From 6d8059674e7ece5f88663a289e34173dbd13d37a Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 07:33:56 +0100 Subject: [PATCH] update to 6.0.20170121 [release 6.0.20170121-1mamba;Fri Jan 27 2017] --- ncurses-6.0-20150810.patch | 187 - ncurses-6.0-20150815.patch | 11415 -------- ncurses-6.0-20150822.patch | 19082 ------------- ncurses-6.0-20150905.patch | 1911 -- ncurses-6.0-20150912.patch | 10769 -------- ncurses-6.0-20150919.patch | 9184 ------- ncurses-6.0-20150926.patch | 596 - ncurses-6.0-20151010.patch | 5485 ---- ncurses-6.0-20151024.patch | 975 - ncurses-6.0-20151101.patch | 12290 --------- ncurses-6.0-20151107.patch | 694 - ncurses-6.0-20151121.patch | 720 - ncurses-6.0-20151128.patch | 612 - ncurses-6.0-20151205.patch | 3819 --- ncurses-6.0-20151212.patch | 2912 -- ncurses-6.0-20151219.patch | 9098 ------- ncurses-6.0-20151226.patch | 366 - ncurses-6.0-20160102.patch | 524 - ncurses-6.0-20160116.patch | 474 - ncurses-6.0-20160123.patch | 702 - ncurses-6.0-20160130.patch | 11519 -------- ncurses-6.0-20160206.patch | 265 - ncurses-6.0-20160213.patch | 344 - ncurses-6.0-20160917.patch | 481 + ncurses-6.0-20160924.patch | 478 + ncurses-6.0-20161001.patch | 5340 ++++ ncurses-6.0-20161008.patch | 15174 +++++++++++ ncurses-6.0-20161015.patch | 5094 ++++ ncurses-6.0-20161022.patch | 1804 ++ ncurses-6.0-20161029.patch | 782 + ncurses-6.0-20161105.patch | 266 + ncurses-6.0-20161112.patch | 1166 + ncurses-6.0-20161119.patch | 1034 + ncurses-6.0-20161126.patch | 1307 + ncurses-6.0-20161203.patch | 1173 + ncurses-6.0-20161210.patch | 14551 ++++++++++ ncurses-6.0-20161217.patch | 445 + ncurses-6.0-20161224.patch | 1402 + ncurses-6.0-20161231.patch | 16453 +++++++++++ ncurses-6.0-20170107.patch | 6071 +++++ ncurses-6.0-20170114.patch | 959 + ...151017.patch => ncurses-6.0-20170121.patch | 22698 ++++++++-------- ncurses.spec | 61 +- patch-6.0-20160910.sh.gz | Bin 0 -> 469710 bytes 44 files changed, 85198 insertions(+), 115484 deletions(-) delete mode 100644 ncurses-6.0-20150810.patch delete mode 100644 ncurses-6.0-20150815.patch delete mode 100644 ncurses-6.0-20150822.patch delete mode 100644 ncurses-6.0-20150905.patch delete mode 100644 ncurses-6.0-20150912.patch delete mode 100644 ncurses-6.0-20150919.patch delete mode 100644 ncurses-6.0-20150926.patch delete mode 100644 ncurses-6.0-20151010.patch delete mode 100644 ncurses-6.0-20151024.patch delete mode 100644 ncurses-6.0-20151101.patch delete mode 100644 ncurses-6.0-20151107.patch delete mode 100644 ncurses-6.0-20151121.patch delete mode 100644 ncurses-6.0-20151128.patch delete mode 100644 ncurses-6.0-20151205.patch delete mode 100644 ncurses-6.0-20151212.patch delete mode 100644 ncurses-6.0-20151219.patch delete mode 100644 ncurses-6.0-20151226.patch delete mode 100644 ncurses-6.0-20160102.patch delete mode 100644 ncurses-6.0-20160116.patch delete mode 100644 ncurses-6.0-20160123.patch delete mode 100644 ncurses-6.0-20160130.patch delete mode 100644 ncurses-6.0-20160206.patch delete mode 100644 ncurses-6.0-20160213.patch create mode 100644 ncurses-6.0-20160917.patch create mode 100644 ncurses-6.0-20160924.patch create mode 100644 ncurses-6.0-20161001.patch create mode 100644 ncurses-6.0-20161008.patch create mode 100644 ncurses-6.0-20161015.patch create mode 100644 ncurses-6.0-20161022.patch create mode 100644 ncurses-6.0-20161029.patch create mode 100644 ncurses-6.0-20161105.patch create mode 100644 ncurses-6.0-20161112.patch create mode 100644 ncurses-6.0-20161119.patch create mode 100644 ncurses-6.0-20161126.patch create mode 100644 ncurses-6.0-20161203.patch create mode 100644 ncurses-6.0-20161210.patch create mode 100644 ncurses-6.0-20161217.patch create mode 100644 ncurses-6.0-20161224.patch create mode 100644 ncurses-6.0-20161231.patch create mode 100644 ncurses-6.0-20170107.patch create mode 100644 ncurses-6.0-20170114.patch rename ncurses-6.0-20151017.patch => ncurses-6.0-20170121.patch (50%) create mode 100644 patch-6.0-20160910.sh.gz diff --git a/ncurses-6.0-20150810.patch b/ncurses-6.0-20150810.patch deleted file mode 100644 index 76f238f..0000000 --- a/ncurses-6.0-20150810.patch +++ /dev/null @@ -1,187 +0,0 @@ -# ncurses 6.0 - patch 20150810 - Thomas E. Dickey -# -# ------------------------------------------------------------------------------ -# -# Ncurses 6.0 is at -# ftp.gnu.org:/pub/gnu -# -# Patches for ncurses 6.0 are in the subdirectory -# ftp://invisible-island.net/ncurses/6.0 -# -# ------------------------------------------------------------------------------ -# ftp://invisible-island.net/ncurses/5.9/ncurses-6.0-20150810.patch.gz -# patch by Thomas E. Dickey -# created Mon Aug 10 09:27:53 UTC 2015 -# ------------------------------------------------------------------------------ -# NEWS | 7 ++++++- -# VERSION | 2 +- -# dist.mk | 4 ++-- -# ncurses/base/MKlib_gen.sh | 4 ++-- -# package/debian-mingw/changelog | 4 ++-- -# package/debian-mingw64/changelog | 4 ++-- -# package/debian/changelog | 4 ++-- -# package/mingw-ncurses.nsi | 4 ++-- -# package/mingw-ncurses.spec | 2 +- -# package/ncurses.spec | 2 +- -# 10 files changed, 21 insertions(+), 16 deletions(-) -# ------------------------------------------------------------------------------ -Index: NEWS -Prereq: 1.2476 ---- ncurses-6.0-20150808+/NEWS 2015-08-08 23:29:51.000000000 +0000 -+++ ncurses-6.0-20150810/NEWS 2015-08-10 09:27:32.000000000 +0000 -@@ -25,7 +25,7 @@ - -- sale, use or other dealings in this Software without prior written -- - -- authorization. -- - ------------------------------------------------------------------------------- ---- $Id: NEWS,v 1.2476 2015/08/08 23:29:51 tom Exp $ -+-- $Id: NEWS,v 1.2478 2015/08/10 09:27:32 tom Exp $ - ------------------------------------------------------------------------------- - - This is a log of changes that ncurses has gone through since Zeyd started -@@ -45,6 +45,11 @@ - Changes through 1.9.9e did not credit all contributions; - it is not possible to add this information. - -+20150810 -+ + workaround for Debian #65617, which was fixed in mawk's upstream -+ releases in 2009 (report by Sven Joachim). See -+ http://invisible-island.net/mawk/CHANGES.html#t20090727 -+ - 20150808 6.0 release for upload to ftp.gnu.org - - 20150808 -Index: VERSION ---- ncurses-6.0-20150808+/VERSION 2015-08-06 23:13:39.000000000 +0000 -+++ ncurses-6.0-20150810/VERSION 2015-08-10 09:10:29.000000000 +0000 -@@ -1 +1 @@ --5:0:9 6.0 20150808 -+5:0:9 6.0 20150810 -Index: dist.mk -Prereq: 1.1064 ---- ncurses-6.0-20150808+/dist.mk 2015-08-06 23:13:39.000000000 +0000 -+++ ncurses-6.0-20150810/dist.mk 2015-08-10 09:10:29.000000000 +0000 -@@ -25,7 +25,7 @@ - # use or other dealings in this Software without prior written # - # authorization. # - ############################################################################## --# $Id: dist.mk,v 1.1064 2015/08/06 23:13:39 tom Exp $ -+# $Id: dist.mk,v 1.1065 2015/08/10 09:10:29 tom Exp $ - # Makefile for creating ncurses distributions. - # - # This only needs to be used directly as a makefile by developers, but -@@ -37,7 +37,7 @@ - # These define the major/minor/patch versions of ncurses. - NCURSES_MAJOR = 6 - NCURSES_MINOR = 0 --NCURSES_PATCH = 20150808 -+NCURSES_PATCH = 20150810 - - # We don't append the patch to the version, since this only applies to releases - VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) -Index: ncurses/base/MKlib_gen.sh -Prereq: 1.50 ---- ncurses-6.0-20150808+/ncurses/base/MKlib_gen.sh 2015-08-07 00:48:24.000000000 +0000 -+++ ncurses-6.0-20150810/ncurses/base/MKlib_gen.sh 2015-08-10 08:56:39.000000000 +0000 -@@ -2,7 +2,7 @@ - # - # MKlib_gen.sh -- generate sources from curses.h macro definitions - # --# ($Id: MKlib_gen.sh,v 1.50 2015/08/07 00:48:24 tom Exp $) -+# ($Id: MKlib_gen.sh,v 1.51 2015/08/10 08:56:39 tom Exp $) - # - ############################################################################## - # Copyright (c) 1998-2014,2015 Free Software Foundation, Inc. # -@@ -72,7 +72,7 @@ - # appears in gcc 5.0 and (with modification) in 5.1, making it necessary to - # determine if we are using gcc, and if so, what version because the proposed - # solution uses a nonstandard option. --PRG=`echo "$1" | $AWK '{ sub(/^[[:space:]]*/,""); sub(/[[:space:]].*$/, ""); print; }' || exit 0` -+PRG=`echo "$1" | $AWK '{ sub(/^[ ]*/,""); sub(/[ ].*$/, ""); print; }' || exit 0` - FSF=`"$PRG" --version 2>/dev/null || exit 0 | fgrep "Free Software Foundation" | head -n 1` - ALL=`"$PRG" -dumpversion 2>/dev/null || exit 0` - ONE=`echo "$ALL" | sed -e 's/\..*$//'` -Index: package/debian-mingw/changelog ---- ncurses-6.0-20150808+/package/debian-mingw/changelog 2015-08-06 23:13:39.000000000 +0000 -+++ ncurses-6.0-20150810/package/debian-mingw/changelog 2015-08-10 09:10:30.000000000 +0000 -@@ -1,8 +1,8 @@ --ncurses6 (6.0+20150808) unstable; urgency=low -+ncurses6 (6.0+20150810) unstable; urgency=low - - * latest weekly patch - -- -- Thomas E. Dickey Thu, 06 Aug 2015 19:13:39 -0400 -+ -- Thomas E. Dickey Mon, 10 Aug 2015 05:10:30 -0400 - - ncurses6 (5.9-20131005) unstable; urgency=low - -Index: package/debian-mingw64/changelog ---- ncurses-6.0-20150808+/package/debian-mingw64/changelog 2015-08-06 23:13:39.000000000 +0000 -+++ ncurses-6.0-20150810/package/debian-mingw64/changelog 2015-08-10 09:10:30.000000000 +0000 -@@ -1,8 +1,8 @@ --ncurses6 (6.0+20150808) unstable; urgency=low -+ncurses6 (6.0+20150810) unstable; urgency=low - - * latest weekly patch - -- -- Thomas E. Dickey Thu, 06 Aug 2015 19:13:39 -0400 -+ -- Thomas E. Dickey Mon, 10 Aug 2015 05:10:30 -0400 - - ncurses6 (5.9-20131005) unstable; urgency=low - -Index: package/debian/changelog ---- ncurses-6.0-20150808+/package/debian/changelog 2015-08-06 23:13:39.000000000 +0000 -+++ ncurses-6.0-20150810/package/debian/changelog 2015-08-10 09:10:29.000000000 +0000 -@@ -1,8 +1,8 @@ --ncurses6 (6.0+20150808) unstable; urgency=low -+ncurses6 (6.0+20150810) unstable; urgency=low - - * latest weekly patch - -- -- Thomas E. Dickey Thu, 06 Aug 2015 19:13:39 -0400 -+ -- Thomas E. Dickey Mon, 10 Aug 2015 05:10:29 -0400 - - ncurses6 (5.9-20120608) unstable; urgency=low - -Index: package/mingw-ncurses.nsi -Prereq: 1.117 ---- ncurses-6.0-20150808+/package/mingw-ncurses.nsi 2015-08-06 23:13:39.000000000 +0000 -+++ ncurses-6.0-20150810/package/mingw-ncurses.nsi 2015-08-10 09:10:30.000000000 +0000 -@@ -1,4 +1,4 @@ --; $Id: mingw-ncurses.nsi,v 1.117 2015/08/06 23:13:39 tom Exp $ -+; $Id: mingw-ncurses.nsi,v 1.118 2015/08/10 09:10:30 tom Exp $ - - ; TODO add examples - ; TODO bump ABI to 6 -@@ -10,7 +10,7 @@ - !define VERSION_MAJOR "6" - !define VERSION_MINOR "0" - !define VERSION_YYYY "2015" --!define VERSION_MMDD "0808" -+!define VERSION_MMDD "0810" - !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} - - !define MY_ABI "5" -Index: package/mingw-ncurses.spec ---- ncurses-6.0-20150808+/package/mingw-ncurses.spec 2015-08-06 23:13:39.000000000 +0000 -+++ ncurses-6.0-20150810/package/mingw-ncurses.spec 2015-08-10 09:10:29.000000000 +0000 -@@ -3,7 +3,7 @@ - Summary: shared libraries for terminal handling - Name: mingw32-ncurses6 - Version: 6.0 --Release: 20150808 -+Release: 20150810 - License: X11 - Group: Development/Libraries - Source: ncurses-%{version}-%{release}.tgz -Index: package/ncurses.spec ---- ncurses-6.0-20150808+/package/ncurses.spec 2015-08-06 23:13:39.000000000 +0000 -+++ ncurses-6.0-20150810/package/ncurses.spec 2015-08-10 09:10:29.000000000 +0000 -@@ -1,7 +1,7 @@ - Summary: shared libraries for terminal handling - Name: ncurses6 - Version: 6.0 --Release: 20150808 -+Release: 20150810 - License: X11 - Group: Development/Libraries - Source: ncurses-%{version}-%{release}.tgz diff --git a/ncurses-6.0-20150815.patch b/ncurses-6.0-20150815.patch deleted file mode 100644 index 21fe06e..0000000 --- a/ncurses-6.0-20150815.patch +++ /dev/null @@ -1,11415 +0,0 @@ -# ncurses 6.0 - patch 20150815 - Thomas E. Dickey -# -# ------------------------------------------------------------------------------ -# -# Ncurses 6.0 is at -# ftp.gnu.org:/pub/gnu -# -# Patches for ncurses 6.0 are in the subdirectory -# ftp://invisible-island.net/ncurses/6.0 -# -# ------------------------------------------------------------------------------ -# ftp://invisible-island.net/ncurses/5.9/ncurses-6.0-20150815.patch.gz -# patch by Thomas E. Dickey -# created Sat Aug 15 23:50:26 UTC 2015 -# ------------------------------------------------------------------------------ -# INSTALL | 83 - -# NEWS | 8 -# VERSION | 2 -# aclocal.m4 | 9 -# configure | 2920 ++++++++++++++++++------------------- -# dist.mk | 4 -# form/llib-lform | 4 -# form/llib-lformt | 6 -# form/llib-lformtw | 4 -# form/llib-lformw | 4 -# menu/llib-lmenu | 4 -# menu/llib-lmenut | 4 -# menu/llib-lmenutw | 6 -# menu/llib-lmenuw | 6 -# ncurses/llib-lncurses | 22 -# ncurses/llib-lncursest | 22 -# ncurses/llib-lncursestw | 22 -# ncurses/llib-lncursesw | 51 -# ncurses/llib-ltic | 11 -# ncurses/llib-ltict | 11 -# ncurses/llib-ltictw | 11 -# ncurses/llib-lticw | 11 -# ncurses/llib-ltinfo | 39 -# ncurses/llib-ltinfot | 41 -# ncurses/llib-ltinfotw | 39 -# ncurses/llib-ltinfow | 39 -# package/debian-mingw/changelog | 4 -# package/debian-mingw64/changelog | 4 -# package/debian/changelog | 4 -# package/mingw-ncurses.nsi | 4 -# package/mingw-ncurses.spec | 2 -# package/ncurses.spec | 2 -# panel/llib-lpanelt | 2 -# panel/llib-lpaneltw | 2 -# 34 files changed, 1579 insertions(+), 1828 deletions(-) -# ------------------------------------------------------------------------------ -Index: INSTALL -Prereq: 1.187 ---- ncurses-6.0-20150810+/INSTALL 2015-07-16 23:59:08.000000000 +0000 -+++ ncurses-6.0-20150815/INSTALL 2015-08-15 20:11:48.000000000 +0000 -@@ -25,7 +25,7 @@ - -- sale, use or other dealings in this Software without prior written -- - -- authorization. -- - ------------------------------------------------------------------------------- ---- $Id: INSTALL,v 1.187 2015/07/16 23:59:08 tom Exp $ -+-- $Id: INSTALL,v 1.192 2015/08/15 20:11:48 tom Exp $ - --------------------------------------------------------------------- - How to install Ncurses/Terminfo on your system - --------------------------------------------------------------------- -@@ -196,17 +196,16 @@ - NOTE: You must have installed the terminfo database, or set the - environment variable $TERMINFO to point to a SVr4-compatible terminfo - database before running the test programs. Not all vendors' terminfo -- databases are SVr4-compatible, but most seem to be. Exceptions include -- DEC's Digital Unix (formerly known as OSF/1). -+ databases are SVr4-compatible, but most seem to be. -+ -+ It is possible to configure ncurses to use other terminfo database formats. -+ A few are provided as examples in the include-directory (see --with-caps). - - If you run the test programs WITHOUT installing terminfo, ncurses may - read the termcap file and cache that in $HOME/.terminfo, which will - thereafter be used instead of the terminfo database. See the comments - on "--enable-getcap-cache", to see why this is a Bad Thing. - -- It is possible to configure ncurses to use other terminfo database formats. -- A few are provided as examples in the include-directory (see --with-caps). -- - The ncurses program is designed specifically to test the ncurses library. - You can use it to verify that the screen highlights work correctly, that - cursor addressing and window scrolling works OK, etc. -@@ -227,8 +226,7 @@ - ############################################################################ - # CAVEAT EMPTOR: `install.data' run as root will NUKE any existing # - # terminfo database. If you have any custom or unusual entries SAVE them # -- # before you install ncurses. I have a file called terminfo.custom for # -- # this purpose. Don't forget to run tic on the file once you're done. # -+ # before you install ncurses. # - ############################################################################ - - The terminfo(5) manual page must be preprocessed with tbl(1) before -@@ -1246,19 +1244,60 @@ - COMPATIBILITY WITH OLDER VERSIONS OF NCURSES: - -------------------------------------------- - -- Because ncurses implements the X/Open Curses Specification, its interface -- is fairly stable. That does not mean the interface does not change. -- Changes are made to the documented interfaces when we find differences -- between ncurses and X/Open or implementations which they certify (such as -- Solaris). We add extensions to those interfaces to solve problems not -- addressed by the original curses design, but those must not conflict with -- the X/Open documentation. -+ Because ncurses implements X/Open Curses, its interface is fairly stable. -+ That does not mean the interface does not change. Changes are made to the -+ documented interfaces when we find differences between ncurses and X/Open -+ or implementations which largely correspond to X/Open (such as Solaris). -+ We add extensions to those interfaces to solve problems not addressed by -+ the original curses design, but those must not conflict with the X/Open -+ documentation. - - Here are some of the major interface changes, and related problems which - you may encounter when building a system with different versions of - ncurses: - -- 6.0 (??? ??, 2015) -+ 6.0 (Aug 08, 2015) -+ Interface changes: -+ -+ + The 6.0 ABI modifies the defaults for these configure options: -+ --enable-const -+ --enable-ext-colors -+ --enable-ext-mouse -+ --enable-ext-putwin -+ --enable-interop -+ --enable-lp64 -+ --enable-sp-funcs -+ --with-chtype=uint32_t -+ --with-mmask_t=uint32_t -+ --with-tparm-arg=intptr_t -+ -+ + ncurses supports symbol versioning. If you use this feature, about -+ half of the "_nc_" private symbols are changed to local symbols. -+ -+ + a few applications may need to explicitly flush the standard output -+ when switching between printf's and (curses) printw. -+ -+ Added extensions: -+ -+ + use_tioctl is an improvement over use_env -+ -+ + added wgetdelay to support the NCURSES_OPAQUE feature. -+ -+ Added internal functions (other than "_sp" variants): -+ _nc_init_termtype -+ _nc_mvcur -+ _nc_putchar -+ _nc_setenv_num -+ _nc_trace_mmask_t -+ -+ Removed internal functions: -+ none -+ -+ Modified internal functions: -+ _nc_do_color - change parameters from short/bool to int -+ _nc_keypad - change parameter from bool to int -+ _nc_setupscreen - change parameter from bool to int -+ _nc_signal_handler - change parameter from bool to int - - 5.9 (Apr 04, 2011) - 5.8 (Feb 26, 2011) -@@ -1811,9 +1850,10 @@ - Configuration and Installation: - - On platforms where ncurses is assumed to be installed in /usr/lib, -- the configure script uses "/usr" as a default: -+ the configure script uses "/usr" as a default. These include any -+ that use the Linux kernel, as well as these special cases: - -- GNU/Linux, FreeBSD, NetBSD, OpenBSD, Cygwin -+ FreeBSD, NetBSD, OpenBSD, Cygwin, MinGW - - For other platforms, the default is "/usr/local". See the discussion - of the "--disable-overwrite" option. -@@ -1974,11 +2014,10 @@ - They have to do with the ncurses library, which uses terminfo rather - than termcap for describing terminal characteristics. - --Though the ncurses library is terminfo-based, it will interpret your -+Though the ncurses library is terminfo-based, it can interpret your - TERMCAP variable (if present), any local termcap files you reference --through it, and the system termcap file. However, in order to avoid --slowing down your application startup, it will only do this once per --terminal type! -+through it, and the system termcap file. However, to avoid slowing -+down your application startup, it does this only once per terminal type! - - The first time you load a given terminal type from your termcap - database, the library initialization code will automatically write it -Index: NEWS -Prereq: 1.2478 ---- ncurses-6.0-20150810+/NEWS 2015-08-10 09:27:32.000000000 +0000 -+++ ncurses-6.0-20150815/NEWS 2015-08-15 22:33:55.000000000 +0000 -@@ -25,7 +25,7 @@ - -- sale, use or other dealings in this Software without prior written -- - -- authorization. -- - ------------------------------------------------------------------------------- ---- $Id: NEWS,v 1.2478 2015/08/10 09:27:32 tom Exp $ -+-- $Id: NEWS,v 1.2481 2015/08/15 22:33:55 tom Exp $ - ------------------------------------------------------------------------------- - - This is a log of changes that ncurses has gone through since Zeyd started -@@ -45,6 +45,12 @@ - Changes through 1.9.9e did not credit all contributions; - it is not possible to add this information. - -+20150815 -+ + disallow "no" as a possible value for "--with-shlib-version" option, -+ overlooked in cleanup-changes for 20000708 (report by Tommy Alex). -+ + update release notes in INSTALL. -+ + regenerate llib-* files to help with review for release notes. -+ - 20150810 - + workaround for Debian #65617, which was fixed in mawk's upstream - releases in 2009 (report by Sven Joachim). See -Index: VERSION ---- ncurses-6.0-20150810+/VERSION 2015-08-10 09:10:29.000000000 +0000 -+++ ncurses-6.0-20150815/VERSION 2015-08-15 15:13:47.000000000 +0000 -@@ -1 +1 @@ --5:0:9 6.0 20150810 -+5:0:9 6.0 20150815 -Index: aclocal.m4 -Prereq: 1.761 ---- ncurses-6.0-20150810+/aclocal.m4 2015-08-06 00:46:34.000000000 +0000 -+++ ncurses-6.0-20150815/aclocal.m4 2015-08-15 22:39:55.000000000 +0000 -@@ -28,7 +28,7 @@ - dnl - dnl Author: Thomas E. Dickey 1995-on - dnl --dnl $Id: aclocal.m4,v 1.761 2015/08/06 00:46:34 tom Exp $ -+dnl $Id: aclocal.m4,v 1.762 2015/08/15 22:39:55 tom Exp $ - dnl Macros used in NCURSES auto-configuration script. - dnl - dnl These macros are maintained separately from NCURSES. The copyright on -@@ -5511,7 +5511,7 @@ - AC_SUBST(EXTRA_LDFLAGS) - ])dnl - dnl --------------------------------------------------------------------------- --dnl CF_SHARED_OPTS version: 88 updated: 2015/08/05 20:44:28 -+dnl CF_SHARED_OPTS version: 89 updated: 2015/08/15 18:38:59 - dnl -------------- - dnl -------------- - dnl Attempt to determine the appropriate CC/LD options for creating a shared -@@ -5564,11 +5564,12 @@ - (yes) - cf_cv_shlib_version=auto - ;; -- (rel|abi|auto|no) -+ (rel|abi|auto) - cf_cv_shlib_version=$withval - ;; - (*) -- AC_MSG_ERROR([option value must be one of: rel, abi, auto or no]) -+ AC_MSG_RESULT($withval) -+ AC_MSG_ERROR([option value must be one of: rel, abi, or auto]) - ;; - esac - ],[cf_cv_shlib_version=auto]) -Index: configure ---- ncurses-6.0-20150810+/configure 2015-08-05 09:20:32.000000000 +0000 -+++ ncurses-6.0-20150815/configure 2015-08-15 22:38:44.000000000 +0000 -@@ -1,5 +1,5 @@ - #! /bin/sh --# From configure.in Revision: 1.618 . -+# From configure.in Revision: 1.619 . - # Guess values for system-dependent variables and create Makefiles. - # Generated by Autoconf 2.52.20141204. - # -@@ -5966,12 +5966,14 @@ - (yes) - cf_cv_shlib_version=auto - ;; -- (rel|abi|auto|no) -+ (rel|abi|auto) - cf_cv_shlib_version=$withval - ;; - (*) -- { { echo "$as_me:5973: error: option value must be one of: rel, abi, auto or no" >&5 --echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;} -+ echo "$as_me:5973: result: $withval" >&5 -+echo "${ECHO_T}$withval" >&6 -+ { { echo "$as_me:5975: error: option value must be one of: rel, abi, or auto" >&5 -+echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;} - { (exit 1); exit 1; }; } - ;; - esac -@@ -5979,7 +5981,7 @@ - else - cf_cv_shlib_version=auto - fi; -- echo "$as_me:5982: result: $cf_cv_shlib_version" >&5 -+ echo "$as_me:5984: result: $cf_cv_shlib_version" >&5 - echo "${ECHO_T}$cf_cv_shlib_version" >&6 - - cf_cv_rm_so_locs=no -@@ -5989,14 +5991,14 @@ - CC_SHARED_OPTS= - if test "$GCC" = yes - then -- echo "$as_me:5992: checking which $CC option to use" >&5 -+ echo "$as_me:5994: checking which $CC option to use" >&5 - echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6 - cf_save_CFLAGS="$CFLAGS" - for CC_SHARED_OPTS in -fPIC -fpic '' - do - CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS" - cat >conftest.$ac_ext <<_ACEOF --#line 5999 "configure" -+#line 6001 "configure" - #include "confdefs.h" - #include - int -@@ -6008,16 +6010,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:6011: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:6013: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:6014: \$? = $ac_status" >&5 -+ echo "$as_me:6016: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:6017: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:6019: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:6020: \$? = $ac_status" >&5 -+ echo "$as_me:6022: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break - else -@@ -6026,7 +6028,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - done -- echo "$as_me:6029: result: $CC_SHARED_OPTS" >&5 -+ echo "$as_me:6031: result: $CC_SHARED_OPTS" >&5 - echo "${ECHO_T}$CC_SHARED_OPTS" >&6 - CFLAGS="$cf_save_CFLAGS" - fi -@@ -6097,7 +6099,7 @@ - MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@' - test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi - cf_cv_shlib_version_infix=yes -- echo "$as_me:6100: checking if ld -search_paths_first works" >&5 -+ echo "$as_me:6102: checking if ld -search_paths_first works" >&5 - echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6 - if test "${cf_cv_ldflags_search_paths_first+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -6106,7 +6108,7 @@ - cf_save_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS -Wl,-search_paths_first" - cat >conftest.$ac_ext <<_ACEOF --#line 6109 "configure" -+#line 6111 "configure" - #include "confdefs.h" - - int -@@ -6118,16 +6120,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:6121: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:6123: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:6124: \$? = $ac_status" >&5 -+ echo "$as_me:6126: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:6127: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:6129: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:6130: \$? = $ac_status" >&5 -+ echo "$as_me:6132: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_ldflags_search_paths_first=yes - else -@@ -6138,7 +6140,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$cf_save_LDFLAGS - fi --echo "$as_me:6141: result: $cf_cv_ldflags_search_paths_first" >&5 -+echo "$as_me:6143: result: $cf_cv_ldflags_search_paths_first" >&5 - echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 - if test $cf_cv_ldflags_search_paths_first = yes; then - LDFLAGS="$LDFLAGS -Wl,-search_paths_first" -@@ -6363,7 +6365,7 @@ - do - CFLAGS="$cf_shared_opts $cf_save_CFLAGS" - cat >conftest.$ac_ext <<_ACEOF --#line 6366 "configure" -+#line 6368 "configure" - #include "confdefs.h" - #include - int -@@ -6375,16 +6377,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:6378: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:6380: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:6381: \$? = $ac_status" >&5 -+ echo "$as_me:6383: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:6384: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:6386: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:6387: \$? = $ac_status" >&5 -+ echo "$as_me:6389: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break - else -@@ -6421,7 +6423,7 @@ - test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes - ;; - (*) -- { echo "$as_me:6424: WARNING: ignored --with-shlib-version" >&5 -+ { echo "$as_me:6426: WARNING: ignored --with-shlib-version" >&5 - echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} - ;; - esac -@@ -6431,7 +6433,7 @@ - if test -n "$cf_try_cflags" - then - cat > conftest.$ac_ext < - int main(int argc, char *argv[]) - { -@@ -6443,18 +6445,18 @@ - for cf_opt in $cf_try_cflags - do - CFLAGS="$cf_save_CFLAGS -$cf_opt" -- echo "$as_me:6446: checking if CFLAGS option -$cf_opt works" >&5 -+ echo "$as_me:6448: checking if CFLAGS option -$cf_opt works" >&5 - echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6 -- if { (eval echo "$as_me:6448: \"$ac_compile\"") >&5 -+ if { (eval echo "$as_me:6450: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:6451: \$? = $ac_status" >&5 -+ echo "$as_me:6453: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- echo "$as_me:6453: result: yes" >&5 -+ echo "$as_me:6455: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - cf_save_CFLAGS="$CFLAGS" - else -- echo "$as_me:6457: result: no" >&5 -+ echo "$as_me:6459: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - done -@@ -6469,17 +6471,17 @@ - - test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6 - --echo "${as_me:-configure}:6472: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 -+echo "${as_me:-configure}:6474: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 - - test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 - --echo "${as_me:-configure}:6476: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 -+echo "${as_me:-configure}:6478: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 - - for model in $cf_list_models; do - case $model in - (libtool) - --echo "$as_me:6482: checking for additional libtool options" >&5 -+echo "$as_me:6484: checking for additional libtool options" >&5 - echo $ECHO_N "checking for additional libtool options... $ECHO_C" >&6 - - # Check whether --with-libtool-opts or --without-libtool-opts was given. -@@ -6489,7 +6491,7 @@ - else - with_libtool_opts=no - fi; --echo "$as_me:6492: result: $with_libtool_opts" >&5 -+echo "$as_me:6494: result: $with_libtool_opts" >&5 - echo "${ECHO_T}$with_libtool_opts" >&6 - - case .$with_libtool_opts in -@@ -6500,7 +6502,7 @@ - ;; - esac - --echo "$as_me:6503: checking if exported-symbols file should be used" >&5 -+echo "$as_me:6505: checking if exported-symbols file should be used" >&5 - echo $ECHO_N "checking if exported-symbols file should be used... $ECHO_C" >&6 - - # Check whether --with-export-syms or --without-export-syms was given. -@@ -6515,7 +6517,7 @@ - with_export_syms='${top_srcdir}/package/${PACKAGE}.sym' - - fi --echo "$as_me:6518: result: $with_export_syms" >&5 -+echo "$as_me:6520: result: $with_export_syms" >&5 - echo "${ECHO_T}$with_export_syms" >&6 - if test "x$with_export_syms" != xno - then -@@ -6526,12 +6528,12 @@ - ;; - (shared) - if test "$CC_SHARED_OPTS" = "unknown"; then -- { { echo "$as_me:6529: error: Shared libraries are not supported in this version" >&5 -+ { { echo "$as_me:6531: error: Shared libraries are not supported in this version" >&5 - echo "$as_me: error: Shared libraries are not supported in this version" >&2;} - { (exit 1); exit 1; }; } - fi - --echo "$as_me:6534: checking if versioned-symbols file should be used" >&5 -+echo "$as_me:6536: checking if versioned-symbols file should be used" >&5 - echo $ECHO_N "checking if versioned-symbols file should be used... $ECHO_C" >&6 - - # Check whether --with-versioned-syms or --without-versioned-syms was given. -@@ -6546,7 +6548,7 @@ - with_versioned_syms='${top_srcdir}/package/${PACKAGE}.map' - - fi --echo "$as_me:6549: result: $with_versioned_syms" >&5 -+echo "$as_me:6551: result: $with_versioned_syms" >&5 - echo "${ECHO_T}$with_versioned_syms" >&6 - - RESULTING_SYMS= -@@ -6562,7 +6564,7 @@ - MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-Wl,%\\${VERSIONED_SYMS} -Wl,%"` - test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 - --echo "${as_me:-configure}:6565: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 -+echo "${as_me:-configure}:6567: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 - - ;; - (*-dy\ *) -@@ -6570,11 +6572,11 @@ - MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-dy%\\${VERSIONED_SYMS} -dy%"` - test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 - --echo "${as_me:-configure}:6573: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 -+echo "${as_me:-configure}:6575: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 - - ;; - (*) -- { echo "$as_me:6577: WARNING: this system does not support versioned-symbols" >&5 -+ { echo "$as_me:6579: WARNING: this system does not support versioned-symbols" >&5 - echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;} - ;; - esac -@@ -6586,7 +6588,7 @@ - # symbols. - if test "x$VERSIONED_SYMS" != "x" - then -- echo "$as_me:6589: checking if wildcards can be used to selectively omit symbols" >&5 -+ echo "$as_me:6591: checking if wildcards can be used to selectively omit symbols" >&5 - echo $ECHO_N "checking if wildcards can be used to selectively omit symbols... $ECHO_C" >&6 - WILDCARD_SYMS=no - -@@ -6623,7 +6625,7 @@ - } submodule_1.0; - EOF - cat >conftest.$ac_ext <&5 |fgrep _ismissing | egrep '[ ]T[ ]'` - test -n "$cf_missing" && WILDCARD_SYMS=yes - fi -- echo "$as_me:6657: result: $WILDCARD_SYMS" >&5 -+ echo "$as_me:6659: result: $WILDCARD_SYMS" >&5 - echo "${ECHO_T}$WILDCARD_SYMS" >&6 - rm -f conftest.* - fi -@@ -6665,7 +6667,7 @@ - done - - # pretend that ncurses==ncursesw==ncursest --echo "$as_me:6668: checking if you want to disable library suffixes" >&5 -+echo "$as_me:6670: checking if you want to disable library suffixes" >&5 - echo $ECHO_N "checking if you want to disable library suffixes... $ECHO_C" >&6 - - # Check whether --enable-lib-suffixes or --disable-lib-suffixes was given. -@@ -6682,13 +6684,13 @@ - disable_lib_suffixes=no - - fi; --echo "$as_me:6685: result: $disable_lib_suffixes" >&5 -+echo "$as_me:6687: result: $disable_lib_suffixes" >&5 - echo "${ECHO_T}$disable_lib_suffixes" >&6 - - ### If we're building with rpath, try to link non-standard libs that way too. - if test "$DFT_LWR_MODEL" = "shared"; then - --echo "$as_me:6691: checking if rpath-hack should be disabled" >&5 -+echo "$as_me:6693: 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. -@@ -6705,21 +6707,21 @@ - cf_disable_rpath_hack=no - - fi; --echo "$as_me:6708: result: $cf_disable_rpath_hack" >&5 -+echo "$as_me:6710: 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:6712: checking for updated LDFLAGS" >&5 -+echo "$as_me:6714: 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:6715: result: maybe" >&5 -+ echo "$as_me:6717: 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:6722: checking for $ac_word" >&5 -+echo "$as_me:6724: 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 -@@ -6734,7 +6736,7 @@ - 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:6737: found $ac_dir/$ac_word" >&5 -+echo "$as_me:6739: found $ac_dir/$ac_word" >&5 - break - done - -@@ -6742,10 +6744,10 @@ - fi - cf_ldd_prog=$ac_cv_prog_cf_ldd_prog - if test -n "$cf_ldd_prog"; then -- echo "$as_me:6745: result: $cf_ldd_prog" >&5 -+ echo "$as_me:6747: result: $cf_ldd_prog" >&5 - echo "${ECHO_T}$cf_ldd_prog" >&6 - else -- echo "$as_me:6748: result: no" >&5 -+ echo "$as_me:6750: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -6759,7 +6761,7 @@ - cf_rpath_oops= - - cat >conftest.$ac_ext <<_ACEOF --#line 6762 "configure" -+#line 6764 "configure" - #include "confdefs.h" - #include - int -@@ -6771,16 +6773,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:6774: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:6776: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:6777: \$? = $ac_status" >&5 -+ echo "$as_me:6779: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:6780: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:6782: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:6783: \$? = $ac_status" >&5 -+ echo "$as_me:6785: \$? = $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` -@@ -6808,7 +6810,7 @@ - then - test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6 - --echo "${as_me:-configure}:6811: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 -+echo "${as_me:-configure}:6813: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 - - LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" - break -@@ -6820,11 +6822,11 @@ - - test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 - --echo "${as_me:-configure}:6823: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 -+echo "${as_me:-configure}:6825: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 - - test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 - --echo "${as_me:-configure}:6827: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 -+echo "${as_me:-configure}:6829: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 - - cf_rpath_dst= - for cf_rpath_src in $LDFLAGS -@@ -6861,7 +6863,7 @@ - then - test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 - --echo "${as_me:-configure}:6864: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 -+echo "${as_me:-configure}:6866: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 - - EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" - fi -@@ -6874,11 +6876,11 @@ - - test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 - --echo "${as_me:-configure}:6877: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 -+echo "${as_me:-configure}:6879: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 - - test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 - --echo "${as_me:-configure}:6881: testing ...checking LIBS $LIBS ..." 1>&5 -+echo "${as_me:-configure}:6883: testing ...checking LIBS $LIBS ..." 1>&5 - - cf_rpath_dst= - for cf_rpath_src in $LIBS -@@ -6915,7 +6917,7 @@ - then - test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 - --echo "${as_me:-configure}:6918: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 -+echo "${as_me:-configure}:6920: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 - - EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" - fi -@@ -6928,14 +6930,14 @@ - - test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 - --echo "${as_me:-configure}:6931: testing ...checked LIBS $LIBS ..." 1>&5 -+echo "${as_me:-configure}:6933: testing ...checked LIBS $LIBS ..." 1>&5 - - test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 - --echo "${as_me:-configure}:6935: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 -+echo "${as_me:-configure}:6937: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 - - else -- echo "$as_me:6938: result: no" >&5 -+ echo "$as_me:6940: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -6946,7 +6948,7 @@ - ############################################################################### - - ### use option --with-extra-suffix to append suffix to headers and libraries --echo "$as_me:6949: checking if you wish to append extra suffix to header/library paths" >&5 -+echo "$as_me:6951: checking if you wish to append extra suffix to header/library paths" >&5 - echo $ECHO_N "checking if you wish to append extra suffix to header/library paths... $ECHO_C" >&6 - EXTRA_SUFFIX= - -@@ -6965,11 +6967,11 @@ - esac - - fi; --echo "$as_me:6968: result: $EXTRA_SUFFIX" >&5 -+echo "$as_me:6970: result: $EXTRA_SUFFIX" >&5 - echo "${ECHO_T}$EXTRA_SUFFIX" >&6 - - ### use option --disable-overwrite to leave out the link to -lcurses --echo "$as_me:6972: checking if you wish to install ncurses overwriting curses" >&5 -+echo "$as_me:6974: checking if you wish to install ncurses overwriting curses" >&5 - echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6 - - # Check whether --enable-overwrite or --disable-overwrite was given. -@@ -6979,10 +6981,10 @@ - else - if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi - fi; --echo "$as_me:6982: result: $with_overwrite" >&5 -+echo "$as_me:6984: result: $with_overwrite" >&5 - echo "${ECHO_T}$with_overwrite" >&6 - --echo "$as_me:6985: checking if external terminfo-database is used" >&5 -+echo "$as_me:6987: checking if external terminfo-database is used" >&5 - echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6 - - # Check whether --enable-database or --disable-database was given. -@@ -6992,7 +6994,7 @@ - else - use_database=yes - fi; --echo "$as_me:6995: result: $use_database" >&5 -+echo "$as_me:6997: result: $use_database" >&5 - echo "${ECHO_T}$use_database" >&6 - - case $host_os in -@@ -7008,7 +7010,7 @@ - if test "$use_database" != no ; then - NCURSES_USE_DATABASE=1 - -- echo "$as_me:7011: checking which terminfo source-file will be installed" >&5 -+ echo "$as_me:7013: checking which terminfo source-file will be installed" >&5 - echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6 - - # Check whether --with-database or --without-database was given. -@@ -7016,10 +7018,10 @@ - withval="$with_database" - TERMINFO_SRC=$withval - fi; -- echo "$as_me:7019: result: $TERMINFO_SRC" >&5 -+ echo "$as_me:7021: result: $TERMINFO_SRC" >&5 - echo "${ECHO_T}$TERMINFO_SRC" >&6 - -- echo "$as_me:7022: checking whether to use hashed database instead of directory/tree" >&5 -+ echo "$as_me:7024: checking whether to use hashed database instead of directory/tree" >&5 - echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6 - - # Check whether --with-hashed-db or --without-hashed-db was given. -@@ -7029,13 +7031,13 @@ - else - with_hashed_db=no - fi; -- echo "$as_me:7032: result: $with_hashed_db" >&5 -+ echo "$as_me:7034: result: $with_hashed_db" >&5 - echo "${ECHO_T}$with_hashed_db" >&6 - else - with_hashed_db=no - fi - --echo "$as_me:7038: checking for list of fallback descriptions" >&5 -+echo "$as_me:7040: checking for list of fallback descriptions" >&5 - echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6 - - # Check whether --with-fallbacks or --without-fallbacks was given. -@@ -7045,11 +7047,11 @@ - else - with_fallback= - fi; --echo "$as_me:7048: result: $with_fallback" >&5 -+echo "$as_me:7050: result: $with_fallback" >&5 - echo "${ECHO_T}$with_fallback" >&6 - FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'` - --echo "$as_me:7052: checking if you want modern xterm or antique" >&5 -+echo "$as_me:7054: checking if you want modern xterm or antique" >&5 - echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6 - - # Check whether --with-xterm-new or --without-xterm-new was given. -@@ -7063,11 +7065,11 @@ - (no) with_xterm_new=xterm-old;; - (*) with_xterm_new=xterm-new;; - esac --echo "$as_me:7066: result: $with_xterm_new" >&5 -+echo "$as_me:7068: result: $with_xterm_new" >&5 - echo "${ECHO_T}$with_xterm_new" >&6 - WHICH_XTERM=$with_xterm_new - --echo "$as_me:7070: checking if xterm backspace sends BS or DEL" >&5 -+echo "$as_me:7072: checking if xterm backspace sends BS or DEL" >&5 - echo $ECHO_N "checking if xterm backspace sends BS or DEL... $ECHO_C" >&6 - - # Check whether --with-xterm-kbs or --without-xterm-kbs was given. -@@ -7088,7 +7090,7 @@ - with_xterm_kbs=$withval - ;; - esac --echo "$as_me:7091: result: $with_xterm_kbs" >&5 -+echo "$as_me:7093: result: $with_xterm_kbs" >&5 - echo "${ECHO_T}$with_xterm_kbs" >&6 - XTERM_KBS=$with_xterm_kbs - -@@ -7098,7 +7100,7 @@ - MAKE_TERMINFO="#" - else - --echo "$as_me:7101: checking for list of terminfo directories" >&5 -+echo "$as_me:7103: checking for list of terminfo directories" >&5 - echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6 - - # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given. -@@ -7138,7 +7140,7 @@ - cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` - ;; - (*) -- { { echo "$as_me:7141: error: expected a pathname, not \"$cf_src_path\"" >&5 -+ { { echo "$as_me:7143: error: expected a pathname, not \"$cf_src_path\"" >&5 - echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;} - { (exit 1); exit 1; }; } - ;; -@@ -7161,14 +7163,14 @@ - ;; - esac - --echo "$as_me:7164: result: $TERMINFO_DIRS" >&5 -+echo "$as_me:7166: result: $TERMINFO_DIRS" >&5 - echo "${ECHO_T}$TERMINFO_DIRS" >&6 - test -n "$TERMINFO_DIRS" && - cat >>confdefs.h <&5 -+echo "$as_me:7173: checking for default terminfo directory" >&5 - echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6 - - # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given. -@@ -7204,7 +7206,7 @@ - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` - ;; - (*) -- { { echo "$as_me:7207: error: expected a pathname, not \"$withval\"" >&5 -+ { { echo "$as_me:7209: error: expected a pathname, not \"$withval\"" >&5 - echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} - { (exit 1); exit 1; }; } - ;; -@@ -7213,7 +7215,7 @@ - fi - eval TERMINFO="$withval" - --echo "$as_me:7216: result: $TERMINFO" >&5 -+echo "$as_me:7218: result: $TERMINFO" >&5 - echo "${ECHO_T}$TERMINFO" >&6 - - cat >>confdefs.h <&5 -+echo "$as_me:7229: checking if big-core option selected" >&5 - echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6 - - # Check whether --enable-big-core or --disable-big-core was given. -@@ -7236,7 +7238,7 @@ - with_big_core=no - else - cat >conftest.$ac_ext <<_ACEOF --#line 7239 "configure" -+#line 7241 "configure" - #include "confdefs.h" - - #include -@@ -7250,15 +7252,15 @@ - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:7253: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:7255: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:7256: \$? = $ac_status" >&5 -+ echo "$as_me:7258: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:7258: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:7260: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:7261: \$? = $ac_status" >&5 -+ echo "$as_me:7263: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - with_big_core=yes - else -@@ -7270,7 +7272,7 @@ - rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - fi; --echo "$as_me:7273: result: $with_big_core" >&5 -+echo "$as_me:7275: result: $with_big_core" >&5 - echo "${ECHO_T}$with_big_core" >&6 - test "x$with_big_core" = "xyes" && - cat >>confdefs.h <<\EOF -@@ -7280,7 +7282,7 @@ - ### ISO C only guarantees 512-char strings, we have tables which load faster - ### when constructed using "big" strings. More than the C compiler, the awk - ### program is a limit on most vendor UNIX systems. Check that we can build. --echo "$as_me:7283: checking if big-strings option selected" >&5 -+echo "$as_me:7285: checking if big-strings option selected" >&5 - echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6 - - # Check whether --enable-big-strings or --disable-big-strings was given. -@@ -7304,14 +7306,14 @@ - esac - - fi; --echo "$as_me:7307: result: $with_big_strings" >&5 -+echo "$as_me:7309: result: $with_big_strings" >&5 - echo "${ECHO_T}$with_big_strings" >&6 - - USE_BIG_STRINGS=0 - test "x$with_big_strings" = "xyes" && USE_BIG_STRINGS=1 - - ### use option --enable-termcap to compile in the termcap fallback support --echo "$as_me:7314: checking if you want termcap-fallback support" >&5 -+echo "$as_me:7316: checking if you want termcap-fallback support" >&5 - echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6 - - # Check whether --enable-termcap or --disable-termcap was given. -@@ -7321,14 +7323,14 @@ - else - with_termcap=no - fi; --echo "$as_me:7324: result: $with_termcap" >&5 -+echo "$as_me:7326: result: $with_termcap" >&5 - echo "${ECHO_T}$with_termcap" >&6 - - NCURSES_USE_TERMCAP=0 - if test "x$with_termcap" != "xyes" ; then - if test "$use_database" = no ; then - if test -z "$with_fallback" ; then -- { { echo "$as_me:7331: error: You have disabled the database w/o specifying fallbacks" >&5 -+ { { echo "$as_me:7333: error: You have disabled the database w/o specifying fallbacks" >&5 - echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;} - { (exit 1); exit 1; }; } - fi -@@ -7341,13 +7343,13 @@ - else - - if test "$with_ticlib" != no ; then -- { { echo "$as_me:7344: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 -+ { { echo "$as_me:7346: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 - echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;} - { (exit 1); exit 1; }; } - fi - - NCURSES_USE_TERMCAP=1 -- echo "$as_me:7350: checking for list of termcap files" >&5 -+ echo "$as_me:7352: checking for list of termcap files" >&5 - echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6 - - # Check whether --with-termpath or --without-termpath was given. -@@ -7387,7 +7389,7 @@ - cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` - ;; - (*) -- { { echo "$as_me:7390: error: expected a pathname, not \"$cf_src_path\"" >&5 -+ { { echo "$as_me:7392: error: expected a pathname, not \"$cf_src_path\"" >&5 - echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;} - { (exit 1); exit 1; }; } - ;; -@@ -7410,7 +7412,7 @@ - ;; - esac - -- echo "$as_me:7413: result: $TERMPATH" >&5 -+ echo "$as_me:7415: result: $TERMPATH" >&5 - echo "${ECHO_T}$TERMPATH" >&6 - test -n "$TERMPATH" && - cat >>confdefs.h <&5 -+ echo "$as_me:7423: checking if fast termcap-loader is needed" >&5 - echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6 - - # Check whether --enable-getcap or --disable-getcap was given. -@@ -7428,14 +7430,14 @@ - else - with_getcap=no - fi; -- echo "$as_me:7431: result: $with_getcap" >&5 -+ echo "$as_me:7433: result: $with_getcap" >&5 - echo "${ECHO_T}$with_getcap" >&6 - test "x$with_getcap" = "xyes" && - cat >>confdefs.h <<\EOF - #define USE_GETCAP 1 - EOF - -- echo "$as_me:7438: checking if translated termcaps will be cached in ~/.terminfo" >&5 -+ echo "$as_me:7440: checking if translated termcaps will be cached in ~/.terminfo" >&5 - echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6 - - # Check whether --enable-getcap-cache or --disable-getcap-cache was given. -@@ -7445,7 +7447,7 @@ - else - with_getcap_cache=no - fi; -- echo "$as_me:7448: result: $with_getcap_cache" >&5 -+ echo "$as_me:7450: result: $with_getcap_cache" >&5 - echo "${ECHO_T}$with_getcap_cache" >&6 - test "x$with_getcap_cache" = "xyes" && - cat >>confdefs.h <<\EOF -@@ -7455,7 +7457,7 @@ - fi - - ### Use option --disable-home-terminfo to completely remove ~/.terminfo --echo "$as_me:7458: checking if ~/.terminfo is wanted" >&5 -+echo "$as_me:7460: checking if ~/.terminfo is wanted" >&5 - echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6 - - # Check whether --enable-home-terminfo or --disable-home-terminfo was given. -@@ -7465,14 +7467,14 @@ - else - with_home_terminfo=yes - fi; --echo "$as_me:7468: result: $with_home_terminfo" >&5 -+echo "$as_me:7470: result: $with_home_terminfo" >&5 - echo "${ECHO_T}$with_home_terminfo" >&6 - test "x$with_home_terminfo" = "xyes" && - cat >>confdefs.h <<\EOF - #define USE_HOME_TERMINFO 1 - EOF - --echo "$as_me:7475: checking if you want to use restricted environment when running as root" >&5 -+echo "$as_me:7477: checking if you want to use restricted environment when running as root" >&5 - echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6 - - # Check whether --enable-root-environ or --disable-root-environ was given. -@@ -7482,7 +7484,7 @@ - else - with_root_environ=yes - fi; --echo "$as_me:7485: result: $with_root_environ" >&5 -+echo "$as_me:7487: result: $with_root_environ" >&5 - echo "${ECHO_T}$with_root_environ" >&6 - test "x$with_root_environ" = xyes && - cat >>confdefs.h <<\EOF -@@ -7497,13 +7499,13 @@ - unlink - do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --echo "$as_me:7500: checking for $ac_func" >&5 -+echo "$as_me:7502: 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 7506 "configure" -+#line 7508 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -@@ -7534,16 +7536,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:7537: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:7539: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:7540: \$? = $ac_status" >&5 -+ echo "$as_me:7542: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:7543: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:7545: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:7546: \$? = $ac_status" >&5 -+ echo "$as_me:7548: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" - else -@@ -7553,7 +7555,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:7556: result: `eval echo '${'$as_ac_var'}'`" >&5 -+echo "$as_me:7558: 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 <&5 -+echo "$as_me:7575: 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 7579 "configure" -+#line 7581 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -@@ -7607,16 +7609,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:7610: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:7612: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:7613: \$? = $ac_status" >&5 -+ echo "$as_me:7615: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:7616: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:7618: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:7619: \$? = $ac_status" >&5 -+ echo "$as_me:7621: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" - else -@@ -7626,7 +7628,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:7629: result: `eval echo '${'$as_ac_var'}'`" >&5 -+echo "$as_me:7631: 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 <&5 -+ echo "$as_me:7642: checking if link/symlink functions work" >&5 - echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6 - if test "${cf_cv_link_funcs+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -7650,7 +7652,7 @@ - eval 'ac_cv_func_'$cf_func'=error' - else - cat >conftest.$ac_ext <<_ACEOF --#line 7653 "configure" -+#line 7655 "configure" - #include "confdefs.h" - - #include -@@ -7680,15 +7682,15 @@ - - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:7683: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:7685: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:7686: \$? = $ac_status" >&5 -+ echo "$as_me:7688: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:7688: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:7690: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:7691: \$? = $ac_status" >&5 -+ echo "$as_me:7693: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - cf_cv_link_funcs="$cf_cv_link_funcs $cf_func" -@@ -7706,7 +7708,7 @@ - test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no - - fi --echo "$as_me:7709: result: $cf_cv_link_funcs" >&5 -+echo "$as_me:7711: result: $cf_cv_link_funcs" >&5 - echo "${ECHO_T}$cf_cv_link_funcs" >&6 - test "$ac_cv_func_link" = yes && - cat >>confdefs.h <<\EOF -@@ -7726,7 +7728,7 @@ - # soft links (symbolic links) are useful for some systems where hard links do - # not work, or to make it simpler to copy terminfo trees around. - if test "x$ac_cv_func_symlink" = xyes ; then -- echo "$as_me:7729: checking if tic should use symbolic links" >&5 -+ echo "$as_me:7731: checking if tic should use symbolic links" >&5 - echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6 - - # Check whether --enable-symlinks or --disable-symlinks was given. -@@ -7736,21 +7738,21 @@ - else - with_symlinks=no - fi; -- echo "$as_me:7739: result: $with_symlinks" >&5 -+ echo "$as_me:7741: result: $with_symlinks" >&5 - echo "${ECHO_T}$with_symlinks" >&6 - fi - - # If we have hard links and did not choose to use soft links instead, there is - # no reason to make this choice optional - use the hard links. - if test "$with_symlinks" = no ; then -- echo "$as_me:7746: checking if tic should use hard links" >&5 -+ echo "$as_me:7748: checking if tic should use hard links" >&5 - echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6 - if test "x$ac_cv_func_link" = xyes ; then - with_links=yes - else - with_links=no - fi -- echo "$as_me:7753: result: $with_links" >&5 -+ echo "$as_me:7755: result: $with_links" >&5 - echo "${ECHO_T}$with_links" >&6 - fi - -@@ -7765,7 +7767,7 @@ - EOF - - ### use option --enable-broken-linker to force on use of broken-linker support --echo "$as_me:7768: checking if you want broken-linker support code" >&5 -+echo "$as_me:7770: checking if you want broken-linker support code" >&5 - echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6 - - # Check whether --enable-broken_linker or --disable-broken_linker was given. -@@ -7775,7 +7777,7 @@ - else - with_broken_linker=${BROKEN_LINKER:-no} - fi; --echo "$as_me:7778: result: $with_broken_linker" >&5 -+echo "$as_me:7780: result: $with_broken_linker" >&5 - echo "${ECHO_T}$with_broken_linker" >&6 - - BROKEN_LINKER=0 -@@ -7797,14 +7799,14 @@ - BROKEN_LINKER=1 - test -n "$verbose" && echo " cygwin linker is broken anyway" 1>&6 - --echo "${as_me:-configure}:7800: testing cygwin linker is broken anyway ..." 1>&5 -+echo "${as_me:-configure}:7802: testing cygwin linker is broken anyway ..." 1>&5 - - ;; - esac - fi - - ### use option --enable-bsdpad to have tputs process BSD-style prefix padding --echo "$as_me:7807: checking if tputs should process BSD-style prefix padding" >&5 -+echo "$as_me:7809: checking if tputs should process BSD-style prefix padding" >&5 - echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6 - - # Check whether --enable-bsdpad or --disable-bsdpad was given. -@@ -7814,7 +7816,7 @@ - else - with_bsdpad=no - fi; --echo "$as_me:7817: result: $with_bsdpad" >&5 -+echo "$as_me:7819: result: $with_bsdpad" >&5 - echo "${ECHO_T}$with_bsdpad" >&6 - test "x$with_bsdpad" = xyes && - cat >>confdefs.h <<\EOF -@@ -7871,14 +7873,14 @@ - ;; - (linux*|gnu*|mint*|k*bsd*-gnu) - --echo "$as_me:7874: checking if we must define _GNU_SOURCE" >&5 -+echo "$as_me:7876: 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 7881 "configure" -+#line 7883 "configure" - #include "confdefs.h" - #include - int -@@ -7893,16 +7895,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:7896: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:7898: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:7899: \$? = $ac_status" >&5 -+ echo "$as_me:7901: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:7902: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:7904: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:7905: \$? = $ac_status" >&5 -+ echo "$as_me:7907: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_gnu_source=no - else -@@ -7911,7 +7913,7 @@ - cf_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" - cat >conftest.$ac_ext <<_ACEOF --#line 7914 "configure" -+#line 7916 "configure" - #include "confdefs.h" - #include - int -@@ -7926,16 +7928,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:7929: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:7931: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:7932: \$? = $ac_status" >&5 -+ echo "$as_me:7934: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:7935: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:7937: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:7938: \$? = $ac_status" >&5 -+ echo "$as_me:7940: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_gnu_source=no - else -@@ -7950,7 +7952,7 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - - fi --echo "$as_me:7953: result: $cf_cv_gnu_source" >&5 -+echo "$as_me:7955: result: $cf_cv_gnu_source" >&5 - echo "${ECHO_T}$cf_cv_gnu_source" >&6 - test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" - -@@ -7975,16 +7977,16 @@ - sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` - --echo "$as_me:7978: checking if we should define _POSIX_C_SOURCE" >&5 -+echo "$as_me:7980: 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}:7984: testing if the symbol is already defined go no further ..." 1>&5 -+echo "${as_me:-configure}:7986: testing if the symbol is already defined go no further ..." 1>&5 - - cat >conftest.$ac_ext <<_ACEOF --#line 7987 "configure" -+#line 7989 "configure" - #include "confdefs.h" - #include - int -@@ -7999,16 +8001,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8002: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8004: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8005: \$? = $ac_status" >&5 -+ echo "$as_me:8007: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8008: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8010: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8011: \$? = $ac_status" >&5 -+ echo "$as_me:8013: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_posix_c_source=no - else -@@ -8029,7 +8031,7 @@ - esac - if test "$cf_want_posix_source" = yes ; then - cat >conftest.$ac_ext <<_ACEOF --#line 8032 "configure" -+#line 8034 "configure" - #include "confdefs.h" - #include - int -@@ -8044,16 +8046,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8047: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8049: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8050: \$? = $ac_status" >&5 -+ echo "$as_me:8052: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8053: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8055: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8056: \$? = $ac_status" >&5 -+ echo "$as_me:8058: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -8064,15 +8066,15 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - fi - --echo "${as_me:-configure}:8067: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 -+echo "${as_me:-configure}:8069: 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}:8072: testing if the second compile does not leave our definition intact error ..." 1>&5 -+echo "${as_me:-configure}:8074: testing if the second compile does not leave our definition intact error ..." 1>&5 - - cat >conftest.$ac_ext <<_ACEOF --#line 8075 "configure" -+#line 8077 "configure" - #include "confdefs.h" - #include - int -@@ -8087,16 +8089,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8090: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8092: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8093: \$? = $ac_status" >&5 -+ echo "$as_me:8095: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8096: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8098: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8099: \$? = $ac_status" >&5 -+ echo "$as_me:8101: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -8112,7 +8114,7 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - - fi --echo "$as_me:8115: result: $cf_cv_posix_c_source" >&5 -+echo "$as_me:8117: 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 -@@ -8230,14 +8232,14 @@ - ;; - (*) - --echo "$as_me:8233: checking if we should define _XOPEN_SOURCE" >&5 -+echo "$as_me:8235: 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 8240 "configure" -+#line 8242 "configure" - #include "confdefs.h" - - #include -@@ -8256,16 +8258,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8259: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8261: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8262: \$? = $ac_status" >&5 -+ echo "$as_me:8264: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8265: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8267: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8268: \$? = $ac_status" >&5 -+ echo "$as_me:8270: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_xopen_source=no - else -@@ -8274,7 +8276,7 @@ - cf_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" - cat >conftest.$ac_ext <<_ACEOF --#line 8277 "configure" -+#line 8279 "configure" - #include "confdefs.h" - - #include -@@ -8293,16 +8295,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8296: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8298: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8299: \$? = $ac_status" >&5 -+ echo "$as_me:8301: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8302: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8304: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8305: \$? = $ac_status" >&5 -+ echo "$as_me:8307: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_xopen_source=no - else -@@ -8317,7 +8319,7 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - - fi --echo "$as_me:8320: result: $cf_cv_xopen_source" >&5 -+echo "$as_me:8322: result: $cf_cv_xopen_source" >&5 - echo "${ECHO_T}$cf_cv_xopen_source" >&6 - - if test "$cf_cv_xopen_source" != no ; then -@@ -8425,16 +8427,16 @@ - sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` - --echo "$as_me:8428: checking if we should define _POSIX_C_SOURCE" >&5 -+echo "$as_me:8430: 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}:8434: testing if the symbol is already defined go no further ..." 1>&5 -+echo "${as_me:-configure}:8436: testing if the symbol is already defined go no further ..." 1>&5 - - cat >conftest.$ac_ext <<_ACEOF --#line 8437 "configure" -+#line 8439 "configure" - #include "confdefs.h" - #include - int -@@ -8449,16 +8451,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8452: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8454: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8455: \$? = $ac_status" >&5 -+ echo "$as_me:8457: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8458: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8460: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8461: \$? = $ac_status" >&5 -+ echo "$as_me:8463: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_posix_c_source=no - else -@@ -8479,7 +8481,7 @@ - esac - if test "$cf_want_posix_source" = yes ; then - cat >conftest.$ac_ext <<_ACEOF --#line 8482 "configure" -+#line 8484 "configure" - #include "confdefs.h" - #include - int -@@ -8494,16 +8496,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8497: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8499: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8500: \$? = $ac_status" >&5 -+ echo "$as_me:8502: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8503: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8505: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8506: \$? = $ac_status" >&5 -+ echo "$as_me:8508: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -8514,15 +8516,15 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - fi - --echo "${as_me:-configure}:8517: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 -+echo "${as_me:-configure}:8519: 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}:8522: testing if the second compile does not leave our definition intact error ..." 1>&5 -+echo "${as_me:-configure}:8524: testing if the second compile does not leave our definition intact error ..." 1>&5 - - cat >conftest.$ac_ext <<_ACEOF --#line 8525 "configure" -+#line 8527 "configure" - #include "confdefs.h" - #include - int -@@ -8537,16 +8539,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8540: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8542: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8543: \$? = $ac_status" >&5 -+ echo "$as_me:8545: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8546: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8548: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8549: \$? = $ac_status" >&5 -+ echo "$as_me:8551: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -8562,7 +8564,7 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - - fi --echo "$as_me:8565: result: $cf_cv_posix_c_source" >&5 -+echo "$as_me:8567: 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 -@@ -8720,7 +8722,7 @@ - if test -n "$cf_new_cflags" ; then - test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 - --echo "${as_me:-configure}:8723: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 -+echo "${as_me:-configure}:8725: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 - - CFLAGS="$CFLAGS $cf_new_cflags" - fi -@@ -8728,7 +8730,7 @@ - if test -n "$cf_new_cppflags" ; then - test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 - --echo "${as_me:-configure}:8731: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 -+echo "${as_me:-configure}:8733: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 - - CPPFLAGS="$CPPFLAGS $cf_new_cppflags" - fi -@@ -8736,7 +8738,7 @@ - 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}:8739: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 -+echo "${as_me:-configure}:8741: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 - - EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" - fi -@@ -8744,10 +8746,10 @@ - fi - - if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then -- echo "$as_me:8747: checking if _XOPEN_SOURCE really is set" >&5 -+ echo "$as_me:8749: 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 8750 "configure" -+#line 8752 "configure" - #include "confdefs.h" - #include - int -@@ -8762,16 +8764,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8765: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8767: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8768: \$? = $ac_status" >&5 -+ echo "$as_me:8770: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8771: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8773: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8774: \$? = $ac_status" >&5 -+ echo "$as_me:8776: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_XOPEN_SOURCE_set=yes - else -@@ -8780,12 +8782,12 @@ - cf_XOPEN_SOURCE_set=no - fi - rm -f conftest.$ac_objext conftest.$ac_ext -- echo "$as_me:8783: result: $cf_XOPEN_SOURCE_set" >&5 -+ echo "$as_me:8785: 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 8788 "configure" -+#line 8790 "configure" - #include "confdefs.h" - #include - int -@@ -8800,16 +8802,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8803: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8805: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8806: \$? = $ac_status" >&5 -+ echo "$as_me:8808: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8809: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8811: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8812: \$? = $ac_status" >&5 -+ echo "$as_me:8814: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_XOPEN_SOURCE_set_ok=yes - else -@@ -8820,19 +8822,19 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - if test $cf_XOPEN_SOURCE_set_ok = no - then -- { echo "$as_me:8823: WARNING: _XOPEN_SOURCE is lower than requested" >&5 -+ { echo "$as_me:8825: WARNING: _XOPEN_SOURCE is lower than requested" >&5 - echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} - fi - else - --echo "$as_me:8828: checking if we should define _XOPEN_SOURCE" >&5 -+echo "$as_me:8830: 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 8835 "configure" -+#line 8837 "configure" - #include "confdefs.h" - - #include -@@ -8851,16 +8853,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8854: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8856: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8857: \$? = $ac_status" >&5 -+ echo "$as_me:8859: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8860: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8862: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8863: \$? = $ac_status" >&5 -+ echo "$as_me:8865: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_xopen_source=no - else -@@ -8869,7 +8871,7 @@ - cf_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" - cat >conftest.$ac_ext <<_ACEOF --#line 8872 "configure" -+#line 8874 "configure" - #include "confdefs.h" - - #include -@@ -8888,16 +8890,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8891: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8893: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8894: \$? = $ac_status" >&5 -+ echo "$as_me:8896: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8897: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8899: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8900: \$? = $ac_status" >&5 -+ echo "$as_me:8902: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_xopen_source=no - else -@@ -8912,7 +8914,7 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - - fi --echo "$as_me:8915: result: $cf_cv_xopen_source" >&5 -+echo "$as_me:8917: result: $cf_cv_xopen_source" >&5 - echo "${ECHO_T}$cf_cv_xopen_source" >&6 - - if test "$cf_cv_xopen_source" != no ; then -@@ -9014,14 +9016,14 @@ - - # Work around breakage on OS X - --echo "$as_me:9017: checking if SIGWINCH is defined" >&5 -+echo "$as_me:9019: 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 9024 "configure" -+#line 9026 "configure" - #include "confdefs.h" - - #include -@@ -9036,23 +9038,23 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:9039: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:9041: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:9042: \$? = $ac_status" >&5 -+ echo "$as_me:9044: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:9045: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9047: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9048: \$? = $ac_status" >&5 -+ echo "$as_me:9050: \$? = $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 9055 "configure" -+#line 9057 "configure" - #include "confdefs.h" - - #undef _XOPEN_SOURCE -@@ -9070,16 +9072,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:9073: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:9075: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:9076: \$? = $ac_status" >&5 -+ echo "$as_me:9078: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:9079: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9081: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9082: \$? = $ac_status" >&5 -+ echo "$as_me:9084: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_define_sigwinch=maybe - else -@@ -9093,11 +9095,11 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - - fi --echo "$as_me:9096: result: $cf_cv_define_sigwinch" >&5 -+echo "$as_me:9098: 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:9100: checking for actual SIGWINCH definition" >&5 -+echo "$as_me:9102: 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 -@@ -9108,7 +9110,7 @@ - while test $cf_sigwinch != 1 - do - cat >conftest.$ac_ext <<_ACEOF --#line 9111 "configure" -+#line 9113 "configure" - #include "confdefs.h" - - #undef _XOPEN_SOURCE -@@ -9130,16 +9132,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:9133: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:9135: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:9136: \$? = $ac_status" >&5 -+ echo "$as_me:9138: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:9139: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9141: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9142: \$? = $ac_status" >&5 -+ echo "$as_me:9144: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_fixup_sigwinch=$cf_sigwinch - break -@@ -9153,7 +9155,7 @@ - done - - fi --echo "$as_me:9156: result: $cf_cv_fixup_sigwinch" >&5 -+echo "$as_me:9158: result: $cf_cv_fixup_sigwinch" >&5 - echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 - - if test "$cf_cv_fixup_sigwinch" != unknown ; then -@@ -9163,13 +9165,13 @@ - - # Checks for CODESET support. - --echo "$as_me:9166: checking for nl_langinfo and CODESET" >&5 -+echo "$as_me:9168: 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 9172 "configure" -+#line 9174 "configure" - #include "confdefs.h" - #include - int -@@ -9181,16 +9183,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:9184: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:9186: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:9187: \$? = $ac_status" >&5 -+ echo "$as_me:9189: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:9190: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9192: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9193: \$? = $ac_status" >&5 -+ echo "$as_me:9195: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - am_cv_langinfo_codeset=yes - else -@@ -9201,7 +9203,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - - fi --echo "$as_me:9204: result: $am_cv_langinfo_codeset" >&5 -+echo "$as_me:9206: result: $am_cv_langinfo_codeset" >&5 - echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 - if test $am_cv_langinfo_codeset = yes; then - -@@ -9215,7 +9217,7 @@ - NCURSES_OK_WCHAR_T= - NCURSES_OK_WINT_T= - --echo "$as_me:9218: checking if you want wide-character code" >&5 -+echo "$as_me:9220: checking if you want wide-character code" >&5 - echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6 - - # Check whether --enable-widec or --disable-widec was given. -@@ -9225,7 +9227,7 @@ - else - with_widec=no - fi; --echo "$as_me:9228: result: $with_widec" >&5 -+echo "$as_me:9230: result: $with_widec" >&5 - echo "${ECHO_T}$with_widec" >&6 - if test "x$with_widec" = xyes ; then - if test "x$disable_lib_suffixes" = xno ; then -@@ -9240,14 +9242,14 @@ - #define NCURSES_WIDECHAR 1 - EOF - --echo "$as_me:9243: checking if wchar.h can be used as is" >&5 -+echo "$as_me:9245: checking if wchar.h can be used as is" >&5 - echo $ECHO_N "checking if wchar.h can be used as is... $ECHO_C" >&6 - if test "${cf_cv_wchar_h_okay+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 9250 "configure" -+#line 9252 "configure" - #include "confdefs.h" - - #include -@@ -9264,16 +9266,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:9267: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:9269: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:9270: \$? = $ac_status" >&5 -+ echo "$as_me:9272: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:9273: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9275: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9276: \$? = $ac_status" >&5 -+ echo "$as_me:9278: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_wchar_h_okay=yes - else -@@ -9283,16 +9285,16 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:9286: result: $cf_cv_wchar_h_okay" >&5 -+echo "$as_me:9288: result: $cf_cv_wchar_h_okay" >&5 - echo "${ECHO_T}$cf_cv_wchar_h_okay" >&6 - - if test $cf_cv_wchar_h_okay = no - then - --echo "$as_me:9292: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 -+echo "$as_me:9294: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 - echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line 9295 "configure" -+#line 9297 "configure" - #include "confdefs.h" - #include - -@@ -9308,16 +9310,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:9311: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:9313: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:9314: \$? = $ac_status" >&5 -+ echo "$as_me:9316: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:9317: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9319: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9320: \$? = $ac_status" >&5 -+ echo "$as_me:9322: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_result=no - else -@@ -9326,16 +9328,16 @@ - cf_result=yes - fi - rm -f conftest.$ac_objext conftest.$ac_ext --echo "$as_me:9329: result: $cf_result" >&5 -+echo "$as_me:9331: result: $cf_result" >&5 - echo "${ECHO_T}$cf_result" >&6 - - if test "$cf_result" = yes ; then - CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" - elif test "x" != "x" ; then -- echo "$as_me:9335: checking checking for compatible value versus " >&5 -+ echo "$as_me:9337: checking checking for compatible value versus " >&5 - echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line 9338 "configure" -+#line 9340 "configure" - #include "confdefs.h" - #include - -@@ -9351,16 +9353,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:9354: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:9356: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:9357: \$? = $ac_status" >&5 -+ echo "$as_me:9359: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:9360: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9362: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9363: \$? = $ac_status" >&5 -+ echo "$as_me:9365: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_result=yes - else -@@ -9369,7 +9371,7 @@ - cf_result=no - fi - rm -f conftest.$ac_objext conftest.$ac_ext -- echo "$as_me:9372: result: $cf_result" >&5 -+ echo "$as_me:9374: result: $cf_result" >&5 - echo "${ECHO_T}$cf_result" >&6 - if test "$cf_result" = no ; then - # perhaps we can override it - try... -@@ -9385,13 +9387,13 @@ - for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs - do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --echo "$as_me:9388: checking for $ac_func" >&5 -+echo "$as_me:9390: 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 9394 "configure" -+#line 9396 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -@@ -9422,16 +9424,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:9425: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:9427: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:9428: \$? = $ac_status" >&5 -+ echo "$as_me:9430: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:9431: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9433: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9434: \$? = $ac_status" >&5 -+ echo "$as_me:9436: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" - else -@@ -9441,7 +9443,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:9444: result: `eval echo '${'$as_ac_var'}'`" >&5 -+echo "$as_me:9446: 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 <&5 -+echo "$as_me:9458: 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 -@@ -9461,7 +9463,7 @@ - - cf_save_LIBS="$LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 9464 "configure" -+#line 9466 "configure" - #include "confdefs.h" - - #include -@@ -9474,16 +9476,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:9477: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:9479: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:9480: \$? = $ac_status" >&5 -+ echo "$as_me:9482: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:9483: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9485: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9486: \$? = $ac_status" >&5 -+ echo "$as_me:9488: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_utf8_lib=yes - else -@@ -9495,12 +9497,12 @@ - cf_cv_header_path_utf8= - cf_cv_library_path_utf8= - --echo "${as_me:-configure}:9498: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 -+echo "${as_me:-configure}:9500: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 - - cf_save_LIBS="$LIBS" - - cat >conftest.$ac_ext <<_ACEOF --#line 9503 "configure" -+#line 9505 "configure" - #include "confdefs.h" - - #include -@@ -9513,16 +9515,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:9516: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:9518: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:9519: \$? = $ac_status" >&5 -+ echo "$as_me:9521: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:9522: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9524: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9525: \$? = $ac_status" >&5 -+ echo "$as_me:9527: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - cf_cv_find_linkage_utf8=yes -@@ -9536,7 +9538,7 @@ - LIBS="-lutf8 $cf_save_LIBS" - - cat >conftest.$ac_ext <<_ACEOF --#line 9539 "configure" -+#line 9541 "configure" - #include "confdefs.h" - - #include -@@ -9549,16 +9551,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:9552: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:9554: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:9555: \$? = $ac_status" >&5 -+ echo "$as_me:9557: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:9558: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9560: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9561: \$? = $ac_status" >&5 -+ echo "$as_me:9563: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - cf_cv_find_linkage_utf8=yes -@@ -9575,9 +9577,9 @@ - - test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 - --echo "${as_me:-configure}:9578: testing find linkage for utf8 library ..." 1>&5 -+echo "${as_me:-configure}:9580: testing find linkage for utf8 library ..." 1>&5 - --echo "${as_me:-configure}:9580: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 -+echo "${as_me:-configure}:9582: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 - - cf_save_CPPFLAGS="$CPPFLAGS" - cf_test_CPPFLAGS="$CPPFLAGS" -@@ -9668,11 +9670,11 @@ - 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}:9671: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 -+echo "${as_me:-configure}:9673: 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 9675 "configure" -+#line 9677 "configure" - #include "confdefs.h" - - #include -@@ -9685,21 +9687,21 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:9688: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:9690: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:9691: \$? = $ac_status" >&5 -+ echo "$as_me:9693: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:9694: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9696: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9697: \$? = $ac_status" >&5 -+ echo "$as_me:9699: \$? = $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}:9702: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 -+echo "${as_me:-configure}:9704: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 - - cf_cv_find_linkage_utf8=maybe - cf_test_CPPFLAGS="$CPPFLAGS" -@@ -9717,7 +9719,7 @@ - - if test "$cf_cv_find_linkage_utf8" = maybe ; then - --echo "${as_me:-configure}:9720: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 -+echo "${as_me:-configure}:9722: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 - - cf_save_LIBS="$LIBS" - cf_save_LDFLAGS="$LDFLAGS" -@@ -9792,13 +9794,13 @@ - 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}:9795: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 -+echo "${as_me:-configure}:9797: 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 9801 "configure" -+#line 9803 "configure" - #include "confdefs.h" - - #include -@@ -9811,21 +9813,21 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:9814: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:9816: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:9817: \$? = $ac_status" >&5 -+ echo "$as_me:9819: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:9820: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9822: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9823: \$? = $ac_status" >&5 -+ echo "$as_me:9825: \$? = $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}:9828: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 -+echo "${as_me:-configure}:9830: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 - - cf_cv_find_linkage_utf8=yes - cf_cv_library_file_utf8="-lutf8" -@@ -9867,7 +9869,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:9870: result: $cf_cv_utf8_lib" >&5 -+echo "$as_me:9872: 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 -@@ -9902,7 +9904,7 @@ - cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF --#line 9905 "configure" -+#line 9907 "configure" - #include "confdefs.h" - #include - int -@@ -9914,16 +9916,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:9917: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:9919: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:9920: \$? = $ac_status" >&5 -+ echo "$as_me:9922: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:9923: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9925: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9926: \$? = $ac_status" >&5 -+ echo "$as_me:9928: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -9940,7 +9942,7 @@ - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - --echo "${as_me:-configure}:9943: testing adding $cf_add_incdir to include-path ..." 1>&5 -+echo "${as_me:-configure}:9945: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - -@@ -9976,7 +9978,7 @@ - if test "$cf_have_libdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 - --echo "${as_me:-configure}:9979: testing adding $cf_add_libdir to library-path ..." 1>&5 -+echo "${as_me:-configure}:9981: testing adding $cf_add_libdir to library-path ..." 1>&5 - - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi -@@ -10008,14 +10010,14 @@ - fi - - # This is needed on Tru64 5.0 to declare mbstate_t --echo "$as_me:10011: checking if we must include wchar.h to declare mbstate_t" >&5 -+echo "$as_me:10013: 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_mbstate_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 10018 "configure" -+#line 10020 "configure" - #include "confdefs.h" - - #include -@@ -10033,23 +10035,23 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10036: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10038: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10039: \$? = $ac_status" >&5 -+ echo "$as_me:10041: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10042: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10044: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10045: \$? = $ac_status" >&5 -+ echo "$as_me:10047: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_mbstate_t=no - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF --#line 10052 "configure" -+#line 10054 "configure" - #include "confdefs.h" - - #include -@@ -10068,16 +10070,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10071: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10073: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10074: \$? = $ac_status" >&5 -+ echo "$as_me:10076: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10077: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10079: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10080: \$? = $ac_status" >&5 -+ echo "$as_me:10082: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_mbstate_t=yes - else -@@ -10089,7 +10091,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:10092: result: $cf_cv_mbstate_t" >&5 -+echo "$as_me:10094: result: $cf_cv_mbstate_t" >&5 - echo "${ECHO_T}$cf_cv_mbstate_t" >&6 - - if test "$cf_cv_mbstate_t" = yes ; then -@@ -10107,14 +10109,14 @@ - fi - - # This is needed on Tru64 5.0 to declare wchar_t --echo "$as_me:10110: checking if we must include wchar.h to declare wchar_t" >&5 -+echo "$as_me:10112: checking if we must include wchar.h to declare wchar_t" >&5 - echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6 - if test "${cf_cv_wchar_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 10117 "configure" -+#line 10119 "configure" - #include "confdefs.h" - - #include -@@ -10132,23 +10134,23 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10135: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10137: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10138: \$? = $ac_status" >&5 -+ echo "$as_me:10140: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10141: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10143: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10144: \$? = $ac_status" >&5 -+ echo "$as_me:10146: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_wchar_t=no - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF --#line 10151 "configure" -+#line 10153 "configure" - #include "confdefs.h" - - #include -@@ -10167,16 +10169,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10170: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10172: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10173: \$? = $ac_status" >&5 -+ echo "$as_me:10175: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10176: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10178: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10179: \$? = $ac_status" >&5 -+ echo "$as_me:10181: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_wchar_t=yes - else -@@ -10188,7 +10190,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:10191: result: $cf_cv_wchar_t" >&5 -+echo "$as_me:10193: result: $cf_cv_wchar_t" >&5 - echo "${ECHO_T}$cf_cv_wchar_t" >&6 - - if test "$cf_cv_wchar_t" = yes ; then -@@ -10211,14 +10213,14 @@ - fi - - # This is needed on Tru64 5.0 to declare wint_t --echo "$as_me:10214: checking if we must include wchar.h to declare wint_t" >&5 -+echo "$as_me:10216: checking if we must include wchar.h to declare wint_t" >&5 - echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6 - if test "${cf_cv_wint_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 10221 "configure" -+#line 10223 "configure" - #include "confdefs.h" - - #include -@@ -10236,23 +10238,23 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10239: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10241: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10242: \$? = $ac_status" >&5 -+ echo "$as_me:10244: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10245: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10247: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10248: \$? = $ac_status" >&5 -+ echo "$as_me:10250: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_wint_t=no - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF --#line 10255 "configure" -+#line 10257 "configure" - #include "confdefs.h" - - #include -@@ -10271,16 +10273,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10274: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10276: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10277: \$? = $ac_status" >&5 -+ echo "$as_me:10279: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10280: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10282: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10283: \$? = $ac_status" >&5 -+ echo "$as_me:10285: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_wint_t=yes - else -@@ -10292,7 +10294,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:10295: result: $cf_cv_wint_t" >&5 -+echo "$as_me:10297: result: $cf_cv_wint_t" >&5 - echo "${ECHO_T}$cf_cv_wint_t" >&6 - - if test "$cf_cv_wint_t" = yes ; then -@@ -10324,7 +10326,7 @@ - fi - - ### use option --disable-lp64 to allow long chtype --echo "$as_me:10327: checking whether to enable _LP64 definition in curses.h" >&5 -+echo "$as_me:10329: checking whether to enable _LP64 definition in curses.h" >&5 - echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6 - - # Check whether --enable-lp64 or --disable-lp64 was given. -@@ -10334,7 +10336,7 @@ - else - with_lp64=$cf_dft_with_lp64 - fi; --echo "$as_me:10337: result: $with_lp64" >&5 -+echo "$as_me:10339: result: $with_lp64" >&5 - echo "${ECHO_T}$with_lp64" >&6 - - if test "x$with_lp64" = xyes ; then -@@ -10350,7 +10352,7 @@ - fi; - if test "$enable_largefile" != no; then - -- echo "$as_me:10353: checking for special C compiler options needed for large files" >&5 -+ echo "$as_me:10355: 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 -@@ -10362,7 +10364,7 @@ - # 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 10365 "configure" -+#line 10367 "configure" - #include "confdefs.h" - #include - /* Check that off_t can represent 2**63 - 1 correctly. -@@ -10382,16 +10384,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10385: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10387: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10388: \$? = $ac_status" >&5 -+ echo "$as_me:10390: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10391: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10393: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10394: \$? = $ac_status" >&5 -+ echo "$as_me:10396: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break - else -@@ -10401,16 +10403,16 @@ - rm -f conftest.$ac_objext - CC="$CC -n32" - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10404: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10406: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10407: \$? = $ac_status" >&5 -+ echo "$as_me:10409: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10410: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10412: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10413: \$? = $ac_status" >&5 -+ echo "$as_me:10415: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sys_largefile_CC=' -n32'; break - else -@@ -10424,13 +10426,13 @@ - rm -f conftest.$ac_ext - fi - fi --echo "$as_me:10427: result: $ac_cv_sys_largefile_CC" >&5 -+echo "$as_me:10429: 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:10433: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -+ echo "$as_me:10435: 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 -@@ -10438,7 +10440,7 @@ - while :; do - ac_cv_sys_file_offset_bits=no - cat >conftest.$ac_ext <<_ACEOF --#line 10441 "configure" -+#line 10443 "configure" - #include "confdefs.h" - #include - /* Check that off_t can represent 2**63 - 1 correctly. -@@ -10458,16 +10460,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10461: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10463: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10464: \$? = $ac_status" >&5 -+ echo "$as_me:10466: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10467: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10469: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10470: \$? = $ac_status" >&5 -+ echo "$as_me:10472: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break - else -@@ -10476,7 +10478,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF --#line 10479 "configure" -+#line 10481 "configure" - #include "confdefs.h" - #define _FILE_OFFSET_BITS 64 - #include -@@ -10497,16 +10499,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10500: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10502: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10503: \$? = $ac_status" >&5 -+ echo "$as_me:10505: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10506: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10508: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10509: \$? = $ac_status" >&5 -+ echo "$as_me:10511: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sys_file_offset_bits=64; break - else -@@ -10517,7 +10519,7 @@ - break - done - fi --echo "$as_me:10520: result: $ac_cv_sys_file_offset_bits" >&5 -+echo "$as_me:10522: 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 - -@@ -10527,7 +10529,7 @@ - - fi - rm -rf conftest* -- echo "$as_me:10530: checking for _LARGE_FILES value needed for large files" >&5 -+ echo "$as_me:10532: 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 -@@ -10535,7 +10537,7 @@ - while :; do - ac_cv_sys_large_files=no - cat >conftest.$ac_ext <<_ACEOF --#line 10538 "configure" -+#line 10540 "configure" - #include "confdefs.h" - #include - /* Check that off_t can represent 2**63 - 1 correctly. -@@ -10555,16 +10557,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10558: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10560: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10561: \$? = $ac_status" >&5 -+ echo "$as_me:10563: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10564: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10566: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10567: \$? = $ac_status" >&5 -+ echo "$as_me:10569: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break - else -@@ -10573,7 +10575,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF --#line 10576 "configure" -+#line 10578 "configure" - #include "confdefs.h" - #define _LARGE_FILES 1 - #include -@@ -10594,16 +10596,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10597: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10599: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10600: \$? = $ac_status" >&5 -+ echo "$as_me:10602: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10603: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10605: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10606: \$? = $ac_status" >&5 -+ echo "$as_me:10608: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sys_large_files=1; break - else -@@ -10614,7 +10616,7 @@ - break - done - fi --echo "$as_me:10617: result: $ac_cv_sys_large_files" >&5 -+echo "$as_me:10619: 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 - -@@ -10627,7 +10629,7 @@ - fi - - if test "$enable_largefile" != no ; then -- echo "$as_me:10630: checking for _LARGEFILE_SOURCE value needed for large files" >&5 -+ echo "$as_me:10632: 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 -@@ -10635,7 +10637,7 @@ - while :; do - ac_cv_sys_largefile_source=no - cat >conftest.$ac_ext <<_ACEOF --#line 10638 "configure" -+#line 10640 "configure" - #include "confdefs.h" - #include - int -@@ -10647,16 +10649,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10650: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10652: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10653: \$? = $ac_status" >&5 -+ echo "$as_me:10655: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10656: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10658: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10659: \$? = $ac_status" >&5 -+ echo "$as_me:10661: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break - else -@@ -10665,7 +10667,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF --#line 10668 "configure" -+#line 10670 "configure" - #include "confdefs.h" - #define _LARGEFILE_SOURCE 1 - #include -@@ -10678,16 +10680,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10681: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10683: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10684: \$? = $ac_status" >&5 -+ echo "$as_me:10686: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10687: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10689: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10690: \$? = $ac_status" >&5 -+ echo "$as_me:10692: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sys_largefile_source=1; break - else -@@ -10698,7 +10700,7 @@ - break - done - fi --echo "$as_me:10701: result: $ac_cv_sys_largefile_source" >&5 -+echo "$as_me:10703: 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 - -@@ -10712,13 +10714,13 @@ - # 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:10715: checking for fseeko" >&5 -+echo "$as_me:10717: 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 10721 "configure" -+#line 10723 "configure" - #include "confdefs.h" - #include - int -@@ -10730,16 +10732,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:10733: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:10735: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:10736: \$? = $ac_status" >&5 -+ echo "$as_me:10738: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:10739: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10741: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10742: \$? = $ac_status" >&5 -+ echo "$as_me:10744: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_fseeko=yes - else -@@ -10749,7 +10751,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:10752: result: $ac_cv_func_fseeko" >&5 -+echo "$as_me:10754: result: $ac_cv_func_fseeko" >&5 - echo "${ECHO_T}$ac_cv_func_fseeko" >&6 - if test $ac_cv_func_fseeko = yes; then - -@@ -10770,14 +10772,14 @@ - 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:10773: checking whether to use struct dirent64" >&5 -+ echo "$as_me:10775: 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 10780 "configure" -+#line 10782 "configure" - #include "confdefs.h" - - #include -@@ -10798,16 +10800,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10801: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10803: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10804: \$? = $ac_status" >&5 -+ echo "$as_me:10806: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10807: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10809: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10810: \$? = $ac_status" >&5 -+ echo "$as_me:10812: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_struct_dirent64=yes - else -@@ -10818,7 +10820,7 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - - fi --echo "$as_me:10821: result: $cf_cv_struct_dirent64" >&5 -+echo "$as_me:10823: result: $cf_cv_struct_dirent64" >&5 - echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 - test "$cf_cv_struct_dirent64" = yes && - cat >>confdefs.h <<\EOF -@@ -10828,7 +10830,7 @@ - fi - - ### use option --disable-tparm-varargs to make tparm() conform to X/Open --echo "$as_me:10831: checking if you want tparm not to use X/Open fixed-parameter list" >&5 -+echo "$as_me:10833: checking if you want tparm not to use X/Open fixed-parameter list" >&5 - echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6 - - # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given. -@@ -10838,14 +10840,14 @@ - else - with_tparm_varargs=yes - fi; --echo "$as_me:10841: result: $with_tparm_varargs" >&5 -+echo "$as_me:10843: result: $with_tparm_varargs" >&5 - echo "${ECHO_T}$with_tparm_varargs" >&6 - NCURSES_TPARM_VARARGS=0 - test "x$with_tparm_varargs" = xyes && NCURSES_TPARM_VARARGS=1 - - ### use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw - if test "$with_ticlib" != no ; then --echo "$as_me:10848: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 -+echo "$as_me:10850: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 - echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6 - - # Check whether --enable-tic-depends or --disable-tic-depends was given. -@@ -10855,14 +10857,14 @@ - else - with_tic_depends=yes - fi; --echo "$as_me:10858: result: $with_tic_depends" >&5 -+echo "$as_me:10860: result: $with_tic_depends" >&5 - echo "${ECHO_T}$with_tic_depends" >&6 - else - with_tic_depends=no - fi - - ### use option --with-bool to override bool's type --echo "$as_me:10865: checking for type of bool" >&5 -+echo "$as_me:10867: checking for type of bool" >&5 - echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 - - # Check whether --with-bool or --without-bool was given. -@@ -10872,10 +10874,10 @@ - else - NCURSES_BOOL=auto - fi; --echo "$as_me:10875: result: $NCURSES_BOOL" >&5 -+echo "$as_me:10877: result: $NCURSES_BOOL" >&5 - echo "${ECHO_T}$NCURSES_BOOL" >&6 - --echo "$as_me:10878: checking for alternate terminal capabilities file" >&5 -+echo "$as_me:10880: checking for alternate terminal capabilities file" >&5 - echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6 - - # Check whether --with-caps or --without-caps was given. -@@ -10886,11 +10888,11 @@ - TERMINFO_CAPS=Caps - fi; - test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps --echo "$as_me:10889: result: $TERMINFO_CAPS" >&5 -+echo "$as_me:10891: result: $TERMINFO_CAPS" >&5 - echo "${ECHO_T}$TERMINFO_CAPS" >&6 - - ### use option --with-chtype to override chtype's type --echo "$as_me:10893: checking for type of chtype" >&5 -+echo "$as_me:10895: checking for type of chtype" >&5 - echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 - - # Check whether --with-chtype or --without-chtype was given. -@@ -10900,11 +10902,11 @@ - else - NCURSES_CHTYPE=$cf_dft_chtype - fi; --echo "$as_me:10903: result: $NCURSES_CHTYPE" >&5 -+echo "$as_me:10905: result: $NCURSES_CHTYPE" >&5 - echo "${ECHO_T}$NCURSES_CHTYPE" >&6 - - ### use option --with-ospeed to override ospeed's type --echo "$as_me:10907: checking for type of ospeed" >&5 -+echo "$as_me:10909: checking for type of ospeed" >&5 - echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6 - - # Check whether --with-ospeed or --without-ospeed was given. -@@ -10914,11 +10916,11 @@ - else - NCURSES_OSPEED=short - fi; --echo "$as_me:10917: result: $NCURSES_OSPEED" >&5 -+echo "$as_me:10919: result: $NCURSES_OSPEED" >&5 - echo "${ECHO_T}$NCURSES_OSPEED" >&6 - - ### use option --with-mmask-t to override mmask_t's type --echo "$as_me:10921: checking for type of mmask_t" >&5 -+echo "$as_me:10923: checking for type of mmask_t" >&5 - echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6 - - # Check whether --with-mmask-t or --without-mmask-t was given. -@@ -10928,11 +10930,11 @@ - else - NCURSES_MMASK_T=$cf_dft_mmask_t - fi; --echo "$as_me:10931: result: $NCURSES_MMASK_T" >&5 -+echo "$as_me:10933: result: $NCURSES_MMASK_T" >&5 - echo "${ECHO_T}$NCURSES_MMASK_T" >&6 - - ### use option --with-ccharw-max to override CCHARW_MAX size --echo "$as_me:10935: checking for size CCHARW_MAX" >&5 -+echo "$as_me:10937: checking for size CCHARW_MAX" >&5 - echo $ECHO_N "checking for size CCHARW_MAX... $ECHO_C" >&6 - - # Check whether --with-ccharw-max or --without-ccharw-max was given. -@@ -10942,11 +10944,11 @@ - else - NCURSES_CCHARW_MAX=5 - fi; --echo "$as_me:10945: result: $NCURSES_CCHARW_MAX" >&5 -+echo "$as_me:10947: result: $NCURSES_CCHARW_MAX" >&5 - echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6 - - ### use option --with-tparm-arg to override tparm's argument type --echo "$as_me:10949: checking for type of tparm args" >&5 -+echo "$as_me:10951: checking for type of tparm args" >&5 - echo $ECHO_N "checking for type of tparm args... $ECHO_C" >&6 - - # Check whether --with-tparm-arg or --without-tparm-arg was given. -@@ -10956,11 +10958,11 @@ - else - NCURSES_TPARM_ARG=$cf_dft_tparm_arg - fi; --echo "$as_me:10959: result: $NCURSES_TPARM_ARG" >&5 -+echo "$as_me:10961: result: $NCURSES_TPARM_ARG" >&5 - echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6 - - ### Enable compiling-in rcs id's --echo "$as_me:10963: checking if RCS identifiers should be compiled-in" >&5 -+echo "$as_me:10965: checking if RCS identifiers should be compiled-in" >&5 - echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6 - - # Check whether --with-rcs-ids or --without-rcs-ids was given. -@@ -10970,7 +10972,7 @@ - else - with_rcs_ids=no - fi; --echo "$as_me:10973: result: $with_rcs_ids" >&5 -+echo "$as_me:10975: result: $with_rcs_ids" >&5 - echo "${ECHO_T}$with_rcs_ids" >&6 - test "x$with_rcs_ids" = xyes && - cat >>confdefs.h <<\EOF -@@ -10979,7 +10981,7 @@ - - ############################################################################### - --echo "$as_me:10982: checking format of man-pages" >&5 -+echo "$as_me:10984: checking format of man-pages" >&5 - echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6 - - # Check whether --with-manpage-format or --without-manpage-format was given. -@@ -11068,14 +11070,14 @@ - ;; - esac - --echo "$as_me:11071: result: $MANPAGE_FORMAT" >&5 -+echo "$as_me:11073: result: $MANPAGE_FORMAT" >&5 - echo "${ECHO_T}$MANPAGE_FORMAT" >&6 - if test -n "$cf_unknown" ; then -- { echo "$as_me:11074: WARNING: Unexpected manpage-format $cf_unknown" >&5 -+ { echo "$as_me:11076: WARNING: Unexpected manpage-format $cf_unknown" >&5 - echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;} - fi - --echo "$as_me:11078: checking for manpage renaming" >&5 -+echo "$as_me:11080: checking for manpage renaming" >&5 - echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6 - - # Check whether --with-manpage-renames or --without-manpage-renames was given. -@@ -11103,7 +11105,7 @@ - if test -f $srcdir/man/$MANPAGE_RENAMES ; then - MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES - elif test ! -f $MANPAGE_RENAMES ; then -- { { echo "$as_me:11106: error: not a filename: $MANPAGE_RENAMES" >&5 -+ { { echo "$as_me:11108: error: not a filename: $MANPAGE_RENAMES" >&5 - echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;} - { (exit 1); exit 1; }; } - fi -@@ -11117,10 +11119,10 @@ - fi - fi - --echo "$as_me:11120: result: $MANPAGE_RENAMES" >&5 -+echo "$as_me:11122: result: $MANPAGE_RENAMES" >&5 - echo "${ECHO_T}$MANPAGE_RENAMES" >&6 - --echo "$as_me:11123: checking if manpage aliases will be installed" >&5 -+echo "$as_me:11125: checking if manpage aliases will be installed" >&5 - echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6 - - # Check whether --with-manpage-aliases or --without-manpage-aliases was given. -@@ -11131,7 +11133,7 @@ - MANPAGE_ALIASES=yes - fi; - --echo "$as_me:11134: result: $MANPAGE_ALIASES" >&5 -+echo "$as_me:11136: result: $MANPAGE_ALIASES" >&5 - echo "${ECHO_T}$MANPAGE_ALIASES" >&6 - - case "x$LN_S" in -@@ -11145,7 +11147,7 @@ - - MANPAGE_SYMLINKS=no - if test "$MANPAGE_ALIASES" = yes ; then --echo "$as_me:11148: checking if manpage symlinks should be used" >&5 -+echo "$as_me:11150: checking if manpage symlinks should be used" >&5 - echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6 - - # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given. -@@ -11158,17 +11160,17 @@ - - if test "$$cf_use_symlinks" = no; then - if test "$MANPAGE_SYMLINKS" = yes ; then -- { echo "$as_me:11161: WARNING: cannot make symlinks" >&5 -+ { echo "$as_me:11163: WARNING: cannot make symlinks" >&5 - echo "$as_me: WARNING: cannot make symlinks" >&2;} - MANPAGE_SYMLINKS=no - fi - fi - --echo "$as_me:11167: result: $MANPAGE_SYMLINKS" >&5 -+echo "$as_me:11169: result: $MANPAGE_SYMLINKS" >&5 - echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6 - fi - --echo "$as_me:11171: checking for manpage tbl" >&5 -+echo "$as_me:11173: checking for manpage tbl" >&5 - echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6 - - # Check whether --with-manpage-tbl or --without-manpage-tbl was given. -@@ -11179,7 +11181,7 @@ - MANPAGE_TBL=no - fi; - --echo "$as_me:11182: result: $MANPAGE_TBL" >&5 -+echo "$as_me:11184: result: $MANPAGE_TBL" >&5 - echo "${ECHO_T}$MANPAGE_TBL" >&6 - - if test "$prefix" = "NONE" ; then -@@ -11512,7 +11514,7 @@ - ############################################################################### - - ### Note that some functions (such as const) are normally disabled anyway. --echo "$as_me:11515: checking if you want to build with function extensions" >&5 -+echo "$as_me:11517: checking if you want to build with function extensions" >&5 - echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6 - - # Check whether --enable-ext-funcs or --disable-ext-funcs was given. -@@ -11522,7 +11524,7 @@ - else - with_ext_funcs=yes - fi; --echo "$as_me:11525: result: $with_ext_funcs" >&5 -+echo "$as_me:11527: result: $with_ext_funcs" >&5 - echo "${ECHO_T}$with_ext_funcs" >&6 - if test "x$with_ext_funcs" = xyes ; then - NCURSES_EXT_FUNCS=1 -@@ -11577,7 +11579,7 @@ - GENERATED_EXT_FUNCS= - fi - --echo "$as_me:11580: checking if you want to build with SCREEN extensions" >&5 -+echo "$as_me:11582: checking if you want to build with SCREEN extensions" >&5 - echo $ECHO_N "checking if you want to build with SCREEN extensions... $ECHO_C" >&6 - - # Check whether --enable-sp-funcs or --disable-sp-funcs was given. -@@ -11587,7 +11589,7 @@ - else - with_sp_funcs=$cf_dft_ext_spfuncs - fi; --echo "$as_me:11590: result: $with_sp_funcs" >&5 -+echo "$as_me:11592: result: $with_sp_funcs" >&5 - echo "${ECHO_T}$with_sp_funcs" >&6 - if test "x$with_sp_funcs" = xyes ; then - NCURSES_SP_FUNCS=1 -@@ -11602,7 +11604,7 @@ - GENERATED_SP_FUNCS= - fi - --echo "$as_me:11605: checking if you want to build with terminal-driver" >&5 -+echo "$as_me:11607: checking if you want to build with terminal-driver" >&5 - echo $ECHO_N "checking if you want to build with terminal-driver... $ECHO_C" >&6 - - # Check whether --enable-term-driver or --disable-term-driver was given. -@@ -11612,7 +11614,7 @@ - else - with_term_driver=no - fi; --echo "$as_me:11615: result: $with_term_driver" >&5 -+echo "$as_me:11617: result: $with_term_driver" >&5 - echo "${ECHO_T}$with_term_driver" >&6 - if test "x$with_term_driver" = xyes ; then - -@@ -11621,19 +11623,19 @@ - EOF - - if test "x$with_termlib" != xno ; then -- { { echo "$as_me:11624: error: The term-driver option conflicts with the termlib option" >&5 -+ { { echo "$as_me:11626: error: The term-driver option conflicts with the termlib option" >&5 - echo "$as_me: error: The term-driver option conflicts with the termlib option" >&2;} - { (exit 1); exit 1; }; } - fi - if test "x$with_sp_funcs" != xyes ; then -- { { echo "$as_me:11629: error: The term-driver option relies upon sp-funcs" >&5 -+ { { echo "$as_me:11631: error: The term-driver option relies upon sp-funcs" >&5 - echo "$as_me: error: The term-driver option relies upon sp-funcs" >&2;} - { (exit 1); exit 1; }; } - fi - fi - - ### use option --enable-const to turn on use of const beyond that in XSI. --echo "$as_me:11636: checking for extended use of const keyword" >&5 -+echo "$as_me:11638: checking for extended use of const keyword" >&5 - echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6 - - # Check whether --enable-const or --disable-const was given. -@@ -11643,7 +11645,7 @@ - else - with_ext_const=$cf_dft_ext_const - fi; --echo "$as_me:11646: result: $with_ext_const" >&5 -+echo "$as_me:11648: result: $with_ext_const" >&5 - echo "${ECHO_T}$with_ext_const" >&6 - NCURSES_CONST='/*nothing*/' - if test "x$with_ext_const" = xyes ; then -@@ -11651,7 +11653,7 @@ - fi - - ### use option --enable-ext-colors to turn on use of colors beyond 16. --echo "$as_me:11654: checking if you want to use extended colors" >&5 -+echo "$as_me:11656: checking if you want to use extended colors" >&5 - echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6 - - # Check whether --enable-ext-colors or --disable-ext-colors was given. -@@ -11661,12 +11663,12 @@ - else - with_ext_colors=$cf_dft_ext_colors - fi; --echo "$as_me:11664: result: $with_ext_colors" >&5 -+echo "$as_me:11666: result: $with_ext_colors" >&5 - echo "${ECHO_T}$with_ext_colors" >&6 - NCURSES_EXT_COLORS=0 - if test "x$with_ext_colors" = xyes ; then - if test "x$with_widec" != xyes ; then -- { echo "$as_me:11669: WARNING: This option applies only to wide-character library" >&5 -+ { echo "$as_me:11671: WARNING: This option applies only to wide-character library" >&5 - echo "$as_me: WARNING: This option applies only to wide-character library" >&2;} - else - # cannot be ABI 5 since it changes sizeof(cchar_t) -@@ -11676,7 +11678,7 @@ - (5.*) - cf_cv_rel_version=6.0 - cf_cv_abi_version=6 -- { echo "$as_me:11679: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 -+ { echo "$as_me:11681: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 - echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;} - ;; - esac -@@ -11692,7 +11694,7 @@ - fi - - ### use option --enable-ext-mouse to modify coding to support 5-button mice --echo "$as_me:11695: checking if you want to use extended mouse encoding" >&5 -+echo "$as_me:11697: checking if you want to use extended mouse encoding" >&5 - echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6 - - # Check whether --enable-ext-mouse or --disable-ext-mouse was given. -@@ -11702,7 +11704,7 @@ - else - with_ext_mouse=$cf_dft_ext_mouse - fi; --echo "$as_me:11705: result: $with_ext_mouse" >&5 -+echo "$as_me:11707: result: $with_ext_mouse" >&5 - echo "${ECHO_T}$with_ext_mouse" >&6 - NCURSES_MOUSE_VERSION=1 - if test "x$with_ext_mouse" = xyes ; then -@@ -11713,7 +11715,7 @@ - (5.*) - cf_cv_rel_version=6.0 - cf_cv_abi_version=6 -- { echo "$as_me:11716: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 -+ { echo "$as_me:11718: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 - echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;} - ;; - esac -@@ -11722,7 +11724,7 @@ - fi - - ### use option --enable-ext-putwin to turn on extended screendumps --echo "$as_me:11725: checking if you want to use extended putwin/screendump" >&5 -+echo "$as_me:11727: checking if you want to use extended putwin/screendump" >&5 - echo $ECHO_N "checking if you want to use extended putwin/screendump... $ECHO_C" >&6 - - # Check whether --enable-ext-putwin or --disable-ext-putwin was given. -@@ -11732,7 +11734,7 @@ - else - with_ext_putwin=$cf_dft_ext_putwin - fi; --echo "$as_me:11735: result: $with_ext_putwin" >&5 -+echo "$as_me:11737: result: $with_ext_putwin" >&5 - echo "${ECHO_T}$with_ext_putwin" >&6 - if test "x$with_ext_putwin" = xyes ; then - -@@ -11742,7 +11744,7 @@ - - fi - --echo "$as_me:11745: checking if you want \$NCURSES_NO_PADDING code" >&5 -+echo "$as_me:11747: checking if you want \$NCURSES_NO_PADDING code" >&5 - echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6 - - # Check whether --enable-no-padding or --disable-no-padding was given. -@@ -11752,20 +11754,20 @@ - else - with_no_padding=$with_ext_funcs - fi; --echo "$as_me:11755: result: $with_no_padding" >&5 -+echo "$as_me:11757: result: $with_no_padding" >&5 - echo "${ECHO_T}$with_no_padding" >&6 - test "x$with_no_padding" = xyes && - cat >>confdefs.h <<\EOF - #define NCURSES_NO_PADDING 1 - EOF - --echo "$as_me:11762: checking for ANSI C header files" >&5 -+echo "$as_me:11764: 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 11768 "configure" -+#line 11770 "configure" - #include "confdefs.h" - #include - #include -@@ -11773,13 +11775,13 @@ - #include - - _ACEOF --if { (eval echo "$as_me:11776: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:11778: \"$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:11782: \$? = $ac_status" >&5 -+ echo "$as_me:11784: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -11801,7 +11803,7 @@ - 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 11804 "configure" -+#line 11806 "configure" - #include "confdefs.h" - #include - -@@ -11819,7 +11821,7 @@ - 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 11822 "configure" -+#line 11824 "configure" - #include "confdefs.h" - #include - -@@ -11840,7 +11842,7 @@ - : - else - cat >conftest.$ac_ext <<_ACEOF --#line 11843 "configure" -+#line 11845 "configure" - #include "confdefs.h" - #include - #if ((' ' & 0x0FF) == 0x020) -@@ -11866,15 +11868,15 @@ - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:11869: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:11871: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:11872: \$? = $ac_status" >&5 -+ echo "$as_me:11874: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:11874: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:11876: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:11877: \$? = $ac_status" >&5 -+ echo "$as_me:11879: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -11887,7 +11889,7 @@ - fi - fi - fi --echo "$as_me:11890: result: $ac_cv_header_stdc" >&5 -+echo "$as_me:11892: result: $ac_cv_header_stdc" >&5 - echo "${ECHO_T}$ac_cv_header_stdc" >&6 - if test $ac_cv_header_stdc = yes; then - -@@ -11903,28 +11905,28 @@ - inttypes.h stdint.h unistd.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:11906: checking for $ac_header" >&5 -+echo "$as_me:11908: 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 11912 "configure" -+#line 11914 "configure" - #include "confdefs.h" - $ac_includes_default - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:11918: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:11920: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:11921: \$? = $ac_status" >&5 -+ echo "$as_me:11923: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:11924: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:11926: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:11927: \$? = $ac_status" >&5 -+ echo "$as_me:11929: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" - else -@@ -11934,7 +11936,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:11937: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "$as_me:11939: 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 <&5 -+echo "$as_me:11949: checking for signed char" >&5 - echo $ECHO_N "checking for signed char... $ECHO_C" >&6 - if test "${ac_cv_type_signed_char+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 11953 "configure" -+#line 11955 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -11965,16 +11967,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:11968: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:11970: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:11971: \$? = $ac_status" >&5 -+ echo "$as_me:11973: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:11974: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:11976: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:11977: \$? = $ac_status" >&5 -+ echo "$as_me:11979: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_signed_char=yes - else -@@ -11984,10 +11986,10 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:11987: result: $ac_cv_type_signed_char" >&5 -+echo "$as_me:11989: result: $ac_cv_type_signed_char" >&5 - echo "${ECHO_T}$ac_cv_type_signed_char" >&6 - --echo "$as_me:11990: checking size of signed char" >&5 -+echo "$as_me:11992: checking size of signed char" >&5 - echo $ECHO_N "checking size of signed char... $ECHO_C" >&6 - if test "${ac_cv_sizeof_signed_char+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -11996,7 +11998,7 @@ - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. - cat >conftest.$ac_ext <<_ACEOF --#line 11999 "configure" -+#line 12001 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -12008,21 +12010,21 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:12011: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:12013: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:12014: \$? = $ac_status" >&5 -+ echo "$as_me:12016: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:12017: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:12019: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:12020: \$? = $ac_status" >&5 -+ echo "$as_me:12022: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF --#line 12025 "configure" -+#line 12027 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -12034,16 +12036,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:12037: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:12039: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:12040: \$? = $ac_status" >&5 -+ echo "$as_me:12042: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:12043: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:12045: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:12046: \$? = $ac_status" >&5 -+ echo "$as_me:12048: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_hi=$ac_mid; break - else -@@ -12059,7 +12061,7 @@ - ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF --#line 12062 "configure" -+#line 12064 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -12071,16 +12073,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:12074: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:12076: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:12077: \$? = $ac_status" >&5 -+ echo "$as_me:12079: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:12080: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:12082: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:12083: \$? = $ac_status" >&5 -+ echo "$as_me:12085: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_lo=$ac_mid; break - else -@@ -12096,7 +12098,7 @@ - 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 12099 "configure" -+#line 12101 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -12108,16 +12110,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:12111: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:12113: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:12114: \$? = $ac_status" >&5 -+ echo "$as_me:12116: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:12117: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:12119: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:12120: \$? = $ac_status" >&5 -+ echo "$as_me:12122: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_hi=$ac_mid - else -@@ -12130,12 +12132,12 @@ - ac_cv_sizeof_signed_char=$ac_lo - else - if test "$cross_compiling" = yes; then -- { { echo "$as_me:12133: error: cannot run test program while cross compiling" >&5 -+ { { echo "$as_me:12135: 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 12138 "configure" -+#line 12140 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -12151,15 +12153,15 @@ - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:12154: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:12156: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:12157: \$? = $ac_status" >&5 -+ echo "$as_me:12159: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:12159: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:12161: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:12162: \$? = $ac_status" >&5 -+ echo "$as_me:12164: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_signed_char=`cat conftest.val` - else -@@ -12175,7 +12177,7 @@ - ac_cv_sizeof_signed_char=0 - fi - fi --echo "$as_me:12178: result: $ac_cv_sizeof_signed_char" >&5 -+echo "$as_me:12180: result: $ac_cv_sizeof_signed_char" >&5 - echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 - cat >>confdefs.h <&5 -+echo "$as_me:12191: checking if you want to use signed Boolean array in term.h" >&5 - echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6 - - # Check whether --enable-signed-char or --disable-signed-char was given. -@@ -12196,12 +12198,12 @@ - else - with_signed_char=no - fi; --echo "$as_me:12199: result: $with_signed_char" >&5 -+echo "$as_me:12201: result: $with_signed_char" >&5 - echo "${ECHO_T}$with_signed_char" >&6 - test "x$with_signed_char" != xyes && NCURSES_SBOOL="char" - - ### use option --enable-sigwinch to turn on use of SIGWINCH logic --echo "$as_me:12204: checking if you want SIGWINCH handler" >&5 -+echo "$as_me:12206: checking if you want SIGWINCH handler" >&5 - echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6 - - # Check whether --enable-sigwinch or --disable-sigwinch was given. -@@ -12211,7 +12213,7 @@ - else - with_sigwinch=$with_ext_funcs - fi; --echo "$as_me:12214: result: $with_sigwinch" >&5 -+echo "$as_me:12216: result: $with_sigwinch" >&5 - echo "${ECHO_T}$with_sigwinch" >&6 - test "x$with_sigwinch" = xyes && - cat >>confdefs.h <<\EOF -@@ -12219,7 +12221,7 @@ - EOF - - ### use option --enable-tcap-names to allow user to define new capabilities --echo "$as_me:12222: checking if you want user-definable terminal capabilities like termcap" >&5 -+echo "$as_me:12224: checking if you want user-definable terminal capabilities like termcap" >&5 - echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6 - - # Check whether --enable-tcap-names or --disable-tcap-names was given. -@@ -12229,7 +12231,7 @@ - else - with_tcap_names=$with_ext_funcs - fi; --echo "$as_me:12232: result: $with_tcap_names" >&5 -+echo "$as_me:12234: result: $with_tcap_names" >&5 - echo "${ECHO_T}$with_tcap_names" >&6 - NCURSES_XNAMES=0 - test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1 -@@ -12237,7 +12239,7 @@ - ############################################################################### - # These options are relatively safe to experiment with. - --echo "$as_me:12240: checking if you want all development code" >&5 -+echo "$as_me:12242: checking if you want all development code" >&5 - echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6 - - # Check whether --with-develop or --without-develop was given. -@@ -12247,11 +12249,11 @@ - else - with_develop=no - fi; --echo "$as_me:12250: result: $with_develop" >&5 -+echo "$as_me:12252: result: $with_develop" >&5 - echo "${ECHO_T}$with_develop" >&6 - - ### use option --enable-hard-tabs to turn on use of hard-tabs optimize --echo "$as_me:12254: checking if you want hard-tabs code" >&5 -+echo "$as_me:12256: checking if you want hard-tabs code" >&5 - echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6 - - # Check whether --enable-hard-tabs or --disable-hard-tabs was given. -@@ -12261,7 +12263,7 @@ - else - enable_hard_tabs=$with_develop - fi; --echo "$as_me:12264: result: $enable_hard_tabs" >&5 -+echo "$as_me:12266: result: $enable_hard_tabs" >&5 - echo "${ECHO_T}$enable_hard_tabs" >&6 - test "x$enable_hard_tabs" = xyes && - cat >>confdefs.h <<\EOF -@@ -12269,7 +12271,7 @@ - EOF - - ### use option --enable-xmc-glitch to turn on use of magic-cookie optimize --echo "$as_me:12272: checking if you want limited support for xmc" >&5 -+echo "$as_me:12274: checking if you want limited support for xmc" >&5 - echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6 - - # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given. -@@ -12279,7 +12281,7 @@ - else - enable_xmc_glitch=$with_develop - fi; --echo "$as_me:12282: result: $enable_xmc_glitch" >&5 -+echo "$as_me:12284: result: $enable_xmc_glitch" >&5 - echo "${ECHO_T}$enable_xmc_glitch" >&6 - test "x$enable_xmc_glitch" = xyes && - cat >>confdefs.h <<\EOF -@@ -12289,7 +12291,7 @@ - ############################################################################### - # These are just experimental, probably should not be in a package: - --echo "$as_me:12292: checking if you do not want to assume colors are white-on-black" >&5 -+echo "$as_me:12294: checking if you do not want to assume colors are white-on-black" >&5 - echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6 - - # Check whether --enable-assumed-color or --disable-assumed-color was given. -@@ -12299,7 +12301,7 @@ - else - with_assumed_color=yes - fi; --echo "$as_me:12302: result: $with_assumed_color" >&5 -+echo "$as_me:12304: result: $with_assumed_color" >&5 - echo "${ECHO_T}$with_assumed_color" >&6 - test "x$with_assumed_color" = xyes && - cat >>confdefs.h <<\EOF -@@ -12307,7 +12309,7 @@ - EOF - - ### use option --enable-hashmap to turn on use of hashmap scrolling logic --echo "$as_me:12310: checking if you want hashmap scrolling-optimization code" >&5 -+echo "$as_me:12312: checking if you want hashmap scrolling-optimization code" >&5 - echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6 - - # Check whether --enable-hashmap or --disable-hashmap was given. -@@ -12317,7 +12319,7 @@ - else - with_hashmap=yes - fi; --echo "$as_me:12320: result: $with_hashmap" >&5 -+echo "$as_me:12322: result: $with_hashmap" >&5 - echo "${ECHO_T}$with_hashmap" >&6 - test "x$with_hashmap" = xyes && - cat >>confdefs.h <<\EOF -@@ -12325,7 +12327,7 @@ - EOF - - ### use option --enable-colorfgbg to turn on use of $COLORFGBG environment --echo "$as_me:12328: checking if you want colorfgbg code" >&5 -+echo "$as_me:12330: checking if you want colorfgbg code" >&5 - echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6 - - # Check whether --enable-colorfgbg or --disable-colorfgbg was given. -@@ -12335,7 +12337,7 @@ - else - with_colorfgbg=no - fi; --echo "$as_me:12338: result: $with_colorfgbg" >&5 -+echo "$as_me:12340: result: $with_colorfgbg" >&5 - echo "${ECHO_T}$with_colorfgbg" >&6 - test "x$with_colorfgbg" = xyes && - cat >>confdefs.h <<\EOF -@@ -12343,7 +12345,7 @@ - EOF - - ### use option --enable-interop to turn on use of bindings used for interop --echo "$as_me:12346: checking if you want interop bindings" >&5 -+echo "$as_me:12348: checking if you want interop bindings" >&5 - echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6 - - # Check whether --enable-interop or --disable-interop was given. -@@ -12353,7 +12355,7 @@ - else - with_exp_interop=$cf_dft_interop - fi; --echo "$as_me:12356: result: $with_exp_interop" >&5 -+echo "$as_me:12358: result: $with_exp_interop" >&5 - echo "${ECHO_T}$with_exp_interop" >&6 - - NCURSES_INTEROP_FUNCS=0 -@@ -12362,7 +12364,7 @@ - # This is still experimental (20080329), but should ultimately be moved to - # the script-block --with-normal, etc. - --echo "$as_me:12365: checking if you want to link with the pthread library" >&5 -+echo "$as_me:12367: checking if you want to link with the pthread library" >&5 - echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6 - - # Check whether --with-pthread or --without-pthread was given. -@@ -12372,27 +12374,27 @@ - else - with_pthread=no - fi; --echo "$as_me:12375: result: $with_pthread" >&5 -+echo "$as_me:12377: result: $with_pthread" >&5 - echo "${ECHO_T}$with_pthread" >&6 - - if test "$with_pthread" != no ; then -- echo "$as_me:12379: checking for pthread.h" >&5 -+ echo "$as_me:12381: checking for pthread.h" >&5 - echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 - if test "${ac_cv_header_pthread_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 12385 "configure" -+#line 12387 "configure" - #include "confdefs.h" - #include - _ACEOF --if { (eval echo "$as_me:12389: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:12391: \"$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:12395: \$? = $ac_status" >&5 -+ echo "$as_me:12397: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -12411,7 +12413,7 @@ - fi - rm -f conftest.err conftest.$ac_ext - fi --echo "$as_me:12414: result: $ac_cv_header_pthread_h" >&5 -+echo "$as_me:12416: result: $ac_cv_header_pthread_h" >&5 - echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 - if test $ac_cv_header_pthread_h = yes; then - -@@ -12421,7 +12423,7 @@ - - for cf_lib_pthread in pthread c_r - do -- echo "$as_me:12424: checking if we can link with the $cf_lib_pthread library" >&5 -+ echo "$as_me:12426: checking if we can link with the $cf_lib_pthread library" >&5 - echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6 - cf_save_LIBS="$LIBS" - -@@ -12442,7 +12444,7 @@ - LIBS="$cf_add_libs" - - cat >conftest.$ac_ext <<_ACEOF --#line 12445 "configure" -+#line 12447 "configure" - #include "confdefs.h" - - #include -@@ -12459,16 +12461,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:12462: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:12464: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:12465: \$? = $ac_status" >&5 -+ echo "$as_me:12467: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:12468: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:12470: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:12471: \$? = $ac_status" >&5 -+ echo "$as_me:12473: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - with_pthread=yes - else -@@ -12478,7 +12480,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS="$cf_save_LIBS" -- echo "$as_me:12481: result: $with_pthread" >&5 -+ echo "$as_me:12483: result: $with_pthread" >&5 - echo "${ECHO_T}$with_pthread" >&6 - test "$with_pthread" = yes && break - done -@@ -12506,7 +12508,7 @@ - EOF - - else -- { { echo "$as_me:12509: error: Cannot link with pthread library" >&5 -+ { { echo "$as_me:12511: error: Cannot link with pthread library" >&5 - echo "$as_me: error: Cannot link with pthread library" >&2;} - { (exit 1); exit 1; }; } - fi -@@ -12516,13 +12518,13 @@ - fi - - if test "x$with_pthread" != xno; then -- echo "$as_me:12519: checking for pthread_kill" >&5 -+ echo "$as_me:12521: checking for pthread_kill" >&5 - echo $ECHO_N "checking for pthread_kill... $ECHO_C" >&6 - if test "${ac_cv_func_pthread_kill+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 12525 "configure" -+#line 12527 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char pthread_kill (); below. */ -@@ -12553,16 +12555,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:12556: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:12558: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:12559: \$? = $ac_status" >&5 -+ echo "$as_me:12561: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:12562: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:12564: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:12565: \$? = $ac_status" >&5 -+ echo "$as_me:12567: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_pthread_kill=yes - else -@@ -12572,11 +12574,11 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:12575: result: $ac_cv_func_pthread_kill" >&5 -+echo "$as_me:12577: result: $ac_cv_func_pthread_kill" >&5 - echo "${ECHO_T}$ac_cv_func_pthread_kill" >&6 - if test $ac_cv_func_pthread_kill = yes; then - -- echo "$as_me:12579: checking if you want to allow EINTR in wgetch with pthreads" >&5 -+ echo "$as_me:12581: checking if you want to allow EINTR in wgetch with pthreads" >&5 - echo $ECHO_N "checking if you want to allow EINTR in wgetch with pthreads... $ECHO_C" >&6 - - # Check whether --enable-pthreads-eintr or --disable-pthreads-eintr was given. -@@ -12586,7 +12588,7 @@ - else - use_pthreads_eintr=no - fi; -- echo "$as_me:12589: result: $use_pthreads_eintr" >&5 -+ echo "$as_me:12591: result: $use_pthreads_eintr" >&5 - echo "${ECHO_T}$use_pthreads_eintr" >&6 - if test "x$use_pthreads_eintr" = xyes ; then - -@@ -12597,7 +12599,7 @@ - fi - fi - -- echo "$as_me:12600: checking if you want to use weak-symbols for pthreads" >&5 -+ echo "$as_me:12602: checking if you want to use weak-symbols for pthreads" >&5 - echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6 - - # Check whether --enable-weak-symbols or --disable-weak-symbols was given. -@@ -12607,18 +12609,18 @@ - else - use_weak_symbols=no - fi; -- echo "$as_me:12610: result: $use_weak_symbols" >&5 -+ echo "$as_me:12612: result: $use_weak_symbols" >&5 - echo "${ECHO_T}$use_weak_symbols" >&6 - if test "x$use_weak_symbols" = xyes ; then - --echo "$as_me:12614: checking if $CC supports weak symbols" >&5 -+echo "$as_me:12616: checking if $CC supports weak symbols" >&5 - echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6 - if test "${cf_cv_weak_symbols+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 12621 "configure" -+#line 12623 "configure" - #include "confdefs.h" - - #include -@@ -12644,16 +12646,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:12647: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:12649: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:12650: \$? = $ac_status" >&5 -+ echo "$as_me:12652: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:12653: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:12655: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:12656: \$? = $ac_status" >&5 -+ echo "$as_me:12658: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_weak_symbols=yes - else -@@ -12664,7 +12666,7 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - - fi --echo "$as_me:12667: result: $cf_cv_weak_symbols" >&5 -+echo "$as_me:12669: result: $cf_cv_weak_symbols" >&5 - echo "${ECHO_T}$cf_cv_weak_symbols" >&6 - - else -@@ -12697,7 +12699,7 @@ - # opaque outside of that, so there is no --enable-opaque option. We can use - # this option without --with-pthreads, but this will be always set for - # pthreads. --echo "$as_me:12700: checking if you want reentrant code" >&5 -+echo "$as_me:12702: checking if you want reentrant code" >&5 - echo $ECHO_N "checking if you want reentrant code... $ECHO_C" >&6 - - # Check whether --enable-reentrant or --disable-reentrant was given. -@@ -12707,7 +12709,7 @@ - else - with_reentrant=no - fi; --echo "$as_me:12710: result: $with_reentrant" >&5 -+echo "$as_me:12712: result: $with_reentrant" >&5 - echo "${ECHO_T}$with_reentrant" >&6 - if test "x$with_reentrant" = xyes ; then - cf_cv_enable_reentrant=1 -@@ -12780,7 +12782,7 @@ - (5.*) - cf_cv_rel_version=6.0 - cf_cv_abi_version=6 -- { echo "$as_me:12783: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 -+ { echo "$as_me:12785: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 - echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;} - ;; - esac -@@ -12795,7 +12797,7 @@ - - ### Allow using a different wrap-prefix - if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then -- echo "$as_me:12798: checking for prefix used to wrap public variables" >&5 -+ echo "$as_me:12800: checking for prefix used to wrap public variables" >&5 - echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6 - - # Check whether --with-wrap-prefix or --without-wrap-prefix was given. -@@ -12805,7 +12807,7 @@ - else - NCURSES_WRAP_PREFIX=_nc_ - fi; -- echo "$as_me:12808: result: $NCURSES_WRAP_PREFIX" >&5 -+ echo "$as_me:12810: result: $NCURSES_WRAP_PREFIX" >&5 - echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 - else - NCURSES_WRAP_PREFIX=_nc_ -@@ -12815,7 +12817,7 @@ - #define NCURSES_WRAP_PREFIX "$NCURSES_WRAP_PREFIX" - EOF - --echo "$as_me:12818: checking if you want experimental safe-sprintf code" >&5 -+echo "$as_me:12820: checking if you want experimental safe-sprintf code" >&5 - echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6 - - # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given. -@@ -12825,7 +12827,7 @@ - else - with_safe_sprintf=no - fi; --echo "$as_me:12828: result: $with_safe_sprintf" >&5 -+echo "$as_me:12830: result: $with_safe_sprintf" >&5 - echo "${ECHO_T}$with_safe_sprintf" >&6 - test "x$with_safe_sprintf" = xyes && - cat >>confdefs.h <<\EOF -@@ -12835,7 +12837,7 @@ - ### use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic - # when hashmap is used scroll hints are useless - if test "$with_hashmap" = no ; then --echo "$as_me:12838: checking if you want to experiment without scrolling-hints code" >&5 -+echo "$as_me:12840: checking if you want to experiment without scrolling-hints code" >&5 - echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6 - - # Check whether --enable-scroll-hints or --disable-scroll-hints was given. -@@ -12845,7 +12847,7 @@ - else - with_scroll_hints=yes - fi; --echo "$as_me:12848: result: $with_scroll_hints" >&5 -+echo "$as_me:12850: result: $with_scroll_hints" >&5 - echo "${ECHO_T}$with_scroll_hints" >&6 - test "x$with_scroll_hints" = xyes && - cat >>confdefs.h <<\EOF -@@ -12854,7 +12856,7 @@ - - fi - --echo "$as_me:12857: checking if you want wgetch-events code" >&5 -+echo "$as_me:12859: checking if you want wgetch-events code" >&5 - echo $ECHO_N "checking if you want wgetch-events code... $ECHO_C" >&6 - - # Check whether --enable-wgetch-events or --disable-wgetch-events was given. -@@ -12864,7 +12866,7 @@ - else - with_wgetch_events=no - fi; --echo "$as_me:12867: result: $with_wgetch_events" >&5 -+echo "$as_me:12869: result: $with_wgetch_events" >&5 - echo "${ECHO_T}$with_wgetch_events" >&6 - test "x$with_wgetch_events" = xyes && - cat >>confdefs.h <<\EOF -@@ -12875,7 +12877,7 @@ - - ### use option --disable-echo to suppress full display compiling commands - --echo "$as_me:12878: checking if you want to see long compiling messages" >&5 -+echo "$as_me:12880: 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. -@@ -12909,7 +12911,7 @@ - ECHO_CC='' - - fi; --echo "$as_me:12912: result: $enableval" >&5 -+echo "$as_me:12914: result: $enableval" >&5 - echo "${ECHO_T}$enableval" >&6 - - if test "x$enable_echo" = xyes; then -@@ -12921,7 +12923,7 @@ - fi - - ### use option --enable-warnings to turn on all gcc warnings --echo "$as_me:12924: checking if you want to see compiler warnings" >&5 -+echo "$as_me:12926: checking if you want to see compiler warnings" >&5 - echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6 - - # Check whether --enable-warnings or --disable-warnings was given. -@@ -12929,7 +12931,7 @@ - enableval="$enable_warnings" - with_warnings=$enableval - fi; --echo "$as_me:12932: result: $with_warnings" >&5 -+echo "$as_me:12934: result: $with_warnings" >&5 - echo "${ECHO_T}$with_warnings" >&6 - - if test "x$with_warnings" = "xyes"; then -@@ -12941,12 +12943,12 @@ - if test "$GCC" = yes ; then - case $host_os in - (linux*|gnu*) -- echo "$as_me:12944: checking if this is really Intel C compiler" >&5 -+ echo "$as_me:12946: 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 12949 "configure" -+#line 12951 "configure" - #include "confdefs.h" - - int -@@ -12963,16 +12965,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:12966: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:12968: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:12969: \$? = $ac_status" >&5 -+ echo "$as_me:12971: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:12972: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:12974: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:12975: \$? = $ac_status" >&5 -+ echo "$as_me:12977: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - INTEL_COMPILER=yes - cf_save_CFLAGS="$cf_save_CFLAGS -we147" -@@ -12983,7 +12985,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - CFLAGS="$cf_save_CFLAGS" -- echo "$as_me:12986: result: $INTEL_COMPILER" >&5 -+ echo "$as_me:12988: result: $INTEL_COMPILER" >&5 - echo "${ECHO_T}$INTEL_COMPILER" >&6 - ;; - esac -@@ -12992,12 +12994,12 @@ - CLANG_COMPILER=no - - if test "$GCC" = yes ; then -- echo "$as_me:12995: checking if this is really Clang C compiler" >&5 -+ echo "$as_me:12997: 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 13000 "configure" -+#line 13002 "configure" - #include "confdefs.h" - - int -@@ -13014,16 +13016,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:13017: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:13019: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:13020: \$? = $ac_status" >&5 -+ echo "$as_me:13022: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:13023: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:13025: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:13026: \$? = $ac_status" >&5 -+ echo "$as_me:13028: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - CLANG_COMPILER=yes - cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" -@@ -13034,12 +13036,12 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - CFLAGS="$cf_save_CFLAGS" -- echo "$as_me:13037: result: $CLANG_COMPILER" >&5 -+ echo "$as_me:13039: result: $CLANG_COMPILER" >&5 - echo "${ECHO_T}$CLANG_COMPILER" >&6 - fi - - cat > conftest.$ac_ext <&5 -+ { echo "$as_me:13061: checking for $CC warning options..." >&5 - echo "$as_me: checking for $CC warning options..." >&6;} - cf_save_CFLAGS="$CFLAGS" - EXTRA_CFLAGS="-Wall" -@@ -13072,12 +13074,12 @@ - wd981 - do - CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" -- if { (eval echo "$as_me:13075: \"$ac_compile\"") >&5 -+ if { (eval echo "$as_me:13077: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:13078: \$? = $ac_status" >&5 -+ echo "$as_me:13080: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- test -n "$verbose" && echo "$as_me:13080: result: ... -$cf_opt" >&5 -+ test -n "$verbose" && echo "$as_me:13082: result: ... -$cf_opt" >&5 - echo "${ECHO_T}... -$cf_opt" >&6 - EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" - fi -@@ -13086,7 +13088,7 @@ - - elif test "$GCC" = yes - then -- { echo "$as_me:13089: checking for $CC warning options..." >&5 -+ { echo "$as_me:13091: checking for $CC warning options..." >&5 - echo "$as_me: checking for $CC warning options..." >&6;} - cf_save_CFLAGS="$CFLAGS" - EXTRA_CFLAGS= -@@ -13110,12 +13112,12 @@ - Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum - do - CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" -- if { (eval echo "$as_me:13113: \"$ac_compile\"") >&5 -+ if { (eval echo "$as_me:13115: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:13116: \$? = $ac_status" >&5 -+ echo "$as_me:13118: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- test -n "$verbose" && echo "$as_me:13118: result: ... -$cf_opt" >&5 -+ test -n "$verbose" && echo "$as_me:13120: result: ... -$cf_opt" >&5 - echo "${ECHO_T}... -$cf_opt" >&6 - case $cf_opt in - (Wcast-qual) -@@ -13126,7 +13128,7 @@ - ([34].*) - test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 - --echo "${as_me:-configure}:13129: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 -+echo "${as_me:-configure}:13131: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 - - continue;; - esac -@@ -13136,7 +13138,7 @@ - ([12].*) - test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 - --echo "${as_me:-configure}:13139: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 -+echo "${as_me:-configure}:13141: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 - - continue;; - esac -@@ -13156,12 +13158,12 @@ - if test "$GCC" = yes ; then - case $host_os in - (linux*|gnu*) -- echo "$as_me:13159: checking if this is really Intel C++ compiler" >&5 -+ echo "$as_me:13161: 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="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -no-gcc" - cat >conftest.$ac_ext <<_ACEOF --#line 13164 "configure" -+#line 13166 "configure" - #include "confdefs.h" - - int -@@ -13178,16 +13180,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:13181: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:13183: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:13184: \$? = $ac_status" >&5 -+ echo "$as_me:13186: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:13187: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:13189: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:13190: \$? = $ac_status" >&5 -+ echo "$as_me:13192: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - INTEL_CPLUSPLUS=yes - cf_save_CFLAGS="$cf_save_CFLAGS -we147" -@@ -13198,7 +13200,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - CXXFLAGS="$cf_save_CFLAGS" -- echo "$as_me:13201: result: $INTEL_CPLUSPLUS" >&5 -+ echo "$as_me:13203: result: $INTEL_CPLUSPLUS" >&5 - echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6 - ;; - esac -@@ -13207,12 +13209,12 @@ - CLANG_CPLUSPLUS=no - - if test "$GCC" = yes ; then -- echo "$as_me:13210: checking if this is really Clang C++ compiler" >&5 -+ echo "$as_me:13212: 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="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -Qunused-arguments" - cat >conftest.$ac_ext <<_ACEOF --#line 13215 "configure" -+#line 13217 "configure" - #include "confdefs.h" - - int -@@ -13229,16 +13231,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:13232: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:13234: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:13235: \$? = $ac_status" >&5 -+ echo "$as_me:13237: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:13238: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:13240: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:13241: \$? = $ac_status" >&5 -+ echo "$as_me:13243: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - CLANG_CPLUSPLUS=yes - cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" -@@ -13249,7 +13251,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - CXXFLAGS="$cf_save_CFLAGS" -- echo "$as_me:13252: result: $CLANG_CPLUSPLUS" >&5 -+ echo "$as_me:13254: result: $CLANG_CPLUSPLUS" >&5 - echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6 - fi - -@@ -13261,7 +13263,7 @@ - ac_main_return=return - - cat > conftest.$ac_ext <&5 -+ { echo "$as_me:13284: checking for $CC warning options..." >&5 - echo "$as_me: checking for $CC warning options..." >&6;} - cf_save_CXXFLAGS="$CXXFLAGS" - EXTRA_CXXFLAGS="-Wall" -@@ -13296,12 +13298,12 @@ - wd981 - do - CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt" -- if { (eval echo "$as_me:13299: \"$ac_compile\"") >&5 -+ if { (eval echo "$as_me:13301: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:13302: \$? = $ac_status" >&5 -+ echo "$as_me:13304: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- test -n "$verbose" && echo "$as_me:13304: result: ... -$cf_opt" >&5 -+ test -n "$verbose" && echo "$as_me:13306: result: ... -$cf_opt" >&5 - echo "${ECHO_T}... -$cf_opt" >&6 - EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" - fi -@@ -13310,7 +13312,7 @@ - - elif test "$GXX" = yes - then -- { echo "$as_me:13313: checking for $CXX warning options..." >&5 -+ { echo "$as_me:13315: checking for $CXX warning options..." >&5 - echo "$as_me: checking for $CXX warning options..." >&6;} - cf_save_CXXFLAGS="$CXXFLAGS" - EXTRA_CXXFLAGS="-W -Wall" -@@ -13340,16 +13342,16 @@ - Wundef $cf_gxx_extra_warnings Wno-unused - do - CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt" -- if { (eval echo "$as_me:13343: \"$ac_compile\"") >&5 -+ if { (eval echo "$as_me:13345: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:13346: \$? = $ac_status" >&5 -+ echo "$as_me:13348: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- test -n "$verbose" && echo "$as_me:13348: result: ... -$cf_opt" >&5 -+ test -n "$verbose" && echo "$as_me:13350: result: ... -$cf_opt" >&5 - echo "${ECHO_T}... -$cf_opt" >&6 - EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" - else -- test -n "$verbose" && echo "$as_me:13352: result: ... no -$cf_opt" >&5 -+ test -n "$verbose" && echo "$as_me:13354: result: ... no -$cf_opt" >&5 - echo "${ECHO_T}... no -$cf_opt" >&6 - fi - done -@@ -13385,10 +13387,10 @@ - EOF - if test "$GCC" = yes - then -- { echo "$as_me:13388: checking for $CC __attribute__ directives..." >&5 -+ { echo "$as_me:13390: checking for $CC __attribute__ directives..." >&5 - echo "$as_me: checking for $CC __attribute__ directives..." >&6;} - cat > conftest.$ac_ext <&5 -+ if { (eval echo "$as_me:13442: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:13443: \$? = $ac_status" >&5 -+ echo "$as_me:13445: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- test -n "$verbose" && echo "$as_me:13445: result: ... $cf_attribute" >&5 -+ test -n "$verbose" && echo "$as_me:13447: result: ... $cf_attribute" >&5 - echo "${ECHO_T}... $cf_attribute" >&6 - cat conftest.h >>confdefs.h - case $cf_attribute in -@@ -13501,7 +13503,7 @@ - rm -rf conftest* - fi - --echo "$as_me:13504: checking if you want to work around bogus compiler/loader warnings" >&5 -+echo "$as_me:13506: checking if you want to work around bogus compiler/loader warnings" >&5 - echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6 - - # Check whether --enable-string-hacks or --disable-string-hacks was given. -@@ -13511,7 +13513,7 @@ - else - with_string_hacks=no - fi; --echo "$as_me:13514: result: $with_string_hacks" >&5 -+echo "$as_me:13516: result: $with_string_hacks" >&5 - echo "${ECHO_T}$with_string_hacks" >&6 - - if test "x$with_string_hacks" = "xyes"; then -@@ -13520,19 +13522,19 @@ - #define USE_STRING_HACKS 1 - EOF - -- { echo "$as_me:13523: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 -+ { echo "$as_me:13525: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 - echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;} - - for ac_func in strlcat strlcpy snprintf - do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --echo "$as_me:13529: checking for $ac_func" >&5 -+echo "$as_me:13531: 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 13535 "configure" -+#line 13537 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -@@ -13563,16 +13565,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:13566: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:13568: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:13569: \$? = $ac_status" >&5 -+ echo "$as_me:13571: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:13572: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:13574: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:13575: \$? = $ac_status" >&5 -+ echo "$as_me:13577: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" - else -@@ -13582,7 +13584,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:13585: result: `eval echo '${'$as_ac_var'}'`" >&5 -+echo "$as_me:13587: 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 <&5 -+echo "$as_me:13600: checking if you want to enable runtime assertions" >&5 - echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6 - - # Check whether --enable-assertions or --disable-assertions was given. -@@ -13605,7 +13607,7 @@ - else - with_assertions=no - fi; --echo "$as_me:13608: result: $with_assertions" >&5 -+echo "$as_me:13610: result: $with_assertions" >&5 - echo "${ECHO_T}$with_assertions" >&6 - if test -n "$GCC" - then -@@ -13621,7 +13623,7 @@ - - ### use option --disable-leaks to suppress "permanent" leaks, for testing - --echo "$as_me:13624: checking if you want to use dmalloc for testing" >&5 -+echo "$as_me:13626: 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. -@@ -13638,7 +13640,7 @@ - else - with_dmalloc= - fi; --echo "$as_me:13641: result: ${with_dmalloc:-no}" >&5 -+echo "$as_me:13643: result: ${with_dmalloc:-no}" >&5 - echo "${ECHO_T}${with_dmalloc:-no}" >&6 - - case .$with_cflags in -@@ -13732,23 +13734,23 @@ - esac - - if test "$with_dmalloc" = yes ; then -- echo "$as_me:13735: checking for dmalloc.h" >&5 -+ echo "$as_me:13737: 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 13741 "configure" -+#line 13743 "configure" - #include "confdefs.h" - #include - _ACEOF --if { (eval echo "$as_me:13745: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:13747: \"$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:13751: \$? = $ac_status" >&5 -+ echo "$as_me:13753: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -13767,11 +13769,11 @@ - fi - rm -f conftest.err conftest.$ac_ext - fi --echo "$as_me:13770: result: $ac_cv_header_dmalloc_h" >&5 -+echo "$as_me:13772: 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:13774: checking for dmalloc_debug in -ldmalloc" >&5 -+echo "$as_me:13776: 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 -@@ -13779,7 +13781,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldmalloc $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 13782 "configure" -+#line 13784 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -13798,16 +13800,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:13801: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:13803: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:13804: \$? = $ac_status" >&5 -+ echo "$as_me:13806: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:13807: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:13809: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:13810: \$? = $ac_status" >&5 -+ echo "$as_me:13812: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dmalloc_dmalloc_debug=yes - else -@@ -13818,7 +13820,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:13821: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 -+echo "$as_me:13823: 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 <&5 -+echo "$as_me:13838: 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. -@@ -13850,7 +13852,7 @@ - else - with_dbmalloc= - fi; --echo "$as_me:13853: result: ${with_dbmalloc:-no}" >&5 -+echo "$as_me:13855: result: ${with_dbmalloc:-no}" >&5 - echo "${ECHO_T}${with_dbmalloc:-no}" >&6 - - case .$with_cflags in -@@ -13944,23 +13946,23 @@ - esac - - if test "$with_dbmalloc" = yes ; then -- echo "$as_me:13947: checking for dbmalloc.h" >&5 -+ echo "$as_me:13949: 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 13953 "configure" -+#line 13955 "configure" - #include "confdefs.h" - #include - _ACEOF --if { (eval echo "$as_me:13957: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:13959: \"$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:13963: \$? = $ac_status" >&5 -+ echo "$as_me:13965: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -13979,11 +13981,11 @@ - fi - rm -f conftest.err conftest.$ac_ext - fi --echo "$as_me:13982: result: $ac_cv_header_dbmalloc_h" >&5 -+echo "$as_me:13984: 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:13986: checking for debug_malloc in -ldbmalloc" >&5 -+echo "$as_me:13988: 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 -@@ -13991,7 +13993,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldbmalloc $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 13994 "configure" -+#line 13996 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -14010,16 +14012,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:14013: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:14015: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:14016: \$? = $ac_status" >&5 -+ echo "$as_me:14018: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:14019: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:14021: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:14022: \$? = $ac_status" >&5 -+ echo "$as_me:14024: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dbmalloc_debug_malloc=yes - else -@@ -14030,7 +14032,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:14033: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 -+echo "$as_me:14035: 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 <&5 -+echo "$as_me:14050: checking if you want to use valgrind for testing" >&5 - echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6 - - # Check whether --with-valgrind or --without-valgrind was given. -@@ -14062,7 +14064,7 @@ - else - with_valgrind= - fi; --echo "$as_me:14065: result: ${with_valgrind:-no}" >&5 -+echo "$as_me:14067: result: ${with_valgrind:-no}" >&5 - echo "${ECHO_T}${with_valgrind:-no}" >&6 - - case .$with_cflags in -@@ -14155,7 +14157,7 @@ - ;; - esac - --echo "$as_me:14158: checking if you want to perform memory-leak testing" >&5 -+echo "$as_me:14160: checking if you want to perform memory-leak testing" >&5 - echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6 - - # Check whether --enable-leaks or --disable-leaks was given. -@@ -14165,7 +14167,7 @@ - else - : ${with_no_leaks:=no} - fi; --echo "$as_me:14168: result: $with_no_leaks" >&5 -+echo "$as_me:14170: result: $with_no_leaks" >&5 - echo "${ECHO_T}$with_no_leaks" >&6 - - if test "$with_no_leaks" = yes ; then -@@ -14217,7 +14219,7 @@ - ;; - esac - --echo "$as_me:14220: checking whether to add trace feature to all models" >&5 -+echo "$as_me:14222: checking whether to add trace feature to all models" >&5 - echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6 - - # Check whether --with-trace or --without-trace was given. -@@ -14227,7 +14229,7 @@ - else - cf_with_trace=$cf_all_traces - fi; --echo "$as_me:14230: result: $cf_with_trace" >&5 -+echo "$as_me:14232: result: $cf_with_trace" >&5 - echo "${ECHO_T}$cf_with_trace" >&6 - - if test "x$cf_with_trace" = xyes ; then -@@ -14317,7 +14319,7 @@ - ADA_TRACE=FALSE - fi - --echo "$as_me:14320: checking if we want to use GNAT projects" >&5 -+echo "$as_me:14322: checking if we want to use GNAT projects" >&5 - echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6 - - # Check whether --enable-gnat-projects or --disable-gnat-projects was given. -@@ -14334,7 +14336,7 @@ - enable_gnat_projects=yes - - fi; --echo "$as_me:14337: result: $enable_gnat_projects" >&5 -+echo "$as_me:14339: result: $enable_gnat_projects" >&5 - echo "${ECHO_T}$enable_gnat_projects" >&6 - - ### Checks for libraries. -@@ -14344,13 +14346,13 @@ - LIBS=" -lpsapi $LIBS" - ;; - (*) --echo "$as_me:14347: checking for gettimeofday" >&5 -+echo "$as_me:14349: checking for gettimeofday" >&5 - echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 - if test "${ac_cv_func_gettimeofday+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 14353 "configure" -+#line 14355 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gettimeofday (); below. */ -@@ -14381,16 +14383,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:14384: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:14386: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:14387: \$? = $ac_status" >&5 -+ echo "$as_me:14389: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:14390: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:14392: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:14393: \$? = $ac_status" >&5 -+ echo "$as_me:14395: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_gettimeofday=yes - else -@@ -14400,7 +14402,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:14403: result: $ac_cv_func_gettimeofday" >&5 -+echo "$as_me:14405: result: $ac_cv_func_gettimeofday" >&5 - echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 - if test $ac_cv_func_gettimeofday = yes; then - -@@ -14410,7 +14412,7 @@ - - else - --echo "$as_me:14413: checking for gettimeofday in -lbsd" >&5 -+echo "$as_me:14415: checking for gettimeofday in -lbsd" >&5 - echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6 - if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -14418,7 +14420,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lbsd $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 14421 "configure" -+#line 14423 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -14437,16 +14439,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:14440: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:14442: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:14443: \$? = $ac_status" >&5 -+ echo "$as_me:14445: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:14446: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:14448: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:14449: \$? = $ac_status" >&5 -+ echo "$as_me:14451: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_bsd_gettimeofday=yes - else -@@ -14457,7 +14459,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:14460: result: $ac_cv_lib_bsd_gettimeofday" >&5 -+echo "$as_me:14462: result: $ac_cv_lib_bsd_gettimeofday" >&5 - echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6 - if test $ac_cv_lib_bsd_gettimeofday = yes; then - -@@ -14487,14 +14489,14 @@ - ;; - esac - --echo "$as_me:14490: checking if -lm needed for math functions" >&5 -+echo "$as_me:14492: 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 14497 "configure" -+#line 14499 "configure" - #include "confdefs.h" - - #include -@@ -14509,16 +14511,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:14512: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:14514: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:14515: \$? = $ac_status" >&5 -+ echo "$as_me:14517: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:14518: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:14520: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:14521: \$? = $ac_status" >&5 -+ echo "$as_me:14523: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_need_libm=no - else -@@ -14528,7 +14530,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:14531: result: $cf_cv_need_libm" >&5 -+echo "$as_me:14533: result: $cf_cv_need_libm" >&5 - echo "${ECHO_T}$cf_cv_need_libm" >&6 - if test "$cf_cv_need_libm" = yes - then -@@ -14536,13 +14538,13 @@ - fi - - ### Checks for header files. --echo "$as_me:14539: checking for ANSI C header files" >&5 -+echo "$as_me:14541: 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 14545 "configure" -+#line 14547 "configure" - #include "confdefs.h" - #include - #include -@@ -14550,13 +14552,13 @@ - #include - - _ACEOF --if { (eval echo "$as_me:14553: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:14555: \"$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:14559: \$? = $ac_status" >&5 -+ echo "$as_me:14561: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -14578,7 +14580,7 @@ - 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 14581 "configure" -+#line 14583 "configure" - #include "confdefs.h" - #include - -@@ -14596,7 +14598,7 @@ - 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 14599 "configure" -+#line 14601 "configure" - #include "confdefs.h" - #include - -@@ -14617,7 +14619,7 @@ - : - else - cat >conftest.$ac_ext <<_ACEOF --#line 14620 "configure" -+#line 14622 "configure" - #include "confdefs.h" - #include - #if ((' ' & 0x0FF) == 0x020) -@@ -14643,15 +14645,15 @@ - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:14646: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:14648: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:14649: \$? = $ac_status" >&5 -+ echo "$as_me:14651: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:14651: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:14653: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:14654: \$? = $ac_status" >&5 -+ echo "$as_me:14656: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -14664,7 +14666,7 @@ - fi - fi - fi --echo "$as_me:14667: result: $ac_cv_header_stdc" >&5 -+echo "$as_me:14669: result: $ac_cv_header_stdc" >&5 - echo "${ECHO_T}$ac_cv_header_stdc" >&6 - if test $ac_cv_header_stdc = yes; then - -@@ -14677,13 +14679,13 @@ - 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:14680: checking for $ac_hdr that defines DIR" >&5 -+echo "$as_me:14682: 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 14686 "configure" -+#line 14688 "configure" - #include "confdefs.h" - #include - #include <$ac_hdr> -@@ -14698,16 +14700,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:14701: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:14703: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:14704: \$? = $ac_status" >&5 -+ echo "$as_me:14706: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:14707: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:14709: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:14710: \$? = $ac_status" >&5 -+ echo "$as_me:14712: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" - else -@@ -14717,7 +14719,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:14720: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "$as_me:14722: 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 <&5 -+ echo "$as_me:14735: 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 -@@ -14738,7 +14740,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldir $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 14741 "configure" -+#line 14743 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -14757,16 +14759,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:14760: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:14762: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:14763: \$? = $ac_status" >&5 -+ echo "$as_me:14765: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:14766: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:14768: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:14769: \$? = $ac_status" >&5 -+ echo "$as_me:14771: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dir_opendir=yes - else -@@ -14777,14 +14779,14 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:14780: result: $ac_cv_lib_dir_opendir" >&5 -+echo "$as_me:14782: 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:14787: checking for opendir in -lx" >&5 -+ echo "$as_me:14789: 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 -@@ -14792,7 +14794,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lx $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 14795 "configure" -+#line 14797 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -14811,16 +14813,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:14814: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:14816: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:14817: \$? = $ac_status" >&5 -+ echo "$as_me:14819: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:14820: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:14822: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:14823: \$? = $ac_status" >&5 -+ echo "$as_me:14825: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_x_opendir=yes - else -@@ -14831,7 +14833,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:14834: result: $ac_cv_lib_x_opendir" >&5 -+echo "$as_me:14836: 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" -@@ -14839,13 +14841,13 @@ - - fi - --echo "$as_me:14842: checking whether time.h and sys/time.h may both be included" >&5 -+echo "$as_me:14844: 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 14848 "configure" -+#line 14850 "configure" - #include "confdefs.h" - #include - #include -@@ -14861,16 +14863,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:14864: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:14866: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:14867: \$? = $ac_status" >&5 -+ echo "$as_me:14869: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:14870: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:14872: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:14873: \$? = $ac_status" >&5 -+ echo "$as_me:14875: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_header_time=yes - else -@@ -14880,7 +14882,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:14883: result: $ac_cv_header_time" >&5 -+echo "$as_me:14885: result: $ac_cv_header_time" >&5 - echo "${ECHO_T}$ac_cv_header_time" >&6 - if test $ac_cv_header_time = yes; then - -@@ -14899,13 +14901,13 @@ - ;; - esac - --echo "$as_me:14902: checking for regcomp" >&5 -+echo "$as_me:14904: checking for regcomp" >&5 - echo $ECHO_N "checking for regcomp... $ECHO_C" >&6 - if test "${ac_cv_func_regcomp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 14908 "configure" -+#line 14910 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char regcomp (); below. */ -@@ -14936,16 +14938,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:14939: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:14941: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:14942: \$? = $ac_status" >&5 -+ echo "$as_me:14944: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:14945: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:14947: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:14948: \$? = $ac_status" >&5 -+ echo "$as_me:14950: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_regcomp=yes - else -@@ -14955,7 +14957,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:14958: result: $ac_cv_func_regcomp" >&5 -+echo "$as_me:14960: result: $ac_cv_func_regcomp" >&5 - echo "${ECHO_T}$ac_cv_func_regcomp" >&6 - if test $ac_cv_func_regcomp = yes; then - cf_regex_func=regcomp -@@ -14964,7 +14966,7 @@ - for cf_regex_lib in $cf_regex_libs - do - as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh` --echo "$as_me:14967: checking for regcomp in -l$cf_regex_lib" >&5 -+echo "$as_me:14969: checking for regcomp in -l$cf_regex_lib" >&5 - echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6 - if eval "test \"\${$as_ac_Lib+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -14972,7 +14974,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-l$cf_regex_lib $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 14975 "configure" -+#line 14977 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -14991,16 +14993,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:14994: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:14996: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:14997: \$? = $ac_status" >&5 -+ echo "$as_me:14999: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:15000: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15002: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15003: \$? = $ac_status" >&5 -+ echo "$as_me:15005: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Lib=yes" - else -@@ -15011,7 +15013,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:15014: result: `eval echo '${'$as_ac_Lib'}'`" >&5 -+echo "$as_me:15016: 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 - -@@ -15040,13 +15042,13 @@ - fi - - if test "$cf_regex_func" = no ; then -- echo "$as_me:15043: checking for compile" >&5 -+ echo "$as_me:15045: checking for compile" >&5 - echo $ECHO_N "checking for compile... $ECHO_C" >&6 - if test "${ac_cv_func_compile+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 15049 "configure" -+#line 15051 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char compile (); below. */ -@@ -15077,16 +15079,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:15080: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:15082: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:15083: \$? = $ac_status" >&5 -+ echo "$as_me:15085: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:15086: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15088: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15089: \$? = $ac_status" >&5 -+ echo "$as_me:15091: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_compile=yes - else -@@ -15096,13 +15098,13 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:15099: result: $ac_cv_func_compile" >&5 -+echo "$as_me:15101: result: $ac_cv_func_compile" >&5 - echo "${ECHO_T}$ac_cv_func_compile" >&6 - if test $ac_cv_func_compile = yes; then - cf_regex_func=compile - else - -- echo "$as_me:15105: checking for compile in -lgen" >&5 -+ echo "$as_me:15107: checking for compile in -lgen" >&5 - echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6 - if test "${ac_cv_lib_gen_compile+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -15110,7 +15112,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lgen $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 15113 "configure" -+#line 15115 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -15129,16 +15131,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:15132: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:15134: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:15135: \$? = $ac_status" >&5 -+ echo "$as_me:15137: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:15138: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15140: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15141: \$? = $ac_status" >&5 -+ echo "$as_me:15143: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_gen_compile=yes - else -@@ -15149,7 +15151,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:15152: result: $ac_cv_lib_gen_compile" >&5 -+echo "$as_me:15154: result: $ac_cv_lib_gen_compile" >&5 - echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6 - if test $ac_cv_lib_gen_compile = yes; then - -@@ -15177,11 +15179,11 @@ - fi - - if test "$cf_regex_func" = no ; then -- { echo "$as_me:15180: WARNING: cannot find regular expression library" >&5 -+ { echo "$as_me:15182: WARNING: cannot find regular expression library" >&5 - echo "$as_me: WARNING: cannot find regular expression library" >&2;} - fi - --echo "$as_me:15184: checking for regular-expression headers" >&5 -+echo "$as_me:15186: checking for regular-expression headers" >&5 - echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6 - if test "${cf_cv_regex_hdrs+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -15193,7 +15195,7 @@ - for cf_regex_hdr in regexp.h regexpr.h - do - cat >conftest.$ac_ext <<_ACEOF --#line 15196 "configure" -+#line 15198 "configure" - #include "confdefs.h" - #include <$cf_regex_hdr> - int -@@ -15208,16 +15210,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:15211: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:15213: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:15214: \$? = $ac_status" >&5 -+ echo "$as_me:15216: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:15217: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15219: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15220: \$? = $ac_status" >&5 -+ echo "$as_me:15222: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - cf_cv_regex_hdrs=$cf_regex_hdr -@@ -15234,7 +15236,7 @@ - for cf_regex_hdr in regex.h - do - cat >conftest.$ac_ext <<_ACEOF --#line 15237 "configure" -+#line 15239 "configure" - #include "confdefs.h" - #include - #include <$cf_regex_hdr> -@@ -15252,16 +15254,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:15255: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:15257: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:15258: \$? = $ac_status" >&5 -+ echo "$as_me:15260: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:15261: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15263: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15264: \$? = $ac_status" >&5 -+ echo "$as_me:15266: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - cf_cv_regex_hdrs=$cf_regex_hdr -@@ -15277,11 +15279,11 @@ - esac - - fi --echo "$as_me:15280: result: $cf_cv_regex_hdrs" >&5 -+echo "$as_me:15282: result: $cf_cv_regex_hdrs" >&5 - echo "${ECHO_T}$cf_cv_regex_hdrs" >&6 - - case $cf_cv_regex_hdrs in -- (no) { echo "$as_me:15284: WARNING: no regular expression header found" >&5 -+ (no) { echo "$as_me:15286: WARNING: no regular expression header found" >&5 - echo "$as_me: WARNING: no regular expression header found" >&2;} ;; - (regex.h) - cat >>confdefs.h <<\EOF -@@ -15320,23 +15322,23 @@ - - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:15323: checking for $ac_header" >&5 -+echo "$as_me:15325: 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 15329 "configure" -+#line 15331 "configure" - #include "confdefs.h" - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:15333: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:15335: \"$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:15339: \$? = $ac_status" >&5 -+ echo "$as_me:15341: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -15355,7 +15357,7 @@ - fi - rm -f conftest.err conftest.$ac_ext - fi --echo "$as_me:15358: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "$as_me:15360: 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 <&5 -+echo "$as_me:15373: 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 15377 "configure" -+#line 15379 "configure" - #include "confdefs.h" - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:15381: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:15383: \"$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:15387: \$? = $ac_status" >&5 -+ echo "$as_me:15389: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -15403,7 +15405,7 @@ - fi - rm -f conftest.err conftest.$ac_ext - fi --echo "$as_me:15406: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "$as_me:15408: 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 <&5 -+echo "$as_me:15418: checking for header declaring getopt variables" >&5 - echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6 - if test "${cf_cv_getopt_header+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -15423,7 +15425,7 @@ - for cf_header in stdio.h stdlib.h unistd.h getopt.h - do - cat >conftest.$ac_ext <<_ACEOF --#line 15426 "configure" -+#line 15428 "configure" - #include "confdefs.h" - - #include <$cf_header> -@@ -15436,16 +15438,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:15439: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:15441: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:15442: \$? = $ac_status" >&5 -+ echo "$as_me:15444: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:15445: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15447: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15448: \$? = $ac_status" >&5 -+ echo "$as_me:15450: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_getopt_header=$cf_header - break -@@ -15457,7 +15459,7 @@ - done - - fi --echo "$as_me:15460: result: $cf_cv_getopt_header" >&5 -+echo "$as_me:15462: result: $cf_cv_getopt_header" >&5 - echo "${ECHO_T}$cf_cv_getopt_header" >&6 - if test $cf_cv_getopt_header != none ; then - -@@ -15478,7 +15480,7 @@ - # Note: even non-Posix ISC needs to declare fd_set - if test "x$ISC" = xyes ; then - --echo "$as_me:15481: checking for main in -lcposix" >&5 -+echo "$as_me:15483: checking for main in -lcposix" >&5 - echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6 - if test "${ac_cv_lib_cposix_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -15486,7 +15488,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lcposix $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 15489 "configure" -+#line 15491 "configure" - #include "confdefs.h" - - int -@@ -15498,16 +15500,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:15501: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:15503: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:15504: \$? = $ac_status" >&5 -+ echo "$as_me:15506: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:15507: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15509: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15510: \$? = $ac_status" >&5 -+ echo "$as_me:15512: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_cposix_main=yes - else -@@ -15518,7 +15520,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:15521: result: $ac_cv_lib_cposix_main" >&5 -+echo "$as_me:15523: result: $ac_cv_lib_cposix_main" >&5 - echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6 - if test $ac_cv_lib_cposix_main = yes; then - cat >>confdefs.h <&5 -+ echo "$as_me:15534: checking for bzero in -linet" >&5 - echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6 - if test "${ac_cv_lib_inet_bzero+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -15537,7 +15539,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-linet $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 15540 "configure" -+#line 15542 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -15556,16 +15558,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:15559: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:15561: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:15562: \$? = $ac_status" >&5 -+ echo "$as_me:15564: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:15565: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15567: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15568: \$? = $ac_status" >&5 -+ echo "$as_me:15570: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_inet_bzero=yes - else -@@ -15576,7 +15578,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:15579: result: $ac_cv_lib_inet_bzero" >&5 -+echo "$as_me:15581: result: $ac_cv_lib_inet_bzero" >&5 - echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6 - if test $ac_cv_lib_inet_bzero = yes; then - -@@ -15599,14 +15601,14 @@ - fi - fi - --echo "$as_me:15602: checking if sys/time.h works with sys/select.h" >&5 -+echo "$as_me:15604: checking if sys/time.h works with sys/select.h" >&5 - echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6 - if test "${cf_cv_sys_time_select+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 15609 "configure" -+#line 15611 "configure" - #include "confdefs.h" - - #include -@@ -15626,16 +15628,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:15629: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:15631: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:15632: \$? = $ac_status" >&5 -+ echo "$as_me:15634: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:15635: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15637: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15638: \$? = $ac_status" >&5 -+ echo "$as_me:15640: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_sys_time_select=yes - else -@@ -15647,7 +15649,7 @@ - - fi - --echo "$as_me:15650: result: $cf_cv_sys_time_select" >&5 -+echo "$as_me:15652: result: $cf_cv_sys_time_select" >&5 - echo "${ECHO_T}$cf_cv_sys_time_select" >&6 - test "$cf_cv_sys_time_select" = yes && - cat >>confdefs.h <<\EOF -@@ -15662,13 +15664,13 @@ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - ac_main_return=return - --echo "$as_me:15665: checking for an ANSI C-conforming const" >&5 -+echo "$as_me:15667: checking for an ANSI C-conforming const" >&5 - echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 - if test "${ac_cv_c_const+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 15671 "configure" -+#line 15673 "configure" - #include "confdefs.h" - - int -@@ -15726,16 +15728,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:15729: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:15731: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:15732: \$? = $ac_status" >&5 -+ echo "$as_me:15734: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:15735: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15737: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15738: \$? = $ac_status" >&5 -+ echo "$as_me:15740: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_const=yes - else -@@ -15745,7 +15747,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:15748: result: $ac_cv_c_const" >&5 -+echo "$as_me:15750: result: $ac_cv_c_const" >&5 - echo "${ECHO_T}$ac_cv_c_const" >&6 - if test $ac_cv_c_const = no; then - -@@ -15755,7 +15757,7 @@ - - fi - --echo "$as_me:15758: checking for inline" >&5 -+echo "$as_me:15760: 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 -@@ -15763,7 +15765,7 @@ - ac_cv_c_inline=no - for ac_kw in inline __inline__ __inline; do - cat >conftest.$ac_ext <<_ACEOF --#line 15766 "configure" -+#line 15768 "configure" - #include "confdefs.h" - #ifndef __cplusplus - static $ac_kw int static_foo () {return 0; } -@@ -15772,16 +15774,16 @@ - - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:15775: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:15777: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:15778: \$? = $ac_status" >&5 -+ echo "$as_me:15780: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:15781: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15783: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15784: \$? = $ac_status" >&5 -+ echo "$as_me:15786: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_inline=$ac_kw; break - else -@@ -15792,7 +15794,7 @@ - done - - fi --echo "$as_me:15795: result: $ac_cv_c_inline" >&5 -+echo "$as_me:15797: result: $ac_cv_c_inline" >&5 - echo "${ECHO_T}$ac_cv_c_inline" >&6 - case $ac_cv_c_inline in - inline | yes) ;; -@@ -15818,7 +15820,7 @@ - : - elif test "$GCC" = yes - then -- echo "$as_me:15821: checking if $CC supports options to tune inlining" >&5 -+ echo "$as_me:15823: checking if $CC supports options to tune inlining" >&5 - echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6 - if test "${cf_cv_gcc_inline+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -15827,7 +15829,7 @@ - cf_save_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS --param max-inline-insns-single=1200" - cat >conftest.$ac_ext <<_ACEOF --#line 15830 "configure" -+#line 15832 "configure" - #include "confdefs.h" - inline int foo(void) { return 1; } - int -@@ -15839,16 +15841,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:15842: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:15844: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:15845: \$? = $ac_status" >&5 -+ echo "$as_me:15847: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:15848: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15850: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15851: \$? = $ac_status" >&5 -+ echo "$as_me:15853: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_gcc_inline=yes - else -@@ -15860,7 +15862,7 @@ - CFLAGS=$cf_save_CFLAGS - - fi --echo "$as_me:15863: result: $cf_cv_gcc_inline" >&5 -+echo "$as_me:15865: result: $cf_cv_gcc_inline" >&5 - echo "${ECHO_T}$cf_cv_gcc_inline" >&6 - if test "$cf_cv_gcc_inline" = yes ; then - -@@ -15946,7 +15948,7 @@ - fi - fi - --echo "$as_me:15949: checking for signal global datatype" >&5 -+echo "$as_me:15951: checking for signal global datatype" >&5 - echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6 - if test "${cf_cv_sig_atomic_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -15958,7 +15960,7 @@ - "int" - do - cat >conftest.$ac_ext <<_ACEOF --#line 15961 "configure" -+#line 15963 "configure" - #include "confdefs.h" - - #include -@@ -15981,16 +15983,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:15984: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:15986: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:15987: \$? = $ac_status" >&5 -+ echo "$as_me:15989: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:15990: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15992: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15993: \$? = $ac_status" >&5 -+ echo "$as_me:15995: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_sig_atomic_t=$cf_type - else -@@ -16004,7 +16006,7 @@ - - fi - --echo "$as_me:16007: result: $cf_cv_sig_atomic_t" >&5 -+echo "$as_me:16009: result: $cf_cv_sig_atomic_t" >&5 - echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6 - test "$cf_cv_sig_atomic_t" != no && - cat >>confdefs.h <&5 -+echo "$as_me:16018: checking for type of chtype" >&5 - echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 - if test "${cf_cv_typeof_chtype+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -16023,7 +16025,7 @@ - cf_cv_typeof_chtype=long - else - cat >conftest.$ac_ext <<_ACEOF --#line 16026 "configure" -+#line 16028 "configure" - #include "confdefs.h" - - #define WANT_BITS 31 -@@ -16058,15 +16060,15 @@ - - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:16061: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:16063: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:16064: \$? = $ac_status" >&5 -+ echo "$as_me:16066: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:16066: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16068: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16069: \$? = $ac_status" >&5 -+ echo "$as_me:16071: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_typeof_chtype=`cat cf_test.out` - else -@@ -16081,7 +16083,7 @@ - - fi - --echo "$as_me:16084: result: $cf_cv_typeof_chtype" >&5 -+echo "$as_me:16086: result: $cf_cv_typeof_chtype" >&5 - echo "${ECHO_T}$cf_cv_typeof_chtype" >&6 - - cat >>confdefs.h <&5 -+echo "$as_me:16098: checking if unsigned literals are legal" >&5 - echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6 - if test "${cf_cv_unsigned_literals+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 16103 "configure" -+#line 16105 "configure" - #include "confdefs.h" - - int -@@ -16112,16 +16114,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:16115: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:16117: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:16118: \$? = $ac_status" >&5 -+ echo "$as_me:16120: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:16121: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16123: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16124: \$? = $ac_status" >&5 -+ echo "$as_me:16126: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_unsigned_literals=yes - else -@@ -16133,7 +16135,7 @@ - - fi - --echo "$as_me:16136: result: $cf_cv_unsigned_literals" >&5 -+echo "$as_me:16138: result: $cf_cv_unsigned_literals" >&5 - echo "${ECHO_T}$cf_cv_unsigned_literals" >&6 - - cf_cv_1UL="1" -@@ -16149,14 +16151,14 @@ - - ### Checks for external-data - --echo "$as_me:16152: checking if external errno is declared" >&5 -+echo "$as_me:16154: 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 16159 "configure" -+#line 16161 "configure" - #include "confdefs.h" - - #ifdef HAVE_STDLIB_H -@@ -16174,16 +16176,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:16177: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:16179: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:16180: \$? = $ac_status" >&5 -+ echo "$as_me:16182: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:16183: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16185: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16186: \$? = $ac_status" >&5 -+ echo "$as_me:16188: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_dcl_errno=yes - else -@@ -16194,7 +16196,7 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - - fi --echo "$as_me:16197: result: $cf_cv_dcl_errno" >&5 -+echo "$as_me:16199: result: $cf_cv_dcl_errno" >&5 - echo "${ECHO_T}$cf_cv_dcl_errno" >&6 - - if test "$cf_cv_dcl_errno" = no ; then -@@ -16209,14 +16211,14 @@ - - # It's possible (for near-UNIX clones) that the data doesn't exist - --echo "$as_me:16212: checking if external errno exists" >&5 -+echo "$as_me:16214: 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 16219 "configure" -+#line 16221 "configure" - #include "confdefs.h" - - #undef errno -@@ -16231,16 +16233,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:16234: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:16236: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:16237: \$? = $ac_status" >&5 -+ echo "$as_me:16239: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:16240: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16242: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16243: \$? = $ac_status" >&5 -+ echo "$as_me:16245: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_have_errno=yes - else -@@ -16251,7 +16253,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - - fi --echo "$as_me:16254: result: $cf_cv_have_errno" >&5 -+echo "$as_me:16256: result: $cf_cv_have_errno" >&5 - echo "${ECHO_T}$cf_cv_have_errno" >&6 - - if test "$cf_cv_have_errno" = yes ; then -@@ -16264,7 +16266,7 @@ - - fi - --echo "$as_me:16267: checking if data-only library module links" >&5 -+echo "$as_me:16269: checking if data-only library module links" >&5 - echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6 - if test "${cf_cv_link_dataonly+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -16272,20 +16274,20 @@ - - rm -f conftest.a - cat >conftest.$ac_ext <&5 -+ if { (eval echo "$as_me:16280: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:16281: \$? = $ac_status" >&5 -+ echo "$as_me:16283: \$? = $ac_status" >&5 - (exit $ac_status); } ; then - mv conftest.o data.o && \ - ( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null - fi - rm -f conftest.$ac_ext data.o - cat >conftest.$ac_ext <&5 -+ if { (eval echo "$as_me:16303: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:16304: \$? = $ac_status" >&5 -+ echo "$as_me:16306: \$? = $ac_status" >&5 - (exit $ac_status); }; then - mv conftest.o func.o && \ - ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null -@@ -16314,7 +16316,7 @@ - cf_cv_link_dataonly=unknown - else - cat >conftest.$ac_ext <<_ACEOF --#line 16317 "configure" -+#line 16319 "configure" - #include "confdefs.h" - - int main() -@@ -16325,15 +16327,15 @@ - - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:16328: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:16330: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:16331: \$? = $ac_status" >&5 -+ echo "$as_me:16333: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:16333: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16335: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16336: \$? = $ac_status" >&5 -+ echo "$as_me:16338: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_link_dataonly=yes - else -@@ -16348,7 +16350,7 @@ - - fi - --echo "$as_me:16351: result: $cf_cv_link_dataonly" >&5 -+echo "$as_me:16353: result: $cf_cv_link_dataonly" >&5 - echo "${ECHO_T}$cf_cv_link_dataonly" >&6 - - if test "$cf_cv_link_dataonly" = no ; then -@@ -16387,13 +16389,13 @@ - - do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --echo "$as_me:16390: checking for $ac_func" >&5 -+echo "$as_me:16392: 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 16396 "configure" -+#line 16398 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -@@ -16424,16 +16426,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:16427: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:16429: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:16430: \$? = $ac_status" >&5 -+ echo "$as_me:16432: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:16433: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16435: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16436: \$? = $ac_status" >&5 -+ echo "$as_me:16438: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" - else -@@ -16443,7 +16445,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:16446: result: `eval echo '${'$as_ac_var'}'`" >&5 -+echo "$as_me:16448: 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 <&5 -+ { { echo "$as_me:16460: error: getopt is required for building programs" >&5 - echo "$as_me: error: getopt is required for building programs" >&2;} - { (exit 1); exit 1; }; } - fi - - if test "x$with_getcap" = "xyes" ; then - --echo "$as_me:16465: checking for terminal-capability database functions" >&5 -+echo "$as_me:16467: checking for terminal-capability database functions" >&5 - echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6 - if test "${cf_cv_cgetent+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 16472 "configure" -+#line 16474 "configure" - #include "confdefs.h" - - #include -@@ -16489,16 +16491,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:16492: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:16494: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:16495: \$? = $ac_status" >&5 -+ echo "$as_me:16497: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:16498: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16500: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16501: \$? = $ac_status" >&5 -+ echo "$as_me:16503: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_cgetent=yes - else -@@ -16509,7 +16511,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - - fi --echo "$as_me:16512: result: $cf_cv_cgetent" >&5 -+echo "$as_me:16514: result: $cf_cv_cgetent" >&5 - echo "${ECHO_T}$cf_cv_cgetent" >&6 - - if test "$cf_cv_cgetent" = yes -@@ -16519,14 +16521,14 @@ - #define HAVE_BSD_CGETENT 1 - EOF - --echo "$as_me:16522: checking if cgetent uses const parameter" >&5 -+echo "$as_me:16524: checking if cgetent uses const parameter" >&5 - echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6 - if test "${cf_cv_cgetent_const+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 16529 "configure" -+#line 16531 "configure" - #include "confdefs.h" - - #include -@@ -16548,16 +16550,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:16551: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:16553: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:16554: \$? = $ac_status" >&5 -+ echo "$as_me:16556: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:16557: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16559: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16560: \$? = $ac_status" >&5 -+ echo "$as_me:16562: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_cgetent_const=yes - else -@@ -16568,7 +16570,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - - fi --echo "$as_me:16571: result: $cf_cv_cgetent_const" >&5 -+echo "$as_me:16573: result: $cf_cv_cgetent_const" >&5 - echo "${ECHO_T}$cf_cv_cgetent_const" >&6 - if test "$cf_cv_cgetent_const" = yes - then -@@ -16582,14 +16584,14 @@ - - fi - --echo "$as_me:16585: checking for isascii" >&5 -+echo "$as_me:16587: checking for isascii" >&5 - echo $ECHO_N "checking for isascii... $ECHO_C" >&6 - if test "${cf_cv_have_isascii+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 16592 "configure" -+#line 16594 "configure" - #include "confdefs.h" - #include - int -@@ -16601,16 +16603,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:16604: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:16606: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:16607: \$? = $ac_status" >&5 -+ echo "$as_me:16609: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:16610: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16612: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16613: \$? = $ac_status" >&5 -+ echo "$as_me:16615: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_have_isascii=yes - else -@@ -16621,7 +16623,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - - fi --echo "$as_me:16624: result: $cf_cv_have_isascii" >&5 -+echo "$as_me:16626: result: $cf_cv_have_isascii" >&5 - echo "${ECHO_T}$cf_cv_have_isascii" >&6 - test "$cf_cv_have_isascii" = yes && - cat >>confdefs.h <<\EOF -@@ -16629,10 +16631,10 @@ - EOF - - if test "$ac_cv_func_sigaction" = yes; then --echo "$as_me:16632: checking whether sigaction needs _POSIX_SOURCE" >&5 -+echo "$as_me:16634: checking whether sigaction needs _POSIX_SOURCE" >&5 - echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line 16635 "configure" -+#line 16637 "configure" - #include "confdefs.h" - - #include -@@ -16646,16 +16648,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:16649: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:16651: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:16652: \$? = $ac_status" >&5 -+ echo "$as_me:16654: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:16655: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16657: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16658: \$? = $ac_status" >&5 -+ echo "$as_me:16660: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - sigact_bad=no - else -@@ -16663,7 +16665,7 @@ - cat conftest.$ac_ext >&5 - - cat >conftest.$ac_ext <<_ACEOF --#line 16666 "configure" -+#line 16668 "configure" - #include "confdefs.h" - - #define _POSIX_SOURCE -@@ -16678,16 +16680,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:16681: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:16683: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:16684: \$? = $ac_status" >&5 -+ echo "$as_me:16686: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:16687: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16689: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16690: \$? = $ac_status" >&5 -+ echo "$as_me:16692: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - sigact_bad=yes - -@@ -16703,11 +16705,11 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - fi - rm -f conftest.$ac_objext conftest.$ac_ext --echo "$as_me:16706: result: $sigact_bad" >&5 -+echo "$as_me:16708: result: $sigact_bad" >&5 - echo "${ECHO_T}$sigact_bad" >&6 - fi - --echo "$as_me:16710: checking if nanosleep really works" >&5 -+echo "$as_me:16712: checking if nanosleep really works" >&5 - echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6 - if test "${cf_cv_func_nanosleep+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -16717,7 +16719,7 @@ - cf_cv_func_nanosleep=unknown - else - cat >conftest.$ac_ext <<_ACEOF --#line 16720 "configure" -+#line 16722 "configure" - #include "confdefs.h" - - #include -@@ -16742,15 +16744,15 @@ - - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:16745: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:16747: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:16748: \$? = $ac_status" >&5 -+ echo "$as_me:16750: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:16750: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16752: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16753: \$? = $ac_status" >&5 -+ echo "$as_me:16755: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_func_nanosleep=yes - else -@@ -16762,7 +16764,7 @@ - rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - fi --echo "$as_me:16765: result: $cf_cv_func_nanosleep" >&5 -+echo "$as_me:16767: result: $cf_cv_func_nanosleep" >&5 - echo "${ECHO_T}$cf_cv_func_nanosleep" >&6 - - test "$cf_cv_func_nanosleep" = "yes" && -@@ -16777,23 +16779,23 @@ - - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:16780: checking for $ac_header" >&5 -+echo "$as_me:16782: 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 16786 "configure" -+#line 16788 "configure" - #include "confdefs.h" - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:16790: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:16792: \"$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:16796: \$? = $ac_status" >&5 -+ echo "$as_me:16798: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -16812,7 +16814,7 @@ - fi - rm -f conftest.err conftest.$ac_ext - fi --echo "$as_me:16815: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "$as_me:16817: 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 <&5 -+echo "$as_me:16832: 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 16836 "configure" -+#line 16838 "configure" - #include "confdefs.h" - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:16840: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:16842: \"$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:16846: \$? = $ac_status" >&5 -+ echo "$as_me:16848: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -16862,7 +16864,7 @@ - fi - rm -f conftest.err conftest.$ac_ext - fi --echo "$as_me:16865: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "$as_me:16867: 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 <&5 -+ echo "$as_me:16885: 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 16886 "configure" -+#line 16888 "configure" - #include "confdefs.h" - #include - int -@@ -16895,16 +16897,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:16898: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:16900: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:16901: \$? = $ac_status" >&5 -+ echo "$as_me:16903: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:16904: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16906: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16907: \$? = $ac_status" >&5 -+ echo "$as_me:16909: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - termios_bad=no - else -@@ -16912,7 +16914,7 @@ - cat conftest.$ac_ext >&5 - - cat >conftest.$ac_ext <<_ACEOF --#line 16915 "configure" -+#line 16917 "configure" - #include "confdefs.h" - - #define _POSIX_SOURCE -@@ -16926,16 +16928,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:16929: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:16931: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:16932: \$? = $ac_status" >&5 -+ echo "$as_me:16934: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:16935: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16937: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16938: \$? = $ac_status" >&5 -+ echo "$as_me:16940: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - termios_bad=unknown - else -@@ -16951,19 +16953,19 @@ - - fi - rm -f conftest.$ac_objext conftest.$ac_ext -- echo "$as_me:16954: result: $termios_bad" >&5 -+ echo "$as_me:16956: result: $termios_bad" >&5 - echo "${ECHO_T}$termios_bad" >&6 - fi - fi - --echo "$as_me:16959: checking for tcgetattr" >&5 -+echo "$as_me:16961: checking for tcgetattr" >&5 - echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6 - if test "${cf_cv_have_tcgetattr+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 16966 "configure" -+#line 16968 "configure" - #include "confdefs.h" - - #include -@@ -16991,16 +16993,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:16994: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:16996: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:16997: \$? = $ac_status" >&5 -+ echo "$as_me:16999: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:17000: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17002: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17003: \$? = $ac_status" >&5 -+ echo "$as_me:17005: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_have_tcgetattr=yes - else -@@ -17010,21 +17012,21 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:17013: result: $cf_cv_have_tcgetattr" >&5 -+echo "$as_me:17015: result: $cf_cv_have_tcgetattr" >&5 - echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6 - test "$cf_cv_have_tcgetattr" = yes && - cat >>confdefs.h <<\EOF - #define HAVE_TCGETATTR 1 - EOF - --echo "$as_me:17020: checking for vsscanf function or workaround" >&5 -+echo "$as_me:17022: checking for vsscanf function or workaround" >&5 - echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6 - if test "${cf_cv_func_vsscanf+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 17027 "configure" -+#line 17029 "configure" - #include "confdefs.h" - - #include -@@ -17040,16 +17042,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:17043: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:17045: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:17046: \$? = $ac_status" >&5 -+ echo "$as_me:17048: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:17049: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17051: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17052: \$? = $ac_status" >&5 -+ echo "$as_me:17054: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_func_vsscanf=vsscanf - else -@@ -17057,7 +17059,7 @@ - cat conftest.$ac_ext >&5 - - cat >conftest.$ac_ext <<_ACEOF --#line 17060 "configure" -+#line 17062 "configure" - #include "confdefs.h" - - #include -@@ -17079,16 +17081,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:17082: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:17084: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:17085: \$? = $ac_status" >&5 -+ echo "$as_me:17087: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:17088: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17090: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17091: \$? = $ac_status" >&5 -+ echo "$as_me:17093: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_func_vsscanf=vfscanf - else -@@ -17096,7 +17098,7 @@ - cat conftest.$ac_ext >&5 - - cat >conftest.$ac_ext <<_ACEOF --#line 17099 "configure" -+#line 17101 "configure" - #include "confdefs.h" - - #include -@@ -17118,16 +17120,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:17121: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:17123: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:17124: \$? = $ac_status" >&5 -+ echo "$as_me:17126: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:17127: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17129: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17130: \$? = $ac_status" >&5 -+ echo "$as_me:17132: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_func_vsscanf=_doscan - else -@@ -17142,7 +17144,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:17145: result: $cf_cv_func_vsscanf" >&5 -+echo "$as_me:17147: result: $cf_cv_func_vsscanf" >&5 - echo "${ECHO_T}$cf_cv_func_vsscanf" >&6 - - case $cf_cv_func_vsscanf in -@@ -17163,7 +17165,7 @@ - ;; - esac - --echo "$as_me:17166: checking for working mkstemp" >&5 -+echo "$as_me:17168: checking for working mkstemp" >&5 - echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 - if test "${cf_cv_func_mkstemp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -17174,7 +17176,7 @@ - cf_cv_func_mkstemp=maybe - else - cat >conftest.$ac_ext <<_ACEOF --#line 17177 "configure" -+#line 17179 "configure" - #include "confdefs.h" - - #include -@@ -17212,15 +17214,15 @@ - - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:17215: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:17217: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:17218: \$? = $ac_status" >&5 -+ echo "$as_me:17220: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:17220: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17222: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17223: \$? = $ac_status" >&5 -+ echo "$as_me:17225: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_func_mkstemp=yes - -@@ -17235,16 +17237,16 @@ - fi - - fi --echo "$as_me:17238: result: $cf_cv_func_mkstemp" >&5 -+echo "$as_me:17240: result: $cf_cv_func_mkstemp" >&5 - echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 - if test "x$cf_cv_func_mkstemp" = xmaybe ; then -- echo "$as_me:17241: checking for mkstemp" >&5 -+ echo "$as_me:17243: checking for mkstemp" >&5 - echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 - if test "${ac_cv_func_mkstemp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 17247 "configure" -+#line 17249 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char mkstemp (); below. */ -@@ -17275,16 +17277,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:17278: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:17280: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:17281: \$? = $ac_status" >&5 -+ echo "$as_me:17283: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:17284: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17286: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17287: \$? = $ac_status" >&5 -+ echo "$as_me:17289: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_mkstemp=yes - else -@@ -17294,7 +17296,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:17297: result: $ac_cv_func_mkstemp" >&5 -+echo "$as_me:17299: result: $ac_cv_func_mkstemp" >&5 - echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 - - fi -@@ -17315,21 +17317,21 @@ - fi - - if test "x$cross_compiling" = xyes ; then -- { echo "$as_me:17318: WARNING: cross compiling: assume setvbuf params not reversed" >&5 -+ { echo "$as_me:17320: WARNING: cross compiling: assume setvbuf params not reversed" >&5 - echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;} - else -- echo "$as_me:17321: checking whether setvbuf arguments are reversed" >&5 -+ echo "$as_me:17323: checking whether setvbuf arguments are reversed" >&5 - echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6 - if test "${ac_cv_func_setvbuf_reversed+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test "$cross_compiling" = yes; then -- { { echo "$as_me:17327: error: cannot run test program while cross compiling" >&5 -+ { { echo "$as_me:17329: 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 17332 "configure" -+#line 17334 "configure" - #include "confdefs.h" - #include - /* If setvbuf has the reversed format, exit 0. */ -@@ -17346,15 +17348,15 @@ - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:17349: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:17351: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:17352: \$? = $ac_status" >&5 -+ echo "$as_me:17354: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:17354: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17356: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17357: \$? = $ac_status" >&5 -+ echo "$as_me:17359: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_setvbuf_reversed=yes - else -@@ -17367,7 +17369,7 @@ - fi - rm -f core core.* *.core - fi --echo "$as_me:17370: result: $ac_cv_func_setvbuf_reversed" >&5 -+echo "$as_me:17372: result: $ac_cv_func_setvbuf_reversed" >&5 - echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6 - if test $ac_cv_func_setvbuf_reversed = yes; then - -@@ -17378,13 +17380,13 @@ - fi - - fi --echo "$as_me:17381: checking for intptr_t" >&5 -+echo "$as_me:17383: 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 17387 "configure" -+#line 17389 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -17399,16 +17401,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:17402: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:17404: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:17405: \$? = $ac_status" >&5 -+ echo "$as_me:17407: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:17408: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17410: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17411: \$? = $ac_status" >&5 -+ echo "$as_me:17413: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_intptr_t=yes - else -@@ -17418,7 +17420,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:17421: result: $ac_cv_type_intptr_t" >&5 -+echo "$as_me:17423: 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 - : -@@ -17430,13 +17432,13 @@ - - fi - --echo "$as_me:17433: checking for ssize_t" >&5 -+echo "$as_me:17435: 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 17439 "configure" -+#line 17441 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -17451,16 +17453,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:17454: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:17456: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:17457: \$? = $ac_status" >&5 -+ echo "$as_me:17459: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:17460: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17462: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17463: \$? = $ac_status" >&5 -+ echo "$as_me:17465: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_ssize_t=yes - else -@@ -17470,7 +17472,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:17473: result: $ac_cv_type_ssize_t" >&5 -+echo "$as_me:17475: 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 - : -@@ -17482,14 +17484,14 @@ - - fi - --echo "$as_me:17485: checking for type sigaction_t" >&5 -+echo "$as_me:17487: checking for type sigaction_t" >&5 - echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6 - if test "${cf_cv_type_sigaction+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 17492 "configure" -+#line 17494 "configure" - #include "confdefs.h" - - #include -@@ -17502,16 +17504,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:17505: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:17507: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:17508: \$? = $ac_status" >&5 -+ echo "$as_me:17510: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:17511: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17513: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17514: \$? = $ac_status" >&5 -+ echo "$as_me:17516: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_type_sigaction=yes - else -@@ -17522,14 +17524,14 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - fi - --echo "$as_me:17525: result: $cf_cv_type_sigaction" >&5 -+echo "$as_me:17527: result: $cf_cv_type_sigaction" >&5 - echo "${ECHO_T}$cf_cv_type_sigaction" >&6 - test "$cf_cv_type_sigaction" = yes && - cat >>confdefs.h <<\EOF - #define HAVE_TYPE_SIGACTION 1 - EOF - --echo "$as_me:17532: checking declaration of size-change" >&5 -+echo "$as_me:17534: 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 -@@ -17544,7 +17546,7 @@ - CPPFLAGS="$cf_save_CPPFLAGS" - test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" - cat >conftest.$ac_ext <<_ACEOF --#line 17547 "configure" -+#line 17549 "configure" - #include "confdefs.h" - #include - #ifdef HAVE_TERMIOS_H -@@ -17588,16 +17590,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:17591: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:17593: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:17594: \$? = $ac_status" >&5 -+ echo "$as_me:17596: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:17597: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17599: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17600: \$? = $ac_status" >&5 -+ echo "$as_me:17602: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_sizechange=yes - else -@@ -17616,7 +17618,7 @@ - done - - fi --echo "$as_me:17619: result: $cf_cv_sizechange" >&5 -+echo "$as_me:17621: result: $cf_cv_sizechange" >&5 - echo "${ECHO_T}$cf_cv_sizechange" >&6 - if test "$cf_cv_sizechange" != no ; then - -@@ -17634,13 +17636,13 @@ - esac - fi - --echo "$as_me:17637: checking for memmove" >&5 -+echo "$as_me:17639: checking for memmove" >&5 - echo $ECHO_N "checking for memmove... $ECHO_C" >&6 - if test "${ac_cv_func_memmove+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 17643 "configure" -+#line 17645 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char memmove (); below. */ -@@ -17671,16 +17673,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:17674: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:17676: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:17677: \$? = $ac_status" >&5 -+ echo "$as_me:17679: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:17680: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17682: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17683: \$? = $ac_status" >&5 -+ echo "$as_me:17685: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_memmove=yes - else -@@ -17690,19 +17692,19 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:17693: result: $ac_cv_func_memmove" >&5 -+echo "$as_me:17695: result: $ac_cv_func_memmove" >&5 - echo "${ECHO_T}$ac_cv_func_memmove" >&6 - if test $ac_cv_func_memmove = yes; then - : - else - --echo "$as_me:17699: checking for bcopy" >&5 -+echo "$as_me:17701: checking for bcopy" >&5 - echo $ECHO_N "checking for bcopy... $ECHO_C" >&6 - if test "${ac_cv_func_bcopy+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 17705 "configure" -+#line 17707 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char bcopy (); below. */ -@@ -17733,16 +17735,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:17736: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:17738: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:17739: \$? = $ac_status" >&5 -+ echo "$as_me:17741: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:17742: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17744: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17745: \$? = $ac_status" >&5 -+ echo "$as_me:17747: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_bcopy=yes - else -@@ -17752,11 +17754,11 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:17755: result: $ac_cv_func_bcopy" >&5 -+echo "$as_me:17757: result: $ac_cv_func_bcopy" >&5 - echo "${ECHO_T}$ac_cv_func_bcopy" >&6 - if test $ac_cv_func_bcopy = yes; then - -- echo "$as_me:17759: checking if bcopy does overlapping moves" >&5 -+ echo "$as_me:17761: checking if bcopy does overlapping moves" >&5 - echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6 - if test "${cf_cv_good_bcopy+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -17766,7 +17768,7 @@ - cf_cv_good_bcopy=unknown - else - cat >conftest.$ac_ext <<_ACEOF --#line 17769 "configure" -+#line 17771 "configure" - #include "confdefs.h" - - int main() { -@@ -17780,15 +17782,15 @@ - - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:17783: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:17785: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:17786: \$? = $ac_status" >&5 -+ echo "$as_me:17788: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:17788: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17790: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17791: \$? = $ac_status" >&5 -+ echo "$as_me:17793: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_good_bcopy=yes - else -@@ -17801,7 +17803,7 @@ - fi - - fi --echo "$as_me:17804: result: $cf_cv_good_bcopy" >&5 -+echo "$as_me:17806: result: $cf_cv_good_bcopy" >&5 - echo "${ECHO_T}$cf_cv_good_bcopy" >&6 - - else -@@ -17824,7 +17826,7 @@ - - fi - --echo "$as_me:17827: checking if poll really works" >&5 -+echo "$as_me:17829: checking if poll really works" >&5 - echo $ECHO_N "checking if poll really works... $ECHO_C" >&6 - if test "${cf_cv_working_poll+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -17834,7 +17836,7 @@ - cf_cv_working_poll=unknown - else - cat >conftest.$ac_ext <<_ACEOF --#line 17837 "configure" -+#line 17839 "configure" - #include "confdefs.h" - - #include -@@ -17881,15 +17883,15 @@ - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:17884: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:17886: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:17887: \$? = $ac_status" >&5 -+ echo "$as_me:17889: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:17889: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17891: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17892: \$? = $ac_status" >&5 -+ echo "$as_me:17894: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_working_poll=yes - else -@@ -17901,21 +17903,21 @@ - rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - fi --echo "$as_me:17904: result: $cf_cv_working_poll" >&5 -+echo "$as_me:17906: result: $cf_cv_working_poll" >&5 - echo "${ECHO_T}$cf_cv_working_poll" >&6 - test "$cf_cv_working_poll" = "yes" && - cat >>confdefs.h <<\EOF - #define HAVE_WORKING_POLL 1 - EOF - --echo "$as_me:17911: checking for va_copy" >&5 -+echo "$as_me:17913: checking for va_copy" >&5 - echo $ECHO_N "checking for va_copy... $ECHO_C" >&6 - if test "${cf_cv_have_va_copy+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 17918 "configure" -+#line 17920 "configure" - #include "confdefs.h" - - #include -@@ -17932,16 +17934,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:17935: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:17937: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:17938: \$? = $ac_status" >&5 -+ echo "$as_me:17940: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:17941: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17943: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17944: \$? = $ac_status" >&5 -+ echo "$as_me:17946: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_have_va_copy=yes - else -@@ -17951,7 +17953,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:17954: result: $cf_cv_have_va_copy" >&5 -+echo "$as_me:17956: result: $cf_cv_have_va_copy" >&5 - echo "${ECHO_T}$cf_cv_have_va_copy" >&6 - - test "$cf_cv_have_va_copy" = yes && -@@ -17959,14 +17961,14 @@ - #define HAVE_VA_COPY 1 - EOF - --echo "$as_me:17962: checking for __va_copy" >&5 -+echo "$as_me:17964: checking for __va_copy" >&5 - echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6 - if test "${cf_cv_have___va_copy+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 17969 "configure" -+#line 17971 "configure" - #include "confdefs.h" - - #include -@@ -17983,16 +17985,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:17986: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:17988: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:17989: \$? = $ac_status" >&5 -+ echo "$as_me:17991: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:17992: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17994: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17995: \$? = $ac_status" >&5 -+ echo "$as_me:17997: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_have___va_copy=yes - else -@@ -18002,7 +18004,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:18005: result: $cf_cv_have___va_copy" >&5 -+echo "$as_me:18007: result: $cf_cv_have___va_copy" >&5 - echo "${ECHO_T}$cf_cv_have___va_copy" >&6 - - test "$cf_cv_have___va_copy" = yes && -@@ -18010,13 +18012,13 @@ - #define HAVE___VA_COPY 1 - EOF - --echo "$as_me:18013: checking for pid_t" >&5 -+echo "$as_me:18015: 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 18019 "configure" -+#line 18021 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -18031,16 +18033,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:18034: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:18036: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:18037: \$? = $ac_status" >&5 -+ echo "$as_me:18039: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:18040: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:18042: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:18043: \$? = $ac_status" >&5 -+ echo "$as_me:18045: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_pid_t=yes - else -@@ -18050,7 +18052,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:18053: result: $ac_cv_type_pid_t" >&5 -+echo "$as_me:18055: 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 - : -@@ -18065,23 +18067,23 @@ - for ac_header in unistd.h vfork.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:18068: checking for $ac_header" >&5 -+echo "$as_me:18070: 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 18074 "configure" -+#line 18076 "configure" - #include "confdefs.h" - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:18078: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:18080: \"$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:18084: \$? = $ac_status" >&5 -+ echo "$as_me:18086: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -18100,7 +18102,7 @@ - fi - rm -f conftest.err conftest.$ac_ext - fi --echo "$as_me:18103: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "$as_me:18105: 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 <&5 -+echo "$as_me:18118: 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 18122 "configure" -+#line 18124 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -@@ -18150,16 +18152,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:18153: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:18155: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:18156: \$? = $ac_status" >&5 -+ echo "$as_me:18158: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:18159: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:18161: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:18162: \$? = $ac_status" >&5 -+ echo "$as_me:18164: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" - else -@@ -18169,7 +18171,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:18172: result: `eval echo '${'$as_ac_var'}'`" >&5 -+echo "$as_me:18174: 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 <&5 -+ echo "$as_me:18186: 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 -@@ -18204,15 +18206,15 @@ - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:18207: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:18209: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:18210: \$? = $ac_status" >&5 -+ echo "$as_me:18212: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:18212: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:18214: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:18215: \$? = $ac_status" >&5 -+ echo "$as_me:18217: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_fork_works=yes - else -@@ -18224,7 +18226,7 @@ - rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - fi --echo "$as_me:18227: result: $ac_cv_func_fork_works" >&5 -+echo "$as_me:18229: result: $ac_cv_func_fork_works" >&5 - echo "${ECHO_T}$ac_cv_func_fork_works" >&6 - - fi -@@ -18238,12 +18240,12 @@ - ac_cv_func_fork_works=yes - ;; - esac -- { echo "$as_me:18241: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 -+ { echo "$as_me:18243: 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:18246: checking for working vfork" >&5 -+ echo "$as_me:18248: 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 -@@ -18252,7 +18254,7 @@ - ac_cv_func_vfork_works=cross - else - cat >conftest.$ac_ext <<_ACEOF --#line 18255 "configure" -+#line 18257 "configure" - #include "confdefs.h" - /* Thanks to Paul Eggert for this test. */ - #include -@@ -18349,15 +18351,15 @@ - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:18352: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:18354: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:18355: \$? = $ac_status" >&5 -+ echo "$as_me:18357: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:18357: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:18359: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:18360: \$? = $ac_status" >&5 -+ echo "$as_me:18362: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_vfork_works=yes - else -@@ -18369,13 +18371,13 @@ - rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - fi --echo "$as_me:18372: result: $ac_cv_func_vfork_works" >&5 -+echo "$as_me:18374: 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:18378: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 -+ { echo "$as_me:18380: 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 - -@@ -18402,7 +18404,7 @@ - - # special check for test/ditto.c - --echo "$as_me:18405: checking for openpty in -lutil" >&5 -+echo "$as_me:18407: checking for openpty in -lutil" >&5 - echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6 - if test "${ac_cv_lib_util_openpty+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -18410,7 +18412,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lutil $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 18413 "configure" -+#line 18415 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -18429,16 +18431,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:18432: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:18434: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:18435: \$? = $ac_status" >&5 -+ echo "$as_me:18437: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:18438: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:18440: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:18441: \$? = $ac_status" >&5 -+ echo "$as_me:18443: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_util_openpty=yes - else -@@ -18449,7 +18451,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:18452: result: $ac_cv_lib_util_openpty" >&5 -+echo "$as_me:18454: result: $ac_cv_lib_util_openpty" >&5 - echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6 - if test $ac_cv_lib_util_openpty = yes; then - cf_cv_lib_util=yes -@@ -18457,7 +18459,7 @@ - cf_cv_lib_util=no - fi - --echo "$as_me:18460: checking for openpty header" >&5 -+echo "$as_me:18462: checking for openpty header" >&5 - echo $ECHO_N "checking for openpty header... $ECHO_C" >&6 - if test "${cf_cv_func_openpty+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -18484,7 +18486,7 @@ - for cf_header in pty.h libutil.h util.h - do - cat >conftest.$ac_ext <<_ACEOF --#line 18487 "configure" -+#line 18489 "configure" - #include "confdefs.h" - - #include <$cf_header> -@@ -18501,16 +18503,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:18504: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:18506: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:18507: \$? = $ac_status" >&5 -+ echo "$as_me:18509: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:18510: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:18512: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:18513: \$? = $ac_status" >&5 -+ echo "$as_me:18515: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - cf_cv_func_openpty=$cf_header -@@ -18528,7 +18530,7 @@ - LIBS="$cf_save_LIBS" - - fi --echo "$as_me:18531: result: $cf_cv_func_openpty" >&5 -+echo "$as_me:18533: result: $cf_cv_func_openpty" >&5 - echo "${ECHO_T}$cf_cv_func_openpty" >&6 - - if test "$cf_cv_func_openpty" != no ; then -@@ -18598,7 +18600,7 @@ - cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF --#line 18601 "configure" -+#line 18603 "configure" - #include "confdefs.h" - #include - int -@@ -18610,16 +18612,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:18613: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:18615: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:18616: \$? = $ac_status" >&5 -+ echo "$as_me:18618: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:18619: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:18621: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:18622: \$? = $ac_status" >&5 -+ echo "$as_me:18624: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -18636,7 +18638,7 @@ - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - --echo "${as_me:-configure}:18639: testing adding $cf_add_incdir to include-path ..." 1>&5 -+echo "${as_me:-configure}:18641: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - -@@ -18672,7 +18674,7 @@ - if test "$cf_have_libdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 - --echo "${as_me:-configure}:18675: testing adding $cf_add_libdir to library-path ..." 1>&5 -+echo "${as_me:-configure}:18677: testing adding $cf_add_libdir to library-path ..." 1>&5 - - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi -@@ -18683,7 +18685,7 @@ - else - case "$with_hashed_db" in - (./*|../*|/*) -- { echo "$as_me:18686: WARNING: no such directory $with_hashed_db" >&5 -+ { echo "$as_me:18688: WARNING: no such directory $with_hashed_db" >&5 - echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;} - ;; - (*) -@@ -18752,7 +18754,7 @@ - cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF --#line 18755 "configure" -+#line 18757 "configure" - #include "confdefs.h" - #include - int -@@ -18764,16 +18766,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:18767: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:18769: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:18770: \$? = $ac_status" >&5 -+ echo "$as_me:18772: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:18773: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:18775: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:18776: \$? = $ac_status" >&5 -+ echo "$as_me:18778: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -18790,7 +18792,7 @@ - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - --echo "${as_me:-configure}:18793: testing adding $cf_add_incdir to include-path ..." 1>&5 -+echo "${as_me:-configure}:18795: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - -@@ -18870,7 +18872,7 @@ - if test "$cf_have_libdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 - --echo "${as_me:-configure}:18873: testing adding $cf_add_libdir to library-path ..." 1>&5 -+echo "${as_me:-configure}:18875: testing adding $cf_add_libdir to library-path ..." 1>&5 - - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi -@@ -18887,23 +18889,23 @@ - fi - esac - --echo "$as_me:18890: checking for db.h" >&5 -+echo "$as_me:18892: checking for db.h" >&5 - echo $ECHO_N "checking for db.h... $ECHO_C" >&6 - if test "${ac_cv_header_db_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 18896 "configure" -+#line 18898 "configure" - #include "confdefs.h" - #include - _ACEOF --if { (eval echo "$as_me:18900: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:18902: \"$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:18906: \$? = $ac_status" >&5 -+ echo "$as_me:18908: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -18922,11 +18924,11 @@ - fi - rm -f conftest.err conftest.$ac_ext - fi --echo "$as_me:18925: result: $ac_cv_header_db_h" >&5 -+echo "$as_me:18927: result: $ac_cv_header_db_h" >&5 - echo "${ECHO_T}$ac_cv_header_db_h" >&6 - if test $ac_cv_header_db_h = yes; then - --echo "$as_me:18929: checking for version of db" >&5 -+echo "$as_me:18931: checking for version of db" >&5 - echo $ECHO_N "checking for version of db... $ECHO_C" >&6 - if test "${cf_cv_hashed_db_version+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -18937,10 +18939,10 @@ - for cf_db_version in 1 2 3 4 5 6 - do - --echo "${as_me:-configure}:18940: testing checking for db version $cf_db_version ..." 1>&5 -+echo "${as_me:-configure}:18942: testing checking for db version $cf_db_version ..." 1>&5 - - cat >conftest.$ac_ext <<_ACEOF --#line 18943 "configure" -+#line 18945 "configure" - #include "confdefs.h" - - $ac_includes_default -@@ -18970,16 +18972,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:18973: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:18975: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:18976: \$? = $ac_status" >&5 -+ echo "$as_me:18978: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:18979: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:18981: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:18982: \$? = $ac_status" >&5 -+ echo "$as_me:18984: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - cf_cv_hashed_db_version=$cf_db_version -@@ -18993,16 +18995,16 @@ - done - - fi --echo "$as_me:18996: result: $cf_cv_hashed_db_version" >&5 -+echo "$as_me:18998: result: $cf_cv_hashed_db_version" >&5 - echo "${ECHO_T}$cf_cv_hashed_db_version" >&6 - - if test "$cf_cv_hashed_db_version" = unknown ; then -- { { echo "$as_me:19000: error: Cannot determine version of db" >&5 -+ { { echo "$as_me:19002: error: Cannot determine version of db" >&5 - echo "$as_me: error: Cannot determine version of db" >&2;} - { (exit 1); exit 1; }; } - else - --echo "$as_me:19005: checking for db libraries" >&5 -+echo "$as_me:19007: checking for db libraries" >&5 - echo $ECHO_N "checking for db libraries... $ECHO_C" >&6 - if test "${cf_cv_hashed_db_libs+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -19032,10 +19034,10 @@ - - fi - --echo "${as_me:-configure}:19035: testing checking for library "$cf_db_libs" ..." 1>&5 -+echo "${as_me:-configure}:19037: testing checking for library "$cf_db_libs" ..." 1>&5 - - cat >conftest.$ac_ext <<_ACEOF --#line 19038 "configure" -+#line 19040 "configure" - #include "confdefs.h" - - $ac_includes_default -@@ -19090,16 +19092,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:19093: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:19095: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:19096: \$? = $ac_status" >&5 -+ echo "$as_me:19098: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:19099: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:19101: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:19102: \$? = $ac_status" >&5 -+ echo "$as_me:19104: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - if test -n "$cf_db_libs" ; then -@@ -19119,11 +19121,11 @@ - done - - fi --echo "$as_me:19122: result: $cf_cv_hashed_db_libs" >&5 -+echo "$as_me:19124: result: $cf_cv_hashed_db_libs" >&5 - echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6 - - if test "$cf_cv_hashed_db_libs" = unknown ; then -- { { echo "$as_me:19126: error: Cannot determine library for db" >&5 -+ { { echo "$as_me:19128: error: Cannot determine library for db" >&5 - echo "$as_me: error: Cannot determine library for db" >&2;} - { (exit 1); exit 1; }; } - elif test "$cf_cv_hashed_db_libs" != default ; then -@@ -19149,7 +19151,7 @@ - - else - -- { { echo "$as_me:19152: error: Cannot find db.h" >&5 -+ { { echo "$as_me:19154: error: Cannot find db.h" >&5 - echo "$as_me: error: Cannot find db.h" >&2;} - { (exit 1); exit 1; }; } - -@@ -19164,7 +19166,7 @@ - - # Just in case, check if the C compiler has a bool type. - --echo "$as_me:19167: checking if we should include stdbool.h" >&5 -+echo "$as_me:19169: checking if we should include stdbool.h" >&5 - echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 - - if test "${cf_cv_header_stdbool_h+set}" = set; then -@@ -19172,7 +19174,7 @@ - else - - cat >conftest.$ac_ext <<_ACEOF --#line 19175 "configure" -+#line 19177 "configure" - #include "confdefs.h" - - int -@@ -19184,23 +19186,23 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:19187: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:19189: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:19190: \$? = $ac_status" >&5 -+ echo "$as_me:19192: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:19193: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:19195: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:19196: \$? = $ac_status" >&5 -+ echo "$as_me:19198: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_header_stdbool_h=0 - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF --#line 19203 "configure" -+#line 19205 "configure" - #include "confdefs.h" - - #ifndef __BEOS__ -@@ -19216,16 +19218,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:19219: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:19221: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:19222: \$? = $ac_status" >&5 -+ echo "$as_me:19224: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:19225: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:19227: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:19228: \$? = $ac_status" >&5 -+ echo "$as_me:19230: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_header_stdbool_h=1 - else -@@ -19239,13 +19241,13 @@ - fi - - if test "$cf_cv_header_stdbool_h" = 1 --then echo "$as_me:19242: result: yes" >&5 -+then echo "$as_me:19244: result: yes" >&5 - echo "${ECHO_T}yes" >&6 --else echo "$as_me:19244: result: no" >&5 -+else echo "$as_me:19246: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - --echo "$as_me:19248: checking for builtin bool type" >&5 -+echo "$as_me:19250: checking for builtin bool type" >&5 - echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 - - if test "${cf_cv_cc_bool_type+set}" = set; then -@@ -19253,7 +19255,7 @@ - else - - cat >conftest.$ac_ext <<_ACEOF --#line 19256 "configure" -+#line 19258 "configure" - #include "confdefs.h" - - #include -@@ -19268,16 +19270,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:19271: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:19273: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:19274: \$? = $ac_status" >&5 -+ echo "$as_me:19276: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:19277: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:19279: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:19280: \$? = $ac_status" >&5 -+ echo "$as_me:19282: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_cc_bool_type=1 - else -@@ -19290,9 +19292,9 @@ - fi - - if test "$cf_cv_cc_bool_type" = 1 --then echo "$as_me:19293: result: yes" >&5 -+then echo "$as_me:19295: result: yes" >&5 - echo "${ECHO_T}yes" >&6 --else echo "$as_me:19295: result: no" >&5 -+else echo "$as_me:19297: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -19314,7 +19316,7 @@ - cf_stdcpp_libname=stdc++ - ;; - esac --echo "$as_me:19317: checking for library $cf_stdcpp_libname" >&5 -+echo "$as_me:19319: checking for library $cf_stdcpp_libname" >&5 - echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6 - if test "${cf_cv_libstdcpp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -19339,7 +19341,7 @@ - LIBS="$cf_add_libs" - - cat >conftest.$ac_ext <<_ACEOF --#line 19342 "configure" -+#line 19344 "configure" - #include "confdefs.h" - - #include -@@ -19355,16 +19357,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:19358: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:19360: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:19361: \$? = $ac_status" >&5 -+ echo "$as_me:19363: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:19364: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:19366: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:19367: \$? = $ac_status" >&5 -+ echo "$as_me:19369: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_libstdcpp=yes - else -@@ -19376,7 +19378,7 @@ - LIBS="$cf_save" - - fi --echo "$as_me:19379: result: $cf_cv_libstdcpp" >&5 -+echo "$as_me:19381: result: $cf_cv_libstdcpp" >&5 - echo "${ECHO_T}$cf_cv_libstdcpp" >&6 - test "$cf_cv_libstdcpp" = yes && - cf_add_libs="-l$cf_stdcpp_libname" -@@ -19397,7 +19399,7 @@ - - fi - -- echo "$as_me:19400: checking whether $CXX understands -c and -o together" >&5 -+ echo "$as_me:19402: checking whether $CXX understands -c and -o together" >&5 - echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6 - if test "${cf_cv_prog_CXX_c_o+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -19413,15 +19415,15 @@ - # We do the test twice because some compilers refuse to overwrite an - # existing .o file with -o, though they will create one. - ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5' --if { (eval echo "$as_me:19416: \"$ac_try\"") >&5 -+if { (eval echo "$as_me:19418: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:19419: \$? = $ac_status" >&5 -+ echo "$as_me:19421: \$? = $ac_status" >&5 - (exit $ac_status); } && -- test -f conftest2.$ac_objext && { (eval echo "$as_me:19421: \"$ac_try\"") >&5 -+ test -f conftest2.$ac_objext && { (eval echo "$as_me:19423: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:19424: \$? = $ac_status" >&5 -+ echo "$as_me:19426: \$? = $ac_status" >&5 - (exit $ac_status); }; - then - eval cf_cv_prog_CXX_c_o=yes -@@ -19432,10 +19434,10 @@ - - fi - if test $cf_cv_prog_CXX_c_o = yes; then -- echo "$as_me:19435: result: yes" >&5 -+ echo "$as_me:19437: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - else -- echo "$as_me:19438: result: no" >&5 -+ echo "$as_me:19440: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -19455,7 +19457,7 @@ - ;; - esac - if test "$GXX" = yes; then -- echo "$as_me:19458: checking for lib$cf_gpp_libname" >&5 -+ echo "$as_me:19460: checking for lib$cf_gpp_libname" >&5 - echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6 - cf_save="$LIBS" - -@@ -19476,7 +19478,7 @@ - LIBS="$cf_add_libs" - - cat >conftest.$ac_ext <<_ACEOF --#line 19479 "configure" -+#line 19481 "configure" - #include "confdefs.h" - - #include <$cf_gpp_libname/builtin.h> -@@ -19490,16 +19492,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:19493: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:19495: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:19496: \$? = $ac_status" >&5 -+ echo "$as_me:19498: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:19499: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:19501: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:19502: \$? = $ac_status" >&5 -+ echo "$as_me:19504: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cxx_library=yes - -@@ -19536,7 +19538,7 @@ - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF --#line 19539 "configure" -+#line 19541 "configure" - #include "confdefs.h" - - #include -@@ -19550,16 +19552,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:19553: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:19555: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:19556: \$? = $ac_status" >&5 -+ echo "$as_me:19558: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:19559: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:19561: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:19562: \$? = $ac_status" >&5 -+ echo "$as_me:19564: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cxx_library=yes - -@@ -19592,7 +19594,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS="$cf_save" -- echo "$as_me:19595: result: $cf_cxx_library" >&5 -+ echo "$as_me:19597: result: $cf_cxx_library" >&5 - echo "${ECHO_T}$cf_cxx_library" >&6 - fi - -@@ -19608,7 +19610,7 @@ - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - ac_main_return=return --echo "$as_me:19611: checking how to run the C++ preprocessor" >&5 -+echo "$as_me:19613: checking how to run the C++ preprocessor" >&5 - echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 - if test -z "$CXXCPP"; then - if test "${ac_cv_prog_CXXCPP+set}" = set; then -@@ -19625,18 +19627,18 @@ - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF --#line 19628 "configure" -+#line 19630 "configure" - #include "confdefs.h" - #include - Syntax error - _ACEOF --if { (eval echo "$as_me:19633: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:19635: \"$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:19639: \$? = $ac_status" >&5 -+ echo "$as_me:19641: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag -@@ -19659,17 +19661,17 @@ - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF --#line 19662 "configure" -+#line 19664 "configure" - #include "confdefs.h" - #include - _ACEOF --if { (eval echo "$as_me:19666: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:19668: \"$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:19672: \$? = $ac_status" >&5 -+ echo "$as_me:19674: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag -@@ -19706,7 +19708,7 @@ - else - ac_cv_prog_CXXCPP=$CXXCPP - fi --echo "$as_me:19709: result: $CXXCPP" >&5 -+echo "$as_me:19711: result: $CXXCPP" >&5 - echo "${ECHO_T}$CXXCPP" >&6 - ac_preproc_ok=false - for ac_cxx_preproc_warn_flag in '' yes -@@ -19716,18 +19718,18 @@ - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF --#line 19719 "configure" -+#line 19721 "configure" - #include "confdefs.h" - #include - Syntax error - _ACEOF --if { (eval echo "$as_me:19724: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:19726: \"$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:19730: \$? = $ac_status" >&5 -+ echo "$as_me:19732: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag -@@ -19750,17 +19752,17 @@ - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF --#line 19753 "configure" -+#line 19755 "configure" - #include "confdefs.h" - #include - _ACEOF --if { (eval echo "$as_me:19757: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:19759: \"$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:19763: \$? = $ac_status" >&5 -+ echo "$as_me:19765: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag -@@ -19788,7 +19790,7 @@ - if $ac_preproc_ok; then - : - else -- { { echo "$as_me:19791: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 -+ { { echo "$as_me:19793: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 - echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} - { (exit 1); exit 1; }; } - fi -@@ -19803,23 +19805,23 @@ - for ac_header in typeinfo - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:19806: checking for $ac_header" >&5 -+echo "$as_me:19808: 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 19812 "configure" -+#line 19814 "configure" - #include "confdefs.h" - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:19816: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:19818: \"$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:19822: \$? = $ac_status" >&5 -+ echo "$as_me:19824: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag -@@ -19838,7 +19840,7 @@ - fi - rm -f conftest.err conftest.$ac_ext - fi --echo "$as_me:19841: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "$as_me:19843: 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 <&5 -+echo "$as_me:19856: 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 19860 "configure" -+#line 19862 "configure" - #include "confdefs.h" - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:19864: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:19866: \"$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:19870: \$? = $ac_status" >&5 -+ echo "$as_me:19872: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag -@@ -19886,7 +19888,7 @@ - fi - rm -f conftest.err conftest.$ac_ext - fi --echo "$as_me:19889: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "$as_me:19891: 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 <&5 -+ echo "$as_me:19902: checking if iostream uses std-namespace" >&5 - echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line 19903 "configure" -+#line 19905 "configure" - #include "confdefs.h" - - #include -@@ -19917,16 +19919,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:19920: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:19922: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:19923: \$? = $ac_status" >&5 -+ echo "$as_me:19925: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:19926: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:19928: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:19929: \$? = $ac_status" >&5 -+ echo "$as_me:19931: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_iostream_namespace=yes - else -@@ -19935,7 +19937,7 @@ - cf_iostream_namespace=no - fi - rm -f conftest.$ac_objext conftest.$ac_ext -- echo "$as_me:19938: result: $cf_iostream_namespace" >&5 -+ echo "$as_me:19940: result: $cf_iostream_namespace" >&5 - echo "${ECHO_T}$cf_iostream_namespace" >&6 - if test "$cf_iostream_namespace" = yes ; then - -@@ -19946,7 +19948,7 @@ - fi - fi - --echo "$as_me:19949: checking if we should include stdbool.h" >&5 -+echo "$as_me:19951: checking if we should include stdbool.h" >&5 - echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 - - if test "${cf_cv_header_stdbool_h+set}" = set; then -@@ -19954,7 +19956,7 @@ - else - - cat >conftest.$ac_ext <<_ACEOF --#line 19957 "configure" -+#line 19959 "configure" - #include "confdefs.h" - - int -@@ -19966,23 +19968,23 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:19969: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:19971: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:19972: \$? = $ac_status" >&5 -+ echo "$as_me:19974: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:19975: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:19977: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:19978: \$? = $ac_status" >&5 -+ echo "$as_me:19980: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_header_stdbool_h=0 - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF --#line 19985 "configure" -+#line 19987 "configure" - #include "confdefs.h" - - #ifndef __BEOS__ -@@ -19998,16 +20000,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:20001: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:20003: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:20004: \$? = $ac_status" >&5 -+ echo "$as_me:20006: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:20007: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:20009: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:20010: \$? = $ac_status" >&5 -+ echo "$as_me:20012: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_header_stdbool_h=1 - else -@@ -20021,13 +20023,13 @@ - fi - - if test "$cf_cv_header_stdbool_h" = 1 --then echo "$as_me:20024: result: yes" >&5 -+then echo "$as_me:20026: result: yes" >&5 - echo "${ECHO_T}yes" >&6 --else echo "$as_me:20026: result: no" >&5 -+else echo "$as_me:20028: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - --echo "$as_me:20030: checking for builtin bool type" >&5 -+echo "$as_me:20032: checking for builtin bool type" >&5 - echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 - - if test "${cf_cv_builtin_bool+set}" = set; then -@@ -20035,7 +20037,7 @@ - else - - cat >conftest.$ac_ext <<_ACEOF --#line 20038 "configure" -+#line 20040 "configure" - #include "confdefs.h" - - #include -@@ -20050,16 +20052,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:20053: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:20055: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:20056: \$? = $ac_status" >&5 -+ echo "$as_me:20058: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:20059: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:20061: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:20062: \$? = $ac_status" >&5 -+ echo "$as_me:20064: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_builtin_bool=1 - else -@@ -20072,13 +20074,13 @@ - fi - - if test "$cf_cv_builtin_bool" = 1 --then echo "$as_me:20075: result: yes" >&5 -+then echo "$as_me:20077: result: yes" >&5 - echo "${ECHO_T}yes" >&6 --else echo "$as_me:20077: result: no" >&5 -+else echo "$as_me:20079: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - --echo "$as_me:20081: checking for size of bool" >&5 -+echo "$as_me:20083: checking for size of bool" >&5 - echo $ECHO_N "checking for size of bool... $ECHO_C" >&6 - if test "${cf_cv_type_of_bool+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -20089,7 +20091,7 @@ - cf_cv_type_of_bool=unknown - else - cat >conftest.$ac_ext <<_ACEOF --#line 20092 "configure" -+#line 20094 "configure" - #include "confdefs.h" - - #include -@@ -20131,15 +20133,15 @@ - - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:20134: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:20136: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:20137: \$? = $ac_status" >&5 -+ echo "$as_me:20139: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:20139: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:20141: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:20142: \$? = $ac_status" >&5 -+ echo "$as_me:20144: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_type_of_bool=`cat cf_test.out` - if test -z "$cf_cv_type_of_bool"; then -@@ -20157,18 +20159,18 @@ - fi - - rm -f cf_test.out --echo "$as_me:20160: result: $cf_cv_type_of_bool" >&5 -+echo "$as_me:20162: result: $cf_cv_type_of_bool" >&5 - echo "${ECHO_T}$cf_cv_type_of_bool" >&6 - if test "$cf_cv_type_of_bool" = unknown ; then - case .$NCURSES_BOOL in - (.auto|.) NCURSES_BOOL=unsigned;; - esac -- { echo "$as_me:20166: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 -+ { echo "$as_me:20168: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 - echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} - cf_cv_type_of_bool=$NCURSES_BOOL - fi - --echo "$as_me:20171: checking for special defines needed for etip.h" >&5 -+echo "$as_me:20173: checking for special defines needed for etip.h" >&5 - echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6 - cf_save_CXXFLAGS="$CXXFLAGS" - cf_result="none" -@@ -20186,7 +20188,7 @@ - test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}" - test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}" - cat >conftest.$ac_ext <<_ACEOF --#line 20189 "configure" -+#line 20191 "configure" - #include "confdefs.h" - - #include -@@ -20200,16 +20202,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:20203: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:20205: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:20206: \$? = $ac_status" >&5 -+ echo "$as_me:20208: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:20209: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:20211: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:20212: \$? = $ac_status" >&5 -+ echo "$as_me:20214: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - test -n "$cf_math" && cat >>confdefs.h <&5 -+echo "$as_me:20235: result: $cf_result" >&5 - echo "${ECHO_T}$cf_result" >&6 - CXXFLAGS="$cf_save_CXXFLAGS" - - if test -n "$CXX"; then --echo "$as_me:20238: checking if $CXX accepts parameter initialization" >&5 -+echo "$as_me:20240: checking if $CXX accepts parameter initialization" >&5 - echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6 - if test "${cf_cv_cpp_param_init+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -20252,7 +20254,7 @@ - cf_cv_cpp_param_init=unknown - else - cat >conftest.$ac_ext <<_ACEOF --#line 20255 "configure" -+#line 20257 "configure" - #include "confdefs.h" - - class TEST { -@@ -20271,15 +20273,15 @@ - - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:20274: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:20276: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:20277: \$? = $ac_status" >&5 -+ echo "$as_me:20279: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:20279: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:20281: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:20282: \$? = $ac_status" >&5 -+ echo "$as_me:20284: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_cpp_param_init=yes - else -@@ -20298,7 +20300,7 @@ - ac_main_return=return - - fi --echo "$as_me:20301: result: $cf_cv_cpp_param_init" >&5 -+echo "$as_me:20303: result: $cf_cv_cpp_param_init" >&5 - echo "${ECHO_T}$cf_cv_cpp_param_init" >&6 - fi - test "$cf_cv_cpp_param_init" = yes && -@@ -20308,7 +20310,7 @@ - - if test -n "$CXX"; then - --echo "$as_me:20311: checking if $CXX accepts static_cast" >&5 -+echo "$as_me:20313: checking if $CXX accepts static_cast" >&5 - echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6 - if test "${cf_cv_cpp_static_cast+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -20322,7 +20324,7 @@ - ac_main_return=return - - cat >conftest.$ac_ext <<_ACEOF --#line 20325 "configure" -+#line 20327 "configure" - #include "confdefs.h" - - class NCursesPanel -@@ -20366,16 +20368,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:20369: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:20371: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:20372: \$? = $ac_status" >&5 -+ echo "$as_me:20374: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:20375: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:20377: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:20378: \$? = $ac_status" >&5 -+ echo "$as_me:20380: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_cpp_static_cast=yes - else -@@ -20393,7 +20395,7 @@ - ac_main_return=return - - fi --echo "$as_me:20396: result: $cf_cv_cpp_static_cast" >&5 -+echo "$as_me:20398: result: $cf_cv_cpp_static_cast" >&5 - echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 - - fi -@@ -20442,7 +20444,7 @@ - else - if test "$cf_cv_header_stdbool_h" = 1 ; then - --echo "$as_me:20445: checking for size of bool" >&5 -+echo "$as_me:20447: checking for size of bool" >&5 - echo $ECHO_N "checking for size of bool... $ECHO_C" >&6 - if test "${cf_cv_type_of_bool+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -20453,7 +20455,7 @@ - cf_cv_type_of_bool=unknown - else - cat >conftest.$ac_ext <<_ACEOF --#line 20456 "configure" -+#line 20458 "configure" - #include "confdefs.h" - - #include -@@ -20495,15 +20497,15 @@ - - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:20498: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:20500: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:20501: \$? = $ac_status" >&5 -+ echo "$as_me:20503: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:20503: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:20505: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:20506: \$? = $ac_status" >&5 -+ echo "$as_me:20508: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_type_of_bool=`cat cf_test.out` - if test -z "$cf_cv_type_of_bool"; then -@@ -20521,25 +20523,25 @@ - fi - - rm -f cf_test.out --echo "$as_me:20524: result: $cf_cv_type_of_bool" >&5 -+echo "$as_me:20526: result: $cf_cv_type_of_bool" >&5 - echo "${ECHO_T}$cf_cv_type_of_bool" >&6 - if test "$cf_cv_type_of_bool" = unknown ; then - case .$NCURSES_BOOL in - (.auto|.) NCURSES_BOOL=unsigned;; - esac -- { echo "$as_me:20530: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 -+ { echo "$as_me:20532: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 - echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} - cf_cv_type_of_bool=$NCURSES_BOOL - fi - - else -- echo "$as_me:20536: checking for fallback type of bool" >&5 -+ echo "$as_me:20538: checking for fallback type of bool" >&5 - echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6 - case "$host_cpu" in - (i?86) cf_cv_type_of_bool=char ;; - (*) cf_cv_type_of_bool=int ;; - esac -- echo "$as_me:20542: result: $cf_cv_type_of_bool" >&5 -+ echo "$as_me:20544: result: $cf_cv_type_of_bool" >&5 - echo "${ECHO_T}$cf_cv_type_of_bool" >&6 - fi - fi -@@ -20568,7 +20570,7 @@ - - if test "$cf_with_ada" != "no" ; then - if test "$with_libtool" != "no"; then -- { echo "$as_me:20571: WARNING: libtool does not support Ada - disabling feature" >&5 -+ { echo "$as_me:20573: WARNING: libtool does not support Ada - disabling feature" >&5 - echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;} - cf_with_ada=no - fi -@@ -20579,7 +20581,7 @@ - cf_ada_make=gnatmake - # Extract the first word of "$cf_ada_make", so it can be a program name with args. - set dummy $cf_ada_make; ac_word=$2 --echo "$as_me:20582: checking for $ac_word" >&5 -+echo "$as_me:20584: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_gnat_exists+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -20594,7 +20596,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_gnat_exists="yes" --echo "$as_me:20597: found $ac_dir/$ac_word" >&5 -+echo "$as_me:20599: found $ac_dir/$ac_word" >&5 - break - done - -@@ -20603,10 +20605,10 @@ - fi - gnat_exists=$ac_cv_prog_gnat_exists - if test -n "$gnat_exists"; then -- echo "$as_me:20606: result: $gnat_exists" >&5 -+ echo "$as_me:20608: result: $gnat_exists" >&5 - echo "${ECHO_T}$gnat_exists" >&6 - else -- echo "$as_me:20609: result: no" >&5 -+ echo "$as_me:20611: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -20615,12 +20617,12 @@ - cf_cv_prog_gnat_correct=no - else - --echo "$as_me:20618: checking for gnat version" >&5 -+echo "$as_me:20620: checking for gnat version" >&5 - echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 - cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \ - grep '[0-9].[0-9][0-9]*' |\ - sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` --echo "$as_me:20623: result: $cf_gnat_version" >&5 -+echo "$as_me:20625: result: $cf_gnat_version" >&5 - echo "${ECHO_T}$cf_gnat_version" >&6 - - case $cf_gnat_version in -@@ -20628,7 +20630,7 @@ - cf_cv_prog_gnat_correct=yes - ;; - (*) -- { echo "$as_me:20631: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 -+ { echo "$as_me:20633: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 - echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} - cf_cv_prog_gnat_correct=no - ;; -@@ -20636,7 +20638,7 @@ - - # Extract the first word of "m4", so it can be a program name with args. - set dummy m4; ac_word=$2 --echo "$as_me:20639: checking for $ac_word" >&5 -+echo "$as_me:20641: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_M4_exists+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -20651,7 +20653,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_M4_exists="yes" --echo "$as_me:20654: found $ac_dir/$ac_word" >&5 -+echo "$as_me:20656: found $ac_dir/$ac_word" >&5 - break - done - -@@ -20660,10 +20662,10 @@ - fi - M4_exists=$ac_cv_prog_M4_exists - if test -n "$M4_exists"; then -- echo "$as_me:20663: result: $M4_exists" >&5 -+ echo "$as_me:20665: result: $M4_exists" >&5 - echo "${ECHO_T}$M4_exists" >&6 - else -- echo "$as_me:20666: result: no" >&5 -+ echo "$as_me:20668: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -20672,7 +20674,7 @@ - echo Ada95 binding required program m4 not found. Ada95 binding disabled. - fi - if test "$cf_cv_prog_gnat_correct" = yes; then -- echo "$as_me:20675: checking if GNAT works" >&5 -+ echo "$as_me:20677: checking if GNAT works" >&5 - echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 - - rm -rf conftest* *~conftest* -@@ -20700,7 +20702,7 @@ - fi - rm -rf conftest* *~conftest* - -- echo "$as_me:20703: result: $cf_cv_prog_gnat_correct" >&5 -+ echo "$as_me:20705: result: $cf_cv_prog_gnat_correct" >&5 - echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 - fi - fi -@@ -20709,7 +20711,7 @@ - - ADAFLAGS="$ADAFLAGS -gnatpn" - -- echo "$as_me:20712: checking optimization options for ADAFLAGS" >&5 -+ echo "$as_me:20714: checking optimization options for ADAFLAGS" >&5 - echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 - case "$CFLAGS" in - (*-g*) -@@ -20726,10 +20728,10 @@ - - ;; - esac -- echo "$as_me:20729: result: $ADAFLAGS" >&5 -+ echo "$as_me:20731: result: $ADAFLAGS" >&5 - echo "${ECHO_T}$ADAFLAGS" >&6 - --echo "$as_me:20732: checking if GNATPREP supports -T option" >&5 -+echo "$as_me:20734: checking if GNATPREP supports -T option" >&5 - echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6 - if test "${cf_cv_gnatprep_opt_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -20739,11 +20741,11 @@ - gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes - - fi --echo "$as_me:20742: result: $cf_cv_gnatprep_opt_t" >&5 -+echo "$as_me:20744: result: $cf_cv_gnatprep_opt_t" >&5 - echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6 - test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS" - --echo "$as_me:20746: checking if GNAT supports generics" >&5 -+echo "$as_me:20748: checking if GNAT supports generics" >&5 - echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 - case $cf_gnat_version in - (3.[1-9]*|[4-9].*) -@@ -20753,7 +20755,7 @@ - cf_gnat_generics=no - ;; - esac --echo "$as_me:20756: result: $cf_gnat_generics" >&5 -+echo "$as_me:20758: result: $cf_gnat_generics" >&5 - echo "${ECHO_T}$cf_gnat_generics" >&6 - - if test "$cf_gnat_generics" = yes -@@ -20765,7 +20767,7 @@ - cf_generic_objects= - fi - --echo "$as_me:20768: checking if GNAT supports SIGINT" >&5 -+echo "$as_me:20770: checking if GNAT supports SIGINT" >&5 - echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6 - if test "${cf_cv_gnat_sigint+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -20813,7 +20815,7 @@ - rm -rf conftest* *~conftest* - - fi --echo "$as_me:20816: result: $cf_cv_gnat_sigint" >&5 -+echo "$as_me:20818: result: $cf_cv_gnat_sigint" >&5 - echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 - - if test $cf_cv_gnat_sigint = yes ; then -@@ -20826,7 +20828,7 @@ - cf_gnat_projects=no - - if test "$enable_gnat_projects" != no ; then --echo "$as_me:20829: checking if GNAT supports project files" >&5 -+echo "$as_me:20831: checking if GNAT supports project files" >&5 - echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 - case $cf_gnat_version in - (3.[0-9]*) -@@ -20886,15 +20888,15 @@ - esac - ;; - esac --echo "$as_me:20889: result: $cf_gnat_projects" >&5 -+echo "$as_me:20891: result: $cf_gnat_projects" >&5 - echo "${ECHO_T}$cf_gnat_projects" >&6 - fi # enable_gnat_projects - - if test $cf_gnat_projects = yes - then -- echo "$as_me:20895: checking if GNAT supports libraries" >&5 -+ echo "$as_me:20897: checking if GNAT supports libraries" >&5 - echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 -- echo "$as_me:20897: result: $cf_gnat_libraries" >&5 -+ echo "$as_me:20899: result: $cf_gnat_libraries" >&5 - echo "${ECHO_T}$cf_gnat_libraries" >&6 - fi - -@@ -20914,7 +20916,7 @@ - USE_GNAT_LIBRARIES="#" - fi - --echo "$as_me:20917: checking for ada-compiler" >&5 -+echo "$as_me:20919: checking for ada-compiler" >&5 - echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6 - - # Check whether --with-ada-compiler or --without-ada-compiler was given. -@@ -20925,12 +20927,12 @@ - cf_ada_compiler=gnatmake - fi; - --echo "$as_me:20928: result: $cf_ada_compiler" >&5 -+echo "$as_me:20930: result: $cf_ada_compiler" >&5 - echo "${ECHO_T}$cf_ada_compiler" >&6 - - cf_ada_package=terminal_interface - --echo "$as_me:20933: checking for ada-include" >&5 -+echo "$as_me:20935: checking for ada-include" >&5 - echo $ECHO_N "checking for ada-include... $ECHO_C" >&6 - - # Check whether --with-ada-include or --without-ada-include was given. -@@ -20966,7 +20968,7 @@ - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` - ;; - (*) -- { { echo "$as_me:20969: error: expected a pathname, not \"$withval\"" >&5 -+ { { echo "$as_me:20971: error: expected a pathname, not \"$withval\"" >&5 - echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} - { (exit 1); exit 1; }; } - ;; -@@ -20975,10 +20977,10 @@ - fi - eval ADA_INCLUDE="$withval" - --echo "$as_me:20978: result: $ADA_INCLUDE" >&5 -+echo "$as_me:20980: result: $ADA_INCLUDE" >&5 - echo "${ECHO_T}$ADA_INCLUDE" >&6 - --echo "$as_me:20981: checking for ada-objects" >&5 -+echo "$as_me:20983: checking for ada-objects" >&5 - echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6 - - # Check whether --with-ada-objects or --without-ada-objects was given. -@@ -21014,7 +21016,7 @@ - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` - ;; - (*) -- { { echo "$as_me:21017: error: expected a pathname, not \"$withval\"" >&5 -+ { { echo "$as_me:21019: error: expected a pathname, not \"$withval\"" >&5 - echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} - { (exit 1); exit 1; }; } - ;; -@@ -21023,10 +21025,10 @@ - fi - eval ADA_OBJECTS="$withval" - --echo "$as_me:21026: result: $ADA_OBJECTS" >&5 -+echo "$as_me:21028: result: $ADA_OBJECTS" >&5 - echo "${ECHO_T}$ADA_OBJECTS" >&6 - --echo "$as_me:21029: checking if an Ada95 shared-library should be built" >&5 -+echo "$as_me:21031: checking if an Ada95 shared-library should be built" >&5 - echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6 - - # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given. -@@ -21036,7 +21038,7 @@ - else - with_ada_sharedlib=no - fi; --echo "$as_me:21039: result: $with_ada_sharedlib" >&5 -+echo "$as_me:21041: result: $with_ada_sharedlib" >&5 - echo "${ECHO_T}$with_ada_sharedlib" >&6 - - ADA_SHAREDLIB='lib$(LIB_NAME).so.1' -@@ -21059,13 +21061,13 @@ - - # do this "late" to avoid conflict with header-checks - if test "x$with_widec" = xyes ; then -- echo "$as_me:21062: checking for wchar_t" >&5 -+ echo "$as_me:21064: checking for wchar_t" >&5 - echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6 - if test "${ac_cv_type_wchar_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 21068 "configure" -+#line 21070 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -21080,16 +21082,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:21083: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:21085: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:21086: \$? = $ac_status" >&5 -+ echo "$as_me:21088: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:21089: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:21091: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:21092: \$? = $ac_status" >&5 -+ echo "$as_me:21094: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_wchar_t=yes - else -@@ -21099,10 +21101,10 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:21102: result: $ac_cv_type_wchar_t" >&5 -+echo "$as_me:21104: result: $ac_cv_type_wchar_t" >&5 - echo "${ECHO_T}$ac_cv_type_wchar_t" >&6 - --echo "$as_me:21105: checking size of wchar_t" >&5 -+echo "$as_me:21107: checking size of wchar_t" >&5 - echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6 - if test "${ac_cv_sizeof_wchar_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -21111,7 +21113,7 @@ - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. - cat >conftest.$ac_ext <<_ACEOF --#line 21114 "configure" -+#line 21116 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -21123,21 +21125,21 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:21126: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:21128: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:21129: \$? = $ac_status" >&5 -+ echo "$as_me:21131: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:21132: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:21134: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:21135: \$? = $ac_status" >&5 -+ echo "$as_me:21137: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF --#line 21140 "configure" -+#line 21142 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -21149,16 +21151,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:21152: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:21154: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:21155: \$? = $ac_status" >&5 -+ echo "$as_me:21157: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:21158: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:21160: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:21161: \$? = $ac_status" >&5 -+ echo "$as_me:21163: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_hi=$ac_mid; break - else -@@ -21174,7 +21176,7 @@ - ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF --#line 21177 "configure" -+#line 21179 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -21186,16 +21188,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:21189: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:21191: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:21192: \$? = $ac_status" >&5 -+ echo "$as_me:21194: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:21195: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:21197: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:21198: \$? = $ac_status" >&5 -+ echo "$as_me:21200: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_lo=$ac_mid; break - else -@@ -21211,7 +21213,7 @@ - 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 21214 "configure" -+#line 21216 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -21223,16 +21225,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:21226: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:21228: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:21229: \$? = $ac_status" >&5 -+ echo "$as_me:21231: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:21232: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:21234: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:21235: \$? = $ac_status" >&5 -+ echo "$as_me:21237: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_hi=$ac_mid - else -@@ -21245,12 +21247,12 @@ - ac_cv_sizeof_wchar_t=$ac_lo - else - if test "$cross_compiling" = yes; then -- { { echo "$as_me:21248: error: cannot run test program while cross compiling" >&5 -+ { { echo "$as_me:21250: 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 21253 "configure" -+#line 21255 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -21266,15 +21268,15 @@ - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:21269: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:21271: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:21272: \$? = $ac_status" >&5 -+ echo "$as_me:21274: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:21274: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:21276: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:21277: \$? = $ac_status" >&5 -+ echo "$as_me:21279: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_wchar_t=`cat conftest.val` - else -@@ -21290,7 +21292,7 @@ - ac_cv_sizeof_wchar_t=0 - fi - fi --echo "$as_me:21293: result: $ac_cv_sizeof_wchar_t" >&5 -+echo "$as_me:21295: result: $ac_cv_sizeof_wchar_t" >&5 - echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6 - cat >>confdefs.h <&5 -+echo "$as_me:21313: checking for library subsets" >&5 - echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 - LIB_SUBSETS= - -@@ -21350,7 +21352,7 @@ - test "x$with_widec" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar" - test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs" - --echo "$as_me:21353: result: $LIB_SUBSETS" >&5 -+echo "$as_me:21355: result: $LIB_SUBSETS" >&5 - echo "${ECHO_T}$LIB_SUBSETS" >&6 - - ### Construct the list of include-directories to be generated -@@ -21381,7 +21383,7 @@ - fi - - ### Build up pieces for makefile rules --echo "$as_me:21384: checking default library suffix" >&5 -+echo "$as_me:21386: checking default library suffix" >&5 - echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 - - case $DFT_LWR_MODEL in -@@ -21392,10 +21394,10 @@ - (shared) DFT_ARG_SUFFIX='' ;; - esac - test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" --echo "$as_me:21395: result: $DFT_ARG_SUFFIX" >&5 -+echo "$as_me:21397: result: $DFT_ARG_SUFFIX" >&5 - echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 - --echo "$as_me:21398: checking default library-dependency suffix" >&5 -+echo "$as_me:21400: checking default library-dependency suffix" >&5 - echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 - - case X$DFT_LWR_MODEL in -@@ -21453,10 +21455,10 @@ - DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}" - DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}" - fi --echo "$as_me:21456: result: $DFT_DEP_SUFFIX" >&5 -+echo "$as_me:21458: result: $DFT_DEP_SUFFIX" >&5 - echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 - --echo "$as_me:21459: checking default object directory" >&5 -+echo "$as_me:21461: checking default object directory" >&5 - echo $ECHO_N "checking default object directory... $ECHO_C" >&6 - - case $DFT_LWR_MODEL in -@@ -21472,11 +21474,11 @@ - DFT_OBJ_SUBDIR='obj_s' ;; - esac - esac --echo "$as_me:21475: result: $DFT_OBJ_SUBDIR" >&5 -+echo "$as_me:21477: result: $DFT_OBJ_SUBDIR" >&5 - echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 - - if test "x$cf_with_cxx" = xyes ; then --echo "$as_me:21479: checking c++ library-dependency suffix" >&5 -+echo "$as_me:21481: checking c++ library-dependency suffix" >&5 - echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6 - if test "$with_libtool" != "no"; then - # libtool thinks it can make c++ shared libraries (perhaps only g++) -@@ -21544,7 +21546,7 @@ - fi - - fi --echo "$as_me:21547: result: $CXX_LIB_SUFFIX" >&5 -+echo "$as_me:21549: result: $CXX_LIB_SUFFIX" >&5 - echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 - - fi -@@ -21717,19 +21719,19 @@ - - if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED" - then -- echo "$as_me:21720: checking if linker supports switching between static/dynamic" >&5 -+ echo "$as_me:21722: checking if linker supports switching between static/dynamic" >&5 - echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6 - - rm -f libconftest.a - cat >conftest.$ac_ext < - int cf_ldflags_static(FILE *fp) { return fflush(fp); } - EOF -- if { (eval echo "$as_me:21729: \"$ac_compile\"") >&5 -+ if { (eval echo "$as_me:21731: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:21732: \$? = $ac_status" >&5 -+ echo "$as_me:21734: \$? = $ac_status" >&5 - (exit $ac_status); } ; then - ( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null - ( eval $RANLIB libconftest.a ) 2>&5 >/dev/null -@@ -21740,10 +21742,10 @@ - - LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 21743 "configure" -+#line 21745 "configure" - #include "confdefs.h" - --#line 21746 "configure" -+#line 21748 "configure" - #include - int cf_ldflags_static(FILE *fp); - -@@ -21758,16 +21760,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:21761: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:21763: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:21764: \$? = $ac_status" >&5 -+ echo "$as_me:21766: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:21767: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:21769: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:21770: \$? = $ac_status" >&5 -+ echo "$as_me:21772: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - # some linkers simply ignore the -dynamic -@@ -21790,7 +21792,7 @@ - rm -f libconftest.* - LIBS="$cf_save_LIBS" - -- echo "$as_me:21793: result: $cf_ldflags_static" >&5 -+ echo "$as_me:21795: result: $cf_ldflags_static" >&5 - echo "${ECHO_T}$cf_ldflags_static" >&6 - - if test $cf_ldflags_static != yes -@@ -21806,7 +21808,7 @@ - ;; - esac - --echo "$as_me:21809: checking where we will install curses.h" >&5 -+echo "$as_me:21811: checking where we will install curses.h" >&5 - echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 - - includesubdir= -@@ -21816,7 +21818,7 @@ - then - includesubdir="/ncurses${USE_LIB_SUFFIX}" - fi --echo "$as_me:21819: result: ${includedir}${includesubdir}" >&5 -+echo "$as_me:21821: result: ${includedir}${includesubdir}" >&5 - echo "${ECHO_T}${includedir}${includesubdir}" >&6 - - ### Resolve a conflict between normal and wide-curses by forcing applications -@@ -21824,7 +21826,7 @@ - if test "$with_overwrite" != no ; then - if test "$NCURSES_LIBUTF8" = 1 ; then - NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)' -- { echo "$as_me:21827: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 -+ { echo "$as_me:21829: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 - echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;} - fi - fi -@@ -21842,7 +21844,7 @@ - ### Construct the list of subdirectories for which we'll customize makefiles - ### with the appropriate compile-rules. - --echo "$as_me:21845: checking for src modules" >&5 -+echo "$as_me:21847: checking for src modules" >&5 - echo $ECHO_N "checking for src modules... $ECHO_C" >&6 - - # dependencies and linker-arguments for test-programs -@@ -21907,7 +21909,7 @@ - fi - fi - done --echo "$as_me:21910: result: $cf_cv_src_modules" >&5 -+echo "$as_me:21912: result: $cf_cv_src_modules" >&5 - echo "${ECHO_T}$cf_cv_src_modules" >&6 - - TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" -@@ -22127,7 +22129,7 @@ - - # Extract the first word of "tic", so it can be a program name with args. - set dummy tic; ac_word=$2 --echo "$as_me:22130: checking for $ac_word" >&5 -+echo "$as_me:22132: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_path_TIC_PATH+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -22144,7 +22146,7 @@ - test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_TIC_PATH="$ac_dir/$ac_word" -- echo "$as_me:22147: found $ac_dir/$ac_word" >&5 -+ echo "$as_me:22149: found $ac_dir/$ac_word" >&5 - break - fi - done -@@ -22156,10 +22158,10 @@ - TIC_PATH=$ac_cv_path_TIC_PATH - - if test -n "$TIC_PATH"; then -- echo "$as_me:22159: result: $TIC_PATH" >&5 -+ echo "$as_me:22161: result: $TIC_PATH" >&5 - echo "${ECHO_T}$TIC_PATH" >&6 - else -- echo "$as_me:22162: result: no" >&5 -+ echo "$as_me:22164: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -22167,7 +22169,7 @@ - then - if test "$TIC_PATH" = unknown - then -- { echo "$as_me:22170: WARNING: no tic program found for fallbacks" >&5 -+ { echo "$as_me:22172: WARNING: no tic program found for fallbacks" >&5 - echo "$as_me: WARNING: no tic program found for fallbacks" >&2;} - fi - fi -@@ -22193,7 +22195,7 @@ - (*-D_XOPEN_SOURCE_EXTENDED*) - test -n "$verbose" && echo " moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6 - --echo "${as_me:-configure}:22196: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 -+echo "${as_me:-configure}:22198: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 - - CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED" - CPPFLAGS=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'` -@@ -22204,7 +22206,7 @@ - - # Help to automatically enable the extended curses features when using either - # the *-config or the ".pc" files by adding defines. --echo "$as_me:22207: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5 -+echo "$as_me:22209: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5 - echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6 - PKG_CFLAGS= - for cf_loop1 in $CPPFLAGS_after_XOPEN -@@ -22220,7 +22222,7 @@ - done - test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1" - done --echo "$as_me:22223: result: $PKG_CFLAGS" >&5 -+echo "$as_me:22225: result: $PKG_CFLAGS" >&5 - echo "${ECHO_T}$PKG_CFLAGS" >&6 - - # AC_CHECK_SIZEOF demands a literal parameter, no variables. So we do this. -@@ -22277,7 +22279,7 @@ - cf_filter_syms=$cf_dft_filter_syms - test -n "$verbose" && echo " will map symbols to ABI=$cf_cv_abi_version" 1>&6 - --echo "${as_me:-configure}:22280: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 -+echo "${as_me:-configure}:22282: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 - - fi - -@@ -22379,7 +22381,7 @@ - : ${CONFIG_STATUS=./config.status} - ac_clean_files_save=$ac_clean_files - ac_clean_files="$ac_clean_files $CONFIG_STATUS" --{ echo "$as_me:22382: creating $CONFIG_STATUS" >&5 -+{ echo "$as_me:22384: creating $CONFIG_STATUS" >&5 - echo "$as_me: creating $CONFIG_STATUS" >&6;} - cat >$CONFIG_STATUS <<_ACEOF - #! $SHELL -@@ -22555,7 +22557,7 @@ - echo "$ac_cs_version"; exit 0 ;; - --he | --h) - # Conflict between --help and --header -- { { echo "$as_me:22558: error: ambiguous option: $1 -+ { { echo "$as_me:22560: 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;} -@@ -22574,7 +22576,7 @@ - ac_need_defaults=false;; - - # This is an error. -- -*) { { echo "$as_me:22577: error: unrecognized option: $1 -+ -*) { { echo "$as_me:22579: 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;} -@@ -22692,7 +22694,7 @@ - "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; - "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; -- *) { { echo "$as_me:22695: error: invalid argument: $ac_config_target" >&5 -+ *) { { echo "$as_me:22697: error: invalid argument: $ac_config_target" >&5 - echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; - esac -@@ -23147,7 +23149,7 @@ - esac - - if test x"$ac_file" != x-; then -- { echo "$as_me:23150: creating $ac_file" >&5 -+ { echo "$as_me:23152: creating $ac_file" >&5 - echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi -@@ -23165,7 +23167,7 @@ - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:23168: error: cannot find input file: $f" >&5 -+ test -f "$f" || { { echo "$as_me:23170: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo $f;; -@@ -23178,7 +23180,7 @@ - echo $srcdir/$f - else - # /dev/null tree -- { { echo "$as_me:23181: error: cannot find input file: $f" >&5 -+ { { echo "$as_me:23183: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; -@@ -23194,7 +23196,7 @@ - if test -n "$ac_seen"; then - ac_used=`grep '@datarootdir@' $ac_item` - if test -z "$ac_used"; then -- { echo "$as_me:23197: WARNING: datarootdir was used implicitly but not set: -+ { echo "$as_me:23199: 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;} -@@ -23203,7 +23205,7 @@ - fi - ac_seen=`grep '${datarootdir}' $ac_item` - if test -n "$ac_seen"; then -- { echo "$as_me:23206: WARNING: datarootdir was used explicitly but not set: -+ { echo "$as_me:23208: 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;} -@@ -23240,7 +23242,7 @@ - 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:23243: WARNING: Variable $ac_name is used but was not set: -+ { echo "$as_me:23245: 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;} -@@ -23251,7 +23253,7 @@ - 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:23254: WARNING: Some variables may not be substituted: -+ { echo "$as_me:23256: WARNING: Some variables may not be substituted: - $ac_seen" >&5 - echo "$as_me: WARNING: Some variables may not be substituted: - $ac_seen" >&2;} -@@ -23300,7 +23302,7 @@ - * ) ac_file_in=$ac_file.in ;; - esac - -- test x"$ac_file" != x- && { echo "$as_me:23303: creating $ac_file" >&5 -+ test x"$ac_file" != x- && { echo "$as_me:23305: creating $ac_file" >&5 - echo "$as_me: creating $ac_file" >&6;} - - # First look for the input files in the build tree, otherwise in the -@@ -23311,7 +23313,7 @@ - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:23314: error: cannot find input file: $f" >&5 -+ test -f "$f" || { { echo "$as_me:23316: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo $f;; -@@ -23324,7 +23326,7 @@ - echo $srcdir/$f - else - # /dev/null tree -- { { echo "$as_me:23327: error: cannot find input file: $f" >&5 -+ { { echo "$as_me:23329: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; -@@ -23382,7 +23384,7 @@ - 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:23385: $ac_file is unchanged" >&5 -+ { echo "$as_me:23387: $ac_file is unchanged" >&5 - echo "$as_me: $ac_file is unchanged" >&6;} - else - ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -@@ -23720,7 +23722,7 @@ - (cygdll|msysdll|mingw) - test "x$with_shared_cxx" = xno && test -n "$verbose" && echo " overriding CXX_MODEL to SHARED" 1>&6 - --echo "${as_me:-configure}:23723: testing overriding CXX_MODEL to SHARED ..." 1>&5 -+echo "${as_me:-configure}:23725: testing overriding CXX_MODEL to SHARED ..." 1>&5 - - with_shared_cxx=yes - ;; -Index: dist.mk -Prereq: 1.1065 ---- ncurses-6.0-20150810+/dist.mk 2015-08-10 09:10:29.000000000 +0000 -+++ ncurses-6.0-20150815/dist.mk 2015-08-15 15:13:47.000000000 +0000 -@@ -25,7 +25,7 @@ - # use or other dealings in this Software without prior written # - # authorization. # - ############################################################################## --# $Id: dist.mk,v 1.1065 2015/08/10 09:10:29 tom Exp $ -+# $Id: dist.mk,v 1.1066 2015/08/15 15:13:47 tom Exp $ - # Makefile for creating ncurses distributions. - # - # This only needs to be used directly as a makefile by developers, but -@@ -37,7 +37,7 @@ - # These define the major/minor/patch versions of ncurses. - NCURSES_MAJOR = 6 - NCURSES_MINOR = 0 --NCURSES_PATCH = 20150810 -+NCURSES_PATCH = 20150815 - - # We don't append the patch to the version, since this only applies to releases - VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) -Index: form/llib-lform ---- ncurses-6.0-20150810+/form/llib-lform 2015-07-25 21:41:42.000000000 +0000 -+++ ncurses-6.0-20150815/form/llib-lform 2015-08-15 17:20:49.000000000 +0000 -@@ -795,8 +795,6 @@ - - /* ./fty_num.c */ - --#include -- - typedef struct - { - int precision; -@@ -823,8 +821,6 @@ - - /* ./fty_regex.c */ - --#include -- - typedef struct - { - regex_t *pRegExp; -Index: form/llib-lformt ---- ncurses-6.0-20150810+/form/llib-lformt 2015-07-25 21:44:00.000000000 +0000 -+++ ncurses-6.0-20150815/form/llib-lformt 2015-08-15 17:22:59.000000000 +0000 -@@ -1,5 +1,5 @@ - /**************************************************************************** -- * Copyright (c) 2010-2010,2015 Free Software Foundation, Inc. * -+ * Copyright (c) 2010,2015 Free Software Foundation, Inc. * - * * - * Permission is hereby granted, free of charge, to any person obtaining a * - * copy of this software and associated documentation files (the * -@@ -795,8 +795,6 @@ - - /* ./fty_num.c */ - --#include -- - typedef struct - { - int precision; -@@ -823,8 +821,6 @@ - - /* ./fty_regex.c */ - --#include -- - typedef struct - { - regex_t *pRegExp; -Index: form/llib-lformtw ---- ncurses-6.0-20150810+/form/llib-lformtw 2015-07-25 21:43:11.000000000 +0000 -+++ ncurses-6.0-20150815/form/llib-lformtw 2015-08-15 17:22:13.000000000 +0000 -@@ -808,8 +808,6 @@ - - /* ./fty_num.c */ - --#include -- - typedef struct - { - int precision; -@@ -836,8 +834,6 @@ - - /* ./fty_regex.c */ - --#include -- - typedef struct - { - regex_t *pRegExp; -Index: form/llib-lformw ---- ncurses-6.0-20150810+/form/llib-lformw 2015-07-25 21:42:23.000000000 +0000 -+++ ncurses-6.0-20150815/form/llib-lformw 2015-08-15 17:21:28.000000000 +0000 -@@ -808,8 +808,6 @@ - - /* ./fty_num.c */ - --#include -- - typedef struct - { - int precision; -@@ -836,8 +834,6 @@ - - /* ./fty_regex.c */ - --#include -- - typedef struct - { - regex_t *pRegExp; -Index: menu/llib-lmenu ---- ncurses-6.0-20150810+/menu/llib-lmenu 2010-01-09 21:22:33.000000000 +0000 -+++ ncurses-6.0-20150815/menu/llib-lmenu 2015-08-15 17:20:51.000000000 +0000 -@@ -1,5 +1,5 @@ - /**************************************************************************** -- * Copyright (c) 1999-2005,2010 Free Software Foundation, Inc. * -+ * Copyright (c) 1998-2010,2015 Free Software Foundation, Inc. * - * * - * Permission is hereby granted, free of charge, to any person obtaining a * - * copy of this software and associated documentation files (the * -@@ -27,7 +27,7 @@ - ****************************************************************************/ - - /**************************************************************************** -- * Author: Thomas E. Dickey 1996-2005,2010 * -+ * Author: Thomas E. Dickey 1996-on * - ****************************************************************************/ - /* LINTLIBRARY */ - -Index: menu/llib-lmenut ---- ncurses-6.0-20150810+/menu/llib-lmenut 2010-01-09 22:23:22.000000000 +0000 -+++ ncurses-6.0-20150815/menu/llib-lmenut 2015-08-15 17:23:01.000000000 +0000 -@@ -1,5 +1,5 @@ - /**************************************************************************** -- * Copyright (c) 2010 Free Software Foundation, Inc. * -+ * Copyright (c) 2010,2015 Free Software Foundation, Inc. * - * * - * Permission is hereby granted, free of charge, to any person obtaining a * - * copy of this software and associated documentation files (the * -@@ -27,7 +27,7 @@ - ****************************************************************************/ - - /**************************************************************************** -- * Author: Thomas E. Dickey 2010 * -+ * Author: Thomas E. Dickey 2010-on * - ****************************************************************************/ - /* LINTLIBRARY */ - -Index: menu/llib-lmenutw ---- ncurses-6.0-20150810+/menu/llib-lmenutw 2010-01-09 22:03:09.000000000 +0000 -+++ ncurses-6.0-20150815/menu/llib-lmenutw 2015-08-15 17:22:15.000000000 +0000 -@@ -1,5 +1,5 @@ - /**************************************************************************** -- * Copyright (c) 2010 Free Software Foundation, Inc. * -+ * Copyright (c) 2010,2015 Free Software Foundation, Inc. * - * * - * Permission is hereby granted, free of charge, to any person obtaining a * - * copy of this software and associated documentation files (the * -@@ -27,7 +27,7 @@ - ****************************************************************************/ - - /**************************************************************************** -- * Author: Thomas E. Dickey 2010 * -+ * Author: Thomas E. Dickey 2010-on * - ****************************************************************************/ - /* LINTLIBRARY */ - -@@ -237,8 +237,6 @@ - - /* ./m_item_new.c */ - --#include -- - #undef new_item - ITEM *new_item( - const char *name, -Index: menu/llib-lmenuw ---- ncurses-6.0-20150810+/menu/llib-lmenuw 2010-01-09 21:53:58.000000000 +0000 -+++ ncurses-6.0-20150815/menu/llib-lmenuw 2015-08-15 17:21:31.000000000 +0000 -@@ -1,5 +1,5 @@ - /**************************************************************************** -- * Copyright (c) 2002-2005,2010 Free Software Foundation, Inc. * -+ * Copyright (c) 2002-2010,2015 Free Software Foundation, Inc. * - * * - * Permission is hereby granted, free of charge, to any person obtaining a * - * copy of this software and associated documentation files (the * -@@ -27,7 +27,7 @@ - ****************************************************************************/ - - /**************************************************************************** -- * Author: Thomas E. Dickey 2002-2005,2010 * -+ * Author: Thomas E. Dickey 2002-on * - ****************************************************************************/ - /* LINTLIBRARY */ - -@@ -237,8 +237,6 @@ - - /* ./m_item_new.c */ - --#include -- - #undef new_item - ITEM *new_item( - const char *name, -Index: ncurses/llib-lncurses ---- ncurses-6.0-20150810+/ncurses/llib-lncurses 2015-07-25 22:52:04.000000000 +0000 -+++ ncurses-6.0-20150815/ncurses/llib-lncurses 2015-08-15 19:06:20.000000000 +0000 -@@ -2511,10 +2511,6 @@ - - /* ./trace/varargs.c */ - --typedef enum { -- atUnknown = 0, atInteger, atFloat, atPoint, atString --} ARGTYPE; -- - #undef _nc_varargs - char *_nc_varargs( - const char *fmt, -@@ -3792,11 +3788,6 @@ - - /* ./trace/lib_tracebits.c */ - --typedef struct { -- unsigned int val; -- const char name[8]; --} BITNAMES; -- - #undef _nc_trace_ttymode - char *_nc_trace_ttymode( - struct termios *tty) -@@ -3980,9 +3971,11 @@ - - /* ./tinfo/read_termcap.c */ - --#undef _nc_read_termcap --void _nc_read_termcap(void) -- { /* void */ } -+#undef _nc_read_termcap_entry -+int _nc_read_termcap_entry( -+ const char *const tn, -+ TERMTYPE *const tp) -+ { return(*(int *)0); } - - /* ./tinfo/strings.c */ - -@@ -4264,11 +4257,6 @@ - const char *t) - { return(*(int *)0); } - --typedef struct { -- const char from[3]; -- const char to[6]; --} assoc; -- - /* ./tinfo/write_entry.c */ - - #undef _nc_set_writedir -Index: ncurses/llib-lncursest ---- ncurses-6.0-20150810+/ncurses/llib-lncursest 2015-07-25 23:02:48.000000000 +0000 -+++ ncurses-6.0-20150815/ncurses/llib-lncursest 2015-08-15 20:08:58.000000000 +0000 -@@ -2520,10 +2520,6 @@ - - /* ./trace/varargs.c */ - --typedef enum { -- atUnknown = 0, atInteger, atFloat, atPoint, atString --} ARGTYPE; -- - #undef _nc_varargs - char *_nc_varargs( - const char *fmt, -@@ -3894,11 +3890,6 @@ - - /* ./trace/lib_tracebits.c */ - --typedef struct { -- unsigned int val; -- const char name[8]; --} BITNAMES; -- - #undef _nc_trace_ttymode - char *_nc_trace_ttymode( - struct termios *tty) -@@ -4093,9 +4084,11 @@ - - /* ./tinfo/read_termcap.c */ - --#undef _nc_read_termcap --void _nc_read_termcap(void) -- { /* void */ } -+#undef _nc_read_termcap_entry -+int _nc_read_termcap_entry( -+ const char *const tn, -+ TERMTYPE *const tp) -+ { return(*(int *)0); } - - /* ./tinfo/strings.c */ - -@@ -4377,11 +4370,6 @@ - const char *t) - { return(*(int *)0); } - --typedef struct { -- const char from[3]; -- const char to[6]; --} assoc; -- - /* ./tinfo/write_entry.c */ - - #undef _nc_set_writedir -Index: ncurses/llib-lncursestw ---- ncurses-6.0-20150810+/ncurses/llib-lncursestw 2015-07-25 23:03:50.000000000 +0000 -+++ ncurses-6.0-20150815/ncurses/llib-lncursestw 2015-08-15 19:07:52.000000000 +0000 -@@ -3028,10 +3028,6 @@ - - /* ./trace/varargs.c */ - --typedef enum { -- atUnknown = 0, atInteger, atFloat, atPoint, atString --} ARGTYPE; -- - #undef _nc_varargs - char *_nc_varargs( - const char *fmt, -@@ -4688,11 +4684,6 @@ - - /* ./trace/lib_tracebits.c */ - --typedef struct { -- unsigned int val; -- const char name[8]; --} BITNAMES; -- - #undef _nc_trace_ttymode - char *_nc_trace_ttymode( - struct termios *tty) -@@ -4887,9 +4878,11 @@ - - /* ./tinfo/read_termcap.c */ - --#undef _nc_read_termcap --void _nc_read_termcap(void) -- { /* void */ } -+#undef _nc_read_termcap_entry -+int _nc_read_termcap_entry( -+ const char *const tn, -+ TERMTYPE *const tp) -+ { return(*(int *)0); } - - /* ./tinfo/strings.c */ - -@@ -5193,11 +5186,6 @@ - const char *t) - { return(*(int *)0); } - --typedef struct { -- const char from[3]; -- const char to[6]; --} assoc; -- - /* ./tinfo/write_entry.c */ - - #undef _nc_set_writedir -Index: ncurses/llib-lncursesw ---- ncurses-6.0-20150810+/ncurses/llib-lncursesw 2015-07-25 23:04:15.000000000 +0000 -+++ ncurses-6.0-20150815/ncurses/llib-lncursesw 2015-08-15 20:03:43.000000000 +0000 -@@ -1904,13 +1904,6 @@ - - /* ./base/lib_mouse.c */ - --typedef struct { -- int nerror; -- int nparam; -- int params[9]; -- int final; --} SGR_DATA; -- - #undef getmouse_sp - int getmouse_sp( - SCREEN *sp, -@@ -2402,28 +2395,6 @@ - - /* ./base/lib_screen.c */ - --typedef enum { -- pINT -- ,pSHORT -- ,pBOOL -- ,pATTR -- ,pCHAR -- ,pSIZE -- ,pCCHAR --} PARAM_TYPE; -- --typedef struct { -- const char name[11]; -- attr_t attr; --} SCR_ATTRS; -- --typedef struct { -- const char name[17]; -- PARAM_TYPE type; -- size_t size; -- size_t offset; --} SCR_PARAMS; -- - #undef getwin_sp - WINDOW *getwin_sp( - SCREEN *sp, -@@ -3048,10 +3019,6 @@ - - /* ./trace/varargs.c */ - --typedef enum { -- atUnknown = 0, atInteger, atFloat, atPoint, atString --} ARGTYPE; -- - #undef _nc_varargs - char *_nc_varargs( - const char *fmt, -@@ -4615,11 +4582,6 @@ - - /* ./trace/lib_tracebits.c */ - --typedef struct { -- unsigned int val; -- const char name[8]; --} BITNAMES; -- - #undef _nc_trace_ttymode - char *_nc_trace_ttymode( - struct termios *tty) -@@ -4803,9 +4765,11 @@ - - /* ./tinfo/read_termcap.c */ - --#undef _nc_read_termcap --void _nc_read_termcap(void) -- { /* void */ } -+#undef _nc_read_termcap_entry -+int _nc_read_termcap_entry( -+ const char *const tn, -+ TERMTYPE *const tp) -+ { return(*(int *)0); } - - /* ./tinfo/strings.c */ - -@@ -5109,11 +5073,6 @@ - const char *t) - { return(*(int *)0); } - --typedef struct { -- const char from[3]; -- const char to[6]; --} assoc; -- - /* ./tinfo/write_entry.c */ - - #undef _nc_set_writedir -Index: ncurses/llib-ltic ---- ncurses-6.0-20150810+/ncurses/llib-ltic 2015-07-25 22:52:52.000000000 +0000 -+++ ncurses-6.0-20150815/ncurses/llib-ltic 2015-08-15 19:06:29.000000000 +0000 -@@ -34,8 +34,6 @@ - /* ./tinfo/alloc_entry.c */ - - #include --#include -- - #undef _nc_init_entry - void _nc_init_entry( - TERMTYPE *const tp) -@@ -65,8 +63,6 @@ - - /* ./tinfo/captoinfo.c */ - --#include -- - #undef _nc_captoinfo - char *_nc_captoinfo( - const char *cap, -@@ -188,15 +184,8 @@ - const char *t) - { return(*(int *)0); } - --typedef struct { -- const char from[3]; -- const char to[6]; --} assoc; -- - /* ./tinfo/write_entry.c */ - --#include -- - #undef _nc_set_writedir - void _nc_set_writedir( - const char *dir) -Index: ncurses/llib-ltict ---- ncurses-6.0-20150810+/ncurses/llib-ltict 2015-07-25 22:49:03.000000000 +0000 -+++ ncurses-6.0-20150815/ncurses/llib-ltict 2015-08-15 19:08:45.000000000 +0000 -@@ -34,8 +34,6 @@ - /* ./tinfo/alloc_entry.c */ - - #include --#include -- - #undef _nc_init_entry - void _nc_init_entry( - TERMTYPE *const tp) -@@ -65,8 +63,6 @@ - - /* ./tinfo/captoinfo.c */ - --#include -- - #undef _nc_captoinfo - char *_nc_captoinfo( - const char *cap, -@@ -188,15 +184,8 @@ - const char *t) - { return(*(int *)0); } - --typedef struct { -- const char from[3]; -- const char to[6]; --} assoc; -- - /* ./tinfo/write_entry.c */ - --#include -- - #undef _nc_set_writedir - void _nc_set_writedir( - const char *dir) -Index: ncurses/llib-ltictw ---- ncurses-6.0-20150810+/ncurses/llib-ltictw 2015-07-25 22:45:20.000000000 +0000 -+++ ncurses-6.0-20150815/ncurses/llib-ltictw 2015-08-15 19:08:02.000000000 +0000 -@@ -34,8 +34,6 @@ - /* ./tinfo/alloc_entry.c */ - - #include --#include -- - #undef _nc_init_entry - void _nc_init_entry( - TERMTYPE *const tp) -@@ -65,8 +63,6 @@ - - /* ./tinfo/captoinfo.c */ - --#include -- - #undef _nc_captoinfo - char *_nc_captoinfo( - const char *cap, -@@ -188,15 +184,8 @@ - const char *t) - { return(*(int *)0); } - --typedef struct { -- const char from[3]; -- const char to[6]; --} assoc; -- - /* ./tinfo/write_entry.c */ - --#include -- - #undef _nc_set_writedir - void _nc_set_writedir( - const char *dir) -Index: ncurses/llib-lticw ---- ncurses-6.0-20150810+/ncurses/llib-lticw 2015-07-25 22:45:08.000000000 +0000 -+++ ncurses-6.0-20150815/ncurses/llib-lticw 2015-08-15 19:07:15.000000000 +0000 -@@ -34,8 +34,6 @@ - /* ./tinfo/alloc_entry.c */ - - #include --#include -- - #undef _nc_init_entry - void _nc_init_entry( - TERMTYPE *const tp) -@@ -65,8 +63,6 @@ - - /* ./tinfo/captoinfo.c */ - --#include -- - #undef _nc_captoinfo - char *_nc_captoinfo( - const char *cap, -@@ -188,15 +184,8 @@ - const char *t) - { return(*(int *)0); } - --typedef struct { -- const char from[3]; -- const char to[6]; --} assoc; -- - /* ./tinfo/write_entry.c */ - --#include -- - #undef _nc_set_writedir - void _nc_set_writedir( - const char *dir) -Index: ncurses/llib-ltinfo ---- ncurses-6.0-20150810+/ncurses/llib-ltinfo 2015-07-25 21:42:11.000000000 +0000 -+++ ncurses-6.0-20150815/ncurses/llib-ltinfo 2015-08-15 19:06:34.000000000 +0000 -@@ -34,9 +34,6 @@ - /* ./tinfo/access.c */ - - #include --#include --#include -- - #undef _nc_rootname - char *_nc_rootname( - char *path) -@@ -111,8 +108,6 @@ - - /* ./comp_captab.c */ - --#include -- - #undef _nc_get_table - const struct name_table_entry *_nc_get_table( - NCURSES_BOOL termcap) -@@ -196,8 +191,6 @@ - - /* ./tinfo/db_iterator.c */ - --#include -- - #undef _nc_tic_dir - const char *_nc_tic_dir( - const char *path) -@@ -303,15 +296,6 @@ - - /* ./tinfo/init_keytry.c */ - --#if 0 -- --#include -- --#undef _nc_tinfo_fkeys --const struct tinfo_fkeys _nc_tinfo_fkeys[] = {0}; -- --#endif -- - #undef _nc_init_keytry - void _nc_init_keytry( - SCREEN *sp) -@@ -333,8 +317,6 @@ - - /* ./tinfo/lib_baudrate.c */ - --#include -- - struct speed { - short s; - int sp; -@@ -485,8 +467,6 @@ - - /* ./tinfo/lib_napms.c */ - --#include -- - #undef napms_sp - int napms_sp( - SCREEN *sp, -@@ -670,10 +650,6 @@ - - /* ./tinfo/lib_setup.c */ - --#include --#include --#include -- - #undef ttytype - char ttytype[256]; - #undef LINES -@@ -791,12 +767,6 @@ - const char *name) - { return(*(int *)0); } - --#if 0 -- --#include -- --#endif -- - #undef tgetent - int tgetent( - char *bufp, -@@ -1136,11 +1106,6 @@ - - /* ./trace/lib_tracebits.c */ - --typedef struct { -- unsigned int val; -- const char name[8]; --} BITNAMES; -- - #undef _nc_trace_ttymode - char *_nc_trace_ttymode( - struct termios *tty) -@@ -1297,8 +1262,6 @@ - - /* ./tinfo/read_entry.c */ - --#include -- - #undef _nc_init_termtype - void _nc_init_termtype( - TERMTYPE *const tp) -@@ -1326,8 +1289,6 @@ - - /* ./tinfo/read_termcap.c */ - --#include -- - #undef _nc_read_termcap - void _nc_read_termcap(void) - { /* void */ } -Index: ncurses/llib-ltinfot ---- ncurses-6.0-20150810+/ncurses/llib-ltinfot 2015-07-25 21:44:32.000000000 +0000 -+++ ncurses-6.0-20150815/ncurses/llib-ltinfot 2015-08-15 19:08:50.000000000 +0000 -@@ -1,5 +1,5 @@ - /**************************************************************************** -- * Copyright (c) 2013-2013,2015 Free Software Foundation, Inc. * -+ * Copyright (c) 2013,2015 Free Software Foundation, Inc. * - * * - * Permission is hereby granted, free of charge, to any person obtaining a * - * copy of this software and associated documentation files (the * -@@ -34,9 +34,6 @@ - /* ./tinfo/access.c */ - - #include --#include --#include -- - #undef _nc_rootname - char *_nc_rootname( - char *path) -@@ -116,8 +113,6 @@ - - /* ./comp_captab.c */ - --#include -- - #undef _nc_get_table - const struct name_table_entry *_nc_get_table( - NCURSES_BOOL termcap) -@@ -201,8 +196,6 @@ - - /* ./tinfo/db_iterator.c */ - --#include -- - #undef _nc_tic_dir - const char *_nc_tic_dir( - const char *path) -@@ -308,15 +301,6 @@ - - /* ./tinfo/init_keytry.c */ - --#if 0 -- --#include -- --#undef _nc_tinfo_fkeys --const struct tinfo_fkeys _nc_tinfo_fkeys[] = {0}; -- --#endif -- - #undef _nc_init_keytry - void _nc_init_keytry( - SCREEN *sp) -@@ -339,8 +323,6 @@ - - /* ./tinfo/lib_baudrate.c */ - --#include -- - struct speed { - short s; - int sp; -@@ -714,10 +696,6 @@ - - /* ./tinfo/lib_setup.c */ - --#include --#include --#include -- - #undef _nc_ttytype - char *_nc_ttytype(void) - { return(*(char **)0); } -@@ -857,12 +835,6 @@ - const char *name) - { return(*(int *)0); } - --#if 0 -- --#include -- --#endif -- - #undef tgetent - int tgetent( - char *bufp, -@@ -1227,11 +1199,6 @@ - - /* ./trace/lib_tracebits.c */ - --typedef struct { -- unsigned int val; -- const char name[8]; --} BITNAMES; -- - #undef _nc_trace_ttymode - char *_nc_trace_ttymode( - struct termios *tty) -@@ -1334,8 +1301,6 @@ - - /* ./tty/lib_twait.c */ - --#include -- - #undef _nc_timed_wait - int _nc_timed_wait( - SCREEN *sp, -@@ -1401,8 +1366,6 @@ - - /* ./tinfo/read_entry.c */ - --#include -- - #undef _nc_init_termtype - void _nc_init_termtype( - TERMTYPE *const tp) -@@ -1430,8 +1393,6 @@ - - /* ./tinfo/read_termcap.c */ - --#include -- - #undef _nc_read_termcap - void _nc_read_termcap(void) - { /* void */ } -Index: ncurses/llib-ltinfotw ---- ncurses-6.0-20150810+/ncurses/llib-ltinfotw 2015-07-25 21:43:48.000000000 +0000 -+++ ncurses-6.0-20150815/ncurses/llib-ltinfotw 2015-08-15 19:08:08.000000000 +0000 -@@ -34,9 +34,6 @@ - /* ./tinfo/access.c */ - - #include --#include --#include -- - #undef _nc_rootname - char *_nc_rootname( - char *path) -@@ -116,8 +113,6 @@ - - /* ./comp_captab.c */ - --#include -- - #undef _nc_get_table - const struct name_table_entry *_nc_get_table( - NCURSES_BOOL termcap) -@@ -201,8 +196,6 @@ - - /* ./tinfo/db_iterator.c */ - --#include -- - #undef _nc_tic_dir - const char *_nc_tic_dir( - const char *path) -@@ -308,15 +301,6 @@ - - /* ./tinfo/init_keytry.c */ - --#if 0 -- --#include -- --#undef _nc_tinfo_fkeys --const struct tinfo_fkeys _nc_tinfo_fkeys[] = {0}; -- --#endif -- - #undef _nc_init_keytry - void _nc_init_keytry( - SCREEN *sp) -@@ -339,8 +323,6 @@ - - /* ./tinfo/lib_baudrate.c */ - --#include -- - struct speed { - short s; - int sp; -@@ -714,10 +696,6 @@ - - /* ./tinfo/lib_setup.c */ - --#include --#include --#include -- - #undef _nc_ttytype - char *_nc_ttytype(void) - { return(*(char **)0); } -@@ -857,12 +835,6 @@ - const char *name) - { return(*(int *)0); } - --#if 0 -- --#include -- --#endif -- - #undef tgetent - int tgetent( - char *bufp, -@@ -1238,11 +1210,6 @@ - - /* ./trace/lib_tracebits.c */ - --typedef struct { -- unsigned int val; -- const char name[8]; --} BITNAMES; -- - #undef _nc_trace_ttymode - char *_nc_trace_ttymode( - struct termios *tty) -@@ -1345,8 +1312,6 @@ - - /* ./tty/lib_twait.c */ - --#include -- - #undef _nc_timed_wait - int _nc_timed_wait( - SCREEN *sp, -@@ -1412,8 +1377,6 @@ - - /* ./tinfo/read_entry.c */ - --#include -- - #undef _nc_init_termtype - void _nc_init_termtype( - TERMTYPE *const tp) -@@ -1441,8 +1404,6 @@ - - /* ./tinfo/read_termcap.c */ - --#include -- - #undef _nc_read_termcap - void _nc_read_termcap(void) - { /* void */ } -Index: ncurses/llib-ltinfow ---- ncurses-6.0-20150810+/ncurses/llib-ltinfow 2015-07-25 21:42:57.000000000 +0000 -+++ ncurses-6.0-20150815/ncurses/llib-ltinfow 2015-08-15 19:07:20.000000000 +0000 -@@ -34,9 +34,6 @@ - /* ./tinfo/access.c */ - - #include --#include --#include -- - #undef _nc_rootname - char *_nc_rootname( - char *path) -@@ -111,8 +108,6 @@ - - /* ./comp_captab.c */ - --#include -- - #undef _nc_get_table - const struct name_table_entry *_nc_get_table( - NCURSES_BOOL termcap) -@@ -196,8 +191,6 @@ - - /* ./tinfo/db_iterator.c */ - --#include -- - #undef _nc_tic_dir - const char *_nc_tic_dir( - const char *path) -@@ -303,15 +296,6 @@ - - /* ./tinfo/init_keytry.c */ - --#if 0 -- --#include -- --#undef _nc_tinfo_fkeys --const struct tinfo_fkeys _nc_tinfo_fkeys[] = {0}; -- --#endif -- - #undef _nc_init_keytry - void _nc_init_keytry( - SCREEN *sp) -@@ -333,8 +317,6 @@ - - /* ./tinfo/lib_baudrate.c */ - --#include -- - struct speed { - short s; - int sp; -@@ -485,8 +467,6 @@ - - /* ./tinfo/lib_napms.c */ - --#include -- - #undef napms_sp - int napms_sp( - SCREEN *sp, -@@ -670,10 +650,6 @@ - - /* ./tinfo/lib_setup.c */ - --#include --#include --#include -- - #undef ttytype - char ttytype[256]; - #undef LINES -@@ -791,12 +767,6 @@ - const char *name) - { return(*(int *)0); } - --#if 0 -- --#include -- --#endif -- - #undef tgetent - int tgetent( - char *bufp, -@@ -1147,11 +1117,6 @@ - - /* ./trace/lib_tracebits.c */ - --typedef struct { -- unsigned int val; -- const char name[8]; --} BITNAMES; -- - #undef _nc_trace_ttymode - char *_nc_trace_ttymode( - struct termios *tty) -@@ -1308,8 +1273,6 @@ - - /* ./tinfo/read_entry.c */ - --#include -- - #undef _nc_init_termtype - void _nc_init_termtype( - TERMTYPE *const tp) -@@ -1337,8 +1300,6 @@ - - /* ./tinfo/read_termcap.c */ - --#include -- - #undef _nc_read_termcap - void _nc_read_termcap(void) - { /* void */ } -Index: package/debian-mingw/changelog ---- ncurses-6.0-20150810+/package/debian-mingw/changelog 2015-08-10 09:10:30.000000000 +0000 -+++ ncurses-6.0-20150815/package/debian-mingw/changelog 2015-08-15 15:13:47.000000000 +0000 -@@ -1,8 +1,8 @@ --ncurses6 (6.0+20150810) unstable; urgency=low -+ncurses6 (6.0+20150815) unstable; urgency=low - - * latest weekly patch - -- -- Thomas E. Dickey Mon, 10 Aug 2015 05:10:30 -0400 -+ -- Thomas E. Dickey Sat, 15 Aug 2015 11:13:47 -0400 - - ncurses6 (5.9-20131005) unstable; urgency=low - -Index: package/debian-mingw64/changelog ---- ncurses-6.0-20150810+/package/debian-mingw64/changelog 2015-08-10 09:10:30.000000000 +0000 -+++ ncurses-6.0-20150815/package/debian-mingw64/changelog 2015-08-15 15:13:47.000000000 +0000 -@@ -1,8 +1,8 @@ --ncurses6 (6.0+20150810) unstable; urgency=low -+ncurses6 (6.0+20150815) unstable; urgency=low - - * latest weekly patch - -- -- Thomas E. Dickey Mon, 10 Aug 2015 05:10:30 -0400 -+ -- Thomas E. Dickey Sat, 15 Aug 2015 11:13:47 -0400 - - ncurses6 (5.9-20131005) unstable; urgency=low - -Index: package/debian/changelog ---- ncurses-6.0-20150810+/package/debian/changelog 2015-08-10 09:10:29.000000000 +0000 -+++ ncurses-6.0-20150815/package/debian/changelog 2015-08-15 15:13:47.000000000 +0000 -@@ -1,8 +1,8 @@ --ncurses6 (6.0+20150810) unstable; urgency=low -+ncurses6 (6.0+20150815) unstable; urgency=low - - * latest weekly patch - -- -- Thomas E. Dickey Mon, 10 Aug 2015 05:10:29 -0400 -+ -- Thomas E. Dickey Sat, 15 Aug 2015 11:13:47 -0400 - - ncurses6 (5.9-20120608) unstable; urgency=low - -Index: package/mingw-ncurses.nsi -Prereq: 1.118 ---- ncurses-6.0-20150810+/package/mingw-ncurses.nsi 2015-08-10 09:10:30.000000000 +0000 -+++ ncurses-6.0-20150815/package/mingw-ncurses.nsi 2015-08-15 15:13:47.000000000 +0000 -@@ -1,4 +1,4 @@ --; $Id: mingw-ncurses.nsi,v 1.118 2015/08/10 09:10:30 tom Exp $ -+; $Id: mingw-ncurses.nsi,v 1.119 2015/08/15 15:13:47 tom Exp $ - - ; TODO add examples - ; TODO bump ABI to 6 -@@ -10,7 +10,7 @@ - !define VERSION_MAJOR "6" - !define VERSION_MINOR "0" - !define VERSION_YYYY "2015" --!define VERSION_MMDD "0810" -+!define VERSION_MMDD "0815" - !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} - - !define MY_ABI "5" -Index: package/mingw-ncurses.spec ---- ncurses-6.0-20150810+/package/mingw-ncurses.spec 2015-08-10 09:10:29.000000000 +0000 -+++ ncurses-6.0-20150815/package/mingw-ncurses.spec 2015-08-15 15:13:47.000000000 +0000 -@@ -3,7 +3,7 @@ - Summary: shared libraries for terminal handling - Name: mingw32-ncurses6 - Version: 6.0 --Release: 20150810 -+Release: 20150815 - License: X11 - Group: Development/Libraries - Source: ncurses-%{version}-%{release}.tgz -Index: package/ncurses.spec ---- ncurses-6.0-20150810+/package/ncurses.spec 2015-08-10 09:10:29.000000000 +0000 -+++ ncurses-6.0-20150815/package/ncurses.spec 2015-08-15 15:13:47.000000000 +0000 -@@ -1,7 +1,7 @@ - Summary: shared libraries for terminal handling - Name: ncurses6 - Version: 6.0 --Release: 20150810 -+Release: 20150815 - License: X11 - Group: Development/Libraries - Source: ncurses-%{version}-%{release}.tgz -Index: panel/llib-lpanelt ---- ncurses-6.0-20150810+/panel/llib-lpanelt 2015-07-25 21:44:18.000000000 +0000 -+++ ncurses-6.0-20150815/panel/llib-lpanelt 2015-08-15 17:26:01.000000000 +0000 -@@ -1,5 +1,5 @@ - /**************************************************************************** -- * Copyright (c) 2010-2010,2015 Free Software Foundation, Inc. * -+ * Copyright (c) 2010,2015 Free Software Foundation, Inc. * - * * - * Permission is hereby granted, free of charge, to any person obtaining a * - * copy of this software and associated documentation files (the * -Index: panel/llib-lpaneltw ---- ncurses-6.0-20150810+/panel/llib-lpaneltw 2015-07-25 21:43:33.000000000 +0000 -+++ ncurses-6.0-20150815/panel/llib-lpaneltw 2015-08-15 17:22:34.000000000 +0000 -@@ -1,5 +1,5 @@ - /**************************************************************************** -- * Copyright (c) 2010-2010,2015 Free Software Foundation, Inc. * -+ * Copyright (c) 2010,2015 Free Software Foundation, Inc. * - * * - * Permission is hereby granted, free of charge, to any person obtaining a * - * copy of this software and associated documentation files (the * diff --git a/ncurses-6.0-20150822.patch b/ncurses-6.0-20150822.patch deleted file mode 100644 index 202ffe8..0000000 --- a/ncurses-6.0-20150822.patch +++ /dev/null @@ -1,19082 +0,0 @@ -# ncurses 6.0 - patch 20150822 - Thomas E. Dickey -# -# ------------------------------------------------------------------------------ -# -# Ncurses 6.0 is at -# ftp.gnu.org:/pub/gnu -# -# Patches for ncurses 6.0 are in the subdirectory -# ftp://invisible-island.net/ncurses/6.0 -# -# ------------------------------------------------------------------------------ -# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20150822.patch.gz -# patch by Thomas E. Dickey -# created Sun Aug 23 00:47:10 UTC 2015 -# ------------------------------------------------------------------------------ -# Ada95/aclocal.m4 | 35 -# Ada95/configure | 2022 +++++++++++---------- -# NEWS | 12 -# VERSION | 2 -# aclocal.m4 | 28 -# configure | 3412 ++++++++++++++++++------------------- -# dist.mk | 4 -# include/term_entry.h | 10 -# man/curs_variables.3x | 18 -# ncurses/base/lib_color.c | 6 -# package/debian-mingw/changelog | 4 -# package/debian-mingw64/changelog | 4 -# package/debian/changelog | 4 -# package/mingw-ncurses.nsi | 4 -# package/mingw-ncurses.spec | 2 -# package/ncurses.spec | 2 -# progs/infocmp.c | 10 -# progs/tic.c | 7 -# test/demo_menus.c | 8 -# test/savescreen.c | 4 -# 20 files changed, 2823 insertions(+), 2775 deletions(-) -# ------------------------------------------------------------------------------ -Index: Ada95/aclocal.m4 -Prereq: 1.105 ---- ncurses-6.0-20150815+/Ada95/aclocal.m4 2015-08-08 14:25:40.000000000 +0000 -+++ ncurses-6.0-20150822/Ada95/aclocal.m4 2015-08-22 21:14:14.000000000 +0000 -@@ -28,7 +28,7 @@ - dnl - dnl Author: Thomas E. Dickey - dnl --dnl $Id: aclocal.m4,v 1.105 2015/08/08 14:25:40 tom Exp $ -+dnl $Id: aclocal.m4,v 1.106 2015/08/22 21:14:14 tom Exp $ - dnl Macros used in NCURSES Ada95 auto-configuration script. - dnl - dnl These macros are maintained separately from NCURSES. The copyright on -@@ -2921,7 +2921,7 @@ - $1=`echo "$2" | sed -e 's/-l$3[[ ]]//g' -e 's/-l$3[$]//'` - ])dnl - dnl --------------------------------------------------------------------------- --dnl CF_SHARED_OPTS version: 88 updated: 2015/08/05 20:44:28 -+dnl CF_SHARED_OPTS version: 89 updated: 2015/08/15 18:38:59 - dnl -------------- - dnl -------------- - dnl Attempt to determine the appropriate CC/LD options for creating a shared -@@ -2974,11 +2974,12 @@ - (yes) - cf_cv_shlib_version=auto - ;; -- (rel|abi|auto|no) -+ (rel|abi|auto) - cf_cv_shlib_version=$withval - ;; - (*) -- AC_MSG_ERROR([option value must be one of: rel, abi, auto or no]) -+ AC_MSG_RESULT($withval) -+ AC_MSG_ERROR([option value must be one of: rel, abi, or auto]) - ;; - esac - ],[cf_cv_shlib_version=auto]) -@@ -3701,19 +3702,25 @@ - AC_SUBST($3)dnl - ])dnl - dnl --------------------------------------------------------------------------- --dnl CF_WITH_PKG_CONFIG_LIBDIR version: 9 updated: 2015/06/06 19:26:44 -+dnl CF_WITH_PKG_CONFIG_LIBDIR version: 10 updated: 2015/08/22 17:10:56 - dnl ------------------------- - dnl Allow the choice of the pkg-config library directory to be overridden. - AC_DEFUN([CF_WITH_PKG_CONFIG_LIBDIR],[ --if test "x$PKG_CONFIG" = xnone ; then -- PKG_CONFIG_LIBDIR=no --else -+ -+case $PKG_CONFIG in -+(no|none|yes) -+ AC_MSG_CHECKING(for pkg-config library directory) -+ ;; -+(*) - AC_MSG_CHECKING(for $PKG_CONFIG library directory) -- AC_ARG_WITH(pkg-config-libdir, -- [ --with-pkg-config-libdir=XXX use given directory for installing pc-files], -- [PKG_CONFIG_LIBDIR=$withval], -- [PKG_CONFIG_LIBDIR=yes]) --fi -+ ;; -+esac -+ -+PKG_CONFIG_LIBDIR=no -+AC_ARG_WITH(pkg-config-libdir, -+ [ --with-pkg-config-libdir=XXX use given directory for installing pc-files], -+ [PKG_CONFIG_LIBDIR=$withval], -+ [test "x$PKG_CONFIG" != xnone && PKG_CONFIG_LIBDIR=yes]) - - case x$PKG_CONFIG_LIBDIR in - (x/*) -@@ -3769,7 +3776,7 @@ - ;; - esac - --if test "x$PKG_CONFIG" != xnone ; then -+if test "x$PKG_CONFIG_LIBDIR" != xno ; then - AC_MSG_RESULT($PKG_CONFIG_LIBDIR) - fi - -Index: Ada95/configure ---- ncurses-6.0-20150815+/Ada95/configure 2015-08-08 14:26:00.000000000 +0000 -+++ ncurses-6.0-20150822/Ada95/configure 2015-08-22 21:14:42.000000000 +0000 -@@ -2547,20 +2547,26 @@ - echo "$as_me: WARNING: pkg-config is not installed" >&2;} - fi - --if test "x$PKG_CONFIG" = xnone ; then -- PKG_CONFIG_LIBDIR=no --else -- echo "$as_me:2553: checking for $PKG_CONFIG library directory" >&5 -+case $PKG_CONFIG in -+(no|none|yes) -+ echo "$as_me:2552: checking for pkg-config library directory" >&5 -+echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6 -+ ;; -+(*) -+ echo "$as_me:2556: checking for $PKG_CONFIG library directory" >&5 - echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6 -+ ;; -+esac -+ -+PKG_CONFIG_LIBDIR=no - - # Check whether --with-pkg-config-libdir or --without-pkg-config-libdir was given. - if test "${with_pkg_config_libdir+set}" = set; then - withval="$with_pkg_config_libdir" - PKG_CONFIG_LIBDIR=$withval - else -- PKG_CONFIG_LIBDIR=yes -+ test "x$PKG_CONFIG" != xnone && PKG_CONFIG_LIBDIR=yes - fi; --fi - - case x$PKG_CONFIG_LIBDIR in - (x/*) -@@ -2602,18 +2608,18 @@ - - test -n "$verbose" && echo " list..." 1>&6 - --echo "${as_me:-configure}:2605: testing list... ..." 1>&5 -+echo "${as_me:-configure}:2611: testing list... ..." 1>&5 - - for cf_config in $cf_search_path - do - test -n "$verbose" && echo " checking $cf_config/pkgconfig" 1>&6 - --echo "${as_me:-configure}:2611: testing checking $cf_config/pkgconfig ..." 1>&5 -+echo "${as_me:-configure}:2617: testing checking $cf_config/pkgconfig ..." 1>&5 - - if test -d $cf_config/pkgconfig - then - PKG_CONFIG_LIBDIR=$cf_config/pkgconfig -- echo "$as_me:2616: checking done" >&5 -+ echo "$as_me:2622: checking done" >&5 - echo $ECHO_N "checking done... $ECHO_C" >&6 - break - fi -@@ -2623,12 +2629,12 @@ - ;; - esac - --if test "x$PKG_CONFIG" != xnone ; then -- echo "$as_me:2627: result: $PKG_CONFIG_LIBDIR" >&5 -+if test "x$PKG_CONFIG_LIBDIR" != xno ; then -+ echo "$as_me:2633: result: $PKG_CONFIG_LIBDIR" >&5 - echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 - fi - --echo "$as_me:2631: checking if you want to build test-programs" >&5 -+echo "$as_me:2637: checking if you want to build test-programs" >&5 - echo $ECHO_N "checking if you want to build test-programs... $ECHO_C" >&6 - - # Check whether --with-tests or --without-tests was given. -@@ -2638,10 +2644,10 @@ - else - cf_with_tests=yes - fi; --echo "$as_me:2641: result: $cf_with_tests" >&5 -+echo "$as_me:2647: result: $cf_with_tests" >&5 - echo "${ECHO_T}$cf_with_tests" >&6 - --echo "$as_me:2644: checking if we should assume mixed-case filenames" >&5 -+echo "$as_me:2650: checking if we should assume mixed-case filenames" >&5 - echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6 - - # Check whether --enable-mixed-case or --disable-mixed-case was given. -@@ -2651,11 +2657,11 @@ - else - enable_mixedcase=auto - fi; --echo "$as_me:2654: result: $enable_mixedcase" >&5 -+echo "$as_me:2660: result: $enable_mixedcase" >&5 - echo "${ECHO_T}$enable_mixedcase" >&6 - if test "$enable_mixedcase" = "auto" ; then - --echo "$as_me:2658: checking if filesystem supports mixed-case filenames" >&5 -+echo "$as_me:2664: 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 -@@ -2682,7 +2688,7 @@ - fi - - fi --echo "$as_me:2685: result: $cf_cv_mixedcase" >&5 -+echo "$as_me:2691: result: $cf_cv_mixedcase" >&5 - echo "${ECHO_T}$cf_cv_mixedcase" >&6 - test "$cf_cv_mixedcase" = yes && - cat >>confdefs.h <<\EOF -@@ -2700,7 +2706,7 @@ - fi - - # do this after mixed-case option (tags/TAGS is not as important as tic). --echo "$as_me:2703: checking whether ${MAKE-make} sets \${MAKE}" >&5 -+echo "$as_me:2709: 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 -@@ -2720,11 +2726,11 @@ - rm -f conftest.make - fi - if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then -- echo "$as_me:2723: result: yes" >&5 -+ echo "$as_me:2729: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - SET_MAKE= - else -- echo "$as_me:2727: result: no" >&5 -+ echo "$as_me:2733: result: no" >&5 - echo "${ECHO_T}no" >&6 - SET_MAKE="MAKE=${MAKE-make}" - fi -@@ -2733,7 +2739,7 @@ - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:2736: checking for $ac_word" >&5 -+echo "$as_me:2742: 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 -@@ -2748,7 +2754,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_CTAGS="$ac_prog" --echo "$as_me:2751: found $ac_dir/$ac_word" >&5 -+echo "$as_me:2757: found $ac_dir/$ac_word" >&5 - break - done - -@@ -2756,10 +2762,10 @@ - fi - CTAGS=$ac_cv_prog_CTAGS - if test -n "$CTAGS"; then -- echo "$as_me:2759: result: $CTAGS" >&5 -+ echo "$as_me:2765: result: $CTAGS" >&5 - echo "${ECHO_T}$CTAGS" >&6 - else -- echo "$as_me:2762: result: no" >&5 -+ echo "$as_me:2768: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -2770,7 +2776,7 @@ - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:2773: checking for $ac_word" >&5 -+echo "$as_me:2779: 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 -@@ -2785,7 +2791,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_ETAGS="$ac_prog" --echo "$as_me:2788: found $ac_dir/$ac_word" >&5 -+echo "$as_me:2794: found $ac_dir/$ac_word" >&5 - break - done - -@@ -2793,10 +2799,10 @@ - fi - ETAGS=$ac_cv_prog_ETAGS - if test -n "$ETAGS"; then -- echo "$as_me:2796: result: $ETAGS" >&5 -+ echo "$as_me:2802: result: $ETAGS" >&5 - echo "${ECHO_T}$ETAGS" >&6 - else -- echo "$as_me:2799: result: no" >&5 -+ echo "$as_me:2805: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -2805,7 +2811,7 @@ - - # 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:2808: checking for $ac_word" >&5 -+echo "$as_me:2814: 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 -@@ -2820,7 +2826,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_MAKE_LOWER_TAGS="yes" --echo "$as_me:2823: found $ac_dir/$ac_word" >&5 -+echo "$as_me:2829: found $ac_dir/$ac_word" >&5 - break - done - -@@ -2829,17 +2835,17 @@ - fi - MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS - if test -n "$MAKE_LOWER_TAGS"; then -- echo "$as_me:2832: result: $MAKE_LOWER_TAGS" >&5 -+ echo "$as_me:2838: result: $MAKE_LOWER_TAGS" >&5 - echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 - else -- echo "$as_me:2835: result: no" >&5 -+ echo "$as_me:2841: 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:2842: checking for $ac_word" >&5 -+echo "$as_me:2848: 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 -@@ -2854,7 +2860,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_MAKE_UPPER_TAGS="yes" --echo "$as_me:2857: found $ac_dir/$ac_word" >&5 -+echo "$as_me:2863: found $ac_dir/$ac_word" >&5 - break - done - -@@ -2863,10 +2869,10 @@ - fi - MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS - if test -n "$MAKE_UPPER_TAGS"; then -- echo "$as_me:2866: result: $MAKE_UPPER_TAGS" >&5 -+ echo "$as_me:2872: result: $MAKE_UPPER_TAGS" >&5 - echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 - else -- echo "$as_me:2869: result: no" >&5 -+ echo "$as_me:2875: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -2886,7 +2892,7 @@ - MAKE_LOWER_TAGS="#" - fi - --echo "$as_me:2889: checking for makeflags variable" >&5 -+echo "$as_me:2895: 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 -@@ -2920,13 +2926,13 @@ - rm -f cf_makeflags.tmp - - fi --echo "$as_me:2923: result: $cf_cv_makeflags" >&5 -+echo "$as_me:2929: result: $cf_cv_makeflags" >&5 - echo "${ECHO_T}$cf_cv_makeflags" >&6 - - 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:2929: checking for $ac_word" >&5 -+echo "$as_me:2935: 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 -@@ -2941,7 +2947,7 @@ - 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:2944: found $ac_dir/$ac_word" >&5 -+echo "$as_me:2950: found $ac_dir/$ac_word" >&5 - break - done - -@@ -2949,10 +2955,10 @@ - fi - RANLIB=$ac_cv_prog_RANLIB - if test -n "$RANLIB"; then -- echo "$as_me:2952: result: $RANLIB" >&5 -+ echo "$as_me:2958: result: $RANLIB" >&5 - echo "${ECHO_T}$RANLIB" >&6 - else -- echo "$as_me:2955: result: no" >&5 -+ echo "$as_me:2961: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -2961,7 +2967,7 @@ - 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:2964: checking for $ac_word" >&5 -+echo "$as_me:2970: 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 -@@ -2976,7 +2982,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_ac_ct_RANLIB="ranlib" --echo "$as_me:2979: found $ac_dir/$ac_word" >&5 -+echo "$as_me:2985: found $ac_dir/$ac_word" >&5 - break - done - -@@ -2985,10 +2991,10 @@ - fi - ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB - if test -n "$ac_ct_RANLIB"; then -- echo "$as_me:2988: result: $ac_ct_RANLIB" >&5 -+ echo "$as_me:2994: result: $ac_ct_RANLIB" >&5 - echo "${ECHO_T}$ac_ct_RANLIB" >&6 - else -- echo "$as_me:2991: result: no" >&5 -+ echo "$as_me:2997: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -3000,7 +3006,7 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. - set dummy ${ac_tool_prefix}ld; ac_word=$2 --echo "$as_me:3003: checking for $ac_word" >&5 -+echo "$as_me:3009: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -3015,7 +3021,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_LD="${ac_tool_prefix}ld" --echo "$as_me:3018: found $ac_dir/$ac_word" >&5 -+echo "$as_me:3024: found $ac_dir/$ac_word" >&5 - break - done - -@@ -3023,10 +3029,10 @@ - fi - LD=$ac_cv_prog_LD - if test -n "$LD"; then -- echo "$as_me:3026: result: $LD" >&5 -+ echo "$as_me:3032: result: $LD" >&5 - echo "${ECHO_T}$LD" >&6 - else -- echo "$as_me:3029: result: no" >&5 -+ echo "$as_me:3035: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -3035,7 +3041,7 @@ - ac_ct_LD=$LD - # Extract the first word of "ld", so it can be a program name with args. - set dummy ld; ac_word=$2 --echo "$as_me:3038: checking for $ac_word" >&5 -+echo "$as_me:3044: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_ac_ct_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -3050,7 +3056,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_ac_ct_LD="ld" --echo "$as_me:3053: found $ac_dir/$ac_word" >&5 -+echo "$as_me:3059: found $ac_dir/$ac_word" >&5 - break - done - -@@ -3059,10 +3065,10 @@ - fi - ac_ct_LD=$ac_cv_prog_ac_ct_LD - if test -n "$ac_ct_LD"; then -- echo "$as_me:3062: result: $ac_ct_LD" >&5 -+ echo "$as_me:3068: result: $ac_ct_LD" >&5 - echo "${ECHO_T}$ac_ct_LD" >&6 - else -- echo "$as_me:3065: result: no" >&5 -+ echo "$as_me:3071: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -3074,7 +3080,7 @@ - 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:3077: checking for $ac_word" >&5 -+echo "$as_me:3083: 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 -@@ -3089,7 +3095,7 @@ - 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:3092: found $ac_dir/$ac_word" >&5 -+echo "$as_me:3098: found $ac_dir/$ac_word" >&5 - break - done - -@@ -3097,10 +3103,10 @@ - fi - AR=$ac_cv_prog_AR - if test -n "$AR"; then -- echo "$as_me:3100: result: $AR" >&5 -+ echo "$as_me:3106: result: $AR" >&5 - echo "${ECHO_T}$AR" >&6 - else -- echo "$as_me:3103: result: no" >&5 -+ echo "$as_me:3109: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -3109,7 +3115,7 @@ - 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:3112: checking for $ac_word" >&5 -+echo "$as_me:3118: 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 -@@ -3124,7 +3130,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_ac_ct_AR="ar" --echo "$as_me:3127: found $ac_dir/$ac_word" >&5 -+echo "$as_me:3133: found $ac_dir/$ac_word" >&5 - break - done - -@@ -3133,10 +3139,10 @@ - fi - ac_ct_AR=$ac_cv_prog_ac_ct_AR - if test -n "$ac_ct_AR"; then -- echo "$as_me:3136: result: $ac_ct_AR" >&5 -+ echo "$as_me:3142: result: $ac_ct_AR" >&5 - echo "${ECHO_T}$ac_ct_AR" >&6 - else -- echo "$as_me:3139: result: no" >&5 -+ echo "$as_me:3145: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -3148,7 +3154,7 @@ - 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:3151: checking for $ac_word" >&5 -+echo "$as_me:3157: 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 -@@ -3163,7 +3169,7 @@ - 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:3166: found $ac_dir/$ac_word" >&5 -+echo "$as_me:3172: found $ac_dir/$ac_word" >&5 - break - done - -@@ -3171,10 +3177,10 @@ - fi - AR=$ac_cv_prog_AR - if test -n "$AR"; then -- echo "$as_me:3174: result: $AR" >&5 -+ echo "$as_me:3180: result: $AR" >&5 - echo "${ECHO_T}$AR" >&6 - else -- echo "$as_me:3177: result: no" >&5 -+ echo "$as_me:3183: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -3183,7 +3189,7 @@ - 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:3186: checking for $ac_word" >&5 -+echo "$as_me:3192: 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 -@@ -3198,7 +3204,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_ac_ct_AR="ar" --echo "$as_me:3201: found $ac_dir/$ac_word" >&5 -+echo "$as_me:3207: found $ac_dir/$ac_word" >&5 - break - done - -@@ -3207,10 +3213,10 @@ - fi - ac_ct_AR=$ac_cv_prog_ac_ct_AR - if test -n "$ac_ct_AR"; then -- echo "$as_me:3210: result: $ac_ct_AR" >&5 -+ echo "$as_me:3216: result: $ac_ct_AR" >&5 - echo "${ECHO_T}$ac_ct_AR" >&6 - else -- echo "$as_me:3213: result: no" >&5 -+ echo "$as_me:3219: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -3219,7 +3225,7 @@ - AR="$ac_cv_prog_AR" - fi - --echo "$as_me:3222: checking for options to update archives" >&5 -+echo "$as_me:3228: 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 -@@ -3242,13 +3248,13 @@ - rm -f conftest.a - - cat >conftest.$ac_ext <&5 -+ if { (eval echo "$as_me:3254: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:3251: \$? = $ac_status" >&5 -+ echo "$as_me:3257: \$? = $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 -@@ -3259,7 +3265,7 @@ - else - test -n "$verbose" && echo " cannot compile test-program" 1>&6 - --echo "${as_me:-configure}:3262: testing cannot compile test-program ..." 1>&5 -+echo "${as_me:-configure}:3268: testing cannot compile test-program ..." 1>&5 - - break - fi -@@ -3267,7 +3273,7 @@ - rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext - - fi --echo "$as_me:3270: result: $cf_cv_ar_flags" >&5 -+echo "$as_me:3276: result: $cf_cv_ar_flags" >&5 - echo "${ECHO_T}$cf_cv_ar_flags" >&6 - - if test -n "$ARFLAGS" ; then -@@ -3278,17 +3284,17 @@ - ARFLAGS=$cf_cv_ar_flags - fi - -- echo "$as_me:3281: checking for PATH separator" >&5 -+ echo "$as_me:3287: 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:3288: result: $PATH_SEPARATOR" >&5 -+ echo "$as_me:3294: result: $PATH_SEPARATOR" >&5 - echo "${ECHO_T}$PATH_SEPARATOR" >&6 - --echo "$as_me:3291: checking if you have specified an install-prefix" >&5 -+echo "$as_me:3297: checking if you have specified an install-prefix" >&5 - echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6 - - # Check whether --with-install-prefix or --without-install-prefix was given. -@@ -3301,7 +3307,7 @@ - ;; - esac - fi; --echo "$as_me:3304: result: $DESTDIR" >&5 -+echo "$as_me:3310: result: $DESTDIR" >&5 - echo "${ECHO_T}$DESTDIR" >&6 - - ############################################################################### -@@ -3329,7 +3335,7 @@ - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:3332: checking for $ac_word" >&5 -+echo "$as_me:3338: 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 -@@ -3344,7 +3350,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_BUILD_CC="$ac_prog" --echo "$as_me:3347: found $ac_dir/$ac_word" >&5 -+echo "$as_me:3353: found $ac_dir/$ac_word" >&5 - break - done - -@@ -3352,10 +3358,10 @@ - fi - BUILD_CC=$ac_cv_prog_BUILD_CC - if test -n "$BUILD_CC"; then -- echo "$as_me:3355: result: $BUILD_CC" >&5 -+ echo "$as_me:3361: result: $BUILD_CC" >&5 - echo "${ECHO_T}$BUILD_CC" >&6 - else -- echo "$as_me:3358: result: no" >&5 -+ echo "$as_me:3364: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -3363,12 +3369,12 @@ - done - - fi; -- echo "$as_me:3366: checking for native build C compiler" >&5 -+ echo "$as_me:3372: checking for native build C compiler" >&5 - echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6 -- echo "$as_me:3368: result: $BUILD_CC" >&5 -+ echo "$as_me:3374: result: $BUILD_CC" >&5 - echo "${ECHO_T}$BUILD_CC" >&6 - -- echo "$as_me:3371: checking for native build C preprocessor" >&5 -+ echo "$as_me:3377: 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. -@@ -3378,10 +3384,10 @@ - else - BUILD_CPP='${BUILD_CC} -E' - fi; -- echo "$as_me:3381: result: $BUILD_CPP" >&5 -+ echo "$as_me:3387: result: $BUILD_CPP" >&5 - echo "${ECHO_T}$BUILD_CPP" >&6 - -- echo "$as_me:3384: checking for native build C flags" >&5 -+ echo "$as_me:3390: 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. -@@ -3389,10 +3395,10 @@ - withval="$with_build_cflags" - BUILD_CFLAGS="$withval" - fi; -- echo "$as_me:3392: result: $BUILD_CFLAGS" >&5 -+ echo "$as_me:3398: result: $BUILD_CFLAGS" >&5 - echo "${ECHO_T}$BUILD_CFLAGS" >&6 - -- echo "$as_me:3395: checking for native build C preprocessor-flags" >&5 -+ echo "$as_me:3401: 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. -@@ -3400,10 +3406,10 @@ - withval="$with_build_cppflags" - BUILD_CPPFLAGS="$withval" - fi; -- echo "$as_me:3403: result: $BUILD_CPPFLAGS" >&5 -+ echo "$as_me:3409: result: $BUILD_CPPFLAGS" >&5 - echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 - -- echo "$as_me:3406: checking for native build linker-flags" >&5 -+ echo "$as_me:3412: 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. -@@ -3411,10 +3417,10 @@ - withval="$with_build_ldflags" - BUILD_LDFLAGS="$withval" - fi; -- echo "$as_me:3414: result: $BUILD_LDFLAGS" >&5 -+ echo "$as_me:3420: result: $BUILD_LDFLAGS" >&5 - echo "${ECHO_T}$BUILD_LDFLAGS" >&6 - -- echo "$as_me:3417: checking for native build linker-libraries" >&5 -+ echo "$as_me:3423: 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. -@@ -3422,7 +3428,7 @@ - withval="$with_build_libs" - BUILD_LIBS="$withval" - fi; -- echo "$as_me:3425: result: $BUILD_LIBS" >&5 -+ echo "$as_me:3431: result: $BUILD_LIBS" >&5 - echo "${ECHO_T}$BUILD_LIBS" >&6 - - # this assumes we're on Unix. -@@ -3432,7 +3438,7 @@ - : ${BUILD_CC:='${CC}'} - - if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then -- { { echo "$as_me:3435: error: Cross-build requires two compilers. -+ { { echo "$as_me:3441: 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;} -@@ -3457,7 +3463,7 @@ - ### shared, for example. - cf_list_models="" - --echo "$as_me:3460: checking if you want to build shared C-objects" >&5 -+echo "$as_me:3466: checking if you want to build shared C-objects" >&5 - echo $ECHO_N "checking if you want to build shared C-objects... $ECHO_C" >&6 - - # Check whether --with-shared or --without-shared was given. -@@ -3467,27 +3473,27 @@ - else - with_shared=no - fi; --echo "$as_me:3470: result: $with_shared" >&5 -+echo "$as_me:3476: result: $with_shared" >&5 - echo "${ECHO_T}$with_shared" >&6 - test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared" - --echo "$as_me:3474: checking for specified models" >&5 -+echo "$as_me:3480: checking for specified models" >&5 - echo $ECHO_N "checking for specified models... $ECHO_C" >&6 - test -z "$cf_list_models" && cf_list_models=normal --echo "$as_me:3477: result: $cf_list_models" >&5 -+echo "$as_me:3483: result: $cf_list_models" >&5 - echo "${ECHO_T}$cf_list_models" >&6 - - ### Use the first model as the default, and save its suffix for use in building - ### up test-applications. --echo "$as_me:3482: checking for default model" >&5 -+echo "$as_me:3488: checking for default model" >&5 - echo $ECHO_N "checking for default model... $ECHO_C" >&6 - DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'` --echo "$as_me:3485: result: $DFT_LWR_MODEL" >&5 -+echo "$as_me:3491: result: $DFT_LWR_MODEL" >&5 - echo "${ECHO_T}$DFT_LWR_MODEL" >&6 - - DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - --echo "$as_me:3490: checking for specific curses-directory" >&5 -+echo "$as_me:3496: 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. -@@ -3497,7 +3503,7 @@ - else - cf_cv_curses_dir=no - fi; --echo "$as_me:3500: result: $cf_cv_curses_dir" >&5 -+echo "$as_me:3506: 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" ) -@@ -3528,7 +3534,7 @@ - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` - ;; - (*) -- { { echo "$as_me:3531: error: expected a pathname, not \"$withval\"" >&5 -+ { { echo "$as_me:3537: error: expected a pathname, not \"$withval\"" >&5 - echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} - { (exit 1); exit 1; }; } - ;; -@@ -3561,7 +3567,7 @@ - cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF --#line 3564 "configure" -+#line 3570 "configure" - #include "confdefs.h" - #include - int -@@ -3573,16 +3579,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:3576: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:3582: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:3579: \$? = $ac_status" >&5 -+ echo "$as_me:3585: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:3582: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:3588: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:3585: \$? = $ac_status" >&5 -+ echo "$as_me:3591: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -3599,7 +3605,7 @@ - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - --echo "${as_me:-configure}:3602: testing adding $cf_add_incdir to include-path ..." 1>&5 -+echo "${as_me:-configure}:3608: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - -@@ -3635,7 +3641,7 @@ - if test "$cf_have_libdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 - --echo "${as_me:-configure}:3638: testing adding $cf_add_libdir to library-path ..." 1>&5 -+echo "${as_me:-configure}:3644: testing adding $cf_add_libdir to library-path ..." 1>&5 - - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi -@@ -3650,13 +3656,13 @@ - cf_have_ncuconfig=no - - if test "x${PKG_CONFIG:=none}" != xnone; then -- echo "$as_me:3653: checking pkg-config for $cf_ncuconfig_root" >&5 -+ echo "$as_me:3659: 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:3656: result: yes" >&5 -+ echo "$as_me:3662: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - -- echo "$as_me:3659: checking if the $cf_ncuconfig_root package files work" >&5 -+ echo "$as_me:3665: 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 - -@@ -3682,7 +3688,7 @@ - LIBS="$cf_add_libs" - - cat >conftest.$ac_ext <<_ACEOF --#line 3685 "configure" -+#line 3691 "configure" - #include "confdefs.h" - #include <${cf_cv_ncurses_header:-curses.h}> - int -@@ -3694,37 +3700,37 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:3697: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:3703: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:3700: \$? = $ac_status" >&5 -+ echo "$as_me:3706: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:3703: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:3709: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:3706: \$? = $ac_status" >&5 -+ echo "$as_me:3712: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - if test "$cross_compiling" = yes; then - cf_have_ncuconfig=maybe - else - cat >conftest.$ac_ext <<_ACEOF --#line 3712 "configure" -+#line 3718 "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:3719: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:3725: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:3722: \$? = $ac_status" >&5 -+ echo "$as_me:3728: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:3724: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:3730: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:3727: \$? = $ac_status" >&5 -+ echo "$as_me:3733: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_have_ncuconfig=yes - else -@@ -3741,7 +3747,7 @@ - cf_have_ncuconfig=no - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -- echo "$as_me:3744: result: $cf_have_ncuconfig" >&5 -+ echo "$as_me:3750: 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" -@@ -3759,7 +3765,7 @@ - fi - - else -- echo "$as_me:3762: result: no" >&5 -+ echo "$as_me:3768: result: no" >&5 - echo "${ECHO_T}no" >&6 - NCURSES_CONFIG_PKG=none - fi -@@ -3775,7 +3781,7 @@ - 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:3778: checking for $ac_word" >&5 -+echo "$as_me:3784: 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 -@@ -3790,7 +3796,7 @@ - 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:3793: found $ac_dir/$ac_word" >&5 -+echo "$as_me:3799: found $ac_dir/$ac_word" >&5 - break - done - -@@ -3798,10 +3804,10 @@ - fi - NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG - if test -n "$NCURSES_CONFIG"; then -- echo "$as_me:3801: result: $NCURSES_CONFIG" >&5 -+ echo "$as_me:3807: result: $NCURSES_CONFIG" >&5 - echo "${ECHO_T}$NCURSES_CONFIG" >&6 - else -- echo "$as_me:3804: result: no" >&5 -+ echo "$as_me:3810: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -3814,7 +3820,7 @@ - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:3817: checking for $ac_word" >&5 -+echo "$as_me:3823: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -3829,7 +3835,7 @@ - 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:3832: found $ac_dir/$ac_word" >&5 -+echo "$as_me:3838: found $ac_dir/$ac_word" >&5 - break - done - -@@ -3837,10 +3843,10 @@ - fi - ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG - if test -n "$ac_ct_NCURSES_CONFIG"; then -- echo "$as_me:3840: result: $ac_ct_NCURSES_CONFIG" >&5 -+ echo "$as_me:3846: result: $ac_ct_NCURSES_CONFIG" >&5 - echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 - else -- echo "$as_me:3843: result: no" >&5 -+ echo "$as_me:3849: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -3873,7 +3879,7 @@ - - # even with config script, some packages use no-override for curses.h - --echo "$as_me:3876: checking if we have identified curses headers" >&5 -+echo "$as_me:3882: 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 -@@ -3885,7 +3891,7 @@ - curses.h ncurses/curses.h - do - cat >conftest.$ac_ext <<_ACEOF --#line 3888 "configure" -+#line 3894 "configure" - #include "confdefs.h" - #include <${cf_header}> - int -@@ -3897,16 +3903,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:3900: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:3906: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:3903: \$? = $ac_status" >&5 -+ echo "$as_me:3909: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:3906: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:3912: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:3909: \$? = $ac_status" >&5 -+ echo "$as_me:3915: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_ncurses_header=$cf_header; break - else -@@ -3917,11 +3923,11 @@ - done - - fi --echo "$as_me:3920: result: $cf_cv_ncurses_header" >&5 -+echo "$as_me:3926: 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:3924: error: No curses header-files found" >&5 -+ { { echo "$as_me:3930: error: No curses header-files found" >&5 - echo "$as_me: error: No curses header-files found" >&2;} - { (exit 1); exit 1; }; } - fi -@@ -3931,23 +3937,23 @@ - for ac_header in $cf_cv_ncurses_header - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:3934: checking for $ac_header" >&5 -+echo "$as_me:3940: 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 3940 "configure" -+#line 3946 "configure" - #include "confdefs.h" - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:3944: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:3950: \"$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:3950: \$? = $ac_status" >&5 -+ echo "$as_me:3956: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -3966,7 +3972,7 @@ - fi - rm -f conftest.err conftest.$ac_ext - fi --echo "$as_me:3969: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "$as_me:3975: 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 <conftest.$ac_ext <<_ACEOF --#line 4022 "configure" -+#line 4028 "configure" - #include "confdefs.h" - #include - int -@@ -4031,16 +4037,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:4034: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:4040: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:4037: \$? = $ac_status" >&5 -+ echo "$as_me:4043: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:4040: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:4046: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:4043: \$? = $ac_status" >&5 -+ echo "$as_me:4049: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -4057,7 +4063,7 @@ - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - --echo "${as_me:-configure}:4060: testing adding $cf_add_incdir to include-path ..." 1>&5 -+echo "${as_me:-configure}:4066: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - -@@ -4076,7 +4082,7 @@ - - } - --echo "$as_me:4079: checking for $cf_ncuhdr_root header in include-path" >&5 -+echo "$as_me:4085: 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 -@@ -4088,7 +4094,7 @@ - do - - cat >conftest.$ac_ext <<_ACEOF --#line 4091 "configure" -+#line 4097 "configure" - #include "confdefs.h" - - #include <$cf_header> -@@ -4112,16 +4118,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:4115: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:4121: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:4118: \$? = $ac_status" >&5 -+ echo "$as_me:4124: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:4121: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:4127: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:4124: \$? = $ac_status" >&5 -+ echo "$as_me:4130: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_ncurses_h=$cf_header - -@@ -4136,14 +4142,14 @@ - done - - fi --echo "$as_me:4139: result: $cf_cv_ncurses_h" >&5 -+echo "$as_me:4145: 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:4146: checking for $cf_ncuhdr_root include-path" >&5 -+echo "$as_me:4152: 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 -@@ -4261,7 +4267,7 @@ - cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF --#line 4264 "configure" -+#line 4270 "configure" - #include "confdefs.h" - #include - int -@@ -4273,16 +4279,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:4276: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:4282: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:4279: \$? = $ac_status" >&5 -+ echo "$as_me:4285: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:4282: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:4288: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:4285: \$? = $ac_status" >&5 -+ echo "$as_me:4291: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -4299,7 +4305,7 @@ - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - --echo "${as_me:-configure}:4302: testing adding $cf_add_incdir to include-path ..." 1>&5 -+echo "${as_me:-configure}:4308: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - -@@ -4322,7 +4328,7 @@ - do - - cat >conftest.$ac_ext <<_ACEOF --#line 4325 "configure" -+#line 4331 "configure" - #include "confdefs.h" - - #include <$cf_header> -@@ -4346,16 +4352,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:4349: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:4355: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:4352: \$? = $ac_status" >&5 -+ echo "$as_me:4358: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:4355: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:4361: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:4358: \$? = $ac_status" >&5 -+ echo "$as_me:4364: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_ncurses_h2=$cf_header - -@@ -4376,12 +4382,12 @@ - CPPFLAGS="$cf_save2_CPPFLAGS" - test "$cf_cv_ncurses_h2" != no && break - done -- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:4379: error: not found" >&5 -+ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:4385: error: not found" >&5 - echo "$as_me: error: not found" >&2;} - { (exit 1); exit 1; }; } - - fi --echo "$as_me:4384: result: $cf_cv_ncurses_h2" >&5 -+echo "$as_me:4390: 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%/[^/]*$%%'` -@@ -4414,7 +4420,7 @@ - cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF --#line 4417 "configure" -+#line 4423 "configure" - #include "confdefs.h" - #include - int -@@ -4426,16 +4432,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:4429: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:4435: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:4432: \$? = $ac_status" >&5 -+ echo "$as_me:4438: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:4435: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:4441: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:4438: \$? = $ac_status" >&5 -+ echo "$as_me:4444: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -4452,7 +4458,7 @@ - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - --echo "${as_me:-configure}:4455: testing adding $cf_add_incdir to include-path ..." 1>&5 -+echo "${as_me:-configure}:4461: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - -@@ -4500,7 +4506,7 @@ - ;; - esac - --echo "$as_me:4503: checking for terminfo header" >&5 -+echo "$as_me:4509: 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 -@@ -4518,7 +4524,7 @@ - for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" - do - cat >conftest.$ac_ext <<_ACEOF --#line 4521 "configure" -+#line 4527 "configure" - #include "confdefs.h" - #include - #include <${cf_cv_ncurses_header:-curses.h}> -@@ -4533,16 +4539,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:4536: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:4542: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:4539: \$? = $ac_status" >&5 -+ echo "$as_me:4545: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:4542: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:4548: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:4545: \$? = $ac_status" >&5 -+ echo "$as_me:4551: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - cf_cv_term_header="$cf_test" -@@ -4558,7 +4564,7 @@ - done - - fi --echo "$as_me:4561: result: $cf_cv_term_header" >&5 -+echo "$as_me:4567: result: $cf_cv_term_header" >&5 - echo "${ECHO_T}$cf_cv_term_header" >&6 - - # Set definitions to allow ifdef'ing to accommodate subdirectories -@@ -4596,7 +4602,7 @@ - #define NCURSES 1 - EOF - --echo "$as_me:4599: checking for ncurses version" >&5 -+echo "$as_me:4605: 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 -@@ -4622,10 +4628,10 @@ - #endif - EOF - cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" -- { (eval echo "$as_me:4625: \"$cf_try\"") >&5 -+ { (eval echo "$as_me:4631: \"$cf_try\"") >&5 - (eval $cf_try) 2>&5 - ac_status=$? -- echo "$as_me:4628: \$? = $ac_status" >&5 -+ echo "$as_me:4634: \$? = $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%".*%%'` -@@ -4635,7 +4641,7 @@ - - else - cat >conftest.$ac_ext <<_ACEOF --#line 4638 "configure" -+#line 4644 "configure" - #include "confdefs.h" - - #include <${cf_cv_ncurses_header:-curses.h}> -@@ -4660,15 +4666,15 @@ - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:4663: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:4669: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:4666: \$? = $ac_status" >&5 -+ echo "$as_me:4672: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:4668: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:4674: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:4671: \$? = $ac_status" >&5 -+ echo "$as_me:4677: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - cf_cv_ncurses_version=`cat $cf_tempfile` -@@ -4682,7 +4688,7 @@ - rm -f $cf_tempfile - - fi --echo "$as_me:4685: result: $cf_cv_ncurses_version" >&5 -+echo "$as_me:4691: result: $cf_cv_ncurses_version" >&5 - echo "${ECHO_T}$cf_cv_ncurses_version" >&6 - test "$cf_cv_ncurses_version" = no || - cat >>confdefs.h <<\EOF -@@ -4695,7 +4701,7 @@ - # to link gpm. - cf_ncurses_LIBS="" - cf_ncurses_SAVE="$LIBS" --echo "$as_me:4698: checking for Gpm_Open in -lgpm" >&5 -+echo "$as_me:4704: 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 -@@ -4703,7 +4709,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lgpm $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 4706 "configure" -+#line 4712 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -4722,16 +4728,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:4725: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:4731: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:4728: \$? = $ac_status" >&5 -+ echo "$as_me:4734: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:4731: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:4737: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:4734: \$? = $ac_status" >&5 -+ echo "$as_me:4740: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_gpm_Gpm_Open=yes - else -@@ -4742,10 +4748,10 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:4745: result: $ac_cv_lib_gpm_Gpm_Open" >&5 -+echo "$as_me:4751: 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:4748: checking for initscr in -lgpm" >&5 -+ echo "$as_me:4754: 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 -@@ -4753,7 +4759,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lgpm $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 4756 "configure" -+#line 4762 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -4772,16 +4778,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:4775: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:4781: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:4778: \$? = $ac_status" >&5 -+ echo "$as_me:4784: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:4781: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:4787: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:4784: \$? = $ac_status" >&5 -+ echo "$as_me:4790: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_gpm_initscr=yes - else -@@ -4792,7 +4798,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:4795: result: $ac_cv_lib_gpm_initscr" >&5 -+echo "$as_me:4801: 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" -@@ -4807,7 +4813,7 @@ - # 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:4810: checking for tgoto in -lmytinfo" >&5 -+ echo "$as_me:4816: 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 -@@ -4815,7 +4821,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lmytinfo $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 4818 "configure" -+#line 4824 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -4834,16 +4840,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:4837: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:4843: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:4840: \$? = $ac_status" >&5 -+ echo "$as_me:4846: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:4843: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:4849: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:4846: \$? = $ac_status" >&5 -+ echo "$as_me:4852: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_mytinfo_tgoto=yes - else -@@ -4854,7 +4860,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:4857: result: $ac_cv_lib_mytinfo_tgoto" >&5 -+echo "$as_me:4863: 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" -@@ -4903,13 +4909,13 @@ - - eval 'cf_cv_have_lib_'$cf_nculib_root'=no' - cf_libdir="" -- echo "$as_me:4906: checking for initscr" >&5 -+ echo "$as_me:4912: 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 4912 "configure" -+#line 4918 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char initscr (); below. */ -@@ -4940,16 +4946,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:4943: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:4949: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:4946: \$? = $ac_status" >&5 -+ echo "$as_me:4952: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:4949: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:4955: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:4952: \$? = $ac_status" >&5 -+ echo "$as_me:4958: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_initscr=yes - else -@@ -4959,18 +4965,18 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:4962: result: $ac_cv_func_initscr" >&5 -+echo "$as_me:4968: 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:4969: checking for initscr in -l$cf_nculib_root" >&5 -+ echo "$as_me:4975: 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 4973 "configure" -+#line 4979 "configure" - #include "confdefs.h" - #include <${cf_cv_ncurses_header:-curses.h}> - int -@@ -4982,25 +4988,25 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:4985: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:4991: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:4988: \$? = $ac_status" >&5 -+ echo "$as_me:4994: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:4991: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:4997: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:4994: \$? = $ac_status" >&5 -+ echo "$as_me:5000: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- echo "$as_me:4996: result: yes" >&5 -+ echo "$as_me:5002: 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:5003: result: no" >&5 -+echo "$as_me:5009: result: no" >&5 - echo "${ECHO_T}no" >&6 - - cf_search= -@@ -5068,11 +5074,11 @@ - - for cf_libdir in $cf_search - do -- echo "$as_me:5071: checking for -l$cf_nculib_root in $cf_libdir" >&5 -+ echo "$as_me:5077: 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 5075 "configure" -+#line 5081 "configure" - #include "confdefs.h" - #include <${cf_cv_ncurses_header:-curses.h}> - int -@@ -5084,25 +5090,25 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:5087: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:5093: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:5090: \$? = $ac_status" >&5 -+ echo "$as_me:5096: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:5093: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:5099: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:5096: \$? = $ac_status" >&5 -+ echo "$as_me:5102: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- echo "$as_me:5098: result: yes" >&5 -+ echo "$as_me:5104: 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:5105: result: no" >&5 -+echo "$as_me:5111: result: no" >&5 - echo "${ECHO_T}no" >&6 - LIBS="$cf_save_LIBS" - fi -@@ -5117,7 +5123,7 @@ - eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root - - if test $cf_found_library = no ; then -- { { echo "$as_me:5120: error: Cannot link $cf_nculib_root library" >&5 -+ { { echo "$as_me:5126: error: Cannot link $cf_nculib_root library" >&5 - echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} - { (exit 1); exit 1; }; } - fi -@@ -5125,7 +5131,7 @@ - fi - - if test -n "$cf_ncurses_LIBS" ; then -- echo "$as_me:5128: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 -+ echo "$as_me:5134: 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 -@@ -5135,7 +5141,7 @@ - fi - done - cat >conftest.$ac_ext <<_ACEOF --#line 5138 "configure" -+#line 5144 "configure" - #include "confdefs.h" - #include <${cf_cv_ncurses_header:-curses.h}> - int -@@ -5147,23 +5153,23 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:5150: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:5156: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:5153: \$? = $ac_status" >&5 -+ echo "$as_me:5159: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:5156: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:5162: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:5159: \$? = $ac_status" >&5 -+ echo "$as_me:5165: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- echo "$as_me:5161: result: yes" >&5 -+ echo "$as_me:5167: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 --echo "$as_me:5166: result: no" >&5 -+echo "$as_me:5172: result: no" >&5 - echo "${ECHO_T}no" >&6 - LIBS="$cf_ncurses_SAVE" - fi -@@ -5181,7 +5187,7 @@ - NCURSES_CONFIG=none - fi - --echo "$as_me:5184: checking if you want wide-character code" >&5 -+echo "$as_me:5190: checking if you want wide-character code" >&5 - echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6 - - # Check whether --enable-widec or --disable-widec was given. -@@ -5191,11 +5197,11 @@ - else - with_widec=no - fi; --echo "$as_me:5194: result: $with_widec" >&5 -+echo "$as_me:5200: result: $with_widec" >&5 - echo "${ECHO_T}$with_widec" >&6 - if test "$with_widec" = yes ; then - --echo "$as_me:5198: checking for multibyte character support" >&5 -+echo "$as_me:5204: 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 -@@ -5203,7 +5209,7 @@ - - cf_save_LIBS="$LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 5206 "configure" -+#line 5212 "configure" - #include "confdefs.h" - - #include -@@ -5216,16 +5222,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:5219: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:5225: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:5222: \$? = $ac_status" >&5 -+ echo "$as_me:5228: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:5225: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:5231: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:5228: \$? = $ac_status" >&5 -+ echo "$as_me:5234: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_utf8_lib=yes - else -@@ -5237,12 +5243,12 @@ - cf_cv_header_path_utf8= - cf_cv_library_path_utf8= - --echo "${as_me:-configure}:5240: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 -+echo "${as_me:-configure}:5246: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 - - cf_save_LIBS="$LIBS" - - cat >conftest.$ac_ext <<_ACEOF --#line 5245 "configure" -+#line 5251 "configure" - #include "confdefs.h" - - #include -@@ -5255,16 +5261,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:5258: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:5264: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:5261: \$? = $ac_status" >&5 -+ echo "$as_me:5267: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:5264: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:5270: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:5267: \$? = $ac_status" >&5 -+ echo "$as_me:5273: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - cf_cv_find_linkage_utf8=yes -@@ -5278,7 +5284,7 @@ - LIBS="-lutf8 $cf_save_LIBS" - - cat >conftest.$ac_ext <<_ACEOF --#line 5281 "configure" -+#line 5287 "configure" - #include "confdefs.h" - - #include -@@ -5291,16 +5297,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:5294: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:5300: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:5297: \$? = $ac_status" >&5 -+ echo "$as_me:5303: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:5300: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:5306: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:5303: \$? = $ac_status" >&5 -+ echo "$as_me:5309: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - cf_cv_find_linkage_utf8=yes -@@ -5317,9 +5323,9 @@ - - test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 - --echo "${as_me:-configure}:5320: testing find linkage for utf8 library ..." 1>&5 -+echo "${as_me:-configure}:5326: testing find linkage for utf8 library ..." 1>&5 - --echo "${as_me:-configure}:5322: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 -+echo "${as_me:-configure}:5328: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 - - cf_save_CPPFLAGS="$CPPFLAGS" - cf_test_CPPFLAGS="$CPPFLAGS" -@@ -5410,11 +5416,11 @@ - 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}:5413: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 -+echo "${as_me:-configure}:5419: 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 5417 "configure" -+#line 5423 "configure" - #include "confdefs.h" - - #include -@@ -5427,21 +5433,21 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:5430: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:5436: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:5433: \$? = $ac_status" >&5 -+ echo "$as_me:5439: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:5436: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:5442: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:5439: \$? = $ac_status" >&5 -+ echo "$as_me:5445: \$? = $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}:5444: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 -+echo "${as_me:-configure}:5450: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 - - cf_cv_find_linkage_utf8=maybe - cf_test_CPPFLAGS="$CPPFLAGS" -@@ -5459,7 +5465,7 @@ - - if test "$cf_cv_find_linkage_utf8" = maybe ; then - --echo "${as_me:-configure}:5462: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 -+echo "${as_me:-configure}:5468: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 - - cf_save_LIBS="$LIBS" - cf_save_LDFLAGS="$LDFLAGS" -@@ -5534,13 +5540,13 @@ - 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}:5537: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 -+echo "${as_me:-configure}:5543: 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 5543 "configure" -+#line 5549 "configure" - #include "confdefs.h" - - #include -@@ -5553,21 +5559,21 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:5556: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:5562: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:5559: \$? = $ac_status" >&5 -+ echo "$as_me:5565: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:5562: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:5568: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:5565: \$? = $ac_status" >&5 -+ echo "$as_me:5571: \$? = $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}:5570: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 -+echo "${as_me:-configure}:5576: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 - - cf_cv_find_linkage_utf8=yes - cf_cv_library_file_utf8="-lutf8" -@@ -5609,7 +5615,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:5612: result: $cf_cv_utf8_lib" >&5 -+echo "$as_me:5618: 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 -@@ -5644,7 +5650,7 @@ - cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF --#line 5647 "configure" -+#line 5653 "configure" - #include "confdefs.h" - #include - int -@@ -5656,16 +5662,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:5659: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:5665: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:5662: \$? = $ac_status" >&5 -+ echo "$as_me:5668: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:5665: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:5671: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:5668: \$? = $ac_status" >&5 -+ echo "$as_me:5674: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -5682,7 +5688,7 @@ - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - --echo "${as_me:-configure}:5685: testing adding $cf_add_incdir to include-path ..." 1>&5 -+echo "${as_me:-configure}:5691: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - -@@ -5718,7 +5724,7 @@ - if test "$cf_have_libdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 - --echo "${as_me:-configure}:5721: testing adding $cf_add_libdir to library-path ..." 1>&5 -+echo "${as_me:-configure}:5727: testing adding $cf_add_libdir to library-path ..." 1>&5 - - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi -@@ -5748,13 +5754,13 @@ - cf_have_ncuconfig=no - - if test "x${PKG_CONFIG:=none}" != xnone; then -- echo "$as_me:5751: checking pkg-config for $cf_ncuconfig_root" >&5 -+ echo "$as_me:5757: 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:5754: result: yes" >&5 -+ echo "$as_me:5760: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - -- echo "$as_me:5757: checking if the $cf_ncuconfig_root package files work" >&5 -+ echo "$as_me:5763: 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 - -@@ -5780,7 +5786,7 @@ - LIBS="$cf_add_libs" - - cat >conftest.$ac_ext <<_ACEOF --#line 5783 "configure" -+#line 5789 "configure" - #include "confdefs.h" - #include <${cf_cv_ncurses_header:-curses.h}> - int -@@ -5792,37 +5798,37 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:5795: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:5801: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:5798: \$? = $ac_status" >&5 -+ echo "$as_me:5804: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:5801: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:5807: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:5804: \$? = $ac_status" >&5 -+ echo "$as_me:5810: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - if test "$cross_compiling" = yes; then - cf_have_ncuconfig=maybe - else - cat >conftest.$ac_ext <<_ACEOF --#line 5810 "configure" -+#line 5816 "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:5817: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:5823: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:5820: \$? = $ac_status" >&5 -+ echo "$as_me:5826: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:5822: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:5828: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:5825: \$? = $ac_status" >&5 -+ echo "$as_me:5831: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_have_ncuconfig=yes - else -@@ -5839,7 +5845,7 @@ - cf_have_ncuconfig=no - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -- echo "$as_me:5842: result: $cf_have_ncuconfig" >&5 -+ echo "$as_me:5848: 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" -@@ -5857,7 +5863,7 @@ - fi - - else -- echo "$as_me:5860: result: no" >&5 -+ echo "$as_me:5866: result: no" >&5 - echo "${ECHO_T}no" >&6 - NCURSES_CONFIG_PKG=none - fi -@@ -5873,7 +5879,7 @@ - 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:5876: checking for $ac_word" >&5 -+echo "$as_me:5882: 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 -@@ -5888,7 +5894,7 @@ - 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:5891: found $ac_dir/$ac_word" >&5 -+echo "$as_me:5897: found $ac_dir/$ac_word" >&5 - break - done - -@@ -5896,10 +5902,10 @@ - fi - NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG - if test -n "$NCURSES_CONFIG"; then -- echo "$as_me:5899: result: $NCURSES_CONFIG" >&5 -+ echo "$as_me:5905: result: $NCURSES_CONFIG" >&5 - echo "${ECHO_T}$NCURSES_CONFIG" >&6 - else -- echo "$as_me:5902: result: no" >&5 -+ echo "$as_me:5908: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -5912,7 +5918,7 @@ - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:5915: checking for $ac_word" >&5 -+echo "$as_me:5921: 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 -@@ -5927,7 +5933,7 @@ - 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:5930: found $ac_dir/$ac_word" >&5 -+echo "$as_me:5936: found $ac_dir/$ac_word" >&5 - break - done - -@@ -5935,10 +5941,10 @@ - fi - ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG - if test -n "$ac_ct_NCURSES_CONFIG"; then -- echo "$as_me:5938: result: $ac_ct_NCURSES_CONFIG" >&5 -+ echo "$as_me:5944: result: $ac_ct_NCURSES_CONFIG" >&5 - echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 - else -- echo "$as_me:5941: result: no" >&5 -+ echo "$as_me:5947: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -5971,7 +5977,7 @@ - - # even with config script, some packages use no-override for curses.h - --echo "$as_me:5974: checking if we have identified curses headers" >&5 -+echo "$as_me:5980: 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 -@@ -5983,7 +5989,7 @@ - curses.h ncursesw/curses.h - do - cat >conftest.$ac_ext <<_ACEOF --#line 5986 "configure" -+#line 5992 "configure" - #include "confdefs.h" - #include <${cf_header}> - int -@@ -5995,16 +6001,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:5998: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:6004: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:6001: \$? = $ac_status" >&5 -+ echo "$as_me:6007: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:6004: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:6010: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:6007: \$? = $ac_status" >&5 -+ echo "$as_me:6013: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_ncurses_header=$cf_header; break - else -@@ -6015,11 +6021,11 @@ - done - - fi --echo "$as_me:6018: result: $cf_cv_ncurses_header" >&5 -+echo "$as_me:6024: 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:6022: error: No curses header-files found" >&5 -+ { { echo "$as_me:6028: error: No curses header-files found" >&5 - echo "$as_me: error: No curses header-files found" >&2;} - { (exit 1); exit 1; }; } - fi -@@ -6029,23 +6035,23 @@ - for ac_header in $cf_cv_ncurses_header - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:6032: checking for $ac_header" >&5 -+echo "$as_me:6038: 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 6038 "configure" -+#line 6044 "configure" - #include "confdefs.h" - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:6042: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:6048: \"$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:6048: \$? = $ac_status" >&5 -+ echo "$as_me:6054: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -6064,7 +6070,7 @@ - fi - rm -f conftest.err conftest.$ac_ext - fi --echo "$as_me:6067: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "$as_me:6073: 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 <conftest.$ac_ext <<_ACEOF --#line 6120 "configure" -+#line 6126 "configure" - #include "confdefs.h" - #include - int -@@ -6129,16 +6135,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:6132: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:6138: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:6135: \$? = $ac_status" >&5 -+ echo "$as_me:6141: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:6138: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:6144: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:6141: \$? = $ac_status" >&5 -+ echo "$as_me:6147: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -6155,7 +6161,7 @@ - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - --echo "${as_me:-configure}:6158: testing adding $cf_add_incdir to include-path ..." 1>&5 -+echo "${as_me:-configure}:6164: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - -@@ -6174,7 +6180,7 @@ - - } - --echo "$as_me:6177: checking for $cf_ncuhdr_root header in include-path" >&5 -+echo "$as_me:6183: 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 -@@ -6186,7 +6192,7 @@ - do - - cat >conftest.$ac_ext <<_ACEOF --#line 6189 "configure" -+#line 6195 "configure" - #include "confdefs.h" - - #define _XOPEN_SOURCE_EXTENDED -@@ -6218,16 +6224,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:6221: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:6227: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:6224: \$? = $ac_status" >&5 -+ echo "$as_me:6230: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:6227: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:6233: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:6230: \$? = $ac_status" >&5 -+ echo "$as_me:6236: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_ncurses_h=$cf_header - -@@ -6242,14 +6248,14 @@ - done - - fi --echo "$as_me:6245: result: $cf_cv_ncurses_h" >&5 -+echo "$as_me:6251: 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:6252: checking for $cf_ncuhdr_root include-path" >&5 -+echo "$as_me:6258: 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 -@@ -6367,7 +6373,7 @@ - cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF --#line 6370 "configure" -+#line 6376 "configure" - #include "confdefs.h" - #include - int -@@ -6379,16 +6385,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:6382: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:6388: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:6385: \$? = $ac_status" >&5 -+ echo "$as_me:6391: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:6388: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:6394: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:6391: \$? = $ac_status" >&5 -+ echo "$as_me:6397: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -6405,7 +6411,7 @@ - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - --echo "${as_me:-configure}:6408: testing adding $cf_add_incdir to include-path ..." 1>&5 -+echo "${as_me:-configure}:6414: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - -@@ -6428,7 +6434,7 @@ - do - - cat >conftest.$ac_ext <<_ACEOF --#line 6431 "configure" -+#line 6437 "configure" - #include "confdefs.h" - - #include <$cf_header> -@@ -6452,16 +6458,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:6455: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:6461: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:6458: \$? = $ac_status" >&5 -+ echo "$as_me:6464: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:6461: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:6467: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:6464: \$? = $ac_status" >&5 -+ echo "$as_me:6470: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_ncurses_h2=$cf_header - -@@ -6482,12 +6488,12 @@ - CPPFLAGS="$cf_save2_CPPFLAGS" - test "$cf_cv_ncurses_h2" != no && break - done -- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6485: error: not found" >&5 -+ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6491: error: not found" >&5 - echo "$as_me: error: not found" >&2;} - { (exit 1); exit 1; }; } - - fi --echo "$as_me:6490: result: $cf_cv_ncurses_h2" >&5 -+echo "$as_me:6496: 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%/[^/]*$%%'` -@@ -6520,7 +6526,7 @@ - cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF --#line 6523 "configure" -+#line 6529 "configure" - #include "confdefs.h" - #include - int -@@ -6532,16 +6538,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:6535: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:6541: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:6538: \$? = $ac_status" >&5 -+ echo "$as_me:6544: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:6541: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:6547: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:6544: \$? = $ac_status" >&5 -+ echo "$as_me:6550: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -6558,7 +6564,7 @@ - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - --echo "${as_me:-configure}:6561: testing adding $cf_add_incdir to include-path ..." 1>&5 -+echo "${as_me:-configure}:6567: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - -@@ -6606,7 +6612,7 @@ - ;; - esac - --echo "$as_me:6609: checking for terminfo header" >&5 -+echo "$as_me:6615: 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 -@@ -6624,7 +6630,7 @@ - for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" - do - cat >conftest.$ac_ext <<_ACEOF --#line 6627 "configure" -+#line 6633 "configure" - #include "confdefs.h" - #include - #include <${cf_cv_ncurses_header:-curses.h}> -@@ -6639,16 +6645,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:6642: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:6648: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:6645: \$? = $ac_status" >&5 -+ echo "$as_me:6651: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:6648: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:6654: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:6651: \$? = $ac_status" >&5 -+ echo "$as_me:6657: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - cf_cv_term_header="$cf_test" -@@ -6664,7 +6670,7 @@ - done - - fi --echo "$as_me:6667: result: $cf_cv_term_header" >&5 -+echo "$as_me:6673: result: $cf_cv_term_header" >&5 - echo "${ECHO_T}$cf_cv_term_header" >&6 - - # Set definitions to allow ifdef'ing to accommodate subdirectories -@@ -6702,7 +6708,7 @@ - #define NCURSES 1 - EOF - --echo "$as_me:6705: checking for ncurses version" >&5 -+echo "$as_me:6711: 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 -@@ -6728,10 +6734,10 @@ - #endif - EOF - cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" -- { (eval echo "$as_me:6731: \"$cf_try\"") >&5 -+ { (eval echo "$as_me:6737: \"$cf_try\"") >&5 - (eval $cf_try) 2>&5 - ac_status=$? -- echo "$as_me:6734: \$? = $ac_status" >&5 -+ echo "$as_me:6740: \$? = $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%".*%%'` -@@ -6741,7 +6747,7 @@ - - else - cat >conftest.$ac_ext <<_ACEOF --#line 6744 "configure" -+#line 6750 "configure" - #include "confdefs.h" - - #include <${cf_cv_ncurses_header:-curses.h}> -@@ -6766,15 +6772,15 @@ - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:6769: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:6775: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:6772: \$? = $ac_status" >&5 -+ echo "$as_me:6778: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:6774: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:6780: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:6777: \$? = $ac_status" >&5 -+ echo "$as_me:6783: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - cf_cv_ncurses_version=`cat $cf_tempfile` -@@ -6788,7 +6794,7 @@ - rm -f $cf_tempfile - - fi --echo "$as_me:6791: result: $cf_cv_ncurses_version" >&5 -+echo "$as_me:6797: result: $cf_cv_ncurses_version" >&5 - echo "${ECHO_T}$cf_cv_ncurses_version" >&6 - test "$cf_cv_ncurses_version" = no || - cat >>confdefs.h <<\EOF -@@ -6801,7 +6807,7 @@ - # to link gpm. - cf_ncurses_LIBS="" - cf_ncurses_SAVE="$LIBS" --echo "$as_me:6804: checking for Gpm_Open in -lgpm" >&5 -+echo "$as_me:6810: 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 -@@ -6809,7 +6815,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lgpm $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 6812 "configure" -+#line 6818 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -6828,16 +6834,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:6831: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:6837: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:6834: \$? = $ac_status" >&5 -+ echo "$as_me:6840: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:6837: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:6843: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:6840: \$? = $ac_status" >&5 -+ echo "$as_me:6846: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_gpm_Gpm_Open=yes - else -@@ -6848,10 +6854,10 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:6851: result: $ac_cv_lib_gpm_Gpm_Open" >&5 -+echo "$as_me:6857: 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:6854: checking for initscr in -lgpm" >&5 -+ echo "$as_me:6860: 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 -@@ -6859,7 +6865,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lgpm $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 6862 "configure" -+#line 6868 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -6878,16 +6884,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:6881: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:6887: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:6884: \$? = $ac_status" >&5 -+ echo "$as_me:6890: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:6887: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:6893: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:6890: \$? = $ac_status" >&5 -+ echo "$as_me:6896: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_gpm_initscr=yes - else -@@ -6898,7 +6904,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:6901: result: $ac_cv_lib_gpm_initscr" >&5 -+echo "$as_me:6907: 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" -@@ -6913,7 +6919,7 @@ - # 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:6916: checking for tgoto in -lmytinfo" >&5 -+ echo "$as_me:6922: 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 -@@ -6921,7 +6927,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lmytinfo $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 6924 "configure" -+#line 6930 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -6940,16 +6946,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:6943: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:6949: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:6946: \$? = $ac_status" >&5 -+ echo "$as_me:6952: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:6949: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:6955: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:6952: \$? = $ac_status" >&5 -+ echo "$as_me:6958: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_mytinfo_tgoto=yes - else -@@ -6960,7 +6966,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:6963: result: $ac_cv_lib_mytinfo_tgoto" >&5 -+echo "$as_me:6969: 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" -@@ -7009,13 +7015,13 @@ - - eval 'cf_cv_have_lib_'$cf_nculib_root'=no' - cf_libdir="" -- echo "$as_me:7012: checking for initscr" >&5 -+ echo "$as_me:7018: 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 7018 "configure" -+#line 7024 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char initscr (); below. */ -@@ -7046,16 +7052,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:7049: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:7055: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:7052: \$? = $ac_status" >&5 -+ echo "$as_me:7058: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:7055: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:7061: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:7058: \$? = $ac_status" >&5 -+ echo "$as_me:7064: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_initscr=yes - else -@@ -7065,18 +7071,18 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:7068: result: $ac_cv_func_initscr" >&5 -+echo "$as_me:7074: 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:7075: checking for initscr in -l$cf_nculib_root" >&5 -+ echo "$as_me:7081: 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 7079 "configure" -+#line 7085 "configure" - #include "confdefs.h" - #include <${cf_cv_ncurses_header:-curses.h}> - int -@@ -7088,25 +7094,25 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:7091: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:7097: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:7094: \$? = $ac_status" >&5 -+ echo "$as_me:7100: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:7097: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:7103: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:7100: \$? = $ac_status" >&5 -+ echo "$as_me:7106: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- echo "$as_me:7102: result: yes" >&5 -+ echo "$as_me:7108: 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:7109: result: no" >&5 -+echo "$as_me:7115: result: no" >&5 - echo "${ECHO_T}no" >&6 - - cf_search= -@@ -7174,11 +7180,11 @@ - - for cf_libdir in $cf_search - do -- echo "$as_me:7177: checking for -l$cf_nculib_root in $cf_libdir" >&5 -+ echo "$as_me:7183: 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 7181 "configure" -+#line 7187 "configure" - #include "confdefs.h" - #include <${cf_cv_ncurses_header:-curses.h}> - int -@@ -7190,25 +7196,25 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:7193: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:7199: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:7196: \$? = $ac_status" >&5 -+ echo "$as_me:7202: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:7199: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:7205: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:7202: \$? = $ac_status" >&5 -+ echo "$as_me:7208: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- echo "$as_me:7204: result: yes" >&5 -+ echo "$as_me:7210: 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:7211: result: no" >&5 -+echo "$as_me:7217: result: no" >&5 - echo "${ECHO_T}no" >&6 - LIBS="$cf_save_LIBS" - fi -@@ -7223,7 +7229,7 @@ - eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root - - if test $cf_found_library = no ; then -- { { echo "$as_me:7226: error: Cannot link $cf_nculib_root library" >&5 -+ { { echo "$as_me:7232: error: Cannot link $cf_nculib_root library" >&5 - echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} - { (exit 1); exit 1; }; } - fi -@@ -7231,7 +7237,7 @@ - fi - - if test -n "$cf_ncurses_LIBS" ; then -- echo "$as_me:7234: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 -+ echo "$as_me:7240: 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 -@@ -7241,7 +7247,7 @@ - fi - done - cat >conftest.$ac_ext <<_ACEOF --#line 7244 "configure" -+#line 7250 "configure" - #include "confdefs.h" - #include <${cf_cv_ncurses_header:-curses.h}> - int -@@ -7253,23 +7259,23 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:7256: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:7262: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:7259: \$? = $ac_status" >&5 -+ echo "$as_me:7265: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:7262: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:7268: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:7265: \$? = $ac_status" >&5 -+ echo "$as_me:7271: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- echo "$as_me:7267: result: yes" >&5 -+ echo "$as_me:7273: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 --echo "$as_me:7272: result: no" >&5 -+echo "$as_me:7278: result: no" >&5 - echo "${ECHO_T}no" >&6 - LIBS="$cf_ncurses_SAVE" - fi -@@ -7293,13 +7299,13 @@ - cf_have_ncuconfig=no - - if test "x${PKG_CONFIG:=none}" != xnone; then -- echo "$as_me:7296: checking pkg-config for $cf_ncuconfig_root" >&5 -+ echo "$as_me:7302: 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:7299: result: yes" >&5 -+ echo "$as_me:7305: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - -- echo "$as_me:7302: checking if the $cf_ncuconfig_root package files work" >&5 -+ echo "$as_me:7308: 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 - -@@ -7325,7 +7331,7 @@ - LIBS="$cf_add_libs" - - cat >conftest.$ac_ext <<_ACEOF --#line 7328 "configure" -+#line 7334 "configure" - #include "confdefs.h" - #include <${cf_cv_ncurses_header:-curses.h}> - int -@@ -7337,37 +7343,37 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:7340: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:7346: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:7343: \$? = $ac_status" >&5 -+ echo "$as_me:7349: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:7346: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:7352: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:7349: \$? = $ac_status" >&5 -+ echo "$as_me:7355: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - if test "$cross_compiling" = yes; then - cf_have_ncuconfig=maybe - else - cat >conftest.$ac_ext <<_ACEOF --#line 7355 "configure" -+#line 7361 "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:7362: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:7368: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:7365: \$? = $ac_status" >&5 -+ echo "$as_me:7371: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:7367: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:7373: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:7370: \$? = $ac_status" >&5 -+ echo "$as_me:7376: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_have_ncuconfig=yes - else -@@ -7384,7 +7390,7 @@ - cf_have_ncuconfig=no - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -- echo "$as_me:7387: result: $cf_have_ncuconfig" >&5 -+ echo "$as_me:7393: 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" -@@ -7402,7 +7408,7 @@ - fi - - else -- echo "$as_me:7405: result: no" >&5 -+ echo "$as_me:7411: result: no" >&5 - echo "${ECHO_T}no" >&6 - NCURSES_CONFIG_PKG=none - fi -@@ -7418,7 +7424,7 @@ - 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:7421: checking for $ac_word" >&5 -+echo "$as_me:7427: 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 -@@ -7433,7 +7439,7 @@ - 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:7436: found $ac_dir/$ac_word" >&5 -+echo "$as_me:7442: found $ac_dir/$ac_word" >&5 - break - done - -@@ -7441,10 +7447,10 @@ - fi - NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG - if test -n "$NCURSES_CONFIG"; then -- echo "$as_me:7444: result: $NCURSES_CONFIG" >&5 -+ echo "$as_me:7450: result: $NCURSES_CONFIG" >&5 - echo "${ECHO_T}$NCURSES_CONFIG" >&6 - else -- echo "$as_me:7447: result: no" >&5 -+ echo "$as_me:7453: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -7457,7 +7463,7 @@ - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:7460: checking for $ac_word" >&5 -+echo "$as_me:7466: 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 -@@ -7472,7 +7478,7 @@ - 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:7475: found $ac_dir/$ac_word" >&5 -+echo "$as_me:7481: found $ac_dir/$ac_word" >&5 - break - done - -@@ -7480,10 +7486,10 @@ - fi - ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG - if test -n "$ac_ct_NCURSES_CONFIG"; then -- echo "$as_me:7483: result: $ac_ct_NCURSES_CONFIG" >&5 -+ echo "$as_me:7489: result: $ac_ct_NCURSES_CONFIG" >&5 - echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 - else -- echo "$as_me:7486: result: no" >&5 -+ echo "$as_me:7492: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -7516,7 +7522,7 @@ - - # even with config script, some packages use no-override for curses.h - --echo "$as_me:7519: checking if we have identified curses headers" >&5 -+echo "$as_me:7525: 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 -@@ -7528,7 +7534,7 @@ - curses.h ncurses/curses.h - do - cat >conftest.$ac_ext <<_ACEOF --#line 7531 "configure" -+#line 7537 "configure" - #include "confdefs.h" - #include <${cf_header}> - int -@@ -7540,16 +7546,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:7543: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:7549: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:7546: \$? = $ac_status" >&5 -+ echo "$as_me:7552: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:7549: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:7555: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:7552: \$? = $ac_status" >&5 -+ echo "$as_me:7558: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_ncurses_header=$cf_header; break - else -@@ -7560,11 +7566,11 @@ - done - - fi --echo "$as_me:7563: result: $cf_cv_ncurses_header" >&5 -+echo "$as_me:7569: 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:7567: error: No curses header-files found" >&5 -+ { { echo "$as_me:7573: error: No curses header-files found" >&5 - echo "$as_me: error: No curses header-files found" >&2;} - { (exit 1); exit 1; }; } - fi -@@ -7574,23 +7580,23 @@ - for ac_header in $cf_cv_ncurses_header - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:7577: checking for $ac_header" >&5 -+echo "$as_me:7583: 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 7583 "configure" -+#line 7589 "configure" - #include "confdefs.h" - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:7587: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:7593: \"$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:7593: \$? = $ac_status" >&5 -+ echo "$as_me:7599: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -7609,7 +7615,7 @@ - fi - rm -f conftest.err conftest.$ac_ext - fi --echo "$as_me:7612: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "$as_me:7618: 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 <conftest.$ac_ext <<_ACEOF --#line 7665 "configure" -+#line 7671 "configure" - #include "confdefs.h" - #include - int -@@ -7674,16 +7680,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:7677: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:7683: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:7680: \$? = $ac_status" >&5 -+ echo "$as_me:7686: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:7683: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:7689: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:7686: \$? = $ac_status" >&5 -+ echo "$as_me:7692: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -7700,7 +7706,7 @@ - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - --echo "${as_me:-configure}:7703: testing adding $cf_add_incdir to include-path ..." 1>&5 -+echo "${as_me:-configure}:7709: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - -@@ -7719,7 +7725,7 @@ - - } - --echo "$as_me:7722: checking for $cf_ncuhdr_root header in include-path" >&5 -+echo "$as_me:7728: 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 -@@ -7731,7 +7737,7 @@ - do - - cat >conftest.$ac_ext <<_ACEOF --#line 7734 "configure" -+#line 7740 "configure" - #include "confdefs.h" - - #include <$cf_header> -@@ -7755,16 +7761,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:7758: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:7764: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:7761: \$? = $ac_status" >&5 -+ echo "$as_me:7767: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:7764: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:7770: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:7767: \$? = $ac_status" >&5 -+ echo "$as_me:7773: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_ncurses_h=$cf_header - -@@ -7779,14 +7785,14 @@ - done - - fi --echo "$as_me:7782: result: $cf_cv_ncurses_h" >&5 -+echo "$as_me:7788: 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:7789: checking for $cf_ncuhdr_root include-path" >&5 -+echo "$as_me:7795: 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 -@@ -7904,7 +7910,7 @@ - cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF --#line 7907 "configure" -+#line 7913 "configure" - #include "confdefs.h" - #include - int -@@ -7916,16 +7922,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:7919: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:7925: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:7922: \$? = $ac_status" >&5 -+ echo "$as_me:7928: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:7925: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:7931: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:7928: \$? = $ac_status" >&5 -+ echo "$as_me:7934: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -7942,7 +7948,7 @@ - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - --echo "${as_me:-configure}:7945: testing adding $cf_add_incdir to include-path ..." 1>&5 -+echo "${as_me:-configure}:7951: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - -@@ -7965,7 +7971,7 @@ - do - - cat >conftest.$ac_ext <<_ACEOF --#line 7968 "configure" -+#line 7974 "configure" - #include "confdefs.h" - - #include <$cf_header> -@@ -7989,16 +7995,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:7992: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:7998: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:7995: \$? = $ac_status" >&5 -+ echo "$as_me:8001: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:7998: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8004: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8001: \$? = $ac_status" >&5 -+ echo "$as_me:8007: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_ncurses_h2=$cf_header - -@@ -8019,12 +8025,12 @@ - CPPFLAGS="$cf_save2_CPPFLAGS" - test "$cf_cv_ncurses_h2" != no && break - done -- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8022: error: not found" >&5 -+ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8028: error: not found" >&5 - echo "$as_me: error: not found" >&2;} - { (exit 1); exit 1; }; } - - fi --echo "$as_me:8027: result: $cf_cv_ncurses_h2" >&5 -+echo "$as_me:8033: 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%/[^/]*$%%'` -@@ -8057,7 +8063,7 @@ - cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF --#line 8060 "configure" -+#line 8066 "configure" - #include "confdefs.h" - #include - int -@@ -8069,16 +8075,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8072: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8078: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8075: \$? = $ac_status" >&5 -+ echo "$as_me:8081: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8078: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8084: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8081: \$? = $ac_status" >&5 -+ echo "$as_me:8087: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -8095,7 +8101,7 @@ - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - --echo "${as_me:-configure}:8098: testing adding $cf_add_incdir to include-path ..." 1>&5 -+echo "${as_me:-configure}:8104: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - -@@ -8143,7 +8149,7 @@ - ;; - esac - --echo "$as_me:8146: checking for terminfo header" >&5 -+echo "$as_me:8152: 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 -@@ -8161,7 +8167,7 @@ - for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" - do - cat >conftest.$ac_ext <<_ACEOF --#line 8164 "configure" -+#line 8170 "configure" - #include "confdefs.h" - #include - #include <${cf_cv_ncurses_header:-curses.h}> -@@ -8176,16 +8182,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8179: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8185: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8182: \$? = $ac_status" >&5 -+ echo "$as_me:8188: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8185: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8191: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8188: \$? = $ac_status" >&5 -+ echo "$as_me:8194: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - cf_cv_term_header="$cf_test" -@@ -8201,7 +8207,7 @@ - done - - fi --echo "$as_me:8204: result: $cf_cv_term_header" >&5 -+echo "$as_me:8210: result: $cf_cv_term_header" >&5 - echo "${ECHO_T}$cf_cv_term_header" >&6 - - # Set definitions to allow ifdef'ing to accommodate subdirectories -@@ -8239,7 +8245,7 @@ - #define NCURSES 1 - EOF - --echo "$as_me:8242: checking for ncurses version" >&5 -+echo "$as_me:8248: 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 -@@ -8265,10 +8271,10 @@ - #endif - EOF - cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" -- { (eval echo "$as_me:8268: \"$cf_try\"") >&5 -+ { (eval echo "$as_me:8274: \"$cf_try\"") >&5 - (eval $cf_try) 2>&5 - ac_status=$? -- echo "$as_me:8271: \$? = $ac_status" >&5 -+ echo "$as_me:8277: \$? = $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%".*%%'` -@@ -8278,7 +8284,7 @@ - - else - cat >conftest.$ac_ext <<_ACEOF --#line 8281 "configure" -+#line 8287 "configure" - #include "confdefs.h" - - #include <${cf_cv_ncurses_header:-curses.h}> -@@ -8303,15 +8309,15 @@ - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:8306: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:8312: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:8309: \$? = $ac_status" >&5 -+ echo "$as_me:8315: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:8311: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8317: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8314: \$? = $ac_status" >&5 -+ echo "$as_me:8320: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - cf_cv_ncurses_version=`cat $cf_tempfile` -@@ -8325,7 +8331,7 @@ - rm -f $cf_tempfile - - fi --echo "$as_me:8328: result: $cf_cv_ncurses_version" >&5 -+echo "$as_me:8334: result: $cf_cv_ncurses_version" >&5 - echo "${ECHO_T}$cf_cv_ncurses_version" >&6 - test "$cf_cv_ncurses_version" = no || - cat >>confdefs.h <<\EOF -@@ -8338,7 +8344,7 @@ - # to link gpm. - cf_ncurses_LIBS="" - cf_ncurses_SAVE="$LIBS" --echo "$as_me:8341: checking for Gpm_Open in -lgpm" >&5 -+echo "$as_me:8347: 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 -@@ -8346,7 +8352,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lgpm $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 8349 "configure" -+#line 8355 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -8365,16 +8371,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:8368: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:8374: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:8371: \$? = $ac_status" >&5 -+ echo "$as_me:8377: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:8374: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8380: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8377: \$? = $ac_status" >&5 -+ echo "$as_me:8383: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_gpm_Gpm_Open=yes - else -@@ -8385,10 +8391,10 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:8388: result: $ac_cv_lib_gpm_Gpm_Open" >&5 -+echo "$as_me:8394: 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:8391: checking for initscr in -lgpm" >&5 -+ echo "$as_me:8397: 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 -@@ -8396,7 +8402,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lgpm $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 8399 "configure" -+#line 8405 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -8415,16 +8421,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:8418: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:8424: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:8421: \$? = $ac_status" >&5 -+ echo "$as_me:8427: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:8424: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8430: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8427: \$? = $ac_status" >&5 -+ echo "$as_me:8433: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_gpm_initscr=yes - else -@@ -8435,7 +8441,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:8438: result: $ac_cv_lib_gpm_initscr" >&5 -+echo "$as_me:8444: 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" -@@ -8450,7 +8456,7 @@ - # 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:8453: checking for tgoto in -lmytinfo" >&5 -+ echo "$as_me:8459: 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 -@@ -8458,7 +8464,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lmytinfo $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 8461 "configure" -+#line 8467 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -8477,16 +8483,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:8480: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:8486: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:8483: \$? = $ac_status" >&5 -+ echo "$as_me:8489: \$? = $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:8492: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8489: \$? = $ac_status" >&5 -+ echo "$as_me:8495: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_mytinfo_tgoto=yes - else -@@ -8497,7 +8503,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:8500: result: $ac_cv_lib_mytinfo_tgoto" >&5 -+echo "$as_me:8506: 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" -@@ -8546,13 +8552,13 @@ - - eval 'cf_cv_have_lib_'$cf_nculib_root'=no' - cf_libdir="" -- echo "$as_me:8549: checking for initscr" >&5 -+ echo "$as_me:8555: 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 8555 "configure" -+#line 8561 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char initscr (); below. */ -@@ -8583,16 +8589,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:8586: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:8592: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:8589: \$? = $ac_status" >&5 -+ echo "$as_me:8595: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:8592: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8598: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8595: \$? = $ac_status" >&5 -+ echo "$as_me:8601: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_initscr=yes - else -@@ -8602,18 +8608,18 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:8605: result: $ac_cv_func_initscr" >&5 -+echo "$as_me:8611: 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:8612: checking for initscr in -l$cf_nculib_root" >&5 -+ echo "$as_me:8618: 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 8616 "configure" -+#line 8622 "configure" - #include "confdefs.h" - #include <${cf_cv_ncurses_header:-curses.h}> - int -@@ -8625,25 +8631,25 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:8628: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:8634: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:8631: \$? = $ac_status" >&5 -+ echo "$as_me:8637: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:8634: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8640: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8637: \$? = $ac_status" >&5 -+ echo "$as_me:8643: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- echo "$as_me:8639: result: yes" >&5 -+ echo "$as_me:8645: 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:8646: result: no" >&5 -+echo "$as_me:8652: result: no" >&5 - echo "${ECHO_T}no" >&6 - - cf_search= -@@ -8711,11 +8717,11 @@ - - for cf_libdir in $cf_search - do -- echo "$as_me:8714: checking for -l$cf_nculib_root in $cf_libdir" >&5 -+ echo "$as_me:8720: 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 8718 "configure" -+#line 8724 "configure" - #include "confdefs.h" - #include <${cf_cv_ncurses_header:-curses.h}> - int -@@ -8727,25 +8733,25 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:8730: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:8736: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:8733: \$? = $ac_status" >&5 -+ echo "$as_me:8739: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:8736: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8742: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8739: \$? = $ac_status" >&5 -+ echo "$as_me:8745: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- echo "$as_me:8741: result: yes" >&5 -+ echo "$as_me:8747: 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:8748: result: no" >&5 -+echo "$as_me:8754: result: no" >&5 - echo "${ECHO_T}no" >&6 - LIBS="$cf_save_LIBS" - fi -@@ -8760,7 +8766,7 @@ - eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root - - if test $cf_found_library = no ; then -- { { echo "$as_me:8763: error: Cannot link $cf_nculib_root library" >&5 -+ { { echo "$as_me:8769: error: Cannot link $cf_nculib_root library" >&5 - echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} - { (exit 1); exit 1; }; } - fi -@@ -8768,7 +8774,7 @@ - fi - - if test -n "$cf_ncurses_LIBS" ; then -- echo "$as_me:8771: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 -+ echo "$as_me:8777: 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 -@@ -8778,7 +8784,7 @@ - fi - done - cat >conftest.$ac_ext <<_ACEOF --#line 8781 "configure" -+#line 8787 "configure" - #include "confdefs.h" - #include <${cf_cv_ncurses_header:-curses.h}> - int -@@ -8790,23 +8796,23 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:8793: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:8799: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:8796: \$? = $ac_status" >&5 -+ echo "$as_me:8802: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:8799: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8805: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8802: \$? = $ac_status" >&5 -+ echo "$as_me:8808: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- echo "$as_me:8804: result: yes" >&5 -+ echo "$as_me:8810: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 --echo "$as_me:8809: result: no" >&5 -+echo "$as_me:8815: result: no" >&5 - echo "${ECHO_T}no" >&6 - LIBS="$cf_ncurses_SAVE" - fi -@@ -8859,10 +8865,10 @@ - AUTOCONF_$cf_name NCURSES_VERSION_$cf_name - CF_EOF - cf_try="$ac_cpp conftest.$ac_ext 2>&5 | fgrep AUTOCONF_$cf_name >conftest.out" -- { (eval echo "$as_me:8862: \"$cf_try\"") >&5 -+ { (eval echo "$as_me:8868: \"$cf_try\"") >&5 - (eval $cf_try) 2>&5 - ac_status=$? -- echo "$as_me:8865: \$? = $ac_status" >&5 -+ echo "$as_me:8871: \$? = $ac_status" >&5 - (exit $ac_status); } - if test -f conftest.out ; then - cf_result=`cat conftest.out | sed -e "s/^.*AUTOCONF_$cf_name[ ][ ]*//"` -@@ -8880,10 +8886,10 @@ - - cf_cv_timestamp=`date` - --echo "$as_me:8883: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 -+echo "$as_me:8889: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 - echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6 - --echo "$as_me:8886: checking if you want to have a library-prefix" >&5 -+echo "$as_me:8892: checking if you want to have a library-prefix" >&5 - echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6 - - # Check whether --with-lib-prefix or --without-lib-prefix was given. -@@ -8893,7 +8899,7 @@ - else - with_lib_prefix=auto - fi; --echo "$as_me:8896: result: $with_lib_prefix" >&5 -+echo "$as_me:8902: result: $with_lib_prefix" >&5 - echo "${ECHO_T}$with_lib_prefix" >&6 - - if test $with_lib_prefix = auto -@@ -8924,7 +8930,7 @@ - test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT='' - fi - --echo "$as_me:8927: checking for default loader flags" >&5 -+echo "$as_me:8933: checking for default loader flags" >&5 - echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6 - case $DFT_LWR_MODEL in - (normal) LD_MODEL='' ;; -@@ -8932,11 +8938,11 @@ - (profile) LD_MODEL='-pg';; - (shared) LD_MODEL='' ;; - esac --echo "$as_me:8935: result: $LD_MODEL" >&5 -+echo "$as_me:8941: result: $LD_MODEL" >&5 - echo "${ECHO_T}$LD_MODEL" >&6 - - LD_RPATH_OPT= --echo "$as_me:8939: checking for an rpath option" >&5 -+echo "$as_me:8945: checking for an rpath option" >&5 - echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 - case $cf_cv_system_name in - (irix*) -@@ -8967,12 +8973,12 @@ - (*) - ;; - esac --echo "$as_me:8970: result: $LD_RPATH_OPT" >&5 -+echo "$as_me:8976: result: $LD_RPATH_OPT" >&5 - echo "${ECHO_T}$LD_RPATH_OPT" >&6 - - case "x$LD_RPATH_OPT" in - (x-R*) -- echo "$as_me:8975: checking if we need a space after rpath option" >&5 -+ echo "$as_me:8981: 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" - -@@ -8993,7 +8999,7 @@ - LIBS="$cf_add_libs" - - cat >conftest.$ac_ext <<_ACEOF --#line 8996 "configure" -+#line 9002 "configure" - #include "confdefs.h" - - int -@@ -9005,16 +9011,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:9008: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:9014: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:9011: \$? = $ac_status" >&5 -+ echo "$as_me:9017: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:9014: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9020: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9017: \$? = $ac_status" >&5 -+ echo "$as_me:9023: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_rpath_space=no - else -@@ -9024,7 +9030,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS="$cf_save_LIBS" -- echo "$as_me:9027: result: $cf_rpath_space" >&5 -+ echo "$as_me:9033: result: $cf_rpath_space" >&5 - echo "${ECHO_T}$cf_rpath_space" >&6 - test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " - ;; -@@ -9045,7 +9051,7 @@ - cf_ld_rpath_opt= - test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT" - -- echo "$as_me:9048: checking if release/abi version should be used for shared libs" >&5 -+ echo "$as_me:9054: checking if release/abi version should be used for shared libs" >&5 - echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6 - - # Check whether --with-shlib-version or --without-shlib-version was given. -@@ -9056,12 +9062,14 @@ - (yes) - cf_cv_shlib_version=auto - ;; -- (rel|abi|auto|no) -+ (rel|abi|auto) - cf_cv_shlib_version=$withval - ;; - (*) -- { { echo "$as_me:9063: error: option value must be one of: rel, abi, auto or no" >&5 --echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;} -+ echo "$as_me:9069: result: $withval" >&5 -+echo "${ECHO_T}$withval" >&6 -+ { { echo "$as_me:9071: error: option value must be one of: rel, abi, or auto" >&5 -+echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;} - { (exit 1); exit 1; }; } - ;; - esac -@@ -9069,7 +9077,7 @@ - else - cf_cv_shlib_version=auto - fi; -- echo "$as_me:9072: result: $cf_cv_shlib_version" >&5 -+ echo "$as_me:9080: result: $cf_cv_shlib_version" >&5 - echo "${ECHO_T}$cf_cv_shlib_version" >&6 - - cf_cv_rm_so_locs=no -@@ -9079,14 +9087,14 @@ - CC_SHARED_OPTS= - if test "$GCC" = yes - then -- echo "$as_me:9082: checking which $CC option to use" >&5 -+ echo "$as_me:9090: checking which $CC option to use" >&5 - echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6 - cf_save_CFLAGS="$CFLAGS" - for CC_SHARED_OPTS in -fPIC -fpic '' - do - CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS" - cat >conftest.$ac_ext <<_ACEOF --#line 9089 "configure" -+#line 9097 "configure" - #include "confdefs.h" - #include - int -@@ -9098,16 +9106,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:9101: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:9109: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:9104: \$? = $ac_status" >&5 -+ echo "$as_me:9112: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:9107: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9115: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9110: \$? = $ac_status" >&5 -+ echo "$as_me:9118: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break - else -@@ -9116,7 +9124,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - done -- echo "$as_me:9119: result: $CC_SHARED_OPTS" >&5 -+ echo "$as_me:9127: result: $CC_SHARED_OPTS" >&5 - echo "${ECHO_T}$CC_SHARED_OPTS" >&6 - CFLAGS="$cf_save_CFLAGS" - fi -@@ -9187,7 +9195,7 @@ - MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@' - test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi - cf_cv_shlib_version_infix=yes -- echo "$as_me:9190: checking if ld -search_paths_first works" >&5 -+ echo "$as_me:9198: checking if ld -search_paths_first works" >&5 - echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6 - if test "${cf_cv_ldflags_search_paths_first+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -9196,7 +9204,7 @@ - cf_save_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS -Wl,-search_paths_first" - cat >conftest.$ac_ext <<_ACEOF --#line 9199 "configure" -+#line 9207 "configure" - #include "confdefs.h" - - int -@@ -9208,16 +9216,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:9211: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:9219: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:9214: \$? = $ac_status" >&5 -+ echo "$as_me:9222: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:9217: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9225: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9220: \$? = $ac_status" >&5 -+ echo "$as_me:9228: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_ldflags_search_paths_first=yes - else -@@ -9228,7 +9236,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$cf_save_LDFLAGS - fi --echo "$as_me:9231: result: $cf_cv_ldflags_search_paths_first" >&5 -+echo "$as_me:9239: result: $cf_cv_ldflags_search_paths_first" >&5 - echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 - if test $cf_cv_ldflags_search_paths_first = yes; then - LDFLAGS="$LDFLAGS -Wl,-search_paths_first" -@@ -9453,7 +9461,7 @@ - do - CFLAGS="$cf_shared_opts $cf_save_CFLAGS" - cat >conftest.$ac_ext <<_ACEOF --#line 9456 "configure" -+#line 9464 "configure" - #include "confdefs.h" - #include - int -@@ -9465,16 +9473,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:9468: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:9476: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:9471: \$? = $ac_status" >&5 -+ echo "$as_me:9479: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:9474: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9482: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9477: \$? = $ac_status" >&5 -+ echo "$as_me:9485: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break - else -@@ -9511,7 +9519,7 @@ - test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes - ;; - (*) -- { echo "$as_me:9514: WARNING: ignored --with-shlib-version" >&5 -+ { echo "$as_me:9522: WARNING: ignored --with-shlib-version" >&5 - echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} - ;; - esac -@@ -9521,7 +9529,7 @@ - if test -n "$cf_try_cflags" - then - cat > conftest.$ac_ext < - int main(int argc, char *argv[]) - { -@@ -9533,18 +9541,18 @@ - for cf_opt in $cf_try_cflags - do - CFLAGS="$cf_save_CFLAGS -$cf_opt" -- echo "$as_me:9536: checking if CFLAGS option -$cf_opt works" >&5 -+ echo "$as_me:9544: checking if CFLAGS option -$cf_opt works" >&5 - echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6 -- if { (eval echo "$as_me:9538: \"$ac_compile\"") >&5 -+ if { (eval echo "$as_me:9546: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:9541: \$? = $ac_status" >&5 -+ echo "$as_me:9549: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- echo "$as_me:9543: result: yes" >&5 -+ echo "$as_me:9551: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - cf_save_CFLAGS="$CFLAGS" - else -- echo "$as_me:9547: result: no" >&5 -+ echo "$as_me:9555: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - done -@@ -9559,17 +9567,17 @@ - - test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6 - --echo "${as_me:-configure}:9562: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 -+echo "${as_me:-configure}:9570: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 - - test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 - --echo "${as_me:-configure}:9566: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 -+echo "${as_me:-configure}:9574: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 - - # The test/sample programs in the original tree link using rpath option. - # Make it optional for packagers. - if test -n "$LOCAL_LDFLAGS" - then -- echo "$as_me:9572: checking if you want to link sample programs with rpath option" >&5 -+ echo "$as_me:9580: checking if you want to link sample programs with rpath option" >&5 - echo $ECHO_N "checking if you want to link sample programs with rpath option... $ECHO_C" >&6 - - # Check whether --enable-rpath-link or --disable-rpath-link was given. -@@ -9579,7 +9587,7 @@ - else - with_rpath_link=yes - fi; -- echo "$as_me:9582: result: $with_rpath_link" >&5 -+ echo "$as_me:9590: result: $with_rpath_link" >&5 - echo "${ECHO_T}$with_rpath_link" >&6 - if test "$with_rpath_link" = no - then -@@ -9591,7 +9599,7 @@ - ############################################################################### - - ### use option --enable-broken-linker to force on use of broken-linker support --echo "$as_me:9594: checking if you want broken-linker support code" >&5 -+echo "$as_me:9602: checking if you want broken-linker support code" >&5 - echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6 - - # Check whether --enable-broken_linker or --disable-broken_linker was given. -@@ -9601,7 +9609,7 @@ - else - with_broken_linker=${BROKEN_LINKER:-no} - fi; --echo "$as_me:9604: result: $with_broken_linker" >&5 -+echo "$as_me:9612: result: $with_broken_linker" >&5 - echo "${ECHO_T}$with_broken_linker" >&6 - - BROKEN_LINKER=0 -@@ -9621,7 +9629,7 @@ - BROKEN_LINKER=1 - test -n "$verbose" && echo " cygwin linker is broken anyway" 1>&6 - --echo "${as_me:-configure}:9624: testing cygwin linker is broken anyway ..." 1>&5 -+echo "${as_me:-configure}:9632: testing cygwin linker is broken anyway ..." 1>&5 - - ;; - esac -@@ -9667,14 +9675,14 @@ - ;; - (linux*|gnu*|mint*|k*bsd*-gnu) - --echo "$as_me:9670: checking if we must define _GNU_SOURCE" >&5 -+echo "$as_me:9678: 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 9677 "configure" -+#line 9685 "configure" - #include "confdefs.h" - #include - int -@@ -9689,16 +9697,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:9692: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:9700: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:9695: \$? = $ac_status" >&5 -+ echo "$as_me:9703: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:9698: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9706: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9701: \$? = $ac_status" >&5 -+ echo "$as_me:9709: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_gnu_source=no - else -@@ -9707,7 +9715,7 @@ - cf_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" - cat >conftest.$ac_ext <<_ACEOF --#line 9710 "configure" -+#line 9718 "configure" - #include "confdefs.h" - #include - int -@@ -9722,16 +9730,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:9725: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:9733: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:9728: \$? = $ac_status" >&5 -+ echo "$as_me:9736: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:9731: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9739: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9734: \$? = $ac_status" >&5 -+ echo "$as_me:9742: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_gnu_source=no - else -@@ -9746,7 +9754,7 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - - fi --echo "$as_me:9749: result: $cf_cv_gnu_source" >&5 -+echo "$as_me:9757: result: $cf_cv_gnu_source" >&5 - echo "${ECHO_T}$cf_cv_gnu_source" >&6 - test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" - -@@ -9771,16 +9779,16 @@ - sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` - --echo "$as_me:9774: checking if we should define _POSIX_C_SOURCE" >&5 -+echo "$as_me:9782: 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}:9780: testing if the symbol is already defined go no further ..." 1>&5 -+echo "${as_me:-configure}:9788: testing if the symbol is already defined go no further ..." 1>&5 - - cat >conftest.$ac_ext <<_ACEOF --#line 9783 "configure" -+#line 9791 "configure" - #include "confdefs.h" - #include - int -@@ -9795,16 +9803,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:9798: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:9806: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:9801: \$? = $ac_status" >&5 -+ echo "$as_me:9809: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:9804: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9812: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9807: \$? = $ac_status" >&5 -+ echo "$as_me:9815: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_posix_c_source=no - else -@@ -9825,7 +9833,7 @@ - esac - if test "$cf_want_posix_source" = yes ; then - cat >conftest.$ac_ext <<_ACEOF --#line 9828 "configure" -+#line 9836 "configure" - #include "confdefs.h" - #include - int -@@ -9840,16 +9848,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:9843: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:9851: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:9846: \$? = $ac_status" >&5 -+ echo "$as_me:9854: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:9849: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9857: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9852: \$? = $ac_status" >&5 -+ echo "$as_me:9860: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -9860,15 +9868,15 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - fi - --echo "${as_me:-configure}:9863: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 -+echo "${as_me:-configure}:9871: 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}:9868: testing if the second compile does not leave our definition intact error ..." 1>&5 -+echo "${as_me:-configure}:9876: testing if the second compile does not leave our definition intact error ..." 1>&5 - - cat >conftest.$ac_ext <<_ACEOF --#line 9871 "configure" -+#line 9879 "configure" - #include "confdefs.h" - #include - int -@@ -9883,16 +9891,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:9886: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:9894: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:9889: \$? = $ac_status" >&5 -+ echo "$as_me:9897: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:9892: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9900: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9895: \$? = $ac_status" >&5 -+ echo "$as_me:9903: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -9908,7 +9916,7 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - - fi --echo "$as_me:9911: result: $cf_cv_posix_c_source" >&5 -+echo "$as_me:9919: 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 -@@ -10026,14 +10034,14 @@ - ;; - (*) - --echo "$as_me:10029: checking if we should define _XOPEN_SOURCE" >&5 -+echo "$as_me:10037: 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 10036 "configure" -+#line 10044 "configure" - #include "confdefs.h" - - #include -@@ -10052,16 +10060,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10055: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10063: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10058: \$? = $ac_status" >&5 -+ echo "$as_me:10066: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10061: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10069: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10064: \$? = $ac_status" >&5 -+ echo "$as_me:10072: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_xopen_source=no - else -@@ -10070,7 +10078,7 @@ - cf_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" - cat >conftest.$ac_ext <<_ACEOF --#line 10073 "configure" -+#line 10081 "configure" - #include "confdefs.h" - - #include -@@ -10089,16 +10097,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10092: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10100: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10095: \$? = $ac_status" >&5 -+ echo "$as_me:10103: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10098: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10106: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10101: \$? = $ac_status" >&5 -+ echo "$as_me:10109: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_xopen_source=no - else -@@ -10113,7 +10121,7 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - - fi --echo "$as_me:10116: result: $cf_cv_xopen_source" >&5 -+echo "$as_me:10124: result: $cf_cv_xopen_source" >&5 - echo "${ECHO_T}$cf_cv_xopen_source" >&6 - - if test "$cf_cv_xopen_source" != no ; then -@@ -10221,16 +10229,16 @@ - sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` - --echo "$as_me:10224: checking if we should define _POSIX_C_SOURCE" >&5 -+echo "$as_me:10232: 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}:10230: testing if the symbol is already defined go no further ..." 1>&5 -+echo "${as_me:-configure}:10238: testing if the symbol is already defined go no further ..." 1>&5 - - cat >conftest.$ac_ext <<_ACEOF --#line 10233 "configure" -+#line 10241 "configure" - #include "confdefs.h" - #include - int -@@ -10245,16 +10253,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10248: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10256: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10251: \$? = $ac_status" >&5 -+ echo "$as_me:10259: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10254: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10262: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10257: \$? = $ac_status" >&5 -+ echo "$as_me:10265: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_posix_c_source=no - else -@@ -10275,7 +10283,7 @@ - esac - if test "$cf_want_posix_source" = yes ; then - cat >conftest.$ac_ext <<_ACEOF --#line 10278 "configure" -+#line 10286 "configure" - #include "confdefs.h" - #include - int -@@ -10290,16 +10298,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10293: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10301: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10296: \$? = $ac_status" >&5 -+ echo "$as_me:10304: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10299: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10307: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10302: \$? = $ac_status" >&5 -+ echo "$as_me:10310: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -10310,15 +10318,15 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - fi - --echo "${as_me:-configure}:10313: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 -+echo "${as_me:-configure}:10321: 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}:10318: testing if the second compile does not leave our definition intact error ..." 1>&5 -+echo "${as_me:-configure}:10326: testing if the second compile does not leave our definition intact error ..." 1>&5 - - cat >conftest.$ac_ext <<_ACEOF --#line 10321 "configure" -+#line 10329 "configure" - #include "confdefs.h" - #include - int -@@ -10333,16 +10341,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10336: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10344: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10339: \$? = $ac_status" >&5 -+ echo "$as_me:10347: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10342: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10350: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10345: \$? = $ac_status" >&5 -+ echo "$as_me:10353: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -10358,7 +10366,7 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - - fi --echo "$as_me:10361: result: $cf_cv_posix_c_source" >&5 -+echo "$as_me:10369: 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 -@@ -10516,7 +10524,7 @@ - if test -n "$cf_new_cflags" ; then - test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 - --echo "${as_me:-configure}:10519: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 -+echo "${as_me:-configure}:10527: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 - - CFLAGS="$CFLAGS $cf_new_cflags" - fi -@@ -10524,7 +10532,7 @@ - if test -n "$cf_new_cppflags" ; then - test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 - --echo "${as_me:-configure}:10527: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 -+echo "${as_me:-configure}:10535: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 - - CPPFLAGS="$CPPFLAGS $cf_new_cppflags" - fi -@@ -10532,7 +10540,7 @@ - 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}:10535: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 -+echo "${as_me:-configure}:10543: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 - - EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" - fi -@@ -10540,10 +10548,10 @@ - fi - - if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then -- echo "$as_me:10543: checking if _XOPEN_SOURCE really is set" >&5 -+ echo "$as_me:10551: 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 10546 "configure" -+#line 10554 "configure" - #include "confdefs.h" - #include - int -@@ -10558,16 +10566,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10561: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10569: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10564: \$? = $ac_status" >&5 -+ echo "$as_me:10572: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10567: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10575: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10570: \$? = $ac_status" >&5 -+ echo "$as_me:10578: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_XOPEN_SOURCE_set=yes - else -@@ -10576,12 +10584,12 @@ - cf_XOPEN_SOURCE_set=no - fi - rm -f conftest.$ac_objext conftest.$ac_ext -- echo "$as_me:10579: result: $cf_XOPEN_SOURCE_set" >&5 -+ echo "$as_me:10587: 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 10584 "configure" -+#line 10592 "configure" - #include "confdefs.h" - #include - int -@@ -10596,16 +10604,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10599: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10607: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10602: \$? = $ac_status" >&5 -+ echo "$as_me:10610: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10605: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10613: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10608: \$? = $ac_status" >&5 -+ echo "$as_me:10616: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_XOPEN_SOURCE_set_ok=yes - else -@@ -10616,19 +10624,19 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - if test $cf_XOPEN_SOURCE_set_ok = no - then -- { echo "$as_me:10619: WARNING: _XOPEN_SOURCE is lower than requested" >&5 -+ { echo "$as_me:10627: WARNING: _XOPEN_SOURCE is lower than requested" >&5 - echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} - fi - else - --echo "$as_me:10624: checking if we should define _XOPEN_SOURCE" >&5 -+echo "$as_me:10632: 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 10631 "configure" -+#line 10639 "configure" - #include "confdefs.h" - - #include -@@ -10647,16 +10655,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10650: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10658: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10653: \$? = $ac_status" >&5 -+ echo "$as_me:10661: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10656: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10664: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10659: \$? = $ac_status" >&5 -+ echo "$as_me:10667: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_xopen_source=no - else -@@ -10665,7 +10673,7 @@ - cf_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" - cat >conftest.$ac_ext <<_ACEOF --#line 10668 "configure" -+#line 10676 "configure" - #include "confdefs.h" - - #include -@@ -10684,16 +10692,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10687: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10695: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10690: \$? = $ac_status" >&5 -+ echo "$as_me:10698: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10693: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10701: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10696: \$? = $ac_status" >&5 -+ echo "$as_me:10704: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_xopen_source=no - else -@@ -10708,7 +10716,7 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - - fi --echo "$as_me:10711: result: $cf_cv_xopen_source" >&5 -+echo "$as_me:10719: result: $cf_cv_xopen_source" >&5 - echo "${ECHO_T}$cf_cv_xopen_source" >&6 - - if test "$cf_cv_xopen_source" != no ; then -@@ -10813,7 +10821,7 @@ - fi; - if test "$enable_largefile" != no; then - -- echo "$as_me:10816: checking for special C compiler options needed for large files" >&5 -+ echo "$as_me:10824: 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 -@@ -10825,7 +10833,7 @@ - # 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 10828 "configure" -+#line 10836 "configure" - #include "confdefs.h" - #include - /* Check that off_t can represent 2**63 - 1 correctly. -@@ -10845,16 +10853,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10848: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10856: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10851: \$? = $ac_status" >&5 -+ echo "$as_me:10859: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10854: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10862: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10857: \$? = $ac_status" >&5 -+ echo "$as_me:10865: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break - else -@@ -10864,16 +10872,16 @@ - rm -f conftest.$ac_objext - CC="$CC -n32" - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10867: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10875: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10870: \$? = $ac_status" >&5 -+ echo "$as_me:10878: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10873: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10881: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10876: \$? = $ac_status" >&5 -+ echo "$as_me:10884: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sys_largefile_CC=' -n32'; break - else -@@ -10887,13 +10895,13 @@ - rm -f conftest.$ac_ext - fi - fi --echo "$as_me:10890: result: $ac_cv_sys_largefile_CC" >&5 -+echo "$as_me:10898: 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:10896: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -+ echo "$as_me:10904: 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 -@@ -10901,7 +10909,7 @@ - while :; do - ac_cv_sys_file_offset_bits=no - cat >conftest.$ac_ext <<_ACEOF --#line 10904 "configure" -+#line 10912 "configure" - #include "confdefs.h" - #include - /* Check that off_t can represent 2**63 - 1 correctly. -@@ -10921,16 +10929,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10924: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10932: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10927: \$? = $ac_status" >&5 -+ echo "$as_me:10935: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10930: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10938: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10933: \$? = $ac_status" >&5 -+ echo "$as_me:10941: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break - else -@@ -10939,7 +10947,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF --#line 10942 "configure" -+#line 10950 "configure" - #include "confdefs.h" - #define _FILE_OFFSET_BITS 64 - #include -@@ -10960,16 +10968,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10963: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10971: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10966: \$? = $ac_status" >&5 -+ echo "$as_me:10974: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10969: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10977: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10972: \$? = $ac_status" >&5 -+ echo "$as_me:10980: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sys_file_offset_bits=64; break - else -@@ -10980,7 +10988,7 @@ - break - done - fi --echo "$as_me:10983: result: $ac_cv_sys_file_offset_bits" >&5 -+echo "$as_me:10991: 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 - -@@ -10990,7 +10998,7 @@ - - fi - rm -rf conftest* -- echo "$as_me:10993: checking for _LARGE_FILES value needed for large files" >&5 -+ echo "$as_me:11001: 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 -@@ -10998,7 +11006,7 @@ - while :; do - ac_cv_sys_large_files=no - cat >conftest.$ac_ext <<_ACEOF --#line 11001 "configure" -+#line 11009 "configure" - #include "confdefs.h" - #include - /* Check that off_t can represent 2**63 - 1 correctly. -@@ -11018,16 +11026,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:11021: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:11029: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:11024: \$? = $ac_status" >&5 -+ echo "$as_me:11032: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:11027: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:11035: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:11030: \$? = $ac_status" >&5 -+ echo "$as_me:11038: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break - else -@@ -11036,7 +11044,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF --#line 11039 "configure" -+#line 11047 "configure" - #include "confdefs.h" - #define _LARGE_FILES 1 - #include -@@ -11057,16 +11065,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:11060: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:11068: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:11063: \$? = $ac_status" >&5 -+ echo "$as_me:11071: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:11066: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:11074: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:11069: \$? = $ac_status" >&5 -+ echo "$as_me:11077: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sys_large_files=1; break - else -@@ -11077,7 +11085,7 @@ - break - done - fi --echo "$as_me:11080: result: $ac_cv_sys_large_files" >&5 -+echo "$as_me:11088: 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 - -@@ -11090,7 +11098,7 @@ - fi - - if test "$enable_largefile" != no ; then -- echo "$as_me:11093: checking for _LARGEFILE_SOURCE value needed for large files" >&5 -+ echo "$as_me:11101: 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 -@@ -11098,7 +11106,7 @@ - while :; do - ac_cv_sys_largefile_source=no - cat >conftest.$ac_ext <<_ACEOF --#line 11101 "configure" -+#line 11109 "configure" - #include "confdefs.h" - #include - int -@@ -11110,16 +11118,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:11113: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:11121: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:11116: \$? = $ac_status" >&5 -+ echo "$as_me:11124: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:11119: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:11127: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:11122: \$? = $ac_status" >&5 -+ echo "$as_me:11130: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break - else -@@ -11128,7 +11136,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF --#line 11131 "configure" -+#line 11139 "configure" - #include "confdefs.h" - #define _LARGEFILE_SOURCE 1 - #include -@@ -11141,16 +11149,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:11144: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:11152: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:11147: \$? = $ac_status" >&5 -+ echo "$as_me:11155: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:11150: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:11158: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:11153: \$? = $ac_status" >&5 -+ echo "$as_me:11161: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sys_largefile_source=1; break - else -@@ -11161,7 +11169,7 @@ - break - done - fi --echo "$as_me:11164: result: $ac_cv_sys_largefile_source" >&5 -+echo "$as_me:11172: 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 - -@@ -11175,13 +11183,13 @@ - # 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:11178: checking for fseeko" >&5 -+echo "$as_me:11186: 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 11184 "configure" -+#line 11192 "configure" - #include "confdefs.h" - #include - int -@@ -11193,16 +11201,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:11196: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:11204: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:11199: \$? = $ac_status" >&5 -+ echo "$as_me:11207: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:11202: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:11210: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:11205: \$? = $ac_status" >&5 -+ echo "$as_me:11213: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_fseeko=yes - else -@@ -11212,7 +11220,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:11215: result: $ac_cv_func_fseeko" >&5 -+echo "$as_me:11223: result: $ac_cv_func_fseeko" >&5 - echo "${ECHO_T}$ac_cv_func_fseeko" >&6 - if test $ac_cv_func_fseeko = yes; then - -@@ -11233,14 +11241,14 @@ - 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:11236: checking whether to use struct dirent64" >&5 -+ echo "$as_me:11244: 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 11243 "configure" -+#line 11251 "configure" - #include "confdefs.h" - - #include -@@ -11261,16 +11269,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:11264: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:11272: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:11267: \$? = $ac_status" >&5 -+ echo "$as_me:11275: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:11270: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:11278: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:11273: \$? = $ac_status" >&5 -+ echo "$as_me:11281: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_struct_dirent64=yes - else -@@ -11281,7 +11289,7 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - - fi --echo "$as_me:11284: result: $cf_cv_struct_dirent64" >&5 -+echo "$as_me:11292: result: $cf_cv_struct_dirent64" >&5 - echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 - test "$cf_cv_struct_dirent64" = yes && - cat >>confdefs.h <<\EOF -@@ -11291,7 +11299,7 @@ - fi - - ### Enable compiling-in rcs id's --echo "$as_me:11294: checking if RCS identifiers should be compiled-in" >&5 -+echo "$as_me:11302: checking if RCS identifiers should be compiled-in" >&5 - echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6 - - # Check whether --with-rcs-ids or --without-rcs-ids was given. -@@ -11301,7 +11309,7 @@ - else - with_rcs_ids=no - fi; --echo "$as_me:11304: result: $with_rcs_ids" >&5 -+echo "$as_me:11312: result: $with_rcs_ids" >&5 - echo "${ECHO_T}$with_rcs_ids" >&6 - test "$with_rcs_ids" = yes && - cat >>confdefs.h <<\EOF -@@ -11311,7 +11319,7 @@ - ############################################################################### - - ### Note that some functions (such as const) are normally disabled anyway. --echo "$as_me:11314: checking if you want to build with function extensions" >&5 -+echo "$as_me:11322: checking if you want to build with function extensions" >&5 - echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6 - - # Check whether --enable-ext-funcs or --disable-ext-funcs was given. -@@ -11321,7 +11329,7 @@ - else - with_ext_funcs=yes - fi; --echo "$as_me:11324: result: $with_ext_funcs" >&5 -+echo "$as_me:11332: result: $with_ext_funcs" >&5 - echo "${ECHO_T}$with_ext_funcs" >&6 - if test "$with_ext_funcs" = yes ; then - NCURSES_EXT_FUNCS=1 -@@ -11339,7 +11347,7 @@ - fi - - ### use option --enable-const to turn on use of const beyond that in XSI. --echo "$as_me:11342: checking for extended use of const keyword" >&5 -+echo "$as_me:11350: checking for extended use of const keyword" >&5 - echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6 - - # Check whether --enable-const or --disable-const was given. -@@ -11349,7 +11357,7 @@ - else - with_ext_const=no - fi; --echo "$as_me:11352: result: $with_ext_const" >&5 -+echo "$as_me:11360: result: $with_ext_const" >&5 - echo "${ECHO_T}$with_ext_const" >&6 - NCURSES_CONST='/*nothing*/' - if test "$with_ext_const" = yes ; then -@@ -11359,7 +11367,7 @@ - ############################################################################### - # These options are relatively safe to experiment with. - --echo "$as_me:11362: checking if you want all development code" >&5 -+echo "$as_me:11370: checking if you want all development code" >&5 - echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6 - - # Check whether --with-develop or --without-develop was given. -@@ -11369,7 +11377,7 @@ - else - with_develop=no - fi; --echo "$as_me:11372: result: $with_develop" >&5 -+echo "$as_me:11380: result: $with_develop" >&5 - echo "${ECHO_T}$with_develop" >&6 - - ############################################################################### -@@ -11378,7 +11386,7 @@ - # This is still experimental (20080329), but should ultimately be moved to - # the script-block --with-normal, etc. - --echo "$as_me:11381: checking if you want to link with the pthread library" >&5 -+echo "$as_me:11389: checking if you want to link with the pthread library" >&5 - echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6 - - # Check whether --with-pthread or --without-pthread was given. -@@ -11388,27 +11396,27 @@ - else - with_pthread=no - fi; --echo "$as_me:11391: result: $with_pthread" >&5 -+echo "$as_me:11399: result: $with_pthread" >&5 - echo "${ECHO_T}$with_pthread" >&6 - - if test "$with_pthread" != no ; then -- echo "$as_me:11395: checking for pthread.h" >&5 -+ echo "$as_me:11403: checking for pthread.h" >&5 - echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 - if test "${ac_cv_header_pthread_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 11401 "configure" -+#line 11409 "configure" - #include "confdefs.h" - #include - _ACEOF --if { (eval echo "$as_me:11405: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:11413: \"$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:11411: \$? = $ac_status" >&5 -+ echo "$as_me:11419: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -11427,7 +11435,7 @@ - fi - rm -f conftest.err conftest.$ac_ext - fi --echo "$as_me:11430: result: $ac_cv_header_pthread_h" >&5 -+echo "$as_me:11438: result: $ac_cv_header_pthread_h" >&5 - echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 - if test $ac_cv_header_pthread_h = yes; then - -@@ -11437,7 +11445,7 @@ - - for cf_lib_pthread in pthread c_r - do -- echo "$as_me:11440: checking if we can link with the $cf_lib_pthread library" >&5 -+ echo "$as_me:11448: checking if we can link with the $cf_lib_pthread library" >&5 - echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6 - cf_save_LIBS="$LIBS" - -@@ -11458,7 +11466,7 @@ - LIBS="$cf_add_libs" - - cat >conftest.$ac_ext <<_ACEOF --#line 11461 "configure" -+#line 11469 "configure" - #include "confdefs.h" - - #include -@@ -11475,16 +11483,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:11478: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:11486: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:11481: \$? = $ac_status" >&5 -+ echo "$as_me:11489: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:11484: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:11492: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:11487: \$? = $ac_status" >&5 -+ echo "$as_me:11495: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - with_pthread=yes - else -@@ -11494,7 +11502,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS="$cf_save_LIBS" -- echo "$as_me:11497: result: $with_pthread" >&5 -+ echo "$as_me:11505: result: $with_pthread" >&5 - echo "${ECHO_T}$with_pthread" >&6 - test "$with_pthread" = yes && break - done -@@ -11522,7 +11530,7 @@ - EOF - - else -- { { echo "$as_me:11525: error: Cannot link with pthread library" >&5 -+ { { echo "$as_me:11533: error: Cannot link with pthread library" >&5 - echo "$as_me: error: Cannot link with pthread library" >&2;} - { (exit 1); exit 1; }; } - fi -@@ -11531,7 +11539,7 @@ - - fi - --echo "$as_me:11534: checking if you want to use weak-symbols for pthreads" >&5 -+echo "$as_me:11542: checking if you want to use weak-symbols for pthreads" >&5 - echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6 - - # Check whether --enable-weak-symbols or --disable-weak-symbols was given. -@@ -11541,18 +11549,18 @@ - else - use_weak_symbols=no - fi; --echo "$as_me:11544: result: $use_weak_symbols" >&5 -+echo "$as_me:11552: result: $use_weak_symbols" >&5 - echo "${ECHO_T}$use_weak_symbols" >&6 - if test "$use_weak_symbols" = yes ; then - --echo "$as_me:11548: checking if $CC supports weak symbols" >&5 -+echo "$as_me:11556: checking if $CC supports weak symbols" >&5 - echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6 - if test "${cf_cv_weak_symbols+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 11555 "configure" -+#line 11563 "configure" - #include "confdefs.h" - - #include -@@ -11578,16 +11586,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:11581: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:11589: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:11584: \$? = $ac_status" >&5 -+ echo "$as_me:11592: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:11587: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:11595: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:11590: \$? = $ac_status" >&5 -+ echo "$as_me:11598: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_weak_symbols=yes - else -@@ -11598,7 +11606,7 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - - fi --echo "$as_me:11601: result: $cf_cv_weak_symbols" >&5 -+echo "$as_me:11609: result: $cf_cv_weak_symbols" >&5 - echo "${ECHO_T}$cf_cv_weak_symbols" >&6 - - else -@@ -11627,13 +11635,13 @@ - fi - - # OpenSUSE is installing ncurses6, using reentrant option. --echo "$as_me:11630: checking for _nc_TABSIZE" >&5 -+echo "$as_me:11638: checking for _nc_TABSIZE" >&5 - echo $ECHO_N "checking for _nc_TABSIZE... $ECHO_C" >&6 - if test "${ac_cv_func__nc_TABSIZE+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 11636 "configure" -+#line 11644 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char _nc_TABSIZE (); below. */ -@@ -11664,16 +11672,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:11667: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:11675: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:11670: \$? = $ac_status" >&5 -+ echo "$as_me:11678: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:11673: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:11681: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:11676: \$? = $ac_status" >&5 -+ echo "$as_me:11684: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func__nc_TABSIZE=yes - else -@@ -11683,7 +11691,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:11686: result: $ac_cv_func__nc_TABSIZE" >&5 -+echo "$as_me:11694: result: $ac_cv_func__nc_TABSIZE" >&5 - echo "${ECHO_T}$ac_cv_func__nc_TABSIZE" >&6 - if test $ac_cv_func__nc_TABSIZE = yes; then - assume_reentrant=yes -@@ -11695,7 +11703,7 @@ - # opaque outside of that, so there is no --enable-opaque option. We can use - # this option without --with-pthreads, but this will be always set for - # pthreads. --echo "$as_me:11698: checking if you want experimental reentrant code" >&5 -+echo "$as_me:11706: checking if you want experimental reentrant code" >&5 - echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6 - - # Check whether --enable-reentrant or --disable-reentrant was given. -@@ -11705,7 +11713,7 @@ - else - with_reentrant=$assume_reentrant - fi; --echo "$as_me:11708: result: $with_reentrant" >&5 -+echo "$as_me:11716: result: $with_reentrant" >&5 - echo "${ECHO_T}$with_reentrant" >&6 - if test "$with_reentrant" = yes ; then - cf_cv_enable_reentrant=1 -@@ -11728,7 +11736,7 @@ - - ### Allow using a different wrap-prefix - if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then -- echo "$as_me:11731: checking for prefix used to wrap public variables" >&5 -+ echo "$as_me:11739: checking for prefix used to wrap public variables" >&5 - echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6 - - # Check whether --with-wrap-prefix or --without-wrap-prefix was given. -@@ -11738,7 +11746,7 @@ - else - NCURSES_WRAP_PREFIX=_nc_ - fi; -- echo "$as_me:11741: result: $NCURSES_WRAP_PREFIX" >&5 -+ echo "$as_me:11749: result: $NCURSES_WRAP_PREFIX" >&5 - echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 - else - NCURSES_WRAP_PREFIX=_nc_ -@@ -11752,7 +11760,7 @@ - - ### use option --disable-echo to suppress full display compiling commands - --echo "$as_me:11755: checking if you want to see long compiling messages" >&5 -+echo "$as_me:11763: 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. -@@ -11786,11 +11794,11 @@ - ECHO_CC='' - - fi; --echo "$as_me:11789: result: $enableval" >&5 -+echo "$as_me:11797: result: $enableval" >&5 - echo "${ECHO_T}$enableval" >&6 - - ### use option --enable-warnings to turn on all gcc warnings --echo "$as_me:11793: checking if you want to see compiler warnings" >&5 -+echo "$as_me:11801: checking if you want to see compiler warnings" >&5 - echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6 - - # Check whether --enable-warnings or --disable-warnings was given. -@@ -11798,7 +11806,7 @@ - enableval="$enable_warnings" - with_warnings=$enableval - fi; --echo "$as_me:11801: result: $with_warnings" >&5 -+echo "$as_me:11809: result: $with_warnings" >&5 - echo "${ECHO_T}$with_warnings" >&6 - - if test "x$with_warnings" = "xyes"; then -@@ -11810,12 +11818,12 @@ - if test "$GCC" = yes ; then - case $host_os in - (linux*|gnu*) -- echo "$as_me:11813: checking if this is really Intel C compiler" >&5 -+ echo "$as_me:11821: 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 11818 "configure" -+#line 11826 "configure" - #include "confdefs.h" - - int -@@ -11832,16 +11840,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:11835: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:11843: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:11838: \$? = $ac_status" >&5 -+ echo "$as_me:11846: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:11841: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:11849: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:11844: \$? = $ac_status" >&5 -+ echo "$as_me:11852: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - INTEL_COMPILER=yes - cf_save_CFLAGS="$cf_save_CFLAGS -we147" -@@ -11852,7 +11860,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - CFLAGS="$cf_save_CFLAGS" -- echo "$as_me:11855: result: $INTEL_COMPILER" >&5 -+ echo "$as_me:11863: result: $INTEL_COMPILER" >&5 - echo "${ECHO_T}$INTEL_COMPILER" >&6 - ;; - esac -@@ -11861,12 +11869,12 @@ - CLANG_COMPILER=no - - if test "$GCC" = yes ; then -- echo "$as_me:11864: checking if this is really Clang C compiler" >&5 -+ echo "$as_me:11872: 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 11869 "configure" -+#line 11877 "configure" - #include "confdefs.h" - - int -@@ -11883,16 +11891,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:11886: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:11894: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:11889: \$? = $ac_status" >&5 -+ echo "$as_me:11897: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:11892: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:11900: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:11895: \$? = $ac_status" >&5 -+ echo "$as_me:11903: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - CLANG_COMPILER=yes - cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" -@@ -11903,12 +11911,12 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - CFLAGS="$cf_save_CFLAGS" -- echo "$as_me:11906: result: $CLANG_COMPILER" >&5 -+ echo "$as_me:11914: result: $CLANG_COMPILER" >&5 - echo "${ECHO_T}$CLANG_COMPILER" >&6 - fi - - cat > conftest.$ac_ext <&5 -+ { echo "$as_me:11936: checking for $CC warning options..." >&5 - echo "$as_me: checking for $CC warning options..." >&6;} - cf_save_CFLAGS="$CFLAGS" - EXTRA_CFLAGS="-Wall" -@@ -11941,12 +11949,12 @@ - wd981 - do - CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" -- if { (eval echo "$as_me:11944: \"$ac_compile\"") >&5 -+ if { (eval echo "$as_me:11952: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:11947: \$? = $ac_status" >&5 -+ echo "$as_me:11955: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- test -n "$verbose" && echo "$as_me:11949: result: ... -$cf_opt" >&5 -+ test -n "$verbose" && echo "$as_me:11957: result: ... -$cf_opt" >&5 - echo "${ECHO_T}... -$cf_opt" >&6 - EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" - fi -@@ -11955,7 +11963,7 @@ - - elif test "$GCC" = yes - then -- { echo "$as_me:11958: checking for $CC warning options..." >&5 -+ { echo "$as_me:11966: checking for $CC warning options..." >&5 - echo "$as_me: checking for $CC warning options..." >&6;} - cf_save_CFLAGS="$CFLAGS" - EXTRA_CFLAGS= -@@ -11979,12 +11987,12 @@ - Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum - do - CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" -- if { (eval echo "$as_me:11982: \"$ac_compile\"") >&5 -+ if { (eval echo "$as_me:11990: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:11985: \$? = $ac_status" >&5 -+ echo "$as_me:11993: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- test -n "$verbose" && echo "$as_me:11987: result: ... -$cf_opt" >&5 -+ test -n "$verbose" && echo "$as_me:11995: result: ... -$cf_opt" >&5 - echo "${ECHO_T}... -$cf_opt" >&6 - case $cf_opt in - (Wcast-qual) -@@ -11995,7 +12003,7 @@ - ([34].*) - test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 - --echo "${as_me:-configure}:11998: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 -+echo "${as_me:-configure}:12006: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 - - continue;; - esac -@@ -12005,7 +12013,7 @@ - ([12].*) - test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 - --echo "${as_me:-configure}:12008: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 -+echo "${as_me:-configure}:12016: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 - - continue;; - esac -@@ -12038,10 +12046,10 @@ - EOF - if test "$GCC" = yes - then -- { echo "$as_me:12041: checking for $CC __attribute__ directives..." >&5 -+ { echo "$as_me:12049: checking for $CC __attribute__ directives..." >&5 - echo "$as_me: checking for $CC __attribute__ directives..." >&6;} - cat > conftest.$ac_ext <&5 -+ if { (eval echo "$as_me:12101: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:12096: \$? = $ac_status" >&5 -+ echo "$as_me:12104: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- test -n "$verbose" && echo "$as_me:12098: result: ... $cf_attribute" >&5 -+ test -n "$verbose" && echo "$as_me:12106: result: ... $cf_attribute" >&5 - echo "${ECHO_T}... $cf_attribute" >&6 - cat conftest.h >>confdefs.h - case $cf_attribute in -@@ -12155,7 +12163,7 @@ - fi - - ### use option --enable-assertions to turn on generation of assertion code --echo "$as_me:12158: checking if you want to enable runtime assertions" >&5 -+echo "$as_me:12166: checking if you want to enable runtime assertions" >&5 - echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6 - - # Check whether --enable-assertions or --disable-assertions was given. -@@ -12165,7 +12173,7 @@ - else - with_assertions=no - fi; --echo "$as_me:12168: result: $with_assertions" >&5 -+echo "$as_me:12176: result: $with_assertions" >&5 - echo "${ECHO_T}$with_assertions" >&6 - if test -n "$GCC" - then -@@ -12218,7 +12226,7 @@ - ;; - esac - --echo "$as_me:12221: checking whether to add trace feature to all models" >&5 -+echo "$as_me:12229: checking whether to add trace feature to all models" >&5 - echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6 - - # Check whether --with-trace or --without-trace was given. -@@ -12228,7 +12236,7 @@ - else - cf_with_trace=$cf_all_traces - fi; --echo "$as_me:12231: result: $cf_with_trace" >&5 -+echo "$as_me:12239: result: $cf_with_trace" >&5 - echo "${ECHO_T}$cf_with_trace" >&6 - - if test "$cf_with_trace" = yes ; then -@@ -12316,7 +12324,7 @@ - ADA_TRACE=FALSE - fi - --echo "$as_me:12319: checking if we want to use GNAT projects" >&5 -+echo "$as_me:12327: checking if we want to use GNAT projects" >&5 - echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6 - - # Check whether --enable-gnat-projects or --disable-gnat-projects was given. -@@ -12333,7 +12341,7 @@ - enable_gnat_projects=yes - - fi; --echo "$as_me:12336: result: $enable_gnat_projects" >&5 -+echo "$as_me:12344: result: $enable_gnat_projects" >&5 - echo "${ECHO_T}$enable_gnat_projects" >&6 - - ### Checks for libraries. -@@ -12341,13 +12349,13 @@ - (*mingw32*) - ;; - (*) --echo "$as_me:12344: checking for gettimeofday" >&5 -+echo "$as_me:12352: checking for gettimeofday" >&5 - echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 - if test "${ac_cv_func_gettimeofday+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 12350 "configure" -+#line 12358 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gettimeofday (); below. */ -@@ -12378,16 +12386,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:12381: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:12389: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:12384: \$? = $ac_status" >&5 -+ echo "$as_me:12392: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:12387: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:12395: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:12390: \$? = $ac_status" >&5 -+ echo "$as_me:12398: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_gettimeofday=yes - else -@@ -12397,7 +12405,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:12400: result: $ac_cv_func_gettimeofday" >&5 -+echo "$as_me:12408: result: $ac_cv_func_gettimeofday" >&5 - echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 - if test $ac_cv_func_gettimeofday = yes; then - cat >>confdefs.h <<\EOF -@@ -12406,7 +12414,7 @@ - - else - --echo "$as_me:12409: checking for gettimeofday in -lbsd" >&5 -+echo "$as_me:12417: checking for gettimeofday in -lbsd" >&5 - echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6 - if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -12414,7 +12422,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lbsd $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 12417 "configure" -+#line 12425 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -12433,16 +12441,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:12436: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:12444: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:12439: \$? = $ac_status" >&5 -+ echo "$as_me:12447: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:12442: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:12450: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:12445: \$? = $ac_status" >&5 -+ echo "$as_me:12453: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_bsd_gettimeofday=yes - else -@@ -12453,7 +12461,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:12456: result: $ac_cv_lib_bsd_gettimeofday" >&5 -+echo "$as_me:12464: result: $ac_cv_lib_bsd_gettimeofday" >&5 - echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6 - if test $ac_cv_lib_bsd_gettimeofday = yes; then - -@@ -12469,13 +12477,13 @@ - esac - - ### Checks for header files. --echo "$as_me:12472: checking for ANSI C header files" >&5 -+echo "$as_me:12480: 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 12478 "configure" -+#line 12486 "configure" - #include "confdefs.h" - #include - #include -@@ -12483,13 +12491,13 @@ - #include - - _ACEOF --if { (eval echo "$as_me:12486: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:12494: \"$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:12492: \$? = $ac_status" >&5 -+ echo "$as_me:12500: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -12511,7 +12519,7 @@ - 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 12514 "configure" -+#line 12522 "configure" - #include "confdefs.h" - #include - -@@ -12529,7 +12537,7 @@ - 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 12532 "configure" -+#line 12540 "configure" - #include "confdefs.h" - #include - -@@ -12550,7 +12558,7 @@ - : - else - cat >conftest.$ac_ext <<_ACEOF --#line 12553 "configure" -+#line 12561 "configure" - #include "confdefs.h" - #include - #if ((' ' & 0x0FF) == 0x020) -@@ -12576,15 +12584,15 @@ - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:12579: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:12587: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:12582: \$? = $ac_status" >&5 -+ echo "$as_me:12590: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:12584: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:12592: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:12587: \$? = $ac_status" >&5 -+ echo "$as_me:12595: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -12597,7 +12605,7 @@ - fi - fi - fi --echo "$as_me:12600: result: $ac_cv_header_stdc" >&5 -+echo "$as_me:12608: result: $ac_cv_header_stdc" >&5 - echo "${ECHO_T}$ac_cv_header_stdc" >&6 - if test $ac_cv_header_stdc = yes; then - -@@ -12610,13 +12618,13 @@ - 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:12613: checking for $ac_hdr that defines DIR" >&5 -+echo "$as_me:12621: 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 12619 "configure" -+#line 12627 "configure" - #include "confdefs.h" - #include - #include <$ac_hdr> -@@ -12631,16 +12639,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:12634: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:12642: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:12637: \$? = $ac_status" >&5 -+ echo "$as_me:12645: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:12640: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:12648: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:12643: \$? = $ac_status" >&5 -+ echo "$as_me:12651: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" - else -@@ -12650,7 +12658,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:12653: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "$as_me:12661: 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 <&5 -+ echo "$as_me:12674: 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 -@@ -12671,7 +12679,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldir $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 12674 "configure" -+#line 12682 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -12690,16 +12698,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:12693: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:12701: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:12696: \$? = $ac_status" >&5 -+ echo "$as_me:12704: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:12699: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:12707: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:12702: \$? = $ac_status" >&5 -+ echo "$as_me:12710: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dir_opendir=yes - else -@@ -12710,14 +12718,14 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:12713: result: $ac_cv_lib_dir_opendir" >&5 -+echo "$as_me:12721: 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:12720: checking for opendir in -lx" >&5 -+ echo "$as_me:12728: 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 -@@ -12725,7 +12733,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lx $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 12728 "configure" -+#line 12736 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -12744,16 +12752,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:12747: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:12755: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:12750: \$? = $ac_status" >&5 -+ echo "$as_me:12758: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:12753: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:12761: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:12756: \$? = $ac_status" >&5 -+ echo "$as_me:12764: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_x_opendir=yes - else -@@ -12764,7 +12772,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:12767: result: $ac_cv_lib_x_opendir" >&5 -+echo "$as_me:12775: 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" -@@ -12772,13 +12780,13 @@ - - fi - --echo "$as_me:12775: checking whether time.h and sys/time.h may both be included" >&5 -+echo "$as_me:12783: 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 12781 "configure" -+#line 12789 "configure" - #include "confdefs.h" - #include - #include -@@ -12794,16 +12802,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:12797: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:12805: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:12800: \$? = $ac_status" >&5 -+ echo "$as_me:12808: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:12803: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:12811: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:12806: \$? = $ac_status" >&5 -+ echo "$as_me:12814: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_header_time=yes - else -@@ -12813,7 +12821,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:12816: result: $ac_cv_header_time" >&5 -+echo "$as_me:12824: result: $ac_cv_header_time" >&5 - echo "${ECHO_T}$ac_cv_header_time" >&6 - if test $ac_cv_header_time = yes; then - -@@ -12831,13 +12839,13 @@ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - ac_main_return=return - --echo "$as_me:12834: checking for an ANSI C-conforming const" >&5 -+echo "$as_me:12842: checking for an ANSI C-conforming const" >&5 - echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 - if test "${ac_cv_c_const+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 12840 "configure" -+#line 12848 "configure" - #include "confdefs.h" - - int -@@ -12895,16 +12903,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:12898: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:12906: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:12901: \$? = $ac_status" >&5 -+ echo "$as_me:12909: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:12904: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:12912: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:12907: \$? = $ac_status" >&5 -+ echo "$as_me:12915: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_const=yes - else -@@ -12914,7 +12922,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:12917: result: $ac_cv_c_const" >&5 -+echo "$as_me:12925: result: $ac_cv_c_const" >&5 - echo "${ECHO_T}$ac_cv_c_const" >&6 - if test $ac_cv_c_const = no; then - -@@ -12926,7 +12934,7 @@ - - ### Checks for external-data - --echo "$as_me:12929: checking if data-only library module links" >&5 -+echo "$as_me:12937: checking if data-only library module links" >&5 - echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6 - if test "${cf_cv_link_dataonly+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -12934,20 +12942,20 @@ - - rm -f conftest.a - cat >conftest.$ac_ext <&5 -+ if { (eval echo "$as_me:12948: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:12943: \$? = $ac_status" >&5 -+ echo "$as_me:12951: \$? = $ac_status" >&5 - (exit $ac_status); } ; then - mv conftest.o data.o && \ - ( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null - fi - rm -f conftest.$ac_ext data.o - cat >conftest.$ac_ext <&5 -+ if { (eval echo "$as_me:12971: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:12966: \$? = $ac_status" >&5 -+ echo "$as_me:12974: \$? = $ac_status" >&5 - (exit $ac_status); }; then - mv conftest.o func.o && \ - ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null -@@ -12976,7 +12984,7 @@ - cf_cv_link_dataonly=unknown - else - cat >conftest.$ac_ext <<_ACEOF --#line 12979 "configure" -+#line 12987 "configure" - #include "confdefs.h" - - int main() -@@ -12987,15 +12995,15 @@ - - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:12990: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:12998: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:12993: \$? = $ac_status" >&5 -+ echo "$as_me:13001: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:12995: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:13003: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:12998: \$? = $ac_status" >&5 -+ echo "$as_me:13006: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_link_dataonly=yes - else -@@ -13010,7 +13018,7 @@ - - fi - --echo "$as_me:13013: result: $cf_cv_link_dataonly" >&5 -+echo "$as_me:13021: result: $cf_cv_link_dataonly" >&5 - echo "${ECHO_T}$cf_cv_link_dataonly" >&6 - - if test "$cf_cv_link_dataonly" = no ; then -@@ -13024,7 +13032,7 @@ - - ### Checks for library functions. - --echo "$as_me:13027: checking for working mkstemp" >&5 -+echo "$as_me:13035: checking for working mkstemp" >&5 - echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 - if test "${cf_cv_func_mkstemp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -13035,7 +13043,7 @@ - cf_cv_func_mkstemp=maybe - else - cat >conftest.$ac_ext <<_ACEOF --#line 13038 "configure" -+#line 13046 "configure" - #include "confdefs.h" - - #include -@@ -13073,15 +13081,15 @@ - - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:13076: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:13084: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:13079: \$? = $ac_status" >&5 -+ echo "$as_me:13087: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:13081: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:13089: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:13084: \$? = $ac_status" >&5 -+ echo "$as_me:13092: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_func_mkstemp=yes - -@@ -13096,16 +13104,16 @@ - fi - - fi --echo "$as_me:13099: result: $cf_cv_func_mkstemp" >&5 -+echo "$as_me:13107: result: $cf_cv_func_mkstemp" >&5 - echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 - if test "x$cf_cv_func_mkstemp" = xmaybe ; then -- echo "$as_me:13102: checking for mkstemp" >&5 -+ echo "$as_me:13110: checking for mkstemp" >&5 - echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 - if test "${ac_cv_func_mkstemp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 13108 "configure" -+#line 13116 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char mkstemp (); below. */ -@@ -13136,16 +13144,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:13139: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:13147: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:13142: \$? = $ac_status" >&5 -+ echo "$as_me:13150: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:13145: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:13153: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:13148: \$? = $ac_status" >&5 -+ echo "$as_me:13156: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_mkstemp=yes - else -@@ -13155,7 +13163,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:13158: result: $ac_cv_func_mkstemp" >&5 -+echo "$as_me:13166: result: $ac_cv_func_mkstemp" >&5 - echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 - - fi -@@ -13178,7 +13186,7 @@ - cf_ada_make=gnatmake - # Extract the first word of "$cf_ada_make", so it can be a program name with args. - set dummy $cf_ada_make; ac_word=$2 --echo "$as_me:13181: checking for $ac_word" >&5 -+echo "$as_me:13189: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_gnat_exists+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -13193,7 +13201,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_gnat_exists="yes" --echo "$as_me:13196: found $ac_dir/$ac_word" >&5 -+echo "$as_me:13204: found $ac_dir/$ac_word" >&5 - break - done - -@@ -13202,10 +13210,10 @@ - fi - gnat_exists=$ac_cv_prog_gnat_exists - if test -n "$gnat_exists"; then -- echo "$as_me:13205: result: $gnat_exists" >&5 -+ echo "$as_me:13213: result: $gnat_exists" >&5 - echo "${ECHO_T}$gnat_exists" >&6 - else -- echo "$as_me:13208: result: no" >&5 -+ echo "$as_me:13216: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -13214,12 +13222,12 @@ - cf_cv_prog_gnat_correct=no - else - --echo "$as_me:13217: checking for gnat version" >&5 -+echo "$as_me:13225: checking for gnat version" >&5 - echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 - cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \ - grep '[0-9].[0-9][0-9]*' |\ - sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` --echo "$as_me:13222: result: $cf_gnat_version" >&5 -+echo "$as_me:13230: result: $cf_gnat_version" >&5 - echo "${ECHO_T}$cf_gnat_version" >&6 - - case $cf_gnat_version in -@@ -13227,7 +13235,7 @@ - cf_cv_prog_gnat_correct=yes - ;; - (*) -- { echo "$as_me:13230: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 -+ { echo "$as_me:13238: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 - echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} - cf_cv_prog_gnat_correct=no - ;; -@@ -13235,7 +13243,7 @@ - - # Extract the first word of "m4", so it can be a program name with args. - set dummy m4; ac_word=$2 --echo "$as_me:13238: checking for $ac_word" >&5 -+echo "$as_me:13246: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_M4_exists+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -13250,7 +13258,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_M4_exists="yes" --echo "$as_me:13253: found $ac_dir/$ac_word" >&5 -+echo "$as_me:13261: found $ac_dir/$ac_word" >&5 - break - done - -@@ -13259,10 +13267,10 @@ - fi - M4_exists=$ac_cv_prog_M4_exists - if test -n "$M4_exists"; then -- echo "$as_me:13262: result: $M4_exists" >&5 -+ echo "$as_me:13270: result: $M4_exists" >&5 - echo "${ECHO_T}$M4_exists" >&6 - else -- echo "$as_me:13265: result: no" >&5 -+ echo "$as_me:13273: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -13271,7 +13279,7 @@ - echo Ada95 binding required program m4 not found. Ada95 binding disabled. - fi - if test "$cf_cv_prog_gnat_correct" = yes; then -- echo "$as_me:13274: checking if GNAT works" >&5 -+ echo "$as_me:13282: checking if GNAT works" >&5 - echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 - - rm -rf conftest* *~conftest* -@@ -13299,14 +13307,14 @@ - fi - rm -rf conftest* *~conftest* - -- echo "$as_me:13302: result: $cf_cv_prog_gnat_correct" >&5 -+ echo "$as_me:13310: result: $cf_cv_prog_gnat_correct" >&5 - echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 - fi - fi - - if test "$cf_cv_prog_gnat_correct" = yes; then - -- echo "$as_me:13309: checking optimization options for ADAFLAGS" >&5 -+ echo "$as_me:13317: checking optimization options for ADAFLAGS" >&5 - echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 - case "$CFLAGS" in - (*-g*) -@@ -13323,10 +13331,10 @@ - - ;; - esac -- echo "$as_me:13326: result: $ADAFLAGS" >&5 -+ echo "$as_me:13334: result: $ADAFLAGS" >&5 - echo "${ECHO_T}$ADAFLAGS" >&6 - --echo "$as_me:13329: checking if GNATPREP supports -T option" >&5 -+echo "$as_me:13337: checking if GNATPREP supports -T option" >&5 - echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6 - if test "${cf_cv_gnatprep_opt_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -13336,11 +13344,11 @@ - gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes - - fi --echo "$as_me:13339: result: $cf_cv_gnatprep_opt_t" >&5 -+echo "$as_me:13347: result: $cf_cv_gnatprep_opt_t" >&5 - echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6 - test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS" - --echo "$as_me:13343: checking if GNAT supports generics" >&5 -+echo "$as_me:13351: checking if GNAT supports generics" >&5 - echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 - case $cf_gnat_version in - (3.[1-9]*|[4-9].*) -@@ -13350,7 +13358,7 @@ - cf_gnat_generics=no - ;; - esac --echo "$as_me:13353: result: $cf_gnat_generics" >&5 -+echo "$as_me:13361: result: $cf_gnat_generics" >&5 - echo "${ECHO_T}$cf_gnat_generics" >&6 - - if test "$cf_gnat_generics" = yes -@@ -13362,7 +13370,7 @@ - cf_generic_objects= - fi - --echo "$as_me:13365: checking if GNAT supports SIGINT" >&5 -+echo "$as_me:13373: checking if GNAT supports SIGINT" >&5 - echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6 - if test "${cf_cv_gnat_sigint+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -13410,7 +13418,7 @@ - rm -rf conftest* *~conftest* - - fi --echo "$as_me:13413: result: $cf_cv_gnat_sigint" >&5 -+echo "$as_me:13421: result: $cf_cv_gnat_sigint" >&5 - echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 - - if test $cf_cv_gnat_sigint = yes ; then -@@ -13423,7 +13431,7 @@ - cf_gnat_projects=no - - if test "$enable_gnat_projects" != no ; then --echo "$as_me:13426: checking if GNAT supports project files" >&5 -+echo "$as_me:13434: checking if GNAT supports project files" >&5 - echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 - case $cf_gnat_version in - (3.[0-9]*) -@@ -13483,15 +13491,15 @@ - esac - ;; - esac --echo "$as_me:13486: result: $cf_gnat_projects" >&5 -+echo "$as_me:13494: result: $cf_gnat_projects" >&5 - echo "${ECHO_T}$cf_gnat_projects" >&6 - fi # enable_gnat_projects - - if test $cf_gnat_projects = yes - then -- echo "$as_me:13492: checking if GNAT supports libraries" >&5 -+ echo "$as_me:13500: checking if GNAT supports libraries" >&5 - echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 -- echo "$as_me:13494: result: $cf_gnat_libraries" >&5 -+ echo "$as_me:13502: result: $cf_gnat_libraries" >&5 - echo "${ECHO_T}$cf_gnat_libraries" >&6 - fi - -@@ -13511,7 +13519,7 @@ - USE_GNAT_LIBRARIES="#" - fi - --echo "$as_me:13514: checking for ada-compiler" >&5 -+echo "$as_me:13522: checking for ada-compiler" >&5 - echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6 - - # Check whether --with-ada-compiler or --without-ada-compiler was given. -@@ -13522,12 +13530,12 @@ - cf_ada_compiler=gnatmake - fi; - --echo "$as_me:13525: result: $cf_ada_compiler" >&5 -+echo "$as_me:13533: result: $cf_ada_compiler" >&5 - echo "${ECHO_T}$cf_ada_compiler" >&6 - - cf_ada_package=terminal_interface - --echo "$as_me:13530: checking for ada-include" >&5 -+echo "$as_me:13538: checking for ada-include" >&5 - echo $ECHO_N "checking for ada-include... $ECHO_C" >&6 - - # Check whether --with-ada-include or --without-ada-include was given. -@@ -13563,7 +13571,7 @@ - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` - ;; - (*) -- { { echo "$as_me:13566: error: expected a pathname, not \"$withval\"" >&5 -+ { { echo "$as_me:13574: error: expected a pathname, not \"$withval\"" >&5 - echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} - { (exit 1); exit 1; }; } - ;; -@@ -13572,10 +13580,10 @@ - fi - eval ADA_INCLUDE="$withval" - --echo "$as_me:13575: result: $ADA_INCLUDE" >&5 -+echo "$as_me:13583: result: $ADA_INCLUDE" >&5 - echo "${ECHO_T}$ADA_INCLUDE" >&6 - --echo "$as_me:13578: checking for ada-objects" >&5 -+echo "$as_me:13586: checking for ada-objects" >&5 - echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6 - - # Check whether --with-ada-objects or --without-ada-objects was given. -@@ -13611,7 +13619,7 @@ - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` - ;; - (*) -- { { echo "$as_me:13614: error: expected a pathname, not \"$withval\"" >&5 -+ { { echo "$as_me:13622: error: expected a pathname, not \"$withval\"" >&5 - echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} - { (exit 1); exit 1; }; } - ;; -@@ -13620,10 +13628,10 @@ - fi - eval ADA_OBJECTS="$withval" - --echo "$as_me:13623: result: $ADA_OBJECTS" >&5 -+echo "$as_me:13631: result: $ADA_OBJECTS" >&5 - echo "${ECHO_T}$ADA_OBJECTS" >&6 - --echo "$as_me:13626: checking if an Ada95 shared-library should be built" >&5 -+echo "$as_me:13634: checking if an Ada95 shared-library should be built" >&5 - echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6 - - # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given. -@@ -13633,7 +13641,7 @@ - else - with_ada_sharedlib=no - fi; --echo "$as_me:13636: result: $with_ada_sharedlib" >&5 -+echo "$as_me:13644: result: $with_ada_sharedlib" >&5 - echo "${ECHO_T}$with_ada_sharedlib" >&6 - - ADA_SHAREDLIB='lib$(LIB_NAME).so.1' -@@ -13649,12 +13657,12 @@ - fi - - else -- { { echo "$as_me:13652: error: No usable Ada compiler found" >&5 -+ { { echo "$as_me:13660: error: No usable Ada compiler found" >&5 - echo "$as_me: error: No usable Ada compiler found" >&2;} - { (exit 1); exit 1; }; } - fi - else -- { { echo "$as_me:13657: error: The Ada compiler is needed for this package" >&5 -+ { { echo "$as_me:13665: error: The Ada compiler is needed for this package" >&5 - echo "$as_me: error: The Ada compiler is needed for this package" >&2;} - { (exit 1); exit 1; }; } - fi -@@ -13694,7 +13702,7 @@ - fi - - ### Build up pieces for makefile rules --echo "$as_me:13697: checking default library suffix" >&5 -+echo "$as_me:13705: checking default library suffix" >&5 - echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 - - case $DFT_LWR_MODEL in -@@ -13705,10 +13713,10 @@ - (shared) DFT_ARG_SUFFIX='' ;; - esac - test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" --echo "$as_me:13708: result: $DFT_ARG_SUFFIX" >&5 -+echo "$as_me:13716: result: $DFT_ARG_SUFFIX" >&5 - echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 - --echo "$as_me:13711: checking default library-dependency suffix" >&5 -+echo "$as_me:13719: checking default library-dependency suffix" >&5 - echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 - - case X$DFT_LWR_MODEL in -@@ -13766,10 +13774,10 @@ - DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}" - DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}" - fi --echo "$as_me:13769: result: $DFT_DEP_SUFFIX" >&5 -+echo "$as_me:13777: result: $DFT_DEP_SUFFIX" >&5 - echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 - --echo "$as_me:13772: checking default object directory" >&5 -+echo "$as_me:13780: checking default object directory" >&5 - echo $ECHO_N "checking default object directory... $ECHO_C" >&6 - - case $DFT_LWR_MODEL in -@@ -13785,7 +13793,7 @@ - DFT_OBJ_SUBDIR='obj_s' ;; - esac - esac --echo "$as_me:13788: result: $DFT_OBJ_SUBDIR" >&5 -+echo "$as_me:13796: result: $DFT_OBJ_SUBDIR" >&5 - echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 - - ### Set up low-level terminfo dependencies for makefiles. -@@ -13997,7 +14005,7 @@ - : ${CONFIG_STATUS=./config.status} - ac_clean_files_save=$ac_clean_files - ac_clean_files="$ac_clean_files $CONFIG_STATUS" --{ echo "$as_me:14000: creating $CONFIG_STATUS" >&5 -+{ echo "$as_me:14008: creating $CONFIG_STATUS" >&5 - echo "$as_me: creating $CONFIG_STATUS" >&6;} - cat >$CONFIG_STATUS <<_ACEOF - #! $SHELL -@@ -14173,7 +14181,7 @@ - echo "$ac_cs_version"; exit 0 ;; - --he | --h) - # Conflict between --help and --header -- { { echo "$as_me:14176: error: ambiguous option: $1 -+ { { echo "$as_me:14184: 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;} -@@ -14192,7 +14200,7 @@ - ac_need_defaults=false;; - - # This is an error. -- -*) { { echo "$as_me:14195: error: unrecognized option: $1 -+ -*) { { echo "$as_me:14203: 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;} -@@ -14263,7 +14271,7 @@ - "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; - "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; -- *) { { echo "$as_me:14266: error: invalid argument: $ac_config_target" >&5 -+ *) { { echo "$as_me:14274: error: invalid argument: $ac_config_target" >&5 - echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; - esac -@@ -14587,7 +14595,7 @@ - esac - - if test x"$ac_file" != x-; then -- { echo "$as_me:14590: creating $ac_file" >&5 -+ { echo "$as_me:14598: creating $ac_file" >&5 - echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi -@@ -14605,7 +14613,7 @@ - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:14608: error: cannot find input file: $f" >&5 -+ test -f "$f" || { { echo "$as_me:14616: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo $f;; -@@ -14618,7 +14626,7 @@ - echo $srcdir/$f - else - # /dev/null tree -- { { echo "$as_me:14621: error: cannot find input file: $f" >&5 -+ { { echo "$as_me:14629: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; -@@ -14634,7 +14642,7 @@ - if test -n "$ac_seen"; then - ac_used=`grep '@datarootdir@' $ac_item` - if test -z "$ac_used"; then -- { echo "$as_me:14637: WARNING: datarootdir was used implicitly but not set: -+ { echo "$as_me:14645: 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;} -@@ -14643,7 +14651,7 @@ - fi - ac_seen=`grep '${datarootdir}' $ac_item` - if test -n "$ac_seen"; then -- { echo "$as_me:14646: WARNING: datarootdir was used explicitly but not set: -+ { echo "$as_me:14654: 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;} -@@ -14680,7 +14688,7 @@ - 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:14683: WARNING: Variable $ac_name is used but was not set: -+ { echo "$as_me:14691: 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;} -@@ -14691,7 +14699,7 @@ - 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:14694: WARNING: Some variables may not be substituted: -+ { echo "$as_me:14702: WARNING: Some variables may not be substituted: - $ac_seen" >&5 - echo "$as_me: WARNING: Some variables may not be substituted: - $ac_seen" >&2;} -@@ -14740,7 +14748,7 @@ - * ) ac_file_in=$ac_file.in ;; - esac - -- test x"$ac_file" != x- && { echo "$as_me:14743: creating $ac_file" >&5 -+ test x"$ac_file" != x- && { echo "$as_me:14751: creating $ac_file" >&5 - echo "$as_me: creating $ac_file" >&6;} - - # First look for the input files in the build tree, otherwise in the -@@ -14751,7 +14759,7 @@ - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:14754: error: cannot find input file: $f" >&5 -+ test -f "$f" || { { echo "$as_me:14762: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo $f;; -@@ -14764,7 +14772,7 @@ - echo $srcdir/$f - else - # /dev/null tree -- { { echo "$as_me:14767: error: cannot find input file: $f" >&5 -+ { { echo "$as_me:14775: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; -@@ -14822,7 +14830,7 @@ - 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:14825: $ac_file is unchanged" >&5 -+ { echo "$as_me:14833: $ac_file is unchanged" >&5 - echo "$as_me: $ac_file is unchanged" >&6;} - else - ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -Index: NEWS -Prereq: 1.2481 ---- ncurses-6.0-20150815+/NEWS 2015-08-15 22:33:55.000000000 +0000 -+++ ncurses-6.0-20150822/NEWS 2015-08-22 23:55:21.000000000 +0000 -@@ -25,7 +25,7 @@ - -- sale, use or other dealings in this Software without prior written -- - -- authorization. -- - ------------------------------------------------------------------------------- ---- $Id: NEWS,v 1.2481 2015/08/15 22:33:55 tom Exp $ -+-- $Id: NEWS,v 1.2487 2015/08/22 23:55:21 tom Exp $ - ------------------------------------------------------------------------------- - - This is a log of changes that ncurses has gone through since Zeyd started -@@ -45,6 +45,16 @@ - Changes through 1.9.9e did not credit all contributions; - it is not possible to add this information. - -+20150822 -+ + sort options in usage message for infocmp, to make it simpler to -+ see unused letters. -+ + update usage message for tic, adding "-0" option. -+ + documented differences in ESCDELAY versus AIX's implementation. -+ + fix some compiler warnings from ports. -+ + modify --with-pkg-config-libdir option to make it possible to install -+ ".pc" files even if pkg-config is not found (adapted by patch by -+ Joshua Root). -+ - 20150815 - + disallow "no" as a possible value for "--with-shlib-version" option, - overlooked in cleanup-changes for 20000708 (report by Tommy Alex). -Index: VERSION ---- ncurses-6.0-20150815+/VERSION 2015-08-15 15:13:47.000000000 +0000 -+++ ncurses-6.0-20150822/VERSION 2015-08-17 08:41:12.000000000 +0000 -@@ -1 +1 @@ --5:0:9 6.0 20150815 -+5:0:9 6.0 20150822 -Index: aclocal.m4 -Prereq: 1.762 ---- ncurses-6.0-20150815+/aclocal.m4 2015-08-15 22:39:55.000000000 +0000 -+++ ncurses-6.0-20150822/aclocal.m4 2015-08-22 21:12:39.000000000 +0000 -@@ -28,7 +28,7 @@ - dnl - dnl Author: Thomas E. Dickey 1995-on - dnl --dnl $Id: aclocal.m4,v 1.762 2015/08/15 22:39:55 tom Exp $ -+dnl $Id: aclocal.m4,v 1.765 2015/08/22 21:12:39 tom Exp $ - dnl Macros used in NCURSES auto-configuration script. - dnl - dnl These macros are maintained separately from NCURSES. The copyright on -@@ -7282,19 +7282,25 @@ - - ])dnl - dnl --------------------------------------------------------------------------- --dnl CF_WITH_PKG_CONFIG_LIBDIR version: 9 updated: 2015/06/06 19:26:44 -+dnl CF_WITH_PKG_CONFIG_LIBDIR version: 10 updated: 2015/08/22 17:10:56 - dnl ------------------------- - dnl Allow the choice of the pkg-config library directory to be overridden. - AC_DEFUN([CF_WITH_PKG_CONFIG_LIBDIR],[ --if test "x$PKG_CONFIG" = xnone ; then -- PKG_CONFIG_LIBDIR=no --else -+ -+case $PKG_CONFIG in -+(no|none|yes) -+ AC_MSG_CHECKING(for pkg-config library directory) -+ ;; -+(*) - AC_MSG_CHECKING(for $PKG_CONFIG library directory) -- AC_ARG_WITH(pkg-config-libdir, -- [ --with-pkg-config-libdir=XXX use given directory for installing pc-files], -- [PKG_CONFIG_LIBDIR=$withval], -- [PKG_CONFIG_LIBDIR=yes]) --fi -+ ;; -+esac -+ -+PKG_CONFIG_LIBDIR=no -+AC_ARG_WITH(pkg-config-libdir, -+ [ --with-pkg-config-libdir=XXX use given directory for installing pc-files], -+ [PKG_CONFIG_LIBDIR=$withval], -+ [test "x$PKG_CONFIG" != xnone && PKG_CONFIG_LIBDIR=yes]) - - case x$PKG_CONFIG_LIBDIR in - (x/*) -@@ -7350,7 +7356,7 @@ - ;; - esac - --if test "x$PKG_CONFIG" != xnone ; then -+if test "x$PKG_CONFIG_LIBDIR" != xno ; then - AC_MSG_RESULT($PKG_CONFIG_LIBDIR) - fi - -Index: configure ---- ncurses-6.0-20150815+/configure 2015-08-15 22:38:44.000000000 +0000 -+++ ncurses-6.0-20150822/configure 2015-08-22 21:08:03.000000000 +0000 -@@ -3571,20 +3571,26 @@ - echo "$as_me: WARNING: pkg-config is not installed" >&2;} - fi - --if test "x$PKG_CONFIG" = xnone ; then -- PKG_CONFIG_LIBDIR=no --else -- echo "$as_me:3577: checking for $PKG_CONFIG library directory" >&5 -+case $PKG_CONFIG in -+(no|none|yes) -+ echo "$as_me:3576: checking for pkg-config library directory" >&5 -+echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6 -+ ;; -+(*) -+ echo "$as_me:3580: checking for $PKG_CONFIG library directory" >&5 - echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6 -+ ;; -+esac -+ -+PKG_CONFIG_LIBDIR=no - - # Check whether --with-pkg-config-libdir or --without-pkg-config-libdir was given. - if test "${with_pkg_config_libdir+set}" = set; then - withval="$with_pkg_config_libdir" - PKG_CONFIG_LIBDIR=$withval - else -- PKG_CONFIG_LIBDIR=yes -+ test "x$PKG_CONFIG" != xnone && PKG_CONFIG_LIBDIR=yes - fi; --fi - - case x$PKG_CONFIG_LIBDIR in - (x/*) -@@ -3626,18 +3632,18 @@ - - test -n "$verbose" && echo " list..." 1>&6 - --echo "${as_me:-configure}:3629: testing list... ..." 1>&5 -+echo "${as_me:-configure}:3635: testing list... ..." 1>&5 - - for cf_config in $cf_search_path - do - test -n "$verbose" && echo " checking $cf_config/pkgconfig" 1>&6 - --echo "${as_me:-configure}:3635: testing checking $cf_config/pkgconfig ..." 1>&5 -+echo "${as_me:-configure}:3641: testing checking $cf_config/pkgconfig ..." 1>&5 - - if test -d $cf_config/pkgconfig - then - PKG_CONFIG_LIBDIR=$cf_config/pkgconfig -- echo "$as_me:3640: checking done" >&5 -+ echo "$as_me:3646: checking done" >&5 - echo $ECHO_N "checking done... $ECHO_C" >&6 - break - fi -@@ -3647,17 +3653,17 @@ - ;; - esac - --if test "x$PKG_CONFIG" != xnone ; then -- echo "$as_me:3651: result: $PKG_CONFIG_LIBDIR" >&5 -+if test "x$PKG_CONFIG_LIBDIR" != xno ; then -+ echo "$as_me:3657: result: $PKG_CONFIG_LIBDIR" >&5 - echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 - fi - - if test "x$PKG_CONFIG" != xnone - then -- echo "$as_me:3657: checking if we should install .pc files for $PKG_CONFIG" >&5 -+ echo "$as_me:3663: checking if we should install .pc files for $PKG_CONFIG" >&5 - echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6 - else -- echo "$as_me:3660: checking if we should install .pc files" >&5 -+ echo "$as_me:3666: checking if we should install .pc files" >&5 - echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6 - fi - -@@ -3668,14 +3674,14 @@ - else - enable_pc_files=no - fi; --echo "$as_me:3671: result: $enable_pc_files" >&5 -+echo "$as_me:3677: result: $enable_pc_files" >&5 - echo "${ECHO_T}$enable_pc_files" >&6 - - if test "x$enable_pc_files" != xno - then - case "x$PKG_CONFIG_LIBDIR" in - (xno|xyes) -- { echo "$as_me:3678: WARNING: no PKG_CONFIG_LIBDIR was found" >&5 -+ { echo "$as_me:3684: WARNING: no PKG_CONFIG_LIBDIR was found" >&5 - echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;} - MAKE_PC_FILES="#" - ;; -@@ -3706,7 +3712,7 @@ - PKG_CONFIG_LIBDIR=`echo $PKG_CONFIG_LIBDIR | sed -e s%NONE%$cf_path_syntax%` - ;; - (*) -- { { echo "$as_me:3709: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5 -+ { { echo "$as_me:3715: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5 - echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&2;} - { (exit 1); exit 1; }; } - ;; -@@ -3721,7 +3727,7 @@ - - if test -z "$MAKE_PC_FILES" - then -- echo "$as_me:3724: checking for suffix to add to pc-files" >&5 -+ echo "$as_me:3730: checking for suffix to add to pc-files" >&5 - echo $ECHO_N "checking for suffix to add to pc-files... $ECHO_C" >&6 - - # Check whether --with-pc-suffix or --without-pc-suffix was given. -@@ -3736,13 +3742,13 @@ - esac - fi; - test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none -- echo "$as_me:3739: result: $PC_MODULE_SUFFIX" >&5 -+ echo "$as_me:3745: result: $PC_MODULE_SUFFIX" >&5 - echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6 - test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX= - - fi - --echo "$as_me:3745: checking if we should assume mixed-case filenames" >&5 -+echo "$as_me:3751: checking if we should assume mixed-case filenames" >&5 - echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6 - - # Check whether --enable-mixed-case or --disable-mixed-case was given. -@@ -3752,11 +3758,11 @@ - else - enable_mixedcase=auto - fi; --echo "$as_me:3755: result: $enable_mixedcase" >&5 -+echo "$as_me:3761: result: $enable_mixedcase" >&5 - echo "${ECHO_T}$enable_mixedcase" >&6 - if test "$enable_mixedcase" = "auto" ; then - --echo "$as_me:3759: checking if filesystem supports mixed-case filenames" >&5 -+echo "$as_me:3765: 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 -@@ -3783,7 +3789,7 @@ - fi - - fi --echo "$as_me:3786: result: $cf_cv_mixedcase" >&5 -+echo "$as_me:3792: result: $cf_cv_mixedcase" >&5 - echo "${ECHO_T}$cf_cv_mixedcase" >&6 - test "$cf_cv_mixedcase" = yes && - cat >>confdefs.h <<\EOF -@@ -3802,7 +3808,7 @@ - fi - - # do this after mixed-case option (tags/TAGS is not as important as tic). --echo "$as_me:3805: checking whether ${MAKE-make} sets \${MAKE}" >&5 -+echo "$as_me:3811: 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 -@@ -3822,11 +3828,11 @@ - rm -f conftest.make - fi - if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then -- echo "$as_me:3825: result: yes" >&5 -+ echo "$as_me:3831: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - SET_MAKE= - else -- echo "$as_me:3829: result: no" >&5 -+ echo "$as_me:3835: result: no" >&5 - echo "${ECHO_T}no" >&6 - SET_MAKE="MAKE=${MAKE-make}" - fi -@@ -3835,7 +3841,7 @@ - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:3838: checking for $ac_word" >&5 -+echo "$as_me:3844: 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 -@@ -3850,7 +3856,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_CTAGS="$ac_prog" --echo "$as_me:3853: found $ac_dir/$ac_word" >&5 -+echo "$as_me:3859: found $ac_dir/$ac_word" >&5 - break - done - -@@ -3858,10 +3864,10 @@ - fi - CTAGS=$ac_cv_prog_CTAGS - if test -n "$CTAGS"; then -- echo "$as_me:3861: result: $CTAGS" >&5 -+ echo "$as_me:3867: result: $CTAGS" >&5 - echo "${ECHO_T}$CTAGS" >&6 - else -- echo "$as_me:3864: result: no" >&5 -+ echo "$as_me:3870: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -3872,7 +3878,7 @@ - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:3875: checking for $ac_word" >&5 -+echo "$as_me:3881: 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 -@@ -3887,7 +3893,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_ETAGS="$ac_prog" --echo "$as_me:3890: found $ac_dir/$ac_word" >&5 -+echo "$as_me:3896: found $ac_dir/$ac_word" >&5 - break - done - -@@ -3895,10 +3901,10 @@ - fi - ETAGS=$ac_cv_prog_ETAGS - if test -n "$ETAGS"; then -- echo "$as_me:3898: result: $ETAGS" >&5 -+ echo "$as_me:3904: result: $ETAGS" >&5 - echo "${ECHO_T}$ETAGS" >&6 - else -- echo "$as_me:3901: result: no" >&5 -+ echo "$as_me:3907: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -3907,7 +3913,7 @@ - - # 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:3910: checking for $ac_word" >&5 -+echo "$as_me:3916: 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 -@@ -3922,7 +3928,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_MAKE_LOWER_TAGS="yes" --echo "$as_me:3925: found $ac_dir/$ac_word" >&5 -+echo "$as_me:3931: found $ac_dir/$ac_word" >&5 - break - done - -@@ -3931,17 +3937,17 @@ - fi - MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS - if test -n "$MAKE_LOWER_TAGS"; then -- echo "$as_me:3934: result: $MAKE_LOWER_TAGS" >&5 -+ echo "$as_me:3940: result: $MAKE_LOWER_TAGS" >&5 - echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 - else -- echo "$as_me:3937: result: no" >&5 -+ echo "$as_me:3943: 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:3944: checking for $ac_word" >&5 -+echo "$as_me:3950: 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 -@@ -3956,7 +3962,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_MAKE_UPPER_TAGS="yes" --echo "$as_me:3959: found $ac_dir/$ac_word" >&5 -+echo "$as_me:3965: found $ac_dir/$ac_word" >&5 - break - done - -@@ -3965,10 +3971,10 @@ - fi - MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS - if test -n "$MAKE_UPPER_TAGS"; then -- echo "$as_me:3968: result: $MAKE_UPPER_TAGS" >&5 -+ echo "$as_me:3974: result: $MAKE_UPPER_TAGS" >&5 - echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 - else -- echo "$as_me:3971: result: no" >&5 -+ echo "$as_me:3977: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -3988,7 +3994,7 @@ - MAKE_LOWER_TAGS="#" - fi - --echo "$as_me:3991: checking for makeflags variable" >&5 -+echo "$as_me:3997: 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 -@@ -4022,13 +4028,13 @@ - rm -f cf_makeflags.tmp - - fi --echo "$as_me:4025: result: $cf_cv_makeflags" >&5 -+echo "$as_me:4031: result: $cf_cv_makeflags" >&5 - echo "${ECHO_T}$cf_cv_makeflags" >&6 - - 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:4031: checking for $ac_word" >&5 -+echo "$as_me:4037: 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 -@@ -4043,7 +4049,7 @@ - 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:4046: found $ac_dir/$ac_word" >&5 -+echo "$as_me:4052: found $ac_dir/$ac_word" >&5 - break - done - -@@ -4051,10 +4057,10 @@ - fi - RANLIB=$ac_cv_prog_RANLIB - if test -n "$RANLIB"; then -- echo "$as_me:4054: result: $RANLIB" >&5 -+ echo "$as_me:4060: result: $RANLIB" >&5 - echo "${ECHO_T}$RANLIB" >&6 - else -- echo "$as_me:4057: result: no" >&5 -+ echo "$as_me:4063: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -4063,7 +4069,7 @@ - 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:4066: checking for $ac_word" >&5 -+echo "$as_me:4072: 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 -@@ -4078,7 +4084,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_ac_ct_RANLIB="ranlib" --echo "$as_me:4081: found $ac_dir/$ac_word" >&5 -+echo "$as_me:4087: found $ac_dir/$ac_word" >&5 - break - done - -@@ -4087,10 +4093,10 @@ - fi - ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB - if test -n "$ac_ct_RANLIB"; then -- echo "$as_me:4090: result: $ac_ct_RANLIB" >&5 -+ echo "$as_me:4096: result: $ac_ct_RANLIB" >&5 - echo "${ECHO_T}$ac_ct_RANLIB" >&6 - else -- echo "$as_me:4093: result: no" >&5 -+ echo "$as_me:4099: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -4102,7 +4108,7 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. - set dummy ${ac_tool_prefix}ld; ac_word=$2 --echo "$as_me:4105: checking for $ac_word" >&5 -+echo "$as_me:4111: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -4117,7 +4123,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_LD="${ac_tool_prefix}ld" --echo "$as_me:4120: found $ac_dir/$ac_word" >&5 -+echo "$as_me:4126: found $ac_dir/$ac_word" >&5 - break - done - -@@ -4125,10 +4131,10 @@ - fi - LD=$ac_cv_prog_LD - if test -n "$LD"; then -- echo "$as_me:4128: result: $LD" >&5 -+ echo "$as_me:4134: result: $LD" >&5 - echo "${ECHO_T}$LD" >&6 - else -- echo "$as_me:4131: result: no" >&5 -+ echo "$as_me:4137: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -4137,7 +4143,7 @@ - ac_ct_LD=$LD - # Extract the first word of "ld", so it can be a program name with args. - set dummy ld; ac_word=$2 --echo "$as_me:4140: checking for $ac_word" >&5 -+echo "$as_me:4146: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_ac_ct_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -4152,7 +4158,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_ac_ct_LD="ld" --echo "$as_me:4155: found $ac_dir/$ac_word" >&5 -+echo "$as_me:4161: found $ac_dir/$ac_word" >&5 - break - done - -@@ -4161,10 +4167,10 @@ - fi - ac_ct_LD=$ac_cv_prog_ac_ct_LD - if test -n "$ac_ct_LD"; then -- echo "$as_me:4164: result: $ac_ct_LD" >&5 -+ echo "$as_me:4170: result: $ac_ct_LD" >&5 - echo "${ECHO_T}$ac_ct_LD" >&6 - else -- echo "$as_me:4167: result: no" >&5 -+ echo "$as_me:4173: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -4176,7 +4182,7 @@ - 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:4179: checking for $ac_word" >&5 -+echo "$as_me:4185: 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 -@@ -4191,7 +4197,7 @@ - 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:4194: found $ac_dir/$ac_word" >&5 -+echo "$as_me:4200: found $ac_dir/$ac_word" >&5 - break - done - -@@ -4199,10 +4205,10 @@ - fi - AR=$ac_cv_prog_AR - if test -n "$AR"; then -- echo "$as_me:4202: result: $AR" >&5 -+ echo "$as_me:4208: result: $AR" >&5 - echo "${ECHO_T}$AR" >&6 - else -- echo "$as_me:4205: result: no" >&5 -+ echo "$as_me:4211: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -4211,7 +4217,7 @@ - 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:4214: checking for $ac_word" >&5 -+echo "$as_me:4220: 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 -@@ -4226,7 +4232,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_ac_ct_AR="ar" --echo "$as_me:4229: found $ac_dir/$ac_word" >&5 -+echo "$as_me:4235: found $ac_dir/$ac_word" >&5 - break - done - -@@ -4235,10 +4241,10 @@ - fi - ac_ct_AR=$ac_cv_prog_ac_ct_AR - if test -n "$ac_ct_AR"; then -- echo "$as_me:4238: result: $ac_ct_AR" >&5 -+ echo "$as_me:4244: result: $ac_ct_AR" >&5 - echo "${ECHO_T}$ac_ct_AR" >&6 - else -- echo "$as_me:4241: result: no" >&5 -+ echo "$as_me:4247: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -4250,7 +4256,7 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args. - set dummy ${ac_tool_prefix}nm; ac_word=$2 --echo "$as_me:4253: checking for $ac_word" >&5 -+echo "$as_me:4259: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_NM+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -4265,7 +4271,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_NM="${ac_tool_prefix}nm" --echo "$as_me:4268: found $ac_dir/$ac_word" >&5 -+echo "$as_me:4274: found $ac_dir/$ac_word" >&5 - break - done - -@@ -4273,10 +4279,10 @@ - fi - NM=$ac_cv_prog_NM - if test -n "$NM"; then -- echo "$as_me:4276: result: $NM" >&5 -+ echo "$as_me:4282: result: $NM" >&5 - echo "${ECHO_T}$NM" >&6 - else -- echo "$as_me:4279: result: no" >&5 -+ echo "$as_me:4285: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -4285,7 +4291,7 @@ - ac_ct_NM=$NM - # Extract the first word of "nm", so it can be a program name with args. - set dummy nm; ac_word=$2 --echo "$as_me:4288: checking for $ac_word" >&5 -+echo "$as_me:4294: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_ac_ct_NM+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -4300,7 +4306,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_ac_ct_NM="nm" --echo "$as_me:4303: found $ac_dir/$ac_word" >&5 -+echo "$as_me:4309: found $ac_dir/$ac_word" >&5 - break - done - -@@ -4309,10 +4315,10 @@ - fi - ac_ct_NM=$ac_cv_prog_ac_ct_NM - if test -n "$ac_ct_NM"; then -- echo "$as_me:4312: result: $ac_ct_NM" >&5 -+ echo "$as_me:4318: result: $ac_ct_NM" >&5 - echo "${ECHO_T}$ac_ct_NM" >&6 - else -- echo "$as_me:4315: result: no" >&5 -+ echo "$as_me:4321: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -4324,7 +4330,7 @@ - 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:4327: checking for $ac_word" >&5 -+echo "$as_me:4333: 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 -@@ -4339,7 +4345,7 @@ - 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:4342: found $ac_dir/$ac_word" >&5 -+echo "$as_me:4348: found $ac_dir/$ac_word" >&5 - break - done - -@@ -4347,10 +4353,10 @@ - fi - AR=$ac_cv_prog_AR - if test -n "$AR"; then -- echo "$as_me:4350: result: $AR" >&5 -+ echo "$as_me:4356: result: $AR" >&5 - echo "${ECHO_T}$AR" >&6 - else -- echo "$as_me:4353: result: no" >&5 -+ echo "$as_me:4359: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -4359,7 +4365,7 @@ - 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:4362: checking for $ac_word" >&5 -+echo "$as_me:4368: 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 -@@ -4374,7 +4380,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_ac_ct_AR="ar" --echo "$as_me:4377: found $ac_dir/$ac_word" >&5 -+echo "$as_me:4383: found $ac_dir/$ac_word" >&5 - break - done - -@@ -4383,10 +4389,10 @@ - fi - ac_ct_AR=$ac_cv_prog_ac_ct_AR - if test -n "$ac_ct_AR"; then -- echo "$as_me:4386: result: $ac_ct_AR" >&5 -+ echo "$as_me:4392: result: $ac_ct_AR" >&5 - echo "${ECHO_T}$ac_ct_AR" >&6 - else -- echo "$as_me:4389: result: no" >&5 -+ echo "$as_me:4395: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -4395,7 +4401,7 @@ - AR="$ac_cv_prog_AR" - fi - --echo "$as_me:4398: checking for options to update archives" >&5 -+echo "$as_me:4404: 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 -@@ -4418,13 +4424,13 @@ - rm -f conftest.a - - cat >conftest.$ac_ext <&5 -+ if { (eval echo "$as_me:4430: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:4427: \$? = $ac_status" >&5 -+ echo "$as_me:4433: \$? = $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 -@@ -4435,7 +4441,7 @@ - else - test -n "$verbose" && echo " cannot compile test-program" 1>&6 - --echo "${as_me:-configure}:4438: testing cannot compile test-program ..." 1>&5 -+echo "${as_me:-configure}:4444: testing cannot compile test-program ..." 1>&5 - - break - fi -@@ -4443,7 +4449,7 @@ - rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext - - fi --echo "$as_me:4446: result: $cf_cv_ar_flags" >&5 -+echo "$as_me:4452: result: $cf_cv_ar_flags" >&5 - echo "${ECHO_T}$cf_cv_ar_flags" >&6 - - if test -n "$ARFLAGS" ; then -@@ -4454,7 +4460,7 @@ - ARFLAGS=$cf_cv_ar_flags - fi - --echo "$as_me:4457: checking if you have specified an install-prefix" >&5 -+echo "$as_me:4463: checking if you have specified an install-prefix" >&5 - echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6 - - # Check whether --with-install-prefix or --without-install-prefix was given. -@@ -4467,7 +4473,7 @@ - ;; - esac - fi; --echo "$as_me:4470: result: $DESTDIR" >&5 -+echo "$as_me:4476: result: $DESTDIR" >&5 - echo "${ECHO_T}$DESTDIR" >&6 - - ############################################################################### -@@ -4495,7 +4501,7 @@ - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:4498: checking for $ac_word" >&5 -+echo "$as_me:4504: 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 -@@ -4510,7 +4516,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_BUILD_CC="$ac_prog" --echo "$as_me:4513: found $ac_dir/$ac_word" >&5 -+echo "$as_me:4519: found $ac_dir/$ac_word" >&5 - break - done - -@@ -4518,10 +4524,10 @@ - fi - BUILD_CC=$ac_cv_prog_BUILD_CC - if test -n "$BUILD_CC"; then -- echo "$as_me:4521: result: $BUILD_CC" >&5 -+ echo "$as_me:4527: result: $BUILD_CC" >&5 - echo "${ECHO_T}$BUILD_CC" >&6 - else -- echo "$as_me:4524: result: no" >&5 -+ echo "$as_me:4530: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -4529,12 +4535,12 @@ - done - - fi; -- echo "$as_me:4532: checking for native build C compiler" >&5 -+ echo "$as_me:4538: checking for native build C compiler" >&5 - echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6 -- echo "$as_me:4534: result: $BUILD_CC" >&5 -+ echo "$as_me:4540: result: $BUILD_CC" >&5 - echo "${ECHO_T}$BUILD_CC" >&6 - -- echo "$as_me:4537: checking for native build C preprocessor" >&5 -+ echo "$as_me:4543: 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. -@@ -4544,10 +4550,10 @@ - else - BUILD_CPP='${BUILD_CC} -E' - fi; -- echo "$as_me:4547: result: $BUILD_CPP" >&5 -+ echo "$as_me:4553: result: $BUILD_CPP" >&5 - echo "${ECHO_T}$BUILD_CPP" >&6 - -- echo "$as_me:4550: checking for native build C flags" >&5 -+ echo "$as_me:4556: 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. -@@ -4555,10 +4561,10 @@ - withval="$with_build_cflags" - BUILD_CFLAGS="$withval" - fi; -- echo "$as_me:4558: result: $BUILD_CFLAGS" >&5 -+ echo "$as_me:4564: result: $BUILD_CFLAGS" >&5 - echo "${ECHO_T}$BUILD_CFLAGS" >&6 - -- echo "$as_me:4561: checking for native build C preprocessor-flags" >&5 -+ echo "$as_me:4567: 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. -@@ -4566,10 +4572,10 @@ - withval="$with_build_cppflags" - BUILD_CPPFLAGS="$withval" - fi; -- echo "$as_me:4569: result: $BUILD_CPPFLAGS" >&5 -+ echo "$as_me:4575: result: $BUILD_CPPFLAGS" >&5 - echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 - -- echo "$as_me:4572: checking for native build linker-flags" >&5 -+ echo "$as_me:4578: 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. -@@ -4577,10 +4583,10 @@ - withval="$with_build_ldflags" - BUILD_LDFLAGS="$withval" - fi; -- echo "$as_me:4580: result: $BUILD_LDFLAGS" >&5 -+ echo "$as_me:4586: result: $BUILD_LDFLAGS" >&5 - echo "${ECHO_T}$BUILD_LDFLAGS" >&6 - -- echo "$as_me:4583: checking for native build linker-libraries" >&5 -+ echo "$as_me:4589: 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. -@@ -4588,7 +4594,7 @@ - withval="$with_build_libs" - BUILD_LIBS="$withval" - fi; -- echo "$as_me:4591: result: $BUILD_LIBS" >&5 -+ echo "$as_me:4597: result: $BUILD_LIBS" >&5 - echo "${ECHO_T}$BUILD_LIBS" >&6 - - # this assumes we're on Unix. -@@ -4598,7 +4604,7 @@ - : ${BUILD_CC:='${CC}'} - - if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then -- { { echo "$as_me:4601: error: Cross-build requires two compilers. -+ { { echo "$as_me:4607: 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;} -@@ -4623,7 +4629,7 @@ - ### shared, for example. - cf_list_models="" - --echo "$as_me:4626: checking if libtool -version-number should be used" >&5 -+echo "$as_me:4632: checking if libtool -version-number should be used" >&5 - echo $ECHO_N "checking if libtool -version-number should be used... $ECHO_C" >&6 - - # Check whether --enable-libtool-version or --disable-libtool-version was given. -@@ -4640,7 +4646,7 @@ - cf_libtool_version=yes - - fi; --echo "$as_me:4643: result: $cf_libtool_version" >&5 -+echo "$as_me:4649: result: $cf_libtool_version" >&5 - echo "${ECHO_T}$cf_libtool_version" >&6 - - if test "$cf_libtool_version" = yes ; then -@@ -4649,25 +4655,25 @@ - LIBTOOL_VERSION="-version-info" - case "x$VERSION" in - (x) -- { echo "$as_me:4652: WARNING: VERSION was not set" >&5 -+ { echo "$as_me:4658: WARNING: VERSION was not set" >&5 - echo "$as_me: WARNING: VERSION was not set" >&2;} - ;; - (x*.*.*) - ABI_VERSION="$VERSION" - test -n "$verbose" && echo " ABI_VERSION: $ABI_VERSION" 1>&6 - --echo "${as_me:-configure}:4659: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 -+echo "${as_me:-configure}:4665: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 - - ;; - (x*:*:*) - ABI_VERSION=`echo "$VERSION" | sed -e 's/:/./g'` - test -n "$verbose" && echo " ABI_VERSION: $ABI_VERSION" 1>&6 - --echo "${as_me:-configure}:4666: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 -+echo "${as_me:-configure}:4672: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 - - ;; - (*) -- { echo "$as_me:4670: WARNING: unexpected VERSION value: $VERSION" >&5 -+ { echo "$as_me:4676: WARNING: unexpected VERSION value: $VERSION" >&5 - echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;} - ;; - esac -@@ -4689,7 +4695,7 @@ - LIB_INSTALL= - LIB_UNINSTALL= - --echo "$as_me:4692: checking if you want to build libraries with libtool" >&5 -+echo "$as_me:4698: checking if you want to build libraries with libtool" >&5 - echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6 - - # Check whether --with-libtool or --without-libtool was given. -@@ -4699,7 +4705,7 @@ - else - with_libtool=no - fi; --echo "$as_me:4702: result: $with_libtool" >&5 -+echo "$as_me:4708: result: $with_libtool" >&5 - echo "${ECHO_T}$with_libtool" >&6 - if test "$with_libtool" != "no"; then - -@@ -4730,7 +4736,7 @@ - with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%` - ;; - (*) -- { { echo "$as_me:4733: error: expected a pathname, not \"$with_libtool\"" >&5 -+ { { echo "$as_me:4739: error: expected a pathname, not \"$with_libtool\"" >&5 - echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;} - { (exit 1); exit 1; }; } - ;; -@@ -4743,7 +4749,7 @@ - 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:4746: checking for $ac_word" >&5 -+echo "$as_me:4752: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_LIBTOOL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -4758,7 +4764,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog" --echo "$as_me:4761: found $ac_dir/$ac_word" >&5 -+echo "$as_me:4767: found $ac_dir/$ac_word" >&5 - break - done - -@@ -4766,10 +4772,10 @@ - fi - LIBTOOL=$ac_cv_prog_LIBTOOL - if test -n "$LIBTOOL"; then -- echo "$as_me:4769: result: $LIBTOOL" >&5 -+ echo "$as_me:4775: result: $LIBTOOL" >&5 - echo "${ECHO_T}$LIBTOOL" >&6 - else -- echo "$as_me:4772: result: no" >&5 -+ echo "$as_me:4778: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -4782,7 +4788,7 @@ - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:4785: checking for $ac_word" >&5 -+echo "$as_me:4791: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -4797,7 +4803,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_ac_ct_LIBTOOL="$ac_prog" --echo "$as_me:4800: found $ac_dir/$ac_word" >&5 -+echo "$as_me:4806: found $ac_dir/$ac_word" >&5 - break - done - -@@ -4805,10 +4811,10 @@ - fi - ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL - if test -n "$ac_ct_LIBTOOL"; then -- echo "$as_me:4808: result: $ac_ct_LIBTOOL" >&5 -+ echo "$as_me:4814: result: $ac_ct_LIBTOOL" >&5 - echo "${ECHO_T}$ac_ct_LIBTOOL" >&6 - else -- echo "$as_me:4811: result: no" >&5 -+ echo "$as_me:4817: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -4839,7 +4845,7 @@ - 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:4842: checking for $ac_word" >&5 -+echo "$as_me:4848: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_LIBTOOL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -4854,7 +4860,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog" --echo "$as_me:4857: found $ac_dir/$ac_word" >&5 -+echo "$as_me:4863: found $ac_dir/$ac_word" >&5 - break - done - -@@ -4862,10 +4868,10 @@ - fi - LIBTOOL=$ac_cv_prog_LIBTOOL - if test -n "$LIBTOOL"; then -- echo "$as_me:4865: result: $LIBTOOL" >&5 -+ echo "$as_me:4871: result: $LIBTOOL" >&5 - echo "${ECHO_T}$LIBTOOL" >&6 - else -- echo "$as_me:4868: result: no" >&5 -+ echo "$as_me:4874: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -4878,7 +4884,7 @@ - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:4881: checking for $ac_word" >&5 -+echo "$as_me:4887: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -4893,7 +4899,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_ac_ct_LIBTOOL="$ac_prog" --echo "$as_me:4896: found $ac_dir/$ac_word" >&5 -+echo "$as_me:4902: found $ac_dir/$ac_word" >&5 - break - done - -@@ -4901,10 +4907,10 @@ - fi - ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL - if test -n "$ac_ct_LIBTOOL"; then -- echo "$as_me:4904: result: $ac_ct_LIBTOOL" >&5 -+ echo "$as_me:4910: result: $ac_ct_LIBTOOL" >&5 - echo "${ECHO_T}$ac_ct_LIBTOOL" >&6 - else -- echo "$as_me:4907: result: no" >&5 -+ echo "$as_me:4913: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -4926,7 +4932,7 @@ - fi - fi - if test -z "$LIBTOOL" ; then -- { { echo "$as_me:4929: error: Cannot find libtool" >&5 -+ { { echo "$as_me:4935: error: Cannot find libtool" >&5 - echo "$as_me: error: Cannot find libtool" >&2;} - { (exit 1); exit 1; }; } - fi -@@ -4942,7 +4948,7 @@ - - if test -n "$LIBTOOL" && test "$LIBTOOL" != none - then -- echo "$as_me:4945: checking version of $LIBTOOL" >&5 -+ echo "$as_me:4951: checking version of $LIBTOOL" >&5 - echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6 - - if test -n "$LIBTOOL" && test "$LIBTOOL" != none -@@ -4953,15 +4959,15 @@ - fi - test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version - -- echo "$as_me:4956: result: $cf_cv_libtool_version" >&5 -+ echo "$as_me:4962: result: $cf_cv_libtool_version" >&5 - echo "${ECHO_T}$cf_cv_libtool_version" >&6 - if test -z "$cf_cv_libtool_version" ; then -- { { echo "$as_me:4959: error: This is not GNU libtool" >&5 -+ { { echo "$as_me:4965: error: This is not GNU libtool" >&5 - echo "$as_me: error: This is not GNU libtool" >&2;} - { (exit 1); exit 1; }; } - fi - else -- { { echo "$as_me:4964: error: GNU libtool has not been found" >&5 -+ { { echo "$as_me:4970: error: GNU libtool has not been found" >&5 - echo "$as_me: error: GNU libtool has not been found" >&2;} - { (exit 1); exit 1; }; } - fi -@@ -4997,7 +5003,7 @@ - - else - --echo "$as_me:5000: checking if you want to build shared libraries" >&5 -+echo "$as_me:5006: checking if you want to build shared libraries" >&5 - echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6 - - # Check whether --with-shared or --without-shared was given. -@@ -5007,11 +5013,11 @@ - else - with_shared=no - fi; --echo "$as_me:5010: result: $with_shared" >&5 -+echo "$as_me:5016: result: $with_shared" >&5 - echo "${ECHO_T}$with_shared" >&6 - test "x$with_shared" = "xyes" && cf_list_models="$cf_list_models shared" - --echo "$as_me:5014: checking if you want to build static libraries" >&5 -+echo "$as_me:5020: checking if you want to build static libraries" >&5 - echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6 - - # Check whether --with-normal or --without-normal was given. -@@ -5021,11 +5027,11 @@ - else - with_normal=yes - fi; --echo "$as_me:5024: result: $with_normal" >&5 -+echo "$as_me:5030: result: $with_normal" >&5 - echo "${ECHO_T}$with_normal" >&6 - test "x$with_normal" = "xyes" && cf_list_models="$cf_list_models normal" - --echo "$as_me:5028: checking if you want to build debug libraries" >&5 -+echo "$as_me:5034: checking if you want to build debug libraries" >&5 - echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6 - - # Check whether --with-debug or --without-debug was given. -@@ -5035,11 +5041,11 @@ - else - with_debug=yes - fi; --echo "$as_me:5038: result: $with_debug" >&5 -+echo "$as_me:5044: result: $with_debug" >&5 - echo "${ECHO_T}$with_debug" >&6 - test "x$with_debug" = "xyes" && cf_list_models="$cf_list_models debug" - --echo "$as_me:5042: checking if you want to build profiling libraries" >&5 -+echo "$as_me:5048: checking if you want to build profiling libraries" >&5 - echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6 - - # Check whether --with-profile or --without-profile was given. -@@ -5049,7 +5055,7 @@ - else - with_profile=no - fi; --echo "$as_me:5052: result: $with_profile" >&5 -+echo "$as_me:5058: result: $with_profile" >&5 - echo "${ECHO_T}$with_profile" >&6 - test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile" - -@@ -5057,7 +5063,7 @@ - - if test "X$cf_with_cxx_binding" != Xno; then - if test "x$with_shared" = "xyes"; then --echo "$as_me:5060: checking if you want to build C++ shared libraries" >&5 -+echo "$as_me:5066: checking if you want to build C++ shared libraries" >&5 - echo $ECHO_N "checking if you want to build C++ shared libraries... $ECHO_C" >&6 - - # Check whether --with-cxx-shared or --without-cxx-shared was given. -@@ -5067,26 +5073,26 @@ - else - with_shared_cxx=no - fi; --echo "$as_me:5070: result: $with_shared_cxx" >&5 -+echo "$as_me:5076: result: $with_shared_cxx" >&5 - echo "${ECHO_T}$with_shared_cxx" >&6 - fi - fi - - ############################################################################### - --echo "$as_me:5077: checking for specified models" >&5 -+echo "$as_me:5083: checking for specified models" >&5 - echo $ECHO_N "checking for specified models... $ECHO_C" >&6 - test -z "$cf_list_models" && cf_list_models=normal - test "$with_libtool" != "no" && cf_list_models=libtool --echo "$as_me:5081: result: $cf_list_models" >&5 -+echo "$as_me:5087: result: $cf_list_models" >&5 - echo "${ECHO_T}$cf_list_models" >&6 - - ### Use the first model as the default, and save its suffix for use in building - ### up test-applications. --echo "$as_me:5086: checking for default model" >&5 -+echo "$as_me:5092: checking for default model" >&5 - echo $ECHO_N "checking for default model... $ECHO_C" >&6 - DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'` --echo "$as_me:5089: result: $DFT_LWR_MODEL" >&5 -+echo "$as_me:5095: result: $DFT_LWR_MODEL" >&5 - echo "${ECHO_T}$DFT_LWR_MODEL" >&6 - - DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -@@ -5100,7 +5106,7 @@ - LIB_DIR=../lib - LIB_2ND=../../lib - --echo "$as_me:5103: checking if you want to have a library-prefix" >&5 -+echo "$as_me:5109: checking if you want to have a library-prefix" >&5 - echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6 - - # Check whether --with-lib-prefix or --without-lib-prefix was given. -@@ -5110,7 +5116,7 @@ - else - with_lib_prefix=auto - fi; --echo "$as_me:5113: result: $with_lib_prefix" >&5 -+echo "$as_me:5119: result: $with_lib_prefix" >&5 - echo "${ECHO_T}$with_lib_prefix" >&6 - - if test $with_lib_prefix = auto -@@ -5134,19 +5140,19 @@ - - LIB_SUFFIX= - -- echo "$as_me:5137: checking for PATH separator" >&5 -+ echo "$as_me:5143: 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:5144: result: $PATH_SEPARATOR" >&5 -+ echo "$as_me:5150: result: $PATH_SEPARATOR" >&5 - echo "${ECHO_T}$PATH_SEPARATOR" >&6 - - ############################################################################### - --echo "$as_me:5149: checking if you want to build a separate terminfo library" >&5 -+echo "$as_me:5155: checking if you want to build a separate terminfo library" >&5 - echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6 - - # Check whether --with-termlib or --without-termlib was given. -@@ -5156,10 +5162,10 @@ - else - with_termlib=no - fi; --echo "$as_me:5159: result: $with_termlib" >&5 -+echo "$as_me:5165: result: $with_termlib" >&5 - echo "${ECHO_T}$with_termlib" >&6 - --echo "$as_me:5162: checking if you want to build a separate tic library" >&5 -+echo "$as_me:5168: checking if you want to build a separate tic library" >&5 - echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6 - - # Check whether --with-ticlib or --without-ticlib was given. -@@ -5169,13 +5175,13 @@ - else - with_ticlib=no - fi; --echo "$as_me:5172: result: $with_ticlib" >&5 -+echo "$as_me:5178: result: $with_ticlib" >&5 - echo "${ECHO_T}$with_ticlib" >&6 - - ### Checks for special libraries, must be done up-front. - SHLIB_LIST="" - --echo "$as_me:5178: checking if you want to link with the GPM mouse library" >&5 -+echo "$as_me:5184: checking if you want to link with the GPM mouse library" >&5 - echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6 - - # Check whether --with-gpm or --without-gpm was given. -@@ -5185,27 +5191,27 @@ - else - with_gpm=maybe - fi; --echo "$as_me:5188: result: $with_gpm" >&5 -+echo "$as_me:5194: result: $with_gpm" >&5 - echo "${ECHO_T}$with_gpm" >&6 - - if test "$with_gpm" != no ; then -- echo "$as_me:5192: checking for gpm.h" >&5 -+ echo "$as_me:5198: checking for gpm.h" >&5 - echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6 - if test "${ac_cv_header_gpm_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 5198 "configure" -+#line 5204 "configure" - #include "confdefs.h" - #include - _ACEOF --if { (eval echo "$as_me:5202: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:5208: \"$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:5208: \$? = $ac_status" >&5 -+ echo "$as_me:5214: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -5224,7 +5230,7 @@ - fi - rm -f conftest.err conftest.$ac_ext - fi --echo "$as_me:5227: result: $ac_cv_header_gpm_h" >&5 -+echo "$as_me:5233: result: $ac_cv_header_gpm_h" >&5 - echo "${ECHO_T}$ac_cv_header_gpm_h" >&6 - if test $ac_cv_header_gpm_h = yes; then - -@@ -5235,14 +5241,14 @@ - if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then - test -n "$verbose" && echo " assuming we really have GPM library" 1>&6 - --echo "${as_me:-configure}:5238: testing assuming we really have GPM library ..." 1>&5 -+echo "${as_me:-configure}:5244: testing assuming we really have GPM library ..." 1>&5 - - cat >>confdefs.h <<\EOF - #define HAVE_LIBGPM 1 - EOF - - else -- echo "$as_me:5245: checking for Gpm_Open in -lgpm" >&5 -+ echo "$as_me:5251: 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 -@@ -5250,7 +5256,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lgpm $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 5253 "configure" -+#line 5259 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -5269,16 +5275,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:5272: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:5278: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:5275: \$? = $ac_status" >&5 -+ echo "$as_me:5281: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:5278: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:5284: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:5281: \$? = $ac_status" >&5 -+ echo "$as_me:5287: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_gpm_Gpm_Open=yes - else -@@ -5289,13 +5295,13 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:5292: result: $ac_cv_lib_gpm_Gpm_Open" >&5 -+echo "$as_me:5298: 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 - : - else - -- { { echo "$as_me:5298: error: Cannot link with GPM library" >&5 -+ { { echo "$as_me:5304: error: Cannot link with GPM library" >&5 - echo "$as_me: error: Cannot link with GPM library" >&2;} - { (exit 1); exit 1; }; } - fi -@@ -5305,7 +5311,7 @@ - - else - -- test "$with_gpm" != maybe && { echo "$as_me:5308: WARNING: Cannot find GPM header" >&5 -+ test "$with_gpm" != maybe && { echo "$as_me:5314: WARNING: Cannot find GPM header" >&5 - echo "$as_me: WARNING: Cannot find GPM header" >&2;} - with_gpm=no - -@@ -5314,7 +5320,7 @@ - fi - - if test "$with_gpm" != no ; then -- echo "$as_me:5317: checking if you want to load GPM dynamically" >&5 -+ echo "$as_me:5323: checking if you want to load GPM dynamically" >&5 - echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6 - - # Check whether --with-dlsym or --without-dlsym was given. -@@ -5324,18 +5330,18 @@ - else - with_dlsym=yes - fi; -- echo "$as_me:5327: result: $with_dlsym" >&5 -+ echo "$as_me:5333: result: $with_dlsym" >&5 - echo "${ECHO_T}$with_dlsym" >&6 - if test "x$with_dlsym" = xyes ; then - - cf_have_dlsym=no --echo "$as_me:5332: checking for dlsym" >&5 -+echo "$as_me:5338: checking for dlsym" >&5 - echo $ECHO_N "checking for dlsym... $ECHO_C" >&6 - if test "${ac_cv_func_dlsym+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 5338 "configure" -+#line 5344 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlsym (); below. */ -@@ -5366,16 +5372,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:5369: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:5375: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:5372: \$? = $ac_status" >&5 -+ echo "$as_me:5378: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:5375: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:5381: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:5378: \$? = $ac_status" >&5 -+ echo "$as_me:5384: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_dlsym=yes - else -@@ -5385,14 +5391,14 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:5388: result: $ac_cv_func_dlsym" >&5 -+echo "$as_me:5394: result: $ac_cv_func_dlsym" >&5 - echo "${ECHO_T}$ac_cv_func_dlsym" >&6 - if test $ac_cv_func_dlsym = yes; then - cf_have_dlsym=yes - else - - cf_have_libdl=no --echo "$as_me:5395: checking for dlsym in -ldl" >&5 -+echo "$as_me:5401: 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 -@@ -5400,7 +5406,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldl $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 5403 "configure" -+#line 5409 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -5419,16 +5425,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:5422: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:5428: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:5425: \$? = $ac_status" >&5 -+ echo "$as_me:5431: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:5428: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:5434: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:5431: \$? = $ac_status" >&5 -+ echo "$as_me:5437: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dl_dlsym=yes - else -@@ -5439,7 +5445,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:5442: result: $ac_cv_lib_dl_dlsym" >&5 -+echo "$as_me:5448: 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 - -@@ -5467,10 +5473,10 @@ - done - LIBS="$cf_add_libs" - -- echo "$as_me:5470: checking whether able to link to dl*() functions" >&5 -+ echo "$as_me:5476: checking whether able to link to dl*() functions" >&5 - echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line 5473 "configure" -+#line 5479 "configure" - #include "confdefs.h" - #include - int -@@ -5488,16 +5494,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:5491: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:5497: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:5494: \$? = $ac_status" >&5 -+ echo "$as_me:5500: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:5497: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:5503: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:5500: \$? = $ac_status" >&5 -+ echo "$as_me:5506: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - cat >>confdefs.h <<\EOF -@@ -5508,15 +5514,15 @@ - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - -- { { echo "$as_me:5511: error: Cannot link test program for libdl" >&5 -+ { { echo "$as_me:5517: error: Cannot link test program for libdl" >&5 - echo "$as_me: error: Cannot link test program for libdl" >&2;} - { (exit 1); exit 1; }; } - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -- echo "$as_me:5516: result: ok" >&5 -+ echo "$as_me:5522: result: ok" >&5 - echo "${ECHO_T}ok" >&6 - else -- { { echo "$as_me:5519: error: Cannot find dlsym function" >&5 -+ { { echo "$as_me:5525: error: Cannot find dlsym function" >&5 - echo "$as_me: error: Cannot find dlsym function" >&2;} - { (exit 1); exit 1; }; } - fi -@@ -5524,12 +5530,12 @@ - if test "x$with_gpm" != xyes ; then - test -n "$verbose" && echo " assuming soname for gpm is $with_gpm" 1>&6 - --echo "${as_me:-configure}:5527: testing assuming soname for gpm is $with_gpm ..." 1>&5 -+echo "${as_me:-configure}:5533: testing assuming soname for gpm is $with_gpm ..." 1>&5 - - cf_cv_gpm_soname="$with_gpm" - else - --echo "$as_me:5532: checking for soname of gpm library" >&5 -+echo "$as_me:5538: checking for soname of gpm library" >&5 - echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6 - if test "${cf_cv_gpm_soname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -5563,15 +5569,15 @@ - done - LIBS="$cf_add_libs" - -- if { (eval echo "$as_me:5566: \"$ac_compile\"") >&5 -+ if { (eval echo "$as_me:5572: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:5569: \$? = $ac_status" >&5 -+ echo "$as_me:5575: \$? = $ac_status" >&5 - (exit $ac_status); } ; then -- if { (eval echo "$as_me:5571: \"$ac_link\"") >&5 -+ if { (eval echo "$as_me:5577: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:5574: \$? = $ac_status" >&5 -+ echo "$as_me:5580: \$? = $ac_status" >&5 - (exit $ac_status); } ; then - cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.` - test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown -@@ -5582,7 +5588,7 @@ - fi - - fi --echo "$as_me:5585: result: $cf_cv_gpm_soname" >&5 -+echo "$as_me:5591: result: $cf_cv_gpm_soname" >&5 - echo "${ECHO_T}$cf_cv_gpm_soname" >&6 - - fi -@@ -5617,7 +5623,7 @@ - #define HAVE_LIBGPM 1 - EOF - --echo "$as_me:5620: checking for Gpm_Wgetch in -lgpm" >&5 -+echo "$as_me:5626: checking for Gpm_Wgetch in -lgpm" >&5 - echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6 - if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -5625,7 +5631,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lgpm $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 5628 "configure" -+#line 5634 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -5644,16 +5650,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:5647: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:5653: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:5650: \$? = $ac_status" >&5 -+ echo "$as_me:5656: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:5653: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:5659: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:5656: \$? = $ac_status" >&5 -+ echo "$as_me:5662: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_gpm_Gpm_Wgetch=yes - else -@@ -5664,11 +5670,11 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:5667: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5 -+echo "$as_me:5673: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5 - echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6 - if test $ac_cv_lib_gpm_Gpm_Wgetch = yes; then - --echo "$as_me:5671: checking if GPM is weakly bound to curses library" >&5 -+echo "$as_me:5677: checking if GPM is weakly bound to curses library" >&5 - echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6 - if test "${cf_cv_check_gpm_wgetch+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -5692,15 +5698,15 @@ - # to rely on the static library, noting that some packagers may not - # include it. - LIBS="-static -lgpm -dynamic $LIBS" -- if { (eval echo "$as_me:5695: \"$ac_compile\"") >&5 -+ if { (eval echo "$as_me:5701: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:5698: \$? = $ac_status" >&5 -+ echo "$as_me:5704: \$? = $ac_status" >&5 - (exit $ac_status); } ; then -- if { (eval echo "$as_me:5700: \"$ac_link\"") >&5 -+ if { (eval echo "$as_me:5706: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:5703: \$? = $ac_status" >&5 -+ echo "$as_me:5709: \$? = $ac_status" >&5 - (exit $ac_status); } ; then - cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\' | egrep '\<[vVwW]\>'` - test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes -@@ -5712,11 +5718,11 @@ - fi - - fi --echo "$as_me:5715: result: $cf_cv_check_gpm_wgetch" >&5 -+echo "$as_me:5721: result: $cf_cv_check_gpm_wgetch" >&5 - echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6 - - if test "$cf_cv_check_gpm_wgetch" != yes ; then -- { echo "$as_me:5719: WARNING: GPM library is already linked with curses - read the FAQ" >&5 -+ { echo "$as_me:5725: WARNING: GPM library is already linked with curses - read the FAQ" >&5 - echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;} - fi - -@@ -5726,7 +5732,7 @@ - - # not everyone has "test -c" - if test -c /dev/sysmouse 2>/dev/null ; then --echo "$as_me:5729: checking if you want to use sysmouse" >&5 -+echo "$as_me:5735: checking if you want to use sysmouse" >&5 - echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6 - - # Check whether --with-sysmouse or --without-sysmouse was given. -@@ -5738,7 +5744,7 @@ - fi; - if test "$cf_with_sysmouse" != no ; then - cat >conftest.$ac_ext <<_ACEOF --#line 5741 "configure" -+#line 5747 "configure" - #include "confdefs.h" - - #include -@@ -5761,16 +5767,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:5764: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:5770: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:5767: \$? = $ac_status" >&5 -+ echo "$as_me:5773: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:5770: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:5776: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:5773: \$? = $ac_status" >&5 -+ echo "$as_me:5779: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_with_sysmouse=yes - else -@@ -5780,7 +5786,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:5783: result: $cf_with_sysmouse" >&5 -+echo "$as_me:5789: result: $cf_with_sysmouse" >&5 - echo "${ECHO_T}$cf_with_sysmouse" >&6 - test "$cf_with_sysmouse" = yes && - cat >>confdefs.h <<\EOF -@@ -5799,7 +5805,7 @@ - test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT='' - fi - --echo "$as_me:5802: checking for default loader flags" >&5 -+echo "$as_me:5808: checking for default loader flags" >&5 - echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6 - case $DFT_LWR_MODEL in - (libtool) LD_MODEL='' ;; -@@ -5808,13 +5814,13 @@ - (profile) LD_MODEL='-pg';; - (shared) LD_MODEL='' ;; - esac --echo "$as_me:5811: result: $LD_MODEL" >&5 -+echo "$as_me:5817: result: $LD_MODEL" >&5 - echo "${ECHO_T}$LD_MODEL" >&6 - - case $DFT_LWR_MODEL in - (shared) - --echo "$as_me:5817: checking if rpath option should be used" >&5 -+echo "$as_me:5823: checking if rpath option should be used" >&5 - echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6 - - # Check whether --enable-rpath or --disable-rpath was given. -@@ -5824,10 +5830,10 @@ - else - cf_cv_enable_rpath=no - fi; --echo "$as_me:5827: result: $cf_cv_enable_rpath" >&5 -+echo "$as_me:5833: result: $cf_cv_enable_rpath" >&5 - echo "${ECHO_T}$cf_cv_enable_rpath" >&6 - --echo "$as_me:5830: checking if shared libraries should be relinked during install" >&5 -+echo "$as_me:5836: checking if shared libraries should be relinked during install" >&5 - echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6 - - # Check whether --enable-relink or --disable-relink was given. -@@ -5837,7 +5843,7 @@ - else - cf_cv_do_relink=yes - fi; --echo "$as_me:5840: result: $cf_cv_do_relink" >&5 -+echo "$as_me:5846: result: $cf_cv_do_relink" >&5 - echo "${ECHO_T}$cf_cv_do_relink" >&6 - ;; - esac -@@ -5846,7 +5852,7 @@ - rel_builddir=.. - - LD_RPATH_OPT= --echo "$as_me:5849: checking for an rpath option" >&5 -+echo "$as_me:5855: checking for an rpath option" >&5 - echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 - case $cf_cv_system_name in - (irix*) -@@ -5877,12 +5883,12 @@ - (*) - ;; - esac --echo "$as_me:5880: result: $LD_RPATH_OPT" >&5 -+echo "$as_me:5886: result: $LD_RPATH_OPT" >&5 - echo "${ECHO_T}$LD_RPATH_OPT" >&6 - - case "x$LD_RPATH_OPT" in - (x-R*) -- echo "$as_me:5885: checking if we need a space after rpath option" >&5 -+ echo "$as_me:5891: 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" - -@@ -5903,7 +5909,7 @@ - LIBS="$cf_add_libs" - - cat >conftest.$ac_ext <<_ACEOF --#line 5906 "configure" -+#line 5912 "configure" - #include "confdefs.h" - - int -@@ -5915,16 +5921,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:5918: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:5924: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:5921: \$? = $ac_status" >&5 -+ echo "$as_me:5927: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:5924: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:5930: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:5927: \$? = $ac_status" >&5 -+ echo "$as_me:5933: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_rpath_space=no - else -@@ -5934,7 +5940,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS="$cf_save_LIBS" -- echo "$as_me:5937: result: $cf_rpath_space" >&5 -+ echo "$as_me:5943: result: $cf_rpath_space" >&5 - echo "${ECHO_T}$cf_rpath_space" >&6 - test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " - ;; -@@ -5955,7 +5961,7 @@ - cf_ld_rpath_opt= - test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT" - -- echo "$as_me:5958: checking if release/abi version should be used for shared libs" >&5 -+ echo "$as_me:5964: checking if release/abi version should be used for shared libs" >&5 - echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6 - - # Check whether --with-shlib-version or --without-shlib-version was given. -@@ -5970,9 +5976,9 @@ - cf_cv_shlib_version=$withval - ;; - (*) -- echo "$as_me:5973: result: $withval" >&5 -+ echo "$as_me:5979: result: $withval" >&5 - echo "${ECHO_T}$withval" >&6 -- { { echo "$as_me:5975: error: option value must be one of: rel, abi, or auto" >&5 -+ { { echo "$as_me:5981: error: option value must be one of: rel, abi, or auto" >&5 - echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;} - { (exit 1); exit 1; }; } - ;; -@@ -5981,7 +5987,7 @@ - else - cf_cv_shlib_version=auto - fi; -- echo "$as_me:5984: result: $cf_cv_shlib_version" >&5 -+ echo "$as_me:5990: result: $cf_cv_shlib_version" >&5 - echo "${ECHO_T}$cf_cv_shlib_version" >&6 - - cf_cv_rm_so_locs=no -@@ -5991,14 +5997,14 @@ - CC_SHARED_OPTS= - if test "$GCC" = yes - then -- echo "$as_me:5994: checking which $CC option to use" >&5 -+ echo "$as_me:6000: checking which $CC option to use" >&5 - echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6 - cf_save_CFLAGS="$CFLAGS" - for CC_SHARED_OPTS in -fPIC -fpic '' - do - CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS" - cat >conftest.$ac_ext <<_ACEOF --#line 6001 "configure" -+#line 6007 "configure" - #include "confdefs.h" - #include - int -@@ -6010,16 +6016,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:6013: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:6019: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:6016: \$? = $ac_status" >&5 -+ echo "$as_me:6022: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:6019: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:6025: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:6022: \$? = $ac_status" >&5 -+ echo "$as_me:6028: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break - else -@@ -6028,7 +6034,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - done -- echo "$as_me:6031: result: $CC_SHARED_OPTS" >&5 -+ echo "$as_me:6037: result: $CC_SHARED_OPTS" >&5 - echo "${ECHO_T}$CC_SHARED_OPTS" >&6 - CFLAGS="$cf_save_CFLAGS" - fi -@@ -6099,7 +6105,7 @@ - MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@' - test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi - cf_cv_shlib_version_infix=yes -- echo "$as_me:6102: checking if ld -search_paths_first works" >&5 -+ echo "$as_me:6108: checking if ld -search_paths_first works" >&5 - echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6 - if test "${cf_cv_ldflags_search_paths_first+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -6108,7 +6114,7 @@ - cf_save_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS -Wl,-search_paths_first" - cat >conftest.$ac_ext <<_ACEOF --#line 6111 "configure" -+#line 6117 "configure" - #include "confdefs.h" - - int -@@ -6120,16 +6126,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:6123: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:6129: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:6126: \$? = $ac_status" >&5 -+ echo "$as_me:6132: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:6129: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:6135: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:6132: \$? = $ac_status" >&5 -+ echo "$as_me:6138: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_ldflags_search_paths_first=yes - else -@@ -6140,7 +6146,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$cf_save_LDFLAGS - fi --echo "$as_me:6143: result: $cf_cv_ldflags_search_paths_first" >&5 -+echo "$as_me:6149: result: $cf_cv_ldflags_search_paths_first" >&5 - echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 - if test $cf_cv_ldflags_search_paths_first = yes; then - LDFLAGS="$LDFLAGS -Wl,-search_paths_first" -@@ -6365,7 +6371,7 @@ - do - CFLAGS="$cf_shared_opts $cf_save_CFLAGS" - cat >conftest.$ac_ext <<_ACEOF --#line 6368 "configure" -+#line 6374 "configure" - #include "confdefs.h" - #include - int -@@ -6377,16 +6383,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:6380: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:6386: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:6383: \$? = $ac_status" >&5 -+ echo "$as_me:6389: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:6386: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:6392: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:6389: \$? = $ac_status" >&5 -+ echo "$as_me:6395: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break - else -@@ -6423,7 +6429,7 @@ - test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes - ;; - (*) -- { echo "$as_me:6426: WARNING: ignored --with-shlib-version" >&5 -+ { echo "$as_me:6432: WARNING: ignored --with-shlib-version" >&5 - echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} - ;; - esac -@@ -6433,7 +6439,7 @@ - if test -n "$cf_try_cflags" - then - cat > conftest.$ac_ext < - int main(int argc, char *argv[]) - { -@@ -6445,18 +6451,18 @@ - for cf_opt in $cf_try_cflags - do - CFLAGS="$cf_save_CFLAGS -$cf_opt" -- echo "$as_me:6448: checking if CFLAGS option -$cf_opt works" >&5 -+ echo "$as_me:6454: checking if CFLAGS option -$cf_opt works" >&5 - echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6 -- if { (eval echo "$as_me:6450: \"$ac_compile\"") >&5 -+ if { (eval echo "$as_me:6456: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:6453: \$? = $ac_status" >&5 -+ echo "$as_me:6459: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- echo "$as_me:6455: result: yes" >&5 -+ echo "$as_me:6461: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - cf_save_CFLAGS="$CFLAGS" - else -- echo "$as_me:6459: result: no" >&5 -+ echo "$as_me:6465: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - done -@@ -6471,17 +6477,17 @@ - - test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6 - --echo "${as_me:-configure}:6474: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 -+echo "${as_me:-configure}:6480: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 - - test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 - --echo "${as_me:-configure}:6478: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 -+echo "${as_me:-configure}:6484: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 - - for model in $cf_list_models; do - case $model in - (libtool) - --echo "$as_me:6484: checking for additional libtool options" >&5 -+echo "$as_me:6490: checking for additional libtool options" >&5 - echo $ECHO_N "checking for additional libtool options... $ECHO_C" >&6 - - # Check whether --with-libtool-opts or --without-libtool-opts was given. -@@ -6491,7 +6497,7 @@ - else - with_libtool_opts=no - fi; --echo "$as_me:6494: result: $with_libtool_opts" >&5 -+echo "$as_me:6500: result: $with_libtool_opts" >&5 - echo "${ECHO_T}$with_libtool_opts" >&6 - - case .$with_libtool_opts in -@@ -6502,7 +6508,7 @@ - ;; - esac - --echo "$as_me:6505: checking if exported-symbols file should be used" >&5 -+echo "$as_me:6511: checking if exported-symbols file should be used" >&5 - echo $ECHO_N "checking if exported-symbols file should be used... $ECHO_C" >&6 - - # Check whether --with-export-syms or --without-export-syms was given. -@@ -6517,7 +6523,7 @@ - with_export_syms='${top_srcdir}/package/${PACKAGE}.sym' - - fi --echo "$as_me:6520: result: $with_export_syms" >&5 -+echo "$as_me:6526: result: $with_export_syms" >&5 - echo "${ECHO_T}$with_export_syms" >&6 - if test "x$with_export_syms" != xno - then -@@ -6528,12 +6534,12 @@ - ;; - (shared) - if test "$CC_SHARED_OPTS" = "unknown"; then -- { { echo "$as_me:6531: error: Shared libraries are not supported in this version" >&5 -+ { { echo "$as_me:6537: error: Shared libraries are not supported in this version" >&5 - echo "$as_me: error: Shared libraries are not supported in this version" >&2;} - { (exit 1); exit 1; }; } - fi - --echo "$as_me:6536: checking if versioned-symbols file should be used" >&5 -+echo "$as_me:6542: checking if versioned-symbols file should be used" >&5 - echo $ECHO_N "checking if versioned-symbols file should be used... $ECHO_C" >&6 - - # Check whether --with-versioned-syms or --without-versioned-syms was given. -@@ -6548,7 +6554,7 @@ - with_versioned_syms='${top_srcdir}/package/${PACKAGE}.map' - - fi --echo "$as_me:6551: result: $with_versioned_syms" >&5 -+echo "$as_me:6557: result: $with_versioned_syms" >&5 - echo "${ECHO_T}$with_versioned_syms" >&6 - - RESULTING_SYMS= -@@ -6564,7 +6570,7 @@ - MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-Wl,%\\${VERSIONED_SYMS} -Wl,%"` - test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 - --echo "${as_me:-configure}:6567: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 -+echo "${as_me:-configure}:6573: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 - - ;; - (*-dy\ *) -@@ -6572,11 +6578,11 @@ - MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-dy%\\${VERSIONED_SYMS} -dy%"` - test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 - --echo "${as_me:-configure}:6575: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 -+echo "${as_me:-configure}:6581: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 - - ;; - (*) -- { echo "$as_me:6579: WARNING: this system does not support versioned-symbols" >&5 -+ { echo "$as_me:6585: WARNING: this system does not support versioned-symbols" >&5 - echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;} - ;; - esac -@@ -6588,7 +6594,7 @@ - # symbols. - if test "x$VERSIONED_SYMS" != "x" - then -- echo "$as_me:6591: checking if wildcards can be used to selectively omit symbols" >&5 -+ echo "$as_me:6597: checking if wildcards can be used to selectively omit symbols" >&5 - echo $ECHO_N "checking if wildcards can be used to selectively omit symbols... $ECHO_C" >&6 - WILDCARD_SYMS=no - -@@ -6625,7 +6631,7 @@ - } submodule_1.0; - EOF - cat >conftest.$ac_ext <&5 |fgrep _ismissing | egrep '[ ]T[ ]'` - test -n "$cf_missing" && WILDCARD_SYMS=yes - fi -- echo "$as_me:6659: result: $WILDCARD_SYMS" >&5 -+ echo "$as_me:6665: result: $WILDCARD_SYMS" >&5 - echo "${ECHO_T}$WILDCARD_SYMS" >&6 - rm -f conftest.* - fi -@@ -6667,7 +6673,7 @@ - done - - # pretend that ncurses==ncursesw==ncursest --echo "$as_me:6670: checking if you want to disable library suffixes" >&5 -+echo "$as_me:6676: checking if you want to disable library suffixes" >&5 - echo $ECHO_N "checking if you want to disable library suffixes... $ECHO_C" >&6 - - # Check whether --enable-lib-suffixes or --disable-lib-suffixes was given. -@@ -6684,13 +6690,13 @@ - disable_lib_suffixes=no - - fi; --echo "$as_me:6687: result: $disable_lib_suffixes" >&5 -+echo "$as_me:6693: result: $disable_lib_suffixes" >&5 - echo "${ECHO_T}$disable_lib_suffixes" >&6 - - ### If we're building with rpath, try to link non-standard libs that way too. - if test "$DFT_LWR_MODEL" = "shared"; then - --echo "$as_me:6693: checking if rpath-hack should be disabled" >&5 -+echo "$as_me:6699: 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. -@@ -6707,21 +6713,21 @@ - cf_disable_rpath_hack=no - - fi; --echo "$as_me:6710: result: $cf_disable_rpath_hack" >&5 -+echo "$as_me:6716: 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:6714: checking for updated LDFLAGS" >&5 -+echo "$as_me:6720: 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:6717: result: maybe" >&5 -+ echo "$as_me:6723: 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:6724: checking for $ac_word" >&5 -+echo "$as_me:6730: 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 -@@ -6736,7 +6742,7 @@ - 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:6739: found $ac_dir/$ac_word" >&5 -+echo "$as_me:6745: found $ac_dir/$ac_word" >&5 - break - done - -@@ -6744,10 +6750,10 @@ - fi - cf_ldd_prog=$ac_cv_prog_cf_ldd_prog - if test -n "$cf_ldd_prog"; then -- echo "$as_me:6747: result: $cf_ldd_prog" >&5 -+ echo "$as_me:6753: result: $cf_ldd_prog" >&5 - echo "${ECHO_T}$cf_ldd_prog" >&6 - else -- echo "$as_me:6750: result: no" >&5 -+ echo "$as_me:6756: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -6761,7 +6767,7 @@ - cf_rpath_oops= - - cat >conftest.$ac_ext <<_ACEOF --#line 6764 "configure" -+#line 6770 "configure" - #include "confdefs.h" - #include - int -@@ -6773,16 +6779,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:6776: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:6782: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:6779: \$? = $ac_status" >&5 -+ echo "$as_me:6785: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:6782: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:6788: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:6785: \$? = $ac_status" >&5 -+ echo "$as_me:6791: \$? = $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` -@@ -6810,7 +6816,7 @@ - then - test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6 - --echo "${as_me:-configure}:6813: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 -+echo "${as_me:-configure}:6819: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 - - LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" - break -@@ -6822,11 +6828,11 @@ - - test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 - --echo "${as_me:-configure}:6825: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 -+echo "${as_me:-configure}:6831: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 - - test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 - --echo "${as_me:-configure}:6829: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 -+echo "${as_me:-configure}:6835: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 - - cf_rpath_dst= - for cf_rpath_src in $LDFLAGS -@@ -6863,7 +6869,7 @@ - then - test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 - --echo "${as_me:-configure}:6866: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 -+echo "${as_me:-configure}:6872: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 - - EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" - fi -@@ -6876,11 +6882,11 @@ - - test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 - --echo "${as_me:-configure}:6879: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 -+echo "${as_me:-configure}:6885: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 - - test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 - --echo "${as_me:-configure}:6883: testing ...checking LIBS $LIBS ..." 1>&5 -+echo "${as_me:-configure}:6889: testing ...checking LIBS $LIBS ..." 1>&5 - - cf_rpath_dst= - for cf_rpath_src in $LIBS -@@ -6917,7 +6923,7 @@ - then - test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 - --echo "${as_me:-configure}:6920: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 -+echo "${as_me:-configure}:6926: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 - - EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" - fi -@@ -6930,14 +6936,14 @@ - - test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 - --echo "${as_me:-configure}:6933: testing ...checked LIBS $LIBS ..." 1>&5 -+echo "${as_me:-configure}:6939: testing ...checked LIBS $LIBS ..." 1>&5 - - test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 - --echo "${as_me:-configure}:6937: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 -+echo "${as_me:-configure}:6943: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 - - else -- echo "$as_me:6940: result: no" >&5 -+ echo "$as_me:6946: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -6948,7 +6954,7 @@ - ############################################################################### - - ### use option --with-extra-suffix to append suffix to headers and libraries --echo "$as_me:6951: checking if you wish to append extra suffix to header/library paths" >&5 -+echo "$as_me:6957: checking if you wish to append extra suffix to header/library paths" >&5 - echo $ECHO_N "checking if you wish to append extra suffix to header/library paths... $ECHO_C" >&6 - EXTRA_SUFFIX= - -@@ -6967,11 +6973,11 @@ - esac - - fi; --echo "$as_me:6970: result: $EXTRA_SUFFIX" >&5 -+echo "$as_me:6976: result: $EXTRA_SUFFIX" >&5 - echo "${ECHO_T}$EXTRA_SUFFIX" >&6 - - ### use option --disable-overwrite to leave out the link to -lcurses --echo "$as_me:6974: checking if you wish to install ncurses overwriting curses" >&5 -+echo "$as_me:6980: checking if you wish to install ncurses overwriting curses" >&5 - echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6 - - # Check whether --enable-overwrite or --disable-overwrite was given. -@@ -6981,10 +6987,10 @@ - else - if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi - fi; --echo "$as_me:6984: result: $with_overwrite" >&5 -+echo "$as_me:6990: result: $with_overwrite" >&5 - echo "${ECHO_T}$with_overwrite" >&6 - --echo "$as_me:6987: checking if external terminfo-database is used" >&5 -+echo "$as_me:6993: checking if external terminfo-database is used" >&5 - echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6 - - # Check whether --enable-database or --disable-database was given. -@@ -6994,7 +7000,7 @@ - else - use_database=yes - fi; --echo "$as_me:6997: result: $use_database" >&5 -+echo "$as_me:7003: result: $use_database" >&5 - echo "${ECHO_T}$use_database" >&6 - - case $host_os in -@@ -7010,7 +7016,7 @@ - if test "$use_database" != no ; then - NCURSES_USE_DATABASE=1 - -- echo "$as_me:7013: checking which terminfo source-file will be installed" >&5 -+ echo "$as_me:7019: checking which terminfo source-file will be installed" >&5 - echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6 - - # Check whether --with-database or --without-database was given. -@@ -7018,10 +7024,10 @@ - withval="$with_database" - TERMINFO_SRC=$withval - fi; -- echo "$as_me:7021: result: $TERMINFO_SRC" >&5 -+ echo "$as_me:7027: result: $TERMINFO_SRC" >&5 - echo "${ECHO_T}$TERMINFO_SRC" >&6 - -- echo "$as_me:7024: checking whether to use hashed database instead of directory/tree" >&5 -+ echo "$as_me:7030: checking whether to use hashed database instead of directory/tree" >&5 - echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6 - - # Check whether --with-hashed-db or --without-hashed-db was given. -@@ -7031,13 +7037,13 @@ - else - with_hashed_db=no - fi; -- echo "$as_me:7034: result: $with_hashed_db" >&5 -+ echo "$as_me:7040: result: $with_hashed_db" >&5 - echo "${ECHO_T}$with_hashed_db" >&6 - else - with_hashed_db=no - fi - --echo "$as_me:7040: checking for list of fallback descriptions" >&5 -+echo "$as_me:7046: checking for list of fallback descriptions" >&5 - echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6 - - # Check whether --with-fallbacks or --without-fallbacks was given. -@@ -7047,11 +7053,11 @@ - else - with_fallback= - fi; --echo "$as_me:7050: result: $with_fallback" >&5 -+echo "$as_me:7056: result: $with_fallback" >&5 - echo "${ECHO_T}$with_fallback" >&6 - FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'` - --echo "$as_me:7054: checking if you want modern xterm or antique" >&5 -+echo "$as_me:7060: checking if you want modern xterm or antique" >&5 - echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6 - - # Check whether --with-xterm-new or --without-xterm-new was given. -@@ -7065,11 +7071,11 @@ - (no) with_xterm_new=xterm-old;; - (*) with_xterm_new=xterm-new;; - esac --echo "$as_me:7068: result: $with_xterm_new" >&5 -+echo "$as_me:7074: result: $with_xterm_new" >&5 - echo "${ECHO_T}$with_xterm_new" >&6 - WHICH_XTERM=$with_xterm_new - --echo "$as_me:7072: checking if xterm backspace sends BS or DEL" >&5 -+echo "$as_me:7078: checking if xterm backspace sends BS or DEL" >&5 - echo $ECHO_N "checking if xterm backspace sends BS or DEL... $ECHO_C" >&6 - - # Check whether --with-xterm-kbs or --without-xterm-kbs was given. -@@ -7090,7 +7096,7 @@ - with_xterm_kbs=$withval - ;; - esac --echo "$as_me:7093: result: $with_xterm_kbs" >&5 -+echo "$as_me:7099: result: $with_xterm_kbs" >&5 - echo "${ECHO_T}$with_xterm_kbs" >&6 - XTERM_KBS=$with_xterm_kbs - -@@ -7100,7 +7106,7 @@ - MAKE_TERMINFO="#" - else - --echo "$as_me:7103: checking for list of terminfo directories" >&5 -+echo "$as_me:7109: checking for list of terminfo directories" >&5 - echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6 - - # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given. -@@ -7140,7 +7146,7 @@ - cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` - ;; - (*) -- { { echo "$as_me:7143: error: expected a pathname, not \"$cf_src_path\"" >&5 -+ { { echo "$as_me:7149: error: expected a pathname, not \"$cf_src_path\"" >&5 - echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;} - { (exit 1); exit 1; }; } - ;; -@@ -7163,14 +7169,14 @@ - ;; - esac - --echo "$as_me:7166: result: $TERMINFO_DIRS" >&5 -+echo "$as_me:7172: result: $TERMINFO_DIRS" >&5 - echo "${ECHO_T}$TERMINFO_DIRS" >&6 - test -n "$TERMINFO_DIRS" && - cat >>confdefs.h <&5 -+echo "$as_me:7179: checking for default terminfo directory" >&5 - echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6 - - # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given. -@@ -7206,7 +7212,7 @@ - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` - ;; - (*) -- { { echo "$as_me:7209: error: expected a pathname, not \"$withval\"" >&5 -+ { { echo "$as_me:7215: error: expected a pathname, not \"$withval\"" >&5 - echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} - { (exit 1); exit 1; }; } - ;; -@@ -7215,7 +7221,7 @@ - fi - eval TERMINFO="$withval" - --echo "$as_me:7218: result: $TERMINFO" >&5 -+echo "$as_me:7224: result: $TERMINFO" >&5 - echo "${ECHO_T}$TERMINFO" >&6 - - cat >>confdefs.h <&5 -+echo "$as_me:7235: checking if big-core option selected" >&5 - echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6 - - # Check whether --enable-big-core or --disable-big-core was given. -@@ -7238,7 +7244,7 @@ - with_big_core=no - else - cat >conftest.$ac_ext <<_ACEOF --#line 7241 "configure" -+#line 7247 "configure" - #include "confdefs.h" - - #include -@@ -7252,15 +7258,15 @@ - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:7255: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:7261: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:7258: \$? = $ac_status" >&5 -+ echo "$as_me:7264: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:7260: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:7266: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:7263: \$? = $ac_status" >&5 -+ echo "$as_me:7269: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - with_big_core=yes - else -@@ -7272,7 +7278,7 @@ - rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - fi; --echo "$as_me:7275: result: $with_big_core" >&5 -+echo "$as_me:7281: result: $with_big_core" >&5 - echo "${ECHO_T}$with_big_core" >&6 - test "x$with_big_core" = "xyes" && - cat >>confdefs.h <<\EOF -@@ -7282,7 +7288,7 @@ - ### ISO C only guarantees 512-char strings, we have tables which load faster - ### when constructed using "big" strings. More than the C compiler, the awk - ### program is a limit on most vendor UNIX systems. Check that we can build. --echo "$as_me:7285: checking if big-strings option selected" >&5 -+echo "$as_me:7291: checking if big-strings option selected" >&5 - echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6 - - # Check whether --enable-big-strings or --disable-big-strings was given. -@@ -7306,14 +7312,14 @@ - esac - - fi; --echo "$as_me:7309: result: $with_big_strings" >&5 -+echo "$as_me:7315: result: $with_big_strings" >&5 - echo "${ECHO_T}$with_big_strings" >&6 - - USE_BIG_STRINGS=0 - test "x$with_big_strings" = "xyes" && USE_BIG_STRINGS=1 - - ### use option --enable-termcap to compile in the termcap fallback support --echo "$as_me:7316: checking if you want termcap-fallback support" >&5 -+echo "$as_me:7322: checking if you want termcap-fallback support" >&5 - echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6 - - # Check whether --enable-termcap or --disable-termcap was given. -@@ -7323,14 +7329,14 @@ - else - with_termcap=no - fi; --echo "$as_me:7326: result: $with_termcap" >&5 -+echo "$as_me:7332: result: $with_termcap" >&5 - echo "${ECHO_T}$with_termcap" >&6 - - NCURSES_USE_TERMCAP=0 - if test "x$with_termcap" != "xyes" ; then - if test "$use_database" = no ; then - if test -z "$with_fallback" ; then -- { { echo "$as_me:7333: error: You have disabled the database w/o specifying fallbacks" >&5 -+ { { echo "$as_me:7339: error: You have disabled the database w/o specifying fallbacks" >&5 - echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;} - { (exit 1); exit 1; }; } - fi -@@ -7343,13 +7349,13 @@ - else - - if test "$with_ticlib" != no ; then -- { { echo "$as_me:7346: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 -+ { { echo "$as_me:7352: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 - echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;} - { (exit 1); exit 1; }; } - fi - - NCURSES_USE_TERMCAP=1 -- echo "$as_me:7352: checking for list of termcap files" >&5 -+ echo "$as_me:7358: checking for list of termcap files" >&5 - echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6 - - # Check whether --with-termpath or --without-termpath was given. -@@ -7389,7 +7395,7 @@ - cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` - ;; - (*) -- { { echo "$as_me:7392: error: expected a pathname, not \"$cf_src_path\"" >&5 -+ { { echo "$as_me:7398: error: expected a pathname, not \"$cf_src_path\"" >&5 - echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;} - { (exit 1); exit 1; }; } - ;; -@@ -7412,7 +7418,7 @@ - ;; - esac - -- echo "$as_me:7415: result: $TERMPATH" >&5 -+ echo "$as_me:7421: result: $TERMPATH" >&5 - echo "${ECHO_T}$TERMPATH" >&6 - test -n "$TERMPATH" && - cat >>confdefs.h <&5 -+ echo "$as_me:7429: checking if fast termcap-loader is needed" >&5 - echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6 - - # Check whether --enable-getcap or --disable-getcap was given. -@@ -7430,14 +7436,14 @@ - else - with_getcap=no - fi; -- echo "$as_me:7433: result: $with_getcap" >&5 -+ echo "$as_me:7439: result: $with_getcap" >&5 - echo "${ECHO_T}$with_getcap" >&6 - test "x$with_getcap" = "xyes" && - cat >>confdefs.h <<\EOF - #define USE_GETCAP 1 - EOF - -- echo "$as_me:7440: checking if translated termcaps will be cached in ~/.terminfo" >&5 -+ echo "$as_me:7446: checking if translated termcaps will be cached in ~/.terminfo" >&5 - echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6 - - # Check whether --enable-getcap-cache or --disable-getcap-cache was given. -@@ -7447,7 +7453,7 @@ - else - with_getcap_cache=no - fi; -- echo "$as_me:7450: result: $with_getcap_cache" >&5 -+ echo "$as_me:7456: result: $with_getcap_cache" >&5 - echo "${ECHO_T}$with_getcap_cache" >&6 - test "x$with_getcap_cache" = "xyes" && - cat >>confdefs.h <<\EOF -@@ -7457,7 +7463,7 @@ - fi - - ### Use option --disable-home-terminfo to completely remove ~/.terminfo --echo "$as_me:7460: checking if ~/.terminfo is wanted" >&5 -+echo "$as_me:7466: checking if ~/.terminfo is wanted" >&5 - echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6 - - # Check whether --enable-home-terminfo or --disable-home-terminfo was given. -@@ -7467,14 +7473,14 @@ - else - with_home_terminfo=yes - fi; --echo "$as_me:7470: result: $with_home_terminfo" >&5 -+echo "$as_me:7476: result: $with_home_terminfo" >&5 - echo "${ECHO_T}$with_home_terminfo" >&6 - test "x$with_home_terminfo" = "xyes" && - cat >>confdefs.h <<\EOF - #define USE_HOME_TERMINFO 1 - EOF - --echo "$as_me:7477: checking if you want to use restricted environment when running as root" >&5 -+echo "$as_me:7483: checking if you want to use restricted environment when running as root" >&5 - echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6 - - # Check whether --enable-root-environ or --disable-root-environ was given. -@@ -7484,7 +7490,7 @@ - else - with_root_environ=yes - fi; --echo "$as_me:7487: result: $with_root_environ" >&5 -+echo "$as_me:7493: result: $with_root_environ" >&5 - echo "${ECHO_T}$with_root_environ" >&6 - test "x$with_root_environ" = xyes && - cat >>confdefs.h <<\EOF -@@ -7499,13 +7505,13 @@ - unlink - do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --echo "$as_me:7502: checking for $ac_func" >&5 -+echo "$as_me:7508: 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 7508 "configure" -+#line 7514 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -@@ -7536,16 +7542,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:7539: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:7545: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:7542: \$? = $ac_status" >&5 -+ echo "$as_me:7548: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:7545: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:7551: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:7548: \$? = $ac_status" >&5 -+ echo "$as_me:7554: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" - else -@@ -7555,7 +7561,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:7558: result: `eval echo '${'$as_ac_var'}'`" >&5 -+echo "$as_me:7564: 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 <&5 -+echo "$as_me:7581: 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 7581 "configure" -+#line 7587 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -@@ -7609,16 +7615,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:7612: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:7618: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:7615: \$? = $ac_status" >&5 -+ echo "$as_me:7621: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:7618: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:7624: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:7621: \$? = $ac_status" >&5 -+ echo "$as_me:7627: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" - else -@@ -7628,7 +7634,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:7631: result: `eval echo '${'$as_ac_var'}'`" >&5 -+echo "$as_me:7637: 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 <&5 -+ echo "$as_me:7648: checking if link/symlink functions work" >&5 - echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6 - if test "${cf_cv_link_funcs+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -7652,7 +7658,7 @@ - eval 'ac_cv_func_'$cf_func'=error' - else - cat >conftest.$ac_ext <<_ACEOF --#line 7655 "configure" -+#line 7661 "configure" - #include "confdefs.h" - - #include -@@ -7682,15 +7688,15 @@ - - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:7685: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:7691: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:7688: \$? = $ac_status" >&5 -+ echo "$as_me:7694: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:7690: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:7696: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:7693: \$? = $ac_status" >&5 -+ echo "$as_me:7699: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - cf_cv_link_funcs="$cf_cv_link_funcs $cf_func" -@@ -7708,7 +7714,7 @@ - test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no - - fi --echo "$as_me:7711: result: $cf_cv_link_funcs" >&5 -+echo "$as_me:7717: result: $cf_cv_link_funcs" >&5 - echo "${ECHO_T}$cf_cv_link_funcs" >&6 - test "$ac_cv_func_link" = yes && - cat >>confdefs.h <<\EOF -@@ -7728,7 +7734,7 @@ - # soft links (symbolic links) are useful for some systems where hard links do - # not work, or to make it simpler to copy terminfo trees around. - if test "x$ac_cv_func_symlink" = xyes ; then -- echo "$as_me:7731: checking if tic should use symbolic links" >&5 -+ echo "$as_me:7737: checking if tic should use symbolic links" >&5 - echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6 - - # Check whether --enable-symlinks or --disable-symlinks was given. -@@ -7738,21 +7744,21 @@ - else - with_symlinks=no - fi; -- echo "$as_me:7741: result: $with_symlinks" >&5 -+ echo "$as_me:7747: result: $with_symlinks" >&5 - echo "${ECHO_T}$with_symlinks" >&6 - fi - - # If we have hard links and did not choose to use soft links instead, there is - # no reason to make this choice optional - use the hard links. - if test "$with_symlinks" = no ; then -- echo "$as_me:7748: checking if tic should use hard links" >&5 -+ echo "$as_me:7754: checking if tic should use hard links" >&5 - echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6 - if test "x$ac_cv_func_link" = xyes ; then - with_links=yes - else - with_links=no - fi -- echo "$as_me:7755: result: $with_links" >&5 -+ echo "$as_me:7761: result: $with_links" >&5 - echo "${ECHO_T}$with_links" >&6 - fi - -@@ -7767,7 +7773,7 @@ - EOF - - ### use option --enable-broken-linker to force on use of broken-linker support --echo "$as_me:7770: checking if you want broken-linker support code" >&5 -+echo "$as_me:7776: checking if you want broken-linker support code" >&5 - echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6 - - # Check whether --enable-broken_linker or --disable-broken_linker was given. -@@ -7777,7 +7783,7 @@ - else - with_broken_linker=${BROKEN_LINKER:-no} - fi; --echo "$as_me:7780: result: $with_broken_linker" >&5 -+echo "$as_me:7786: result: $with_broken_linker" >&5 - echo "${ECHO_T}$with_broken_linker" >&6 - - BROKEN_LINKER=0 -@@ -7799,14 +7805,14 @@ - BROKEN_LINKER=1 - test -n "$verbose" && echo " cygwin linker is broken anyway" 1>&6 - --echo "${as_me:-configure}:7802: testing cygwin linker is broken anyway ..." 1>&5 -+echo "${as_me:-configure}:7808: testing cygwin linker is broken anyway ..." 1>&5 - - ;; - esac - fi - - ### use option --enable-bsdpad to have tputs process BSD-style prefix padding --echo "$as_me:7809: checking if tputs should process BSD-style prefix padding" >&5 -+echo "$as_me:7815: checking if tputs should process BSD-style prefix padding" >&5 - echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6 - - # Check whether --enable-bsdpad or --disable-bsdpad was given. -@@ -7816,7 +7822,7 @@ - else - with_bsdpad=no - fi; --echo "$as_me:7819: result: $with_bsdpad" >&5 -+echo "$as_me:7825: result: $with_bsdpad" >&5 - echo "${ECHO_T}$with_bsdpad" >&6 - test "x$with_bsdpad" = xyes && - cat >>confdefs.h <<\EOF -@@ -7873,14 +7879,14 @@ - ;; - (linux*|gnu*|mint*|k*bsd*-gnu) - --echo "$as_me:7876: checking if we must define _GNU_SOURCE" >&5 -+echo "$as_me:7882: 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 7883 "configure" -+#line 7889 "configure" - #include "confdefs.h" - #include - int -@@ -7895,16 +7901,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:7898: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:7904: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:7901: \$? = $ac_status" >&5 -+ echo "$as_me:7907: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:7904: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:7910: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:7907: \$? = $ac_status" >&5 -+ echo "$as_me:7913: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_gnu_source=no - else -@@ -7913,7 +7919,7 @@ - cf_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" - cat >conftest.$ac_ext <<_ACEOF --#line 7916 "configure" -+#line 7922 "configure" - #include "confdefs.h" - #include - int -@@ -7928,16 +7934,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:7931: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:7937: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:7934: \$? = $ac_status" >&5 -+ echo "$as_me:7940: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:7937: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:7943: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:7940: \$? = $ac_status" >&5 -+ echo "$as_me:7946: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_gnu_source=no - else -@@ -7952,7 +7958,7 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - - fi --echo "$as_me:7955: result: $cf_cv_gnu_source" >&5 -+echo "$as_me:7961: result: $cf_cv_gnu_source" >&5 - echo "${ECHO_T}$cf_cv_gnu_source" >&6 - test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" - -@@ -7977,16 +7983,16 @@ - sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` - --echo "$as_me:7980: checking if we should define _POSIX_C_SOURCE" >&5 -+echo "$as_me:7986: 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}:7986: testing if the symbol is already defined go no further ..." 1>&5 -+echo "${as_me:-configure}:7992: testing if the symbol is already defined go no further ..." 1>&5 - - cat >conftest.$ac_ext <<_ACEOF --#line 7989 "configure" -+#line 7995 "configure" - #include "confdefs.h" - #include - int -@@ -8001,16 +8007,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8004: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8010: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8007: \$? = $ac_status" >&5 -+ echo "$as_me:8013: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8010: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8016: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8013: \$? = $ac_status" >&5 -+ echo "$as_me:8019: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_posix_c_source=no - else -@@ -8031,7 +8037,7 @@ - esac - if test "$cf_want_posix_source" = yes ; then - cat >conftest.$ac_ext <<_ACEOF --#line 8034 "configure" -+#line 8040 "configure" - #include "confdefs.h" - #include - int -@@ -8046,16 +8052,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8049: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8055: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8052: \$? = $ac_status" >&5 -+ echo "$as_me:8058: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8055: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8061: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8058: \$? = $ac_status" >&5 -+ echo "$as_me:8064: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -8066,15 +8072,15 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - fi - --echo "${as_me:-configure}:8069: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 -+echo "${as_me:-configure}:8075: 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}:8074: testing if the second compile does not leave our definition intact error ..." 1>&5 -+echo "${as_me:-configure}:8080: testing if the second compile does not leave our definition intact error ..." 1>&5 - - cat >conftest.$ac_ext <<_ACEOF --#line 8077 "configure" -+#line 8083 "configure" - #include "confdefs.h" - #include - int -@@ -8089,16 +8095,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8092: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8098: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8095: \$? = $ac_status" >&5 -+ echo "$as_me:8101: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8098: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8104: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8101: \$? = $ac_status" >&5 -+ echo "$as_me:8107: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -8114,7 +8120,7 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - - fi --echo "$as_me:8117: result: $cf_cv_posix_c_source" >&5 -+echo "$as_me:8123: 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 -@@ -8232,14 +8238,14 @@ - ;; - (*) - --echo "$as_me:8235: checking if we should define _XOPEN_SOURCE" >&5 -+echo "$as_me:8241: 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 8242 "configure" -+#line 8248 "configure" - #include "confdefs.h" - - #include -@@ -8258,16 +8264,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8261: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8267: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8264: \$? = $ac_status" >&5 -+ echo "$as_me:8270: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8267: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8273: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8270: \$? = $ac_status" >&5 -+ echo "$as_me:8276: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_xopen_source=no - else -@@ -8276,7 +8282,7 @@ - cf_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" - cat >conftest.$ac_ext <<_ACEOF --#line 8279 "configure" -+#line 8285 "configure" - #include "confdefs.h" - - #include -@@ -8295,16 +8301,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8298: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8304: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8301: \$? = $ac_status" >&5 -+ echo "$as_me:8307: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8304: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8310: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8307: \$? = $ac_status" >&5 -+ echo "$as_me:8313: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_xopen_source=no - else -@@ -8319,7 +8325,7 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - - fi --echo "$as_me:8322: result: $cf_cv_xopen_source" >&5 -+echo "$as_me:8328: result: $cf_cv_xopen_source" >&5 - echo "${ECHO_T}$cf_cv_xopen_source" >&6 - - if test "$cf_cv_xopen_source" != no ; then -@@ -8427,16 +8433,16 @@ - sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` - --echo "$as_me:8430: checking if we should define _POSIX_C_SOURCE" >&5 -+echo "$as_me:8436: 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}:8436: testing if the symbol is already defined go no further ..." 1>&5 -+echo "${as_me:-configure}:8442: testing if the symbol is already defined go no further ..." 1>&5 - - cat >conftest.$ac_ext <<_ACEOF --#line 8439 "configure" -+#line 8445 "configure" - #include "confdefs.h" - #include - int -@@ -8451,16 +8457,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8454: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8460: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8457: \$? = $ac_status" >&5 -+ echo "$as_me:8463: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8460: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8466: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8463: \$? = $ac_status" >&5 -+ echo "$as_me:8469: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_posix_c_source=no - else -@@ -8481,7 +8487,7 @@ - esac - if test "$cf_want_posix_source" = yes ; then - cat >conftest.$ac_ext <<_ACEOF --#line 8484 "configure" -+#line 8490 "configure" - #include "confdefs.h" - #include - int -@@ -8496,16 +8502,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8499: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8505: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8502: \$? = $ac_status" >&5 -+ echo "$as_me:8508: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8505: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8511: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8508: \$? = $ac_status" >&5 -+ echo "$as_me:8514: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -8516,15 +8522,15 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - fi - --echo "${as_me:-configure}:8519: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 -+echo "${as_me:-configure}:8525: 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}:8524: testing if the second compile does not leave our definition intact error ..." 1>&5 -+echo "${as_me:-configure}:8530: testing if the second compile does not leave our definition intact error ..." 1>&5 - - cat >conftest.$ac_ext <<_ACEOF --#line 8527 "configure" -+#line 8533 "configure" - #include "confdefs.h" - #include - int -@@ -8539,16 +8545,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8542: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8548: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8545: \$? = $ac_status" >&5 -+ echo "$as_me:8551: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8548: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8554: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8551: \$? = $ac_status" >&5 -+ echo "$as_me:8557: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -8564,7 +8570,7 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - - fi --echo "$as_me:8567: result: $cf_cv_posix_c_source" >&5 -+echo "$as_me:8573: 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 -@@ -8722,7 +8728,7 @@ - if test -n "$cf_new_cflags" ; then - test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 - --echo "${as_me:-configure}:8725: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 -+echo "${as_me:-configure}:8731: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 - - CFLAGS="$CFLAGS $cf_new_cflags" - fi -@@ -8730,7 +8736,7 @@ - if test -n "$cf_new_cppflags" ; then - test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 - --echo "${as_me:-configure}:8733: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 -+echo "${as_me:-configure}:8739: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 - - CPPFLAGS="$CPPFLAGS $cf_new_cppflags" - fi -@@ -8738,7 +8744,7 @@ - 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}:8741: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 -+echo "${as_me:-configure}:8747: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 - - EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" - fi -@@ -8746,10 +8752,10 @@ - fi - - if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then -- echo "$as_me:8749: checking if _XOPEN_SOURCE really is set" >&5 -+ echo "$as_me:8755: 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 8752 "configure" -+#line 8758 "configure" - #include "confdefs.h" - #include - int -@@ -8764,16 +8770,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8767: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8773: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8770: \$? = $ac_status" >&5 -+ echo "$as_me:8776: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8773: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8779: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8776: \$? = $ac_status" >&5 -+ echo "$as_me:8782: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_XOPEN_SOURCE_set=yes - else -@@ -8782,12 +8788,12 @@ - cf_XOPEN_SOURCE_set=no - fi - rm -f conftest.$ac_objext conftest.$ac_ext -- echo "$as_me:8785: result: $cf_XOPEN_SOURCE_set" >&5 -+ echo "$as_me:8791: 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 8790 "configure" -+#line 8796 "configure" - #include "confdefs.h" - #include - int -@@ -8802,16 +8808,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8805: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8811: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8808: \$? = $ac_status" >&5 -+ echo "$as_me:8814: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8811: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8817: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8814: \$? = $ac_status" >&5 -+ echo "$as_me:8820: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_XOPEN_SOURCE_set_ok=yes - else -@@ -8822,19 +8828,19 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - if test $cf_XOPEN_SOURCE_set_ok = no - then -- { echo "$as_me:8825: WARNING: _XOPEN_SOURCE is lower than requested" >&5 -+ { echo "$as_me:8831: WARNING: _XOPEN_SOURCE is lower than requested" >&5 - echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} - fi - else - --echo "$as_me:8830: checking if we should define _XOPEN_SOURCE" >&5 -+echo "$as_me:8836: 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 8837 "configure" -+#line 8843 "configure" - #include "confdefs.h" - - #include -@@ -8853,16 +8859,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8856: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8862: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8859: \$? = $ac_status" >&5 -+ echo "$as_me:8865: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8862: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8868: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8865: \$? = $ac_status" >&5 -+ echo "$as_me:8871: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_xopen_source=no - else -@@ -8871,7 +8877,7 @@ - cf_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" - cat >conftest.$ac_ext <<_ACEOF --#line 8874 "configure" -+#line 8880 "configure" - #include "confdefs.h" - - #include -@@ -8890,16 +8896,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8893: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8899: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8896: \$? = $ac_status" >&5 -+ echo "$as_me:8902: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8899: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8905: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8902: \$? = $ac_status" >&5 -+ echo "$as_me:8908: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_xopen_source=no - else -@@ -8914,7 +8920,7 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - - fi --echo "$as_me:8917: result: $cf_cv_xopen_source" >&5 -+echo "$as_me:8923: result: $cf_cv_xopen_source" >&5 - echo "${ECHO_T}$cf_cv_xopen_source" >&6 - - if test "$cf_cv_xopen_source" != no ; then -@@ -9016,14 +9022,14 @@ - - # Work around breakage on OS X - --echo "$as_me:9019: checking if SIGWINCH is defined" >&5 -+echo "$as_me:9025: 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 9026 "configure" -+#line 9032 "configure" - #include "confdefs.h" - - #include -@@ -9038,23 +9044,23 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:9041: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:9047: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:9044: \$? = $ac_status" >&5 -+ echo "$as_me:9050: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:9047: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9053: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9050: \$? = $ac_status" >&5 -+ echo "$as_me:9056: \$? = $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 9057 "configure" -+#line 9063 "configure" - #include "confdefs.h" - - #undef _XOPEN_SOURCE -@@ -9072,16 +9078,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:9075: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:9081: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:9078: \$? = $ac_status" >&5 -+ echo "$as_me:9084: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:9081: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9087: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9084: \$? = $ac_status" >&5 -+ echo "$as_me:9090: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_define_sigwinch=maybe - else -@@ -9095,11 +9101,11 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - - fi --echo "$as_me:9098: result: $cf_cv_define_sigwinch" >&5 -+echo "$as_me:9104: 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:9102: checking for actual SIGWINCH definition" >&5 -+echo "$as_me:9108: 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 -@@ -9110,7 +9116,7 @@ - while test $cf_sigwinch != 1 - do - cat >conftest.$ac_ext <<_ACEOF --#line 9113 "configure" -+#line 9119 "configure" - #include "confdefs.h" - - #undef _XOPEN_SOURCE -@@ -9132,16 +9138,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:9135: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:9141: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:9138: \$? = $ac_status" >&5 -+ echo "$as_me:9144: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:9141: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9147: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9144: \$? = $ac_status" >&5 -+ echo "$as_me:9150: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_fixup_sigwinch=$cf_sigwinch - break -@@ -9155,7 +9161,7 @@ - done - - fi --echo "$as_me:9158: result: $cf_cv_fixup_sigwinch" >&5 -+echo "$as_me:9164: result: $cf_cv_fixup_sigwinch" >&5 - echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 - - if test "$cf_cv_fixup_sigwinch" != unknown ; then -@@ -9165,13 +9171,13 @@ - - # Checks for CODESET support. - --echo "$as_me:9168: checking for nl_langinfo and CODESET" >&5 -+echo "$as_me:9174: 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 9174 "configure" -+#line 9180 "configure" - #include "confdefs.h" - #include - int -@@ -9183,16 +9189,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:9186: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:9192: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:9189: \$? = $ac_status" >&5 -+ echo "$as_me:9195: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:9192: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9198: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9195: \$? = $ac_status" >&5 -+ echo "$as_me:9201: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - am_cv_langinfo_codeset=yes - else -@@ -9203,7 +9209,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - - fi --echo "$as_me:9206: result: $am_cv_langinfo_codeset" >&5 -+echo "$as_me:9212: result: $am_cv_langinfo_codeset" >&5 - echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 - if test $am_cv_langinfo_codeset = yes; then - -@@ -9217,7 +9223,7 @@ - NCURSES_OK_WCHAR_T= - NCURSES_OK_WINT_T= - --echo "$as_me:9220: checking if you want wide-character code" >&5 -+echo "$as_me:9226: checking if you want wide-character code" >&5 - echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6 - - # Check whether --enable-widec or --disable-widec was given. -@@ -9227,7 +9233,7 @@ - else - with_widec=no - fi; --echo "$as_me:9230: result: $with_widec" >&5 -+echo "$as_me:9236: result: $with_widec" >&5 - echo "${ECHO_T}$with_widec" >&6 - if test "x$with_widec" = xyes ; then - if test "x$disable_lib_suffixes" = xno ; then -@@ -9242,14 +9248,14 @@ - #define NCURSES_WIDECHAR 1 - EOF - --echo "$as_me:9245: checking if wchar.h can be used as is" >&5 -+echo "$as_me:9251: checking if wchar.h can be used as is" >&5 - echo $ECHO_N "checking if wchar.h can be used as is... $ECHO_C" >&6 - if test "${cf_cv_wchar_h_okay+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 9252 "configure" -+#line 9258 "configure" - #include "confdefs.h" - - #include -@@ -9266,16 +9272,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:9269: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:9275: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:9272: \$? = $ac_status" >&5 -+ echo "$as_me:9278: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:9275: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9281: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9278: \$? = $ac_status" >&5 -+ echo "$as_me:9284: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_wchar_h_okay=yes - else -@@ -9285,16 +9291,16 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:9288: result: $cf_cv_wchar_h_okay" >&5 -+echo "$as_me:9294: result: $cf_cv_wchar_h_okay" >&5 - echo "${ECHO_T}$cf_cv_wchar_h_okay" >&6 - - if test $cf_cv_wchar_h_okay = no - then - --echo "$as_me:9294: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 -+echo "$as_me:9300: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 - echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line 9297 "configure" -+#line 9303 "configure" - #include "confdefs.h" - #include - -@@ -9310,16 +9316,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:9313: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:9319: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:9316: \$? = $ac_status" >&5 -+ echo "$as_me:9322: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:9319: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9325: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9322: \$? = $ac_status" >&5 -+ echo "$as_me:9328: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_result=no - else -@@ -9328,16 +9334,16 @@ - cf_result=yes - fi - rm -f conftest.$ac_objext conftest.$ac_ext --echo "$as_me:9331: result: $cf_result" >&5 -+echo "$as_me:9337: result: $cf_result" >&5 - echo "${ECHO_T}$cf_result" >&6 - - if test "$cf_result" = yes ; then - CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" - elif test "x" != "x" ; then -- echo "$as_me:9337: checking checking for compatible value versus " >&5 -+ echo "$as_me:9343: checking checking for compatible value versus " >&5 - echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line 9340 "configure" -+#line 9346 "configure" - #include "confdefs.h" - #include - -@@ -9353,16 +9359,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:9356: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:9362: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:9359: \$? = $ac_status" >&5 -+ echo "$as_me:9365: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:9362: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9368: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9365: \$? = $ac_status" >&5 -+ echo "$as_me:9371: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_result=yes - else -@@ -9371,7 +9377,7 @@ - cf_result=no - fi - rm -f conftest.$ac_objext conftest.$ac_ext -- echo "$as_me:9374: result: $cf_result" >&5 -+ echo "$as_me:9380: result: $cf_result" >&5 - echo "${ECHO_T}$cf_result" >&6 - if test "$cf_result" = no ; then - # perhaps we can override it - try... -@@ -9387,13 +9393,13 @@ - for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs - do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --echo "$as_me:9390: checking for $ac_func" >&5 -+echo "$as_me:9396: 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 9396 "configure" -+#line 9402 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -@@ -9424,16 +9430,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:9427: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:9433: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:9430: \$? = $ac_status" >&5 -+ echo "$as_me:9436: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:9433: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9439: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9436: \$? = $ac_status" >&5 -+ echo "$as_me:9442: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" - else -@@ -9443,7 +9449,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:9446: result: `eval echo '${'$as_ac_var'}'`" >&5 -+echo "$as_me:9452: 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 <&5 -+echo "$as_me:9464: 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 -@@ -9463,7 +9469,7 @@ - - cf_save_LIBS="$LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 9466 "configure" -+#line 9472 "configure" - #include "confdefs.h" - - #include -@@ -9476,16 +9482,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:9479: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:9485: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:9482: \$? = $ac_status" >&5 -+ echo "$as_me:9488: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:9485: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9491: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9488: \$? = $ac_status" >&5 -+ echo "$as_me:9494: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_utf8_lib=yes - else -@@ -9497,12 +9503,12 @@ - cf_cv_header_path_utf8= - cf_cv_library_path_utf8= - --echo "${as_me:-configure}:9500: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 -+echo "${as_me:-configure}:9506: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 - - cf_save_LIBS="$LIBS" - - cat >conftest.$ac_ext <<_ACEOF --#line 9505 "configure" -+#line 9511 "configure" - #include "confdefs.h" - - #include -@@ -9515,16 +9521,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:9518: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:9524: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:9521: \$? = $ac_status" >&5 -+ echo "$as_me:9527: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:9524: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9530: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9527: \$? = $ac_status" >&5 -+ echo "$as_me:9533: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - cf_cv_find_linkage_utf8=yes -@@ -9538,7 +9544,7 @@ - LIBS="-lutf8 $cf_save_LIBS" - - cat >conftest.$ac_ext <<_ACEOF --#line 9541 "configure" -+#line 9547 "configure" - #include "confdefs.h" - - #include -@@ -9551,16 +9557,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:9554: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:9560: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:9557: \$? = $ac_status" >&5 -+ echo "$as_me:9563: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:9560: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9566: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9563: \$? = $ac_status" >&5 -+ echo "$as_me:9569: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - cf_cv_find_linkage_utf8=yes -@@ -9577,9 +9583,9 @@ - - test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 - --echo "${as_me:-configure}:9580: testing find linkage for utf8 library ..." 1>&5 -+echo "${as_me:-configure}:9586: testing find linkage for utf8 library ..." 1>&5 - --echo "${as_me:-configure}:9582: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 -+echo "${as_me:-configure}:9588: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 - - cf_save_CPPFLAGS="$CPPFLAGS" - cf_test_CPPFLAGS="$CPPFLAGS" -@@ -9670,11 +9676,11 @@ - 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}:9673: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 -+echo "${as_me:-configure}:9679: 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 9677 "configure" -+#line 9683 "configure" - #include "confdefs.h" - - #include -@@ -9687,21 +9693,21 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:9690: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:9696: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:9693: \$? = $ac_status" >&5 -+ echo "$as_me:9699: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:9696: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9702: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9699: \$? = $ac_status" >&5 -+ echo "$as_me:9705: \$? = $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}:9704: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 -+echo "${as_me:-configure}:9710: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 - - cf_cv_find_linkage_utf8=maybe - cf_test_CPPFLAGS="$CPPFLAGS" -@@ -9719,7 +9725,7 @@ - - if test "$cf_cv_find_linkage_utf8" = maybe ; then - --echo "${as_me:-configure}:9722: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 -+echo "${as_me:-configure}:9728: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 - - cf_save_LIBS="$LIBS" - cf_save_LDFLAGS="$LDFLAGS" -@@ -9794,13 +9800,13 @@ - 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}:9797: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 -+echo "${as_me:-configure}:9803: 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 9803 "configure" -+#line 9809 "configure" - #include "confdefs.h" - - #include -@@ -9813,21 +9819,21 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:9816: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:9822: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:9819: \$? = $ac_status" >&5 -+ echo "$as_me:9825: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:9822: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9828: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9825: \$? = $ac_status" >&5 -+ echo "$as_me:9831: \$? = $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}:9830: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 -+echo "${as_me:-configure}:9836: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 - - cf_cv_find_linkage_utf8=yes - cf_cv_library_file_utf8="-lutf8" -@@ -9869,7 +9875,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:9872: result: $cf_cv_utf8_lib" >&5 -+echo "$as_me:9878: 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 -@@ -9904,7 +9910,7 @@ - cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF --#line 9907 "configure" -+#line 9913 "configure" - #include "confdefs.h" - #include - int -@@ -9916,16 +9922,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:9919: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:9925: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:9922: \$? = $ac_status" >&5 -+ echo "$as_me:9928: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:9925: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9931: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9928: \$? = $ac_status" >&5 -+ echo "$as_me:9934: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -9942,7 +9948,7 @@ - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - --echo "${as_me:-configure}:9945: testing adding $cf_add_incdir to include-path ..." 1>&5 -+echo "${as_me:-configure}:9951: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - -@@ -9978,7 +9984,7 @@ - if test "$cf_have_libdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 - --echo "${as_me:-configure}:9981: testing adding $cf_add_libdir to library-path ..." 1>&5 -+echo "${as_me:-configure}:9987: testing adding $cf_add_libdir to library-path ..." 1>&5 - - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi -@@ -10010,14 +10016,14 @@ - fi - - # This is needed on Tru64 5.0 to declare mbstate_t --echo "$as_me:10013: checking if we must include wchar.h to declare mbstate_t" >&5 -+echo "$as_me:10019: 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_mbstate_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 10020 "configure" -+#line 10026 "configure" - #include "confdefs.h" - - #include -@@ -10035,23 +10041,23 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10038: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10044: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10041: \$? = $ac_status" >&5 -+ echo "$as_me:10047: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10044: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10050: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10047: \$? = $ac_status" >&5 -+ echo "$as_me:10053: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_mbstate_t=no - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF --#line 10054 "configure" -+#line 10060 "configure" - #include "confdefs.h" - - #include -@@ -10070,16 +10076,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10073: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10079: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10076: \$? = $ac_status" >&5 -+ echo "$as_me:10082: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10079: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10085: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10082: \$? = $ac_status" >&5 -+ echo "$as_me:10088: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_mbstate_t=yes - else -@@ -10091,7 +10097,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:10094: result: $cf_cv_mbstate_t" >&5 -+echo "$as_me:10100: result: $cf_cv_mbstate_t" >&5 - echo "${ECHO_T}$cf_cv_mbstate_t" >&6 - - if test "$cf_cv_mbstate_t" = yes ; then -@@ -10109,14 +10115,14 @@ - fi - - # This is needed on Tru64 5.0 to declare wchar_t --echo "$as_me:10112: checking if we must include wchar.h to declare wchar_t" >&5 -+echo "$as_me:10118: checking if we must include wchar.h to declare wchar_t" >&5 - echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6 - if test "${cf_cv_wchar_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 10119 "configure" -+#line 10125 "configure" - #include "confdefs.h" - - #include -@@ -10134,23 +10140,23 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10137: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10143: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10140: \$? = $ac_status" >&5 -+ echo "$as_me:10146: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10143: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10149: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10146: \$? = $ac_status" >&5 -+ echo "$as_me:10152: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_wchar_t=no - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF --#line 10153 "configure" -+#line 10159 "configure" - #include "confdefs.h" - - #include -@@ -10169,16 +10175,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10172: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10178: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10175: \$? = $ac_status" >&5 -+ echo "$as_me:10181: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10178: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10184: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10181: \$? = $ac_status" >&5 -+ echo "$as_me:10187: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_wchar_t=yes - else -@@ -10190,7 +10196,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:10193: result: $cf_cv_wchar_t" >&5 -+echo "$as_me:10199: result: $cf_cv_wchar_t" >&5 - echo "${ECHO_T}$cf_cv_wchar_t" >&6 - - if test "$cf_cv_wchar_t" = yes ; then -@@ -10213,14 +10219,14 @@ - fi - - # This is needed on Tru64 5.0 to declare wint_t --echo "$as_me:10216: checking if we must include wchar.h to declare wint_t" >&5 -+echo "$as_me:10222: checking if we must include wchar.h to declare wint_t" >&5 - echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6 - if test "${cf_cv_wint_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 10223 "configure" -+#line 10229 "configure" - #include "confdefs.h" - - #include -@@ -10238,23 +10244,23 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10241: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10247: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10244: \$? = $ac_status" >&5 -+ echo "$as_me:10250: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10247: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10253: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10250: \$? = $ac_status" >&5 -+ echo "$as_me:10256: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_wint_t=no - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF --#line 10257 "configure" -+#line 10263 "configure" - #include "confdefs.h" - - #include -@@ -10273,16 +10279,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10276: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10282: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10279: \$? = $ac_status" >&5 -+ echo "$as_me:10285: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10282: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10288: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10285: \$? = $ac_status" >&5 -+ echo "$as_me:10291: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_wint_t=yes - else -@@ -10294,7 +10300,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:10297: result: $cf_cv_wint_t" >&5 -+echo "$as_me:10303: result: $cf_cv_wint_t" >&5 - echo "${ECHO_T}$cf_cv_wint_t" >&6 - - if test "$cf_cv_wint_t" = yes ; then -@@ -10326,7 +10332,7 @@ - fi - - ### use option --disable-lp64 to allow long chtype --echo "$as_me:10329: checking whether to enable _LP64 definition in curses.h" >&5 -+echo "$as_me:10335: checking whether to enable _LP64 definition in curses.h" >&5 - echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6 - - # Check whether --enable-lp64 or --disable-lp64 was given. -@@ -10336,7 +10342,7 @@ - else - with_lp64=$cf_dft_with_lp64 - fi; --echo "$as_me:10339: result: $with_lp64" >&5 -+echo "$as_me:10345: result: $with_lp64" >&5 - echo "${ECHO_T}$with_lp64" >&6 - - if test "x$with_lp64" = xyes ; then -@@ -10352,7 +10358,7 @@ - fi; - if test "$enable_largefile" != no; then - -- echo "$as_me:10355: checking for special C compiler options needed for large files" >&5 -+ echo "$as_me:10361: 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 -@@ -10364,7 +10370,7 @@ - # 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 10367 "configure" -+#line 10373 "configure" - #include "confdefs.h" - #include - /* Check that off_t can represent 2**63 - 1 correctly. -@@ -10384,16 +10390,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10387: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10393: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10390: \$? = $ac_status" >&5 -+ echo "$as_me:10396: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10393: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10399: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10396: \$? = $ac_status" >&5 -+ echo "$as_me:10402: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break - else -@@ -10403,16 +10409,16 @@ - rm -f conftest.$ac_objext - CC="$CC -n32" - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10406: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10412: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10409: \$? = $ac_status" >&5 -+ echo "$as_me:10415: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10412: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10418: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10415: \$? = $ac_status" >&5 -+ echo "$as_me:10421: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sys_largefile_CC=' -n32'; break - else -@@ -10426,13 +10432,13 @@ - rm -f conftest.$ac_ext - fi - fi --echo "$as_me:10429: result: $ac_cv_sys_largefile_CC" >&5 -+echo "$as_me:10435: 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:10435: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -+ echo "$as_me:10441: 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 -@@ -10440,7 +10446,7 @@ - while :; do - ac_cv_sys_file_offset_bits=no - cat >conftest.$ac_ext <<_ACEOF --#line 10443 "configure" -+#line 10449 "configure" - #include "confdefs.h" - #include - /* Check that off_t can represent 2**63 - 1 correctly. -@@ -10460,16 +10466,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10463: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10469: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10466: \$? = $ac_status" >&5 -+ echo "$as_me:10472: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10469: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10475: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10472: \$? = $ac_status" >&5 -+ echo "$as_me:10478: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break - else -@@ -10478,7 +10484,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF --#line 10481 "configure" -+#line 10487 "configure" - #include "confdefs.h" - #define _FILE_OFFSET_BITS 64 - #include -@@ -10499,16 +10505,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10502: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10508: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10505: \$? = $ac_status" >&5 -+ echo "$as_me:10511: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10508: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10514: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10511: \$? = $ac_status" >&5 -+ echo "$as_me:10517: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sys_file_offset_bits=64; break - else -@@ -10519,7 +10525,7 @@ - break - done - fi --echo "$as_me:10522: result: $ac_cv_sys_file_offset_bits" >&5 -+echo "$as_me:10528: 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 - -@@ -10529,7 +10535,7 @@ - - fi - rm -rf conftest* -- echo "$as_me:10532: checking for _LARGE_FILES value needed for large files" >&5 -+ echo "$as_me:10538: 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 -@@ -10537,7 +10543,7 @@ - while :; do - ac_cv_sys_large_files=no - cat >conftest.$ac_ext <<_ACEOF --#line 10540 "configure" -+#line 10546 "configure" - #include "confdefs.h" - #include - /* Check that off_t can represent 2**63 - 1 correctly. -@@ -10557,16 +10563,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10560: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10566: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10563: \$? = $ac_status" >&5 -+ echo "$as_me:10569: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10566: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10572: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10569: \$? = $ac_status" >&5 -+ echo "$as_me:10575: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break - else -@@ -10575,7 +10581,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF --#line 10578 "configure" -+#line 10584 "configure" - #include "confdefs.h" - #define _LARGE_FILES 1 - #include -@@ -10596,16 +10602,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10599: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10605: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10602: \$? = $ac_status" >&5 -+ echo "$as_me:10608: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10605: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10611: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10608: \$? = $ac_status" >&5 -+ echo "$as_me:10614: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sys_large_files=1; break - else -@@ -10616,7 +10622,7 @@ - break - done - fi --echo "$as_me:10619: result: $ac_cv_sys_large_files" >&5 -+echo "$as_me:10625: 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 - -@@ -10629,7 +10635,7 @@ - fi - - if test "$enable_largefile" != no ; then -- echo "$as_me:10632: checking for _LARGEFILE_SOURCE value needed for large files" >&5 -+ echo "$as_me:10638: 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 -@@ -10637,7 +10643,7 @@ - while :; do - ac_cv_sys_largefile_source=no - cat >conftest.$ac_ext <<_ACEOF --#line 10640 "configure" -+#line 10646 "configure" - #include "confdefs.h" - #include - int -@@ -10649,16 +10655,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10652: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10658: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10655: \$? = $ac_status" >&5 -+ echo "$as_me:10661: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10658: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10664: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10661: \$? = $ac_status" >&5 -+ echo "$as_me:10667: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break - else -@@ -10667,7 +10673,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF --#line 10670 "configure" -+#line 10676 "configure" - #include "confdefs.h" - #define _LARGEFILE_SOURCE 1 - #include -@@ -10680,16 +10686,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10683: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10689: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10686: \$? = $ac_status" >&5 -+ echo "$as_me:10692: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10689: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10695: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10692: \$? = $ac_status" >&5 -+ echo "$as_me:10698: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sys_largefile_source=1; break - else -@@ -10700,7 +10706,7 @@ - break - done - fi --echo "$as_me:10703: result: $ac_cv_sys_largefile_source" >&5 -+echo "$as_me:10709: 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 - -@@ -10714,13 +10720,13 @@ - # 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:10717: checking for fseeko" >&5 -+echo "$as_me:10723: 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 10723 "configure" -+#line 10729 "configure" - #include "confdefs.h" - #include - int -@@ -10732,16 +10738,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:10735: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:10741: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:10738: \$? = $ac_status" >&5 -+ echo "$as_me:10744: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:10741: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10747: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10744: \$? = $ac_status" >&5 -+ echo "$as_me:10750: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_fseeko=yes - else -@@ -10751,7 +10757,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:10754: result: $ac_cv_func_fseeko" >&5 -+echo "$as_me:10760: result: $ac_cv_func_fseeko" >&5 - echo "${ECHO_T}$ac_cv_func_fseeko" >&6 - if test $ac_cv_func_fseeko = yes; then - -@@ -10772,14 +10778,14 @@ - 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:10775: checking whether to use struct dirent64" >&5 -+ echo "$as_me:10781: 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 10782 "configure" -+#line 10788 "configure" - #include "confdefs.h" - - #include -@@ -10800,16 +10806,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10803: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10809: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10806: \$? = $ac_status" >&5 -+ echo "$as_me:10812: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10809: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10815: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10812: \$? = $ac_status" >&5 -+ echo "$as_me:10818: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_struct_dirent64=yes - else -@@ -10820,7 +10826,7 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - - fi --echo "$as_me:10823: result: $cf_cv_struct_dirent64" >&5 -+echo "$as_me:10829: result: $cf_cv_struct_dirent64" >&5 - echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 - test "$cf_cv_struct_dirent64" = yes && - cat >>confdefs.h <<\EOF -@@ -10830,7 +10836,7 @@ - fi - - ### use option --disable-tparm-varargs to make tparm() conform to X/Open --echo "$as_me:10833: checking if you want tparm not to use X/Open fixed-parameter list" >&5 -+echo "$as_me:10839: checking if you want tparm not to use X/Open fixed-parameter list" >&5 - echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6 - - # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given. -@@ -10840,14 +10846,14 @@ - else - with_tparm_varargs=yes - fi; --echo "$as_me:10843: result: $with_tparm_varargs" >&5 -+echo "$as_me:10849: result: $with_tparm_varargs" >&5 - echo "${ECHO_T}$with_tparm_varargs" >&6 - NCURSES_TPARM_VARARGS=0 - test "x$with_tparm_varargs" = xyes && NCURSES_TPARM_VARARGS=1 - - ### use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw - if test "$with_ticlib" != no ; then --echo "$as_me:10850: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 -+echo "$as_me:10856: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 - echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6 - - # Check whether --enable-tic-depends or --disable-tic-depends was given. -@@ -10857,14 +10863,14 @@ - else - with_tic_depends=yes - fi; --echo "$as_me:10860: result: $with_tic_depends" >&5 -+echo "$as_me:10866: result: $with_tic_depends" >&5 - echo "${ECHO_T}$with_tic_depends" >&6 - else - with_tic_depends=no - fi - - ### use option --with-bool to override bool's type --echo "$as_me:10867: checking for type of bool" >&5 -+echo "$as_me:10873: checking for type of bool" >&5 - echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 - - # Check whether --with-bool or --without-bool was given. -@@ -10874,10 +10880,10 @@ - else - NCURSES_BOOL=auto - fi; --echo "$as_me:10877: result: $NCURSES_BOOL" >&5 -+echo "$as_me:10883: result: $NCURSES_BOOL" >&5 - echo "${ECHO_T}$NCURSES_BOOL" >&6 - --echo "$as_me:10880: checking for alternate terminal capabilities file" >&5 -+echo "$as_me:10886: checking for alternate terminal capabilities file" >&5 - echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6 - - # Check whether --with-caps or --without-caps was given. -@@ -10888,11 +10894,11 @@ - TERMINFO_CAPS=Caps - fi; - test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps --echo "$as_me:10891: result: $TERMINFO_CAPS" >&5 -+echo "$as_me:10897: result: $TERMINFO_CAPS" >&5 - echo "${ECHO_T}$TERMINFO_CAPS" >&6 - - ### use option --with-chtype to override chtype's type --echo "$as_me:10895: checking for type of chtype" >&5 -+echo "$as_me:10901: checking for type of chtype" >&5 - echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 - - # Check whether --with-chtype or --without-chtype was given. -@@ -10902,11 +10908,11 @@ - else - NCURSES_CHTYPE=$cf_dft_chtype - fi; --echo "$as_me:10905: result: $NCURSES_CHTYPE" >&5 -+echo "$as_me:10911: result: $NCURSES_CHTYPE" >&5 - echo "${ECHO_T}$NCURSES_CHTYPE" >&6 - - ### use option --with-ospeed to override ospeed's type --echo "$as_me:10909: checking for type of ospeed" >&5 -+echo "$as_me:10915: checking for type of ospeed" >&5 - echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6 - - # Check whether --with-ospeed or --without-ospeed was given. -@@ -10916,11 +10922,11 @@ - else - NCURSES_OSPEED=short - fi; --echo "$as_me:10919: result: $NCURSES_OSPEED" >&5 -+echo "$as_me:10925: result: $NCURSES_OSPEED" >&5 - echo "${ECHO_T}$NCURSES_OSPEED" >&6 - - ### use option --with-mmask-t to override mmask_t's type --echo "$as_me:10923: checking for type of mmask_t" >&5 -+echo "$as_me:10929: checking for type of mmask_t" >&5 - echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6 - - # Check whether --with-mmask-t or --without-mmask-t was given. -@@ -10930,11 +10936,11 @@ - else - NCURSES_MMASK_T=$cf_dft_mmask_t - fi; --echo "$as_me:10933: result: $NCURSES_MMASK_T" >&5 -+echo "$as_me:10939: result: $NCURSES_MMASK_T" >&5 - echo "${ECHO_T}$NCURSES_MMASK_T" >&6 - - ### use option --with-ccharw-max to override CCHARW_MAX size --echo "$as_me:10937: checking for size CCHARW_MAX" >&5 -+echo "$as_me:10943: checking for size CCHARW_MAX" >&5 - echo $ECHO_N "checking for size CCHARW_MAX... $ECHO_C" >&6 - - # Check whether --with-ccharw-max or --without-ccharw-max was given. -@@ -10944,11 +10950,11 @@ - else - NCURSES_CCHARW_MAX=5 - fi; --echo "$as_me:10947: result: $NCURSES_CCHARW_MAX" >&5 -+echo "$as_me:10953: result: $NCURSES_CCHARW_MAX" >&5 - echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6 - - ### use option --with-tparm-arg to override tparm's argument type --echo "$as_me:10951: checking for type of tparm args" >&5 -+echo "$as_me:10957: checking for type of tparm args" >&5 - echo $ECHO_N "checking for type of tparm args... $ECHO_C" >&6 - - # Check whether --with-tparm-arg or --without-tparm-arg was given. -@@ -10958,11 +10964,11 @@ - else - NCURSES_TPARM_ARG=$cf_dft_tparm_arg - fi; --echo "$as_me:10961: result: $NCURSES_TPARM_ARG" >&5 -+echo "$as_me:10967: result: $NCURSES_TPARM_ARG" >&5 - echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6 - - ### Enable compiling-in rcs id's --echo "$as_me:10965: checking if RCS identifiers should be compiled-in" >&5 -+echo "$as_me:10971: checking if RCS identifiers should be compiled-in" >&5 - echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6 - - # Check whether --with-rcs-ids or --without-rcs-ids was given. -@@ -10972,7 +10978,7 @@ - else - with_rcs_ids=no - fi; --echo "$as_me:10975: result: $with_rcs_ids" >&5 -+echo "$as_me:10981: result: $with_rcs_ids" >&5 - echo "${ECHO_T}$with_rcs_ids" >&6 - test "x$with_rcs_ids" = xyes && - cat >>confdefs.h <<\EOF -@@ -10981,7 +10987,7 @@ - - ############################################################################### - --echo "$as_me:10984: checking format of man-pages" >&5 -+echo "$as_me:10990: checking format of man-pages" >&5 - echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6 - - # Check whether --with-manpage-format or --without-manpage-format was given. -@@ -11070,14 +11076,14 @@ - ;; - esac - --echo "$as_me:11073: result: $MANPAGE_FORMAT" >&5 -+echo "$as_me:11079: result: $MANPAGE_FORMAT" >&5 - echo "${ECHO_T}$MANPAGE_FORMAT" >&6 - if test -n "$cf_unknown" ; then -- { echo "$as_me:11076: WARNING: Unexpected manpage-format $cf_unknown" >&5 -+ { echo "$as_me:11082: WARNING: Unexpected manpage-format $cf_unknown" >&5 - echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;} - fi - --echo "$as_me:11080: checking for manpage renaming" >&5 -+echo "$as_me:11086: checking for manpage renaming" >&5 - echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6 - - # Check whether --with-manpage-renames or --without-manpage-renames was given. -@@ -11105,7 +11111,7 @@ - if test -f $srcdir/man/$MANPAGE_RENAMES ; then - MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES - elif test ! -f $MANPAGE_RENAMES ; then -- { { echo "$as_me:11108: error: not a filename: $MANPAGE_RENAMES" >&5 -+ { { echo "$as_me:11114: error: not a filename: $MANPAGE_RENAMES" >&5 - echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;} - { (exit 1); exit 1; }; } - fi -@@ -11119,10 +11125,10 @@ - fi - fi - --echo "$as_me:11122: result: $MANPAGE_RENAMES" >&5 -+echo "$as_me:11128: result: $MANPAGE_RENAMES" >&5 - echo "${ECHO_T}$MANPAGE_RENAMES" >&6 - --echo "$as_me:11125: checking if manpage aliases will be installed" >&5 -+echo "$as_me:11131: checking if manpage aliases will be installed" >&5 - echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6 - - # Check whether --with-manpage-aliases or --without-manpage-aliases was given. -@@ -11133,7 +11139,7 @@ - MANPAGE_ALIASES=yes - fi; - --echo "$as_me:11136: result: $MANPAGE_ALIASES" >&5 -+echo "$as_me:11142: result: $MANPAGE_ALIASES" >&5 - echo "${ECHO_T}$MANPAGE_ALIASES" >&6 - - case "x$LN_S" in -@@ -11147,7 +11153,7 @@ - - MANPAGE_SYMLINKS=no - if test "$MANPAGE_ALIASES" = yes ; then --echo "$as_me:11150: checking if manpage symlinks should be used" >&5 -+echo "$as_me:11156: checking if manpage symlinks should be used" >&5 - echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6 - - # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given. -@@ -11160,17 +11166,17 @@ - - if test "$$cf_use_symlinks" = no; then - if test "$MANPAGE_SYMLINKS" = yes ; then -- { echo "$as_me:11163: WARNING: cannot make symlinks" >&5 -+ { echo "$as_me:11169: WARNING: cannot make symlinks" >&5 - echo "$as_me: WARNING: cannot make symlinks" >&2;} - MANPAGE_SYMLINKS=no - fi - fi - --echo "$as_me:11169: result: $MANPAGE_SYMLINKS" >&5 -+echo "$as_me:11175: result: $MANPAGE_SYMLINKS" >&5 - echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6 - fi - --echo "$as_me:11173: checking for manpage tbl" >&5 -+echo "$as_me:11179: checking for manpage tbl" >&5 - echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6 - - # Check whether --with-manpage-tbl or --without-manpage-tbl was given. -@@ -11181,7 +11187,7 @@ - MANPAGE_TBL=no - fi; - --echo "$as_me:11184: result: $MANPAGE_TBL" >&5 -+echo "$as_me:11190: result: $MANPAGE_TBL" >&5 - echo "${ECHO_T}$MANPAGE_TBL" >&6 - - if test "$prefix" = "NONE" ; then -@@ -11514,7 +11520,7 @@ - ############################################################################### - - ### Note that some functions (such as const) are normally disabled anyway. --echo "$as_me:11517: checking if you want to build with function extensions" >&5 -+echo "$as_me:11523: checking if you want to build with function extensions" >&5 - echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6 - - # Check whether --enable-ext-funcs or --disable-ext-funcs was given. -@@ -11524,7 +11530,7 @@ - else - with_ext_funcs=yes - fi; --echo "$as_me:11527: result: $with_ext_funcs" >&5 -+echo "$as_me:11533: result: $with_ext_funcs" >&5 - echo "${ECHO_T}$with_ext_funcs" >&6 - if test "x$with_ext_funcs" = xyes ; then - NCURSES_EXT_FUNCS=1 -@@ -11579,7 +11585,7 @@ - GENERATED_EXT_FUNCS= - fi - --echo "$as_me:11582: checking if you want to build with SCREEN extensions" >&5 -+echo "$as_me:11588: checking if you want to build with SCREEN extensions" >&5 - echo $ECHO_N "checking if you want to build with SCREEN extensions... $ECHO_C" >&6 - - # Check whether --enable-sp-funcs or --disable-sp-funcs was given. -@@ -11589,7 +11595,7 @@ - else - with_sp_funcs=$cf_dft_ext_spfuncs - fi; --echo "$as_me:11592: result: $with_sp_funcs" >&5 -+echo "$as_me:11598: result: $with_sp_funcs" >&5 - echo "${ECHO_T}$with_sp_funcs" >&6 - if test "x$with_sp_funcs" = xyes ; then - NCURSES_SP_FUNCS=1 -@@ -11604,7 +11610,7 @@ - GENERATED_SP_FUNCS= - fi - --echo "$as_me:11607: checking if you want to build with terminal-driver" >&5 -+echo "$as_me:11613: checking if you want to build with terminal-driver" >&5 - echo $ECHO_N "checking if you want to build with terminal-driver... $ECHO_C" >&6 - - # Check whether --enable-term-driver or --disable-term-driver was given. -@@ -11614,7 +11620,7 @@ - else - with_term_driver=no - fi; --echo "$as_me:11617: result: $with_term_driver" >&5 -+echo "$as_me:11623: result: $with_term_driver" >&5 - echo "${ECHO_T}$with_term_driver" >&6 - if test "x$with_term_driver" = xyes ; then - -@@ -11623,19 +11629,19 @@ - EOF - - if test "x$with_termlib" != xno ; then -- { { echo "$as_me:11626: error: The term-driver option conflicts with the termlib option" >&5 -+ { { echo "$as_me:11632: error: The term-driver option conflicts with the termlib option" >&5 - echo "$as_me: error: The term-driver option conflicts with the termlib option" >&2;} - { (exit 1); exit 1; }; } - fi - if test "x$with_sp_funcs" != xyes ; then -- { { echo "$as_me:11631: error: The term-driver option relies upon sp-funcs" >&5 -+ { { echo "$as_me:11637: error: The term-driver option relies upon sp-funcs" >&5 - echo "$as_me: error: The term-driver option relies upon sp-funcs" >&2;} - { (exit 1); exit 1; }; } - fi - fi - - ### use option --enable-const to turn on use of const beyond that in XSI. --echo "$as_me:11638: checking for extended use of const keyword" >&5 -+echo "$as_me:11644: checking for extended use of const keyword" >&5 - echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6 - - # Check whether --enable-const or --disable-const was given. -@@ -11645,7 +11651,7 @@ - else - with_ext_const=$cf_dft_ext_const - fi; --echo "$as_me:11648: result: $with_ext_const" >&5 -+echo "$as_me:11654: result: $with_ext_const" >&5 - echo "${ECHO_T}$with_ext_const" >&6 - NCURSES_CONST='/*nothing*/' - if test "x$with_ext_const" = xyes ; then -@@ -11653,7 +11659,7 @@ - fi - - ### use option --enable-ext-colors to turn on use of colors beyond 16. --echo "$as_me:11656: checking if you want to use extended colors" >&5 -+echo "$as_me:11662: checking if you want to use extended colors" >&5 - echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6 - - # Check whether --enable-ext-colors or --disable-ext-colors was given. -@@ -11663,12 +11669,12 @@ - else - with_ext_colors=$cf_dft_ext_colors - fi; --echo "$as_me:11666: result: $with_ext_colors" >&5 -+echo "$as_me:11672: result: $with_ext_colors" >&5 - echo "${ECHO_T}$with_ext_colors" >&6 - NCURSES_EXT_COLORS=0 - if test "x$with_ext_colors" = xyes ; then - if test "x$with_widec" != xyes ; then -- { echo "$as_me:11671: WARNING: This option applies only to wide-character library" >&5 -+ { echo "$as_me:11677: WARNING: This option applies only to wide-character library" >&5 - echo "$as_me: WARNING: This option applies only to wide-character library" >&2;} - else - # cannot be ABI 5 since it changes sizeof(cchar_t) -@@ -11678,7 +11684,7 @@ - (5.*) - cf_cv_rel_version=6.0 - cf_cv_abi_version=6 -- { echo "$as_me:11681: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 -+ { echo "$as_me:11687: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 - echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;} - ;; - esac -@@ -11694,7 +11700,7 @@ - fi - - ### use option --enable-ext-mouse to modify coding to support 5-button mice --echo "$as_me:11697: checking if you want to use extended mouse encoding" >&5 -+echo "$as_me:11703: checking if you want to use extended mouse encoding" >&5 - echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6 - - # Check whether --enable-ext-mouse or --disable-ext-mouse was given. -@@ -11704,7 +11710,7 @@ - else - with_ext_mouse=$cf_dft_ext_mouse - fi; --echo "$as_me:11707: result: $with_ext_mouse" >&5 -+echo "$as_me:11713: result: $with_ext_mouse" >&5 - echo "${ECHO_T}$with_ext_mouse" >&6 - NCURSES_MOUSE_VERSION=1 - if test "x$with_ext_mouse" = xyes ; then -@@ -11715,7 +11721,7 @@ - (5.*) - cf_cv_rel_version=6.0 - cf_cv_abi_version=6 -- { echo "$as_me:11718: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 -+ { echo "$as_me:11724: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 - echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;} - ;; - esac -@@ -11724,7 +11730,7 @@ - fi - - ### use option --enable-ext-putwin to turn on extended screendumps --echo "$as_me:11727: checking if you want to use extended putwin/screendump" >&5 -+echo "$as_me:11733: checking if you want to use extended putwin/screendump" >&5 - echo $ECHO_N "checking if you want to use extended putwin/screendump... $ECHO_C" >&6 - - # Check whether --enable-ext-putwin or --disable-ext-putwin was given. -@@ -11734,7 +11740,7 @@ - else - with_ext_putwin=$cf_dft_ext_putwin - fi; --echo "$as_me:11737: result: $with_ext_putwin" >&5 -+echo "$as_me:11743: result: $with_ext_putwin" >&5 - echo "${ECHO_T}$with_ext_putwin" >&6 - if test "x$with_ext_putwin" = xyes ; then - -@@ -11744,7 +11750,7 @@ - - fi - --echo "$as_me:11747: checking if you want \$NCURSES_NO_PADDING code" >&5 -+echo "$as_me:11753: checking if you want \$NCURSES_NO_PADDING code" >&5 - echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6 - - # Check whether --enable-no-padding or --disable-no-padding was given. -@@ -11754,20 +11760,20 @@ - else - with_no_padding=$with_ext_funcs - fi; --echo "$as_me:11757: result: $with_no_padding" >&5 -+echo "$as_me:11763: result: $with_no_padding" >&5 - echo "${ECHO_T}$with_no_padding" >&6 - test "x$with_no_padding" = xyes && - cat >>confdefs.h <<\EOF - #define NCURSES_NO_PADDING 1 - EOF - --echo "$as_me:11764: checking for ANSI C header files" >&5 -+echo "$as_me:11770: 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 11770 "configure" -+#line 11776 "configure" - #include "confdefs.h" - #include - #include -@@ -11775,13 +11781,13 @@ - #include - - _ACEOF --if { (eval echo "$as_me:11778: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:11784: \"$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:11784: \$? = $ac_status" >&5 -+ echo "$as_me:11790: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -11803,7 +11809,7 @@ - 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 11806 "configure" -+#line 11812 "configure" - #include "confdefs.h" - #include - -@@ -11821,7 +11827,7 @@ - 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 11824 "configure" -+#line 11830 "configure" - #include "confdefs.h" - #include - -@@ -11842,7 +11848,7 @@ - : - else - cat >conftest.$ac_ext <<_ACEOF --#line 11845 "configure" -+#line 11851 "configure" - #include "confdefs.h" - #include - #if ((' ' & 0x0FF) == 0x020) -@@ -11868,15 +11874,15 @@ - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:11871: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:11877: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:11874: \$? = $ac_status" >&5 -+ echo "$as_me:11880: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:11876: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:11882: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:11879: \$? = $ac_status" >&5 -+ echo "$as_me:11885: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -11889,7 +11895,7 @@ - fi - fi - fi --echo "$as_me:11892: result: $ac_cv_header_stdc" >&5 -+echo "$as_me:11898: result: $ac_cv_header_stdc" >&5 - echo "${ECHO_T}$ac_cv_header_stdc" >&6 - if test $ac_cv_header_stdc = yes; then - -@@ -11905,28 +11911,28 @@ - inttypes.h stdint.h unistd.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:11908: checking for $ac_header" >&5 -+echo "$as_me:11914: 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 11914 "configure" -+#line 11920 "configure" - #include "confdefs.h" - $ac_includes_default - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:11920: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:11926: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:11923: \$? = $ac_status" >&5 -+ echo "$as_me:11929: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:11926: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:11932: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:11929: \$? = $ac_status" >&5 -+ echo "$as_me:11935: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" - else -@@ -11936,7 +11942,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:11939: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "$as_me:11945: 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 <&5 -+echo "$as_me:11955: checking for signed char" >&5 - echo $ECHO_N "checking for signed char... $ECHO_C" >&6 - if test "${ac_cv_type_signed_char+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 11955 "configure" -+#line 11961 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -11967,16 +11973,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:11970: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:11976: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:11973: \$? = $ac_status" >&5 -+ echo "$as_me:11979: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:11976: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:11982: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:11979: \$? = $ac_status" >&5 -+ echo "$as_me:11985: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_signed_char=yes - else -@@ -11986,10 +11992,10 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:11989: result: $ac_cv_type_signed_char" >&5 -+echo "$as_me:11995: result: $ac_cv_type_signed_char" >&5 - echo "${ECHO_T}$ac_cv_type_signed_char" >&6 - --echo "$as_me:11992: checking size of signed char" >&5 -+echo "$as_me:11998: checking size of signed char" >&5 - echo $ECHO_N "checking size of signed char... $ECHO_C" >&6 - if test "${ac_cv_sizeof_signed_char+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -11998,7 +12004,7 @@ - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. - cat >conftest.$ac_ext <<_ACEOF --#line 12001 "configure" -+#line 12007 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -12010,21 +12016,21 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:12013: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:12019: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:12016: \$? = $ac_status" >&5 -+ echo "$as_me:12022: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:12019: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:12025: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:12022: \$? = $ac_status" >&5 -+ echo "$as_me:12028: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF --#line 12027 "configure" -+#line 12033 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -12036,16 +12042,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:12039: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:12045: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:12042: \$? = $ac_status" >&5 -+ echo "$as_me:12048: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:12045: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:12051: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:12048: \$? = $ac_status" >&5 -+ echo "$as_me:12054: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_hi=$ac_mid; break - else -@@ -12061,7 +12067,7 @@ - ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF --#line 12064 "configure" -+#line 12070 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -12073,16 +12079,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:12076: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:12082: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:12079: \$? = $ac_status" >&5 -+ echo "$as_me:12085: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:12082: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:12088: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:12085: \$? = $ac_status" >&5 -+ echo "$as_me:12091: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_lo=$ac_mid; break - else -@@ -12098,7 +12104,7 @@ - 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 12101 "configure" -+#line 12107 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -12110,16 +12116,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:12113: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:12119: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:12116: \$? = $ac_status" >&5 -+ echo "$as_me:12122: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:12119: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:12125: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:12122: \$? = $ac_status" >&5 -+ echo "$as_me:12128: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_hi=$ac_mid - else -@@ -12132,12 +12138,12 @@ - ac_cv_sizeof_signed_char=$ac_lo - else - if test "$cross_compiling" = yes; then -- { { echo "$as_me:12135: error: cannot run test program while cross compiling" >&5 -+ { { echo "$as_me:12141: 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 12140 "configure" -+#line 12146 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -12153,15 +12159,15 @@ - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:12156: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:12162: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:12159: \$? = $ac_status" >&5 -+ echo "$as_me:12165: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:12161: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:12167: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:12164: \$? = $ac_status" >&5 -+ echo "$as_me:12170: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_signed_char=`cat conftest.val` - else -@@ -12177,7 +12183,7 @@ - ac_cv_sizeof_signed_char=0 - fi - fi --echo "$as_me:12180: result: $ac_cv_sizeof_signed_char" >&5 -+echo "$as_me:12186: result: $ac_cv_sizeof_signed_char" >&5 - echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 - cat >>confdefs.h <&5 -+echo "$as_me:12197: checking if you want to use signed Boolean array in term.h" >&5 - echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6 - - # Check whether --enable-signed-char or --disable-signed-char was given. -@@ -12198,12 +12204,12 @@ - else - with_signed_char=no - fi; --echo "$as_me:12201: result: $with_signed_char" >&5 -+echo "$as_me:12207: result: $with_signed_char" >&5 - echo "${ECHO_T}$with_signed_char" >&6 - test "x$with_signed_char" != xyes && NCURSES_SBOOL="char" - - ### use option --enable-sigwinch to turn on use of SIGWINCH logic --echo "$as_me:12206: checking if you want SIGWINCH handler" >&5 -+echo "$as_me:12212: checking if you want SIGWINCH handler" >&5 - echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6 - - # Check whether --enable-sigwinch or --disable-sigwinch was given. -@@ -12213,7 +12219,7 @@ - else - with_sigwinch=$with_ext_funcs - fi; --echo "$as_me:12216: result: $with_sigwinch" >&5 -+echo "$as_me:12222: result: $with_sigwinch" >&5 - echo "${ECHO_T}$with_sigwinch" >&6 - test "x$with_sigwinch" = xyes && - cat >>confdefs.h <<\EOF -@@ -12221,7 +12227,7 @@ - EOF - - ### use option --enable-tcap-names to allow user to define new capabilities --echo "$as_me:12224: checking if you want user-definable terminal capabilities like termcap" >&5 -+echo "$as_me:12230: checking if you want user-definable terminal capabilities like termcap" >&5 - echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6 - - # Check whether --enable-tcap-names or --disable-tcap-names was given. -@@ -12231,7 +12237,7 @@ - else - with_tcap_names=$with_ext_funcs - fi; --echo "$as_me:12234: result: $with_tcap_names" >&5 -+echo "$as_me:12240: result: $with_tcap_names" >&5 - echo "${ECHO_T}$with_tcap_names" >&6 - NCURSES_XNAMES=0 - test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1 -@@ -12239,7 +12245,7 @@ - ############################################################################### - # These options are relatively safe to experiment with. - --echo "$as_me:12242: checking if you want all development code" >&5 -+echo "$as_me:12248: checking if you want all development code" >&5 - echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6 - - # Check whether --with-develop or --without-develop was given. -@@ -12249,11 +12255,11 @@ - else - with_develop=no - fi; --echo "$as_me:12252: result: $with_develop" >&5 -+echo "$as_me:12258: result: $with_develop" >&5 - echo "${ECHO_T}$with_develop" >&6 - - ### use option --enable-hard-tabs to turn on use of hard-tabs optimize --echo "$as_me:12256: checking if you want hard-tabs code" >&5 -+echo "$as_me:12262: checking if you want hard-tabs code" >&5 - echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6 - - # Check whether --enable-hard-tabs or --disable-hard-tabs was given. -@@ -12263,7 +12269,7 @@ - else - enable_hard_tabs=$with_develop - fi; --echo "$as_me:12266: result: $enable_hard_tabs" >&5 -+echo "$as_me:12272: result: $enable_hard_tabs" >&5 - echo "${ECHO_T}$enable_hard_tabs" >&6 - test "x$enable_hard_tabs" = xyes && - cat >>confdefs.h <<\EOF -@@ -12271,7 +12277,7 @@ - EOF - - ### use option --enable-xmc-glitch to turn on use of magic-cookie optimize --echo "$as_me:12274: checking if you want limited support for xmc" >&5 -+echo "$as_me:12280: checking if you want limited support for xmc" >&5 - echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6 - - # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given. -@@ -12281,7 +12287,7 @@ - else - enable_xmc_glitch=$with_develop - fi; --echo "$as_me:12284: result: $enable_xmc_glitch" >&5 -+echo "$as_me:12290: result: $enable_xmc_glitch" >&5 - echo "${ECHO_T}$enable_xmc_glitch" >&6 - test "x$enable_xmc_glitch" = xyes && - cat >>confdefs.h <<\EOF -@@ -12291,7 +12297,7 @@ - ############################################################################### - # These are just experimental, probably should not be in a package: - --echo "$as_me:12294: checking if you do not want to assume colors are white-on-black" >&5 -+echo "$as_me:12300: checking if you do not want to assume colors are white-on-black" >&5 - echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6 - - # Check whether --enable-assumed-color or --disable-assumed-color was given. -@@ -12301,7 +12307,7 @@ - else - with_assumed_color=yes - fi; --echo "$as_me:12304: result: $with_assumed_color" >&5 -+echo "$as_me:12310: result: $with_assumed_color" >&5 - echo "${ECHO_T}$with_assumed_color" >&6 - test "x$with_assumed_color" = xyes && - cat >>confdefs.h <<\EOF -@@ -12309,7 +12315,7 @@ - EOF - - ### use option --enable-hashmap to turn on use of hashmap scrolling logic --echo "$as_me:12312: checking if you want hashmap scrolling-optimization code" >&5 -+echo "$as_me:12318: checking if you want hashmap scrolling-optimization code" >&5 - echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6 - - # Check whether --enable-hashmap or --disable-hashmap was given. -@@ -12319,7 +12325,7 @@ - else - with_hashmap=yes - fi; --echo "$as_me:12322: result: $with_hashmap" >&5 -+echo "$as_me:12328: result: $with_hashmap" >&5 - echo "${ECHO_T}$with_hashmap" >&6 - test "x$with_hashmap" = xyes && - cat >>confdefs.h <<\EOF -@@ -12327,7 +12333,7 @@ - EOF - - ### use option --enable-colorfgbg to turn on use of $COLORFGBG environment --echo "$as_me:12330: checking if you want colorfgbg code" >&5 -+echo "$as_me:12336: checking if you want colorfgbg code" >&5 - echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6 - - # Check whether --enable-colorfgbg or --disable-colorfgbg was given. -@@ -12337,7 +12343,7 @@ - else - with_colorfgbg=no - fi; --echo "$as_me:12340: result: $with_colorfgbg" >&5 -+echo "$as_me:12346: result: $with_colorfgbg" >&5 - echo "${ECHO_T}$with_colorfgbg" >&6 - test "x$with_colorfgbg" = xyes && - cat >>confdefs.h <<\EOF -@@ -12345,7 +12351,7 @@ - EOF - - ### use option --enable-interop to turn on use of bindings used for interop --echo "$as_me:12348: checking if you want interop bindings" >&5 -+echo "$as_me:12354: checking if you want interop bindings" >&5 - echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6 - - # Check whether --enable-interop or --disable-interop was given. -@@ -12355,7 +12361,7 @@ - else - with_exp_interop=$cf_dft_interop - fi; --echo "$as_me:12358: result: $with_exp_interop" >&5 -+echo "$as_me:12364: result: $with_exp_interop" >&5 - echo "${ECHO_T}$with_exp_interop" >&6 - - NCURSES_INTEROP_FUNCS=0 -@@ -12364,7 +12370,7 @@ - # This is still experimental (20080329), but should ultimately be moved to - # the script-block --with-normal, etc. - --echo "$as_me:12367: checking if you want to link with the pthread library" >&5 -+echo "$as_me:12373: checking if you want to link with the pthread library" >&5 - echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6 - - # Check whether --with-pthread or --without-pthread was given. -@@ -12374,27 +12380,27 @@ - else - with_pthread=no - fi; --echo "$as_me:12377: result: $with_pthread" >&5 -+echo "$as_me:12383: result: $with_pthread" >&5 - echo "${ECHO_T}$with_pthread" >&6 - - if test "$with_pthread" != no ; then -- echo "$as_me:12381: checking for pthread.h" >&5 -+ echo "$as_me:12387: checking for pthread.h" >&5 - echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 - if test "${ac_cv_header_pthread_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 12387 "configure" -+#line 12393 "configure" - #include "confdefs.h" - #include - _ACEOF --if { (eval echo "$as_me:12391: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:12397: \"$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:12397: \$? = $ac_status" >&5 -+ echo "$as_me:12403: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -12413,7 +12419,7 @@ - fi - rm -f conftest.err conftest.$ac_ext - fi --echo "$as_me:12416: result: $ac_cv_header_pthread_h" >&5 -+echo "$as_me:12422: result: $ac_cv_header_pthread_h" >&5 - echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 - if test $ac_cv_header_pthread_h = yes; then - -@@ -12423,7 +12429,7 @@ - - for cf_lib_pthread in pthread c_r - do -- echo "$as_me:12426: checking if we can link with the $cf_lib_pthread library" >&5 -+ echo "$as_me:12432: checking if we can link with the $cf_lib_pthread library" >&5 - echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6 - cf_save_LIBS="$LIBS" - -@@ -12444,7 +12450,7 @@ - LIBS="$cf_add_libs" - - cat >conftest.$ac_ext <<_ACEOF --#line 12447 "configure" -+#line 12453 "configure" - #include "confdefs.h" - - #include -@@ -12461,16 +12467,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:12464: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:12470: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:12467: \$? = $ac_status" >&5 -+ echo "$as_me:12473: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:12470: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:12476: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:12473: \$? = $ac_status" >&5 -+ echo "$as_me:12479: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - with_pthread=yes - else -@@ -12480,7 +12486,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS="$cf_save_LIBS" -- echo "$as_me:12483: result: $with_pthread" >&5 -+ echo "$as_me:12489: result: $with_pthread" >&5 - echo "${ECHO_T}$with_pthread" >&6 - test "$with_pthread" = yes && break - done -@@ -12508,7 +12514,7 @@ - EOF - - else -- { { echo "$as_me:12511: error: Cannot link with pthread library" >&5 -+ { { echo "$as_me:12517: error: Cannot link with pthread library" >&5 - echo "$as_me: error: Cannot link with pthread library" >&2;} - { (exit 1); exit 1; }; } - fi -@@ -12518,13 +12524,13 @@ - fi - - if test "x$with_pthread" != xno; then -- echo "$as_me:12521: checking for pthread_kill" >&5 -+ echo "$as_me:12527: checking for pthread_kill" >&5 - echo $ECHO_N "checking for pthread_kill... $ECHO_C" >&6 - if test "${ac_cv_func_pthread_kill+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 12527 "configure" -+#line 12533 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char pthread_kill (); below. */ -@@ -12555,16 +12561,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:12558: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:12564: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:12561: \$? = $ac_status" >&5 -+ echo "$as_me:12567: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:12564: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:12570: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:12567: \$? = $ac_status" >&5 -+ echo "$as_me:12573: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_pthread_kill=yes - else -@@ -12574,11 +12580,11 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:12577: result: $ac_cv_func_pthread_kill" >&5 -+echo "$as_me:12583: result: $ac_cv_func_pthread_kill" >&5 - echo "${ECHO_T}$ac_cv_func_pthread_kill" >&6 - if test $ac_cv_func_pthread_kill = yes; then - -- echo "$as_me:12581: checking if you want to allow EINTR in wgetch with pthreads" >&5 -+ echo "$as_me:12587: checking if you want to allow EINTR in wgetch with pthreads" >&5 - echo $ECHO_N "checking if you want to allow EINTR in wgetch with pthreads... $ECHO_C" >&6 - - # Check whether --enable-pthreads-eintr or --disable-pthreads-eintr was given. -@@ -12588,7 +12594,7 @@ - else - use_pthreads_eintr=no - fi; -- echo "$as_me:12591: result: $use_pthreads_eintr" >&5 -+ echo "$as_me:12597: result: $use_pthreads_eintr" >&5 - echo "${ECHO_T}$use_pthreads_eintr" >&6 - if test "x$use_pthreads_eintr" = xyes ; then - -@@ -12599,7 +12605,7 @@ - fi - fi - -- echo "$as_me:12602: checking if you want to use weak-symbols for pthreads" >&5 -+ echo "$as_me:12608: checking if you want to use weak-symbols for pthreads" >&5 - echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6 - - # Check whether --enable-weak-symbols or --disable-weak-symbols was given. -@@ -12609,18 +12615,18 @@ - else - use_weak_symbols=no - fi; -- echo "$as_me:12612: result: $use_weak_symbols" >&5 -+ echo "$as_me:12618: result: $use_weak_symbols" >&5 - echo "${ECHO_T}$use_weak_symbols" >&6 - if test "x$use_weak_symbols" = xyes ; then - --echo "$as_me:12616: checking if $CC supports weak symbols" >&5 -+echo "$as_me:12622: checking if $CC supports weak symbols" >&5 - echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6 - if test "${cf_cv_weak_symbols+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 12623 "configure" -+#line 12629 "configure" - #include "confdefs.h" - - #include -@@ -12646,16 +12652,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:12649: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:12655: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:12652: \$? = $ac_status" >&5 -+ echo "$as_me:12658: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:12655: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:12661: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:12658: \$? = $ac_status" >&5 -+ echo "$as_me:12664: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_weak_symbols=yes - else -@@ -12666,7 +12672,7 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - - fi --echo "$as_me:12669: result: $cf_cv_weak_symbols" >&5 -+echo "$as_me:12675: result: $cf_cv_weak_symbols" >&5 - echo "${ECHO_T}$cf_cv_weak_symbols" >&6 - - else -@@ -12699,7 +12705,7 @@ - # opaque outside of that, so there is no --enable-opaque option. We can use - # this option without --with-pthreads, but this will be always set for - # pthreads. --echo "$as_me:12702: checking if you want reentrant code" >&5 -+echo "$as_me:12708: checking if you want reentrant code" >&5 - echo $ECHO_N "checking if you want reentrant code... $ECHO_C" >&6 - - # Check whether --enable-reentrant or --disable-reentrant was given. -@@ -12709,7 +12715,7 @@ - else - with_reentrant=no - fi; --echo "$as_me:12712: result: $with_reentrant" >&5 -+echo "$as_me:12718: result: $with_reentrant" >&5 - echo "${ECHO_T}$with_reentrant" >&6 - if test "x$with_reentrant" = xyes ; then - cf_cv_enable_reentrant=1 -@@ -12782,7 +12788,7 @@ - (5.*) - cf_cv_rel_version=6.0 - cf_cv_abi_version=6 -- { echo "$as_me:12785: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 -+ { echo "$as_me:12791: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 - echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;} - ;; - esac -@@ -12797,7 +12803,7 @@ - - ### Allow using a different wrap-prefix - if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then -- echo "$as_me:12800: checking for prefix used to wrap public variables" >&5 -+ echo "$as_me:12806: checking for prefix used to wrap public variables" >&5 - echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6 - - # Check whether --with-wrap-prefix or --without-wrap-prefix was given. -@@ -12807,7 +12813,7 @@ - else - NCURSES_WRAP_PREFIX=_nc_ - fi; -- echo "$as_me:12810: result: $NCURSES_WRAP_PREFIX" >&5 -+ echo "$as_me:12816: result: $NCURSES_WRAP_PREFIX" >&5 - echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 - else - NCURSES_WRAP_PREFIX=_nc_ -@@ -12817,7 +12823,7 @@ - #define NCURSES_WRAP_PREFIX "$NCURSES_WRAP_PREFIX" - EOF - --echo "$as_me:12820: checking if you want experimental safe-sprintf code" >&5 -+echo "$as_me:12826: checking if you want experimental safe-sprintf code" >&5 - echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6 - - # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given. -@@ -12827,7 +12833,7 @@ - else - with_safe_sprintf=no - fi; --echo "$as_me:12830: result: $with_safe_sprintf" >&5 -+echo "$as_me:12836: result: $with_safe_sprintf" >&5 - echo "${ECHO_T}$with_safe_sprintf" >&6 - test "x$with_safe_sprintf" = xyes && - cat >>confdefs.h <<\EOF -@@ -12837,7 +12843,7 @@ - ### use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic - # when hashmap is used scroll hints are useless - if test "$with_hashmap" = no ; then --echo "$as_me:12840: checking if you want to experiment without scrolling-hints code" >&5 -+echo "$as_me:12846: checking if you want to experiment without scrolling-hints code" >&5 - echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6 - - # Check whether --enable-scroll-hints or --disable-scroll-hints was given. -@@ -12847,7 +12853,7 @@ - else - with_scroll_hints=yes - fi; --echo "$as_me:12850: result: $with_scroll_hints" >&5 -+echo "$as_me:12856: result: $with_scroll_hints" >&5 - echo "${ECHO_T}$with_scroll_hints" >&6 - test "x$with_scroll_hints" = xyes && - cat >>confdefs.h <<\EOF -@@ -12856,7 +12862,7 @@ - - fi - --echo "$as_me:12859: checking if you want wgetch-events code" >&5 -+echo "$as_me:12865: checking if you want wgetch-events code" >&5 - echo $ECHO_N "checking if you want wgetch-events code... $ECHO_C" >&6 - - # Check whether --enable-wgetch-events or --disable-wgetch-events was given. -@@ -12866,7 +12872,7 @@ - else - with_wgetch_events=no - fi; --echo "$as_me:12869: result: $with_wgetch_events" >&5 -+echo "$as_me:12875: result: $with_wgetch_events" >&5 - echo "${ECHO_T}$with_wgetch_events" >&6 - test "x$with_wgetch_events" = xyes && - cat >>confdefs.h <<\EOF -@@ -12877,7 +12883,7 @@ - - ### use option --disable-echo to suppress full display compiling commands - --echo "$as_me:12880: checking if you want to see long compiling messages" >&5 -+echo "$as_me:12886: 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. -@@ -12911,7 +12917,7 @@ - ECHO_CC='' - - fi; --echo "$as_me:12914: result: $enableval" >&5 -+echo "$as_me:12920: result: $enableval" >&5 - echo "${ECHO_T}$enableval" >&6 - - if test "x$enable_echo" = xyes; then -@@ -12923,7 +12929,7 @@ - fi - - ### use option --enable-warnings to turn on all gcc warnings --echo "$as_me:12926: checking if you want to see compiler warnings" >&5 -+echo "$as_me:12932: checking if you want to see compiler warnings" >&5 - echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6 - - # Check whether --enable-warnings or --disable-warnings was given. -@@ -12931,7 +12937,7 @@ - enableval="$enable_warnings" - with_warnings=$enableval - fi; --echo "$as_me:12934: result: $with_warnings" >&5 -+echo "$as_me:12940: result: $with_warnings" >&5 - echo "${ECHO_T}$with_warnings" >&6 - - if test "x$with_warnings" = "xyes"; then -@@ -12943,12 +12949,12 @@ - if test "$GCC" = yes ; then - case $host_os in - (linux*|gnu*) -- echo "$as_me:12946: checking if this is really Intel C compiler" >&5 -+ echo "$as_me:12952: 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 12951 "configure" -+#line 12957 "configure" - #include "confdefs.h" - - int -@@ -12965,16 +12971,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:12968: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:12974: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:12971: \$? = $ac_status" >&5 -+ echo "$as_me:12977: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:12974: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:12980: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:12977: \$? = $ac_status" >&5 -+ echo "$as_me:12983: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - INTEL_COMPILER=yes - cf_save_CFLAGS="$cf_save_CFLAGS -we147" -@@ -12985,7 +12991,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - CFLAGS="$cf_save_CFLAGS" -- echo "$as_me:12988: result: $INTEL_COMPILER" >&5 -+ echo "$as_me:12994: result: $INTEL_COMPILER" >&5 - echo "${ECHO_T}$INTEL_COMPILER" >&6 - ;; - esac -@@ -12994,12 +13000,12 @@ - CLANG_COMPILER=no - - if test "$GCC" = yes ; then -- echo "$as_me:12997: checking if this is really Clang C compiler" >&5 -+ echo "$as_me:13003: 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 13002 "configure" -+#line 13008 "configure" - #include "confdefs.h" - - int -@@ -13016,16 +13022,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:13019: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:13025: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:13022: \$? = $ac_status" >&5 -+ echo "$as_me:13028: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:13025: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:13031: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:13028: \$? = $ac_status" >&5 -+ echo "$as_me:13034: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - CLANG_COMPILER=yes - cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" -@@ -13036,12 +13042,12 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - CFLAGS="$cf_save_CFLAGS" -- echo "$as_me:13039: result: $CLANG_COMPILER" >&5 -+ echo "$as_me:13045: result: $CLANG_COMPILER" >&5 - echo "${ECHO_T}$CLANG_COMPILER" >&6 - fi - - cat > conftest.$ac_ext <&5 -+ { echo "$as_me:13067: checking for $CC warning options..." >&5 - echo "$as_me: checking for $CC warning options..." >&6;} - cf_save_CFLAGS="$CFLAGS" - EXTRA_CFLAGS="-Wall" -@@ -13074,12 +13080,12 @@ - wd981 - do - CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" -- if { (eval echo "$as_me:13077: \"$ac_compile\"") >&5 -+ if { (eval echo "$as_me:13083: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:13080: \$? = $ac_status" >&5 -+ echo "$as_me:13086: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- test -n "$verbose" && echo "$as_me:13082: result: ... -$cf_opt" >&5 -+ test -n "$verbose" && echo "$as_me:13088: result: ... -$cf_opt" >&5 - echo "${ECHO_T}... -$cf_opt" >&6 - EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" - fi -@@ -13088,7 +13094,7 @@ - - elif test "$GCC" = yes - then -- { echo "$as_me:13091: checking for $CC warning options..." >&5 -+ { echo "$as_me:13097: checking for $CC warning options..." >&5 - echo "$as_me: checking for $CC warning options..." >&6;} - cf_save_CFLAGS="$CFLAGS" - EXTRA_CFLAGS= -@@ -13112,12 +13118,12 @@ - Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum - do - CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" -- if { (eval echo "$as_me:13115: \"$ac_compile\"") >&5 -+ if { (eval echo "$as_me:13121: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:13118: \$? = $ac_status" >&5 -+ echo "$as_me:13124: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- test -n "$verbose" && echo "$as_me:13120: result: ... -$cf_opt" >&5 -+ test -n "$verbose" && echo "$as_me:13126: result: ... -$cf_opt" >&5 - echo "${ECHO_T}... -$cf_opt" >&6 - case $cf_opt in - (Wcast-qual) -@@ -13128,7 +13134,7 @@ - ([34].*) - test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 - --echo "${as_me:-configure}:13131: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 -+echo "${as_me:-configure}:13137: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 - - continue;; - esac -@@ -13138,7 +13144,7 @@ - ([12].*) - test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 - --echo "${as_me:-configure}:13141: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 -+echo "${as_me:-configure}:13147: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 - - continue;; - esac -@@ -13158,12 +13164,12 @@ - if test "$GCC" = yes ; then - case $host_os in - (linux*|gnu*) -- echo "$as_me:13161: checking if this is really Intel C++ compiler" >&5 -+ echo "$as_me:13167: 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="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -no-gcc" - cat >conftest.$ac_ext <<_ACEOF --#line 13166 "configure" -+#line 13172 "configure" - #include "confdefs.h" - - int -@@ -13180,16 +13186,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:13183: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:13189: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:13186: \$? = $ac_status" >&5 -+ echo "$as_me:13192: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:13189: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:13195: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:13192: \$? = $ac_status" >&5 -+ echo "$as_me:13198: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - INTEL_CPLUSPLUS=yes - cf_save_CFLAGS="$cf_save_CFLAGS -we147" -@@ -13200,7 +13206,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - CXXFLAGS="$cf_save_CFLAGS" -- echo "$as_me:13203: result: $INTEL_CPLUSPLUS" >&5 -+ echo "$as_me:13209: result: $INTEL_CPLUSPLUS" >&5 - echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6 - ;; - esac -@@ -13209,12 +13215,12 @@ - CLANG_CPLUSPLUS=no - - if test "$GCC" = yes ; then -- echo "$as_me:13212: checking if this is really Clang C++ compiler" >&5 -+ echo "$as_me:13218: 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="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -Qunused-arguments" - cat >conftest.$ac_ext <<_ACEOF --#line 13217 "configure" -+#line 13223 "configure" - #include "confdefs.h" - - int -@@ -13231,16 +13237,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:13234: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:13240: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:13237: \$? = $ac_status" >&5 -+ echo "$as_me:13243: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:13240: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:13246: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:13243: \$? = $ac_status" >&5 -+ echo "$as_me:13249: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - CLANG_CPLUSPLUS=yes - cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" -@@ -13251,7 +13257,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - CXXFLAGS="$cf_save_CFLAGS" -- echo "$as_me:13254: result: $CLANG_CPLUSPLUS" >&5 -+ echo "$as_me:13260: result: $CLANG_CPLUSPLUS" >&5 - echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6 - fi - -@@ -13263,7 +13269,7 @@ - ac_main_return=return - - cat > conftest.$ac_ext <&5 -+ { echo "$as_me:13290: checking for $CC warning options..." >&5 - echo "$as_me: checking for $CC warning options..." >&6;} - cf_save_CXXFLAGS="$CXXFLAGS" - EXTRA_CXXFLAGS="-Wall" -@@ -13298,12 +13304,12 @@ - wd981 - do - CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt" -- if { (eval echo "$as_me:13301: \"$ac_compile\"") >&5 -+ if { (eval echo "$as_me:13307: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:13304: \$? = $ac_status" >&5 -+ echo "$as_me:13310: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- test -n "$verbose" && echo "$as_me:13306: result: ... -$cf_opt" >&5 -+ test -n "$verbose" && echo "$as_me:13312: result: ... -$cf_opt" >&5 - echo "${ECHO_T}... -$cf_opt" >&6 - EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" - fi -@@ -13312,7 +13318,7 @@ - - elif test "$GXX" = yes - then -- { echo "$as_me:13315: checking for $CXX warning options..." >&5 -+ { echo "$as_me:13321: checking for $CXX warning options..." >&5 - echo "$as_me: checking for $CXX warning options..." >&6;} - cf_save_CXXFLAGS="$CXXFLAGS" - EXTRA_CXXFLAGS="-W -Wall" -@@ -13342,16 +13348,16 @@ - Wundef $cf_gxx_extra_warnings Wno-unused - do - CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt" -- if { (eval echo "$as_me:13345: \"$ac_compile\"") >&5 -+ if { (eval echo "$as_me:13351: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:13348: \$? = $ac_status" >&5 -+ echo "$as_me:13354: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- test -n "$verbose" && echo "$as_me:13350: result: ... -$cf_opt" >&5 -+ test -n "$verbose" && echo "$as_me:13356: result: ... -$cf_opt" >&5 - echo "${ECHO_T}... -$cf_opt" >&6 - EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" - else -- test -n "$verbose" && echo "$as_me:13354: result: ... no -$cf_opt" >&5 -+ test -n "$verbose" && echo "$as_me:13360: result: ... no -$cf_opt" >&5 - echo "${ECHO_T}... no -$cf_opt" >&6 - fi - done -@@ -13387,10 +13393,10 @@ - EOF - if test "$GCC" = yes - then -- { echo "$as_me:13390: checking for $CC __attribute__ directives..." >&5 -+ { echo "$as_me:13396: checking for $CC __attribute__ directives..." >&5 - echo "$as_me: checking for $CC __attribute__ directives..." >&6;} - cat > conftest.$ac_ext <&5 -+ if { (eval echo "$as_me:13448: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:13445: \$? = $ac_status" >&5 -+ echo "$as_me:13451: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- test -n "$verbose" && echo "$as_me:13447: result: ... $cf_attribute" >&5 -+ test -n "$verbose" && echo "$as_me:13453: result: ... $cf_attribute" >&5 - echo "${ECHO_T}... $cf_attribute" >&6 - cat conftest.h >>confdefs.h - case $cf_attribute in -@@ -13503,7 +13509,7 @@ - rm -rf conftest* - fi - --echo "$as_me:13506: checking if you want to work around bogus compiler/loader warnings" >&5 -+echo "$as_me:13512: checking if you want to work around bogus compiler/loader warnings" >&5 - echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6 - - # Check whether --enable-string-hacks or --disable-string-hacks was given. -@@ -13513,7 +13519,7 @@ - else - with_string_hacks=no - fi; --echo "$as_me:13516: result: $with_string_hacks" >&5 -+echo "$as_me:13522: result: $with_string_hacks" >&5 - echo "${ECHO_T}$with_string_hacks" >&6 - - if test "x$with_string_hacks" = "xyes"; then -@@ -13522,19 +13528,19 @@ - #define USE_STRING_HACKS 1 - EOF - -- { echo "$as_me:13525: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 -+ { echo "$as_me:13531: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 - echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;} - - for ac_func in strlcat strlcpy snprintf - do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --echo "$as_me:13531: checking for $ac_func" >&5 -+echo "$as_me:13537: 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 13537 "configure" -+#line 13543 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -@@ -13565,16 +13571,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:13568: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:13574: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:13571: \$? = $ac_status" >&5 -+ echo "$as_me:13577: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:13574: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:13580: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:13577: \$? = $ac_status" >&5 -+ echo "$as_me:13583: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" - else -@@ -13584,7 +13590,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:13587: result: `eval echo '${'$as_ac_var'}'`" >&5 -+echo "$as_me:13593: 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 <&5 -+echo "$as_me:13606: checking if you want to enable runtime assertions" >&5 - echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6 - - # Check whether --enable-assertions or --disable-assertions was given. -@@ -13607,7 +13613,7 @@ - else - with_assertions=no - fi; --echo "$as_me:13610: result: $with_assertions" >&5 -+echo "$as_me:13616: result: $with_assertions" >&5 - echo "${ECHO_T}$with_assertions" >&6 - if test -n "$GCC" - then -@@ -13623,7 +13629,7 @@ - - ### use option --disable-leaks to suppress "permanent" leaks, for testing - --echo "$as_me:13626: checking if you want to use dmalloc for testing" >&5 -+echo "$as_me:13632: 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. -@@ -13640,7 +13646,7 @@ - else - with_dmalloc= - fi; --echo "$as_me:13643: result: ${with_dmalloc:-no}" >&5 -+echo "$as_me:13649: result: ${with_dmalloc:-no}" >&5 - echo "${ECHO_T}${with_dmalloc:-no}" >&6 - - case .$with_cflags in -@@ -13734,23 +13740,23 @@ - esac - - if test "$with_dmalloc" = yes ; then -- echo "$as_me:13737: checking for dmalloc.h" >&5 -+ echo "$as_me:13743: 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 13743 "configure" -+#line 13749 "configure" - #include "confdefs.h" - #include - _ACEOF --if { (eval echo "$as_me:13747: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:13753: \"$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:13753: \$? = $ac_status" >&5 -+ echo "$as_me:13759: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -13769,11 +13775,11 @@ - fi - rm -f conftest.err conftest.$ac_ext - fi --echo "$as_me:13772: result: $ac_cv_header_dmalloc_h" >&5 -+echo "$as_me:13778: 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:13776: checking for dmalloc_debug in -ldmalloc" >&5 -+echo "$as_me:13782: 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 -@@ -13781,7 +13787,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldmalloc $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 13784 "configure" -+#line 13790 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -13800,16 +13806,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:13803: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:13809: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:13806: \$? = $ac_status" >&5 -+ echo "$as_me:13812: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:13809: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:13815: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:13812: \$? = $ac_status" >&5 -+ echo "$as_me:13818: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dmalloc_dmalloc_debug=yes - else -@@ -13820,7 +13826,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:13823: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 -+echo "$as_me:13829: 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 <&5 -+echo "$as_me:13844: 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. -@@ -13852,7 +13858,7 @@ - else - with_dbmalloc= - fi; --echo "$as_me:13855: result: ${with_dbmalloc:-no}" >&5 -+echo "$as_me:13861: result: ${with_dbmalloc:-no}" >&5 - echo "${ECHO_T}${with_dbmalloc:-no}" >&6 - - case .$with_cflags in -@@ -13946,23 +13952,23 @@ - esac - - if test "$with_dbmalloc" = yes ; then -- echo "$as_me:13949: checking for dbmalloc.h" >&5 -+ echo "$as_me:13955: 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 13955 "configure" -+#line 13961 "configure" - #include "confdefs.h" - #include - _ACEOF --if { (eval echo "$as_me:13959: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:13965: \"$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:13965: \$? = $ac_status" >&5 -+ echo "$as_me:13971: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -13981,11 +13987,11 @@ - fi - rm -f conftest.err conftest.$ac_ext - fi --echo "$as_me:13984: result: $ac_cv_header_dbmalloc_h" >&5 -+echo "$as_me:13990: 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:13988: checking for debug_malloc in -ldbmalloc" >&5 -+echo "$as_me:13994: 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 -@@ -13993,7 +13999,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldbmalloc $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 13996 "configure" -+#line 14002 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -14012,16 +14018,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:14015: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:14021: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:14018: \$? = $ac_status" >&5 -+ echo "$as_me:14024: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:14021: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:14027: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:14024: \$? = $ac_status" >&5 -+ echo "$as_me:14030: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dbmalloc_debug_malloc=yes - else -@@ -14032,7 +14038,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:14035: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 -+echo "$as_me:14041: 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 <&5 -+echo "$as_me:14056: checking if you want to use valgrind for testing" >&5 - echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6 - - # Check whether --with-valgrind or --without-valgrind was given. -@@ -14064,7 +14070,7 @@ - else - with_valgrind= - fi; --echo "$as_me:14067: result: ${with_valgrind:-no}" >&5 -+echo "$as_me:14073: result: ${with_valgrind:-no}" >&5 - echo "${ECHO_T}${with_valgrind:-no}" >&6 - - case .$with_cflags in -@@ -14157,7 +14163,7 @@ - ;; - esac - --echo "$as_me:14160: checking if you want to perform memory-leak testing" >&5 -+echo "$as_me:14166: checking if you want to perform memory-leak testing" >&5 - echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6 - - # Check whether --enable-leaks or --disable-leaks was given. -@@ -14167,7 +14173,7 @@ - else - : ${with_no_leaks:=no} - fi; --echo "$as_me:14170: result: $with_no_leaks" >&5 -+echo "$as_me:14176: result: $with_no_leaks" >&5 - echo "${ECHO_T}$with_no_leaks" >&6 - - if test "$with_no_leaks" = yes ; then -@@ -14219,7 +14225,7 @@ - ;; - esac - --echo "$as_me:14222: checking whether to add trace feature to all models" >&5 -+echo "$as_me:14228: checking whether to add trace feature to all models" >&5 - echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6 - - # Check whether --with-trace or --without-trace was given. -@@ -14229,7 +14235,7 @@ - else - cf_with_trace=$cf_all_traces - fi; --echo "$as_me:14232: result: $cf_with_trace" >&5 -+echo "$as_me:14238: result: $cf_with_trace" >&5 - echo "${ECHO_T}$cf_with_trace" >&6 - - if test "x$cf_with_trace" = xyes ; then -@@ -14319,7 +14325,7 @@ - ADA_TRACE=FALSE - fi - --echo "$as_me:14322: checking if we want to use GNAT projects" >&5 -+echo "$as_me:14328: checking if we want to use GNAT projects" >&5 - echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6 - - # Check whether --enable-gnat-projects or --disable-gnat-projects was given. -@@ -14336,7 +14342,7 @@ - enable_gnat_projects=yes - - fi; --echo "$as_me:14339: result: $enable_gnat_projects" >&5 -+echo "$as_me:14345: result: $enable_gnat_projects" >&5 - echo "${ECHO_T}$enable_gnat_projects" >&6 - - ### Checks for libraries. -@@ -14346,13 +14352,13 @@ - LIBS=" -lpsapi $LIBS" - ;; - (*) --echo "$as_me:14349: checking for gettimeofday" >&5 -+echo "$as_me:14355: checking for gettimeofday" >&5 - echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 - if test "${ac_cv_func_gettimeofday+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 14355 "configure" -+#line 14361 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gettimeofday (); below. */ -@@ -14383,16 +14389,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:14386: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:14392: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:14389: \$? = $ac_status" >&5 -+ echo "$as_me:14395: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:14392: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:14398: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:14395: \$? = $ac_status" >&5 -+ echo "$as_me:14401: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_gettimeofday=yes - else -@@ -14402,7 +14408,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:14405: result: $ac_cv_func_gettimeofday" >&5 -+echo "$as_me:14411: result: $ac_cv_func_gettimeofday" >&5 - echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 - if test $ac_cv_func_gettimeofday = yes; then - -@@ -14412,7 +14418,7 @@ - - else - --echo "$as_me:14415: checking for gettimeofday in -lbsd" >&5 -+echo "$as_me:14421: checking for gettimeofday in -lbsd" >&5 - echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6 - if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -14420,7 +14426,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lbsd $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 14423 "configure" -+#line 14429 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -14439,16 +14445,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:14442: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:14448: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:14445: \$? = $ac_status" >&5 -+ echo "$as_me:14451: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:14448: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:14454: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:14451: \$? = $ac_status" >&5 -+ echo "$as_me:14457: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_bsd_gettimeofday=yes - else -@@ -14459,7 +14465,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:14462: result: $ac_cv_lib_bsd_gettimeofday" >&5 -+echo "$as_me:14468: result: $ac_cv_lib_bsd_gettimeofday" >&5 - echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6 - if test $ac_cv_lib_bsd_gettimeofday = yes; then - -@@ -14489,14 +14495,14 @@ - ;; - esac - --echo "$as_me:14492: checking if -lm needed for math functions" >&5 -+echo "$as_me:14498: 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 14499 "configure" -+#line 14505 "configure" - #include "confdefs.h" - - #include -@@ -14511,16 +14517,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:14514: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:14520: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:14517: \$? = $ac_status" >&5 -+ echo "$as_me:14523: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:14520: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:14526: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:14523: \$? = $ac_status" >&5 -+ echo "$as_me:14529: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_need_libm=no - else -@@ -14530,7 +14536,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:14533: result: $cf_cv_need_libm" >&5 -+echo "$as_me:14539: result: $cf_cv_need_libm" >&5 - echo "${ECHO_T}$cf_cv_need_libm" >&6 - if test "$cf_cv_need_libm" = yes - then -@@ -14538,13 +14544,13 @@ - fi - - ### Checks for header files. --echo "$as_me:14541: checking for ANSI C header files" >&5 -+echo "$as_me:14547: 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 14547 "configure" -+#line 14553 "configure" - #include "confdefs.h" - #include - #include -@@ -14552,13 +14558,13 @@ - #include - - _ACEOF --if { (eval echo "$as_me:14555: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:14561: \"$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:14561: \$? = $ac_status" >&5 -+ echo "$as_me:14567: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -14580,7 +14586,7 @@ - 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 14583 "configure" -+#line 14589 "configure" - #include "confdefs.h" - #include - -@@ -14598,7 +14604,7 @@ - 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 14601 "configure" -+#line 14607 "configure" - #include "confdefs.h" - #include - -@@ -14619,7 +14625,7 @@ - : - else - cat >conftest.$ac_ext <<_ACEOF --#line 14622 "configure" -+#line 14628 "configure" - #include "confdefs.h" - #include - #if ((' ' & 0x0FF) == 0x020) -@@ -14645,15 +14651,15 @@ - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:14648: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:14654: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:14651: \$? = $ac_status" >&5 -+ echo "$as_me:14657: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:14653: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:14659: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:14656: \$? = $ac_status" >&5 -+ echo "$as_me:14662: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -14666,7 +14672,7 @@ - fi - fi - fi --echo "$as_me:14669: result: $ac_cv_header_stdc" >&5 -+echo "$as_me:14675: result: $ac_cv_header_stdc" >&5 - echo "${ECHO_T}$ac_cv_header_stdc" >&6 - if test $ac_cv_header_stdc = yes; then - -@@ -14679,13 +14685,13 @@ - 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:14682: checking for $ac_hdr that defines DIR" >&5 -+echo "$as_me:14688: 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 14688 "configure" -+#line 14694 "configure" - #include "confdefs.h" - #include - #include <$ac_hdr> -@@ -14700,16 +14706,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:14703: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:14709: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:14706: \$? = $ac_status" >&5 -+ echo "$as_me:14712: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:14709: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:14715: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:14712: \$? = $ac_status" >&5 -+ echo "$as_me:14718: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" - else -@@ -14719,7 +14725,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:14722: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "$as_me:14728: 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 <&5 -+ echo "$as_me:14741: 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 -@@ -14740,7 +14746,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldir $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 14743 "configure" -+#line 14749 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -14759,16 +14765,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:14762: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:14768: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:14765: \$? = $ac_status" >&5 -+ echo "$as_me:14771: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:14768: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:14774: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:14771: \$? = $ac_status" >&5 -+ echo "$as_me:14777: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dir_opendir=yes - else -@@ -14779,14 +14785,14 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:14782: result: $ac_cv_lib_dir_opendir" >&5 -+echo "$as_me:14788: 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:14789: checking for opendir in -lx" >&5 -+ echo "$as_me:14795: 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 -@@ -14794,7 +14800,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lx $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 14797 "configure" -+#line 14803 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -14813,16 +14819,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:14816: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:14822: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:14819: \$? = $ac_status" >&5 -+ echo "$as_me:14825: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:14822: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:14828: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:14825: \$? = $ac_status" >&5 -+ echo "$as_me:14831: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_x_opendir=yes - else -@@ -14833,7 +14839,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:14836: result: $ac_cv_lib_x_opendir" >&5 -+echo "$as_me:14842: 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" -@@ -14841,13 +14847,13 @@ - - fi - --echo "$as_me:14844: checking whether time.h and sys/time.h may both be included" >&5 -+echo "$as_me:14850: 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 14850 "configure" -+#line 14856 "configure" - #include "confdefs.h" - #include - #include -@@ -14863,16 +14869,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:14866: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:14872: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:14869: \$? = $ac_status" >&5 -+ echo "$as_me:14875: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:14872: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:14878: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:14875: \$? = $ac_status" >&5 -+ echo "$as_me:14881: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_header_time=yes - else -@@ -14882,7 +14888,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:14885: result: $ac_cv_header_time" >&5 -+echo "$as_me:14891: result: $ac_cv_header_time" >&5 - echo "${ECHO_T}$ac_cv_header_time" >&6 - if test $ac_cv_header_time = yes; then - -@@ -14901,13 +14907,13 @@ - ;; - esac - --echo "$as_me:14904: checking for regcomp" >&5 -+echo "$as_me:14910: checking for regcomp" >&5 - echo $ECHO_N "checking for regcomp... $ECHO_C" >&6 - if test "${ac_cv_func_regcomp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 14910 "configure" -+#line 14916 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char regcomp (); below. */ -@@ -14938,16 +14944,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:14941: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:14947: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:14944: \$? = $ac_status" >&5 -+ echo "$as_me:14950: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:14947: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:14953: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:14950: \$? = $ac_status" >&5 -+ echo "$as_me:14956: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_regcomp=yes - else -@@ -14957,7 +14963,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:14960: result: $ac_cv_func_regcomp" >&5 -+echo "$as_me:14966: result: $ac_cv_func_regcomp" >&5 - echo "${ECHO_T}$ac_cv_func_regcomp" >&6 - if test $ac_cv_func_regcomp = yes; then - cf_regex_func=regcomp -@@ -14966,7 +14972,7 @@ - for cf_regex_lib in $cf_regex_libs - do - as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh` --echo "$as_me:14969: checking for regcomp in -l$cf_regex_lib" >&5 -+echo "$as_me:14975: checking for regcomp in -l$cf_regex_lib" >&5 - echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6 - if eval "test \"\${$as_ac_Lib+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -14974,7 +14980,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-l$cf_regex_lib $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 14977 "configure" -+#line 14983 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -14993,16 +14999,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:14996: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:15002: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:14999: \$? = $ac_status" >&5 -+ echo "$as_me:15005: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:15002: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15008: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15005: \$? = $ac_status" >&5 -+ echo "$as_me:15011: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Lib=yes" - else -@@ -15013,7 +15019,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:15016: result: `eval echo '${'$as_ac_Lib'}'`" >&5 -+echo "$as_me:15022: 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 - -@@ -15042,13 +15048,13 @@ - fi - - if test "$cf_regex_func" = no ; then -- echo "$as_me:15045: checking for compile" >&5 -+ echo "$as_me:15051: checking for compile" >&5 - echo $ECHO_N "checking for compile... $ECHO_C" >&6 - if test "${ac_cv_func_compile+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 15051 "configure" -+#line 15057 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char compile (); below. */ -@@ -15079,16 +15085,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:15082: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:15088: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:15085: \$? = $ac_status" >&5 -+ echo "$as_me:15091: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:15088: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15094: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15091: \$? = $ac_status" >&5 -+ echo "$as_me:15097: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_compile=yes - else -@@ -15098,13 +15104,13 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:15101: result: $ac_cv_func_compile" >&5 -+echo "$as_me:15107: result: $ac_cv_func_compile" >&5 - echo "${ECHO_T}$ac_cv_func_compile" >&6 - if test $ac_cv_func_compile = yes; then - cf_regex_func=compile - else - -- echo "$as_me:15107: checking for compile in -lgen" >&5 -+ echo "$as_me:15113: checking for compile in -lgen" >&5 - echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6 - if test "${ac_cv_lib_gen_compile+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -15112,7 +15118,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lgen $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 15115 "configure" -+#line 15121 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -15131,16 +15137,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:15134: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:15140: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:15137: \$? = $ac_status" >&5 -+ echo "$as_me:15143: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:15140: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15146: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15143: \$? = $ac_status" >&5 -+ echo "$as_me:15149: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_gen_compile=yes - else -@@ -15151,7 +15157,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:15154: result: $ac_cv_lib_gen_compile" >&5 -+echo "$as_me:15160: result: $ac_cv_lib_gen_compile" >&5 - echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6 - if test $ac_cv_lib_gen_compile = yes; then - -@@ -15179,11 +15185,11 @@ - fi - - if test "$cf_regex_func" = no ; then -- { echo "$as_me:15182: WARNING: cannot find regular expression library" >&5 -+ { echo "$as_me:15188: WARNING: cannot find regular expression library" >&5 - echo "$as_me: WARNING: cannot find regular expression library" >&2;} - fi - --echo "$as_me:15186: checking for regular-expression headers" >&5 -+echo "$as_me:15192: checking for regular-expression headers" >&5 - echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6 - if test "${cf_cv_regex_hdrs+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -15195,7 +15201,7 @@ - for cf_regex_hdr in regexp.h regexpr.h - do - cat >conftest.$ac_ext <<_ACEOF --#line 15198 "configure" -+#line 15204 "configure" - #include "confdefs.h" - #include <$cf_regex_hdr> - int -@@ -15210,16 +15216,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:15213: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:15219: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:15216: \$? = $ac_status" >&5 -+ echo "$as_me:15222: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:15219: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15225: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15222: \$? = $ac_status" >&5 -+ echo "$as_me:15228: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - cf_cv_regex_hdrs=$cf_regex_hdr -@@ -15236,7 +15242,7 @@ - for cf_regex_hdr in regex.h - do - cat >conftest.$ac_ext <<_ACEOF --#line 15239 "configure" -+#line 15245 "configure" - #include "confdefs.h" - #include - #include <$cf_regex_hdr> -@@ -15254,16 +15260,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:15257: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:15263: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:15260: \$? = $ac_status" >&5 -+ echo "$as_me:15266: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:15263: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15269: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15266: \$? = $ac_status" >&5 -+ echo "$as_me:15272: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - cf_cv_regex_hdrs=$cf_regex_hdr -@@ -15279,11 +15285,11 @@ - esac - - fi --echo "$as_me:15282: result: $cf_cv_regex_hdrs" >&5 -+echo "$as_me:15288: result: $cf_cv_regex_hdrs" >&5 - echo "${ECHO_T}$cf_cv_regex_hdrs" >&6 - - case $cf_cv_regex_hdrs in -- (no) { echo "$as_me:15286: WARNING: no regular expression header found" >&5 -+ (no) { echo "$as_me:15292: WARNING: no regular expression header found" >&5 - echo "$as_me: WARNING: no regular expression header found" >&2;} ;; - (regex.h) - cat >>confdefs.h <<\EOF -@@ -15322,23 +15328,23 @@ - - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:15325: checking for $ac_header" >&5 -+echo "$as_me:15331: 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 15331 "configure" -+#line 15337 "configure" - #include "confdefs.h" - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:15335: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:15341: \"$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:15341: \$? = $ac_status" >&5 -+ echo "$as_me:15347: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -15357,7 +15363,7 @@ - fi - rm -f conftest.err conftest.$ac_ext - fi --echo "$as_me:15360: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "$as_me:15366: 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 <&5 -+echo "$as_me:15379: 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 15379 "configure" -+#line 15385 "configure" - #include "confdefs.h" - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:15383: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:15389: \"$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:15389: \$? = $ac_status" >&5 -+ echo "$as_me:15395: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -15405,7 +15411,7 @@ - fi - rm -f conftest.err conftest.$ac_ext - fi --echo "$as_me:15408: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "$as_me:15414: 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 <&5 -+echo "$as_me:15424: checking for header declaring getopt variables" >&5 - echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6 - if test "${cf_cv_getopt_header+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -15425,7 +15431,7 @@ - for cf_header in stdio.h stdlib.h unistd.h getopt.h - do - cat >conftest.$ac_ext <<_ACEOF --#line 15428 "configure" -+#line 15434 "configure" - #include "confdefs.h" - - #include <$cf_header> -@@ -15438,16 +15444,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:15441: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:15447: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:15444: \$? = $ac_status" >&5 -+ echo "$as_me:15450: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:15447: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15453: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15450: \$? = $ac_status" >&5 -+ echo "$as_me:15456: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_getopt_header=$cf_header - break -@@ -15459,7 +15465,7 @@ - done - - fi --echo "$as_me:15462: result: $cf_cv_getopt_header" >&5 -+echo "$as_me:15468: result: $cf_cv_getopt_header" >&5 - echo "${ECHO_T}$cf_cv_getopt_header" >&6 - if test $cf_cv_getopt_header != none ; then - -@@ -15480,7 +15486,7 @@ - # Note: even non-Posix ISC needs to declare fd_set - if test "x$ISC" = xyes ; then - --echo "$as_me:15483: checking for main in -lcposix" >&5 -+echo "$as_me:15489: checking for main in -lcposix" >&5 - echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6 - if test "${ac_cv_lib_cposix_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -15488,7 +15494,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lcposix $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 15491 "configure" -+#line 15497 "configure" - #include "confdefs.h" - - int -@@ -15500,16 +15506,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:15503: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:15509: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:15506: \$? = $ac_status" >&5 -+ echo "$as_me:15512: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:15509: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15515: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15512: \$? = $ac_status" >&5 -+ echo "$as_me:15518: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_cposix_main=yes - else -@@ -15520,7 +15526,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:15523: result: $ac_cv_lib_cposix_main" >&5 -+echo "$as_me:15529: result: $ac_cv_lib_cposix_main" >&5 - echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6 - if test $ac_cv_lib_cposix_main = yes; then - cat >>confdefs.h <&5 -+ echo "$as_me:15540: checking for bzero in -linet" >&5 - echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6 - if test "${ac_cv_lib_inet_bzero+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -15539,7 +15545,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-linet $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 15542 "configure" -+#line 15548 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -15558,16 +15564,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:15561: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:15567: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:15564: \$? = $ac_status" >&5 -+ echo "$as_me:15570: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:15567: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15573: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15570: \$? = $ac_status" >&5 -+ echo "$as_me:15576: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_inet_bzero=yes - else -@@ -15578,7 +15584,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:15581: result: $ac_cv_lib_inet_bzero" >&5 -+echo "$as_me:15587: result: $ac_cv_lib_inet_bzero" >&5 - echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6 - if test $ac_cv_lib_inet_bzero = yes; then - -@@ -15601,14 +15607,14 @@ - fi - fi - --echo "$as_me:15604: checking if sys/time.h works with sys/select.h" >&5 -+echo "$as_me:15610: checking if sys/time.h works with sys/select.h" >&5 - echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6 - if test "${cf_cv_sys_time_select+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 15611 "configure" -+#line 15617 "configure" - #include "confdefs.h" - - #include -@@ -15628,16 +15634,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:15631: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:15637: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:15634: \$? = $ac_status" >&5 -+ echo "$as_me:15640: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:15637: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15643: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15640: \$? = $ac_status" >&5 -+ echo "$as_me:15646: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_sys_time_select=yes - else -@@ -15649,7 +15655,7 @@ - - fi - --echo "$as_me:15652: result: $cf_cv_sys_time_select" >&5 -+echo "$as_me:15658: result: $cf_cv_sys_time_select" >&5 - echo "${ECHO_T}$cf_cv_sys_time_select" >&6 - test "$cf_cv_sys_time_select" = yes && - cat >>confdefs.h <<\EOF -@@ -15664,13 +15670,13 @@ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - ac_main_return=return - --echo "$as_me:15667: checking for an ANSI C-conforming const" >&5 -+echo "$as_me:15673: checking for an ANSI C-conforming const" >&5 - echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 - if test "${ac_cv_c_const+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 15673 "configure" -+#line 15679 "configure" - #include "confdefs.h" - - int -@@ -15728,16 +15734,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:15731: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:15737: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:15734: \$? = $ac_status" >&5 -+ echo "$as_me:15740: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:15737: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15743: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15740: \$? = $ac_status" >&5 -+ echo "$as_me:15746: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_const=yes - else -@@ -15747,7 +15753,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:15750: result: $ac_cv_c_const" >&5 -+echo "$as_me:15756: result: $ac_cv_c_const" >&5 - echo "${ECHO_T}$ac_cv_c_const" >&6 - if test $ac_cv_c_const = no; then - -@@ -15757,7 +15763,7 @@ - - fi - --echo "$as_me:15760: checking for inline" >&5 -+echo "$as_me:15766: 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 -@@ -15765,7 +15771,7 @@ - ac_cv_c_inline=no - for ac_kw in inline __inline__ __inline; do - cat >conftest.$ac_ext <<_ACEOF --#line 15768 "configure" -+#line 15774 "configure" - #include "confdefs.h" - #ifndef __cplusplus - static $ac_kw int static_foo () {return 0; } -@@ -15774,16 +15780,16 @@ - - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:15777: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:15783: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:15780: \$? = $ac_status" >&5 -+ echo "$as_me:15786: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:15783: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15789: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15786: \$? = $ac_status" >&5 -+ echo "$as_me:15792: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_inline=$ac_kw; break - else -@@ -15794,7 +15800,7 @@ - done - - fi --echo "$as_me:15797: result: $ac_cv_c_inline" >&5 -+echo "$as_me:15803: result: $ac_cv_c_inline" >&5 - echo "${ECHO_T}$ac_cv_c_inline" >&6 - case $ac_cv_c_inline in - inline | yes) ;; -@@ -15820,7 +15826,7 @@ - : - elif test "$GCC" = yes - then -- echo "$as_me:15823: checking if $CC supports options to tune inlining" >&5 -+ echo "$as_me:15829: checking if $CC supports options to tune inlining" >&5 - echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6 - if test "${cf_cv_gcc_inline+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -15829,7 +15835,7 @@ - cf_save_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS --param max-inline-insns-single=1200" - cat >conftest.$ac_ext <<_ACEOF --#line 15832 "configure" -+#line 15838 "configure" - #include "confdefs.h" - inline int foo(void) { return 1; } - int -@@ -15841,16 +15847,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:15844: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:15850: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:15847: \$? = $ac_status" >&5 -+ echo "$as_me:15853: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:15850: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15856: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15853: \$? = $ac_status" >&5 -+ echo "$as_me:15859: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_gcc_inline=yes - else -@@ -15862,7 +15868,7 @@ - CFLAGS=$cf_save_CFLAGS - - fi --echo "$as_me:15865: result: $cf_cv_gcc_inline" >&5 -+echo "$as_me:15871: result: $cf_cv_gcc_inline" >&5 - echo "${ECHO_T}$cf_cv_gcc_inline" >&6 - if test "$cf_cv_gcc_inline" = yes ; then - -@@ -15948,7 +15954,7 @@ - fi - fi - --echo "$as_me:15951: checking for signal global datatype" >&5 -+echo "$as_me:15957: checking for signal global datatype" >&5 - echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6 - if test "${cf_cv_sig_atomic_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -15960,7 +15966,7 @@ - "int" - do - cat >conftest.$ac_ext <<_ACEOF --#line 15963 "configure" -+#line 15969 "configure" - #include "confdefs.h" - - #include -@@ -15983,16 +15989,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:15986: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:15992: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:15989: \$? = $ac_status" >&5 -+ echo "$as_me:15995: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:15992: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15998: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15995: \$? = $ac_status" >&5 -+ echo "$as_me:16001: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_sig_atomic_t=$cf_type - else -@@ -16006,7 +16012,7 @@ - - fi - --echo "$as_me:16009: result: $cf_cv_sig_atomic_t" >&5 -+echo "$as_me:16015: result: $cf_cv_sig_atomic_t" >&5 - echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6 - test "$cf_cv_sig_atomic_t" != no && - cat >>confdefs.h <&5 -+echo "$as_me:16024: checking for type of chtype" >&5 - echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 - if test "${cf_cv_typeof_chtype+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -16025,7 +16031,7 @@ - cf_cv_typeof_chtype=long - else - cat >conftest.$ac_ext <<_ACEOF --#line 16028 "configure" -+#line 16034 "configure" - #include "confdefs.h" - - #define WANT_BITS 31 -@@ -16060,15 +16066,15 @@ - - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:16063: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:16069: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:16066: \$? = $ac_status" >&5 -+ echo "$as_me:16072: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:16068: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16074: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16071: \$? = $ac_status" >&5 -+ echo "$as_me:16077: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_typeof_chtype=`cat cf_test.out` - else -@@ -16083,7 +16089,7 @@ - - fi - --echo "$as_me:16086: result: $cf_cv_typeof_chtype" >&5 -+echo "$as_me:16092: result: $cf_cv_typeof_chtype" >&5 - echo "${ECHO_T}$cf_cv_typeof_chtype" >&6 - - cat >>confdefs.h <&5 -+echo "$as_me:16104: checking if unsigned literals are legal" >&5 - echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6 - if test "${cf_cv_unsigned_literals+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 16105 "configure" -+#line 16111 "configure" - #include "confdefs.h" - - int -@@ -16114,16 +16120,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:16117: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:16123: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:16120: \$? = $ac_status" >&5 -+ echo "$as_me:16126: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:16123: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16129: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16126: \$? = $ac_status" >&5 -+ echo "$as_me:16132: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_unsigned_literals=yes - else -@@ -16135,7 +16141,7 @@ - - fi - --echo "$as_me:16138: result: $cf_cv_unsigned_literals" >&5 -+echo "$as_me:16144: result: $cf_cv_unsigned_literals" >&5 - echo "${ECHO_T}$cf_cv_unsigned_literals" >&6 - - cf_cv_1UL="1" -@@ -16151,14 +16157,14 @@ - - ### Checks for external-data - --echo "$as_me:16154: checking if external errno is declared" >&5 -+echo "$as_me:16160: 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 16161 "configure" -+#line 16167 "configure" - #include "confdefs.h" - - #ifdef HAVE_STDLIB_H -@@ -16176,16 +16182,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:16179: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:16185: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:16182: \$? = $ac_status" >&5 -+ echo "$as_me:16188: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:16185: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16191: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16188: \$? = $ac_status" >&5 -+ echo "$as_me:16194: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_dcl_errno=yes - else -@@ -16196,7 +16202,7 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - - fi --echo "$as_me:16199: result: $cf_cv_dcl_errno" >&5 -+echo "$as_me:16205: result: $cf_cv_dcl_errno" >&5 - echo "${ECHO_T}$cf_cv_dcl_errno" >&6 - - if test "$cf_cv_dcl_errno" = no ; then -@@ -16211,14 +16217,14 @@ - - # It's possible (for near-UNIX clones) that the data doesn't exist - --echo "$as_me:16214: checking if external errno exists" >&5 -+echo "$as_me:16220: 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 16221 "configure" -+#line 16227 "configure" - #include "confdefs.h" - - #undef errno -@@ -16233,16 +16239,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:16236: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:16242: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:16239: \$? = $ac_status" >&5 -+ echo "$as_me:16245: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:16242: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16248: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16245: \$? = $ac_status" >&5 -+ echo "$as_me:16251: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_have_errno=yes - else -@@ -16253,7 +16259,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - - fi --echo "$as_me:16256: result: $cf_cv_have_errno" >&5 -+echo "$as_me:16262: result: $cf_cv_have_errno" >&5 - echo "${ECHO_T}$cf_cv_have_errno" >&6 - - if test "$cf_cv_have_errno" = yes ; then -@@ -16266,7 +16272,7 @@ - - fi - --echo "$as_me:16269: checking if data-only library module links" >&5 -+echo "$as_me:16275: checking if data-only library module links" >&5 - echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6 - if test "${cf_cv_link_dataonly+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -16274,20 +16280,20 @@ - - rm -f conftest.a - cat >conftest.$ac_ext <&5 -+ if { (eval echo "$as_me:16286: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:16283: \$? = $ac_status" >&5 -+ echo "$as_me:16289: \$? = $ac_status" >&5 - (exit $ac_status); } ; then - mv conftest.o data.o && \ - ( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null - fi - rm -f conftest.$ac_ext data.o - cat >conftest.$ac_ext <&5 -+ if { (eval echo "$as_me:16309: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:16306: \$? = $ac_status" >&5 -+ echo "$as_me:16312: \$? = $ac_status" >&5 - (exit $ac_status); }; then - mv conftest.o func.o && \ - ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null -@@ -16316,7 +16322,7 @@ - cf_cv_link_dataonly=unknown - else - cat >conftest.$ac_ext <<_ACEOF --#line 16319 "configure" -+#line 16325 "configure" - #include "confdefs.h" - - int main() -@@ -16327,15 +16333,15 @@ - - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:16330: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:16336: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:16333: \$? = $ac_status" >&5 -+ echo "$as_me:16339: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:16335: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16341: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16338: \$? = $ac_status" >&5 -+ echo "$as_me:16344: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_link_dataonly=yes - else -@@ -16350,7 +16356,7 @@ - - fi - --echo "$as_me:16353: result: $cf_cv_link_dataonly" >&5 -+echo "$as_me:16359: result: $cf_cv_link_dataonly" >&5 - echo "${ECHO_T}$cf_cv_link_dataonly" >&6 - - if test "$cf_cv_link_dataonly" = no ; then -@@ -16389,13 +16395,13 @@ - - do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --echo "$as_me:16392: checking for $ac_func" >&5 -+echo "$as_me:16398: 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 16398 "configure" -+#line 16404 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -@@ -16426,16 +16432,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:16429: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:16435: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:16432: \$? = $ac_status" >&5 -+ echo "$as_me:16438: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:16435: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16441: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16438: \$? = $ac_status" >&5 -+ echo "$as_me:16444: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" - else -@@ -16445,7 +16451,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:16448: result: `eval echo '${'$as_ac_var'}'`" >&5 -+echo "$as_me:16454: 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 <&5 -+ { { echo "$as_me:16466: error: getopt is required for building programs" >&5 - echo "$as_me: error: getopt is required for building programs" >&2;} - { (exit 1); exit 1; }; } - fi - - if test "x$with_getcap" = "xyes" ; then - --echo "$as_me:16467: checking for terminal-capability database functions" >&5 -+echo "$as_me:16473: checking for terminal-capability database functions" >&5 - echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6 - if test "${cf_cv_cgetent+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 16474 "configure" -+#line 16480 "configure" - #include "confdefs.h" - - #include -@@ -16491,16 +16497,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:16494: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:16500: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:16497: \$? = $ac_status" >&5 -+ echo "$as_me:16503: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:16500: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16506: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16503: \$? = $ac_status" >&5 -+ echo "$as_me:16509: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_cgetent=yes - else -@@ -16511,7 +16517,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - - fi --echo "$as_me:16514: result: $cf_cv_cgetent" >&5 -+echo "$as_me:16520: result: $cf_cv_cgetent" >&5 - echo "${ECHO_T}$cf_cv_cgetent" >&6 - - if test "$cf_cv_cgetent" = yes -@@ -16521,14 +16527,14 @@ - #define HAVE_BSD_CGETENT 1 - EOF - --echo "$as_me:16524: checking if cgetent uses const parameter" >&5 -+echo "$as_me:16530: checking if cgetent uses const parameter" >&5 - echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6 - if test "${cf_cv_cgetent_const+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 16531 "configure" -+#line 16537 "configure" - #include "confdefs.h" - - #include -@@ -16550,16 +16556,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:16553: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:16559: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:16556: \$? = $ac_status" >&5 -+ echo "$as_me:16562: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:16559: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16565: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16562: \$? = $ac_status" >&5 -+ echo "$as_me:16568: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_cgetent_const=yes - else -@@ -16570,7 +16576,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - - fi --echo "$as_me:16573: result: $cf_cv_cgetent_const" >&5 -+echo "$as_me:16579: result: $cf_cv_cgetent_const" >&5 - echo "${ECHO_T}$cf_cv_cgetent_const" >&6 - if test "$cf_cv_cgetent_const" = yes - then -@@ -16584,14 +16590,14 @@ - - fi - --echo "$as_me:16587: checking for isascii" >&5 -+echo "$as_me:16593: checking for isascii" >&5 - echo $ECHO_N "checking for isascii... $ECHO_C" >&6 - if test "${cf_cv_have_isascii+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 16594 "configure" -+#line 16600 "configure" - #include "confdefs.h" - #include - int -@@ -16603,16 +16609,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:16606: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:16612: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:16609: \$? = $ac_status" >&5 -+ echo "$as_me:16615: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:16612: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16618: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16615: \$? = $ac_status" >&5 -+ echo "$as_me:16621: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_have_isascii=yes - else -@@ -16623,7 +16629,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - - fi --echo "$as_me:16626: result: $cf_cv_have_isascii" >&5 -+echo "$as_me:16632: result: $cf_cv_have_isascii" >&5 - echo "${ECHO_T}$cf_cv_have_isascii" >&6 - test "$cf_cv_have_isascii" = yes && - cat >>confdefs.h <<\EOF -@@ -16631,10 +16637,10 @@ - EOF - - if test "$ac_cv_func_sigaction" = yes; then --echo "$as_me:16634: checking whether sigaction needs _POSIX_SOURCE" >&5 -+echo "$as_me:16640: checking whether sigaction needs _POSIX_SOURCE" >&5 - echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line 16637 "configure" -+#line 16643 "configure" - #include "confdefs.h" - - #include -@@ -16648,16 +16654,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:16651: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:16657: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:16654: \$? = $ac_status" >&5 -+ echo "$as_me:16660: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:16657: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16663: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16660: \$? = $ac_status" >&5 -+ echo "$as_me:16666: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - sigact_bad=no - else -@@ -16665,7 +16671,7 @@ - cat conftest.$ac_ext >&5 - - cat >conftest.$ac_ext <<_ACEOF --#line 16668 "configure" -+#line 16674 "configure" - #include "confdefs.h" - - #define _POSIX_SOURCE -@@ -16680,16 +16686,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:16683: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:16689: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:16686: \$? = $ac_status" >&5 -+ echo "$as_me:16692: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:16689: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16695: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16692: \$? = $ac_status" >&5 -+ echo "$as_me:16698: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - sigact_bad=yes - -@@ -16705,11 +16711,11 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - fi - rm -f conftest.$ac_objext conftest.$ac_ext --echo "$as_me:16708: result: $sigact_bad" >&5 -+echo "$as_me:16714: result: $sigact_bad" >&5 - echo "${ECHO_T}$sigact_bad" >&6 - fi - --echo "$as_me:16712: checking if nanosleep really works" >&5 -+echo "$as_me:16718: checking if nanosleep really works" >&5 - echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6 - if test "${cf_cv_func_nanosleep+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -16719,7 +16725,7 @@ - cf_cv_func_nanosleep=unknown - else - cat >conftest.$ac_ext <<_ACEOF --#line 16722 "configure" -+#line 16728 "configure" - #include "confdefs.h" - - #include -@@ -16744,15 +16750,15 @@ - - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:16747: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:16753: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:16750: \$? = $ac_status" >&5 -+ echo "$as_me:16756: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:16752: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16758: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16755: \$? = $ac_status" >&5 -+ echo "$as_me:16761: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_func_nanosleep=yes - else -@@ -16764,7 +16770,7 @@ - rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - fi --echo "$as_me:16767: result: $cf_cv_func_nanosleep" >&5 -+echo "$as_me:16773: result: $cf_cv_func_nanosleep" >&5 - echo "${ECHO_T}$cf_cv_func_nanosleep" >&6 - - test "$cf_cv_func_nanosleep" = "yes" && -@@ -16779,23 +16785,23 @@ - - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:16782: checking for $ac_header" >&5 -+echo "$as_me:16788: 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 16788 "configure" -+#line 16794 "configure" - #include "confdefs.h" - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:16792: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:16798: \"$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:16798: \$? = $ac_status" >&5 -+ echo "$as_me:16804: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -16814,7 +16820,7 @@ - fi - rm -f conftest.err conftest.$ac_ext - fi --echo "$as_me:16817: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "$as_me:16823: 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 <&5 -+echo "$as_me:16838: 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 16838 "configure" -+#line 16844 "configure" - #include "confdefs.h" - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:16842: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:16848: \"$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:16848: \$? = $ac_status" >&5 -+ echo "$as_me:16854: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -16864,7 +16870,7 @@ - fi - rm -f conftest.err conftest.$ac_ext - fi --echo "$as_me:16867: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "$as_me:16873: 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 <&5 -+ echo "$as_me:16891: 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 16888 "configure" -+#line 16894 "configure" - #include "confdefs.h" - #include - int -@@ -16897,16 +16903,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:16900: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:16906: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:16903: \$? = $ac_status" >&5 -+ echo "$as_me:16909: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:16906: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16912: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16909: \$? = $ac_status" >&5 -+ echo "$as_me:16915: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - termios_bad=no - else -@@ -16914,7 +16920,7 @@ - cat conftest.$ac_ext >&5 - - cat >conftest.$ac_ext <<_ACEOF --#line 16917 "configure" -+#line 16923 "configure" - #include "confdefs.h" - - #define _POSIX_SOURCE -@@ -16928,16 +16934,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:16931: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:16937: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:16934: \$? = $ac_status" >&5 -+ echo "$as_me:16940: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:16937: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16943: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16940: \$? = $ac_status" >&5 -+ echo "$as_me:16946: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - termios_bad=unknown - else -@@ -16953,19 +16959,19 @@ - - fi - rm -f conftest.$ac_objext conftest.$ac_ext -- echo "$as_me:16956: result: $termios_bad" >&5 -+ echo "$as_me:16962: result: $termios_bad" >&5 - echo "${ECHO_T}$termios_bad" >&6 - fi - fi - --echo "$as_me:16961: checking for tcgetattr" >&5 -+echo "$as_me:16967: checking for tcgetattr" >&5 - echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6 - if test "${cf_cv_have_tcgetattr+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 16968 "configure" -+#line 16974 "configure" - #include "confdefs.h" - - #include -@@ -16993,16 +16999,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:16996: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:17002: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:16999: \$? = $ac_status" >&5 -+ echo "$as_me:17005: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:17002: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17008: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17005: \$? = $ac_status" >&5 -+ echo "$as_me:17011: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_have_tcgetattr=yes - else -@@ -17012,21 +17018,21 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:17015: result: $cf_cv_have_tcgetattr" >&5 -+echo "$as_me:17021: result: $cf_cv_have_tcgetattr" >&5 - echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6 - test "$cf_cv_have_tcgetattr" = yes && - cat >>confdefs.h <<\EOF - #define HAVE_TCGETATTR 1 - EOF - --echo "$as_me:17022: checking for vsscanf function or workaround" >&5 -+echo "$as_me:17028: checking for vsscanf function or workaround" >&5 - echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6 - if test "${cf_cv_func_vsscanf+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 17029 "configure" -+#line 17035 "configure" - #include "confdefs.h" - - #include -@@ -17042,16 +17048,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:17045: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:17051: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:17048: \$? = $ac_status" >&5 -+ echo "$as_me:17054: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:17051: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17057: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17054: \$? = $ac_status" >&5 -+ echo "$as_me:17060: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_func_vsscanf=vsscanf - else -@@ -17059,7 +17065,7 @@ - cat conftest.$ac_ext >&5 - - cat >conftest.$ac_ext <<_ACEOF --#line 17062 "configure" -+#line 17068 "configure" - #include "confdefs.h" - - #include -@@ -17081,16 +17087,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:17084: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:17090: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:17087: \$? = $ac_status" >&5 -+ echo "$as_me:17093: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:17090: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17096: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17093: \$? = $ac_status" >&5 -+ echo "$as_me:17099: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_func_vsscanf=vfscanf - else -@@ -17098,7 +17104,7 @@ - cat conftest.$ac_ext >&5 - - cat >conftest.$ac_ext <<_ACEOF --#line 17101 "configure" -+#line 17107 "configure" - #include "confdefs.h" - - #include -@@ -17120,16 +17126,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:17123: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:17129: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:17126: \$? = $ac_status" >&5 -+ echo "$as_me:17132: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:17129: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17135: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17132: \$? = $ac_status" >&5 -+ echo "$as_me:17138: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_func_vsscanf=_doscan - else -@@ -17144,7 +17150,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:17147: result: $cf_cv_func_vsscanf" >&5 -+echo "$as_me:17153: result: $cf_cv_func_vsscanf" >&5 - echo "${ECHO_T}$cf_cv_func_vsscanf" >&6 - - case $cf_cv_func_vsscanf in -@@ -17165,7 +17171,7 @@ - ;; - esac - --echo "$as_me:17168: checking for working mkstemp" >&5 -+echo "$as_me:17174: checking for working mkstemp" >&5 - echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 - if test "${cf_cv_func_mkstemp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -17176,7 +17182,7 @@ - cf_cv_func_mkstemp=maybe - else - cat >conftest.$ac_ext <<_ACEOF --#line 17179 "configure" -+#line 17185 "configure" - #include "confdefs.h" - - #include -@@ -17214,15 +17220,15 @@ - - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:17217: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:17223: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:17220: \$? = $ac_status" >&5 -+ echo "$as_me:17226: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:17222: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17228: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17225: \$? = $ac_status" >&5 -+ echo "$as_me:17231: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_func_mkstemp=yes - -@@ -17237,16 +17243,16 @@ - fi - - fi --echo "$as_me:17240: result: $cf_cv_func_mkstemp" >&5 -+echo "$as_me:17246: result: $cf_cv_func_mkstemp" >&5 - echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 - if test "x$cf_cv_func_mkstemp" = xmaybe ; then -- echo "$as_me:17243: checking for mkstemp" >&5 -+ echo "$as_me:17249: checking for mkstemp" >&5 - echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 - if test "${ac_cv_func_mkstemp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 17249 "configure" -+#line 17255 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char mkstemp (); below. */ -@@ -17277,16 +17283,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:17280: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:17286: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:17283: \$? = $ac_status" >&5 -+ echo "$as_me:17289: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:17286: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17292: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17289: \$? = $ac_status" >&5 -+ echo "$as_me:17295: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_mkstemp=yes - else -@@ -17296,7 +17302,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:17299: result: $ac_cv_func_mkstemp" >&5 -+echo "$as_me:17305: result: $ac_cv_func_mkstemp" >&5 - echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 - - fi -@@ -17317,21 +17323,21 @@ - fi - - if test "x$cross_compiling" = xyes ; then -- { echo "$as_me:17320: WARNING: cross compiling: assume setvbuf params not reversed" >&5 -+ { echo "$as_me:17326: WARNING: cross compiling: assume setvbuf params not reversed" >&5 - echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;} - else -- echo "$as_me:17323: checking whether setvbuf arguments are reversed" >&5 -+ echo "$as_me:17329: checking whether setvbuf arguments are reversed" >&5 - echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6 - if test "${ac_cv_func_setvbuf_reversed+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test "$cross_compiling" = yes; then -- { { echo "$as_me:17329: error: cannot run test program while cross compiling" >&5 -+ { { echo "$as_me:17335: 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 17334 "configure" -+#line 17340 "configure" - #include "confdefs.h" - #include - /* If setvbuf has the reversed format, exit 0. */ -@@ -17348,15 +17354,15 @@ - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:17351: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:17357: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:17354: \$? = $ac_status" >&5 -+ echo "$as_me:17360: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:17356: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17362: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17359: \$? = $ac_status" >&5 -+ echo "$as_me:17365: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_setvbuf_reversed=yes - else -@@ -17369,7 +17375,7 @@ - fi - rm -f core core.* *.core - fi --echo "$as_me:17372: result: $ac_cv_func_setvbuf_reversed" >&5 -+echo "$as_me:17378: result: $ac_cv_func_setvbuf_reversed" >&5 - echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6 - if test $ac_cv_func_setvbuf_reversed = yes; then - -@@ -17380,13 +17386,13 @@ - fi - - fi --echo "$as_me:17383: checking for intptr_t" >&5 -+echo "$as_me:17389: 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 17389 "configure" -+#line 17395 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -17401,16 +17407,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:17404: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:17410: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:17407: \$? = $ac_status" >&5 -+ echo "$as_me:17413: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:17410: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17416: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17413: \$? = $ac_status" >&5 -+ echo "$as_me:17419: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_intptr_t=yes - else -@@ -17420,7 +17426,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:17423: result: $ac_cv_type_intptr_t" >&5 -+echo "$as_me:17429: 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 - : -@@ -17432,13 +17438,13 @@ - - fi - --echo "$as_me:17435: checking for ssize_t" >&5 -+echo "$as_me:17441: 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 17441 "configure" -+#line 17447 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -17453,16 +17459,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:17456: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:17462: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:17459: \$? = $ac_status" >&5 -+ echo "$as_me:17465: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:17462: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17468: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17465: \$? = $ac_status" >&5 -+ echo "$as_me:17471: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_ssize_t=yes - else -@@ -17472,7 +17478,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:17475: result: $ac_cv_type_ssize_t" >&5 -+echo "$as_me:17481: 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 - : -@@ -17484,14 +17490,14 @@ - - fi - --echo "$as_me:17487: checking for type sigaction_t" >&5 -+echo "$as_me:17493: checking for type sigaction_t" >&5 - echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6 - if test "${cf_cv_type_sigaction+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 17494 "configure" -+#line 17500 "configure" - #include "confdefs.h" - - #include -@@ -17504,16 +17510,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:17507: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:17513: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:17510: \$? = $ac_status" >&5 -+ echo "$as_me:17516: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:17513: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17519: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17516: \$? = $ac_status" >&5 -+ echo "$as_me:17522: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_type_sigaction=yes - else -@@ -17524,14 +17530,14 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - fi - --echo "$as_me:17527: result: $cf_cv_type_sigaction" >&5 -+echo "$as_me:17533: result: $cf_cv_type_sigaction" >&5 - echo "${ECHO_T}$cf_cv_type_sigaction" >&6 - test "$cf_cv_type_sigaction" = yes && - cat >>confdefs.h <<\EOF - #define HAVE_TYPE_SIGACTION 1 - EOF - --echo "$as_me:17534: checking declaration of size-change" >&5 -+echo "$as_me:17540: 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 -@@ -17546,7 +17552,7 @@ - CPPFLAGS="$cf_save_CPPFLAGS" - test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" - cat >conftest.$ac_ext <<_ACEOF --#line 17549 "configure" -+#line 17555 "configure" - #include "confdefs.h" - #include - #ifdef HAVE_TERMIOS_H -@@ -17590,16 +17596,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:17593: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:17599: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:17596: \$? = $ac_status" >&5 -+ echo "$as_me:17602: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:17599: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17605: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17602: \$? = $ac_status" >&5 -+ echo "$as_me:17608: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_sizechange=yes - else -@@ -17618,7 +17624,7 @@ - done - - fi --echo "$as_me:17621: result: $cf_cv_sizechange" >&5 -+echo "$as_me:17627: result: $cf_cv_sizechange" >&5 - echo "${ECHO_T}$cf_cv_sizechange" >&6 - if test "$cf_cv_sizechange" != no ; then - -@@ -17636,13 +17642,13 @@ - esac - fi - --echo "$as_me:17639: checking for memmove" >&5 -+echo "$as_me:17645: checking for memmove" >&5 - echo $ECHO_N "checking for memmove... $ECHO_C" >&6 - if test "${ac_cv_func_memmove+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 17645 "configure" -+#line 17651 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char memmove (); below. */ -@@ -17673,16 +17679,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:17676: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:17682: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:17679: \$? = $ac_status" >&5 -+ echo "$as_me:17685: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:17682: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17688: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17685: \$? = $ac_status" >&5 -+ echo "$as_me:17691: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_memmove=yes - else -@@ -17692,19 +17698,19 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:17695: result: $ac_cv_func_memmove" >&5 -+echo "$as_me:17701: result: $ac_cv_func_memmove" >&5 - echo "${ECHO_T}$ac_cv_func_memmove" >&6 - if test $ac_cv_func_memmove = yes; then - : - else - --echo "$as_me:17701: checking for bcopy" >&5 -+echo "$as_me:17707: checking for bcopy" >&5 - echo $ECHO_N "checking for bcopy... $ECHO_C" >&6 - if test "${ac_cv_func_bcopy+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 17707 "configure" -+#line 17713 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char bcopy (); below. */ -@@ -17735,16 +17741,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:17738: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:17744: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:17741: \$? = $ac_status" >&5 -+ echo "$as_me:17747: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:17744: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17750: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17747: \$? = $ac_status" >&5 -+ echo "$as_me:17753: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_bcopy=yes - else -@@ -17754,11 +17760,11 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:17757: result: $ac_cv_func_bcopy" >&5 -+echo "$as_me:17763: result: $ac_cv_func_bcopy" >&5 - echo "${ECHO_T}$ac_cv_func_bcopy" >&6 - if test $ac_cv_func_bcopy = yes; then - -- echo "$as_me:17761: checking if bcopy does overlapping moves" >&5 -+ echo "$as_me:17767: checking if bcopy does overlapping moves" >&5 - echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6 - if test "${cf_cv_good_bcopy+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -17768,7 +17774,7 @@ - cf_cv_good_bcopy=unknown - else - cat >conftest.$ac_ext <<_ACEOF --#line 17771 "configure" -+#line 17777 "configure" - #include "confdefs.h" - - int main() { -@@ -17782,15 +17788,15 @@ - - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:17785: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:17791: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:17788: \$? = $ac_status" >&5 -+ echo "$as_me:17794: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:17790: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17796: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17793: \$? = $ac_status" >&5 -+ echo "$as_me:17799: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_good_bcopy=yes - else -@@ -17803,7 +17809,7 @@ - fi - - fi --echo "$as_me:17806: result: $cf_cv_good_bcopy" >&5 -+echo "$as_me:17812: result: $cf_cv_good_bcopy" >&5 - echo "${ECHO_T}$cf_cv_good_bcopy" >&6 - - else -@@ -17826,7 +17832,7 @@ - - fi - --echo "$as_me:17829: checking if poll really works" >&5 -+echo "$as_me:17835: checking if poll really works" >&5 - echo $ECHO_N "checking if poll really works... $ECHO_C" >&6 - if test "${cf_cv_working_poll+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -17836,7 +17842,7 @@ - cf_cv_working_poll=unknown - else - cat >conftest.$ac_ext <<_ACEOF --#line 17839 "configure" -+#line 17845 "configure" - #include "confdefs.h" - - #include -@@ -17883,15 +17889,15 @@ - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:17886: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:17892: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:17889: \$? = $ac_status" >&5 -+ echo "$as_me:17895: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:17891: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17897: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17894: \$? = $ac_status" >&5 -+ echo "$as_me:17900: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_working_poll=yes - else -@@ -17903,21 +17909,21 @@ - rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - fi --echo "$as_me:17906: result: $cf_cv_working_poll" >&5 -+echo "$as_me:17912: result: $cf_cv_working_poll" >&5 - echo "${ECHO_T}$cf_cv_working_poll" >&6 - test "$cf_cv_working_poll" = "yes" && - cat >>confdefs.h <<\EOF - #define HAVE_WORKING_POLL 1 - EOF - --echo "$as_me:17913: checking for va_copy" >&5 -+echo "$as_me:17919: checking for va_copy" >&5 - echo $ECHO_N "checking for va_copy... $ECHO_C" >&6 - if test "${cf_cv_have_va_copy+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 17920 "configure" -+#line 17926 "configure" - #include "confdefs.h" - - #include -@@ -17934,16 +17940,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:17937: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:17943: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:17940: \$? = $ac_status" >&5 -+ echo "$as_me:17946: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:17943: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17949: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17946: \$? = $ac_status" >&5 -+ echo "$as_me:17952: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_have_va_copy=yes - else -@@ -17953,7 +17959,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:17956: result: $cf_cv_have_va_copy" >&5 -+echo "$as_me:17962: result: $cf_cv_have_va_copy" >&5 - echo "${ECHO_T}$cf_cv_have_va_copy" >&6 - - test "$cf_cv_have_va_copy" = yes && -@@ -17961,14 +17967,14 @@ - #define HAVE_VA_COPY 1 - EOF - --echo "$as_me:17964: checking for __va_copy" >&5 -+echo "$as_me:17970: checking for __va_copy" >&5 - echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6 - if test "${cf_cv_have___va_copy+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 17971 "configure" -+#line 17977 "configure" - #include "confdefs.h" - - #include -@@ -17985,16 +17991,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:17988: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:17994: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:17991: \$? = $ac_status" >&5 -+ echo "$as_me:17997: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:17994: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:18000: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17997: \$? = $ac_status" >&5 -+ echo "$as_me:18003: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_have___va_copy=yes - else -@@ -18004,7 +18010,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:18007: result: $cf_cv_have___va_copy" >&5 -+echo "$as_me:18013: result: $cf_cv_have___va_copy" >&5 - echo "${ECHO_T}$cf_cv_have___va_copy" >&6 - - test "$cf_cv_have___va_copy" = yes && -@@ -18012,13 +18018,13 @@ - #define HAVE___VA_COPY 1 - EOF - --echo "$as_me:18015: checking for pid_t" >&5 -+echo "$as_me:18021: 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 18021 "configure" -+#line 18027 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -18033,16 +18039,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:18036: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:18042: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:18039: \$? = $ac_status" >&5 -+ echo "$as_me:18045: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:18042: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:18048: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:18045: \$? = $ac_status" >&5 -+ echo "$as_me:18051: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_pid_t=yes - else -@@ -18052,7 +18058,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:18055: result: $ac_cv_type_pid_t" >&5 -+echo "$as_me:18061: 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 - : -@@ -18067,23 +18073,23 @@ - for ac_header in unistd.h vfork.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:18070: checking for $ac_header" >&5 -+echo "$as_me:18076: 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 18076 "configure" -+#line 18082 "configure" - #include "confdefs.h" - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:18080: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:18086: \"$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:18086: \$? = $ac_status" >&5 -+ echo "$as_me:18092: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -18102,7 +18108,7 @@ - fi - rm -f conftest.err conftest.$ac_ext - fi --echo "$as_me:18105: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "$as_me:18111: 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 <&5 -+echo "$as_me:18124: 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 18124 "configure" -+#line 18130 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -@@ -18152,16 +18158,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:18155: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:18161: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:18158: \$? = $ac_status" >&5 -+ echo "$as_me:18164: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:18161: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:18167: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:18164: \$? = $ac_status" >&5 -+ echo "$as_me:18170: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" - else -@@ -18171,7 +18177,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:18174: result: `eval echo '${'$as_ac_var'}'`" >&5 -+echo "$as_me:18180: 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 <&5 -+ echo "$as_me:18192: 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 -@@ -18206,15 +18212,15 @@ - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:18209: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:18215: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:18212: \$? = $ac_status" >&5 -+ echo "$as_me:18218: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:18214: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:18220: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:18217: \$? = $ac_status" >&5 -+ echo "$as_me:18223: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_fork_works=yes - else -@@ -18226,7 +18232,7 @@ - rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - fi --echo "$as_me:18229: result: $ac_cv_func_fork_works" >&5 -+echo "$as_me:18235: result: $ac_cv_func_fork_works" >&5 - echo "${ECHO_T}$ac_cv_func_fork_works" >&6 - - fi -@@ -18240,12 +18246,12 @@ - ac_cv_func_fork_works=yes - ;; - esac -- { echo "$as_me:18243: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 -+ { echo "$as_me:18249: 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:18248: checking for working vfork" >&5 -+ echo "$as_me:18254: 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 -@@ -18254,7 +18260,7 @@ - ac_cv_func_vfork_works=cross - else - cat >conftest.$ac_ext <<_ACEOF --#line 18257 "configure" -+#line 18263 "configure" - #include "confdefs.h" - /* Thanks to Paul Eggert for this test. */ - #include -@@ -18351,15 +18357,15 @@ - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:18354: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:18360: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:18357: \$? = $ac_status" >&5 -+ echo "$as_me:18363: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:18359: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:18365: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:18362: \$? = $ac_status" >&5 -+ echo "$as_me:18368: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_vfork_works=yes - else -@@ -18371,13 +18377,13 @@ - rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - fi --echo "$as_me:18374: result: $ac_cv_func_vfork_works" >&5 -+echo "$as_me:18380: 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:18380: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 -+ { echo "$as_me:18386: 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 - -@@ -18404,7 +18410,7 @@ - - # special check for test/ditto.c - --echo "$as_me:18407: checking for openpty in -lutil" >&5 -+echo "$as_me:18413: checking for openpty in -lutil" >&5 - echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6 - if test "${ac_cv_lib_util_openpty+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -18412,7 +18418,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lutil $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 18415 "configure" -+#line 18421 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -18431,16 +18437,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:18434: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:18440: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:18437: \$? = $ac_status" >&5 -+ echo "$as_me:18443: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:18440: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:18446: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:18443: \$? = $ac_status" >&5 -+ echo "$as_me:18449: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_util_openpty=yes - else -@@ -18451,7 +18457,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:18454: result: $ac_cv_lib_util_openpty" >&5 -+echo "$as_me:18460: result: $ac_cv_lib_util_openpty" >&5 - echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6 - if test $ac_cv_lib_util_openpty = yes; then - cf_cv_lib_util=yes -@@ -18459,7 +18465,7 @@ - cf_cv_lib_util=no - fi - --echo "$as_me:18462: checking for openpty header" >&5 -+echo "$as_me:18468: checking for openpty header" >&5 - echo $ECHO_N "checking for openpty header... $ECHO_C" >&6 - if test "${cf_cv_func_openpty+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -18486,7 +18492,7 @@ - for cf_header in pty.h libutil.h util.h - do - cat >conftest.$ac_ext <<_ACEOF --#line 18489 "configure" -+#line 18495 "configure" - #include "confdefs.h" - - #include <$cf_header> -@@ -18503,16 +18509,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:18506: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:18512: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:18509: \$? = $ac_status" >&5 -+ echo "$as_me:18515: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:18512: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:18518: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:18515: \$? = $ac_status" >&5 -+ echo "$as_me:18521: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - cf_cv_func_openpty=$cf_header -@@ -18530,7 +18536,7 @@ - LIBS="$cf_save_LIBS" - - fi --echo "$as_me:18533: result: $cf_cv_func_openpty" >&5 -+echo "$as_me:18539: result: $cf_cv_func_openpty" >&5 - echo "${ECHO_T}$cf_cv_func_openpty" >&6 - - if test "$cf_cv_func_openpty" != no ; then -@@ -18600,7 +18606,7 @@ - cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF --#line 18603 "configure" -+#line 18609 "configure" - #include "confdefs.h" - #include - int -@@ -18612,16 +18618,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:18615: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:18621: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:18618: \$? = $ac_status" >&5 -+ echo "$as_me:18624: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:18621: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:18627: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:18624: \$? = $ac_status" >&5 -+ echo "$as_me:18630: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -18638,7 +18644,7 @@ - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - --echo "${as_me:-configure}:18641: testing adding $cf_add_incdir to include-path ..." 1>&5 -+echo "${as_me:-configure}:18647: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - -@@ -18674,7 +18680,7 @@ - if test "$cf_have_libdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 - --echo "${as_me:-configure}:18677: testing adding $cf_add_libdir to library-path ..." 1>&5 -+echo "${as_me:-configure}:18683: testing adding $cf_add_libdir to library-path ..." 1>&5 - - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi -@@ -18685,7 +18691,7 @@ - else - case "$with_hashed_db" in - (./*|../*|/*) -- { echo "$as_me:18688: WARNING: no such directory $with_hashed_db" >&5 -+ { echo "$as_me:18694: WARNING: no such directory $with_hashed_db" >&5 - echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;} - ;; - (*) -@@ -18754,7 +18760,7 @@ - cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF --#line 18757 "configure" -+#line 18763 "configure" - #include "confdefs.h" - #include - int -@@ -18766,16 +18772,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:18769: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:18775: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:18772: \$? = $ac_status" >&5 -+ echo "$as_me:18778: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:18775: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:18781: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:18778: \$? = $ac_status" >&5 -+ echo "$as_me:18784: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -18792,7 +18798,7 @@ - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - --echo "${as_me:-configure}:18795: testing adding $cf_add_incdir to include-path ..." 1>&5 -+echo "${as_me:-configure}:18801: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - -@@ -18872,7 +18878,7 @@ - if test "$cf_have_libdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 - --echo "${as_me:-configure}:18875: testing adding $cf_add_libdir to library-path ..." 1>&5 -+echo "${as_me:-configure}:18881: testing adding $cf_add_libdir to library-path ..." 1>&5 - - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi -@@ -18889,23 +18895,23 @@ - fi - esac - --echo "$as_me:18892: checking for db.h" >&5 -+echo "$as_me:18898: checking for db.h" >&5 - echo $ECHO_N "checking for db.h... $ECHO_C" >&6 - if test "${ac_cv_header_db_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 18898 "configure" -+#line 18904 "configure" - #include "confdefs.h" - #include - _ACEOF --if { (eval echo "$as_me:18902: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:18908: \"$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:18908: \$? = $ac_status" >&5 -+ echo "$as_me:18914: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -18924,11 +18930,11 @@ - fi - rm -f conftest.err conftest.$ac_ext - fi --echo "$as_me:18927: result: $ac_cv_header_db_h" >&5 -+echo "$as_me:18933: result: $ac_cv_header_db_h" >&5 - echo "${ECHO_T}$ac_cv_header_db_h" >&6 - if test $ac_cv_header_db_h = yes; then - --echo "$as_me:18931: checking for version of db" >&5 -+echo "$as_me:18937: checking for version of db" >&5 - echo $ECHO_N "checking for version of db... $ECHO_C" >&6 - if test "${cf_cv_hashed_db_version+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -18939,10 +18945,10 @@ - for cf_db_version in 1 2 3 4 5 6 - do - --echo "${as_me:-configure}:18942: testing checking for db version $cf_db_version ..." 1>&5 -+echo "${as_me:-configure}:18948: testing checking for db version $cf_db_version ..." 1>&5 - - cat >conftest.$ac_ext <<_ACEOF --#line 18945 "configure" -+#line 18951 "configure" - #include "confdefs.h" - - $ac_includes_default -@@ -18972,16 +18978,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:18975: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:18981: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:18978: \$? = $ac_status" >&5 -+ echo "$as_me:18984: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:18981: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:18987: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:18984: \$? = $ac_status" >&5 -+ echo "$as_me:18990: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - cf_cv_hashed_db_version=$cf_db_version -@@ -18995,16 +19001,16 @@ - done - - fi --echo "$as_me:18998: result: $cf_cv_hashed_db_version" >&5 -+echo "$as_me:19004: result: $cf_cv_hashed_db_version" >&5 - echo "${ECHO_T}$cf_cv_hashed_db_version" >&6 - - if test "$cf_cv_hashed_db_version" = unknown ; then -- { { echo "$as_me:19002: error: Cannot determine version of db" >&5 -+ { { echo "$as_me:19008: error: Cannot determine version of db" >&5 - echo "$as_me: error: Cannot determine version of db" >&2;} - { (exit 1); exit 1; }; } - else - --echo "$as_me:19007: checking for db libraries" >&5 -+echo "$as_me:19013: checking for db libraries" >&5 - echo $ECHO_N "checking for db libraries... $ECHO_C" >&6 - if test "${cf_cv_hashed_db_libs+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -19034,10 +19040,10 @@ - - fi - --echo "${as_me:-configure}:19037: testing checking for library "$cf_db_libs" ..." 1>&5 -+echo "${as_me:-configure}:19043: testing checking for library "$cf_db_libs" ..." 1>&5 - - cat >conftest.$ac_ext <<_ACEOF --#line 19040 "configure" -+#line 19046 "configure" - #include "confdefs.h" - - $ac_includes_default -@@ -19092,16 +19098,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:19095: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:19101: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:19098: \$? = $ac_status" >&5 -+ echo "$as_me:19104: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:19101: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:19107: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:19104: \$? = $ac_status" >&5 -+ echo "$as_me:19110: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - if test -n "$cf_db_libs" ; then -@@ -19121,11 +19127,11 @@ - done - - fi --echo "$as_me:19124: result: $cf_cv_hashed_db_libs" >&5 -+echo "$as_me:19130: result: $cf_cv_hashed_db_libs" >&5 - echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6 - - if test "$cf_cv_hashed_db_libs" = unknown ; then -- { { echo "$as_me:19128: error: Cannot determine library for db" >&5 -+ { { echo "$as_me:19134: error: Cannot determine library for db" >&5 - echo "$as_me: error: Cannot determine library for db" >&2;} - { (exit 1); exit 1; }; } - elif test "$cf_cv_hashed_db_libs" != default ; then -@@ -19151,7 +19157,7 @@ - - else - -- { { echo "$as_me:19154: error: Cannot find db.h" >&5 -+ { { echo "$as_me:19160: error: Cannot find db.h" >&5 - echo "$as_me: error: Cannot find db.h" >&2;} - { (exit 1); exit 1; }; } - -@@ -19166,7 +19172,7 @@ - - # Just in case, check if the C compiler has a bool type. - --echo "$as_me:19169: checking if we should include stdbool.h" >&5 -+echo "$as_me:19175: checking if we should include stdbool.h" >&5 - echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 - - if test "${cf_cv_header_stdbool_h+set}" = set; then -@@ -19174,7 +19180,7 @@ - else - - cat >conftest.$ac_ext <<_ACEOF --#line 19177 "configure" -+#line 19183 "configure" - #include "confdefs.h" - - int -@@ -19186,23 +19192,23 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:19189: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:19195: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:19192: \$? = $ac_status" >&5 -+ echo "$as_me:19198: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:19195: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:19201: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:19198: \$? = $ac_status" >&5 -+ echo "$as_me:19204: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_header_stdbool_h=0 - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF --#line 19205 "configure" -+#line 19211 "configure" - #include "confdefs.h" - - #ifndef __BEOS__ -@@ -19218,16 +19224,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:19221: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:19227: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:19224: \$? = $ac_status" >&5 -+ echo "$as_me:19230: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:19227: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:19233: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:19230: \$? = $ac_status" >&5 -+ echo "$as_me:19236: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_header_stdbool_h=1 - else -@@ -19241,13 +19247,13 @@ - fi - - if test "$cf_cv_header_stdbool_h" = 1 --then echo "$as_me:19244: result: yes" >&5 -+then echo "$as_me:19250: result: yes" >&5 - echo "${ECHO_T}yes" >&6 --else echo "$as_me:19246: result: no" >&5 -+else echo "$as_me:19252: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - --echo "$as_me:19250: checking for builtin bool type" >&5 -+echo "$as_me:19256: checking for builtin bool type" >&5 - echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 - - if test "${cf_cv_cc_bool_type+set}" = set; then -@@ -19255,7 +19261,7 @@ - else - - cat >conftest.$ac_ext <<_ACEOF --#line 19258 "configure" -+#line 19264 "configure" - #include "confdefs.h" - - #include -@@ -19270,16 +19276,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:19273: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:19279: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:19276: \$? = $ac_status" >&5 -+ echo "$as_me:19282: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:19279: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:19285: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:19282: \$? = $ac_status" >&5 -+ echo "$as_me:19288: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_cc_bool_type=1 - else -@@ -19292,9 +19298,9 @@ - fi - - if test "$cf_cv_cc_bool_type" = 1 --then echo "$as_me:19295: result: yes" >&5 -+then echo "$as_me:19301: result: yes" >&5 - echo "${ECHO_T}yes" >&6 --else echo "$as_me:19297: result: no" >&5 -+else echo "$as_me:19303: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -19316,7 +19322,7 @@ - cf_stdcpp_libname=stdc++ - ;; - esac --echo "$as_me:19319: checking for library $cf_stdcpp_libname" >&5 -+echo "$as_me:19325: checking for library $cf_stdcpp_libname" >&5 - echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6 - if test "${cf_cv_libstdcpp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -19341,7 +19347,7 @@ - LIBS="$cf_add_libs" - - cat >conftest.$ac_ext <<_ACEOF --#line 19344 "configure" -+#line 19350 "configure" - #include "confdefs.h" - - #include -@@ -19357,16 +19363,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:19360: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:19366: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:19363: \$? = $ac_status" >&5 -+ echo "$as_me:19369: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:19366: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:19372: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:19369: \$? = $ac_status" >&5 -+ echo "$as_me:19375: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_libstdcpp=yes - else -@@ -19378,7 +19384,7 @@ - LIBS="$cf_save" - - fi --echo "$as_me:19381: result: $cf_cv_libstdcpp" >&5 -+echo "$as_me:19387: result: $cf_cv_libstdcpp" >&5 - echo "${ECHO_T}$cf_cv_libstdcpp" >&6 - test "$cf_cv_libstdcpp" = yes && - cf_add_libs="-l$cf_stdcpp_libname" -@@ -19399,7 +19405,7 @@ - - fi - -- echo "$as_me:19402: checking whether $CXX understands -c and -o together" >&5 -+ echo "$as_me:19408: checking whether $CXX understands -c and -o together" >&5 - echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6 - if test "${cf_cv_prog_CXX_c_o+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -19415,15 +19421,15 @@ - # We do the test twice because some compilers refuse to overwrite an - # existing .o file with -o, though they will create one. - ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5' --if { (eval echo "$as_me:19418: \"$ac_try\"") >&5 -+if { (eval echo "$as_me:19424: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:19421: \$? = $ac_status" >&5 -+ echo "$as_me:19427: \$? = $ac_status" >&5 - (exit $ac_status); } && -- test -f conftest2.$ac_objext && { (eval echo "$as_me:19423: \"$ac_try\"") >&5 -+ test -f conftest2.$ac_objext && { (eval echo "$as_me:19429: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:19426: \$? = $ac_status" >&5 -+ echo "$as_me:19432: \$? = $ac_status" >&5 - (exit $ac_status); }; - then - eval cf_cv_prog_CXX_c_o=yes -@@ -19434,10 +19440,10 @@ - - fi - if test $cf_cv_prog_CXX_c_o = yes; then -- echo "$as_me:19437: result: yes" >&5 -+ echo "$as_me:19443: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - else -- echo "$as_me:19440: result: no" >&5 -+ echo "$as_me:19446: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -19457,7 +19463,7 @@ - ;; - esac - if test "$GXX" = yes; then -- echo "$as_me:19460: checking for lib$cf_gpp_libname" >&5 -+ echo "$as_me:19466: checking for lib$cf_gpp_libname" >&5 - echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6 - cf_save="$LIBS" - -@@ -19478,7 +19484,7 @@ - LIBS="$cf_add_libs" - - cat >conftest.$ac_ext <<_ACEOF --#line 19481 "configure" -+#line 19487 "configure" - #include "confdefs.h" - - #include <$cf_gpp_libname/builtin.h> -@@ -19492,16 +19498,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:19495: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:19501: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:19498: \$? = $ac_status" >&5 -+ echo "$as_me:19504: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:19501: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:19507: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:19504: \$? = $ac_status" >&5 -+ echo "$as_me:19510: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cxx_library=yes - -@@ -19538,7 +19544,7 @@ - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF --#line 19541 "configure" -+#line 19547 "configure" - #include "confdefs.h" - - #include -@@ -19552,16 +19558,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:19555: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:19561: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:19558: \$? = $ac_status" >&5 -+ echo "$as_me:19564: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:19561: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:19567: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:19564: \$? = $ac_status" >&5 -+ echo "$as_me:19570: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cxx_library=yes - -@@ -19594,7 +19600,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS="$cf_save" -- echo "$as_me:19597: result: $cf_cxx_library" >&5 -+ echo "$as_me:19603: result: $cf_cxx_library" >&5 - echo "${ECHO_T}$cf_cxx_library" >&6 - fi - -@@ -19610,7 +19616,7 @@ - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - ac_main_return=return --echo "$as_me:19613: checking how to run the C++ preprocessor" >&5 -+echo "$as_me:19619: checking how to run the C++ preprocessor" >&5 - echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 - if test -z "$CXXCPP"; then - if test "${ac_cv_prog_CXXCPP+set}" = set; then -@@ -19627,18 +19633,18 @@ - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF --#line 19630 "configure" -+#line 19636 "configure" - #include "confdefs.h" - #include - Syntax error - _ACEOF --if { (eval echo "$as_me:19635: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:19641: \"$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:19641: \$? = $ac_status" >&5 -+ echo "$as_me:19647: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag -@@ -19661,17 +19667,17 @@ - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF --#line 19664 "configure" -+#line 19670 "configure" - #include "confdefs.h" - #include - _ACEOF --if { (eval echo "$as_me:19668: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:19674: \"$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:19674: \$? = $ac_status" >&5 -+ echo "$as_me:19680: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag -@@ -19708,7 +19714,7 @@ - else - ac_cv_prog_CXXCPP=$CXXCPP - fi --echo "$as_me:19711: result: $CXXCPP" >&5 -+echo "$as_me:19717: result: $CXXCPP" >&5 - echo "${ECHO_T}$CXXCPP" >&6 - ac_preproc_ok=false - for ac_cxx_preproc_warn_flag in '' yes -@@ -19718,18 +19724,18 @@ - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF --#line 19721 "configure" -+#line 19727 "configure" - #include "confdefs.h" - #include - Syntax error - _ACEOF --if { (eval echo "$as_me:19726: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:19732: \"$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:19732: \$? = $ac_status" >&5 -+ echo "$as_me:19738: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag -@@ -19752,17 +19758,17 @@ - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF --#line 19755 "configure" -+#line 19761 "configure" - #include "confdefs.h" - #include - _ACEOF --if { (eval echo "$as_me:19759: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:19765: \"$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:19765: \$? = $ac_status" >&5 -+ echo "$as_me:19771: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag -@@ -19790,7 +19796,7 @@ - if $ac_preproc_ok; then - : - else -- { { echo "$as_me:19793: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 -+ { { echo "$as_me:19799: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 - echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} - { (exit 1); exit 1; }; } - fi -@@ -19805,23 +19811,23 @@ - for ac_header in typeinfo - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:19808: checking for $ac_header" >&5 -+echo "$as_me:19814: 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 19814 "configure" -+#line 19820 "configure" - #include "confdefs.h" - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:19818: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:19824: \"$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:19824: \$? = $ac_status" >&5 -+ echo "$as_me:19830: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag -@@ -19840,7 +19846,7 @@ - fi - rm -f conftest.err conftest.$ac_ext - fi --echo "$as_me:19843: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "$as_me:19849: 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 <&5 -+echo "$as_me:19862: 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 19862 "configure" -+#line 19868 "configure" - #include "confdefs.h" - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:19866: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:19872: \"$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:19872: \$? = $ac_status" >&5 -+ echo "$as_me:19878: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag -@@ -19888,7 +19894,7 @@ - fi - rm -f conftest.err conftest.$ac_ext - fi --echo "$as_me:19891: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "$as_me:19897: 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 <&5 -+ echo "$as_me:19908: checking if iostream uses std-namespace" >&5 - echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line 19905 "configure" -+#line 19911 "configure" - #include "confdefs.h" - - #include -@@ -19919,16 +19925,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:19922: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:19928: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:19925: \$? = $ac_status" >&5 -+ echo "$as_me:19931: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:19928: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:19934: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:19931: \$? = $ac_status" >&5 -+ echo "$as_me:19937: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_iostream_namespace=yes - else -@@ -19937,7 +19943,7 @@ - cf_iostream_namespace=no - fi - rm -f conftest.$ac_objext conftest.$ac_ext -- echo "$as_me:19940: result: $cf_iostream_namespace" >&5 -+ echo "$as_me:19946: result: $cf_iostream_namespace" >&5 - echo "${ECHO_T}$cf_iostream_namespace" >&6 - if test "$cf_iostream_namespace" = yes ; then - -@@ -19948,7 +19954,7 @@ - fi - fi - --echo "$as_me:19951: checking if we should include stdbool.h" >&5 -+echo "$as_me:19957: checking if we should include stdbool.h" >&5 - echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 - - if test "${cf_cv_header_stdbool_h+set}" = set; then -@@ -19956,7 +19962,7 @@ - else - - cat >conftest.$ac_ext <<_ACEOF --#line 19959 "configure" -+#line 19965 "configure" - #include "confdefs.h" - - int -@@ -19968,23 +19974,23 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:19971: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:19977: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:19974: \$? = $ac_status" >&5 -+ echo "$as_me:19980: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:19977: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:19983: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:19980: \$? = $ac_status" >&5 -+ echo "$as_me:19986: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_header_stdbool_h=0 - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF --#line 19987 "configure" -+#line 19993 "configure" - #include "confdefs.h" - - #ifndef __BEOS__ -@@ -20000,16 +20006,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:20003: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:20009: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:20006: \$? = $ac_status" >&5 -+ echo "$as_me:20012: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:20009: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:20015: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:20012: \$? = $ac_status" >&5 -+ echo "$as_me:20018: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_header_stdbool_h=1 - else -@@ -20023,13 +20029,13 @@ - fi - - if test "$cf_cv_header_stdbool_h" = 1 --then echo "$as_me:20026: result: yes" >&5 -+then echo "$as_me:20032: result: yes" >&5 - echo "${ECHO_T}yes" >&6 --else echo "$as_me:20028: result: no" >&5 -+else echo "$as_me:20034: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - --echo "$as_me:20032: checking for builtin bool type" >&5 -+echo "$as_me:20038: checking for builtin bool type" >&5 - echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 - - if test "${cf_cv_builtin_bool+set}" = set; then -@@ -20037,7 +20043,7 @@ - else - - cat >conftest.$ac_ext <<_ACEOF --#line 20040 "configure" -+#line 20046 "configure" - #include "confdefs.h" - - #include -@@ -20052,16 +20058,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:20055: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:20061: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:20058: \$? = $ac_status" >&5 -+ echo "$as_me:20064: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:20061: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:20067: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:20064: \$? = $ac_status" >&5 -+ echo "$as_me:20070: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_builtin_bool=1 - else -@@ -20074,13 +20080,13 @@ - fi - - if test "$cf_cv_builtin_bool" = 1 --then echo "$as_me:20077: result: yes" >&5 -+then echo "$as_me:20083: result: yes" >&5 - echo "${ECHO_T}yes" >&6 --else echo "$as_me:20079: result: no" >&5 -+else echo "$as_me:20085: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - --echo "$as_me:20083: checking for size of bool" >&5 -+echo "$as_me:20089: checking for size of bool" >&5 - echo $ECHO_N "checking for size of bool... $ECHO_C" >&6 - if test "${cf_cv_type_of_bool+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -20091,7 +20097,7 @@ - cf_cv_type_of_bool=unknown - else - cat >conftest.$ac_ext <<_ACEOF --#line 20094 "configure" -+#line 20100 "configure" - #include "confdefs.h" - - #include -@@ -20133,15 +20139,15 @@ - - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:20136: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:20142: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:20139: \$? = $ac_status" >&5 -+ echo "$as_me:20145: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:20141: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:20147: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:20144: \$? = $ac_status" >&5 -+ echo "$as_me:20150: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_type_of_bool=`cat cf_test.out` - if test -z "$cf_cv_type_of_bool"; then -@@ -20159,18 +20165,18 @@ - fi - - rm -f cf_test.out --echo "$as_me:20162: result: $cf_cv_type_of_bool" >&5 -+echo "$as_me:20168: result: $cf_cv_type_of_bool" >&5 - echo "${ECHO_T}$cf_cv_type_of_bool" >&6 - if test "$cf_cv_type_of_bool" = unknown ; then - case .$NCURSES_BOOL in - (.auto|.) NCURSES_BOOL=unsigned;; - esac -- { echo "$as_me:20168: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 -+ { echo "$as_me:20174: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 - echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} - cf_cv_type_of_bool=$NCURSES_BOOL - fi - --echo "$as_me:20173: checking for special defines needed for etip.h" >&5 -+echo "$as_me:20179: checking for special defines needed for etip.h" >&5 - echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6 - cf_save_CXXFLAGS="$CXXFLAGS" - cf_result="none" -@@ -20188,7 +20194,7 @@ - test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}" - test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}" - cat >conftest.$ac_ext <<_ACEOF --#line 20191 "configure" -+#line 20197 "configure" - #include "confdefs.h" - - #include -@@ -20202,16 +20208,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:20205: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:20211: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:20208: \$? = $ac_status" >&5 -+ echo "$as_me:20214: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:20211: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:20217: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:20214: \$? = $ac_status" >&5 -+ echo "$as_me:20220: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - test -n "$cf_math" && cat >>confdefs.h <&5 -+echo "$as_me:20241: result: $cf_result" >&5 - echo "${ECHO_T}$cf_result" >&6 - CXXFLAGS="$cf_save_CXXFLAGS" - - if test -n "$CXX"; then --echo "$as_me:20240: checking if $CXX accepts parameter initialization" >&5 -+echo "$as_me:20246: checking if $CXX accepts parameter initialization" >&5 - echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6 - if test "${cf_cv_cpp_param_init+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -20254,7 +20260,7 @@ - cf_cv_cpp_param_init=unknown - else - cat >conftest.$ac_ext <<_ACEOF --#line 20257 "configure" -+#line 20263 "configure" - #include "confdefs.h" - - class TEST { -@@ -20273,15 +20279,15 @@ - - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:20276: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:20282: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:20279: \$? = $ac_status" >&5 -+ echo "$as_me:20285: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:20281: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:20287: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:20284: \$? = $ac_status" >&5 -+ echo "$as_me:20290: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_cpp_param_init=yes - else -@@ -20300,7 +20306,7 @@ - ac_main_return=return - - fi --echo "$as_me:20303: result: $cf_cv_cpp_param_init" >&5 -+echo "$as_me:20309: result: $cf_cv_cpp_param_init" >&5 - echo "${ECHO_T}$cf_cv_cpp_param_init" >&6 - fi - test "$cf_cv_cpp_param_init" = yes && -@@ -20310,7 +20316,7 @@ - - if test -n "$CXX"; then - --echo "$as_me:20313: checking if $CXX accepts static_cast" >&5 -+echo "$as_me:20319: checking if $CXX accepts static_cast" >&5 - echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6 - if test "${cf_cv_cpp_static_cast+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -20324,7 +20330,7 @@ - ac_main_return=return - - cat >conftest.$ac_ext <<_ACEOF --#line 20327 "configure" -+#line 20333 "configure" - #include "confdefs.h" - - class NCursesPanel -@@ -20368,16 +20374,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:20371: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:20377: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:20374: \$? = $ac_status" >&5 -+ echo "$as_me:20380: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:20377: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:20383: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:20380: \$? = $ac_status" >&5 -+ echo "$as_me:20386: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_cpp_static_cast=yes - else -@@ -20395,7 +20401,7 @@ - ac_main_return=return - - fi --echo "$as_me:20398: result: $cf_cv_cpp_static_cast" >&5 -+echo "$as_me:20404: result: $cf_cv_cpp_static_cast" >&5 - echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 - - fi -@@ -20444,7 +20450,7 @@ - else - if test "$cf_cv_header_stdbool_h" = 1 ; then - --echo "$as_me:20447: checking for size of bool" >&5 -+echo "$as_me:20453: checking for size of bool" >&5 - echo $ECHO_N "checking for size of bool... $ECHO_C" >&6 - if test "${cf_cv_type_of_bool+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -20455,7 +20461,7 @@ - cf_cv_type_of_bool=unknown - else - cat >conftest.$ac_ext <<_ACEOF --#line 20458 "configure" -+#line 20464 "configure" - #include "confdefs.h" - - #include -@@ -20497,15 +20503,15 @@ - - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:20500: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:20506: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:20503: \$? = $ac_status" >&5 -+ echo "$as_me:20509: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:20505: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:20511: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:20508: \$? = $ac_status" >&5 -+ echo "$as_me:20514: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_type_of_bool=`cat cf_test.out` - if test -z "$cf_cv_type_of_bool"; then -@@ -20523,25 +20529,25 @@ - fi - - rm -f cf_test.out --echo "$as_me:20526: result: $cf_cv_type_of_bool" >&5 -+echo "$as_me:20532: result: $cf_cv_type_of_bool" >&5 - echo "${ECHO_T}$cf_cv_type_of_bool" >&6 - if test "$cf_cv_type_of_bool" = unknown ; then - case .$NCURSES_BOOL in - (.auto|.) NCURSES_BOOL=unsigned;; - esac -- { echo "$as_me:20532: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 -+ { echo "$as_me:20538: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 - echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} - cf_cv_type_of_bool=$NCURSES_BOOL - fi - - else -- echo "$as_me:20538: checking for fallback type of bool" >&5 -+ echo "$as_me:20544: checking for fallback type of bool" >&5 - echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6 - case "$host_cpu" in - (i?86) cf_cv_type_of_bool=char ;; - (*) cf_cv_type_of_bool=int ;; - esac -- echo "$as_me:20544: result: $cf_cv_type_of_bool" >&5 -+ echo "$as_me:20550: result: $cf_cv_type_of_bool" >&5 - echo "${ECHO_T}$cf_cv_type_of_bool" >&6 - fi - fi -@@ -20570,7 +20576,7 @@ - - if test "$cf_with_ada" != "no" ; then - if test "$with_libtool" != "no"; then -- { echo "$as_me:20573: WARNING: libtool does not support Ada - disabling feature" >&5 -+ { echo "$as_me:20579: WARNING: libtool does not support Ada - disabling feature" >&5 - echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;} - cf_with_ada=no - fi -@@ -20581,7 +20587,7 @@ - cf_ada_make=gnatmake - # Extract the first word of "$cf_ada_make", so it can be a program name with args. - set dummy $cf_ada_make; ac_word=$2 --echo "$as_me:20584: checking for $ac_word" >&5 -+echo "$as_me:20590: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_gnat_exists+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -20596,7 +20602,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_gnat_exists="yes" --echo "$as_me:20599: found $ac_dir/$ac_word" >&5 -+echo "$as_me:20605: found $ac_dir/$ac_word" >&5 - break - done - -@@ -20605,10 +20611,10 @@ - fi - gnat_exists=$ac_cv_prog_gnat_exists - if test -n "$gnat_exists"; then -- echo "$as_me:20608: result: $gnat_exists" >&5 -+ echo "$as_me:20614: result: $gnat_exists" >&5 - echo "${ECHO_T}$gnat_exists" >&6 - else -- echo "$as_me:20611: result: no" >&5 -+ echo "$as_me:20617: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -20617,12 +20623,12 @@ - cf_cv_prog_gnat_correct=no - else - --echo "$as_me:20620: checking for gnat version" >&5 -+echo "$as_me:20626: checking for gnat version" >&5 - echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 - cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \ - grep '[0-9].[0-9][0-9]*' |\ - sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` --echo "$as_me:20625: result: $cf_gnat_version" >&5 -+echo "$as_me:20631: result: $cf_gnat_version" >&5 - echo "${ECHO_T}$cf_gnat_version" >&6 - - case $cf_gnat_version in -@@ -20630,7 +20636,7 @@ - cf_cv_prog_gnat_correct=yes - ;; - (*) -- { echo "$as_me:20633: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 -+ { echo "$as_me:20639: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 - echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} - cf_cv_prog_gnat_correct=no - ;; -@@ -20638,7 +20644,7 @@ - - # Extract the first word of "m4", so it can be a program name with args. - set dummy m4; ac_word=$2 --echo "$as_me:20641: checking for $ac_word" >&5 -+echo "$as_me:20647: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_M4_exists+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -20653,7 +20659,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_M4_exists="yes" --echo "$as_me:20656: found $ac_dir/$ac_word" >&5 -+echo "$as_me:20662: found $ac_dir/$ac_word" >&5 - break - done - -@@ -20662,10 +20668,10 @@ - fi - M4_exists=$ac_cv_prog_M4_exists - if test -n "$M4_exists"; then -- echo "$as_me:20665: result: $M4_exists" >&5 -+ echo "$as_me:20671: result: $M4_exists" >&5 - echo "${ECHO_T}$M4_exists" >&6 - else -- echo "$as_me:20668: result: no" >&5 -+ echo "$as_me:20674: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -20674,7 +20680,7 @@ - echo Ada95 binding required program m4 not found. Ada95 binding disabled. - fi - if test "$cf_cv_prog_gnat_correct" = yes; then -- echo "$as_me:20677: checking if GNAT works" >&5 -+ echo "$as_me:20683: checking if GNAT works" >&5 - echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 - - rm -rf conftest* *~conftest* -@@ -20702,7 +20708,7 @@ - fi - rm -rf conftest* *~conftest* - -- echo "$as_me:20705: result: $cf_cv_prog_gnat_correct" >&5 -+ echo "$as_me:20711: result: $cf_cv_prog_gnat_correct" >&5 - echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 - fi - fi -@@ -20711,7 +20717,7 @@ - - ADAFLAGS="$ADAFLAGS -gnatpn" - -- echo "$as_me:20714: checking optimization options for ADAFLAGS" >&5 -+ echo "$as_me:20720: checking optimization options for ADAFLAGS" >&5 - echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 - case "$CFLAGS" in - (*-g*) -@@ -20728,10 +20734,10 @@ - - ;; - esac -- echo "$as_me:20731: result: $ADAFLAGS" >&5 -+ echo "$as_me:20737: result: $ADAFLAGS" >&5 - echo "${ECHO_T}$ADAFLAGS" >&6 - --echo "$as_me:20734: checking if GNATPREP supports -T option" >&5 -+echo "$as_me:20740: checking if GNATPREP supports -T option" >&5 - echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6 - if test "${cf_cv_gnatprep_opt_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -20741,11 +20747,11 @@ - gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes - - fi --echo "$as_me:20744: result: $cf_cv_gnatprep_opt_t" >&5 -+echo "$as_me:20750: result: $cf_cv_gnatprep_opt_t" >&5 - echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6 - test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS" - --echo "$as_me:20748: checking if GNAT supports generics" >&5 -+echo "$as_me:20754: checking if GNAT supports generics" >&5 - echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 - case $cf_gnat_version in - (3.[1-9]*|[4-9].*) -@@ -20755,7 +20761,7 @@ - cf_gnat_generics=no - ;; - esac --echo "$as_me:20758: result: $cf_gnat_generics" >&5 -+echo "$as_me:20764: result: $cf_gnat_generics" >&5 - echo "${ECHO_T}$cf_gnat_generics" >&6 - - if test "$cf_gnat_generics" = yes -@@ -20767,7 +20773,7 @@ - cf_generic_objects= - fi - --echo "$as_me:20770: checking if GNAT supports SIGINT" >&5 -+echo "$as_me:20776: checking if GNAT supports SIGINT" >&5 - echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6 - if test "${cf_cv_gnat_sigint+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -20815,7 +20821,7 @@ - rm -rf conftest* *~conftest* - - fi --echo "$as_me:20818: result: $cf_cv_gnat_sigint" >&5 -+echo "$as_me:20824: result: $cf_cv_gnat_sigint" >&5 - echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 - - if test $cf_cv_gnat_sigint = yes ; then -@@ -20828,7 +20834,7 @@ - cf_gnat_projects=no - - if test "$enable_gnat_projects" != no ; then --echo "$as_me:20831: checking if GNAT supports project files" >&5 -+echo "$as_me:20837: checking if GNAT supports project files" >&5 - echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 - case $cf_gnat_version in - (3.[0-9]*) -@@ -20888,15 +20894,15 @@ - esac - ;; - esac --echo "$as_me:20891: result: $cf_gnat_projects" >&5 -+echo "$as_me:20897: result: $cf_gnat_projects" >&5 - echo "${ECHO_T}$cf_gnat_projects" >&6 - fi # enable_gnat_projects - - if test $cf_gnat_projects = yes - then -- echo "$as_me:20897: checking if GNAT supports libraries" >&5 -+ echo "$as_me:20903: checking if GNAT supports libraries" >&5 - echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 -- echo "$as_me:20899: result: $cf_gnat_libraries" >&5 -+ echo "$as_me:20905: result: $cf_gnat_libraries" >&5 - echo "${ECHO_T}$cf_gnat_libraries" >&6 - fi - -@@ -20916,7 +20922,7 @@ - USE_GNAT_LIBRARIES="#" - fi - --echo "$as_me:20919: checking for ada-compiler" >&5 -+echo "$as_me:20925: checking for ada-compiler" >&5 - echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6 - - # Check whether --with-ada-compiler or --without-ada-compiler was given. -@@ -20927,12 +20933,12 @@ - cf_ada_compiler=gnatmake - fi; - --echo "$as_me:20930: result: $cf_ada_compiler" >&5 -+echo "$as_me:20936: result: $cf_ada_compiler" >&5 - echo "${ECHO_T}$cf_ada_compiler" >&6 - - cf_ada_package=terminal_interface - --echo "$as_me:20935: checking for ada-include" >&5 -+echo "$as_me:20941: checking for ada-include" >&5 - echo $ECHO_N "checking for ada-include... $ECHO_C" >&6 - - # Check whether --with-ada-include or --without-ada-include was given. -@@ -20968,7 +20974,7 @@ - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` - ;; - (*) -- { { echo "$as_me:20971: error: expected a pathname, not \"$withval\"" >&5 -+ { { echo "$as_me:20977: error: expected a pathname, not \"$withval\"" >&5 - echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} - { (exit 1); exit 1; }; } - ;; -@@ -20977,10 +20983,10 @@ - fi - eval ADA_INCLUDE="$withval" - --echo "$as_me:20980: result: $ADA_INCLUDE" >&5 -+echo "$as_me:20986: result: $ADA_INCLUDE" >&5 - echo "${ECHO_T}$ADA_INCLUDE" >&6 - --echo "$as_me:20983: checking for ada-objects" >&5 -+echo "$as_me:20989: checking for ada-objects" >&5 - echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6 - - # Check whether --with-ada-objects or --without-ada-objects was given. -@@ -21016,7 +21022,7 @@ - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` - ;; - (*) -- { { echo "$as_me:21019: error: expected a pathname, not \"$withval\"" >&5 -+ { { echo "$as_me:21025: error: expected a pathname, not \"$withval\"" >&5 - echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} - { (exit 1); exit 1; }; } - ;; -@@ -21025,10 +21031,10 @@ - fi - eval ADA_OBJECTS="$withval" - --echo "$as_me:21028: result: $ADA_OBJECTS" >&5 -+echo "$as_me:21034: result: $ADA_OBJECTS" >&5 - echo "${ECHO_T}$ADA_OBJECTS" >&6 - --echo "$as_me:21031: checking if an Ada95 shared-library should be built" >&5 -+echo "$as_me:21037: checking if an Ada95 shared-library should be built" >&5 - echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6 - - # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given. -@@ -21038,7 +21044,7 @@ - else - with_ada_sharedlib=no - fi; --echo "$as_me:21041: result: $with_ada_sharedlib" >&5 -+echo "$as_me:21047: result: $with_ada_sharedlib" >&5 - echo "${ECHO_T}$with_ada_sharedlib" >&6 - - ADA_SHAREDLIB='lib$(LIB_NAME).so.1' -@@ -21061,13 +21067,13 @@ - - # do this "late" to avoid conflict with header-checks - if test "x$with_widec" = xyes ; then -- echo "$as_me:21064: checking for wchar_t" >&5 -+ echo "$as_me:21070: checking for wchar_t" >&5 - echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6 - if test "${ac_cv_type_wchar_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 21070 "configure" -+#line 21076 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -21082,16 +21088,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:21085: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:21091: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:21088: \$? = $ac_status" >&5 -+ echo "$as_me:21094: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:21091: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:21097: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:21094: \$? = $ac_status" >&5 -+ echo "$as_me:21100: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_wchar_t=yes - else -@@ -21101,10 +21107,10 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:21104: result: $ac_cv_type_wchar_t" >&5 -+echo "$as_me:21110: result: $ac_cv_type_wchar_t" >&5 - echo "${ECHO_T}$ac_cv_type_wchar_t" >&6 - --echo "$as_me:21107: checking size of wchar_t" >&5 -+echo "$as_me:21113: checking size of wchar_t" >&5 - echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6 - if test "${ac_cv_sizeof_wchar_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -21113,7 +21119,7 @@ - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. - cat >conftest.$ac_ext <<_ACEOF --#line 21116 "configure" -+#line 21122 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -21125,21 +21131,21 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:21128: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:21134: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:21131: \$? = $ac_status" >&5 -+ echo "$as_me:21137: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:21134: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:21140: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:21137: \$? = $ac_status" >&5 -+ echo "$as_me:21143: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF --#line 21142 "configure" -+#line 21148 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -21151,16 +21157,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:21154: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:21160: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:21157: \$? = $ac_status" >&5 -+ echo "$as_me:21163: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:21160: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:21166: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:21163: \$? = $ac_status" >&5 -+ echo "$as_me:21169: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_hi=$ac_mid; break - else -@@ -21176,7 +21182,7 @@ - ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF --#line 21179 "configure" -+#line 21185 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -21188,16 +21194,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:21191: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:21197: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:21194: \$? = $ac_status" >&5 -+ echo "$as_me:21200: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:21197: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:21203: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:21200: \$? = $ac_status" >&5 -+ echo "$as_me:21206: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_lo=$ac_mid; break - else -@@ -21213,7 +21219,7 @@ - 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 21216 "configure" -+#line 21222 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -21225,16 +21231,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:21228: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:21234: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:21231: \$? = $ac_status" >&5 -+ echo "$as_me:21237: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:21234: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:21240: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:21237: \$? = $ac_status" >&5 -+ echo "$as_me:21243: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_hi=$ac_mid - else -@@ -21247,12 +21253,12 @@ - ac_cv_sizeof_wchar_t=$ac_lo - else - if test "$cross_compiling" = yes; then -- { { echo "$as_me:21250: error: cannot run test program while cross compiling" >&5 -+ { { echo "$as_me:21256: 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 21255 "configure" -+#line 21261 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -21268,15 +21274,15 @@ - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:21271: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:21277: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:21274: \$? = $ac_status" >&5 -+ echo "$as_me:21280: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:21276: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:21282: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:21279: \$? = $ac_status" >&5 -+ echo "$as_me:21285: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_wchar_t=`cat conftest.val` - else -@@ -21292,7 +21298,7 @@ - ac_cv_sizeof_wchar_t=0 - fi - fi --echo "$as_me:21295: result: $ac_cv_sizeof_wchar_t" >&5 -+echo "$as_me:21301: result: $ac_cv_sizeof_wchar_t" >&5 - echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6 - cat >>confdefs.h <&5 -+echo "$as_me:21319: checking for library subsets" >&5 - echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 - LIB_SUBSETS= - -@@ -21352,7 +21358,7 @@ - test "x$with_widec" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar" - test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs" - --echo "$as_me:21355: result: $LIB_SUBSETS" >&5 -+echo "$as_me:21361: result: $LIB_SUBSETS" >&5 - echo "${ECHO_T}$LIB_SUBSETS" >&6 - - ### Construct the list of include-directories to be generated -@@ -21383,7 +21389,7 @@ - fi - - ### Build up pieces for makefile rules --echo "$as_me:21386: checking default library suffix" >&5 -+echo "$as_me:21392: checking default library suffix" >&5 - echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 - - case $DFT_LWR_MODEL in -@@ -21394,10 +21400,10 @@ - (shared) DFT_ARG_SUFFIX='' ;; - esac - test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" --echo "$as_me:21397: result: $DFT_ARG_SUFFIX" >&5 -+echo "$as_me:21403: result: $DFT_ARG_SUFFIX" >&5 - echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 - --echo "$as_me:21400: checking default library-dependency suffix" >&5 -+echo "$as_me:21406: checking default library-dependency suffix" >&5 - echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 - - case X$DFT_LWR_MODEL in -@@ -21455,10 +21461,10 @@ - DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}" - DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}" - fi --echo "$as_me:21458: result: $DFT_DEP_SUFFIX" >&5 -+echo "$as_me:21464: result: $DFT_DEP_SUFFIX" >&5 - echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 - --echo "$as_me:21461: checking default object directory" >&5 -+echo "$as_me:21467: checking default object directory" >&5 - echo $ECHO_N "checking default object directory... $ECHO_C" >&6 - - case $DFT_LWR_MODEL in -@@ -21474,11 +21480,11 @@ - DFT_OBJ_SUBDIR='obj_s' ;; - esac - esac --echo "$as_me:21477: result: $DFT_OBJ_SUBDIR" >&5 -+echo "$as_me:21483: result: $DFT_OBJ_SUBDIR" >&5 - echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 - - if test "x$cf_with_cxx" = xyes ; then --echo "$as_me:21481: checking c++ library-dependency suffix" >&5 -+echo "$as_me:21487: checking c++ library-dependency suffix" >&5 - echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6 - if test "$with_libtool" != "no"; then - # libtool thinks it can make c++ shared libraries (perhaps only g++) -@@ -21546,7 +21552,7 @@ - fi - - fi --echo "$as_me:21549: result: $CXX_LIB_SUFFIX" >&5 -+echo "$as_me:21555: result: $CXX_LIB_SUFFIX" >&5 - echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 - - fi -@@ -21719,19 +21725,19 @@ - - if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED" - then -- echo "$as_me:21722: checking if linker supports switching between static/dynamic" >&5 -+ echo "$as_me:21728: checking if linker supports switching between static/dynamic" >&5 - echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6 - - rm -f libconftest.a - cat >conftest.$ac_ext < - int cf_ldflags_static(FILE *fp) { return fflush(fp); } - EOF -- if { (eval echo "$as_me:21731: \"$ac_compile\"") >&5 -+ if { (eval echo "$as_me:21737: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:21734: \$? = $ac_status" >&5 -+ echo "$as_me:21740: \$? = $ac_status" >&5 - (exit $ac_status); } ; then - ( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null - ( eval $RANLIB libconftest.a ) 2>&5 >/dev/null -@@ -21742,10 +21748,10 @@ - - LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 21745 "configure" -+#line 21751 "configure" - #include "confdefs.h" - --#line 21748 "configure" -+#line 21754 "configure" - #include - int cf_ldflags_static(FILE *fp); - -@@ -21760,16 +21766,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:21763: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:21769: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:21766: \$? = $ac_status" >&5 -+ echo "$as_me:21772: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:21769: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:21775: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:21772: \$? = $ac_status" >&5 -+ echo "$as_me:21778: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - # some linkers simply ignore the -dynamic -@@ -21792,7 +21798,7 @@ - rm -f libconftest.* - LIBS="$cf_save_LIBS" - -- echo "$as_me:21795: result: $cf_ldflags_static" >&5 -+ echo "$as_me:21801: result: $cf_ldflags_static" >&5 - echo "${ECHO_T}$cf_ldflags_static" >&6 - - if test $cf_ldflags_static != yes -@@ -21808,7 +21814,7 @@ - ;; - esac - --echo "$as_me:21811: checking where we will install curses.h" >&5 -+echo "$as_me:21817: checking where we will install curses.h" >&5 - echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 - - includesubdir= -@@ -21818,7 +21824,7 @@ - then - includesubdir="/ncurses${USE_LIB_SUFFIX}" - fi --echo "$as_me:21821: result: ${includedir}${includesubdir}" >&5 -+echo "$as_me:21827: result: ${includedir}${includesubdir}" >&5 - echo "${ECHO_T}${includedir}${includesubdir}" >&6 - - ### Resolve a conflict between normal and wide-curses by forcing applications -@@ -21826,7 +21832,7 @@ - if test "$with_overwrite" != no ; then - if test "$NCURSES_LIBUTF8" = 1 ; then - NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)' -- { echo "$as_me:21829: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 -+ { echo "$as_me:21835: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 - echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;} - fi - fi -@@ -21844,7 +21850,7 @@ - ### Construct the list of subdirectories for which we'll customize makefiles - ### with the appropriate compile-rules. - --echo "$as_me:21847: checking for src modules" >&5 -+echo "$as_me:21853: checking for src modules" >&5 - echo $ECHO_N "checking for src modules... $ECHO_C" >&6 - - # dependencies and linker-arguments for test-programs -@@ -21909,7 +21915,7 @@ - fi - fi - done --echo "$as_me:21912: result: $cf_cv_src_modules" >&5 -+echo "$as_me:21918: result: $cf_cv_src_modules" >&5 - echo "${ECHO_T}$cf_cv_src_modules" >&6 - - TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" -@@ -22129,7 +22135,7 @@ - - # Extract the first word of "tic", so it can be a program name with args. - set dummy tic; ac_word=$2 --echo "$as_me:22132: checking for $ac_word" >&5 -+echo "$as_me:22138: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_path_TIC_PATH+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -22146,7 +22152,7 @@ - test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_TIC_PATH="$ac_dir/$ac_word" -- echo "$as_me:22149: found $ac_dir/$ac_word" >&5 -+ echo "$as_me:22155: found $ac_dir/$ac_word" >&5 - break - fi - done -@@ -22158,10 +22164,10 @@ - TIC_PATH=$ac_cv_path_TIC_PATH - - if test -n "$TIC_PATH"; then -- echo "$as_me:22161: result: $TIC_PATH" >&5 -+ echo "$as_me:22167: result: $TIC_PATH" >&5 - echo "${ECHO_T}$TIC_PATH" >&6 - else -- echo "$as_me:22164: result: no" >&5 -+ echo "$as_me:22170: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -22169,7 +22175,7 @@ - then - if test "$TIC_PATH" = unknown - then -- { echo "$as_me:22172: WARNING: no tic program found for fallbacks" >&5 -+ { echo "$as_me:22178: WARNING: no tic program found for fallbacks" >&5 - echo "$as_me: WARNING: no tic program found for fallbacks" >&2;} - fi - fi -@@ -22195,7 +22201,7 @@ - (*-D_XOPEN_SOURCE_EXTENDED*) - test -n "$verbose" && echo " moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6 - --echo "${as_me:-configure}:22198: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 -+echo "${as_me:-configure}:22204: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 - - CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED" - CPPFLAGS=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'` -@@ -22206,7 +22212,7 @@ - - # Help to automatically enable the extended curses features when using either - # the *-config or the ".pc" files by adding defines. --echo "$as_me:22209: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5 -+echo "$as_me:22215: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5 - echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6 - PKG_CFLAGS= - for cf_loop1 in $CPPFLAGS_after_XOPEN -@@ -22222,7 +22228,7 @@ - done - test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1" - done --echo "$as_me:22225: result: $PKG_CFLAGS" >&5 -+echo "$as_me:22231: result: $PKG_CFLAGS" >&5 - echo "${ECHO_T}$PKG_CFLAGS" >&6 - - # AC_CHECK_SIZEOF demands a literal parameter, no variables. So we do this. -@@ -22279,7 +22285,7 @@ - cf_filter_syms=$cf_dft_filter_syms - test -n "$verbose" && echo " will map symbols to ABI=$cf_cv_abi_version" 1>&6 - --echo "${as_me:-configure}:22282: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 -+echo "${as_me:-configure}:22288: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 - - fi - -@@ -22381,7 +22387,7 @@ - : ${CONFIG_STATUS=./config.status} - ac_clean_files_save=$ac_clean_files - ac_clean_files="$ac_clean_files $CONFIG_STATUS" --{ echo "$as_me:22384: creating $CONFIG_STATUS" >&5 -+{ echo "$as_me:22390: creating $CONFIG_STATUS" >&5 - echo "$as_me: creating $CONFIG_STATUS" >&6;} - cat >$CONFIG_STATUS <<_ACEOF - #! $SHELL -@@ -22557,7 +22563,7 @@ - echo "$ac_cs_version"; exit 0 ;; - --he | --h) - # Conflict between --help and --header -- { { echo "$as_me:22560: error: ambiguous option: $1 -+ { { echo "$as_me:22566: 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;} -@@ -22576,7 +22582,7 @@ - ac_need_defaults=false;; - - # This is an error. -- -*) { { echo "$as_me:22579: error: unrecognized option: $1 -+ -*) { { echo "$as_me:22585: 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;} -@@ -22694,7 +22700,7 @@ - "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; - "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; -- *) { { echo "$as_me:22697: error: invalid argument: $ac_config_target" >&5 -+ *) { { echo "$as_me:22703: error: invalid argument: $ac_config_target" >&5 - echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; - esac -@@ -23149,7 +23155,7 @@ - esac - - if test x"$ac_file" != x-; then -- { echo "$as_me:23152: creating $ac_file" >&5 -+ { echo "$as_me:23158: creating $ac_file" >&5 - echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi -@@ -23167,7 +23173,7 @@ - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:23170: error: cannot find input file: $f" >&5 -+ test -f "$f" || { { echo "$as_me:23176: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo $f;; -@@ -23180,7 +23186,7 @@ - echo $srcdir/$f - else - # /dev/null tree -- { { echo "$as_me:23183: error: cannot find input file: $f" >&5 -+ { { echo "$as_me:23189: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; -@@ -23196,7 +23202,7 @@ - if test -n "$ac_seen"; then - ac_used=`grep '@datarootdir@' $ac_item` - if test -z "$ac_used"; then -- { echo "$as_me:23199: WARNING: datarootdir was used implicitly but not set: -+ { echo "$as_me:23205: 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;} -@@ -23205,7 +23211,7 @@ - fi - ac_seen=`grep '${datarootdir}' $ac_item` - if test -n "$ac_seen"; then -- { echo "$as_me:23208: WARNING: datarootdir was used explicitly but not set: -+ { echo "$as_me:23214: 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;} -@@ -23242,7 +23248,7 @@ - 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:23245: WARNING: Variable $ac_name is used but was not set: -+ { echo "$as_me:23251: 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;} -@@ -23253,7 +23259,7 @@ - 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:23256: WARNING: Some variables may not be substituted: -+ { echo "$as_me:23262: WARNING: Some variables may not be substituted: - $ac_seen" >&5 - echo "$as_me: WARNING: Some variables may not be substituted: - $ac_seen" >&2;} -@@ -23302,7 +23308,7 @@ - * ) ac_file_in=$ac_file.in ;; - esac - -- test x"$ac_file" != x- && { echo "$as_me:23305: creating $ac_file" >&5 -+ test x"$ac_file" != x- && { echo "$as_me:23311: creating $ac_file" >&5 - echo "$as_me: creating $ac_file" >&6;} - - # First look for the input files in the build tree, otherwise in the -@@ -23313,7 +23319,7 @@ - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:23316: error: cannot find input file: $f" >&5 -+ test -f "$f" || { { echo "$as_me:23322: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo $f;; -@@ -23326,7 +23332,7 @@ - echo $srcdir/$f - else - # /dev/null tree -- { { echo "$as_me:23329: error: cannot find input file: $f" >&5 -+ { { echo "$as_me:23335: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; -@@ -23384,7 +23390,7 @@ - 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:23387: $ac_file is unchanged" >&5 -+ { echo "$as_me:23393: $ac_file is unchanged" >&5 - echo "$as_me: $ac_file is unchanged" >&6;} - else - ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -@@ -23722,7 +23728,7 @@ - (cygdll|msysdll|mingw) - test "x$with_shared_cxx" = xno && test -n "$verbose" && echo " overriding CXX_MODEL to SHARED" 1>&6 - --echo "${as_me:-configure}:23725: testing overriding CXX_MODEL to SHARED ..." 1>&5 -+echo "${as_me:-configure}:23731: testing overriding CXX_MODEL to SHARED ..." 1>&5 - - with_shared_cxx=yes - ;; -Index: dist.mk -Prereq: 1.1066 ---- ncurses-6.0-20150815+/dist.mk 2015-08-15 15:13:47.000000000 +0000 -+++ ncurses-6.0-20150822/dist.mk 2015-08-17 08:41:12.000000000 +0000 -@@ -25,7 +25,7 @@ - # use or other dealings in this Software without prior written # - # authorization. # - ############################################################################## --# $Id: dist.mk,v 1.1066 2015/08/15 15:13:47 tom Exp $ -+# $Id: dist.mk,v 1.1067 2015/08/17 08:41:12 tom Exp $ - # Makefile for creating ncurses distributions. - # - # This only needs to be used directly as a makefile by developers, but -@@ -37,7 +37,7 @@ - # These define the major/minor/patch versions of ncurses. - NCURSES_MAJOR = 6 - NCURSES_MINOR = 0 --NCURSES_PATCH = 20150815 -+NCURSES_PATCH = 20150822 - - # We don't append the patch to the version, since this only applies to releases - VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) -Index: include/term_entry.h -Prereq: 1.45 ---- ncurses-6.0-20150815+/include/term_entry.h 2014-11-01 14:47:00.000000000 +0000 -+++ ncurses-6.0-20150822/include/term_entry.h 2015-08-22 23:04:25.000000000 +0000 -@@ -1,5 +1,5 @@ - /**************************************************************************** -- * Copyright (c) 1998-2013,2014 Free Software Foundation, Inc. * -+ * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc. * - * * - * Permission is hereby granted, free of charge, to any person obtaining a * - * copy of this software and associated documentation files (the * -@@ -32,7 +32,7 @@ - * and: Thomas E. Dickey 1998-on * - ****************************************************************************/ - --/* $Id: term_entry.h,v 1.45 2014/11/01 14:47:00 tom Exp $ */ -+/* $Id: term_entry.h,v 1.46 2015/08/22 23:04:25 tom Exp $ */ - - /* - * term_entry.h -- interface to entry-manipulation code -@@ -106,9 +106,9 @@ - #define for_each_string(n,tp) for(n = 0; n < NUM_STRINGS(tp); n++) - - #if NCURSES_XNAMES --#define for_each_ext_boolean(n,tp) for(n = BOOLCOUNT; n < NUM_BOOLEANS(tp); n++) --#define for_each_ext_number(n,tp) for(n = NUMCOUNT; n < NUM_NUMBERS(tp); n++) --#define for_each_ext_string(n,tp) for(n = STRCOUNT; n < NUM_STRINGS(tp); n++) -+#define for_each_ext_boolean(n,tp) for(n = BOOLCOUNT; (int) n < (int) NUM_BOOLEANS(tp); n++) -+#define for_each_ext_number(n,tp) for(n = NUMCOUNT; (int) n < (int) NUM_NUMBERS(tp); n++) -+#define for_each_ext_string(n,tp) for(n = STRCOUNT; (int) n < (int) NUM_STRINGS(tp); n++) - #endif - - #define ExtBoolname(tp,i,names) EXT_NAMES(tp, i, BOOLCOUNT, (i - (tp->num_Booleans - tp->ext_Booleans)), names) -Index: man/curs_variables.3x -Prereq: 1.6 ---- ncurses-6.0-20150815+/man/curs_variables.3x 2013-12-21 18:41:32.000000000 +0000 -+++ ncurses-6.0-20150822/man/curs_variables.3x 2015-08-22 23:33:22.000000000 +0000 -@@ -1,5 +1,5 @@ - .\"*************************************************************************** --.\" Copyright (c) 2010,2013 Free Software Foundation, Inc. * -+.\" Copyright (c) 2010-2013,2015 Free Software Foundation, Inc. * - .\" * - .\" Permission is hereby granted, free of charge, to any person obtaining a * - .\" copy of this software and associated documentation files (the * -@@ -26,7 +26,7 @@ - .\" authorization. * - .\"*************************************************************************** - .\" --.\" $Id: curs_variables.3x,v 1.6 2013/12/21 18:41:32 tom Exp $ -+.\" $Id: curs_variables.3x,v 1.8 2015/08/22 23:33:22 tom Exp $ - .TH curs_variables 3X "" - .de bP - .IP \(bu 4 -@@ -127,6 +127,20 @@ - .SH PORTABILITY - ESCDELAY and TABSIZE are extensions, - not provided in most other implementations of curses. -+.PP -+ESCDELAY is an extension in AIX curses: -+.bP -+In AIX, the units for ESCDELAY are \fIfifths\fP of a millisecond. -+.bP -+The default value for AIX's ESCDELAY is 0.1 seconds. -+.bP -+AIX also enforces a limit of 10,000 seconds for ESCDELAY; -+this implementation currently has no upper limit. -+.PP -+This implementation has long used ESCDELAY with units of milliseconds, -+making it impossible to be completely compatible with AIX. -+Likewise, most users have either decided to override the value, -+or rely upon its default value. - .SH SEE ALSO - \fBcurses\fR(3X), - \fBcurs_opaque\fR(3X), -Index: ncurses/base/lib_color.c -Prereq: 1.110 ---- ncurses-6.0-20150815+/ncurses/base/lib_color.c 2014-03-08 20:04:44.000000000 +0000 -+++ ncurses-6.0-20150822/ncurses/base/lib_color.c 2015-08-22 22:38:58.000000000 +0000 -@@ -1,5 +1,5 @@ - /**************************************************************************** -- * Copyright (c) 1998-2013,2014 Free Software Foundation, Inc. * -+ * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc. * - * * - * Permission is hereby granted, free of charge, to any person obtaining a * - * copy of this software and associated documentation files (the * -@@ -45,7 +45,7 @@ - #define CUR SP_TERMTYPE - #endif - --MODULE_ID("$Id: lib_color.c,v 1.110 2014/03/08 20:04:44 tom Exp $") -+MODULE_ID("$Id: lib_color.c,v 1.111 2015/08/22 22:38:58 tom Exp $") - - #ifdef USE_TERM_DRIVER - #define CanChange InfoOf(SP_PARM).canchange -@@ -544,7 +544,7 @@ - - SP_PARM->_color_pairs[pair] = result; - if (GET_SCREEN_PAIR(SP_PARM) == pair) -- SET_SCREEN_PAIR(SP_PARM, (chtype) (~0)); /* force attribute update */ -+ SET_SCREEN_PAIR(SP_PARM, (int) (~0)); /* force attribute update */ - - #ifdef USE_TERM_DRIVER - CallDriver_3(SP_PARM, td_initpair, pair, f, b); -Index: package/debian-mingw/changelog ---- ncurses-6.0-20150815+/package/debian-mingw/changelog 2015-08-15 15:13:47.000000000 +0000 -+++ ncurses-6.0-20150822/package/debian-mingw/changelog 2015-08-17 08:41:12.000000000 +0000 -@@ -1,8 +1,8 @@ --ncurses6 (6.0+20150815) unstable; urgency=low -+ncurses6 (6.0+20150822) unstable; urgency=low - - * latest weekly patch - -- -- Thomas E. Dickey Sat, 15 Aug 2015 11:13:47 -0400 -+ -- Thomas E. Dickey Mon, 17 Aug 2015 04:41:12 -0400 - - ncurses6 (5.9-20131005) unstable; urgency=low - -Index: package/debian-mingw64/changelog ---- ncurses-6.0-20150815+/package/debian-mingw64/changelog 2015-08-15 15:13:47.000000000 +0000 -+++ ncurses-6.0-20150822/package/debian-mingw64/changelog 2015-08-17 08:41:12.000000000 +0000 -@@ -1,8 +1,8 @@ --ncurses6 (6.0+20150815) unstable; urgency=low -+ncurses6 (6.0+20150822) unstable; urgency=low - - * latest weekly patch - -- -- Thomas E. Dickey Sat, 15 Aug 2015 11:13:47 -0400 -+ -- Thomas E. Dickey Mon, 17 Aug 2015 04:41:12 -0400 - - ncurses6 (5.9-20131005) unstable; urgency=low - -Index: package/debian/changelog ---- ncurses-6.0-20150815+/package/debian/changelog 2015-08-15 15:13:47.000000000 +0000 -+++ ncurses-6.0-20150822/package/debian/changelog 2015-08-17 08:41:12.000000000 +0000 -@@ -1,8 +1,8 @@ --ncurses6 (6.0+20150815) unstable; urgency=low -+ncurses6 (6.0+20150822) unstable; urgency=low - - * latest weekly patch - -- -- Thomas E. Dickey Sat, 15 Aug 2015 11:13:47 -0400 -+ -- Thomas E. Dickey Mon, 17 Aug 2015 04:41:12 -0400 - - ncurses6 (5.9-20120608) unstable; urgency=low - -Index: package/mingw-ncurses.nsi -Prereq: 1.119 ---- ncurses-6.0-20150815+/package/mingw-ncurses.nsi 2015-08-15 15:13:47.000000000 +0000 -+++ ncurses-6.0-20150822/package/mingw-ncurses.nsi 2015-08-17 08:41:12.000000000 +0000 -@@ -1,4 +1,4 @@ --; $Id: mingw-ncurses.nsi,v 1.119 2015/08/15 15:13:47 tom Exp $ -+; $Id: mingw-ncurses.nsi,v 1.120 2015/08/17 08:41:12 tom Exp $ - - ; TODO add examples - ; TODO bump ABI to 6 -@@ -10,7 +10,7 @@ - !define VERSION_MAJOR "6" - !define VERSION_MINOR "0" - !define VERSION_YYYY "2015" --!define VERSION_MMDD "0815" -+!define VERSION_MMDD "0822" - !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} - - !define MY_ABI "5" -Index: package/mingw-ncurses.spec ---- ncurses-6.0-20150815+/package/mingw-ncurses.spec 2015-08-15 15:13:47.000000000 +0000 -+++ ncurses-6.0-20150822/package/mingw-ncurses.spec 2015-08-17 08:41:12.000000000 +0000 -@@ -3,7 +3,7 @@ - Summary: shared libraries for terminal handling - Name: mingw32-ncurses6 - Version: 6.0 --Release: 20150815 -+Release: 20150822 - License: X11 - Group: Development/Libraries - Source: ncurses-%{version}-%{release}.tgz -Index: package/ncurses.spec ---- ncurses-6.0-20150815+/package/ncurses.spec 2015-08-15 15:13:47.000000000 +0000 -+++ ncurses-6.0-20150822/package/ncurses.spec 2015-08-17 08:41:12.000000000 +0000 -@@ -1,7 +1,7 @@ - Summary: shared libraries for terminal handling - Name: ncurses6 - Version: 6.0 --Release: 20150815 -+Release: 20150822 - License: X11 - Group: Development/Libraries - Source: ncurses-%{version}-%{release}.tgz -Index: progs/infocmp.c -Prereq: 1.133 ---- ncurses-6.0-20150815+/progs/infocmp.c 2015-05-27 00:57:41.000000000 +0000 -+++ ncurses-6.0-20150822/progs/infocmp.c 2015-08-22 23:54:25.000000000 +0000 -@@ -42,7 +42,7 @@ - - #include - --MODULE_ID("$Id: infocmp.c,v 1.133 2015/05/27 00:57:41 tom Exp $") -+MODULE_ID("$Id: infocmp.c,v 1.134 2015/08/22 23:54:25 tom Exp $") - - #define L_CURL "{" - #define R_CURL "}" -@@ -1173,15 +1173,17 @@ - { - " -0 print single-row" - ," -1 print single-column" -- ," -K use termcap-names and BSD syntax" - ," -C use termcap-names" -+ ," -D print database locations" -+ ," -E format output as C tables" - ," -F compare terminfo-files" -+ ," -G format %{number} to %'char'" - ," -I use terminfo-names" -+ ," -K use termcap-names and BSD syntax" - ," -L use long names" - ," -R subset (see manpage)" - ," -T eliminate size limits (test)" - ," -U do not post-process entries" -- ," -D print database locations" - ," -V print version" - #if NCURSES_XNAMES - ," -a with -F, list commented-out caps" -@@ -1189,9 +1191,7 @@ - ," -c list common capabilities" - ," -d list different capabilities" - ," -e format output for C initializer" -- ," -E format output as C tables" - ," -f with -1, format complex strings" -- ," -G format %{number} to %'char'" - ," -g format %'char' to %{number}" - ," -i analyze initialization/reset" - ," -l output terminfo names" -Index: progs/tic.c -Prereq: 1.211 ---- ncurses-6.0-20150815+/progs/tic.c 2015-07-04 21:12:41.000000000 +0000 -+++ ncurses-6.0-20150822/progs/tic.c 2015-08-22 23:49:57.000000000 +0000 -@@ -48,7 +48,7 @@ - #include - #include - --MODULE_ID("$Id: tic.c,v 1.211 2015/07/04 21:12:41 tom Exp $") -+MODULE_ID("$Id: tic.c,v 1.213 2015/08/22 23:49:57 tom Exp $") - - #define STDIN_NAME "" - -@@ -142,6 +142,7 @@ - static const char options_string[] = - { - DATA("Options:") -+ DATA(" -0 format translation output all capabilities on one line") - DATA(" -1 format translation output one capability per line") - #if NCURSES_XNAMES - DATA(" -a retain commented-out capabilities (sets -x also)") -@@ -2149,7 +2150,7 @@ - NAME_VALUE *result = typeMalloc(NAME_VALUE, NUM_STRINGS(tp) + 1); - const struct tinfo_fkeys *all_fkeys = _nc_tinfo_fkeys; - int used = 0; -- int j; -+ unsigned j; - - if (result == 0) - failed("get_fkey_list"); -@@ -2165,7 +2166,7 @@ - } - #if NCURSES_XNAMES - for (j = STRCOUNT; j < NUM_STRINGS(tp); ++j) { -- const char *name = ExtStrname(tp, j, strnames); -+ const char *name = ExtStrname(tp, (int) j, strnames); - if (*name == 'k') { - result[used].keycode = -1; - result[used].name = name; -Index: test/demo_menus.c -Prereq: 1.54 ---- ncurses-6.0-20150815+/test/demo_menus.c 2014-09-05 08:34:06.000000000 +0000 -+++ ncurses-6.0-20150822/test/demo_menus.c 2015-08-22 22:59:56.000000000 +0000 -@@ -1,5 +1,5 @@ - /**************************************************************************** -- * Copyright (c) 2005-2013,2014 Free Software Foundation, Inc. * -+ * Copyright (c) 2005-2014,2015 Free Software Foundation, Inc. * - * * - * Permission is hereby granted, free of charge, to any person obtaining a * - * copy of this software and associated documentation files (the * -@@ -26,7 +26,7 @@ - * authorization. * - ****************************************************************************/ - /* -- * $Id: demo_menus.c,v 1.54 2014/09/05 08:34:06 tom Exp $ -+ * $Id: demo_menus.c,v 1.55 2015/08/22 22:59:56 tom Exp $ - * - * Demonstrate a variety of functions from the menu library. - * Thomas Dickey - 2005/4/9 -@@ -868,10 +868,6 @@ - beep(); - continue; - } -- --#ifdef NCURSES_MOUSE_VERSION -- mousemask(0, (mmask_t *) 0); --#endif - } - - static void -Index: test/savescreen.c -Prereq: 1.27 ---- ncurses-6.0-20150815+/test/savescreen.c 2015-03-28 23:21:28.000000000 +0000 -+++ ncurses-6.0-20150822/test/savescreen.c 2015-08-22 22:40:22.000000000 +0000 -@@ -26,7 +26,7 @@ - * authorization. * - ****************************************************************************/ - /* -- * $Id: savescreen.c,v 1.27 2015/03/28 23:21:28 tom Exp $ -+ * $Id: savescreen.c,v 1.28 2015/08/22 22:40:22 tom Exp $ - * - * Demonstrate save/restore functions from the curses library. - * Thomas Dickey - 2007/7/14 -@@ -471,7 +471,7 @@ - continue; - } - if (!done) { -- attr_t attr = (A_REVERSE | COLOR_PAIR(color * COLORS)); -+ attr_t attr = (A_REVERSE | (attr_t) COLOR_PAIR(color * COLORS)); - chtype ch2 = (altchars ? ACS_DIAMOND : '#'); - move(y, x); - addch(ch2 | attr); diff --git a/ncurses-6.0-20150905.patch b/ncurses-6.0-20150905.patch deleted file mode 100644 index 76dd45c..0000000 --- a/ncurses-6.0-20150905.patch +++ /dev/null @@ -1,1911 +0,0 @@ -# ncurses 6.0 - patch 20150905 - Thomas E. Dickey -# -# ------------------------------------------------------------------------------ -# -# Ncurses 6.0 is at -# ftp.gnu.org:/pub/gnu -# -# Patches for ncurses 6.0 are in the subdirectory -# ftp://invisible-island.net/ncurses/6.0 -# -# ------------------------------------------------------------------------------ -# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20150905.patch.gz -# patch by Thomas E. Dickey -# created Sun Sep 6 01:23:48 UTC 2015 -# ------------------------------------------------------------------------------ -# NEWS | 12 ++ -# VERSION | 2 -# dist.mk | 4 -# doc/html/man/captoinfo.1m.html | 2 -# doc/html/man/clear.1.html | 2 -# doc/html/man/curs_addch.3x.html | 50 ++++++++---- -# doc/html/man/curs_attr.3x.html | 4 -# doc/html/man/curs_variables.3x.html | 21 ++++- -# doc/html/man/form.3x.html | 2 -# doc/html/man/infocmp.1m.html | 77 +++++++++++------- -# doc/html/man/infotocap.1m.html | 2 -# doc/html/man/menu.3x.html | 2 -# doc/html/man/ncurses.3x.html | 2 -# doc/html/man/panel.3x.html | 2 -# doc/html/man/tabs.1.html | 2 -# doc/html/man/terminfo.5.html | 2 -# doc/html/man/tic.1m.html | 139 ++++++++++++++++++---------------- -# doc/html/man/toe.1m.html | 39 +++++---- -# doc/html/man/tput.1.html | 2 -# doc/html/man/tset.1.html | 2 -# include/term_entry.h | 3 -# man/curs_addch.3x | 19 ++++ -# man/curs_attr.3x | 6 - -# man/curs_threads.3x | 4 -# man/infocmp.1m | 26 +++++- -# man/tic.1m | 25 +++++- -# man/toe.1m | 7 + -# ncurses/tinfo/write_entry.c | 13 +-- -# package/debian-mingw/changelog | 4 -# package/debian-mingw64/changelog | 4 -# package/debian/changelog | 4 -# package/mingw-ncurses.nsi | 4 -# package/mingw-ncurses.spec | 2 -# package/ncurses.map | 9 +- -# package/ncurses.spec | 2 -# package/ncurses.sym | 3 -# package/ncursest.map | 9 +- -# package/ncursest.sym | 3 -# package/ncursestw.map | 9 +- -# package/ncursestw.sym | 3 -# package/ncursesw.map | 9 +- -# package/ncursesw.sym | 3 -# progs/dump_entry.c | 96 +++++++++++++++++++++-- -# progs/dump_entry.h | 5 - -# progs/infocmp.c | 21 +++-- -# progs/tic.c | 47 ++++++++--- -# 46 files changed, 491 insertions(+), 219 deletions(-) -# ------------------------------------------------------------------------------ -Index: NEWS -Prereq: 1.2487 ---- ncurses-6.0-20150822+/NEWS 2015-08-22 23:55:21.000000000 +0000 -+++ ncurses-6.0-20150905/NEWS 2015-09-05 21:14:36.000000000 +0000 -@@ -25,7 +25,7 @@ - -- sale, use or other dealings in this Software without prior written -- - -- authorization. -- - ------------------------------------------------------------------------------- ---- $Id: NEWS,v 1.2487 2015/08/22 23:55:21 tom Exp $ -+-- $Id: NEWS,v 1.2490 2015/09/05 21:14:36 tom Exp $ - ------------------------------------------------------------------------------- - - This is a log of changes that ncurses has gone through since Zeyd started -@@ -45,6 +45,16 @@ - Changes through 1.9.9e did not credit all contributions; - it is not possible to add this information. - -+20150905 -+ + add note in curs_addch.3x about line-drawing when it depends upon -+ UTF-8. -+ + add tic -q option for consistency with infocmp, use it to suppress -+ all comments from the "tic -I" output. -+ + modify infocmp -q option to suppress the "Reconstructed from" -+ header. -+ + add infocmp/tic -Q option, which allows one to dump the compiled -+ form of the terminal entry, in hexadecimal or base64. -+ - 20150822 - + sort options in usage message for infocmp, to make it simpler to - see unused letters. -Index: VERSION ---- ncurses-6.0-20150822+/VERSION 2015-08-17 08:41:12.000000000 +0000 -+++ ncurses-6.0-20150905/VERSION 2015-09-05 21:14:02.000000000 +0000 -@@ -1 +1 @@ --5:0:9 6.0 20150822 -+5:0:9 6.0 20150905 -Index: dist.mk -Prereq: 1.1067 ---- ncurses-6.0-20150822+/dist.mk 2015-08-17 08:41:12.000000000 +0000 -+++ ncurses-6.0-20150905/dist.mk 2015-09-05 21:14:02.000000000 +0000 -@@ -25,7 +25,7 @@ - # use or other dealings in this Software without prior written # - # authorization. # - ############################################################################## --# $Id: dist.mk,v 1.1067 2015/08/17 08:41:12 tom Exp $ -+# $Id: dist.mk,v 1.1069 2015/09/05 21:14:02 tom Exp $ - # Makefile for creating ncurses distributions. - # - # This only needs to be used directly as a makefile by developers, but -@@ -37,7 +37,7 @@ - # These define the major/minor/patch versions of ncurses. - NCURSES_MAJOR = 6 - NCURSES_MINOR = 0 --NCURSES_PATCH = 20150822 -+NCURSES_PATCH = 20150905 - - # We don't append the patch to the version, since this only applies to releases - VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) -Index: doc/html/man/captoinfo.1m.html ---- ncurses-6.0-20150822+/doc/html/man/captoinfo.1m.html 2015-08-08 18:45:46.000000000 +0000 -+++ ncurses-6.0-20150905/doc/html/man/captoinfo.1m.html 2015-09-05 21:19:32.000000000 +0000 -@@ -205,7 +205,7 @@ -

SEE ALSO

-        infocmp(1m), curses(3x), terminfo(5)
- 
--       This describes ncurses version 6.0 (patch 20150808).
-+       This describes ncurses version 6.0 (patch 20150905).
- 
- 
-
-Index: doc/html/man/clear.1.html ---- ncurses-6.0-20150822+/doc/html/man/clear.1.html 2015-08-08 18:45:46.000000000 +0000 -+++ ncurses-6.0-20150905/doc/html/man/clear.1.html 2015-09-05 21:19:32.000000000 +0000 -@@ -71,7 +71,7 @@ -

SEE ALSO

-        tput(1), terminfo(5)
- 
--       This describes ncurses version 6.0 (patch 20150808).
-+       This describes ncurses version 6.0 (patch 20150905).
- 
- 
- 
-Index: doc/html/man/curs_addch.3x.html
---- ncurses-6.0-20150822+/doc/html/man/curs_addch.3x.html	2015-07-16 09:29:40.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/curs_addch.3x.html	2015-09-05 21:19:33.000000000 +0000
-@@ -136,8 +136,11 @@
-        characters to the screen with routines of the  addch  fam-
-        ily.   The  default  character listed below is used if the
-        acsc  capability  does  not  define  a   terminal-specific
--       replacement for it.  The names are taken from VT100 nomen-
--       clature.
-+       replacement for it, or if the terminal and locale configu-
-+       ration requires Unicode but the library is unable  to  use
-+       Unicode.
-+
-+       The names are taken from VT100 nomenclature.
- 
-        Name           Default   Description
-        --------------------------------------------------
-@@ -178,41 +181,54 @@
-
-

RETURN VALUE

-        All routines return the integer ERR upon failure and OK on
--       success  (the  SVr4 manuals specify only "an integer value
-+       success (the SVr4 manuals specify only "an  integer  value
-        other than ERR") upon successful completion, unless other-
-        wise noted in the preceding routine descriptions.
- 
--       Functions  with a "mv" prefix first perform a cursor move-
--       ment using wmove, and return an error if the  position  is
-+       Functions with a "mv" prefix first perform a cursor  move-
-+       ment  using  wmove, and return an error if the position is
-        outside the window, or if the window pointer is null.
- 
- 
-
-

NOTES

--       Note  that  addch,  mvaddch, mvwaddch, and echochar may be
-+       Note that addch, mvaddch, mvwaddch, and  echochar  may  be
-        macros.
- 
- 
-
-

PORTABILITY

--       All these functions are described in the XSI Curses  stan-
--       dard,  Issue  4.  The defaults specified for forms-drawing
-+       All  these functions are described in the XSI Curses stan-
-+       dard, Issue 4.  The defaults specified  for  forms-drawing
-        characters apply in the POSIX locale.
- 
--       X/Open Curses states that the ACS_  definitions  are  char
--       constants.   For  the  wide-character  implementation (see
-+       X/Open  Curses  states  that the ACS_ definitions are char
-+       constants.  For  the  wide-character  implementation  (see
-        curs_add_wch), there are analogous WACS_ definitions which
-        are cchar_t constants.
- 
--       Some  ACS symbols (ACS_S3, ACS_S7, ACS_LEQUAL, ACS_GEQUAL,
--       ACS_PI, ACS_NEQUAL, ACS_STERLING) were not  documented  in
--       any  publicly  released  System V.  However, many publicly
--       available terminfos include acsc strings  in  which  their
--       key  characters  (pryz{|}) are embedded, and a second-hand
--       list of their character descriptions has  come  to  light.
--       The   ACS-prefixed   names  for  them  were  invented  for
-+       Some ACS symbols (ACS_S3, ACS_S7, ACS_LEQUAL,  ACS_GEQUAL,
-+       ACS_PI,  ACS_NEQUAL,  ACS_STERLING) were not documented in
-+       any publicly released System V.   However,  many  publicly
-+       available  terminfos  include  acsc strings in which their
-+       key characters (pryz{|}) are embedded, and  a  second-hand
-+       list  of  their  character descriptions has come to light.
-+       The  ACS-prefixed  names  for  them  were   invented   for
-        ncurses(3x).
- 
-+       The  displayed  values  for  the  ACS_ and WACS_ constants
-+       depend on
-+
-+       o   the library configuration, i.e., ncurses versus ncurs-
-+           esw, where the latter is capable of displaying Unicode
-+           while the former is not, and
-+
-+       o   whether the locale uses UTF-8 encoding.
-+
-+       In certain cases, the terminal is unable to display  line-
-+       drawing  characters except by using UTF-8 (see the discus-
-+       sion of NCURSES_NO_UTF8_ACS in ncurses(3x)).
-+
-        The TABSIZE variable is implemented in  some  versions  of
-        curses, but is not part of X/Open curses.
- 
-Index: doc/html/man/curs_attr.3x.html
---- ncurses-6.0-20150822+/doc/html/man/curs_attr.3x.html	2015-07-22 00:49:55.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/curs_attr.3x.html	2015-09-05 23:05:55.000000000 +0000
-@@ -173,8 +173,8 @@
- 
Attributes
-        The following video attributes, defined in <curses.h>, can
-        be passed to the routines attron, attroff, and attrset, or
--       OR'd with the characters passed to  addch  (see  curs_add-
--       ch(3x)).
-+       OR'd with the characters passed to  addch  (see  curs_add-
-+       ch(3x)).
- 
-               Name            Description
-               ------------------------------------------------------------
-Index: doc/html/man/curs_variables.3x.html
---- ncurses-6.0-20150822+/doc/html/man/curs_variables.3x.html	2015-05-13 19:27:46.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/curs_variables.3x.html	2015-09-05 21:19:36.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-@@ -163,10 +163,25 @@
-        ESCDELAY  and TABSIZE are extensions, not provided in most
-        other implementations of curses.
- 
-+       ESCDELAY is an extension in AIX curses:
-+
-+       o   In AIX, the units for ESCDELAY are fifths  of  a  mil-
-+           lisecond.
-+
-+       o   The default value for AIX's ESCDELAY is 0.1 seconds.
-+
-+       o   AIX also enforces a limit of 10,000 seconds for ESCDE-
-+           LAY; this implementation currently has no upper limit.
-+
-+       This implementation has long used ESCDELAY with  units  of
-+       milliseconds,  making  it impossible to be completely com-
-+       patible with AIX.  Likewise, most users have either decid-
-+       ed to override the value, or rely upon its default value.
-+
- 
- 

- 
SEE ALSO
--       curses(3x),      curs_opaque(3x),       curs_terminfo(3x),
-+       curses(3x),       curs_opaque(3x),      curs_terminfo(3x),
-        curs_threads(3x), term_variables(3x), terminfo(5).
- 
- 
-Index: doc/html/man/form.3x.html
---- ncurses-6.0-20150822+/doc/html/man/form.3x.html	2015-08-08 18:45:50.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/form.3x.html	2015-09-05 21:19:36.000000000 +0000
-@@ -245,7 +245,7 @@
-        curses(3x) and related pages whose names begin "form_" for
-        detailed descriptions of the entry points.
- 
--       This describes ncurses version 6.0 (patch 20150808).
-+       This describes ncurses version 6.0 (patch 20150905).
- 
- 
- 
-Index: doc/html/man/infocmp.1m.html
---- ncurses-6.0-20150822+/doc/html/man/infocmp.1m.html	2015-08-08 18:45:51.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/infocmp.1m.html	2015-09-05 21:19:38.000000000 +0000
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: infocmp.1m,v 1.56 2015/05/23 20:50:00 tom Exp @
-+  * @Id: infocmp.1m,v 1.57 2015/09/05 20:50:22 tom Exp @
- -->
- 
- 
-@@ -54,7 +54,7 @@
- 

- 
SYNOPSIS
-        infocmp [-1CDEFGIKLTUVcdegilnpqrtux]
--             [-v n] [-s d| i| l| c] [-R subset]
-+             [-v n] [-s d| i| l| c] [-Q n] [-R subset]
-              [-w width] [-A directory] [-B directory]
-              [termname...]
- 
-@@ -374,29 +374,44 @@
- 
-        -p   Ignore padding specifications when comparing strings.
- 
--       -q   Make  the comparison listing shorter by omitting sub-
--            headings, and using "-" for absent capabilities,  "@"
--            for canceled rather than "NULL".
-+       -Q n Rather  than  show  source in terminfo (text) format,
-+            print the compiled (binary) format in hexadecimal  or
-+            base64 form, depending on the option's value:
-+
-+               1  hexadecimal
-+
-+               2  base64
-+
-+               3  hexadecimal and base64
-+
-+       -q   This makes the output a little shorter:
-+
-+            o   Make  the  comparison listing shorter by omitting
-+                subheadings, and using "-" for  absent  capabili-
-+                ties, "@" for canceled rather than "NULL".
-+
-+            o   Omit  the "Reconstructed from" comment for source
-+                listings.
- 
-        -Rsubset
--            Restrict  output  to  a given subset.  This option is
--            for use with archaic versions of terminfo like  those
--            on  SVr1,  Ultrix,  or  HP/UX that do not support the
--            full set of SVR4/XSI Curses  terminfo;  and  variants
-+            Restrict output to a given subset.   This  option  is
-+            for  use with archaic versions of terminfo like those
-+            on SVr1, Ultrix, or HP/UX that  do  not  support  the
-+            full  set  of  SVR4/XSI Curses terminfo; and variants
-             such as AIX that have their own extensions incompati-
-             ble with SVr4/XSI.
- 
-             Available  terminfo  subsets  are  "SVr1",  "Ultrix",
--            "HP",  and  "AIX";  see terminfo(5) for details.  You
--            can also choose the subset "BSD" which  selects  only
--            capabilities  with  termcap equivalents recognized by
-+            "HP", and "AIX"; see terminfo(5)  for  details.   You
-+            can  also  choose the subset "BSD" which selects only
-+            capabilities with termcap equivalents  recognized  by
-             4.4BSD.
- 
-        -s [d|i|l|c]
--            The -s option  sorts  the  fields  within  each  type
-+            The  -s  option  sorts  the  fields  within each type
-             according to the argument below:
- 
--            d    leave  fields  in the order that they are stored
-+            d    leave fields in the order that they  are  stored
-                  in the terminfo database.
- 
-             i    sort by terminfo name.
-@@ -406,38 +421,38 @@
-             c    sort by the termcap name.
- 
-             If the -s option is not given, the fields printed out
--            will  be  sorted  alphabetically by the terminfo name
-+            will be sorted alphabetically by  the  terminfo  name
-             within each type, except in the case of the -C or the
-             -L options, which cause the sorting to be done by the
--            termcap name or the long  C  variable  name,  respec-
-+            termcap  name  or  the  long C variable name, respec-
-             tively.
- 
--       -T   eliminates  size-restrictions  on the generated text.
-+       -T   eliminates size-restrictions on the  generated  text.
-             This is mainly useful for testing and analysis, since
-             the compiled descriptions are limited (e.g., 1023 for
-             termcap, 4096 for terminfo).
- 
-        -t   tells  tic  to  discard  commented-out  capabilities.
--            Normally  when  translating from terminfo to termcap,
-+            Normally when translating from terminfo  to  termcap,
-             untranslatable capabilities are commented-out.
- 
--       -U   tells infocmp to  not  post-process  the  data  after
--            parsing  the  source  file.   This feature helps when
--            comparing the actual contents of  two  source  files,
--            since  it  excludes the inferences that infocmp makes
-+       -U   tells  infocmp  to  not  post-process  the data after
-+            parsing the source file.   This  feature  helps  when
-+            comparing  the  actual  contents of two source files,
-+            since it excludes the inferences that  infocmp  makes
-             to fill in missing data.
- 
-        -V   reports the version of ncurses which was used in this
-             program, and exits.
- 
--       -v n prints  out  tracing information on standard error as
--            the program runs.  Higher values of n induce  greater
-+       -v n prints out tracing information on standard  error  as
-+            the  program runs.  Higher values of n induce greater
-             verbosity.
- 
-        -w width
-             changes the output to width characters.
- 
--       -x   print   information  for  user-defined  capabilities.
-+       -x   print  information  for  user-defined   capabilities.
-             These are extensions to the terminfo repertoire which
-             can be loaded using the -x option of tic.
- 
-@@ -450,13 +465,13 @@
- 
- 

- 
EXTENSIONS
--       The -0, -1, -E, -F, -G, -R, -T, -V, -a, -e,  -f,  -g,  -i,
--       -l,  -p,  -q  and  -t  options  are  not supported in SVr4
-+       The  -0,  -1,  -E, -F, -G, -R, -T, -V, -a, -e, -f, -g, -i,
-+       -l, -p, -q and  -t  options  are  not  supported  in  SVr4
-        curses.
- 
-        The -r option's notion of `termcap' capabilities is System
--       V  Release  4's.   Actual  BSD curses versions will have a
--       more restricted set.  To see only the 4.4BSD set,  use  -r
-+       V Release 4's.  Actual BSD curses  versions  will  have  a
-+       more  restricted  set.  To see only the 4.4BSD set, use -r
-        -RBSD.
- 
- 
-@@ -467,12 +482,12 @@
- 
- 

- 
SEE ALSO
--       captoinfo(1m),     infotocap(1m),     tic(1m),    toe(1m),
-+       captoinfo(1m),    infotocap(1m),     tic(1m),     toe(1m),
-        curses(3x), terminfo(5).
- 
-        http://invisible-island.net/ncurses/tctest.html
- 
--       This describes ncurses version 6.0 (patch 20150808).
-+       This describes ncurses version 6.0 (patch 20150905).
- 
- 
- 

-Index: doc/html/man/infotocap.1m.html
---- ncurses-6.0-20150822+/doc/html/man/infotocap.1m.html	2015-08-08 18:45:51.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/infotocap.1m.html	2015-09-05 21:19:38.000000000 +0000
-@@ -94,7 +94,7 @@
- 
SEE ALSO
-        curses(3x), tic(1m), infocmp(1m), terminfo(5)
- 
--       This describes ncurses version 6.0 (patch 20150808).
-+       This describes ncurses version 6.0 (patch 20150905).
- 
- 
- 

-Index: doc/html/man/menu.3x.html
---- ncurses-6.0-20150822+/doc/html/man/menu.3x.html	2015-08-08 18:45:52.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/menu.3x.html	2015-09-05 21:19:38.000000000 +0000
-@@ -227,7 +227,7 @@
-        curses(3x) and related pages whose names begin "menu_" for
-        detailed descriptions of the entry points.
- 
--       This describes ncurses version 6.0 (patch 20150808).
-+       This describes ncurses version 6.0 (patch 20150905).
- 
- 
- 
-Index: doc/html/man/ncurses.3x.html
---- ncurses-6.0-20150822+/doc/html/man/ncurses.3x.html	2015-08-08 18:45:53.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/ncurses.3x.html	2015-09-05 21:19:39.000000000 +0000
-@@ -63,7 +63,7 @@
-        sonable optimization.  This implementation is "new curses"
-        (ncurses) and is the approved replacement for 4.4BSD clas-
-        sic  curses,  which has been discontinued.  This describes
--       ncurses version 6.0 (patch 20150808).
-+       ncurses version 6.0 (patch 20150905).
- 
-        The ncurses library emulates the curses library of  System
-        V  Release  4  UNIX,  and  XPG4 (X/Open Portability Guide)
-Index: doc/html/man/panel.3x.html
---- ncurses-6.0-20150822+/doc/html/man/panel.3x.html	2015-08-08 18:45:53.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/panel.3x.html	2015-09-05 21:19:39.000000000 +0000
-@@ -218,7 +218,7 @@
- 
SEE ALSO
-        curses(3x), curs_variables(3x),
- 
--       This describes ncurses version 6.0 (patch 20150808).
-+       This describes ncurses version 6.0 (patch 20150905).
- 
- 
- 

-Index: doc/html/man/tabs.1.html
---- ncurses-6.0-20150822+/doc/html/man/tabs.1.html	2015-08-08 18:45:53.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/tabs.1.html	2015-09-05 21:19:40.000000000 +0000
-@@ -168,7 +168,7 @@
- 
SEE ALSO
-        tset(1), infocmp(1m), curses(3x), terminfo(5).
- 
--       This describes ncurses version 6.0 (patch 20150808).
-+       This describes ncurses version 6.0 (patch 20150905).
- 
- 
- 
-Index: doc/html/man/terminfo.5.html
---- ncurses-6.0-20150822+/doc/html/man/terminfo.5.html	2015-08-08 18:45:54.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/terminfo.5.html	2015-09-05 21:19:40.000000000 +0000
-@@ -78,7 +78,7 @@
-        nals by giving a set of capabilities which they  have,  by
-        specifying how to perform screen operations, and by speci-
-        fying padding requirements and  initialization  sequences.
--       This describes ncurses version 6.0 (patch 20150808).
-+       This describes ncurses version 6.0 (patch 20150905).
- 
-        Entries in terminfo consist of a sequence of `,' separated
-        fields (embedded commas may be escaped with a backslash or
-Index: doc/html/man/tic.1m.html
---- ncurses-6.0-20150822+/doc/html/man/tic.1m.html	2015-08-08 18:45:54.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/tic.1m.html	2015-09-05 21:19:40.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-@@ -52,8 +52,8 @@
- 
- 

- 
SYNOPSIS
--       tic  [-01CDGIKLNTUVacfgrstx]  [-e names] [-o dir] [-R sub-
--       set] [-v[n]] [-w[n]] file
-+       tic  [-01CDGIKLNTUVacfgqrstx]  [-e names] [-o dir] [-Q[n]]
-+       [-R subset] [-v[n]] [-w[n]] file
- 
- 
- 

-@@ -228,22 +228,35 @@
-        -odir  Write  compiled entries to given database location.
-               Overrides the TERMINFO environment variable.
- 
-+       -Qn    Rather than show source in terminfo (text)  format,
-+              print  the  compiled (binary) format in hexadecimal
-+              or base64 form, depending on the option's value:
-+
-+               1  hexadecimal
-+
-+               2  base64
-+
-+               3  hexadecimal and base64
-+
-+       -q     Suppress comments  and  blank  lines  when  showing
-+              translated source.
-+
-        -Rsubset
--              Restrict output to a given subset.  This option  is
--              for  use  with  archaic  versions  of terminfo like
-+              Restrict  output to a given subset.  This option is
-+              for use with  archaic  versions  of  terminfo  like
-               those on SVr1, Ultrix, or HP/UX that do not support
--              the  full set of SVR4/XSI Curses terminfo; and out-
-+              the full set of SVR4/XSI Curses terminfo; and  out-
-               right broken ports like AIX 3.x that have their own
--              extensions  incompatible  with SVr4/XSI.  Available
-+              extensions incompatible with  SVr4/XSI.   Available
-               subsets  are  "SVr1",  "Ultrix",  "HP",  "BSD"  and
-               "AIX"; see terminfo(5) for details.
- 
--       -r     Force  entry  resolution (so there are no remaining
--              tc capabilities) even  when  doing  translation  to
-+       -r     Force entry resolution (so there are  no  remaining
-+              tc  capabilities)  even  when  doing translation to
-               termcap format.  This may be needed if you are pre-
--              paring a termcap file for a termcap  library  (such
--              as  GNU  termcap through version 1.3 or BSD termcap
--              through 4.3BSD) that does not  handle  multiple  tc
-+              paring  a  termcap file for a termcap library (such
-+              as GNU termcap through version 1.3 or  BSD  termcap
-+              through  4.3BSD)  that  does not handle multiple tc
-               capabilities per entry.
- 
-        -s     Summarize the compile by showing the database loca-
-@@ -251,28 +264,28 @@
-               of entries which are compiled.
- 
-        -T     eliminates size-restrictions on the generated text.
--              This is mainly useful  for  testing  and  analysis,
--              since  the compiled descriptions are limited (e.g.,
-+              This  is  mainly  useful  for testing and analysis,
-+              since the compiled descriptions are limited  (e.g.,
-               1023 for termcap, 4096 for terminfo).
- 
--       -t     tells tic to  discard  commented-out  capabilities.
-+       -t     tells  tic  to  discard commented-out capabilities.
-               Normally when translating from terminfo to termcap,
-               untranslatable capabilities are commented-out.
- 
--       -U   tells tic to not post-process the data after  parsing
--            the  source  file.  Normally, it infers data which is
--            commonly missing in older terminfo data, or in  term-
-+       -U   tells  tic to not post-process the data after parsing
-+            the source file.  Normally, it infers data  which  is
-+            commonly  missing in older terminfo data, or in term-
-             caps.
- 
-        -V   reports the version of ncurses which was used in this
-             program, and exits.
- 
--       -vn  specifies that (verbose) output be written  to  stan-
--            dard  error trace information showing tic's progress.
--            The optional parameter n is a number from  1  to  10,
--            inclusive,  indicating the desired level of detail of
--            information.  If n is omitted, the default  level  is
--            1.   If  n is specified and greater than 1, the level
-+       -vn  specifies  that  (verbose) output be written to stan-
-+            dard error trace information showing tic's  progress.
-+            The  optional  parameter  n is a number from 1 to 10,
-+            inclusive, indicating the desired level of detail  of
-+            information.   If  n is omitted, the default level is
-+            1.  If n is specified and greater than 1,  the  level
-             of detail is increased.
- 
-             The debug flag levels are as follows:
-@@ -289,32 +302,32 @@
- 
-             8      List of tokens encountered by scanner
- 
--            9      All values computed  in  construction  of  the
-+            9      All  values  computed  in  construction of the
-                    hash table
- 
--            If  the debug level n is not given, it is taken to be
-+            If the debug level n is not given, it is taken to  be
-             one.
- 
--       -wn  specifies the width of the output.  The parameter  is
-+       -wn  specifies  the width of the output.  The parameter is
-             optional.  If it is omitted, it defaults to 60.
- 
-        -x   Treat unknown capabilities as user-defined.  That is,
--            if you supply a capability name which  tic  does  not
-+            if  you  supply  a capability name which tic does not
-             recognize, it will infer its type (boolean, number or
--            string) from the syntax and make  an  extended  table
-+            string)  from  the  syntax and make an extended table
-             entry  for  that.   User-defined  capability  strings
--            whose name begins with "k" are  treated  as  function
-+            whose  name  begins  with "k" are treated as function
-             keys.
- 
- 
-
-

PARAMETERS

-        file   contains one or more terminfo terminal descriptions
--              in source format [see terminfo(5)].  Each  descrip-
--              tion  in  the  file describes the capabilities of a
-+              in  source format [see terminfo(5)].  Each descrip-
-+              tion in the file describes the  capabilities  of  a
-               particular terminal.
- 
--              If file is "-", then the  data  is  read  from  the
-+              If  file  is  "-",  then  the data is read from the
-               standard input.  The file parameter may also be the
-               path of a character-device.
- 
-@@ -325,62 +338,62 @@
-        umented in terminfo(5).  The exception is the use capabil-
-        ity.
- 
--       When a use=entry-name field is discovered  in  a  terminal
--       entry  currently  being  compiled, tic reads in the binary
--       from /usr/share/terminfo to complete the entry.   (Entries
--       created  from file will be used first.  tic duplicates the
-+       When  a  use=entry-name  field is discovered in a terminal
-+       entry currently being compiled, tic reads  in  the  binary
-+       from  /usr/share/terminfo to complete the entry.  (Entries
-+       created from file will be used first.  tic duplicates  the
-        capabilities in entry-name for the current entry, with the
--       exception   of  those  capabilities  that  explicitly  are
-+       exception  of  those  capabilities  that  explicitly   are
-        defined in the current entry.
- 
--       When   an   entry,   e.g.,   entry_name_1,   contains    a
--       use=entry_name_2   field,  any  canceled  capabilities  in
--       entry_name_2 must also appear in entry_name_1 before  use=
-+       When    an   entry,   e.g.,   entry_name_1,   contains   a
-+       use=entry_name_2  field,  any  canceled  capabilities   in
-+       entry_name_2  must also appear in entry_name_1 before use=
-        for these capabilities to be canceled in entry_name_1.
- 
-        Total compiled entries cannot exceed 4096 bytes.  The name
--       field cannot exceed 512 bytes.  Terminal  names  exceeding
--       the  maximum  alias  length (32 characters on systems with
-+       field  cannot  exceed 512 bytes.  Terminal names exceeding
-+       the maximum alias length (32 characters  on  systems  with
-        long filenames, 14 characters otherwise) will be truncated
--       to  the maximum alias length and a warning message will be
-+       to the maximum alias length and a warning message will  be
-        printed.
- 
- 
-
-

COMPATIBILITY

--       There is some evidence that historic  tic  implementations
--       treated  description  fields with no whitespace in them as
--       additional aliases or short names.  This tic does  not  do
--       that,  but  it  does  warn  when description fields may be
-+       There  is  some evidence that historic tic implementations
-+       treated description fields with no whitespace in  them  as
-+       additional  aliases  or short names.  This tic does not do
-+       that, but it does warn  when  description  fields  may  be
-        treated that way and check them for dangerous characters.
- 
- 
-
-

EXTENSIONS

-        Unlike the SVr4 tic command, this implementation can actu-
--       ally  compile  termcap  sources.  In fact, entries in ter-
--       minfo and termcap syntax can be mixed in a  single  source
-+       ally compile termcap sources.  In fact,  entries  in  ter-
-+       minfo  and  termcap syntax can be mixed in a single source
-        file.  See terminfo(5) for the list of termcap names taken
-        to be equivalent to terminfo names.
- 
--       The SVr4 manual pages are  not  clear  on  the  resolution
--       rules  for  use  capabilities.  This implementation of tic
-+       The  SVr4  manual  pages  are  not clear on the resolution
-+       rules for use capabilities.  This  implementation  of  tic
-        will find use targets anywhere in the source file, or any-
--       where  in the file tree rooted at TERMINFO (if TERMINFO is
-+       where in the file tree rooted at TERMINFO (if TERMINFO  is
-        defined), or in the user's $HOME/.terminfo database (if it
--       exists),  or  (finally) anywhere in the system's file tree
-+       exists), or (finally) anywhere in the system's  file  tree
-        of compiled entries.
- 
--       The error messages from this tic have the same  format  as
--       GNU  C  error  messages,  and can be parsed by GNU Emacs's
-+       The  error  messages from this tic have the same format as
-+       GNU C error messages, and can be  parsed  by  GNU  Emacs's
-        compile facility.
- 
--       The -0, -1, -C, -G, -I, -N, -R, -T, -V, -a,  -e,  -f,  -g,
--       -o,  -r,  -s,  -t  and  -x options are not supported under
-+       The  -0,  -1,  -C, -G, -I, -N, -R, -T, -V, -a, -e, -f, -g,
-+       -o, -r, -s, -t and -x  options  are  not  supported  under
-        SVr4.  The SVr4 -c mode does not report bad use links.
- 
--       System V does not compile entries to or read entries  from
--       your  $HOME/.terminfo  database unless TERMINFO is explic-
-+       System  V does not compile entries to or read entries from
-+       your $HOME/.terminfo database unless TERMINFO  is  explic-
-        itly set to it.
- 
- 
-@@ -392,10 +405,10 @@
- 
-
-

SEE ALSO

--       infocmp(1m),   captoinfo(1m),   infotocap(1m),    toe(1m),
-+       infocmp(1m),    captoinfo(1m),   infotocap(1m),   toe(1m),
-        curses(3x), term(5).  terminfo(5).
- 
--       This describes ncurses version 6.0 (patch 20150808).
-+       This describes ncurses version 6.0 (patch 20150905).
- 
- 
-
-Index: doc/html/man/toe.1m.html ---- ncurses-6.0-20150822+/doc/html/man/toe.1m.html 2015-08-08 18:45:54.000000000 +0000 -+++ ncurses-6.0-20150905/doc/html/man/toe.1m.html 2015-09-05 21:19:40.000000000 +0000 -@@ -1,6 +1,6 @@ - - - -@@ -77,34 +77,37 @@ - marks entries which differ, and "+" marks equiva- - lent entries. - -+ Without the -s option, toe does not attempt to -+ merge duplicates in its report -+ - -s sort the output by the entry names. - - -u file -- says to write a report to the standard output, -- listing dependencies in the given terminfo/termcap -- source file. The report condenses the `use' rela- -- tion: each line consists of the primary name of a -- terminal that has use capabilities, followed by a -+ says to write a report to the standard output, -+ listing dependencies in the given terminfo/termcap -+ source file. The report condenses the `use' rela- -+ tion: each line consists of the primary name of a -+ terminal that has use capabilities, followed by a - colon, followed by the whitespace-separated primary -- names of all terminals which occur in those use -+ names of all terminals which occur in those use - capabilities, followed by a newline - - -U file -- says to write a report to the standard output, -- listing reverse dependencies in the given ter- -+ says to write a report to the standard output, -+ listing reverse dependencies in the given ter- - minfo/termcap source file. The report reverses the -- `use' relation: each line consists of the primary -+ `use' relation: each line consists of the primary - name of a terminal that occurs in use capabilities, -- followed by a colon, followed by the whitespace- -- separated primary names of all terminals which -+ followed by a colon, followed by the whitespace- -+ separated primary names of all terminals which - depend on it, followed by a newline. - - -vn specifies that (verbose) output be written to stan- -- dard error, showing toe's progress. The optional -- parameter n is a number from 1 to 10, interpreted -+ dard error, showing toe's progress. The optional -+ parameter n is a number from 1 to 10, interpreted - as for tic(1m). - -- -V reports the version of ncurses which was used in -+ -V reports the version of ncurses which was used in - this program, and exits. - - -@@ -116,10 +119,10 @@ - - -

SEE ALSO

--       tic(1m),    infocmp(1m),   captoinfo(1m),   infotocap(1m),
-+       tic(1m),   infocmp(1m),   captoinfo(1m),    infotocap(1m),
-        curses(3x), terminfo(5).
- 
--       This describes ncurses version 6.0 (patch 20150808).
-+       This describes ncurses version 6.0 (patch 20150905).
- 
- 
- 
-Index: doc/html/man/tput.1.html
---- ncurses-6.0-20150822+/doc/html/man/tput.1.html	2015-08-08 18:45:54.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/tput.1.html	2015-09-05 21:19:40.000000000 +0000
-@@ -338,7 +338,7 @@
- 
SEE ALSO
-        clear(1), stty(1), tabs(1), terminfo(5), curs_termcap(3x).
- 
--       This describes ncurses version 6.0 (patch 20150808).
-+       This describes ncurses version 6.0 (patch 20150905).
- 
- 
- 
-Index: doc/html/man/tset.1.html
---- ncurses-6.0-20150822+/doc/html/man/tset.1.html	2015-08-08 18:45:54.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/tset.1.html	2015-09-05 21:19:40.000000000 +0000
-@@ -319,7 +319,7 @@
-        csh(1),   sh(1),   stty(1),   curs_terminfo(3x),   tty(4),
-        terminfo(5), ttys(5), environ(7)
- 
--       This describes ncurses version 6.0 (patch 20150808).
-+       This describes ncurses version 6.0 (patch 20150905).
- 
- 
- 
-Index: include/term_entry.h
-Prereq:  1.46 
---- ncurses-6.0-20150822+/include/term_entry.h	2015-08-22 23:04:25.000000000 +0000
-+++ ncurses-6.0-20150905/include/term_entry.h	2015-08-30 00:41:20.000000000 +0000
-@@ -32,7 +32,7 @@
-  *     and: Thomas E. Dickey                        1998-on                 *
-  ****************************************************************************/
- 
--/* $Id: term_entry.h,v 1.46 2015/08/22 23:04:25 tom Exp $ */
-+/* $Id: term_entry.h,v 1.47 2015/08/30 00:41:20 tom Exp $ */
- 
- /*
-  *	term_entry.h -- interface to entry-manipulation code
-@@ -172,6 +172,7 @@
- /* write_entry.c: writing an entry to the file system */
- extern NCURSES_EXPORT(void) _nc_set_writedir (const char *);
- extern NCURSES_EXPORT(void) _nc_write_entry (TERMTYPE *const);
-+extern NCURSES_EXPORT(int) _nc_write_object(TERMTYPE *, char *, unsigned *, unsigned);
- 
- /* comp_parse.c: entry list handling */
- extern NCURSES_EXPORT(void) _nc_read_entry_source (FILE*, char*, int, bool, bool (*)(ENTRY*));
-Index: man/curs_addch.3x
-Prereq:  1.36 
---- ncurses-6.0-20150822+/man/curs_addch.3x	2015-07-16 09:14:44.000000000 +0000
-+++ ncurses-6.0-20150905/man/curs_addch.3x	2015-09-05 21:13:25.000000000 +0000
-@@ -27,7 +27,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_addch.3x,v 1.36 2015/07/16 09:14:44 tom Exp $
-+.\" $Id: curs_addch.3x,v 1.37 2015/09/05 21:13:25 tom Exp $
- .TH curs_addch 3X ""
- .de bP
- .IP \(bu 4
-@@ -110,7 +110,10 @@
- The following variables may be used to add line drawing characters to the
- screen with routines of the \fBaddch\fR family.  The default character listed
- below is used if the \fBacsc\fR capability does not define a terminal-specific
--replacement for it.
-+replacement for it,
-+or if the terminal and locale configuration requires Unicode but the
-+library is unable to use Unicode.
-+.PP
- The names are taken from VT100 nomenclature.
- .PP
- .TS
-@@ -185,6 +188,18 @@
- embedded, and a second-hand list of their character descriptions has come
- to light.  The ACS-prefixed names for them were invented for \fBncurses\fR(3X).
- .LP
-+The \fIdisplayed\fP values for the \fIACS_\fP and \fIWACS_\fP constants
-+depend on 
-+.bP
-+the library configuration, i.e., \fBncurses\fP versus \fBncursesw\fP,
-+where the latter is capable of displaying Unicode while the former is not, and
-+.bP
-+whether the \fIlocale\fP uses UTF-8 encoding.
-+.LP
-+In certain cases, the terminal is unable to display line-drawing characters
-+except by using UTF-8 (see the discussion of \fBNCURSES_NO_UTF8_ACS\fP in
-+ncurses(3X)).
-+.LP
- The \fBTABSIZE\fR variable is implemented in some versions of curses,
- but is not part of X/Open curses.
- .LP
-Index: man/curs_attr.3x
-Prereq:  1.40 
---- ncurses-6.0-20150822+/man/curs_attr.3x	2015-07-20 23:35:38.000000000 +0000
-+++ ncurses-6.0-20150905/man/curs_attr.3x	2015-09-05 21:13:25.000000000 +0000
-@@ -27,7 +27,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_attr.3x,v 1.40 2015/07/20 23:35:38 tom Exp $
-+.\" $Id: curs_attr.3x,v 1.41 2015/09/05 21:13:25 tom Exp $
- .TH curs_attr 3X ""
- .na
- .hy 0
-@@ -168,7 +168,7 @@
- for \fBstdscr\fR.
- .PP
- There is no corresponding \fBattrget\fP function as such in X/Open Curses,
--although ncurses provides \fBgetattrs\fP (see curs_legacy(3x)).
-+although ncurses provides \fBgetattrs\fP (see curs_legacy(3X)).
- .SS chgat
- .PP
- The routine \fBchgat\fR changes the attributes of a given number of characters
-@@ -188,7 +188,7 @@
- .SS Attributes
- The following video attributes, defined in \fB\fR, can be passed to
- the routines \fBattron\fR, \fBattroff\fR, and \fBattrset\fR, or OR'd with the
--characters passed to \fBaddch\fR (see curs_addch(3x)).
-+characters passed to \fBaddch\fR (see curs_addch(3X)).
- .PP
- .RS
- .TS
-Index: man/curs_threads.3x
-Prereq:  1.21 
---- ncurses-6.0-20150822+/man/curs_threads.3x	2015-04-11 10:23:49.000000000 +0000
-+++ ncurses-6.0-20150905/man/curs_threads.3x	2015-09-05 21:13:25.000000000 +0000
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_threads.3x,v 1.21 2015/04/11 10:23:49 tom Exp $
-+.\" $Id: curs_threads.3x,v 1.22 2015/09/05 21:13:25 tom Exp $
- .TH curs_threads 3X ""
- .de bP
- .IP \(bu 4
-@@ -67,7 +67,7 @@
- use of the global variables when configured for threading.
- .PP
- In addition to forcing access to members of the \fBWINDOW\fP structure
--to be via functions (see \fBcurs_opaque\fP(3x)),
-+to be via functions (see \fBcurs_opaque\fP(3X)),
- it makes functions of the common global variables,
- e.g.,
- COLORS,
-Index: man/infocmp.1m
-Prereq:  1.56 
---- ncurses-6.0-20150822+/man/infocmp.1m	2015-05-23 20:50:00.000000000 +0000
-+++ ncurses-6.0-20150905/man/infocmp.1m	2015-09-05 20:50:22.000000000 +0000
-@@ -27,7 +27,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: infocmp.1m,v 1.56 2015/05/23 20:50:00 tom Exp $
-+.\" $Id: infocmp.1m,v 1.57 2015/09/05 20:50:22 tom Exp $
- .TH @INFOCMP@ 1M ""
- .ds n 5
- .de bP
-@@ -65,7 +65,7 @@
- x\
- \fR]
- .br
--      [\fB\-v\fR \fIn\fR] [\fB\-s d\fR| \fBi\fR| \fBl\fR| \fBc\fR] [\fB\-R \fR\fBsubset\fR]
-+      [\fB\-v\fR \fIn\fR] [\fB\-s d\fR| \fBi\fR| \fBl\fR| \fBc\fR] [\fB\-Q\fR \fIn\fR] [\fB\-R \fR\fBsubset\fR]
- .br
-       [\fB\-w\fR\ \fIwidth\fR] [\fB\-A\fR\ \fIdirectory\fR] [\fB\-B\fR\ \fIdirectory\fR]
- .br
-@@ -390,9 +390,31 @@
- \fB\-p\fR
- Ignore padding specifications when comparing strings.
- .TP 5
-+\fB\-Q\fR \fIn\fR
-+Rather than show source in terminfo (text) format,
-+print the compiled (binary) format in hexadecimal or base64 form,
-+depending on the option's value:
-+.RS 8
-+.TP 3
-+1
-+hexadecimal
-+.TP 3
-+2
-+base64
-+.TP 3
-+3
-+hexadecimal and base64
-+.RE
-+.TP 5
- \fB\-q\fR
-+This makes the output a little shorter:
-+.RS
-+.bP
- Make the comparison listing shorter by omitting subheadings, and using
- "\-" for absent capabilities, "@" for canceled rather than "NULL".
-+.bP
-+Omit the "Reconstructed from" comment for source listings.
-+.RE
- .TP 5
- \fB\-R\fR\fIsubset\fR
- Restrict output to a given subset.
-Index: man/tic.1m
-Prereq:  1.60 
---- ncurses-6.0-20150822+/man/tic.1m	2014-05-24 22:00:11.000000000 +0000
-+++ ncurses-6.0-20150905/man/tic.1m	2015-09-05 20:45:49.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2013,2014 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: tic.1m,v 1.60 2014/05/24 22:00:11 tom Exp $
-+.\" $Id: tic.1m,v 1.61 2015/09/05 20:45:49 tom Exp $
- .TH @TIC@ 1M ""
- .ie \n(.g .ds `` \(lq
- .el       .ds `` ``
-@@ -58,6 +58,7 @@
- c\
- f\
- g\
-+q\
- r\
- s\
- t\
-@@ -65,6 +66,7 @@
- \fR]
- [\fB\-e\fR \fInames\fR]
- [\fB\-o\fR \fIdir\fR]
-+[\fB\-Q\fR[\fIn\fR]]
- [\fB\-R\fR \fIsubset\fR]
- [\fB\-v\fR[\fIn\fR]]
- [\fB\-w\fR[\fIn\fR]]
-@@ -243,6 +245,25 @@
- Write compiled entries to given database location.
- Overrides the TERMINFO environment variable.
- .TP
-+\fB\-Q\fR\fIn\fR
-+Rather than show source in terminfo (text) format,
-+print the compiled (binary) format in hexadecimal or base64 form,
-+depending on the option's value:
-+.RS 8
-+.TP 3
-+1
-+hexadecimal
-+.TP 3
-+2
-+base64
-+.TP 3
-+3
-+hexadecimal and base64
-+.RE
-+.TP
-+\fB\-q\fR
-+Suppress comments and blank lines when showing translated source.
-+.TP
- \fB\-R\fR\fIsubset\fR
- Restrict output to a given subset.
- This option is for use with archaic
-Index: man/toe.1m
-Prereq:  1.26 
---- ncurses-6.0-20150822+/man/toe.1m	2012-01-01 00:40:51.000000000 +0000
-+++ ncurses-6.0-20150905/man/toe.1m	2015-08-29 22:04:48.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2011,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: toe.1m,v 1.26 2012/01/01 00:40:51 tom Exp $
-+.\" $Id: toe.1m,v 1.27 2015/08/29 22:04:48 tom Exp $
- .TH @TOE@ 1M ""
- .ds n 5
- .ds d @TERMINFO@
-@@ -58,6 +58,9 @@
- showing (like \fBconflict\fP(1)) which entries which 
- belong to a given terminal database.
- An "*" marks entries which differ, and "+" marks equivalent entries.
-+.IP
-+Without the \fB\-s\fP option, \fB@TOE@\fR does not attempt to merge
-+duplicates in its report
- .TP
- \fB\-s\fR
- sort the output by the entry names.
-Index: ncurses/tinfo/write_entry.c
-Prereq:  1.92 
---- ncurses-6.0-20150822+/ncurses/tinfo/write_entry.c	2014-11-01 14:47:00.000000000 +0000
-+++ ncurses-6.0-20150905/ncurses/tinfo/write_entry.c	2015-09-05 21:24:29.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2013,2014 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -47,12 +47,11 @@
- #define TRACE_OUT(p)		/*nothing */
- #endif
- 
--MODULE_ID("$Id: write_entry.c,v 1.92 2014/11/01 14:47:00 tom Exp $")
-+MODULE_ID("$Id: write_entry.c,v 1.93 2015/09/05 21:24:29 tom Exp $")
- 
- static int total_written;
- 
- static int make_db_root(const char *);
--static int write_object(TERMTYPE *, char *, unsigned *, unsigned);
- 
- #if !USE_HASHED_DB
- static void
-@@ -69,7 +68,7 @@
-     }
-     DEBUG(1, ("Created %s", filename));
- 
--    if (write_object(tp, buffer, &offset, limit) == ERR
-+    if (_nc_write_object(tp, buffer, &offset, limit) == ERR
- 	|| fwrite(buffer, sizeof(char), (size_t) offset, fp) != offset) {
- 	_nc_syserr_abort("error writing %s/%s", _nc_tic_dir(0), filename);
-     }
-@@ -316,7 +315,7 @@
-     _nc_set_type(first_name);
- 
- #if USE_HASHED_DB
--    if (write_object(tp, buffer + 1, &offset, limit - 1) != ERR) {
-+    if (_nc_write_object(tp, buffer + 1, &offset, limit - 1) != ERR) {
- 	DB *capdb = _nc_db_open(_nc_tic_dir(0), TRUE);
- 	DBT key, data;
- 
-@@ -620,8 +619,8 @@
- }
- #endif
- 
--static int
--write_object(TERMTYPE *tp, char *buffer, unsigned *offset, unsigned limit)
-+NCURSES_EXPORT(int)
-+_nc_write_object(TERMTYPE *tp, char *buffer, unsigned *offset, unsigned limit)
- {
-     char *namelist;
-     size_t namelen, boolmax, nummax, strmax;
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20150822+/package/debian-mingw/changelog	2015-08-17 08:41:12.000000000 +0000
-+++ ncurses-6.0-20150905/package/debian-mingw/changelog	2015-09-05 21:14:03.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150822) unstable; urgency=low
-+ncurses6 (6.0+20150905) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Mon, 17 Aug 2015 04:41:12 -0400
-+ -- Thomas E. Dickey   Sat, 05 Sep 2015 17:14:03 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20150822+/package/debian-mingw64/changelog	2015-08-17 08:41:12.000000000 +0000
-+++ ncurses-6.0-20150905/package/debian-mingw64/changelog	2015-09-05 21:14:03.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150822) unstable; urgency=low
-+ncurses6 (6.0+20150905) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Mon, 17 Aug 2015 04:41:12 -0400
-+ -- Thomas E. Dickey   Sat, 05 Sep 2015 17:14:03 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.0-20150822+/package/debian/changelog	2015-08-17 08:41:12.000000000 +0000
-+++ ncurses-6.0-20150905/package/debian/changelog	2015-09-05 21:14:03.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150822) unstable; urgency=low
-+ncurses6 (6.0+20150905) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Mon, 17 Aug 2015 04:41:12 -0400
-+ -- Thomas E. Dickey   Sat, 05 Sep 2015 17:14:03 -0400
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.120 
---- ncurses-6.0-20150822+/package/mingw-ncurses.nsi	2015-08-17 08:41:12.000000000 +0000
-+++ ncurses-6.0-20150905/package/mingw-ncurses.nsi	2015-09-05 21:14:03.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.120 2015/08/17 08:41:12 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.122 2015/09/05 21:14:03 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "0"
- !define VERSION_YYYY  "2015"
--!define VERSION_MMDD  "0822"
-+!define VERSION_MMDD  "0905"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20150822+/package/mingw-ncurses.spec	2015-08-17 08:41:12.000000000 +0000
-+++ ncurses-6.0-20150905/package/mingw-ncurses.spec	2015-09-05 21:14:03.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.0
--Release: 20150822
-+Release: 20150905
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.map
-Prereq:  1.34 
---- ncurses-6.0-20150822+/package/ncurses.map	2015-06-27 22:28:50.000000000 +0000
-+++ ncurses-6.0-20150905/package/ncurses.map	2015-09-05 19:27:16.000000000 +0000
-@@ -1,4 +1,4 @@
--# $Id: ncurses.map,v 1.34 2015/06/27 22:28:50 tom Exp $
-+# $Id: ncurses.map,v 1.35 2015/09/05 19:27:16 tom Exp $
- # script for shared library symbol-versioning using ld
- #
- # This file was generated by ncu-mapsyms
-@@ -806,6 +806,13 @@
- 		_nc_strict_bsd;
- } NCURSES_TIC_5.7.20081102;
- 
-+NCURSES_TIC_6.0.current {
-+	global:
-+		_nc_write_object;
-+	local:
-+		_*;
-+} NCURSES_TIC_5.9.20150530;
-+
- NCURSES_TINFO_5.0.19991023 {
- 	global:
- 		BC;
-Index: package/ncurses.spec
---- ncurses-6.0-20150822+/package/ncurses.spec	2015-08-17 08:41:12.000000000 +0000
-+++ ncurses-6.0-20150905/package/ncurses.spec	2015-09-05 21:14:03.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.0
--Release: 20150822
-+Release: 20150905
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.sym
-Prereq:  1.23 
---- ncurses-6.0-20150822+/package/ncurses.sym	2015-06-27 22:30:44.000000000 +0000
-+++ ncurses-6.0-20150905/package/ncurses.sym	2015-09-05 19:36:49.000000000 +0000
-@@ -1,4 +1,4 @@
--# $Id: ncurses.sym,v 1.23 2015/06/27 22:30:44 tom Exp $
-+# $Id: ncurses.sym,v 1.24 2015/09/05 19:36:49 tom Exp $
- # script for shared library symbol-visibility using libtool
- #
- # This file was generated by ncu-mapsyms
-@@ -231,6 +231,7 @@
- _nc_viscbuf
- _nc_warning
- _nc_write_entry
-+_nc_write_object
- _traceattr
- _traceattr2
- _tracechar
-Index: package/ncursest.map
-Prereq:  1.30 
---- ncurses-6.0-20150822+/package/ncursest.map	2015-07-11 13:01:10.000000000 +0000
-+++ ncurses-6.0-20150905/package/ncursest.map	2015-09-05 19:35:45.000000000 +0000
-@@ -1,4 +1,4 @@
--# $Id: ncursest.map,v 1.30 2015/07/11 13:01:10 tom Exp $
-+# $Id: ncursest.map,v 1.31 2015/09/05 19:35:45 tom Exp $
- # script for shared library symbol-versioning using ld
- #
- # This file was generated by ncu-mapsyms
-@@ -105,6 +105,13 @@
- 		_nc_strict_bsd;
- } NCURSES_TIC_5.7.20081102;
- 
-+NCURSES_TIC_6.0.current {
-+	global:
-+		_nc_write_object;
-+	local:
-+		_*;
-+} NCURSES_TIC_5.9.20150530;
-+
- NCURSES_TINFO_5.0.19991023 {
- 	global:
- 		BC;
-Index: package/ncursest.sym
-Prereq:  1.25 
---- ncurses-6.0-20150822+/package/ncursest.sym	2015-07-11 23:33:50.000000000 +0000
-+++ ncurses-6.0-20150905/package/ncursest.sym	2015-09-05 19:36:49.000000000 +0000
-@@ -1,4 +1,4 @@
--# $Id: ncursest.sym,v 1.25 2015/07/11 23:33:50 tom Exp $
-+# $Id: ncursest.sym,v 1.26 2015/09/05 19:36:49 tom Exp $
- # script for shared library symbol-visibility using libtool
- #
- # This file was generated by ncu-mapsyms
-@@ -233,6 +233,7 @@
- _nc_viscbuf
- _nc_warning
- _nc_write_entry
-+_nc_write_object
- _traceattr
- _traceattr2
- _tracechtype
-Index: package/ncursestw.map
-Prereq:  1.31 
---- ncurses-6.0-20150822+/package/ncursestw.map	2015-07-11 13:02:44.000000000 +0000
-+++ ncurses-6.0-20150905/package/ncursestw.map	2015-09-05 19:35:05.000000000 +0000
-@@ -1,4 +1,4 @@
--# $Id: ncursestw.map,v 1.31 2015/07/11 13:02:44 tom Exp $
-+# $Id: ncursestw.map,v 1.32 2015/09/05 19:35:05 tom Exp $
- # script for shared library symbol-versioning using ld
- #
- # This file was generated by ncu-mapsyms
-@@ -105,6 +105,13 @@
- 		_nc_strict_bsd;
- } NCURSES_TIC_5.7.20081102;
- 
-+NCURSES_TIC_6.0.current {
-+	global:
-+		_nc_write_object;
-+	local:
-+		_*;
-+} NCURSES_TIC_5.9.20150530;
-+
- NCURSES_TINFO_5.0.19991023 {
- 	global:
- 		BC;
-Index: package/ncursestw.sym
-Prereq:  1.23 
---- ncurses-6.0-20150822+/package/ncursestw.sym	2015-07-11 23:33:35.000000000 +0000
-+++ ncurses-6.0-20150905/package/ncursestw.sym	2015-09-05 19:36:49.000000000 +0000
-@@ -1,4 +1,4 @@
--# $Id: ncursestw.sym,v 1.23 2015/07/11 23:33:35 tom Exp $
-+# $Id: ncursestw.sym,v 1.24 2015/09/05 19:36:49 tom Exp $
- # script for shared library symbol-visibility using libtool
- #
- # This file was generated by ncu-mapsyms
-@@ -238,6 +238,7 @@
- _nc_warning
- _nc_wcrtomb
- _nc_write_entry
-+_nc_write_object
- _traceattr
- _traceattr2
- _tracecchar_t
-Index: package/ncursesw.map
-Prereq:  1.36 
---- ncurses-6.0-20150822+/package/ncursesw.map	2015-06-27 22:26:52.000000000 +0000
-+++ ncurses-6.0-20150905/package/ncursesw.map	2015-09-05 19:33:48.000000000 +0000
-@@ -1,4 +1,4 @@
--# $Id: ncursesw.map,v 1.36 2015/06/27 22:26:52 tom Exp $
-+# $Id: ncursesw.map,v 1.37 2015/09/05 19:33:48 tom Exp $
- # script for shared library symbol-versioning using ld
- #
- # This file was generated by ncu-mapsyms
-@@ -114,6 +114,13 @@
- 		_nc_strict_bsd;
- } NCURSES_TIC_5.7.20081102;
- 
-+NCURSES_TIC_6.0.current {
-+	global:
-+		_nc_write_object;
-+	local:
-+		_*;
-+} NCURSES_TIC_5.9.20150530;
-+
- NCURSES_TINFO_5.0.19991023 {
- 	global:
- 		BC;
-Index: package/ncursesw.sym
-Prereq:  1.24 
---- ncurses-6.0-20150822+/package/ncursesw.sym	2015-06-27 22:30:29.000000000 +0000
-+++ ncurses-6.0-20150905/package/ncursesw.sym	2015-09-05 19:36:49.000000000 +0000
-@@ -1,4 +1,4 @@
--# $Id: ncursesw.sym,v 1.24 2015/06/27 22:30:29 tom Exp $
-+# $Id: ncursesw.sym,v 1.25 2015/09/05 19:36:49 tom Exp $
- # script for shared library symbol-visibility using libtool
- #
- # This file was generated by ncu-mapsyms
-@@ -233,6 +233,7 @@
- _nc_wchstrlen
- _nc_wcrtomb
- _nc_write_entry
-+_nc_write_object
- _traceattr
- _traceattr2
- _tracecchar_t
-Index: progs/dump_entry.c
-Prereq:  1.118 
---- ncurses-6.0-20150822+/progs/dump_entry.c	2015-07-07 08:06:39.000000000 +0000
-+++ ncurses-6.0-20150905/progs/dump_entry.c	2015-09-05 23:31:12.000000000 +0000
-@@ -39,9 +39,8 @@
- #include "termsort.c"		/* this C file is generated */
- #include 	/* so is this */
- 
--MODULE_ID("$Id: dump_entry.c,v 1.118 2015/07/07 08:06:39 Werner.Fink Exp $")
-+MODULE_ID("$Id: dump_entry.c,v 1.123 2015/09/05 23:31:12 tom Exp $")
- 
--#define INDENT			8
- #define DISCARD(string) string = ABSENT_STRING
- #define PRINTF (void) printf
- 
-@@ -62,6 +61,7 @@
- static int oldcol;		/* last value of column before wrap */
- static bool pretty;		/* true if we format if-then-else strings */
- static bool checking;		/* true if we are checking for tic */
-+static int quickdump;		/* true if we are dumping compiled data */
- 
- static char *save_sgr;
- 
-@@ -75,6 +75,7 @@
- static NCURSES_CONST char *const *str_names;
- 
- static const char *separator = "", *trailer = "";
-+static int indent = 8;
- 
- /* cover various ports and variants of terminfo */
- #define V_ALLCAPS	0	/* all capabilities (SVr4, XSI, ncurses) */
-@@ -193,13 +194,15 @@
- 	  int theight,
- 	  unsigned traceval,
- 	  bool formatted,
--	  bool check)
-+	  bool check,
-+	  int quick)
- /* set up for entry display */
- {
-     width = twidth;
-     height = theight;
-     pretty = formatted;
-     checking = check;
-+    quickdump = (quick & 3);
- 
-     /* versions */
-     if (version == 0)
-@@ -244,6 +247,7 @@
- 	trailer = "\\\n\t:";
- 	break;
-     }
-+    indent = 8;
- 
-     /* implement sort modes */
-     switch (sortmode = sort) {
-@@ -413,7 +417,7 @@
-     oldcol = column;
-     trim_trailing();
-     strcpy_DYN(&outbuf, trailer);
--    column = INDENT;
-+    column = indent;
- }
- 
- static void
-@@ -422,7 +426,7 @@
-     size_t need = strlen(src);
-     size_t want = strlen(separator) + need;
- 
--    if (column > INDENT
-+    if (column > indent
- 	&& column + (int) want > width) {
- 	force_wrap();
-     }
-@@ -628,7 +632,7 @@
- 
-     strcpy_DYN(&outbuf, 0);
-     if (content_only) {
--	column = INDENT;	/* FIXME: workaround to prevent empty lines */
-+	column = indent;	/* FIXME: workaround to prevent empty lines */
-     } else {
- 	strcpy_DYN(&outbuf, tterm->term_names);
- 
-@@ -671,7 +675,7 @@
- 	}
-     }
- 
--    if (column != INDENT && height > 1)
-+    if (column != indent && height > 1)
- 	force_wrap();
- 
-     for_each_number(j, tterm) {
-@@ -699,7 +703,7 @@
- 	}
-     }
- 
--    if (column != INDENT && height > 1)
-+    if (column != indent && height > 1)
- 	force_wrap();
- 
-     len += (int) (num_bools
-@@ -1112,6 +1116,34 @@
-     return result;
- }
- 
-+static void
-+encode_b64(char *target, char *source, unsigned state, int *saved)
-+{
-+    /* RFC-4648 */
-+    static const char data[] =
-+    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-+    "abcdefghijklmnopqrstuvwxyz"
-+    "0123456789" "-_";
-+    int ch = UChar(source[state]);
-+
-+    switch (state % 3) {
-+    case 0:
-+	*target++ = data[ch & 077];
-+	*saved = (ch >> 6) & 3;
-+	break;
-+    case 1:
-+	*target++ = data[((ch << 2) | *saved) & 077];
-+	*saved = (ch >> 4) & 017;
-+	break;
-+    case 2:
-+	*target++ = data[((ch << 4) | *saved) & 077];
-+	*target++ = data[(ch >> 2) & 077];
-+	*saved = 0;
-+	break;
-+    }
-+    *target = '\0';
-+}
-+
- /*
-  * Dump a single entry.
-  */
-@@ -1127,6 +1159,48 @@
-     const char *legend;
-     bool infodump;
- 
-+    if (quickdump) {
-+	char bigbuf[65536];
-+	unsigned n;
-+	unsigned offset = 0;
-+	separator = "";
-+	trailer = "\n";
-+	indent = 0;
-+	if (_nc_write_object(tterm, bigbuf, &offset, sizeof(bigbuf)) == OK) {
-+	    char numbuf[80];
-+	    if (quickdump & 1) {
-+		if (outbuf.used)
-+		    wrap_concat("\n");
-+		wrap_concat("hex:");
-+		for (n = 0; n < offset; ++n) {
-+		    sprintf(numbuf, "%02X", UChar(bigbuf[n]));
-+		    wrap_concat(numbuf);
-+		}
-+	    }
-+	    if (quickdump & 2) {
-+		int value = 0;
-+		if (outbuf.used)
-+		    wrap_concat("\n");
-+		wrap_concat("b64:");
-+		for (n = 0; n < offset; ++n) {
-+		    encode_b64(numbuf, bigbuf, n, &value);
-+		    wrap_concat(numbuf);
-+		}
-+		switch (n % 3) {
-+		case 0:
-+		    break;
-+		case 1:
-+		    wrap_concat("===");
-+		    break;
-+		case 2:
-+		    wrap_concat("==");
-+		    break;
-+		}
-+	    }
-+	}
-+	return;
-+    }
-+
-     if (outform == F_TERMCAP || outform == F_TCONVERR) {
- 	critlen = MAX_TERMCAP_LENGTH;
- 	legend = "older termcap";
-@@ -1276,8 +1350,10 @@
- 	}
- 	outbuf.text[outbuf.used] = '\0';
-     }
--    (void) fputs(outbuf.text, stdout);
--    putchar('\n');
-+    if (outbuf.text != 0) {
-+	(void) fputs(outbuf.text, stdout);
-+	putchar('\n');
-+    }
-     return (int) outbuf.used;
- }
- 
-Index: progs/dump_entry.h
-Prereq:  1.35 
---- ncurses-6.0-20150822+/progs/dump_entry.h	2015-05-27 00:56:54.000000000 +0000
-+++ ncurses-6.0-20150905/progs/dump_entry.h	2015-09-05 15:49:58.000000000 +0000
-@@ -33,7 +33,7 @@
-  ****************************************************************************/
- 
- /*
-- * $Id: dump_entry.h,v 1.35 2015/05/27 00:56:54 tom Exp $
-+ * $Id: dump_entry.h,v 1.37 2015/09/05 15:49:58 tom Exp $
-  *
-  * Dump control definitions and variables
-  */
-@@ -72,7 +72,8 @@
- extern int show_entry(void);
- extern void compare_entry(PredHook, TERMTYPE *, bool);
- extern void dump_entry(TERMTYPE *, int, int, int, PredFunc);
--extern void dump_init(const char *, int, int, int, int, unsigned, bool, bool);
-+extern void dump_init(const char *, int, int, int, int, unsigned, bool,
-+		      bool, int);
- extern void dump_uses(const char *, bool);
- extern void repair_acsc(TERMTYPE *tp);
- 
-Index: progs/infocmp.c
-Prereq:  1.134 
---- ncurses-6.0-20150822+/progs/infocmp.c	2015-08-22 23:54:25.000000000 +0000
-+++ ncurses-6.0-20150905/progs/infocmp.c	2015-09-05 15:49:57.000000000 +0000
-@@ -42,7 +42,7 @@
- 
- #include 
- 
--MODULE_ID("$Id: infocmp.c,v 1.134 2015/08/22 23:54:25 tom Exp $")
-+MODULE_ID("$Id: infocmp.c,v 1.136 2015/09/05 15:49:57 tom Exp $")
- 
- #define L_CURL "{"
- #define R_CURL "}"
-@@ -989,7 +989,8 @@
-     int i, n;
- 
-     memset(heads, 0, sizeof(heads));
--    dump_init((char *) 0, F_LITERAL, S_TERMINFO, 0, 65535, itrace, FALSE, FALSE);
-+    dump_init((char *) 0, F_LITERAL, S_TERMINFO, 0, 65535, itrace, FALSE,
-+	      FALSE, FALSE);
- 
-     for (n = 0; n < argc && n < MAXCOMPARE; n++) {
- 	if (freopen(argv[n], "r", stdin) == 0)
-@@ -1197,6 +1198,7 @@
- 	,"  -l    output terminfo names"
- 	,"  -n    list capabilities in neither"
- 	,"  -p    ignore padding specifiers"
-+	,"  -Q number  dump compiled description"
- 	,"  -q    brief listing, removes headers"
- 	,"  -r    with -C, output in termcap form"
- 	,"  -r    with -F, resolve use-references"
-@@ -1506,6 +1508,7 @@
-     int initdump = 0;
-     bool init_analyze = FALSE;
-     bool suppress_untranslatable = FALSE;
-+    int quickdump = 0;
- 
-     /* where is the terminfo database location going to default to? */
-     restdir = firstdir = 0;
-@@ -1527,7 +1530,7 @@
- 
-     while ((c = getopt(argc,
- 		       argv,
--		       "01A:aB:CcDdEeFfGgIiKLlnpqR:rs:TtUuVv:w:x")) != -1) {
-+		       "01A:aB:CcDdEeFfGgIiKLlnpQ:qR:rs:TtUuVv:w:x")) != -1) {
- 	switch (c) {
- 	case '0':
- 	    mwidth = 65535;
-@@ -1628,6 +1631,10 @@
- 	    ignorepads = TRUE;
- 	    break;
- 
-+	case 'Q':
-+	    quickdump = optarg_to_number();
-+	    break;
-+
- 	case 'q':
- 	    quiet = TRUE;
- 	    s_absent = "-";
-@@ -1751,7 +1758,7 @@
- 
-     /* set up for display */
-     dump_init(tversion, outform, sortmode, mwidth, mheight, itrace,
--	      formatted, FALSE);
-+	      formatted, FALSE, quickdump);
- 
-     if (!filecompare) {
- 	/* grab the entries */
-@@ -1852,8 +1859,10 @@
- 				   "%s: about to dump %s\n",
- 				   _nc_progname,
- 				   tname[0]);
--		(void) printf("#\tReconstructed via infocmp from file: %s\n",
--			      tfile[0]);
-+		if (!quiet)
-+		    (void)
-+				  printf("#\tReconstructed via infocmp from file: %s\n",
-+				  tfile[0]);
- 		dump_entry(&entries[0].tterm,
- 			   suppress_untranslatable,
- 			   limited,
-Index: progs/tic.c
-Prereq:  1.213 
---- ncurses-6.0-20150822+/progs/tic.c	2015-08-22 23:49:57.000000000 +0000
-+++ ncurses-6.0-20150905/progs/tic.c	2015-09-05 19:22:49.000000000 +0000
-@@ -48,7 +48,7 @@
- #include 
- #include 
- 
--MODULE_ID("$Id: tic.c,v 1.213 2015/08/22 23:49:57 tom Exp $")
-+MODULE_ID("$Id: tic.c,v 1.216 2015/09/05 19:22:49 tom Exp $")
- 
- #define STDIN_NAME ""
- 
-@@ -159,6 +159,8 @@
- 	DATA("  -L         translate entries to full terminfo source form")
- 	DATA("  -N         disable smart defaults for source translation")
- 	DATA("  -o    set output directory for compiled entry writes")
-+	DATA("  -Q[n]      dump compiled description")
-+	DATA("  -q    brief listing, removes headers")
- 	DATA("  -R   restrict translation to given terminfo/termcap version")
- 	DATA("  -r         force resolution of all use entries in source translation")
- 	DATA("  -s         print summary statistics")
-@@ -660,6 +662,12 @@
-     }
- }
- 
-+static void
-+add_digit(int *target, int source)
-+{
-+    *target = (*target * 10) + (source - '0');
-+}
-+
- #define VtoTrace(opt) (unsigned) ((opt > 0) ? opt : (opt == 0))
- 
- int
-@@ -690,6 +698,8 @@
-     char *outdir = (char *) NULL;
-     bool check_only = FALSE;
-     bool suppress_untranslatable = FALSE;
-+    int quickdump = 0;
-+    bool quiet = FALSE;
- 
-     log_fp = stderr;
- 
-@@ -715,14 +725,17 @@
-      * be optional.
-      */
-     while ((this_opt = getopt(argc, argv,
--			      "0123456789CDIKLNR:TUVace:fGgo:rstvwx")) != -1) {
-+			      "0123456789CDIKLNQR:TUVace:fGgo:qrstvwx")) != -1) {
- 	if (isdigit(this_opt)) {
- 	    switch (last_opt) {
-+	    case 'Q':
-+		add_digit(&quickdump, this_opt);
-+		break;
- 	    case 'v':
--		v_opt = (v_opt * 10) + (this_opt - '0');
-+		add_digit(&v_opt, this_opt);
- 		break;
- 	    case 'w':
--		width = (width * 10) + (this_opt - '0');
-+		add_digit(&width, this_opt);
- 		break;
- 	    default:
- 		switch (this_opt) {
-@@ -773,6 +786,9 @@
- 	    smart_defaults = FALSE;
- 	    literal = TRUE;
- 	    break;
-+	case 'Q':
-+	    quickdump = 0;
-+	    break;
- 	case 'R':
- 	    tversion = optarg;
- 	    break;
-@@ -803,6 +819,9 @@
- 	case 'o':
- 	    outdir = optarg;
- 	    break;
-+	case 'q':
-+	    quiet = TRUE;
-+	    break;
- 	case 'r':
- 	    forceresolve = TRUE;
- 	    break;
-@@ -914,11 +933,11 @@
- 		  ? outform
- 		  : F_LITERAL,
- 		  sortmode, width, height, debug_level, formatted ||
--		  check_only, check_only);
-+		  check_only, check_only, quickdump);
-     } else if (capdump) {
- 	dump_init(tversion,
- 		  outform,
--		  sortmode, width, height, debug_level, FALSE, FALSE);
-+		  sortmode, width, height, debug_level, FALSE, FALSE, FALSE);
-     }
- 
-     /* parse entries out of the source file */
-@@ -989,12 +1008,14 @@
- 		    /* this is in case infotocap() generates warnings */
- 		    _nc_set_type(_nc_first_name(qp->tterm.term_names));
- 
--		    (void) fseek(tmp_fp, qp->cstart, SEEK_SET);
--		    while (j-- > 0) {
--			if (infodump)
--			    (void) putchar(fgetc(tmp_fp));
--			else
--			    put_translate(fgetc(tmp_fp));
-+		    if (!quiet) {
-+			(void) fseek(tmp_fp, qp->cstart, SEEK_SET);
-+			while (j-- > 0) {
-+			    if (infodump)
-+				(void) putchar(fgetc(tmp_fp));
-+			    else
-+				put_translate(fgetc(tmp_fp));
-+			}
- 		    }
- 
- 		    repair_acsc(&qp->tterm);
-@@ -1007,7 +1028,7 @@
- 			printf("# length=%d\n", len);
- 		}
- 	    }
--	    if (!namelst && _nc_tail) {
-+	    if (!namelst && _nc_tail && !quiet) {
- 		int c, oldc = '\0';
- 		bool in_comment = FALSE;
- 		bool trailing_comment = FALSE;
diff --git a/ncurses-6.0-20150912.patch b/ncurses-6.0-20150912.patch
deleted file mode 100644
index 4d698f4..0000000
--- a/ncurses-6.0-20150912.patch
+++ /dev/null
@@ -1,10769 +0,0 @@
-# ncurses 6.0 - patch 20150912 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.0 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.0 are in the subdirectory
-# 	ftp://invisible-island.net/ncurses/6.0
-#
-# ------------------------------------------------------------------------------
-# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20150912.patch.gz
-# patch by Thomas E. Dickey 
-# created  Sun Sep 13 00:36:49 UTC 2015
-# ------------------------------------------------------------------------------
-# NEWS                             |   16 
-# VERSION                          |    2 
-# aclocal.m4                       |   68 
-# configure                        | 3106 ++++++++++++++++++-------------------
-# dist.mk                          |    4 
-# include/ncurses_cfg.hin          |    8 
-# ncurses/base/lib_screen.c        |    3 
-# package/debian-mingw/changelog   |    4 
-# package/debian-mingw64/changelog |    4 
-# package/debian/changelog         |    4 
-# package/mingw-ncurses.nsi        |    4 
-# package/mingw-ncurses.spec       |    2 
-# package/ncurses.spec             |    2 
-# 13 files changed, 1651 insertions(+), 1576 deletions(-)
-# ------------------------------------------------------------------------------
-Index: NEWS
-Prereq:  1.2490 
---- ncurses-6.0-20150905+/NEWS	2015-09-05 21:14:36.000000000 +0000
-+++ ncurses-6.0-20150912/NEWS	2015-09-12 19:52:57.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.2490 2015/09/05 21:14:36 tom Exp $
-+-- $Id: NEWS,v 1.2493 2015/09/12 19:52:57 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,18 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20150912
-+	+ fixes for configure/build using clang on OSX (prompted by report by
-+	  William Gallafent).
-+	  + do not redefine "inline" in ncurses_cfg.h; this was originally to
-+	    solve a problem with gcc/g++, but is aggravated by clang's misuse
-+	    of symbols to pretend it is gcc.
-+	  + add braces to configure script to prevent unwanted add of
-+	    "-lstdc++" to the CXXLIBS symbol.
-+	  + improve/update test-program used for checking existence of stdc++
-+	    library.
-+	  + if $CXXLIBS is set, the linkage test uses that in addition to $LIBS
-+
- 20150905
- 	+ add note in curs_addch.3x about line-drawing when it depends upon
- 	  UTF-8.
-@@ -62,7 +74,7 @@
- 	+ documented differences in ESCDELAY versus AIX's implementation.
- 	+ fix some compiler warnings from ports.
- 	+ modify --with-pkg-config-libdir option to make it possible to install
--	  ".pc" files even if pkg-config is not found (adapted by patch by
-+	  ".pc" files even if pkg-config is not found (adapted from patch by
- 	  Joshua Root).
- 
- 20150815
-Index: VERSION
---- ncurses-6.0-20150905+/VERSION	2015-09-05 21:14:02.000000000 +0000
-+++ ncurses-6.0-20150912/VERSION	2015-09-12 16:17:30.000000000 +0000
-@@ -1 +1 @@
--5:0:9	6.0	20150905
-+5:0:9	6.0	20150912
-Index: aclocal.m4
-Prereq:  1.765 
---- ncurses-6.0-20150905+/aclocal.m4	2015-08-22 21:12:39.000000000 +0000
-+++ ncurses-6.0-20150912/aclocal.m4	2015-09-12 20:00:59.000000000 +0000
-@@ -28,7 +28,7 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: aclocal.m4,v 1.765 2015/08/22 21:12:39 tom Exp $
-+dnl $Id: aclocal.m4,v 1.767 2015/09/12 20:00:59 tom Exp $
- dnl Macros used in NCURSES auto-configuration script.
- dnl
- dnl These macros are maintained separately from NCURSES.  The copyright on
-@@ -1693,7 +1693,7 @@
- unset $1
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_FUNC_DLSYM version: 3 updated: 2012/10/06 11:17:15
-+dnl CF_FUNC_DLSYM version: 4 updated: 2015/09/12 14:46:44
- dnl -------------
- dnl Test for dlsym() and related functions, as well as libdl.
- dnl
-@@ -1710,7 +1710,7 @@
- 	cf_have_libdl=yes])])
- 
- if test "$cf_have_dlsym" = yes ; then
--	test "$cf_have_libdl" = yes && CF_ADD_LIB(dl)
-+	test "$cf_have_libdl" = yes && { CF_ADD_LIB(dl) }
- 
- 	AC_MSG_CHECKING(whether able to link to dl*() functions)
- 	AC_TRY_LINK([#include ],[
-@@ -1793,7 +1793,7 @@
- test "$cf_cv_func_nanosleep" = "yes" && AC_DEFINE(HAVE_NANOSLEEP,1,[Define to 1 if we have nanosleep()])
- ])
- dnl ---------------------------------------------------------------------------
--dnl CF_FUNC_OPENPTY version: 4 updated: 2015/04/18 08:56:57
-+dnl CF_FUNC_OPENPTY version: 5 updated: 2015/09/12 14:46:50
- dnl ---------------
- dnl Check for openpty() function, along with  header.  It may need the
- dnl "util" library as well.
-@@ -1802,7 +1802,7 @@
- AC_CHECK_LIB(util,openpty,cf_cv_lib_util=yes,cf_cv_lib_util=no)
- AC_CACHE_CHECK(for openpty header,cf_cv_func_openpty,[
- 	cf_save_LIBS="$LIBS"
--	test $cf_cv_lib_util = yes && CF_ADD_LIB(util)
-+	test $cf_cv_lib_util = yes && { CF_ADD_LIB(util) }
- 	for cf_header in pty.h libutil.h util.h
- 	do
- 	AC_TRY_LINK([
-@@ -6247,33 +6247,51 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_STDCPP_LIBRARY version: 8 updated: 2015/04/17 21:13:04
-+dnl CF_STDCPP_LIBRARY version: 10 updated: 2015/09/12 15:53:39
- dnl -----------------
- dnl Check for -lstdc++, which is GNU's standard C++ library.
-+dnl If $CXXLIBS is set, add that to the libraries used for test-linking.
-+dnl If -lstdc++ was not already added to $LIBS or $CXXLIBS, and is needed,
-+dnl add it to $CXXLIBS.
- AC_DEFUN([CF_STDCPP_LIBRARY],
- [
- if test -n "$GXX" ; then
--case $cf_cv_system_name in
--(os2*)
--	cf_stdcpp_libname=stdcpp
--	;;
--(*)
--	cf_stdcpp_libname=stdc++
--	;;
--esac
--AC_CACHE_CHECK(for library $cf_stdcpp_libname,cf_cv_libstdcpp,[
-+
- 	cf_save="$LIBS"
--	CF_ADD_LIB($cf_stdcpp_libname)
--AC_TRY_LINK([
--#include ],[
--char buf[80];
--strstreambuf foo(buf, sizeof(buf))
--],
--	[cf_cv_libstdcpp=yes],
--	[cf_cv_libstdcpp=no])
-+	LIBS="$LIBS $CXXLIBS"
-+	AC_MSG_CHECKING(if we already have C++ library)
-+	AC_TRY_LINK([
-+			#include ],[
-+			std::cout << "Hello World!" << std::endl;],
-+		[cf_have_libstdcpp=yes],
-+		[cf_have_libstdcpp=no])
-+	AC_MSG_RESULT($cf_have_libstdcpp)
- 	LIBS="$cf_save"
--])
--test "$cf_cv_libstdcpp" = yes && CF_ADD_LIB($cf_stdcpp_libname,CXXLIBS)
-+
-+	if test $cf_have_libstdcpp != yes
-+	then
-+		case $cf_cv_system_name in
-+		(os2*)
-+			cf_stdcpp_libname=stdcpp
-+			;;
-+		(*)
-+			cf_stdcpp_libname=stdc++
-+			;;
-+		esac
-+
-+		AC_CACHE_CHECK(for library $cf_stdcpp_libname,cf_cv_libstdcpp,[
-+			cf_save="$LIBS"
-+			LIBS="$LIBS $CXXLIBS"
-+			CF_ADD_LIB($cf_stdcpp_libname)
-+		AC_TRY_LINK([
-+				#include ],[
-+				std::cout << "Hello World!" << std::endl;],
-+			[cf_cv_libstdcpp=yes],
-+			[cf_cv_libstdcpp=no])
-+			LIBS="$cf_save"
-+		])
-+		test "$cf_cv_libstdcpp" = yes && { CF_ADD_LIB($cf_stdcpp_libname,CXXLIBS) }
-+	fi
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
-Index: configure
---- ncurses-6.0-20150905+/configure	2015-08-22 21:08:03.000000000 +0000
-+++ ncurses-6.0-20150912/configure	2015-09-12 20:01:47.000000000 +0000
-@@ -5456,7 +5456,7 @@
- fi
- 
- if test "$cf_have_dlsym" = yes ; then
--	test "$cf_have_libdl" = yes &&
-+	test "$cf_have_libdl" = yes && {
- cf_add_libs="-ldl"
- # Filter out duplicates - this happens with badly-designed ".pc" files...
- for cf_add_1lib in $LIBS
-@@ -5472,11 +5472,12 @@
- 	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
- done
- LIBS="$cf_add_libs"
-+ }
- 
--	echo "$as_me:5476: checking whether able to link to dl*() functions" >&5
-+	echo "$as_me:5477: checking whether able to link to dl*() functions" >&5
- echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 5479 "configure"
-+#line 5480 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -5494,16 +5495,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5497: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5498: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5500: \$? = $ac_status" >&5
-+  echo "$as_me:5501: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5503: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5504: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5506: \$? = $ac_status" >&5
-+  echo "$as_me:5507: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- cat >>confdefs.h <<\EOF
-@@ -5514,15 +5515,15 @@
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- 
--		{ { echo "$as_me:5517: error: Cannot link test program for libdl" >&5
-+		{ { echo "$as_me:5518: error: Cannot link test program for libdl" >&5
- echo "$as_me: error: Cannot link test program for libdl" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--	echo "$as_me:5522: result: ok" >&5
-+	echo "$as_me:5523: result: ok" >&5
- echo "${ECHO_T}ok" >&6
- else
--	{ { echo "$as_me:5525: error: Cannot find dlsym function" >&5
-+	{ { echo "$as_me:5526: error: Cannot find dlsym function" >&5
- echo "$as_me: error: Cannot find dlsym function" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -5530,12 +5531,12 @@
- 		if test "x$with_gpm" != xyes ; then
- 			test -n "$verbose" && echo "	assuming soname for gpm is $with_gpm" 1>&6
- 
--echo "${as_me:-configure}:5533: testing assuming soname for gpm is $with_gpm ..." 1>&5
-+echo "${as_me:-configure}:5534: testing assuming soname for gpm is $with_gpm ..." 1>&5
- 
- 			cf_cv_gpm_soname="$with_gpm"
- 		else
- 
--echo "$as_me:5538: checking for soname of gpm library" >&5
-+echo "$as_me:5539: checking for soname of gpm library" >&5
- echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6
- if test "${cf_cv_gpm_soname+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5569,15 +5570,15 @@
- done
- LIBS="$cf_add_libs"
- 
--	if { (eval echo "$as_me:5572: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:5573: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:5575: \$? = $ac_status" >&5
-+  echo "$as_me:5576: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
--		if { (eval echo "$as_me:5577: \"$ac_link\"") >&5
-+		if { (eval echo "$as_me:5578: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5580: \$? = $ac_status" >&5
-+  echo "$as_me:5581: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 			cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.`
- 			test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
-@@ -5588,7 +5589,7 @@
- fi
- 
- fi
--echo "$as_me:5591: result: $cf_cv_gpm_soname" >&5
-+echo "$as_me:5592: result: $cf_cv_gpm_soname" >&5
- echo "${ECHO_T}$cf_cv_gpm_soname" >&6
- 
- 		fi
-@@ -5623,7 +5624,7 @@
- #define HAVE_LIBGPM 1
- EOF
- 
--echo "$as_me:5626: checking for Gpm_Wgetch in -lgpm" >&5
-+echo "$as_me:5627: checking for Gpm_Wgetch in -lgpm" >&5
- echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6
- if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5631,7 +5632,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5634 "configure"
-+#line 5635 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5650,16 +5651,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5653: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5654: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5656: \$? = $ac_status" >&5
-+  echo "$as_me:5657: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5659: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5660: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5662: \$? = $ac_status" >&5
-+  echo "$as_me:5663: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_Gpm_Wgetch=yes
- else
-@@ -5670,11 +5671,11 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:5673: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
-+echo "$as_me:5674: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
- echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6
- if test $ac_cv_lib_gpm_Gpm_Wgetch = yes; then
- 
--echo "$as_me:5677: checking if GPM is weakly bound to curses library" >&5
-+echo "$as_me:5678: checking if GPM is weakly bound to curses library" >&5
- echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6
- if test "${cf_cv_check_gpm_wgetch+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5698,15 +5699,15 @@
- 	# to rely on the static library, noting that some packagers may not
- 	# include it.
- 	LIBS="-static -lgpm -dynamic $LIBS"
--	if { (eval echo "$as_me:5701: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:5702: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:5704: \$? = $ac_status" >&5
-+  echo "$as_me:5705: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
--		if { (eval echo "$as_me:5706: \"$ac_link\"") >&5
-+		if { (eval echo "$as_me:5707: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5709: \$? = $ac_status" >&5
-+  echo "$as_me:5710: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 			cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\' | egrep '\<[vVwW]\>'`
- 			test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
-@@ -5718,11 +5719,11 @@
- fi
- 
- fi
--echo "$as_me:5721: result: $cf_cv_check_gpm_wgetch" >&5
-+echo "$as_me:5722: result: $cf_cv_check_gpm_wgetch" >&5
- echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6
- 
- if test "$cf_cv_check_gpm_wgetch" != yes ; then
--	{ echo "$as_me:5725: WARNING: GPM library is already linked with curses - read the FAQ" >&5
-+	{ echo "$as_me:5726: WARNING: GPM library is already linked with curses - read the FAQ" >&5
- echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;}
- fi
- 
-@@ -5732,7 +5733,7 @@
- 
- # not everyone has "test -c"
- if test -c /dev/sysmouse 2>/dev/null ; then
--echo "$as_me:5735: checking if you want to use sysmouse" >&5
-+echo "$as_me:5736: checking if you want to use sysmouse" >&5
- echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6
- 
- # Check whether --with-sysmouse or --without-sysmouse was given.
-@@ -5744,7 +5745,7 @@
- fi;
- 	if test "$cf_with_sysmouse" != no ; then
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 5747 "configure"
-+#line 5748 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -5767,16 +5768,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:5770: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5771: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:5773: \$? = $ac_status" >&5
-+  echo "$as_me:5774: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:5776: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5777: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5779: \$? = $ac_status" >&5
-+  echo "$as_me:5780: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_with_sysmouse=yes
- else
-@@ -5786,7 +5787,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	fi
--echo "$as_me:5789: result: $cf_with_sysmouse" >&5
-+echo "$as_me:5790: result: $cf_with_sysmouse" >&5
- echo "${ECHO_T}$cf_with_sysmouse" >&6
- test "$cf_with_sysmouse" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -5805,7 +5806,7 @@
- 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
- fi
- 
--echo "$as_me:5808: checking for default loader flags" >&5
-+echo "$as_me:5809: checking for default loader flags" >&5
- echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
- case $DFT_LWR_MODEL in
- (libtool) LD_MODEL=''   ;;
-@@ -5814,13 +5815,13 @@
- (profile) LD_MODEL='-pg';;
- (shared)  LD_MODEL=''   ;;
- esac
--echo "$as_me:5817: result: $LD_MODEL" >&5
-+echo "$as_me:5818: result: $LD_MODEL" >&5
- echo "${ECHO_T}$LD_MODEL" >&6
- 
- case $DFT_LWR_MODEL in
- (shared)
- 
--echo "$as_me:5823: checking if rpath option should be used" >&5
-+echo "$as_me:5824: checking if rpath option should be used" >&5
- echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6
- 
- # Check whether --enable-rpath or --disable-rpath was given.
-@@ -5830,10 +5831,10 @@
- else
-   cf_cv_enable_rpath=no
- fi;
--echo "$as_me:5833: result: $cf_cv_enable_rpath" >&5
-+echo "$as_me:5834: result: $cf_cv_enable_rpath" >&5
- echo "${ECHO_T}$cf_cv_enable_rpath" >&6
- 
--echo "$as_me:5836: checking if shared libraries should be relinked during install" >&5
-+echo "$as_me:5837: checking if shared libraries should be relinked during install" >&5
- echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6
- 
- # Check whether --enable-relink or --disable-relink was given.
-@@ -5843,7 +5844,7 @@
- else
-   cf_cv_do_relink=yes
- fi;
--echo "$as_me:5846: result: $cf_cv_do_relink" >&5
-+echo "$as_me:5847: result: $cf_cv_do_relink" >&5
- echo "${ECHO_T}$cf_cv_do_relink" >&6
- 	;;
- esac
-@@ -5852,7 +5853,7 @@
- rel_builddir=..
- 
- LD_RPATH_OPT=
--echo "$as_me:5855: checking for an rpath option" >&5
-+echo "$as_me:5856: checking for an rpath option" >&5
- echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
- case $cf_cv_system_name in
- (irix*)
-@@ -5883,12 +5884,12 @@
- (*)
- 	;;
- esac
--echo "$as_me:5886: result: $LD_RPATH_OPT" >&5
-+echo "$as_me:5887: result: $LD_RPATH_OPT" >&5
- echo "${ECHO_T}$LD_RPATH_OPT" >&6
- 
- case "x$LD_RPATH_OPT" in
- (x-R*)
--	echo "$as_me:5891: checking if we need a space after rpath option" >&5
-+	echo "$as_me:5892: 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"
- 
-@@ -5909,7 +5910,7 @@
- LIBS="$cf_add_libs"
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 5912 "configure"
-+#line 5913 "configure"
- #include "confdefs.h"
- 
- int
-@@ -5921,16 +5922,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5924: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5925: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5927: \$? = $ac_status" >&5
-+  echo "$as_me:5928: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5930: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5931: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5933: \$? = $ac_status" >&5
-+  echo "$as_me:5934: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_rpath_space=no
- else
-@@ -5940,7 +5941,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	LIBS="$cf_save_LIBS"
--	echo "$as_me:5943: result: $cf_rpath_space" >&5
-+	echo "$as_me:5944: result: $cf_rpath_space" >&5
- echo "${ECHO_T}$cf_rpath_space" >&6
- 	test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
- 	;;
-@@ -5961,7 +5962,7 @@
- 	cf_ld_rpath_opt=
- 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
- 
--	echo "$as_me:5964: checking if release/abi version should be used for shared libs" >&5
-+	echo "$as_me:5965: checking if release/abi version should be used for shared libs" >&5
- echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6
- 
- # Check whether --with-shlib-version or --without-shlib-version was given.
-@@ -5976,9 +5977,9 @@
- 		cf_cv_shlib_version=$withval
- 		;;
- 	(*)
--		echo "$as_me:5979: result: $withval" >&5
-+		echo "$as_me:5980: result: $withval" >&5
- echo "${ECHO_T}$withval" >&6
--		{ { echo "$as_me:5981: error: option value must be one of: rel, abi, or auto" >&5
-+		{ { echo "$as_me:5982: error: option value must be one of: rel, abi, or auto" >&5
- echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
-    { (exit 1); exit 1; }; }
- 		;;
-@@ -5987,7 +5988,7 @@
- else
-   cf_cv_shlib_version=auto
- fi;
--	echo "$as_me:5990: result: $cf_cv_shlib_version" >&5
-+	echo "$as_me:5991: result: $cf_cv_shlib_version" >&5
- echo "${ECHO_T}$cf_cv_shlib_version" >&6
- 
- 	cf_cv_rm_so_locs=no
-@@ -5997,14 +5998,14 @@
- 	CC_SHARED_OPTS=
- 	if test "$GCC" = yes
- 	then
--		echo "$as_me:6000: checking which $CC option to use" >&5
-+		echo "$as_me:6001: checking which $CC option to use" >&5
- echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
- 		cf_save_CFLAGS="$CFLAGS"
- 		for CC_SHARED_OPTS in -fPIC -fpic ''
- 		do
- 			CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 6007 "configure"
-+#line 6008 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -6016,16 +6017,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6019: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6020: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6022: \$? = $ac_status" >&5
-+  echo "$as_me:6023: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6025: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6026: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6028: \$? = $ac_status" >&5
-+  echo "$as_me:6029: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -6034,7 +6035,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		done
--		echo "$as_me:6037: result: $CC_SHARED_OPTS" >&5
-+		echo "$as_me:6038: result: $CC_SHARED_OPTS" >&5
- echo "${ECHO_T}$CC_SHARED_OPTS" >&6
- 		CFLAGS="$cf_save_CFLAGS"
- 	fi
-@@ -6105,7 +6106,7 @@
- 		MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
- 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
- 		cf_cv_shlib_version_infix=yes
--		echo "$as_me:6108: checking if ld -search_paths_first works" >&5
-+		echo "$as_me:6109: checking if ld -search_paths_first works" >&5
- echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6
- if test "${cf_cv_ldflags_search_paths_first+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6114,7 +6115,7 @@
- 			cf_save_LDFLAGS=$LDFLAGS
- 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 6117 "configure"
-+#line 6118 "configure"
- #include "confdefs.h"
- 
- int
-@@ -6126,16 +6127,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6129: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6130: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6132: \$? = $ac_status" >&5
-+  echo "$as_me:6133: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6135: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6136: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6138: \$? = $ac_status" >&5
-+  echo "$as_me:6139: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ldflags_search_paths_first=yes
- else
-@@ -6146,7 +6147,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 				LDFLAGS=$cf_save_LDFLAGS
- fi
--echo "$as_me:6149: result: $cf_cv_ldflags_search_paths_first" >&5
-+echo "$as_me:6150: result: $cf_cv_ldflags_search_paths_first" >&5
- echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
- 		if test $cf_cv_ldflags_search_paths_first = yes; then
- 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
-@@ -6371,7 +6372,7 @@
- 			do
- 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
- 				cat >conftest.$ac_ext <<_ACEOF
--#line 6374 "configure"
-+#line 6375 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -6383,16 +6384,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6386: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6387: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6389: \$? = $ac_status" >&5
-+  echo "$as_me:6390: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6392: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6393: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6395: \$? = $ac_status" >&5
-+  echo "$as_me:6396: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -6429,7 +6430,7 @@
- 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
- 			;;
- 		(*)
--			{ echo "$as_me:6432: WARNING: ignored --with-shlib-version" >&5
-+			{ echo "$as_me:6433: WARNING: ignored --with-shlib-version" >&5
- echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
- 			;;
- 		esac
-@@ -6439,7 +6440,7 @@
- 	if test -n "$cf_try_cflags"
- 	then
- cat > conftest.$ac_ext <
- int main(int argc, char *argv[])
- {
-@@ -6451,18 +6452,18 @@
- 		for cf_opt in $cf_try_cflags
- 		do
- 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
--			echo "$as_me:6454: checking if CFLAGS option -$cf_opt works" >&5
-+			echo "$as_me:6455: checking if CFLAGS option -$cf_opt works" >&5
- echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6
--			if { (eval echo "$as_me:6456: \"$ac_compile\"") >&5
-+			if { (eval echo "$as_me:6457: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6459: \$? = $ac_status" >&5
-+  echo "$as_me:6460: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--				echo "$as_me:6461: result: yes" >&5
-+				echo "$as_me:6462: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 				cf_save_CFLAGS="$CFLAGS"
- 			else
--				echo "$as_me:6465: result: no" >&5
-+				echo "$as_me:6466: result: no" >&5
- echo "${ECHO_T}no" >&6
- 			fi
- 		done
-@@ -6477,17 +6478,17 @@
- 
- 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
- 
--echo "${as_me:-configure}:6480: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
-+echo "${as_me:-configure}:6481: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
- 
- 	test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
- 
--echo "${as_me:-configure}:6484: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
-+echo "${as_me:-configure}:6485: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
- 
- for model in $cf_list_models; do
- 	case $model in
- 	(libtool)
- 
--echo "$as_me:6490: checking for additional libtool options" >&5
-+echo "$as_me:6491: checking for additional libtool options" >&5
- echo $ECHO_N "checking for additional libtool options... $ECHO_C" >&6
- 
- # Check whether --with-libtool-opts or --without-libtool-opts was given.
-@@ -6497,7 +6498,7 @@
- else
-   with_libtool_opts=no
- fi;
--echo "$as_me:6500: result: $with_libtool_opts" >&5
-+echo "$as_me:6501: result: $with_libtool_opts" >&5
- echo "${ECHO_T}$with_libtool_opts" >&6
- 
- case .$with_libtool_opts in
-@@ -6508,7 +6509,7 @@
- 	;;
- esac
- 
--echo "$as_me:6511: checking if exported-symbols file should be used" >&5
-+echo "$as_me:6512: checking if exported-symbols file should be used" >&5
- echo $ECHO_N "checking if exported-symbols file should be used... $ECHO_C" >&6
- 
- # Check whether --with-export-syms or --without-export-syms was given.
-@@ -6523,7 +6524,7 @@
- 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
- 
- fi
--echo "$as_me:6526: result: $with_export_syms" >&5
-+echo "$as_me:6527: result: $with_export_syms" >&5
- echo "${ECHO_T}$with_export_syms" >&6
- if test "x$with_export_syms" != xno
- then
-@@ -6534,12 +6535,12 @@
- 		;;
- 	(shared)
- 		if test "$CC_SHARED_OPTS" = "unknown"; then
--			{ { echo "$as_me:6537: error: Shared libraries are not supported in this version" >&5
-+			{ { echo "$as_me:6538: error: Shared libraries are not supported in this version" >&5
- echo "$as_me: error: Shared libraries are not supported in this version" >&2;}
-    { (exit 1); exit 1; }; }
- 		fi
- 
--echo "$as_me:6542: checking if versioned-symbols file should be used" >&5
-+echo "$as_me:6543: checking if versioned-symbols file should be used" >&5
- echo $ECHO_N "checking if versioned-symbols file should be used... $ECHO_C" >&6
- 
- # Check whether --with-versioned-syms or --without-versioned-syms was given.
-@@ -6554,7 +6555,7 @@
- 	with_versioned_syms='${top_srcdir}/package/${PACKAGE}.map'
- 
- fi
--echo "$as_me:6557: result: $with_versioned_syms" >&5
-+echo "$as_me:6558: result: $with_versioned_syms" >&5
- echo "${ECHO_T}$with_versioned_syms" >&6
- 
- RESULTING_SYMS=
-@@ -6570,7 +6571,7 @@
- 		MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-Wl,%\\${VERSIONED_SYMS} -Wl,%"`
- 		test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
- 
--echo "${as_me:-configure}:6573: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
-+echo "${as_me:-configure}:6574: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
- 
- 		;;
- 	(*-dy\ *)
-@@ -6578,11 +6579,11 @@
- 		MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-dy%\\${VERSIONED_SYMS} -dy%"`
- 		test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
- 
--echo "${as_me:-configure}:6581: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
-+echo "${as_me:-configure}:6582: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
- 
- 		;;
- 	(*)
--		{ echo "$as_me:6585: WARNING: this system does not support versioned-symbols" >&5
-+		{ echo "$as_me:6586: WARNING: this system does not support versioned-symbols" >&5
- echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
- 		;;
- 	esac
-@@ -6594,7 +6595,7 @@
- 	# symbols.
- 	if test "x$VERSIONED_SYMS" != "x"
- 	then
--		echo "$as_me:6597: checking if wildcards can be used to selectively omit symbols" >&5
-+		echo "$as_me:6598: checking if wildcards can be used to selectively omit symbols" >&5
- echo $ECHO_N "checking if wildcards can be used to selectively omit symbols... $ECHO_C" >&6
- 		WILDCARD_SYMS=no
- 
-@@ -6631,7 +6632,7 @@
- } submodule_1.0;
- EOF
- 		cat >conftest.$ac_ext <&5 |fgrep _ismissing | egrep '[ 	]T[ 	]'`
- 			test -n "$cf_missing" && WILDCARD_SYMS=yes
- 		fi
--		echo "$as_me:6665: result: $WILDCARD_SYMS" >&5
-+		echo "$as_me:6666: result: $WILDCARD_SYMS" >&5
- echo "${ECHO_T}$WILDCARD_SYMS" >&6
- 		rm -f conftest.*
- 	fi
-@@ -6673,7 +6674,7 @@
- done
- 
- # pretend that ncurses==ncursesw==ncursest
--echo "$as_me:6676: checking if you want to disable library suffixes" >&5
-+echo "$as_me:6677: checking if you want to disable library suffixes" >&5
- echo $ECHO_N "checking if you want to disable library suffixes... $ECHO_C" >&6
- 
- # Check whether --enable-lib-suffixes or --disable-lib-suffixes was given.
-@@ -6690,13 +6691,13 @@
- 	disable_lib_suffixes=no
- 
- fi;
--echo "$as_me:6693: result: $disable_lib_suffixes" >&5
-+echo "$as_me:6694: result: $disable_lib_suffixes" >&5
- echo "${ECHO_T}$disable_lib_suffixes" >&6
- 
- ### If we're building with rpath, try to link non-standard libs that way too.
- if test "$DFT_LWR_MODEL" = "shared"; then
- 
--echo "$as_me:6699: checking if rpath-hack should be disabled" >&5
-+echo "$as_me:6700: 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.
-@@ -6713,21 +6714,21 @@
- 	cf_disable_rpath_hack=no
- 
- fi;
--echo "$as_me:6716: result: $cf_disable_rpath_hack" >&5
-+echo "$as_me:6717: 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:6720: checking for updated LDFLAGS" >&5
-+echo "$as_me:6721: 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:6723: result: maybe" >&5
-+	echo "$as_me:6724: 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:6730: checking for $ac_word" >&5
-+echo "$as_me:6731: 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
-@@ -6742,7 +6743,7 @@
-   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:6745: found $ac_dir/$ac_word" >&5
-+echo "$as_me:6746: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -6750,10 +6751,10 @@
- fi
- cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
- if test -n "$cf_ldd_prog"; then
--  echo "$as_me:6753: result: $cf_ldd_prog" >&5
-+  echo "$as_me:6754: result: $cf_ldd_prog" >&5
- echo "${ECHO_T}$cf_ldd_prog" >&6
- else
--  echo "$as_me:6756: result: no" >&5
-+  echo "$as_me:6757: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -6767,7 +6768,7 @@
- 		cf_rpath_oops=
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 6770 "configure"
-+#line 6771 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -6779,16 +6780,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6782: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6783: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6785: \$? = $ac_status" >&5
-+  echo "$as_me:6786: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6788: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6789: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6791: \$? = $ac_status" >&5
-+  echo "$as_me:6792: \$? = $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`
-@@ -6816,7 +6817,7 @@
- 					then
- 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
- 
--echo "${as_me:-configure}:6819: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
-+echo "${as_me:-configure}:6820: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
- 
- 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
- 						break
-@@ -6828,11 +6829,11 @@
- 
- 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:6831: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6832: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
- 
- test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:6835: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6836: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
- 
- cf_rpath_dst=
- for cf_rpath_src in $LDFLAGS
-@@ -6869,7 +6870,7 @@
- 			then
- 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
- 
--echo "${as_me:-configure}:6872: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
-+echo "${as_me:-configure}:6873: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
- 
- 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
- 			fi
-@@ -6882,11 +6883,11 @@
- 
- test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:6885: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6886: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
- 
- test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
- 
--echo "${as_me:-configure}:6889: testing ...checking LIBS $LIBS ..." 1>&5
-+echo "${as_me:-configure}:6890: testing ...checking LIBS $LIBS ..." 1>&5
- 
- cf_rpath_dst=
- for cf_rpath_src in $LIBS
-@@ -6923,7 +6924,7 @@
- 			then
- 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
- 
--echo "${as_me:-configure}:6926: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
-+echo "${as_me:-configure}:6927: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
- 
- 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
- 			fi
-@@ -6936,14 +6937,14 @@
- 
- test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
- 
--echo "${as_me:-configure}:6939: testing ...checked LIBS $LIBS ..." 1>&5
-+echo "${as_me:-configure}:6940: testing ...checked LIBS $LIBS ..." 1>&5
- 
- 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:6943: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6944: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
- 
- else
--	echo "$as_me:6946: result: no" >&5
-+	echo "$as_me:6947: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -6954,7 +6955,7 @@
- ###############################################################################
- 
- ###	use option --with-extra-suffix to append suffix to headers and libraries
--echo "$as_me:6957: checking if you wish to append extra suffix to header/library paths" >&5
-+echo "$as_me:6958: checking if you wish to append extra suffix to header/library paths" >&5
- echo $ECHO_N "checking if you wish to append extra suffix to header/library paths... $ECHO_C" >&6
- EXTRA_SUFFIX=
- 
-@@ -6973,11 +6974,11 @@
- 	esac
- 
- fi;
--echo "$as_me:6976: result: $EXTRA_SUFFIX" >&5
-+echo "$as_me:6977: result: $EXTRA_SUFFIX" >&5
- echo "${ECHO_T}$EXTRA_SUFFIX" >&6
- 
- ###	use option --disable-overwrite to leave out the link to -lcurses
--echo "$as_me:6980: checking if you wish to install ncurses overwriting curses" >&5
-+echo "$as_me:6981: checking if you wish to install ncurses overwriting curses" >&5
- echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6
- 
- # Check whether --enable-overwrite or --disable-overwrite was given.
-@@ -6987,10 +6988,10 @@
- else
-   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
- fi;
--echo "$as_me:6990: result: $with_overwrite" >&5
-+echo "$as_me:6991: result: $with_overwrite" >&5
- echo "${ECHO_T}$with_overwrite" >&6
- 
--echo "$as_me:6993: checking if external terminfo-database is used" >&5
-+echo "$as_me:6994: checking if external terminfo-database is used" >&5
- echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6
- 
- # Check whether --enable-database or --disable-database was given.
-@@ -7000,7 +7001,7 @@
- else
-   use_database=yes
- fi;
--echo "$as_me:7003: result: $use_database" >&5
-+echo "$as_me:7004: result: $use_database" >&5
- echo "${ECHO_T}$use_database" >&6
- 
- case $host_os in
-@@ -7016,7 +7017,7 @@
- if test "$use_database" != no ; then
- 	NCURSES_USE_DATABASE=1
- 
--	echo "$as_me:7019: checking which terminfo source-file will be installed" >&5
-+	echo "$as_me:7020: checking which terminfo source-file will be installed" >&5
- echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6
- 
- # Check whether --with-database or --without-database was given.
-@@ -7024,10 +7025,10 @@
-   withval="$with_database"
-   TERMINFO_SRC=$withval
- fi;
--	echo "$as_me:7027: result: $TERMINFO_SRC" >&5
-+	echo "$as_me:7028: result: $TERMINFO_SRC" >&5
- echo "${ECHO_T}$TERMINFO_SRC" >&6
- 
--	echo "$as_me:7030: checking whether to use hashed database instead of directory/tree" >&5
-+	echo "$as_me:7031: checking whether to use hashed database instead of directory/tree" >&5
- echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6
- 
- # Check whether --with-hashed-db or --without-hashed-db was given.
-@@ -7037,13 +7038,13 @@
- else
-   with_hashed_db=no
- fi;
--	echo "$as_me:7040: result: $with_hashed_db" >&5
-+	echo "$as_me:7041: result: $with_hashed_db" >&5
- echo "${ECHO_T}$with_hashed_db" >&6
- else
- 	with_hashed_db=no
- fi
- 
--echo "$as_me:7046: checking for list of fallback descriptions" >&5
-+echo "$as_me:7047: checking for list of fallback descriptions" >&5
- echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6
- 
- # Check whether --with-fallbacks or --without-fallbacks was given.
-@@ -7053,11 +7054,11 @@
- else
-   with_fallback=
- fi;
--echo "$as_me:7056: result: $with_fallback" >&5
-+echo "$as_me:7057: result: $with_fallback" >&5
- echo "${ECHO_T}$with_fallback" >&6
- FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'`
- 
--echo "$as_me:7060: checking if you want modern xterm or antique" >&5
-+echo "$as_me:7061: checking if you want modern xterm or antique" >&5
- echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6
- 
- # Check whether --with-xterm-new or --without-xterm-new was given.
-@@ -7071,11 +7072,11 @@
- (no) with_xterm_new=xterm-old;;
- (*)	 with_xterm_new=xterm-new;;
- esac
--echo "$as_me:7074: result: $with_xterm_new" >&5
-+echo "$as_me:7075: result: $with_xterm_new" >&5
- echo "${ECHO_T}$with_xterm_new" >&6
- WHICH_XTERM=$with_xterm_new
- 
--echo "$as_me:7078: checking if xterm backspace sends BS or DEL" >&5
-+echo "$as_me:7079: checking if xterm backspace sends BS or DEL" >&5
- echo $ECHO_N "checking if xterm backspace sends BS or DEL... $ECHO_C" >&6
- 
- # Check whether --with-xterm-kbs or --without-xterm-kbs was given.
-@@ -7096,7 +7097,7 @@
- 	with_xterm_kbs=$withval
- 	;;
- esac
--echo "$as_me:7099: result: $with_xterm_kbs" >&5
-+echo "$as_me:7100: result: $with_xterm_kbs" >&5
- echo "${ECHO_T}$with_xterm_kbs" >&6
- XTERM_KBS=$with_xterm_kbs
- 
-@@ -7106,7 +7107,7 @@
- 	MAKE_TERMINFO="#"
- else
- 
--echo "$as_me:7109: checking for list of terminfo directories" >&5
-+echo "$as_me:7110: checking for list of terminfo directories" >&5
- echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6
- 
- # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given.
-@@ -7146,7 +7147,7 @@
- 	cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:7149: error: expected a pathname, not \"$cf_src_path\"" >&5
-+	{ { echo "$as_me:7150: error: expected a pathname, not \"$cf_src_path\"" >&5
- echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -7169,14 +7170,14 @@
- 	;;
- esac
- 
--echo "$as_me:7172: result: $TERMINFO_DIRS" >&5
-+echo "$as_me:7173: result: $TERMINFO_DIRS" >&5
- echo "${ECHO_T}$TERMINFO_DIRS" >&6
- test -n "$TERMINFO_DIRS" &&
- cat >>confdefs.h <&5
-+echo "$as_me:7180: checking for default terminfo directory" >&5
- echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6
- 
- # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given.
-@@ -7212,7 +7213,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:7215: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:7216: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -7221,7 +7222,7 @@
- fi
- eval TERMINFO="$withval"
- 
--echo "$as_me:7224: result: $TERMINFO" >&5
-+echo "$as_me:7225: result: $TERMINFO" >&5
- echo "${ECHO_T}$TERMINFO" >&6
- 
- cat >>confdefs.h <&5
-+echo "$as_me:7236: checking if big-core option selected" >&5
- echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6
- 
- # Check whether --enable-big-core or --disable-big-core was given.
-@@ -7244,7 +7245,7 @@
-   with_big_core=no
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7247 "configure"
-+#line 7248 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -7258,15 +7259,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:7261: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7262: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7264: \$? = $ac_status" >&5
-+  echo "$as_me:7265: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:7266: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7267: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7269: \$? = $ac_status" >&5
-+  echo "$as_me:7270: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   with_big_core=yes
- else
-@@ -7278,7 +7279,7 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi;
--echo "$as_me:7281: result: $with_big_core" >&5
-+echo "$as_me:7282: result: $with_big_core" >&5
- echo "${ECHO_T}$with_big_core" >&6
- test "x$with_big_core" = "xyes" &&
- cat >>confdefs.h <<\EOF
-@@ -7288,7 +7289,7 @@
- ### ISO C only guarantees 512-char strings, we have tables which load faster
- ### when constructed using "big" strings.  More than the C compiler, the awk
- ### program is a limit on most vendor UNIX systems.  Check that we can build.
--echo "$as_me:7291: checking if big-strings option selected" >&5
-+echo "$as_me:7292: checking if big-strings option selected" >&5
- echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6
- 
- # Check whether --enable-big-strings or --disable-big-strings was given.
-@@ -7312,14 +7313,14 @@
- 	esac
- 
- fi;
--echo "$as_me:7315: result: $with_big_strings" >&5
-+echo "$as_me:7316: result: $with_big_strings" >&5
- echo "${ECHO_T}$with_big_strings" >&6
- 
- USE_BIG_STRINGS=0
- test "x$with_big_strings" = "xyes" && USE_BIG_STRINGS=1
- 
- ###	use option --enable-termcap to compile in the termcap fallback support
--echo "$as_me:7322: checking if you want termcap-fallback support" >&5
-+echo "$as_me:7323: checking if you want termcap-fallback support" >&5
- echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6
- 
- # Check whether --enable-termcap or --disable-termcap was given.
-@@ -7329,14 +7330,14 @@
- else
-   with_termcap=no
- fi;
--echo "$as_me:7332: result: $with_termcap" >&5
-+echo "$as_me:7333: result: $with_termcap" >&5
- echo "${ECHO_T}$with_termcap" >&6
- 
- NCURSES_USE_TERMCAP=0
- if test "x$with_termcap" != "xyes" ; then
- 	if test "$use_database" = no ; then
- 		if test -z "$with_fallback" ; then
--			{ { echo "$as_me:7339: error: You have disabled the database w/o specifying fallbacks" >&5
-+			{ { echo "$as_me:7340: error: You have disabled the database w/o specifying fallbacks" >&5
- echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;}
-    { (exit 1); exit 1; }; }
- 		fi
-@@ -7349,13 +7350,13 @@
- else
- 
- 	if test "$with_ticlib" != no ; then
--		{ { echo "$as_me:7352: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
-+		{ { echo "$as_me:7353: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
- echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
- 
- 	NCURSES_USE_TERMCAP=1
--	echo "$as_me:7358: checking for list of termcap files" >&5
-+	echo "$as_me:7359: checking for list of termcap files" >&5
- echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6
- 
- # Check whether --with-termpath or --without-termpath was given.
-@@ -7395,7 +7396,7 @@
- 	cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:7398: error: expected a pathname, not \"$cf_src_path\"" >&5
-+	{ { echo "$as_me:7399: error: expected a pathname, not \"$cf_src_path\"" >&5
- echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -7418,7 +7419,7 @@
- 	;;
- esac
- 
--	echo "$as_me:7421: result: $TERMPATH" >&5
-+	echo "$as_me:7422: result: $TERMPATH" >&5
- echo "${ECHO_T}$TERMPATH" >&6
- 	test -n "$TERMPATH" &&
- cat >>confdefs.h <&5
-+	echo "$as_me:7430: checking if fast termcap-loader is needed" >&5
- echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6
- 
- # Check whether --enable-getcap or --disable-getcap was given.
-@@ -7436,14 +7437,14 @@
- else
-   with_getcap=no
- fi;
--	echo "$as_me:7439: result: $with_getcap" >&5
-+	echo "$as_me:7440: result: $with_getcap" >&5
- echo "${ECHO_T}$with_getcap" >&6
- 	test "x$with_getcap" = "xyes" &&
- cat >>confdefs.h <<\EOF
- #define USE_GETCAP 1
- EOF
- 
--	echo "$as_me:7446: checking if translated termcaps will be cached in ~/.terminfo" >&5
-+	echo "$as_me:7447: checking if translated termcaps will be cached in ~/.terminfo" >&5
- echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6
- 
- # Check whether --enable-getcap-cache or --disable-getcap-cache was given.
-@@ -7453,7 +7454,7 @@
- else
-   with_getcap_cache=no
- fi;
--	echo "$as_me:7456: result: $with_getcap_cache" >&5
-+	echo "$as_me:7457: result: $with_getcap_cache" >&5
- echo "${ECHO_T}$with_getcap_cache" >&6
- 	test "x$with_getcap_cache" = "xyes" &&
- cat >>confdefs.h <<\EOF
-@@ -7463,7 +7464,7 @@
- fi
- 
- ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
--echo "$as_me:7466: checking if ~/.terminfo is wanted" >&5
-+echo "$as_me:7467: checking if ~/.terminfo is wanted" >&5
- echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6
- 
- # Check whether --enable-home-terminfo or --disable-home-terminfo was given.
-@@ -7473,14 +7474,14 @@
- else
-   with_home_terminfo=yes
- fi;
--echo "$as_me:7476: result: $with_home_terminfo" >&5
-+echo "$as_me:7477: result: $with_home_terminfo" >&5
- echo "${ECHO_T}$with_home_terminfo" >&6
- test "x$with_home_terminfo" = "xyes" &&
- cat >>confdefs.h <<\EOF
- #define USE_HOME_TERMINFO 1
- EOF
- 
--echo "$as_me:7483: checking if you want to use restricted environment when running as root" >&5
-+echo "$as_me:7484: checking if you want to use restricted environment when running as root" >&5
- echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6
- 
- # Check whether --enable-root-environ or --disable-root-environ was given.
-@@ -7490,7 +7491,7 @@
- else
-   with_root_environ=yes
- fi;
--echo "$as_me:7493: result: $with_root_environ" >&5
-+echo "$as_me:7494: result: $with_root_environ" >&5
- echo "${ECHO_T}$with_root_environ" >&6
- test "x$with_root_environ" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -7505,13 +7506,13 @@
- 	unlink
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:7508: checking for $ac_func" >&5
-+echo "$as_me:7509: 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 7514 "configure"
-+#line 7515 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -7542,16 +7543,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7545: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7546: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7548: \$? = $ac_status" >&5
-+  echo "$as_me:7549: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7551: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7552: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7554: \$? = $ac_status" >&5
-+  echo "$as_me:7555: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -7561,7 +7562,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:7564: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:7565: 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 <&5
-+echo "$as_me:7582: 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 7587 "configure"
-+#line 7588 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -7615,16 +7616,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7618: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7619: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7621: \$? = $ac_status" >&5
-+  echo "$as_me:7622: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7624: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7625: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7627: \$? = $ac_status" >&5
-+  echo "$as_me:7628: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -7634,7 +7635,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:7637: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:7638: 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 <&5
-+	echo "$as_me:7649: checking if link/symlink functions work" >&5
- echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6
- if test "${cf_cv_link_funcs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7658,7 +7659,7 @@
- 			eval 'ac_cv_func_'$cf_func'=error'
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7661 "configure"
-+#line 7662 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -7688,15 +7689,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:7691: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7692: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7694: \$? = $ac_status" >&5
-+  echo "$as_me:7695: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:7696: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7697: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7699: \$? = $ac_status" >&5
-+  echo "$as_me:7700: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
-@@ -7714,7 +7715,7 @@
- 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
- 
- fi
--echo "$as_me:7717: result: $cf_cv_link_funcs" >&5
-+echo "$as_me:7718: result: $cf_cv_link_funcs" >&5
- echo "${ECHO_T}$cf_cv_link_funcs" >&6
- 	test "$ac_cv_func_link"    = yes &&
- cat >>confdefs.h <<\EOF
-@@ -7734,7 +7735,7 @@
- # soft links (symbolic links) are useful for some systems where hard links do
- # not work, or to make it simpler to copy terminfo trees around.
- if test "x$ac_cv_func_symlink" = xyes ; then
--	echo "$as_me:7737: checking if tic should use symbolic links" >&5
-+	echo "$as_me:7738: checking if tic should use symbolic links" >&5
- echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6
- 
- # Check whether --enable-symlinks or --disable-symlinks was given.
-@@ -7744,21 +7745,21 @@
- else
-   with_symlinks=no
- fi;
--	echo "$as_me:7747: result: $with_symlinks" >&5
-+	echo "$as_me:7748: result: $with_symlinks" >&5
- echo "${ECHO_T}$with_symlinks" >&6
- fi
- 
- # If we have hard links and did not choose to use soft links instead, there is
- # no reason to make this choice optional - use the hard links.
- if test "$with_symlinks" = no ; then
--	echo "$as_me:7754: checking if tic should use hard links" >&5
-+	echo "$as_me:7755: checking if tic should use hard links" >&5
- echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6
- 	if test "x$ac_cv_func_link" = xyes ; then
- 		with_links=yes
- 	else
- 		with_links=no
- 	fi
--	echo "$as_me:7761: result: $with_links" >&5
-+	echo "$as_me:7762: result: $with_links" >&5
- echo "${ECHO_T}$with_links" >&6
- fi
- 
-@@ -7773,7 +7774,7 @@
- EOF
- 
- ###   use option --enable-broken-linker to force on use of broken-linker support
--echo "$as_me:7776: checking if you want broken-linker support code" >&5
-+echo "$as_me:7777: checking if you want broken-linker support code" >&5
- echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
- 
- # Check whether --enable-broken_linker or --disable-broken_linker was given.
-@@ -7783,7 +7784,7 @@
- else
-   with_broken_linker=${BROKEN_LINKER:-no}
- fi;
--echo "$as_me:7786: result: $with_broken_linker" >&5
-+echo "$as_me:7787: result: $with_broken_linker" >&5
- echo "${ECHO_T}$with_broken_linker" >&6
- 
- BROKEN_LINKER=0
-@@ -7805,14 +7806,14 @@
- 		BROKEN_LINKER=1
- 		test -n "$verbose" && echo "	cygwin linker is broken anyway" 1>&6
- 
--echo "${as_me:-configure}:7808: testing cygwin linker is broken anyway ..." 1>&5
-+echo "${as_me:-configure}:7809: testing cygwin linker is broken anyway ..." 1>&5
- 
- 		;;
- 	esac
- fi
- 
- ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
--echo "$as_me:7815: checking if tputs should process BSD-style prefix padding" >&5
-+echo "$as_me:7816: checking if tputs should process BSD-style prefix padding" >&5
- echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6
- 
- # Check whether --enable-bsdpad or --disable-bsdpad was given.
-@@ -7822,7 +7823,7 @@
- else
-   with_bsdpad=no
- fi;
--echo "$as_me:7825: result: $with_bsdpad" >&5
-+echo "$as_me:7826: result: $with_bsdpad" >&5
- echo "${ECHO_T}$with_bsdpad" >&6
- test "x$with_bsdpad" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -7879,14 +7880,14 @@
- 	;;
- (linux*|gnu*|mint*|k*bsd*-gnu)
- 
--echo "$as_me:7882: checking if we must define _GNU_SOURCE" >&5
-+echo "$as_me:7883: 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 7889 "configure"
-+#line 7890 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -7901,16 +7902,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7904: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7905: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7907: \$? = $ac_status" >&5
-+  echo "$as_me:7908: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7910: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7911: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7913: \$? = $ac_status" >&5
-+  echo "$as_me:7914: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -7919,7 +7920,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 7922 "configure"
-+#line 7923 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -7934,16 +7935,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7937: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7938: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7940: \$? = $ac_status" >&5
-+  echo "$as_me:7941: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7943: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7944: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7946: \$? = $ac_status" >&5
-+  echo "$as_me:7947: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -7958,7 +7959,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:7961: result: $cf_cv_gnu_source" >&5
-+echo "$as_me:7962: result: $cf_cv_gnu_source" >&5
- echo "${ECHO_T}$cf_cv_gnu_source" >&6
- test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- 
-@@ -7983,16 +7984,16 @@
- 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
- 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
- 
--echo "$as_me:7986: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "$as_me:7987: 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}:7992: testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me:-configure}:7993: testing if the symbol is already defined go no further ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 7995 "configure"
-+#line 7996 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -8007,16 +8008,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8010: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8011: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8013: \$? = $ac_status" >&5
-+  echo "$as_me:8014: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8016: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8017: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8019: \$? = $ac_status" >&5
-+  echo "$as_me:8020: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_posix_c_source=no
- else
-@@ -8037,7 +8038,7 @@
- 	 esac
- 	 if test "$cf_want_posix_source" = yes ; then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 8040 "configure"
-+#line 8041 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -8052,16 +8053,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8055: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8056: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8058: \$? = $ac_status" >&5
-+  echo "$as_me:8059: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8061: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8062: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8064: \$? = $ac_status" >&5
-+  echo "$as_me:8065: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8072,15 +8073,15 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	 fi
- 
--echo "${as_me:-configure}:8075: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me:-configure}:8076: 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}:8080: testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me:-configure}:8081: testing if the second compile does not leave our definition intact error ..." 1>&5
- 
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 8083 "configure"
-+#line 8084 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -8095,16 +8096,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8098: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8099: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8101: \$? = $ac_status" >&5
-+  echo "$as_me:8102: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8104: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8105: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8107: \$? = $ac_status" >&5
-+  echo "$as_me:8108: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8120,7 +8121,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:8123: result: $cf_cv_posix_c_source" >&5
-+echo "$as_me:8124: 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
-@@ -8238,14 +8239,14 @@
- 	;;
- (*)
- 
--echo "$as_me:8241: checking if we should define _XOPEN_SOURCE" >&5
-+echo "$as_me:8242: 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 8248 "configure"
-+#line 8249 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -8264,16 +8265,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8267: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8268: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8270: \$? = $ac_status" >&5
-+  echo "$as_me:8271: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8273: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8274: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8276: \$? = $ac_status" >&5
-+  echo "$as_me:8277: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -8282,7 +8283,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 8285 "configure"
-+#line 8286 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -8301,16 +8302,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8304: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8305: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8307: \$? = $ac_status" >&5
-+  echo "$as_me:8308: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8310: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8311: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8313: \$? = $ac_status" >&5
-+  echo "$as_me:8314: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -8325,7 +8326,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:8328: result: $cf_cv_xopen_source" >&5
-+echo "$as_me:8329: result: $cf_cv_xopen_source" >&5
- echo "${ECHO_T}$cf_cv_xopen_source" >&6
- 
- if test "$cf_cv_xopen_source" != no ; then
-@@ -8433,16 +8434,16 @@
- 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
- 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
- 
--echo "$as_me:8436: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "$as_me:8437: 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}:8442: testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me:-configure}:8443: testing if the symbol is already defined go no further ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 8445 "configure"
-+#line 8446 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -8457,16 +8458,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8460: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8461: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8463: \$? = $ac_status" >&5
-+  echo "$as_me:8464: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8466: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8467: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8469: \$? = $ac_status" >&5
-+  echo "$as_me:8470: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_posix_c_source=no
- else
-@@ -8487,7 +8488,7 @@
- 	 esac
- 	 if test "$cf_want_posix_source" = yes ; then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 8490 "configure"
-+#line 8491 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -8502,16 +8503,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8505: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8506: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8508: \$? = $ac_status" >&5
-+  echo "$as_me:8509: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8511: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8512: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8514: \$? = $ac_status" >&5
-+  echo "$as_me:8515: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8522,15 +8523,15 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	 fi
- 
--echo "${as_me:-configure}:8525: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me:-configure}:8526: 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}:8530: testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me:-configure}:8531: testing if the second compile does not leave our definition intact error ..." 1>&5
- 
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 8533 "configure"
-+#line 8534 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -8545,16 +8546,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8548: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8549: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8551: \$? = $ac_status" >&5
-+  echo "$as_me:8552: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8554: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8555: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8557: \$? = $ac_status" >&5
-+  echo "$as_me:8558: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8570,7 +8571,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:8573: result: $cf_cv_posix_c_source" >&5
-+echo "$as_me:8574: 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
-@@ -8728,7 +8729,7 @@
- if test -n "$cf_new_cflags" ; then
- 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
- 
--echo "${as_me:-configure}:8731: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
-+echo "${as_me:-configure}:8732: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
- 
- 	CFLAGS="$CFLAGS $cf_new_cflags"
- fi
-@@ -8736,7 +8737,7 @@
- if test -n "$cf_new_cppflags" ; then
- 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
- 
--echo "${as_me:-configure}:8739: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
-+echo "${as_me:-configure}:8740: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
- 
- 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
- fi
-@@ -8744,7 +8745,7 @@
- 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}:8747: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
-+echo "${as_me:-configure}:8748: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
- 
- 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
- fi
-@@ -8752,10 +8753,10 @@
- fi
- 
- if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
--	echo "$as_me:8755: checking if _XOPEN_SOURCE really is set" >&5
-+	echo "$as_me:8756: 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 8758 "configure"
-+#line 8759 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -8770,16 +8771,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8773: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8774: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8776: \$? = $ac_status" >&5
-+  echo "$as_me:8777: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8779: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8780: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8782: \$? = $ac_status" >&5
-+  echo "$as_me:8783: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_XOPEN_SOURCE_set=yes
- else
-@@ -8788,12 +8789,12 @@
- cf_XOPEN_SOURCE_set=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:8791: result: $cf_XOPEN_SOURCE_set" >&5
-+	echo "$as_me:8792: 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 8796 "configure"
-+#line 8797 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -8808,16 +8809,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8811: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8812: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8814: \$? = $ac_status" >&5
-+  echo "$as_me:8815: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8817: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8818: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8820: \$? = $ac_status" >&5
-+  echo "$as_me:8821: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_XOPEN_SOURCE_set_ok=yes
- else
-@@ -8828,19 +8829,19 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		if test $cf_XOPEN_SOURCE_set_ok = no
- 		then
--			{ echo "$as_me:8831: WARNING: _XOPEN_SOURCE is lower than requested" >&5
-+			{ echo "$as_me:8832: WARNING: _XOPEN_SOURCE is lower than requested" >&5
- echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
- 		fi
- 	else
- 
--echo "$as_me:8836: checking if we should define _XOPEN_SOURCE" >&5
-+echo "$as_me:8837: 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 8843 "configure"
-+#line 8844 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -8859,16 +8860,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8862: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8863: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8865: \$? = $ac_status" >&5
-+  echo "$as_me:8866: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8868: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8869: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8871: \$? = $ac_status" >&5
-+  echo "$as_me:8872: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -8877,7 +8878,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 8880 "configure"
-+#line 8881 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -8896,16 +8897,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8899: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8900: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8902: \$? = $ac_status" >&5
-+  echo "$as_me:8903: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8905: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8906: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8908: \$? = $ac_status" >&5
-+  echo "$as_me:8909: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -8920,7 +8921,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:8923: result: $cf_cv_xopen_source" >&5
-+echo "$as_me:8924: result: $cf_cv_xopen_source" >&5
- echo "${ECHO_T}$cf_cv_xopen_source" >&6
- 
- if test "$cf_cv_xopen_source" != no ; then
-@@ -9022,14 +9023,14 @@
- 
- # Work around breakage on OS X
- 
--echo "$as_me:9025: checking if SIGWINCH is defined" >&5
-+echo "$as_me:9026: 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 9032 "configure"
-+#line 9033 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -9044,23 +9045,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9047: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9048: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9050: \$? = $ac_status" >&5
-+  echo "$as_me:9051: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9053: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9054: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9056: \$? = $ac_status" >&5
-+  echo "$as_me:9057: \$? = $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 9063 "configure"
-+#line 9064 "configure"
- #include "confdefs.h"
- 
- #undef _XOPEN_SOURCE
-@@ -9078,16 +9079,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9081: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9082: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9084: \$? = $ac_status" >&5
-+  echo "$as_me:9085: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9087: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9088: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9090: \$? = $ac_status" >&5
-+  echo "$as_me:9091: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_define_sigwinch=maybe
- else
-@@ -9101,11 +9102,11 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:9104: result: $cf_cv_define_sigwinch" >&5
-+echo "$as_me:9105: 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:9108: checking for actual SIGWINCH definition" >&5
-+echo "$as_me:9109: 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
-@@ -9116,7 +9117,7 @@
- while test $cf_sigwinch != 1
- do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9119 "configure"
-+#line 9120 "configure"
- #include "confdefs.h"
- 
- #undef _XOPEN_SOURCE
-@@ -9138,16 +9139,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9141: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9142: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9144: \$? = $ac_status" >&5
-+  echo "$as_me:9145: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9147: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9148: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9150: \$? = $ac_status" >&5
-+  echo "$as_me:9151: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_fixup_sigwinch=$cf_sigwinch
- 	 break
-@@ -9161,7 +9162,7 @@
- done
- 
- fi
--echo "$as_me:9164: result: $cf_cv_fixup_sigwinch" >&5
-+echo "$as_me:9165: result: $cf_cv_fixup_sigwinch" >&5
- echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
- 
- 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
-@@ -9171,13 +9172,13 @@
- 
- # Checks for CODESET support.
- 
--echo "$as_me:9174: checking for nl_langinfo and CODESET" >&5
-+echo "$as_me:9175: 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 9180 "configure"
-+#line 9181 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -9189,16 +9190,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9192: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9193: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9195: \$? = $ac_status" >&5
-+  echo "$as_me:9196: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9198: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9199: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9201: \$? = $ac_status" >&5
-+  echo "$as_me:9202: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   am_cv_langinfo_codeset=yes
- else
-@@ -9209,7 +9210,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:9212: result: $am_cv_langinfo_codeset" >&5
-+echo "$as_me:9213: result: $am_cv_langinfo_codeset" >&5
- echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
- 	if test $am_cv_langinfo_codeset = yes; then
- 
-@@ -9223,7 +9224,7 @@
- NCURSES_OK_WCHAR_T=
- NCURSES_OK_WINT_T=
- 
--echo "$as_me:9226: checking if you want wide-character code" >&5
-+echo "$as_me:9227: checking if you want wide-character code" >&5
- echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6
- 
- # Check whether --enable-widec or --disable-widec was given.
-@@ -9233,7 +9234,7 @@
- else
-   with_widec=no
- fi;
--echo "$as_me:9236: result: $with_widec" >&5
-+echo "$as_me:9237: result: $with_widec" >&5
- echo "${ECHO_T}$with_widec" >&6
- if test "x$with_widec" = xyes ; then
- 	if test "x$disable_lib_suffixes" = xno ; then
-@@ -9248,14 +9249,14 @@
- #define NCURSES_WIDECHAR 1
- EOF
- 
--echo "$as_me:9251: checking if wchar.h can be used as is" >&5
-+echo "$as_me:9252: checking if wchar.h can be used as is" >&5
- echo $ECHO_N "checking if wchar.h can be used as is... $ECHO_C" >&6
- if test "${cf_cv_wchar_h_okay+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 9258 "configure"
-+#line 9259 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -9272,16 +9273,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9275: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9276: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9278: \$? = $ac_status" >&5
-+  echo "$as_me:9279: \$? = $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:9282: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9284: \$? = $ac_status" >&5
-+  echo "$as_me:9285: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_h_okay=yes
- else
-@@ -9291,16 +9292,16 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:9294: result: $cf_cv_wchar_h_okay" >&5
-+echo "$as_me:9295: result: $cf_cv_wchar_h_okay" >&5
- echo "${ECHO_T}$cf_cv_wchar_h_okay" >&6
- 
- if test $cf_cv_wchar_h_okay = no
- then
- 
--echo "$as_me:9300: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
-+echo "$as_me:9301: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
- echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 9303 "configure"
-+#line 9304 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -9316,16 +9317,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9319: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9320: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9322: \$? = $ac_status" >&5
-+  echo "$as_me:9323: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9325: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9326: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9328: \$? = $ac_status" >&5
-+  echo "$as_me:9329: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=no
- else
-@@ -9334,16 +9335,16 @@
- cf_result=yes
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:9337: result: $cf_result" >&5
-+echo "$as_me:9338: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 
- if test "$cf_result" = yes ; then
- 	CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
- elif test "x" != "x" ; then
--	echo "$as_me:9343: checking checking for compatible value versus " >&5
-+	echo "$as_me:9344: checking checking for compatible value versus " >&5
- echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9346 "configure"
-+#line 9347 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -9359,16 +9360,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9362: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9363: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9365: \$? = $ac_status" >&5
-+  echo "$as_me:9366: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9368: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9369: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9371: \$? = $ac_status" >&5
-+  echo "$as_me:9372: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -9377,7 +9378,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:9380: result: $cf_result" >&5
-+	echo "$as_me:9381: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 	if test "$cf_result" = no ; then
- 		# perhaps we can override it - try...
-@@ -9393,13 +9394,13 @@
- for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:9396: checking for $ac_func" >&5
-+echo "$as_me:9397: 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 9402 "configure"
-+#line 9403 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -9430,16 +9431,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9433: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9434: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9436: \$? = $ac_status" >&5
-+  echo "$as_me:9437: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9439: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9440: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9442: \$? = $ac_status" >&5
-+  echo "$as_me:9443: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -9449,7 +9450,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:9452: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:9453: 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 <&5
-+echo "$as_me:9465: 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
-@@ -9469,7 +9470,7 @@
- 
- 	cf_save_LIBS="$LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9472 "configure"
-+#line 9473 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -9482,16 +9483,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9485: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9486: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9488: \$? = $ac_status" >&5
-+  echo "$as_me:9489: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9491: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9492: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9494: \$? = $ac_status" >&5
-+  echo "$as_me:9495: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_utf8_lib=yes
- else
-@@ -9503,12 +9504,12 @@
- cf_cv_header_path_utf8=
- cf_cv_library_path_utf8=
- 
--echo "${as_me:-configure}:9506: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:9507: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
- 
- cf_save_LIBS="$LIBS"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 9511 "configure"
-+#line 9512 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -9521,16 +9522,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9524: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9525: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9527: \$? = $ac_status" >&5
-+  echo "$as_me:9528: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9530: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9531: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9533: \$? = $ac_status" >&5
-+  echo "$as_me:9534: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_find_linkage_utf8=yes
-@@ -9544,7 +9545,7 @@
- LIBS="-lutf8  $cf_save_LIBS"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 9547 "configure"
-+#line 9548 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -9557,16 +9558,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9560: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9561: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9563: \$? = $ac_status" >&5
-+  echo "$as_me:9564: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9566: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9567: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9569: \$? = $ac_status" >&5
-+  echo "$as_me:9570: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_find_linkage_utf8=yes
-@@ -9583,9 +9584,9 @@
- 
- 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
- 
--echo "${as_me:-configure}:9586: testing find linkage for utf8 library ..." 1>&5
-+echo "${as_me:-configure}:9587: testing find linkage for utf8 library ..." 1>&5
- 
--echo "${as_me:-configure}:9588: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:9589: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
- 
- 	cf_save_CPPFLAGS="$CPPFLAGS"
- 	cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -9676,11 +9677,11 @@
- 		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}:9679: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9680: 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 9683 "configure"
-+#line 9684 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -9693,21 +9694,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9696: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9697: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9699: \$? = $ac_status" >&5
-+  echo "$as_me:9700: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9702: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9703: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9705: \$? = $ac_status" >&5
-+  echo "$as_me:9706: \$? = $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}:9710: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9711: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
- 
- 				cf_cv_find_linkage_utf8=maybe
- 				cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -9725,7 +9726,7 @@
- 
- 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
- 
--echo "${as_me:-configure}:9728: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:9729: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
- 
- 		cf_save_LIBS="$LIBS"
- 		cf_save_LDFLAGS="$LDFLAGS"
-@@ -9800,13 +9801,13 @@
- 				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}:9803: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9804: 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 9809 "configure"
-+#line 9810 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -9819,21 +9820,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9822: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9823: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9825: \$? = $ac_status" >&5
-+  echo "$as_me:9826: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9828: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9829: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9831: \$? = $ac_status" >&5
-+  echo "$as_me:9832: \$? = $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}:9836: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9837: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
- 
- 					cf_cv_find_linkage_utf8=yes
- 					cf_cv_library_file_utf8="-lutf8"
-@@ -9875,7 +9876,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:9878: result: $cf_cv_utf8_lib" >&5
-+echo "$as_me:9879: 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
-@@ -9910,7 +9911,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 9913 "configure"
-+#line 9914 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -9922,16 +9923,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9925: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9926: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9928: \$? = $ac_status" >&5
-+  echo "$as_me:9929: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9931: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9932: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9934: \$? = $ac_status" >&5
-+  echo "$as_me:9935: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -9948,7 +9949,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:9951: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:9952: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -9984,7 +9985,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:9987: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:9988: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -10016,14 +10017,14 @@
- 	fi
- 
- # This is needed on Tru64 5.0 to declare mbstate_t
--echo "$as_me:10019: checking if we must include wchar.h to declare mbstate_t" >&5
-+echo "$as_me:10020: 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_mbstate_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 10026 "configure"
-+#line 10027 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10041,23 +10042,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10044: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10045: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10047: \$? = $ac_status" >&5
-+  echo "$as_me:10048: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10050: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10051: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10053: \$? = $ac_status" >&5
-+  echo "$as_me:10054: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_mbstate_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 10060 "configure"
-+#line 10061 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10076,16 +10077,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10079: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10080: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10082: \$? = $ac_status" >&5
-+  echo "$as_me:10083: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10085: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10086: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10088: \$? = $ac_status" >&5
-+  echo "$as_me:10089: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_mbstate_t=yes
- else
-@@ -10097,7 +10098,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:10100: result: $cf_cv_mbstate_t" >&5
-+echo "$as_me:10101: result: $cf_cv_mbstate_t" >&5
- echo "${ECHO_T}$cf_cv_mbstate_t" >&6
- 
- if test "$cf_cv_mbstate_t" = yes ; then
-@@ -10115,14 +10116,14 @@
- fi
- 
- # This is needed on Tru64 5.0 to declare wchar_t
--echo "$as_me:10118: checking if we must include wchar.h to declare wchar_t" >&5
-+echo "$as_me:10119: checking if we must include wchar.h to declare wchar_t" >&5
- echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
- if test "${cf_cv_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 10125 "configure"
-+#line 10126 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10140,23 +10141,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10143: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10144: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10146: \$? = $ac_status" >&5
-+  echo "$as_me:10147: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10149: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10150: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10152: \$? = $ac_status" >&5
-+  echo "$as_me:10153: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 10159 "configure"
-+#line 10160 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10175,16 +10176,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10178: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10179: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10181: \$? = $ac_status" >&5
-+  echo "$as_me:10182: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10184: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10185: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10187: \$? = $ac_status" >&5
-+  echo "$as_me:10188: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_t=yes
- else
-@@ -10196,7 +10197,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:10199: result: $cf_cv_wchar_t" >&5
-+echo "$as_me:10200: result: $cf_cv_wchar_t" >&5
- echo "${ECHO_T}$cf_cv_wchar_t" >&6
- 
- if test "$cf_cv_wchar_t" = yes ; then
-@@ -10219,14 +10220,14 @@
- fi
- 
- # This is needed on Tru64 5.0 to declare wint_t
--echo "$as_me:10222: checking if we must include wchar.h to declare wint_t" >&5
-+echo "$as_me:10223: checking if we must include wchar.h to declare wint_t" >&5
- echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
- if test "${cf_cv_wint_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 10229 "configure"
-+#line 10230 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10244,23 +10245,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10247: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10248: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10250: \$? = $ac_status" >&5
-+  echo "$as_me:10251: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10253: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10254: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10256: \$? = $ac_status" >&5
-+  echo "$as_me:10257: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wint_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 10263 "configure"
-+#line 10264 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10279,16 +10280,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10282: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10283: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10285: \$? = $ac_status" >&5
-+  echo "$as_me:10286: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10288: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10289: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10291: \$? = $ac_status" >&5
-+  echo "$as_me:10292: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wint_t=yes
- else
-@@ -10300,7 +10301,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:10303: result: $cf_cv_wint_t" >&5
-+echo "$as_me:10304: result: $cf_cv_wint_t" >&5
- echo "${ECHO_T}$cf_cv_wint_t" >&6
- 
- if test "$cf_cv_wint_t" = yes ; then
-@@ -10332,7 +10333,7 @@
- fi
- 
- ###   use option --disable-lp64 to allow long chtype
--echo "$as_me:10335: checking whether to enable _LP64 definition in curses.h" >&5
-+echo "$as_me:10336: checking whether to enable _LP64 definition in curses.h" >&5
- echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6
- 
- # Check whether --enable-lp64 or --disable-lp64 was given.
-@@ -10342,7 +10343,7 @@
- else
-   with_lp64=$cf_dft_with_lp64
- fi;
--echo "$as_me:10345: result: $with_lp64" >&5
-+echo "$as_me:10346: result: $with_lp64" >&5
- echo "${ECHO_T}$with_lp64" >&6
- 
- if test "x$with_lp64" = xyes ; then
-@@ -10358,7 +10359,7 @@
- fi;
- if test "$enable_largefile" != no; then
- 
--  echo "$as_me:10361: checking for special C compiler options needed for large files" >&5
-+  echo "$as_me:10362: 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
-@@ -10370,7 +10371,7 @@
-      	 # 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 10373 "configure"
-+#line 10374 "configure"
- #include "confdefs.h"
- #include 
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10390,16 +10391,16 @@
- }
- _ACEOF
-      	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10393: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10394: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10396: \$? = $ac_status" >&5
-+  echo "$as_me:10397: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10399: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10400: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10402: \$? = $ac_status" >&5
-+  echo "$as_me:10403: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10409,16 +10410,16 @@
- rm -f conftest.$ac_objext
-      	 CC="$CC -n32"
-      	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10412: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10413: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10415: \$? = $ac_status" >&5
-+  echo "$as_me:10416: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10418: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10419: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10421: \$? = $ac_status" >&5
-+  echo "$as_me:10422: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_largefile_CC=' -n32'; break
- else
-@@ -10432,13 +10433,13 @@
-        rm -f conftest.$ac_ext
-     fi
- fi
--echo "$as_me:10435: result: $ac_cv_sys_largefile_CC" >&5
-+echo "$as_me:10436: 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:10441: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-+  echo "$as_me:10442: 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
-@@ -10446,7 +10447,7 @@
-   while :; do
-   ac_cv_sys_file_offset_bits=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10449 "configure"
-+#line 10450 "configure"
- #include "confdefs.h"
- #include 
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10466,16 +10467,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10469: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10470: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10472: \$? = $ac_status" >&5
-+  echo "$as_me:10473: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10475: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10476: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10478: \$? = $ac_status" >&5
-+  echo "$as_me:10479: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10484,7 +10485,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10487 "configure"
-+#line 10488 "configure"
- #include "confdefs.h"
- #define _FILE_OFFSET_BITS 64
- #include 
-@@ -10505,16 +10506,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10508: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10509: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10511: \$? = $ac_status" >&5
-+  echo "$as_me:10512: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10514: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10515: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10517: \$? = $ac_status" >&5
-+  echo "$as_me:10518: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_file_offset_bits=64; break
- else
-@@ -10525,7 +10526,7 @@
-   break
- done
- fi
--echo "$as_me:10528: result: $ac_cv_sys_file_offset_bits" >&5
-+echo "$as_me:10529: 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
- 
-@@ -10535,7 +10536,7 @@
- 
- fi
- rm -rf conftest*
--  echo "$as_me:10538: checking for _LARGE_FILES value needed for large files" >&5
-+  echo "$as_me:10539: 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
-@@ -10543,7 +10544,7 @@
-   while :; do
-   ac_cv_sys_large_files=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10546 "configure"
-+#line 10547 "configure"
- #include "confdefs.h"
- #include 
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10563,16 +10564,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10566: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10567: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10569: \$? = $ac_status" >&5
-+  echo "$as_me:10570: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10572: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10573: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10575: \$? = $ac_status" >&5
-+  echo "$as_me:10576: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10581,7 +10582,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10584 "configure"
-+#line 10585 "configure"
- #include "confdefs.h"
- #define _LARGE_FILES 1
- #include 
-@@ -10602,16 +10603,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10605: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10606: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10608: \$? = $ac_status" >&5
-+  echo "$as_me:10609: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10611: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10612: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10614: \$? = $ac_status" >&5
-+  echo "$as_me:10615: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_large_files=1; break
- else
-@@ -10622,7 +10623,7 @@
-   break
- done
- fi
--echo "$as_me:10625: result: $ac_cv_sys_large_files" >&5
-+echo "$as_me:10626: 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
- 
-@@ -10635,7 +10636,7 @@
- fi
- 
- 	if test "$enable_largefile" != no ; then
--	echo "$as_me:10638: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-+	echo "$as_me:10639: 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
-@@ -10643,7 +10644,7 @@
-   while :; do
-   ac_cv_sys_largefile_source=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10646 "configure"
-+#line 10647 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -10655,16 +10656,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10658: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10659: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10661: \$? = $ac_status" >&5
-+  echo "$as_me:10662: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10664: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10665: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10667: \$? = $ac_status" >&5
-+  echo "$as_me:10668: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10673,7 +10674,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10676 "configure"
-+#line 10677 "configure"
- #include "confdefs.h"
- #define _LARGEFILE_SOURCE 1
- #include 
-@@ -10686,16 +10687,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10689: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10690: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10692: \$? = $ac_status" >&5
-+  echo "$as_me:10693: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10695: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10696: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10698: \$? = $ac_status" >&5
-+  echo "$as_me:10699: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_largefile_source=1; break
- else
-@@ -10706,7 +10707,7 @@
-   break
- done
- fi
--echo "$as_me:10709: result: $ac_cv_sys_largefile_source" >&5
-+echo "$as_me:10710: 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
- 
-@@ -10720,13 +10721,13 @@
- # 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:10723: checking for fseeko" >&5
-+echo "$as_me:10724: 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 10729 "configure"
-+#line 10730 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -10738,16 +10739,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:10741: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10742: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10744: \$? = $ac_status" >&5
-+  echo "$as_me:10745: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:10747: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10748: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10750: \$? = $ac_status" >&5
-+  echo "$as_me:10751: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_fseeko=yes
- else
-@@ -10757,7 +10758,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:10760: result: $ac_cv_func_fseeko" >&5
-+echo "$as_me:10761: result: $ac_cv_func_fseeko" >&5
- echo "${ECHO_T}$ac_cv_func_fseeko" >&6
- if test $ac_cv_func_fseeko = yes; then
- 
-@@ -10778,14 +10779,14 @@
- 	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:10781: checking whether to use struct dirent64" >&5
-+	echo "$as_me:10782: 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 10788 "configure"
-+#line 10789 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10806,16 +10807,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10809: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10810: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10812: \$? = $ac_status" >&5
-+  echo "$as_me:10813: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10815: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10816: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10818: \$? = $ac_status" >&5
-+  echo "$as_me:10819: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_struct_dirent64=yes
- else
-@@ -10826,7 +10827,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:10829: result: $cf_cv_struct_dirent64" >&5
-+echo "$as_me:10830: result: $cf_cv_struct_dirent64" >&5
- echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
- 	test "$cf_cv_struct_dirent64" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -10836,7 +10837,7 @@
- 	fi
- 
- ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
--echo "$as_me:10839: checking if you want tparm not to use X/Open fixed-parameter list" >&5
-+echo "$as_me:10840: checking if you want tparm not to use X/Open fixed-parameter list" >&5
- echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6
- 
- # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given.
-@@ -10846,14 +10847,14 @@
- else
-   with_tparm_varargs=yes
- fi;
--echo "$as_me:10849: result: $with_tparm_varargs" >&5
-+echo "$as_me:10850: result: $with_tparm_varargs" >&5
- echo "${ECHO_T}$with_tparm_varargs" >&6
- NCURSES_TPARM_VARARGS=0
- test "x$with_tparm_varargs" = xyes && NCURSES_TPARM_VARARGS=1
- 
- ###   use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw
- if test "$with_ticlib" != no ; then
--echo "$as_me:10856: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
-+echo "$as_me:10857: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
- echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6
- 
- # Check whether --enable-tic-depends or --disable-tic-depends was given.
-@@ -10863,14 +10864,14 @@
- else
-   with_tic_depends=yes
- fi;
--echo "$as_me:10866: result: $with_tic_depends" >&5
-+echo "$as_me:10867: result: $with_tic_depends" >&5
- echo "${ECHO_T}$with_tic_depends" >&6
- else
- 	with_tic_depends=no
- fi
- 
- ###   use option --with-bool to override bool's type
--echo "$as_me:10873: checking for type of bool" >&5
-+echo "$as_me:10874: checking for type of bool" >&5
- echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
- 
- # Check whether --with-bool or --without-bool was given.
-@@ -10880,10 +10881,10 @@
- else
-   NCURSES_BOOL=auto
- fi;
--echo "$as_me:10883: result: $NCURSES_BOOL" >&5
-+echo "$as_me:10884: result: $NCURSES_BOOL" >&5
- echo "${ECHO_T}$NCURSES_BOOL" >&6
- 
--echo "$as_me:10886: checking for alternate terminal capabilities file" >&5
-+echo "$as_me:10887: checking for alternate terminal capabilities file" >&5
- echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6
- 
- # Check whether --with-caps or --without-caps was given.
-@@ -10894,11 +10895,11 @@
-   TERMINFO_CAPS=Caps
- fi;
- test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
--echo "$as_me:10897: result: $TERMINFO_CAPS" >&5
-+echo "$as_me:10898: result: $TERMINFO_CAPS" >&5
- echo "${ECHO_T}$TERMINFO_CAPS" >&6
- 
- ###   use option --with-chtype to override chtype's type
--echo "$as_me:10901: checking for type of chtype" >&5
-+echo "$as_me:10902: checking for type of chtype" >&5
- echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
- 
- # Check whether --with-chtype or --without-chtype was given.
-@@ -10908,11 +10909,11 @@
- else
-   NCURSES_CHTYPE=$cf_dft_chtype
- fi;
--echo "$as_me:10911: result: $NCURSES_CHTYPE" >&5
-+echo "$as_me:10912: result: $NCURSES_CHTYPE" >&5
- echo "${ECHO_T}$NCURSES_CHTYPE" >&6
- 
- ###   use option --with-ospeed to override ospeed's type
--echo "$as_me:10915: checking for type of ospeed" >&5
-+echo "$as_me:10916: checking for type of ospeed" >&5
- echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6
- 
- # Check whether --with-ospeed or --without-ospeed was given.
-@@ -10922,11 +10923,11 @@
- else
-   NCURSES_OSPEED=short
- fi;
--echo "$as_me:10925: result: $NCURSES_OSPEED" >&5
-+echo "$as_me:10926: result: $NCURSES_OSPEED" >&5
- echo "${ECHO_T}$NCURSES_OSPEED" >&6
- 
- ###   use option --with-mmask-t to override mmask_t's type
--echo "$as_me:10929: checking for type of mmask_t" >&5
-+echo "$as_me:10930: checking for type of mmask_t" >&5
- echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6
- 
- # Check whether --with-mmask-t or --without-mmask-t was given.
-@@ -10936,11 +10937,11 @@
- else
-   NCURSES_MMASK_T=$cf_dft_mmask_t
- fi;
--echo "$as_me:10939: result: $NCURSES_MMASK_T" >&5
-+echo "$as_me:10940: result: $NCURSES_MMASK_T" >&5
- echo "${ECHO_T}$NCURSES_MMASK_T" >&6
- 
- ###   use option --with-ccharw-max to override CCHARW_MAX size
--echo "$as_me:10943: checking for size CCHARW_MAX" >&5
-+echo "$as_me:10944: checking for size CCHARW_MAX" >&5
- echo $ECHO_N "checking for size CCHARW_MAX... $ECHO_C" >&6
- 
- # Check whether --with-ccharw-max or --without-ccharw-max was given.
-@@ -10950,11 +10951,11 @@
- else
-   NCURSES_CCHARW_MAX=5
- fi;
--echo "$as_me:10953: result: $NCURSES_CCHARW_MAX" >&5
-+echo "$as_me:10954: result: $NCURSES_CCHARW_MAX" >&5
- echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
- 
- ###   use option --with-tparm-arg to override tparm's argument type
--echo "$as_me:10957: checking for type of tparm args" >&5
-+echo "$as_me:10958: checking for type of tparm args" >&5
- echo $ECHO_N "checking for type of tparm args... $ECHO_C" >&6
- 
- # Check whether --with-tparm-arg or --without-tparm-arg was given.
-@@ -10964,11 +10965,11 @@
- else
-   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
- fi;
--echo "$as_me:10967: result: $NCURSES_TPARM_ARG" >&5
-+echo "$as_me:10968: result: $NCURSES_TPARM_ARG" >&5
- echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
- 
- ### Enable compiling-in rcs id's
--echo "$as_me:10971: checking if RCS identifiers should be compiled-in" >&5
-+echo "$as_me:10972: checking if RCS identifiers should be compiled-in" >&5
- echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6
- 
- # Check whether --with-rcs-ids or --without-rcs-ids was given.
-@@ -10978,7 +10979,7 @@
- else
-   with_rcs_ids=no
- fi;
--echo "$as_me:10981: result: $with_rcs_ids" >&5
-+echo "$as_me:10982: result: $with_rcs_ids" >&5
- echo "${ECHO_T}$with_rcs_ids" >&6
- test "x$with_rcs_ids" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -10987,7 +10988,7 @@
- 
- ###############################################################################
- 
--echo "$as_me:10990: checking format of man-pages" >&5
-+echo "$as_me:10991: checking format of man-pages" >&5
- echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6
- 
- # Check whether --with-manpage-format or --without-manpage-format was given.
-@@ -11076,14 +11077,14 @@
- 	;;
- esac
- 
--echo "$as_me:11079: result: $MANPAGE_FORMAT" >&5
-+echo "$as_me:11080: result: $MANPAGE_FORMAT" >&5
- echo "${ECHO_T}$MANPAGE_FORMAT" >&6
- if test -n "$cf_unknown" ; then
--	{ echo "$as_me:11082: WARNING: Unexpected manpage-format $cf_unknown" >&5
-+	{ echo "$as_me:11083: WARNING: Unexpected manpage-format $cf_unknown" >&5
- echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
- fi
- 
--echo "$as_me:11086: checking for manpage renaming" >&5
-+echo "$as_me:11087: checking for manpage renaming" >&5
- echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6
- 
- # Check whether --with-manpage-renames or --without-manpage-renames was given.
-@@ -11111,7 +11112,7 @@
- 	if test -f $srcdir/man/$MANPAGE_RENAMES ; then
- 		MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES
- 	elif test ! -f $MANPAGE_RENAMES ; then
--		{ { echo "$as_me:11114: error: not a filename: $MANPAGE_RENAMES" >&5
-+		{ { echo "$as_me:11115: error: not a filename: $MANPAGE_RENAMES" >&5
- echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
-@@ -11125,10 +11126,10 @@
- 	fi
- fi
- 
--echo "$as_me:11128: result: $MANPAGE_RENAMES" >&5
-+echo "$as_me:11129: result: $MANPAGE_RENAMES" >&5
- echo "${ECHO_T}$MANPAGE_RENAMES" >&6
- 
--echo "$as_me:11131: checking if manpage aliases will be installed" >&5
-+echo "$as_me:11132: checking if manpage aliases will be installed" >&5
- echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6
- 
- # Check whether --with-manpage-aliases or --without-manpage-aliases was given.
-@@ -11139,7 +11140,7 @@
-   MANPAGE_ALIASES=yes
- fi;
- 
--echo "$as_me:11142: result: $MANPAGE_ALIASES" >&5
-+echo "$as_me:11143: result: $MANPAGE_ALIASES" >&5
- echo "${ECHO_T}$MANPAGE_ALIASES" >&6
- 
- case "x$LN_S" in
-@@ -11153,7 +11154,7 @@
- 
- MANPAGE_SYMLINKS=no
- if test "$MANPAGE_ALIASES" = yes ; then
--echo "$as_me:11156: checking if manpage symlinks should be used" >&5
-+echo "$as_me:11157: checking if manpage symlinks should be used" >&5
- echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6
- 
- # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given.
-@@ -11166,17 +11167,17 @@
- 
- if test "$$cf_use_symlinks" = no; then
- if test "$MANPAGE_SYMLINKS" = yes ; then
--	{ echo "$as_me:11169: WARNING: cannot make symlinks" >&5
-+	{ echo "$as_me:11170: WARNING: cannot make symlinks" >&5
- echo "$as_me: WARNING: cannot make symlinks" >&2;}
- 	MANPAGE_SYMLINKS=no
- fi
- fi
- 
--echo "$as_me:11175: result: $MANPAGE_SYMLINKS" >&5
-+echo "$as_me:11176: result: $MANPAGE_SYMLINKS" >&5
- echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
- fi
- 
--echo "$as_me:11179: checking for manpage tbl" >&5
-+echo "$as_me:11180: checking for manpage tbl" >&5
- echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6
- 
- # Check whether --with-manpage-tbl or --without-manpage-tbl was given.
-@@ -11187,7 +11188,7 @@
-   MANPAGE_TBL=no
- fi;
- 
--echo "$as_me:11190: result: $MANPAGE_TBL" >&5
-+echo "$as_me:11191: result: $MANPAGE_TBL" >&5
- echo "${ECHO_T}$MANPAGE_TBL" >&6
- 
- if test "$prefix" = "NONE" ; then
-@@ -11520,7 +11521,7 @@
- ###############################################################################
- 
- ### Note that some functions (such as const) are normally disabled anyway.
--echo "$as_me:11523: checking if you want to build with function extensions" >&5
-+echo "$as_me:11524: checking if you want to build with function extensions" >&5
- echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6
- 
- # Check whether --enable-ext-funcs or --disable-ext-funcs was given.
-@@ -11530,7 +11531,7 @@
- else
-   with_ext_funcs=yes
- fi;
--echo "$as_me:11533: result: $with_ext_funcs" >&5
-+echo "$as_me:11534: result: $with_ext_funcs" >&5
- echo "${ECHO_T}$with_ext_funcs" >&6
- if test "x$with_ext_funcs" = xyes ; then
- 	NCURSES_EXT_FUNCS=1
-@@ -11585,7 +11586,7 @@
- 	GENERATED_EXT_FUNCS=
- fi
- 
--echo "$as_me:11588: checking if you want to build with SCREEN extensions" >&5
-+echo "$as_me:11589: checking if you want to build with SCREEN extensions" >&5
- echo $ECHO_N "checking if you want to build with SCREEN extensions... $ECHO_C" >&6
- 
- # Check whether --enable-sp-funcs or --disable-sp-funcs was given.
-@@ -11595,7 +11596,7 @@
- else
-   with_sp_funcs=$cf_dft_ext_spfuncs
- fi;
--echo "$as_me:11598: result: $with_sp_funcs" >&5
-+echo "$as_me:11599: result: $with_sp_funcs" >&5
- echo "${ECHO_T}$with_sp_funcs" >&6
- if test "x$with_sp_funcs" = xyes ; then
- 	NCURSES_SP_FUNCS=1
-@@ -11610,7 +11611,7 @@
- 	GENERATED_SP_FUNCS=
- fi
- 
--echo "$as_me:11613: checking if you want to build with terminal-driver" >&5
-+echo "$as_me:11614: checking if you want to build with terminal-driver" >&5
- echo $ECHO_N "checking if you want to build with terminal-driver... $ECHO_C" >&6
- 
- # Check whether --enable-term-driver or --disable-term-driver was given.
-@@ -11620,7 +11621,7 @@
- else
-   with_term_driver=no
- fi;
--echo "$as_me:11623: result: $with_term_driver" >&5
-+echo "$as_me:11624: result: $with_term_driver" >&5
- echo "${ECHO_T}$with_term_driver" >&6
- if test "x$with_term_driver" = xyes ; then
- 
-@@ -11629,19 +11630,19 @@
- EOF
- 
- 	if test "x$with_termlib" != xno ; then
--		{ { echo "$as_me:11632: error: The term-driver option conflicts with the termlib option" >&5
-+		{ { echo "$as_me:11633: error: The term-driver option conflicts with the termlib option" >&5
- echo "$as_me: error: The term-driver option conflicts with the termlib option" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
- 	if test "x$with_sp_funcs" != xyes ; then
--		{ { echo "$as_me:11637: error: The term-driver option relies upon sp-funcs" >&5
-+		{ { echo "$as_me:11638: error: The term-driver option relies upon sp-funcs" >&5
- echo "$as_me: error: The term-driver option relies upon sp-funcs" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
- fi
- 
- ###   use option --enable-const to turn on use of const beyond that in XSI.
--echo "$as_me:11644: checking for extended use of const keyword" >&5
-+echo "$as_me:11645: checking for extended use of const keyword" >&5
- echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
- 
- # Check whether --enable-const or --disable-const was given.
-@@ -11651,7 +11652,7 @@
- else
-   with_ext_const=$cf_dft_ext_const
- fi;
--echo "$as_me:11654: result: $with_ext_const" >&5
-+echo "$as_me:11655: result: $with_ext_const" >&5
- echo "${ECHO_T}$with_ext_const" >&6
- NCURSES_CONST='/*nothing*/'
- if test "x$with_ext_const" = xyes ; then
-@@ -11659,7 +11660,7 @@
- fi
- 
- ###   use option --enable-ext-colors to turn on use of colors beyond 16.
--echo "$as_me:11662: checking if you want to use extended colors" >&5
-+echo "$as_me:11663: checking if you want to use extended colors" >&5
- echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6
- 
- # Check whether --enable-ext-colors or --disable-ext-colors was given.
-@@ -11669,12 +11670,12 @@
- else
-   with_ext_colors=$cf_dft_ext_colors
- fi;
--echo "$as_me:11672: result: $with_ext_colors" >&5
-+echo "$as_me:11673: result: $with_ext_colors" >&5
- echo "${ECHO_T}$with_ext_colors" >&6
- NCURSES_EXT_COLORS=0
- if test "x$with_ext_colors" = xyes ; then
- 	if test "x$with_widec" != xyes ; then
--		{ echo "$as_me:11677: WARNING: This option applies only to wide-character library" >&5
-+		{ echo "$as_me:11678: WARNING: This option applies only to wide-character library" >&5
- echo "$as_me: WARNING: This option applies only to wide-character library" >&2;}
- 	else
- 		# cannot be ABI 5 since it changes sizeof(cchar_t)
-@@ -11684,7 +11685,7 @@
- 	(5.*)
- 		cf_cv_rel_version=6.0
- 		cf_cv_abi_version=6
--		{ echo "$as_me:11687: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
-+		{ echo "$as_me:11688: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
- echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
- 		;;
- 	esac
-@@ -11700,7 +11701,7 @@
- fi
- 
- ###   use option --enable-ext-mouse to modify coding to support 5-button mice
--echo "$as_me:11703: checking if you want to use extended mouse encoding" >&5
-+echo "$as_me:11704: checking if you want to use extended mouse encoding" >&5
- echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6
- 
- # Check whether --enable-ext-mouse or --disable-ext-mouse was given.
-@@ -11710,7 +11711,7 @@
- else
-   with_ext_mouse=$cf_dft_ext_mouse
- fi;
--echo "$as_me:11713: result: $with_ext_mouse" >&5
-+echo "$as_me:11714: result: $with_ext_mouse" >&5
- echo "${ECHO_T}$with_ext_mouse" >&6
- NCURSES_MOUSE_VERSION=1
- if test "x$with_ext_mouse" = xyes ; then
-@@ -11721,7 +11722,7 @@
- 	(5.*)
- 		cf_cv_rel_version=6.0
- 		cf_cv_abi_version=6
--		{ echo "$as_me:11724: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
-+		{ echo "$as_me:11725: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
- echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
- 		;;
- 	esac
-@@ -11730,7 +11731,7 @@
- fi
- 
- ###   use option --enable-ext-putwin to turn on extended screendumps
--echo "$as_me:11733: checking if you want to use extended putwin/screendump" >&5
-+echo "$as_me:11734: checking if you want to use extended putwin/screendump" >&5
- echo $ECHO_N "checking if you want to use extended putwin/screendump... $ECHO_C" >&6
- 
- # Check whether --enable-ext-putwin or --disable-ext-putwin was given.
-@@ -11740,7 +11741,7 @@
- else
-   with_ext_putwin=$cf_dft_ext_putwin
- fi;
--echo "$as_me:11743: result: $with_ext_putwin" >&5
-+echo "$as_me:11744: result: $with_ext_putwin" >&5
- echo "${ECHO_T}$with_ext_putwin" >&6
- if test "x$with_ext_putwin" = xyes ; then
- 
-@@ -11750,7 +11751,7 @@
- 
- fi
- 
--echo "$as_me:11753: checking if you want \$NCURSES_NO_PADDING code" >&5
-+echo "$as_me:11754: checking if you want \$NCURSES_NO_PADDING code" >&5
- echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6
- 
- # Check whether --enable-no-padding or --disable-no-padding was given.
-@@ -11760,20 +11761,20 @@
- else
-   with_no_padding=$with_ext_funcs
- fi;
--echo "$as_me:11763: result: $with_no_padding" >&5
-+echo "$as_me:11764: result: $with_no_padding" >&5
- echo "${ECHO_T}$with_no_padding" >&6
- test "x$with_no_padding" = xyes &&
- cat >>confdefs.h <<\EOF
- #define NCURSES_NO_PADDING 1
- EOF
- 
--echo "$as_me:11770: checking for ANSI C header files" >&5
-+echo "$as_me:11771: 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 11776 "configure"
-+#line 11777 "configure"
- #include "confdefs.h"
- #include 
- #include 
-@@ -11781,13 +11782,13 @@
- #include 
- 
- _ACEOF
--if { (eval echo "$as_me:11784: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:11785: \"$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:11790: \$? = $ac_status" >&5
-+  echo "$as_me:11791: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -11809,7 +11810,7 @@
- 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 11812 "configure"
-+#line 11813 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -11827,7 +11828,7 @@
- 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 11830 "configure"
-+#line 11831 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -11848,7 +11849,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11851 "configure"
-+#line 11852 "configure"
- #include "confdefs.h"
- #include 
- #if ((' ' & 0x0FF) == 0x020)
-@@ -11874,15 +11875,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:11877: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11878: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11880: \$? = $ac_status" >&5
-+  echo "$as_me:11881: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:11882: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11883: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11885: \$? = $ac_status" >&5
-+  echo "$as_me:11886: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -11895,7 +11896,7 @@
- fi
- fi
- fi
--echo "$as_me:11898: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:11899: result: $ac_cv_header_stdc" >&5
- echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
- 
-@@ -11911,28 +11912,28 @@
-                   inttypes.h stdint.h unistd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:11914: checking for $ac_header" >&5
-+echo "$as_me:11915: 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 11920 "configure"
-+#line 11921 "configure"
- #include "confdefs.h"
- $ac_includes_default
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11926: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11927: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11929: \$? = $ac_status" >&5
-+  echo "$as_me:11930: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11932: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11933: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11935: \$? = $ac_status" >&5
-+  echo "$as_me:11936: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Header=yes"
- else
-@@ -11942,7 +11943,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:11945: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:11946: 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 <&5
-+echo "$as_me:11956: checking for signed char" >&5
- echo $ECHO_N "checking for signed char... $ECHO_C" >&6
- if test "${ac_cv_type_signed_char+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11961 "configure"
-+#line 11962 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -11973,16 +11974,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11976: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11977: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11979: \$? = $ac_status" >&5
-+  echo "$as_me:11980: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11982: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11983: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11985: \$? = $ac_status" >&5
-+  echo "$as_me:11986: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_signed_char=yes
- else
-@@ -11992,10 +11993,10 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:11995: result: $ac_cv_type_signed_char" >&5
-+echo "$as_me:11996: result: $ac_cv_type_signed_char" >&5
- echo "${ECHO_T}$ac_cv_type_signed_char" >&6
- 
--echo "$as_me:11998: checking size of signed char" >&5
-+echo "$as_me:11999: checking size of signed char" >&5
- echo $ECHO_N "checking size of signed char... $ECHO_C" >&6
- if test "${ac_cv_sizeof_signed_char+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12004,7 +12005,7 @@
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
--#line 12007 "configure"
-+#line 12008 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12016,21 +12017,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12019: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12020: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12022: \$? = $ac_status" >&5
-+  echo "$as_me:12023: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12025: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12026: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12028: \$? = $ac_status" >&5
-+  echo "$as_me:12029: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=0 ac_mid=0
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 12033 "configure"
-+#line 12034 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12042,16 +12043,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12045: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12046: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12048: \$? = $ac_status" >&5
-+  echo "$as_me:12049: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12051: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12052: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12054: \$? = $ac_status" >&5
-+  echo "$as_me:12055: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid; break
- else
-@@ -12067,7 +12068,7 @@
- ac_hi=-1 ac_mid=-1
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 12070 "configure"
-+#line 12071 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12079,16 +12080,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12082: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12083: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12085: \$? = $ac_status" >&5
-+  echo "$as_me:12086: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12088: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12089: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12091: \$? = $ac_status" >&5
-+  echo "$as_me:12092: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=$ac_mid; break
- else
-@@ -12104,7 +12105,7 @@
- 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 12107 "configure"
-+#line 12108 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12116,16 +12117,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12119: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12120: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12122: \$? = $ac_status" >&5
-+  echo "$as_me:12123: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12125: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12126: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12128: \$? = $ac_status" >&5
-+  echo "$as_me:12129: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid
- else
-@@ -12138,12 +12139,12 @@
- ac_cv_sizeof_signed_char=$ac_lo
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:12141: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:12142: 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 12146 "configure"
-+#line 12147 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12159,15 +12160,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:12162: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12163: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12165: \$? = $ac_status" >&5
-+  echo "$as_me:12166: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:12167: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12168: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12170: \$? = $ac_status" >&5
-+  echo "$as_me:12171: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_signed_char=`cat conftest.val`
- else
-@@ -12183,7 +12184,7 @@
-   ac_cv_sizeof_signed_char=0
- fi
- fi
--echo "$as_me:12186: result: $ac_cv_sizeof_signed_char" >&5
-+echo "$as_me:12187: result: $ac_cv_sizeof_signed_char" >&5
- echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
- cat >>confdefs.h <&5
-+echo "$as_me:12198: checking if you want to use signed Boolean array in term.h" >&5
- echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6
- 
- # Check whether --enable-signed-char or --disable-signed-char was given.
-@@ -12204,12 +12205,12 @@
- else
-   with_signed_char=no
- fi;
--echo "$as_me:12207: result: $with_signed_char" >&5
-+echo "$as_me:12208: result: $with_signed_char" >&5
- echo "${ECHO_T}$with_signed_char" >&6
- test "x$with_signed_char" != xyes && NCURSES_SBOOL="char"
- 
- ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
--echo "$as_me:12212: checking if you want SIGWINCH handler" >&5
-+echo "$as_me:12213: checking if you want SIGWINCH handler" >&5
- echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6
- 
- # Check whether --enable-sigwinch or --disable-sigwinch was given.
-@@ -12219,7 +12220,7 @@
- else
-   with_sigwinch=$with_ext_funcs
- fi;
--echo "$as_me:12222: result: $with_sigwinch" >&5
-+echo "$as_me:12223: result: $with_sigwinch" >&5
- echo "${ECHO_T}$with_sigwinch" >&6
- test "x$with_sigwinch" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12227,7 +12228,7 @@
- EOF
- 
- ###   use option --enable-tcap-names to allow user to define new capabilities
--echo "$as_me:12230: checking if you want user-definable terminal capabilities like termcap" >&5
-+echo "$as_me:12231: checking if you want user-definable terminal capabilities like termcap" >&5
- echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6
- 
- # Check whether --enable-tcap-names or --disable-tcap-names was given.
-@@ -12237,7 +12238,7 @@
- else
-   with_tcap_names=$with_ext_funcs
- fi;
--echo "$as_me:12240: result: $with_tcap_names" >&5
-+echo "$as_me:12241: result: $with_tcap_names" >&5
- echo "${ECHO_T}$with_tcap_names" >&6
- NCURSES_XNAMES=0
- test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1
-@@ -12245,7 +12246,7 @@
- ###############################################################################
- # These options are relatively safe to experiment with.
- 
--echo "$as_me:12248: checking if you want all development code" >&5
-+echo "$as_me:12249: checking if you want all development code" >&5
- echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
- 
- # Check whether --with-develop or --without-develop was given.
-@@ -12255,11 +12256,11 @@
- else
-   with_develop=no
- fi;
--echo "$as_me:12258: result: $with_develop" >&5
-+echo "$as_me:12259: result: $with_develop" >&5
- echo "${ECHO_T}$with_develop" >&6
- 
- ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
--echo "$as_me:12262: checking if you want hard-tabs code" >&5
-+echo "$as_me:12263: checking if you want hard-tabs code" >&5
- echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6
- 
- # Check whether --enable-hard-tabs or --disable-hard-tabs was given.
-@@ -12269,7 +12270,7 @@
- else
-   enable_hard_tabs=$with_develop
- fi;
--echo "$as_me:12272: result: $enable_hard_tabs" >&5
-+echo "$as_me:12273: result: $enable_hard_tabs" >&5
- echo "${ECHO_T}$enable_hard_tabs" >&6
- test "x$enable_hard_tabs" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12277,7 +12278,7 @@
- EOF
- 
- ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
--echo "$as_me:12280: checking if you want limited support for xmc" >&5
-+echo "$as_me:12281: checking if you want limited support for xmc" >&5
- echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6
- 
- # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given.
-@@ -12287,7 +12288,7 @@
- else
-   enable_xmc_glitch=$with_develop
- fi;
--echo "$as_me:12290: result: $enable_xmc_glitch" >&5
-+echo "$as_me:12291: result: $enable_xmc_glitch" >&5
- echo "${ECHO_T}$enable_xmc_glitch" >&6
- test "x$enable_xmc_glitch" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12297,7 +12298,7 @@
- ###############################################################################
- # These are just experimental, probably should not be in a package:
- 
--echo "$as_me:12300: checking if you do not want to assume colors are white-on-black" >&5
-+echo "$as_me:12301: checking if you do not want to assume colors are white-on-black" >&5
- echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6
- 
- # Check whether --enable-assumed-color or --disable-assumed-color was given.
-@@ -12307,7 +12308,7 @@
- else
-   with_assumed_color=yes
- fi;
--echo "$as_me:12310: result: $with_assumed_color" >&5
-+echo "$as_me:12311: result: $with_assumed_color" >&5
- echo "${ECHO_T}$with_assumed_color" >&6
- test "x$with_assumed_color" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12315,7 +12316,7 @@
- EOF
- 
- ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
--echo "$as_me:12318: checking if you want hashmap scrolling-optimization code" >&5
-+echo "$as_me:12319: checking if you want hashmap scrolling-optimization code" >&5
- echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6
- 
- # Check whether --enable-hashmap or --disable-hashmap was given.
-@@ -12325,7 +12326,7 @@
- else
-   with_hashmap=yes
- fi;
--echo "$as_me:12328: result: $with_hashmap" >&5
-+echo "$as_me:12329: result: $with_hashmap" >&5
- echo "${ECHO_T}$with_hashmap" >&6
- test "x$with_hashmap" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12333,7 +12334,7 @@
- EOF
- 
- ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
--echo "$as_me:12336: checking if you want colorfgbg code" >&5
-+echo "$as_me:12337: checking if you want colorfgbg code" >&5
- echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6
- 
- # Check whether --enable-colorfgbg or --disable-colorfgbg was given.
-@@ -12343,7 +12344,7 @@
- else
-   with_colorfgbg=no
- fi;
--echo "$as_me:12346: result: $with_colorfgbg" >&5
-+echo "$as_me:12347: result: $with_colorfgbg" >&5
- echo "${ECHO_T}$with_colorfgbg" >&6
- test "x$with_colorfgbg" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12351,7 +12352,7 @@
- EOF
- 
- ###   use option --enable-interop to turn on use of bindings used for interop
--echo "$as_me:12354: checking if you want interop bindings" >&5
-+echo "$as_me:12355: checking if you want interop bindings" >&5
- echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6
- 
- # Check whether --enable-interop or --disable-interop was given.
-@@ -12361,7 +12362,7 @@
- else
-   with_exp_interop=$cf_dft_interop
- fi;
--echo "$as_me:12364: result: $with_exp_interop" >&5
-+echo "$as_me:12365: result: $with_exp_interop" >&5
- echo "${ECHO_T}$with_exp_interop" >&6
- 
- NCURSES_INTEROP_FUNCS=0
-@@ -12370,7 +12371,7 @@
- # This is still experimental (20080329), but should ultimately be moved to
- # the script-block --with-normal, etc.
- 
--echo "$as_me:12373: checking if you want to link with the pthread library" >&5
-+echo "$as_me:12374: checking if you want to link with the pthread library" >&5
- echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6
- 
- # Check whether --with-pthread or --without-pthread was given.
-@@ -12380,27 +12381,27 @@
- else
-   with_pthread=no
- fi;
--echo "$as_me:12383: result: $with_pthread" >&5
-+echo "$as_me:12384: result: $with_pthread" >&5
- echo "${ECHO_T}$with_pthread" >&6
- 
- if test "$with_pthread" != no ; then
--	echo "$as_me:12387: checking for pthread.h" >&5
-+	echo "$as_me:12388: checking for pthread.h" >&5
- echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
- if test "${ac_cv_header_pthread_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12393 "configure"
-+#line 12394 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:12397: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:12398: \"$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:12403: \$? = $ac_status" >&5
-+  echo "$as_me:12404: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -12419,7 +12420,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:12422: result: $ac_cv_header_pthread_h" >&5
-+echo "$as_me:12423: result: $ac_cv_header_pthread_h" >&5
- echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
- if test $ac_cv_header_pthread_h = yes; then
- 
-@@ -12429,7 +12430,7 @@
- 
- 	for cf_lib_pthread in pthread c_r
- 	do
--	    echo "$as_me:12432: checking if we can link with the $cf_lib_pthread library" >&5
-+	    echo "$as_me:12433: checking if we can link with the $cf_lib_pthread library" >&5
- echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6
- 	    cf_save_LIBS="$LIBS"
- 
-@@ -12450,7 +12451,7 @@
- LIBS="$cf_add_libs"
- 
- 	    cat >conftest.$ac_ext <<_ACEOF
--#line 12453 "configure"
-+#line 12454 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -12467,16 +12468,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12470: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12471: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12473: \$? = $ac_status" >&5
-+  echo "$as_me:12474: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12476: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12477: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12479: \$? = $ac_status" >&5
-+  echo "$as_me:12480: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   with_pthread=yes
- else
-@@ -12486,7 +12487,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	    LIBS="$cf_save_LIBS"
--	    echo "$as_me:12489: result: $with_pthread" >&5
-+	    echo "$as_me:12490: result: $with_pthread" >&5
- echo "${ECHO_T}$with_pthread" >&6
- 	    test "$with_pthread" = yes && break
- 	done
-@@ -12514,7 +12515,7 @@
- EOF
- 
- 	else
--	    { { echo "$as_me:12517: error: Cannot link with pthread library" >&5
-+	    { { echo "$as_me:12518: error: Cannot link with pthread library" >&5
- echo "$as_me: error: Cannot link with pthread library" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
-@@ -12524,13 +12525,13 @@
- fi
- 
- if test "x$with_pthread" != xno; then
--	echo "$as_me:12527: checking for pthread_kill" >&5
-+	echo "$as_me:12528: checking for pthread_kill" >&5
- echo $ECHO_N "checking for pthread_kill... $ECHO_C" >&6
- if test "${ac_cv_func_pthread_kill+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12533 "configure"
-+#line 12534 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char pthread_kill (); below.  */
-@@ -12561,16 +12562,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12564: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12565: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12567: \$? = $ac_status" >&5
-+  echo "$as_me:12568: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12570: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12571: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12573: \$? = $ac_status" >&5
-+  echo "$as_me:12574: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_pthread_kill=yes
- else
-@@ -12580,11 +12581,11 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:12583: result: $ac_cv_func_pthread_kill" >&5
-+echo "$as_me:12584: result: $ac_cv_func_pthread_kill" >&5
- echo "${ECHO_T}$ac_cv_func_pthread_kill" >&6
- if test $ac_cv_func_pthread_kill = yes; then
- 
--		echo "$as_me:12587: checking if you want to allow EINTR in wgetch with pthreads" >&5
-+		echo "$as_me:12588: checking if you want to allow EINTR in wgetch with pthreads" >&5
- echo $ECHO_N "checking if you want to allow EINTR in wgetch with pthreads... $ECHO_C" >&6
- 
- # Check whether --enable-pthreads-eintr or --disable-pthreads-eintr was given.
-@@ -12594,7 +12595,7 @@
- else
-   use_pthreads_eintr=no
- fi;
--		echo "$as_me:12597: result: $use_pthreads_eintr" >&5
-+		echo "$as_me:12598: result: $use_pthreads_eintr" >&5
- echo "${ECHO_T}$use_pthreads_eintr" >&6
- 		if test "x$use_pthreads_eintr" = xyes ; then
- 
-@@ -12605,7 +12606,7 @@
- 		fi
- fi
- 
--	echo "$as_me:12608: checking if you want to use weak-symbols for pthreads" >&5
-+	echo "$as_me:12609: checking if you want to use weak-symbols for pthreads" >&5
- echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6
- 
- # Check whether --enable-weak-symbols or --disable-weak-symbols was given.
-@@ -12615,18 +12616,18 @@
- else
-   use_weak_symbols=no
- fi;
--	echo "$as_me:12618: result: $use_weak_symbols" >&5
-+	echo "$as_me:12619: result: $use_weak_symbols" >&5
- echo "${ECHO_T}$use_weak_symbols" >&6
- 	if test "x$use_weak_symbols" = xyes ; then
- 
--echo "$as_me:12622: checking if $CC supports weak symbols" >&5
-+echo "$as_me:12623: checking if $CC supports weak symbols" >&5
- echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6
- if test "${cf_cv_weak_symbols+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 12629 "configure"
-+#line 12630 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -12652,16 +12653,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12655: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12656: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12658: \$? = $ac_status" >&5
-+  echo "$as_me:12659: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12661: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12662: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12664: \$? = $ac_status" >&5
-+  echo "$as_me:12665: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_weak_symbols=yes
- else
-@@ -12672,7 +12673,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:12675: result: $cf_cv_weak_symbols" >&5
-+echo "$as_me:12676: result: $cf_cv_weak_symbols" >&5
- echo "${ECHO_T}$cf_cv_weak_symbols" >&6
- 
- 	else
-@@ -12705,7 +12706,7 @@
- # opaque outside of that, so there is no --enable-opaque option.  We can use
- # this option without --with-pthreads, but this will be always set for
- # pthreads.
--echo "$as_me:12708: checking if you want reentrant code" >&5
-+echo "$as_me:12709: checking if you want reentrant code" >&5
- echo $ECHO_N "checking if you want reentrant code... $ECHO_C" >&6
- 
- # Check whether --enable-reentrant or --disable-reentrant was given.
-@@ -12715,7 +12716,7 @@
- else
-   with_reentrant=no
- fi;
--echo "$as_me:12718: result: $with_reentrant" >&5
-+echo "$as_me:12719: result: $with_reentrant" >&5
- echo "${ECHO_T}$with_reentrant" >&6
- if test "x$with_reentrant" = xyes ; then
- 	cf_cv_enable_reentrant=1
-@@ -12788,7 +12789,7 @@
- 	(5.*)
- 		cf_cv_rel_version=6.0
- 		cf_cv_abi_version=6
--		{ echo "$as_me:12791: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
-+		{ echo "$as_me:12792: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
- echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
- 		;;
- 	esac
-@@ -12803,7 +12804,7 @@
- 
- ### Allow using a different wrap-prefix
- if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
--	echo "$as_me:12806: checking for prefix used to wrap public variables" >&5
-+	echo "$as_me:12807: checking for prefix used to wrap public variables" >&5
- echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6
- 
- # Check whether --with-wrap-prefix or --without-wrap-prefix was given.
-@@ -12813,7 +12814,7 @@
- else
-   NCURSES_WRAP_PREFIX=_nc_
- fi;
--	echo "$as_me:12816: result: $NCURSES_WRAP_PREFIX" >&5
-+	echo "$as_me:12817: result: $NCURSES_WRAP_PREFIX" >&5
- echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
- else
- 	NCURSES_WRAP_PREFIX=_nc_
-@@ -12823,7 +12824,7 @@
- #define NCURSES_WRAP_PREFIX "$NCURSES_WRAP_PREFIX"
- EOF
- 
--echo "$as_me:12826: checking if you want experimental safe-sprintf code" >&5
-+echo "$as_me:12827: checking if you want experimental safe-sprintf code" >&5
- echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6
- 
- # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given.
-@@ -12833,7 +12834,7 @@
- else
-   with_safe_sprintf=no
- fi;
--echo "$as_me:12836: result: $with_safe_sprintf" >&5
-+echo "$as_me:12837: result: $with_safe_sprintf" >&5
- echo "${ECHO_T}$with_safe_sprintf" >&6
- test "x$with_safe_sprintf" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12843,7 +12844,7 @@
- ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
- # when hashmap is used scroll hints are useless
- if test "$with_hashmap" = no ; then
--echo "$as_me:12846: checking if you want to experiment without scrolling-hints code" >&5
-+echo "$as_me:12847: checking if you want to experiment without scrolling-hints code" >&5
- echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6
- 
- # Check whether --enable-scroll-hints or --disable-scroll-hints was given.
-@@ -12853,7 +12854,7 @@
- else
-   with_scroll_hints=yes
- fi;
--echo "$as_me:12856: result: $with_scroll_hints" >&5
-+echo "$as_me:12857: result: $with_scroll_hints" >&5
- echo "${ECHO_T}$with_scroll_hints" >&6
- test "x$with_scroll_hints" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12862,7 +12863,7 @@
- 
- fi
- 
--echo "$as_me:12865: checking if you want wgetch-events code" >&5
-+echo "$as_me:12866: checking if you want wgetch-events code" >&5
- echo $ECHO_N "checking if you want wgetch-events code... $ECHO_C" >&6
- 
- # Check whether --enable-wgetch-events or --disable-wgetch-events was given.
-@@ -12872,7 +12873,7 @@
- else
-   with_wgetch_events=no
- fi;
--echo "$as_me:12875: result: $with_wgetch_events" >&5
-+echo "$as_me:12876: result: $with_wgetch_events" >&5
- echo "${ECHO_T}$with_wgetch_events" >&6
- test "x$with_wgetch_events" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12883,7 +12884,7 @@
- 
- ###	use option --disable-echo to suppress full display compiling commands
- 
--echo "$as_me:12886: checking if you want to see long compiling messages" >&5
-+echo "$as_me:12887: 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.
-@@ -12917,7 +12918,7 @@
- 	ECHO_CC=''
- 
- fi;
--echo "$as_me:12920: result: $enableval" >&5
-+echo "$as_me:12921: result: $enableval" >&5
- echo "${ECHO_T}$enableval" >&6
- 
- if test "x$enable_echo" = xyes; then
-@@ -12929,7 +12930,7 @@
- fi
- 
- ###	use option --enable-warnings to turn on all gcc warnings
--echo "$as_me:12932: checking if you want to see compiler warnings" >&5
-+echo "$as_me:12933: checking if you want to see compiler warnings" >&5
- echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
- 
- # Check whether --enable-warnings or --disable-warnings was given.
-@@ -12937,7 +12938,7 @@
-   enableval="$enable_warnings"
-   with_warnings=$enableval
- fi;
--echo "$as_me:12940: result: $with_warnings" >&5
-+echo "$as_me:12941: result: $with_warnings" >&5
- echo "${ECHO_T}$with_warnings" >&6
- 
- if test "x$with_warnings" = "xyes"; then
-@@ -12949,12 +12950,12 @@
- if test "$GCC" = yes ; then
- 	case $host_os in
- 	(linux*|gnu*)
--		echo "$as_me:12952: checking if this is really Intel C compiler" >&5
-+		echo "$as_me:12953: 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 12957 "configure"
-+#line 12958 "configure"
- #include "confdefs.h"
- 
- int
-@@ -12971,16 +12972,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12974: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12975: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12977: \$? = $ac_status" >&5
-+  echo "$as_me:12978: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12980: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12981: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12983: \$? = $ac_status" >&5
-+  echo "$as_me:12984: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   INTEL_COMPILER=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -we147"
-@@ -12991,7 +12992,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		CFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:12994: result: $INTEL_COMPILER" >&5
-+		echo "$as_me:12995: result: $INTEL_COMPILER" >&5
- echo "${ECHO_T}$INTEL_COMPILER" >&6
- 		;;
- 	esac
-@@ -13000,12 +13001,12 @@
- CLANG_COMPILER=no
- 
- if test "$GCC" = yes ; then
--	echo "$as_me:13003: checking if this is really Clang C compiler" >&5
-+	echo "$as_me:13004: 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 13008 "configure"
-+#line 13009 "configure"
- #include "confdefs.h"
- 
- int
-@@ -13022,16 +13023,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13025: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13026: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13028: \$? = $ac_status" >&5
-+  echo "$as_me:13029: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13031: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13032: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13034: \$? = $ac_status" >&5
-+  echo "$as_me:13035: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   CLANG_COMPILER=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
-@@ -13042,12 +13043,12 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	CFLAGS="$cf_save_CFLAGS"
--	echo "$as_me:13045: result: $CLANG_COMPILER" >&5
-+	echo "$as_me:13046: result: $CLANG_COMPILER" >&5
- echo "${ECHO_T}$CLANG_COMPILER" >&6
- fi
- 
- cat > conftest.$ac_ext <&5
-+	{ echo "$as_me:13068: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS="-Wall"
-@@ -13080,12 +13081,12 @@
- 		wd981
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:13083: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13084: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13086: \$? = $ac_status" >&5
-+  echo "$as_me:13087: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13088: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13089: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
- 		fi
-@@ -13094,7 +13095,7 @@
- 
- elif test "$GCC" = yes
- then
--	{ echo "$as_me:13097: checking for $CC warning options..." >&5
-+	{ echo "$as_me:13098: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS=
-@@ -13118,12 +13119,12 @@
- 		Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:13121: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13122: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13124: \$? = $ac_status" >&5
-+  echo "$as_me:13125: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13126: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13127: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			case $cf_opt in
- 			(Wcast-qual)
-@@ -13134,7 +13135,7 @@
- 				([34].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:13137: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:13138: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -13144,7 +13145,7 @@
- 				([12].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:13147: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:13148: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -13164,12 +13165,12 @@
- if test "$GCC" = yes ; then
- 	case $host_os in
- 	(linux*|gnu*)
--		echo "$as_me:13167: checking if this is really Intel C++ compiler" >&5
-+		echo "$as_me:13168: 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="$CXXFLAGS"
- 		CXXFLAGS="$CXXFLAGS -no-gcc"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 13172 "configure"
-+#line 13173 "configure"
- #include "confdefs.h"
- 
- int
-@@ -13186,16 +13187,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13189: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13190: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13192: \$? = $ac_status" >&5
-+  echo "$as_me:13193: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13195: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13196: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13198: \$? = $ac_status" >&5
-+  echo "$as_me:13199: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   INTEL_CPLUSPLUS=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -we147"
-@@ -13206,7 +13207,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		CXXFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:13209: result: $INTEL_CPLUSPLUS" >&5
-+		echo "$as_me:13210: result: $INTEL_CPLUSPLUS" >&5
- echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
- 		;;
- 	esac
-@@ -13215,12 +13216,12 @@
- CLANG_CPLUSPLUS=no
- 
- if test "$GCC" = yes ; then
--	echo "$as_me:13218: checking if this is really Clang C++ compiler" >&5
-+	echo "$as_me:13219: 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="$CXXFLAGS"
- 	CXXFLAGS="$CXXFLAGS -Qunused-arguments"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 13223 "configure"
-+#line 13224 "configure"
- #include "confdefs.h"
- 
- int
-@@ -13237,16 +13238,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13240: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13241: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13243: \$? = $ac_status" >&5
-+  echo "$as_me:13244: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13246: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13247: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13249: \$? = $ac_status" >&5
-+  echo "$as_me:13250: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   CLANG_CPLUSPLUS=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
-@@ -13257,7 +13258,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	CXXFLAGS="$cf_save_CFLAGS"
--	echo "$as_me:13260: result: $CLANG_CPLUSPLUS" >&5
-+	echo "$as_me:13261: result: $CLANG_CPLUSPLUS" >&5
- echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
- fi
- 
-@@ -13269,7 +13270,7 @@
- ac_main_return=return
- 
- cat > conftest.$ac_ext <&5
-+	{ echo "$as_me:13291: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CXXFLAGS="$CXXFLAGS"
- 	EXTRA_CXXFLAGS="-Wall"
-@@ -13304,12 +13305,12 @@
- 		wd981
- 	do
- 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
--		if { (eval echo "$as_me:13307: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13308: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13310: \$? = $ac_status" >&5
-+  echo "$as_me:13311: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13312: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13313: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
- 		fi
-@@ -13318,7 +13319,7 @@
- 
- elif test "$GXX" = yes
- then
--	{ echo "$as_me:13321: checking for $CXX warning options..." >&5
-+	{ echo "$as_me:13322: checking for $CXX warning options..." >&5
- echo "$as_me: checking for $CXX warning options..." >&6;}
- 	cf_save_CXXFLAGS="$CXXFLAGS"
- 	EXTRA_CXXFLAGS="-W -Wall"
-@@ -13348,16 +13349,16 @@
- 		Wundef $cf_gxx_extra_warnings Wno-unused
- 	do
- 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
--		if { (eval echo "$as_me:13351: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13352: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13354: \$? = $ac_status" >&5
-+  echo "$as_me:13355: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13356: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13357: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
- 		else
--			test -n "$verbose" && echo "$as_me:13360: result: ... no -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13361: result: ... no -$cf_opt" >&5
- echo "${ECHO_T}... no -$cf_opt" >&6
- 		fi
- 	done
-@@ -13393,10 +13394,10 @@
- EOF
- if test "$GCC" = yes
- then
--	{ echo "$as_me:13396: checking for $CC __attribute__ directives..." >&5
-+	{ echo "$as_me:13397: checking for $CC __attribute__ directives..." >&5
- echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
- cat > conftest.$ac_ext <&5
-+		if { (eval echo "$as_me:13449: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13451: \$? = $ac_status" >&5
-+  echo "$as_me:13452: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13453: result: ... $cf_attribute" >&5
-+			test -n "$verbose" && echo "$as_me:13454: result: ... $cf_attribute" >&5
- echo "${ECHO_T}... $cf_attribute" >&6
- 			cat conftest.h >>confdefs.h
- 			case $cf_attribute in
-@@ -13509,7 +13510,7 @@
- rm -rf conftest*
- fi
- 
--echo "$as_me:13512: checking if you want to work around bogus compiler/loader warnings" >&5
-+echo "$as_me:13513: checking if you want to work around bogus compiler/loader warnings" >&5
- echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6
- 
- # Check whether --enable-string-hacks or --disable-string-hacks was given.
-@@ -13519,7 +13520,7 @@
- else
-   with_string_hacks=no
- fi;
--echo "$as_me:13522: result: $with_string_hacks" >&5
-+echo "$as_me:13523: result: $with_string_hacks" >&5
- echo "${ECHO_T}$with_string_hacks" >&6
- 
- if test "x$with_string_hacks" = "xyes"; then
-@@ -13528,19 +13529,19 @@
- #define USE_STRING_HACKS 1
- EOF
- 
--	{ echo "$as_me:13531: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
-+	{ echo "$as_me:13532: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
- echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;}
- 
- for ac_func in strlcat strlcpy snprintf
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:13537: checking for $ac_func" >&5
-+echo "$as_me:13538: 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 13543 "configure"
-+#line 13544 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -13571,16 +13572,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13574: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13575: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13577: \$? = $ac_status" >&5
-+  echo "$as_me:13578: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13580: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13581: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13583: \$? = $ac_status" >&5
-+  echo "$as_me:13584: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -13590,7 +13591,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:13593: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:13594: 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 <&5
-+echo "$as_me:13607: checking if you want to enable runtime assertions" >&5
- echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
- 
- # Check whether --enable-assertions or --disable-assertions was given.
-@@ -13613,7 +13614,7 @@
- else
-   with_assertions=no
- fi;
--echo "$as_me:13616: result: $with_assertions" >&5
-+echo "$as_me:13617: result: $with_assertions" >&5
- echo "${ECHO_T}$with_assertions" >&6
- if test -n "$GCC"
- then
-@@ -13629,7 +13630,7 @@
- 
- ###	use option --disable-leaks to suppress "permanent" leaks, for testing
- 
--echo "$as_me:13632: checking if you want to use dmalloc for testing" >&5
-+echo "$as_me:13633: 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.
-@@ -13646,7 +13647,7 @@
- else
-   with_dmalloc=
- fi;
--echo "$as_me:13649: result: ${with_dmalloc:-no}" >&5
-+echo "$as_me:13650: result: ${with_dmalloc:-no}" >&5
- echo "${ECHO_T}${with_dmalloc:-no}" >&6
- 
- case .$with_cflags in
-@@ -13740,23 +13741,23 @@
- esac
- 
- if test "$with_dmalloc" = yes ; then
--	echo "$as_me:13743: checking for dmalloc.h" >&5
-+	echo "$as_me:13744: 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 13749 "configure"
-+#line 13750 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:13753: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:13754: \"$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:13759: \$? = $ac_status" >&5
-+  echo "$as_me:13760: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -13775,11 +13776,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:13778: result: $ac_cv_header_dmalloc_h" >&5
-+echo "$as_me:13779: 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:13782: checking for dmalloc_debug in -ldmalloc" >&5
-+echo "$as_me:13783: 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
-@@ -13787,7 +13788,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 13790 "configure"
-+#line 13791 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -13806,16 +13807,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13809: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13810: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13812: \$? = $ac_status" >&5
-+  echo "$as_me:13813: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13815: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13816: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13818: \$? = $ac_status" >&5
-+  echo "$as_me:13819: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dmalloc_dmalloc_debug=yes
- else
-@@ -13826,7 +13827,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:13829: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
-+echo "$as_me:13830: 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 <&5
-+echo "$as_me:13845: 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.
-@@ -13858,7 +13859,7 @@
- else
-   with_dbmalloc=
- fi;
--echo "$as_me:13861: result: ${with_dbmalloc:-no}" >&5
-+echo "$as_me:13862: result: ${with_dbmalloc:-no}" >&5
- echo "${ECHO_T}${with_dbmalloc:-no}" >&6
- 
- case .$with_cflags in
-@@ -13952,23 +13953,23 @@
- esac
- 
- if test "$with_dbmalloc" = yes ; then
--	echo "$as_me:13955: checking for dbmalloc.h" >&5
-+	echo "$as_me:13956: 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 13961 "configure"
-+#line 13962 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:13965: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:13966: \"$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:13971: \$? = $ac_status" >&5
-+  echo "$as_me:13972: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -13987,11 +13988,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:13990: result: $ac_cv_header_dbmalloc_h" >&5
-+echo "$as_me:13991: 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:13994: checking for debug_malloc in -ldbmalloc" >&5
-+echo "$as_me:13995: 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
-@@ -13999,7 +14000,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldbmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14002 "configure"
-+#line 14003 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14018,16 +14019,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14021: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14022: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14024: \$? = $ac_status" >&5
-+  echo "$as_me:14025: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14027: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14028: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14030: \$? = $ac_status" >&5
-+  echo "$as_me:14031: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dbmalloc_debug_malloc=yes
- else
-@@ -14038,7 +14039,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:14041: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
-+echo "$as_me:14042: 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 <&5
-+echo "$as_me:14057: checking if you want to use valgrind for testing" >&5
- echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
- 
- # Check whether --with-valgrind or --without-valgrind was given.
-@@ -14070,7 +14071,7 @@
- else
-   with_valgrind=
- fi;
--echo "$as_me:14073: result: ${with_valgrind:-no}" >&5
-+echo "$as_me:14074: result: ${with_valgrind:-no}" >&5
- echo "${ECHO_T}${with_valgrind:-no}" >&6
- 
- case .$with_cflags in
-@@ -14163,7 +14164,7 @@
- 	;;
- esac
- 
--echo "$as_me:14166: checking if you want to perform memory-leak testing" >&5
-+echo "$as_me:14167: checking if you want to perform memory-leak testing" >&5
- echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
- 
- # Check whether --enable-leaks or --disable-leaks was given.
-@@ -14173,7 +14174,7 @@
- else
-   : ${with_no_leaks:=no}
- fi;
--echo "$as_me:14176: result: $with_no_leaks" >&5
-+echo "$as_me:14177: result: $with_no_leaks" >&5
- echo "${ECHO_T}$with_no_leaks" >&6
- 
- if test "$with_no_leaks" = yes ; then
-@@ -14225,7 +14226,7 @@
- 	;;
- esac
- 
--echo "$as_me:14228: checking whether to add trace feature to all models" >&5
-+echo "$as_me:14229: checking whether to add trace feature to all models" >&5
- echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
- 
- # Check whether --with-trace or --without-trace was given.
-@@ -14235,7 +14236,7 @@
- else
-   cf_with_trace=$cf_all_traces
- fi;
--echo "$as_me:14238: result: $cf_with_trace" >&5
-+echo "$as_me:14239: result: $cf_with_trace" >&5
- echo "${ECHO_T}$cf_with_trace" >&6
- 
- if test "x$cf_with_trace" = xyes ; then
-@@ -14325,7 +14326,7 @@
- 	ADA_TRACE=FALSE
- fi
- 
--echo "$as_me:14328: checking if we want to use GNAT projects" >&5
-+echo "$as_me:14329: checking if we want to use GNAT projects" >&5
- echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6
- 
- # Check whether --enable-gnat-projects or --disable-gnat-projects was given.
-@@ -14342,7 +14343,7 @@
- 	enable_gnat_projects=yes
- 
- fi;
--echo "$as_me:14345: result: $enable_gnat_projects" >&5
-+echo "$as_me:14346: result: $enable_gnat_projects" >&5
- echo "${ECHO_T}$enable_gnat_projects" >&6
- 
- ###	Checks for libraries.
-@@ -14352,13 +14353,13 @@
- 	LIBS=" -lpsapi $LIBS"
- 	;;
- (*)
--echo "$as_me:14355: checking for gettimeofday" >&5
-+echo "$as_me:14356: checking for gettimeofday" >&5
- echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
- if test "${ac_cv_func_gettimeofday+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14361 "configure"
-+#line 14362 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char gettimeofday (); below.  */
-@@ -14389,16 +14390,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14392: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14393: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14395: \$? = $ac_status" >&5
-+  echo "$as_me:14396: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14398: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14399: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14401: \$? = $ac_status" >&5
-+  echo "$as_me:14402: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_gettimeofday=yes
- else
-@@ -14408,7 +14409,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:14411: result: $ac_cv_func_gettimeofday" >&5
-+echo "$as_me:14412: result: $ac_cv_func_gettimeofday" >&5
- echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
- if test $ac_cv_func_gettimeofday = yes; then
- 
-@@ -14418,7 +14419,7 @@
- 
- else
- 
--echo "$as_me:14421: checking for gettimeofday in -lbsd" >&5
-+echo "$as_me:14422: checking for gettimeofday in -lbsd" >&5
- echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
- if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14426,7 +14427,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbsd  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14429 "configure"
-+#line 14430 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14445,16 +14446,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14448: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14449: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14451: \$? = $ac_status" >&5
-+  echo "$as_me:14452: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14454: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14455: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14457: \$? = $ac_status" >&5
-+  echo "$as_me:14458: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_bsd_gettimeofday=yes
- else
-@@ -14465,7 +14466,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:14468: result: $ac_cv_lib_bsd_gettimeofday" >&5
-+echo "$as_me:14469: result: $ac_cv_lib_bsd_gettimeofday" >&5
- echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
- if test $ac_cv_lib_bsd_gettimeofday = yes; then
- 
-@@ -14495,14 +14496,14 @@
- 	;;
- esac
- 
--echo "$as_me:14498: checking if -lm needed for math functions" >&5
-+echo "$as_me:14499: 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 14505 "configure"
-+#line 14506 "configure"
- #include "confdefs.h"
- 
- 	#include 
-@@ -14517,16 +14518,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14520: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14521: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14523: \$? = $ac_status" >&5
-+  echo "$as_me:14524: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14526: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14527: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14529: \$? = $ac_status" >&5
-+  echo "$as_me:14530: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_need_libm=no
- else
-@@ -14536,7 +14537,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:14539: result: $cf_cv_need_libm" >&5
-+echo "$as_me:14540: result: $cf_cv_need_libm" >&5
- echo "${ECHO_T}$cf_cv_need_libm" >&6
- if test "$cf_cv_need_libm" = yes
- then
-@@ -14544,13 +14545,13 @@
- fi
- 
- ###	Checks for header files.
--echo "$as_me:14547: checking for ANSI C header files" >&5
-+echo "$as_me:14548: 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 14553 "configure"
-+#line 14554 "configure"
- #include "confdefs.h"
- #include 
- #include 
-@@ -14558,13 +14559,13 @@
- #include 
- 
- _ACEOF
--if { (eval echo "$as_me:14561: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:14562: \"$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:14567: \$? = $ac_status" >&5
-+  echo "$as_me:14568: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -14586,7 +14587,7 @@
- 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 14589 "configure"
-+#line 14590 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -14604,7 +14605,7 @@
- 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 14607 "configure"
-+#line 14608 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -14625,7 +14626,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14628 "configure"
-+#line 14629 "configure"
- #include "confdefs.h"
- #include 
- #if ((' ' & 0x0FF) == 0x020)
-@@ -14651,15 +14652,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:14654: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14655: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14657: \$? = $ac_status" >&5
-+  echo "$as_me:14658: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:14659: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14660: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14662: \$? = $ac_status" >&5
-+  echo "$as_me:14663: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -14672,7 +14673,7 @@
- fi
- fi
- fi
--echo "$as_me:14675: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:14676: result: $ac_cv_header_stdc" >&5
- echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
- 
-@@ -14685,13 +14686,13 @@
- 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:14688: checking for $ac_hdr that defines DIR" >&5
-+echo "$as_me:14689: 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 14694 "configure"
-+#line 14695 "configure"
- #include "confdefs.h"
- #include 
- #include <$ac_hdr>
-@@ -14706,16 +14707,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14709: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14710: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14712: \$? = $ac_status" >&5
-+  echo "$as_me:14713: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14715: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14716: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14718: \$? = $ac_status" >&5
-+  echo "$as_me:14719: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Header=yes"
- else
-@@ -14725,7 +14726,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:14728: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:14729: 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 <&5
-+  echo "$as_me:14742: 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
-@@ -14746,7 +14747,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldir  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14749 "configure"
-+#line 14750 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14765,16 +14766,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14768: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14769: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14771: \$? = $ac_status" >&5
-+  echo "$as_me:14772: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14774: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14775: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14777: \$? = $ac_status" >&5
-+  echo "$as_me:14778: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dir_opendir=yes
- else
-@@ -14785,14 +14786,14 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:14788: result: $ac_cv_lib_dir_opendir" >&5
-+echo "$as_me:14789: 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:14795: checking for opendir in -lx" >&5
-+  echo "$as_me:14796: 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
-@@ -14800,7 +14801,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lx  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14803 "configure"
-+#line 14804 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14819,16 +14820,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14822: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14823: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14825: \$? = $ac_status" >&5
-+  echo "$as_me:14826: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14828: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14829: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14831: \$? = $ac_status" >&5
-+  echo "$as_me:14832: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_x_opendir=yes
- else
-@@ -14839,7 +14840,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:14842: result: $ac_cv_lib_x_opendir" >&5
-+echo "$as_me:14843: 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"
-@@ -14847,13 +14848,13 @@
- 
- fi
- 
--echo "$as_me:14850: checking whether time.h and sys/time.h may both be included" >&5
-+echo "$as_me:14851: 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 14856 "configure"
-+#line 14857 "configure"
- #include "confdefs.h"
- #include 
- #include 
-@@ -14869,16 +14870,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14872: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14873: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14875: \$? = $ac_status" >&5
-+  echo "$as_me:14876: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14878: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14879: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14881: \$? = $ac_status" >&5
-+  echo "$as_me:14882: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_header_time=yes
- else
-@@ -14888,7 +14889,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:14891: result: $ac_cv_header_time" >&5
-+echo "$as_me:14892: result: $ac_cv_header_time" >&5
- echo "${ECHO_T}$ac_cv_header_time" >&6
- if test $ac_cv_header_time = yes; then
- 
-@@ -14907,13 +14908,13 @@
- 	;;
- esac
- 
--echo "$as_me:14910: checking for regcomp" >&5
-+echo "$as_me:14911: checking for regcomp" >&5
- echo $ECHO_N "checking for regcomp... $ECHO_C" >&6
- if test "${ac_cv_func_regcomp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14916 "configure"
-+#line 14917 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char regcomp (); below.  */
-@@ -14944,16 +14945,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14947: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14948: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14950: \$? = $ac_status" >&5
-+  echo "$as_me:14951: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14953: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14954: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14956: \$? = $ac_status" >&5
-+  echo "$as_me:14957: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_regcomp=yes
- else
-@@ -14963,7 +14964,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:14966: result: $ac_cv_func_regcomp" >&5
-+echo "$as_me:14967: result: $ac_cv_func_regcomp" >&5
- echo "${ECHO_T}$ac_cv_func_regcomp" >&6
- if test $ac_cv_func_regcomp = yes; then
-   cf_regex_func=regcomp
-@@ -14972,7 +14973,7 @@
- 	for cf_regex_lib in $cf_regex_libs
- 	do
- 		as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh`
--echo "$as_me:14975: checking for regcomp in -l$cf_regex_lib" >&5
-+echo "$as_me:14976: checking for regcomp in -l$cf_regex_lib" >&5
- echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14980,7 +14981,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-l$cf_regex_lib  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14983 "configure"
-+#line 14984 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14999,16 +15000,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15002: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15003: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15005: \$? = $ac_status" >&5
-+  echo "$as_me:15006: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15008: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15009: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15011: \$? = $ac_status" >&5
-+  echo "$as_me:15012: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Lib=yes"
- else
-@@ -15019,7 +15020,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:15022: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-+echo "$as_me:15023: 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
- 
-@@ -15048,13 +15049,13 @@
- fi
- 
- if test "$cf_regex_func" = no ; then
--	echo "$as_me:15051: checking for compile" >&5
-+	echo "$as_me:15052: checking for compile" >&5
- echo $ECHO_N "checking for compile... $ECHO_C" >&6
- if test "${ac_cv_func_compile+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15057 "configure"
-+#line 15058 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char compile (); below.  */
-@@ -15085,16 +15086,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15088: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15089: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15091: \$? = $ac_status" >&5
-+  echo "$as_me:15092: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15094: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15095: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15097: \$? = $ac_status" >&5
-+  echo "$as_me:15098: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_compile=yes
- else
-@@ -15104,13 +15105,13 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:15107: result: $ac_cv_func_compile" >&5
-+echo "$as_me:15108: result: $ac_cv_func_compile" >&5
- echo "${ECHO_T}$ac_cv_func_compile" >&6
- if test $ac_cv_func_compile = yes; then
-   cf_regex_func=compile
- else
- 
--		echo "$as_me:15113: checking for compile in -lgen" >&5
-+		echo "$as_me:15114: checking for compile in -lgen" >&5
- echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6
- if test "${ac_cv_lib_gen_compile+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15118,7 +15119,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgen  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 15121 "configure"
-+#line 15122 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -15137,16 +15138,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15140: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15141: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15143: \$? = $ac_status" >&5
-+  echo "$as_me:15144: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15146: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15147: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15149: \$? = $ac_status" >&5
-+  echo "$as_me:15150: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gen_compile=yes
- else
-@@ -15157,7 +15158,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:15160: result: $ac_cv_lib_gen_compile" >&5
-+echo "$as_me:15161: result: $ac_cv_lib_gen_compile" >&5
- echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6
- if test $ac_cv_lib_gen_compile = yes; then
- 
-@@ -15185,11 +15186,11 @@
- fi
- 
- if test "$cf_regex_func" = no ; then
--	{ echo "$as_me:15188: WARNING: cannot find regular expression library" >&5
-+	{ echo "$as_me:15189: WARNING: cannot find regular expression library" >&5
- echo "$as_me: WARNING: cannot find regular expression library" >&2;}
- fi
- 
--echo "$as_me:15192: checking for regular-expression headers" >&5
-+echo "$as_me:15193: checking for regular-expression headers" >&5
- echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
- if test "${cf_cv_regex_hdrs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15201,7 +15202,7 @@
- 	for cf_regex_hdr in regexp.h regexpr.h
- 	do
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 15204 "configure"
-+#line 15205 "configure"
- #include "confdefs.h"
- #include <$cf_regex_hdr>
- int
-@@ -15216,16 +15217,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15219: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15220: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15222: \$? = $ac_status" >&5
-+  echo "$as_me:15223: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15225: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15226: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15228: \$? = $ac_status" >&5
-+  echo "$as_me:15229: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 			cf_cv_regex_hdrs=$cf_regex_hdr
-@@ -15242,7 +15243,7 @@
- 	for cf_regex_hdr in regex.h
- 	do
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 15245 "configure"
-+#line 15246 "configure"
- #include "confdefs.h"
- #include 
- #include <$cf_regex_hdr>
-@@ -15260,16 +15261,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15263: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15264: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15266: \$? = $ac_status" >&5
-+  echo "$as_me:15267: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15269: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15270: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15272: \$? = $ac_status" >&5
-+  echo "$as_me:15273: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 			cf_cv_regex_hdrs=$cf_regex_hdr
-@@ -15285,11 +15286,11 @@
- esac
- 
- fi
--echo "$as_me:15288: result: $cf_cv_regex_hdrs" >&5
-+echo "$as_me:15289: result: $cf_cv_regex_hdrs" >&5
- echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
- 
- case $cf_cv_regex_hdrs in
--	(no)		{ echo "$as_me:15292: WARNING: no regular expression header found" >&5
-+	(no)		{ echo "$as_me:15293: WARNING: no regular expression header found" >&5
- echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
- 	(regex.h)
- cat >>confdefs.h <<\EOF
-@@ -15328,23 +15329,23 @@
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:15331: checking for $ac_header" >&5
-+echo "$as_me:15332: 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 15337 "configure"
-+#line 15338 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:15341: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:15342: \"$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:15347: \$? = $ac_status" >&5
-+  echo "$as_me:15348: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -15363,7 +15364,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:15366: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:15367: 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 <&5
-+echo "$as_me:15380: 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 15385 "configure"
-+#line 15386 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:15389: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:15390: \"$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:15395: \$? = $ac_status" >&5
-+  echo "$as_me:15396: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -15411,7 +15412,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:15414: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:15415: 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 <&5
-+echo "$as_me:15425: checking for header declaring getopt variables" >&5
- echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6
- if test "${cf_cv_getopt_header+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15431,7 +15432,7 @@
- for cf_header in stdio.h stdlib.h unistd.h getopt.h
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 15434 "configure"
-+#line 15435 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -15444,16 +15445,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15447: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15448: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15450: \$? = $ac_status" >&5
-+  echo "$as_me:15451: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15453: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15454: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15456: \$? = $ac_status" >&5
-+  echo "$as_me:15457: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_getopt_header=$cf_header
-  break
-@@ -15465,7 +15466,7 @@
- done
- 
- fi
--echo "$as_me:15468: result: $cf_cv_getopt_header" >&5
-+echo "$as_me:15469: result: $cf_cv_getopt_header" >&5
- echo "${ECHO_T}$cf_cv_getopt_header" >&6
- if test $cf_cv_getopt_header != none ; then
- 
-@@ -15486,7 +15487,7 @@
- # Note: even non-Posix ISC needs  to declare fd_set
- if test "x$ISC" = xyes ; then
- 
--echo "$as_me:15489: checking for main in -lcposix" >&5
-+echo "$as_me:15490: checking for main in -lcposix" >&5
- echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6
- if test "${ac_cv_lib_cposix_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15494,7 +15495,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lcposix  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 15497 "configure"
-+#line 15498 "configure"
- #include "confdefs.h"
- 
- int
-@@ -15506,16 +15507,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15509: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15510: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15512: \$? = $ac_status" >&5
-+  echo "$as_me:15513: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15515: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15516: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15518: \$? = $ac_status" >&5
-+  echo "$as_me:15519: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_cposix_main=yes
- else
-@@ -15526,7 +15527,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:15529: result: $ac_cv_lib_cposix_main" >&5
-+echo "$as_me:15530: result: $ac_cv_lib_cposix_main" >&5
- echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6
- if test $ac_cv_lib_cposix_main = yes; then
-   cat >>confdefs.h <&5
-+	echo "$as_me:15541: checking for bzero in -linet" >&5
- echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6
- if test "${ac_cv_lib_inet_bzero+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15545,7 +15546,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-linet  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 15548 "configure"
-+#line 15549 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -15564,16 +15565,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15567: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15568: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15570: \$? = $ac_status" >&5
-+  echo "$as_me:15571: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15573: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15574: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15576: \$? = $ac_status" >&5
-+  echo "$as_me:15577: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_inet_bzero=yes
- else
-@@ -15584,7 +15585,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:15587: result: $ac_cv_lib_inet_bzero" >&5
-+echo "$as_me:15588: result: $ac_cv_lib_inet_bzero" >&5
- echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6
- if test $ac_cv_lib_inet_bzero = yes; then
- 
-@@ -15607,14 +15608,14 @@
- fi
- fi
- 
--echo "$as_me:15610: checking if sys/time.h works with sys/select.h" >&5
-+echo "$as_me:15611: checking if sys/time.h works with sys/select.h" >&5
- echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
- if test "${cf_cv_sys_time_select+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 15617 "configure"
-+#line 15618 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -15634,16 +15635,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15637: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15638: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15640: \$? = $ac_status" >&5
-+  echo "$as_me:15641: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15643: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15644: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15646: \$? = $ac_status" >&5
-+  echo "$as_me:15647: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sys_time_select=yes
- else
-@@ -15655,7 +15656,7 @@
- 
- fi
- 
--echo "$as_me:15658: result: $cf_cv_sys_time_select" >&5
-+echo "$as_me:15659: result: $cf_cv_sys_time_select" >&5
- echo "${ECHO_T}$cf_cv_sys_time_select" >&6
- test "$cf_cv_sys_time_select" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -15670,13 +15671,13 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ac_main_return=return
- 
--echo "$as_me:15673: checking for an ANSI C-conforming const" >&5
-+echo "$as_me:15674: checking for an ANSI C-conforming const" >&5
- echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
- if test "${ac_cv_c_const+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15679 "configure"
-+#line 15680 "configure"
- #include "confdefs.h"
- 
- int
-@@ -15734,16 +15735,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15737: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15738: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15740: \$? = $ac_status" >&5
-+  echo "$as_me:15741: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15743: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15744: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15746: \$? = $ac_status" >&5
-+  echo "$as_me:15747: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_const=yes
- else
-@@ -15753,7 +15754,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:15756: result: $ac_cv_c_const" >&5
-+echo "$as_me:15757: result: $ac_cv_c_const" >&5
- echo "${ECHO_T}$ac_cv_c_const" >&6
- if test $ac_cv_c_const = no; then
- 
-@@ -15763,7 +15764,7 @@
- 
- fi
- 
--echo "$as_me:15766: checking for inline" >&5
-+echo "$as_me:15767: 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
-@@ -15771,7 +15772,7 @@
-   ac_cv_c_inline=no
- for ac_kw in inline __inline__ __inline; do
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15774 "configure"
-+#line 15775 "configure"
- #include "confdefs.h"
- #ifndef __cplusplus
- static $ac_kw int static_foo () {return 0; }
-@@ -15780,16 +15781,16 @@
- 
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15783: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15784: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15786: \$? = $ac_status" >&5
-+  echo "$as_me:15787: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15789: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15790: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15792: \$? = $ac_status" >&5
-+  echo "$as_me:15793: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_inline=$ac_kw; break
- else
-@@ -15800,7 +15801,7 @@
- done
- 
- fi
--echo "$as_me:15803: result: $ac_cv_c_inline" >&5
-+echo "$as_me:15804: result: $ac_cv_c_inline" >&5
- echo "${ECHO_T}$ac_cv_c_inline" >&6
- case $ac_cv_c_inline in
-   inline | yes) ;;
-@@ -15826,7 +15827,7 @@
- 		:
- 	elif test "$GCC" = yes
- 	then
--		echo "$as_me:15829: checking if $CC supports options to tune inlining" >&5
-+		echo "$as_me:15830: checking if $CC supports options to tune inlining" >&5
- echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6
- if test "${cf_cv_gcc_inline+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15835,7 +15836,7 @@
- 		cf_save_CFLAGS=$CFLAGS
- 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 15838 "configure"
-+#line 15839 "configure"
- #include "confdefs.h"
- inline int foo(void) { return 1; }
- int
-@@ -15847,16 +15848,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15850: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15851: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15853: \$? = $ac_status" >&5
-+  echo "$as_me:15854: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15856: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15857: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15859: \$? = $ac_status" >&5
-+  echo "$as_me:15860: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gcc_inline=yes
- else
-@@ -15868,7 +15869,7 @@
- 		CFLAGS=$cf_save_CFLAGS
- 
- fi
--echo "$as_me:15871: result: $cf_cv_gcc_inline" >&5
-+echo "$as_me:15872: result: $cf_cv_gcc_inline" >&5
- echo "${ECHO_T}$cf_cv_gcc_inline" >&6
- 		if test "$cf_cv_gcc_inline" = yes ; then
- 
-@@ -15954,7 +15955,7 @@
- 	fi
- fi
- 
--echo "$as_me:15957: checking for signal global datatype" >&5
-+echo "$as_me:15958: checking for signal global datatype" >&5
- echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6
- if test "${cf_cv_sig_atomic_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15966,7 +15967,7 @@
- 		"int"
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 15969 "configure"
-+#line 15970 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -15989,16 +15990,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15992: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15993: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15995: \$? = $ac_status" >&5
-+  echo "$as_me:15996: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15998: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15999: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16001: \$? = $ac_status" >&5
-+  echo "$as_me:16002: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sig_atomic_t=$cf_type
- else
-@@ -16012,7 +16013,7 @@
- 
- fi
- 
--echo "$as_me:16015: result: $cf_cv_sig_atomic_t" >&5
-+echo "$as_me:16016: result: $cf_cv_sig_atomic_t" >&5
- echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
- test "$cf_cv_sig_atomic_t" != no &&
- cat >>confdefs.h <&5
-+echo "$as_me:16025: checking for type of chtype" >&5
- echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
- if test "${cf_cv_typeof_chtype+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16031,7 +16032,7 @@
-   cf_cv_typeof_chtype=long
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16034 "configure"
-+#line 16035 "configure"
- #include "confdefs.h"
- 
- #define WANT_BITS 31
-@@ -16066,15 +16067,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16069: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16070: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16072: \$? = $ac_status" >&5
-+  echo "$as_me:16073: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16074: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16075: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16077: \$? = $ac_status" >&5
-+  echo "$as_me:16078: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_typeof_chtype=`cat cf_test.out`
- else
-@@ -16089,7 +16090,7 @@
- 
- fi
- 
--echo "$as_me:16092: result: $cf_cv_typeof_chtype" >&5
-+echo "$as_me:16093: result: $cf_cv_typeof_chtype" >&5
- echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
- 
- cat >>confdefs.h <&5
-+echo "$as_me:16105: checking if unsigned literals are legal" >&5
- echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6
- if test "${cf_cv_unsigned_literals+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16111 "configure"
-+#line 16112 "configure"
- #include "confdefs.h"
- 
- int
-@@ -16120,16 +16121,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16123: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16124: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16126: \$? = $ac_status" >&5
-+  echo "$as_me:16127: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16129: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16130: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16132: \$? = $ac_status" >&5
-+  echo "$as_me:16133: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_unsigned_literals=yes
- else
-@@ -16141,7 +16142,7 @@
- 
- fi
- 
--echo "$as_me:16144: result: $cf_cv_unsigned_literals" >&5
-+echo "$as_me:16145: result: $cf_cv_unsigned_literals" >&5
- echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
- 
- cf_cv_1UL="1"
-@@ -16157,14 +16158,14 @@
- 
- ###	Checks for external-data
- 
--echo "$as_me:16160: checking if external errno is declared" >&5
-+echo "$as_me:16161: 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 16167 "configure"
-+#line 16168 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_STDLIB_H
-@@ -16182,16 +16183,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16185: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16186: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16188: \$? = $ac_status" >&5
-+  echo "$as_me:16189: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16191: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16192: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16194: \$? = $ac_status" >&5
-+  echo "$as_me:16195: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_dcl_errno=yes
- else
-@@ -16202,7 +16203,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:16205: result: $cf_cv_dcl_errno" >&5
-+echo "$as_me:16206: result: $cf_cv_dcl_errno" >&5
- echo "${ECHO_T}$cf_cv_dcl_errno" >&6
- 
- if test "$cf_cv_dcl_errno" = no ; then
-@@ -16217,14 +16218,14 @@
- 
- # It's possible (for near-UNIX clones) that the data doesn't exist
- 
--echo "$as_me:16220: checking if external errno exists" >&5
-+echo "$as_me:16221: 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 16227 "configure"
-+#line 16228 "configure"
- #include "confdefs.h"
- 
- #undef errno
-@@ -16239,16 +16240,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16242: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16243: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16245: \$? = $ac_status" >&5
-+  echo "$as_me:16246: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16248: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16249: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16251: \$? = $ac_status" >&5
-+  echo "$as_me:16252: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_errno=yes
- else
-@@ -16259,7 +16260,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:16262: result: $cf_cv_have_errno" >&5
-+echo "$as_me:16263: result: $cf_cv_have_errno" >&5
- echo "${ECHO_T}$cf_cv_have_errno" >&6
- 
- if test "$cf_cv_have_errno" = yes ; then
-@@ -16272,7 +16273,7 @@
- 
- fi
- 
--echo "$as_me:16275: checking if data-only library module links" >&5
-+echo "$as_me:16276: checking if data-only library module links" >&5
- echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
- if test "${cf_cv_link_dataonly+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16280,20 +16281,20 @@
- 
- 	rm -f conftest.a
- 	cat >conftest.$ac_ext <&5
-+	if { (eval echo "$as_me:16287: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16289: \$? = $ac_status" >&5
-+  echo "$as_me:16290: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 		mv conftest.o data.o && \
- 		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
- 	fi
- 	rm -f conftest.$ac_ext data.o
- 	cat >conftest.$ac_ext <&5
-+	if { (eval echo "$as_me:16310: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16312: \$? = $ac_status" >&5
-+  echo "$as_me:16313: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
- 		mv conftest.o func.o && \
- 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
-@@ -16322,7 +16323,7 @@
-   cf_cv_link_dataonly=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16325 "configure"
-+#line 16326 "configure"
- #include "confdefs.h"
- 
- 	int main()
-@@ -16333,15 +16334,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16336: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16337: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16339: \$? = $ac_status" >&5
-+  echo "$as_me:16340: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16341: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16342: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16344: \$? = $ac_status" >&5
-+  echo "$as_me:16345: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_link_dataonly=yes
- else
-@@ -16356,7 +16357,7 @@
- 
- fi
- 
--echo "$as_me:16359: result: $cf_cv_link_dataonly" >&5
-+echo "$as_me:16360: result: $cf_cv_link_dataonly" >&5
- echo "${ECHO_T}$cf_cv_link_dataonly" >&6
- 
- if test "$cf_cv_link_dataonly" = no ; then
-@@ -16395,13 +16396,13 @@
- 
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:16398: checking for $ac_func" >&5
-+echo "$as_me:16399: 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 16404 "configure"
-+#line 16405 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -16432,16 +16433,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16435: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16436: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16438: \$? = $ac_status" >&5
-+  echo "$as_me:16439: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16441: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16442: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16444: \$? = $ac_status" >&5
-+  echo "$as_me:16445: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -16451,7 +16452,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:16454: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:16455: 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 <&5
-+	{ { echo "$as_me:16467: error: getopt is required for building programs" >&5
- echo "$as_me: error: getopt is required for building programs" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- if test "x$with_getcap" = "xyes" ; then
- 
--echo "$as_me:16473: checking for terminal-capability database functions" >&5
-+echo "$as_me:16474: checking for terminal-capability database functions" >&5
- echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6
- if test "${cf_cv_cgetent+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16480 "configure"
-+#line 16481 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -16497,16 +16498,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16500: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16501: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16503: \$? = $ac_status" >&5
-+  echo "$as_me:16504: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16506: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16507: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16509: \$? = $ac_status" >&5
-+  echo "$as_me:16510: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cgetent=yes
- else
-@@ -16517,7 +16518,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:16520: result: $cf_cv_cgetent" >&5
-+echo "$as_me:16521: result: $cf_cv_cgetent" >&5
- echo "${ECHO_T}$cf_cv_cgetent" >&6
- 
- if test "$cf_cv_cgetent" = yes
-@@ -16527,14 +16528,14 @@
- #define HAVE_BSD_CGETENT 1
- EOF
- 
--echo "$as_me:16530: checking if cgetent uses const parameter" >&5
-+echo "$as_me:16531: checking if cgetent uses const parameter" >&5
- echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6
- if test "${cf_cv_cgetent_const+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16537 "configure"
-+#line 16538 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -16556,16 +16557,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16559: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16560: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16562: \$? = $ac_status" >&5
-+  echo "$as_me:16563: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16565: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16566: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16568: \$? = $ac_status" >&5
-+  echo "$as_me:16569: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cgetent_const=yes
- else
-@@ -16576,7 +16577,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:16579: result: $cf_cv_cgetent_const" >&5
-+echo "$as_me:16580: result: $cf_cv_cgetent_const" >&5
- echo "${ECHO_T}$cf_cv_cgetent_const" >&6
- 	if test "$cf_cv_cgetent_const" = yes
- 	then
-@@ -16590,14 +16591,14 @@
- 
- fi
- 
--echo "$as_me:16593: checking for isascii" >&5
-+echo "$as_me:16594: checking for isascii" >&5
- echo $ECHO_N "checking for isascii... $ECHO_C" >&6
- if test "${cf_cv_have_isascii+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16600 "configure"
-+#line 16601 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -16609,16 +16610,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16612: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16613: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16615: \$? = $ac_status" >&5
-+  echo "$as_me:16616: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16618: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16619: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16621: \$? = $ac_status" >&5
-+  echo "$as_me:16622: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_isascii=yes
- else
-@@ -16629,7 +16630,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:16632: result: $cf_cv_have_isascii" >&5
-+echo "$as_me:16633: result: $cf_cv_have_isascii" >&5
- echo "${ECHO_T}$cf_cv_have_isascii" >&6
- test "$cf_cv_have_isascii" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -16637,10 +16638,10 @@
- EOF
- 
- if test "$ac_cv_func_sigaction" = yes; then
--echo "$as_me:16640: checking whether sigaction needs _POSIX_SOURCE" >&5
-+echo "$as_me:16641: checking whether sigaction needs _POSIX_SOURCE" >&5
- echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 16643 "configure"
-+#line 16644 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -16654,16 +16655,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16657: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16658: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16660: \$? = $ac_status" >&5
-+  echo "$as_me:16661: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16663: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16664: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16666: \$? = $ac_status" >&5
-+  echo "$as_me:16667: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   sigact_bad=no
- else
-@@ -16671,7 +16672,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16674 "configure"
-+#line 16675 "configure"
- #include "confdefs.h"
- 
- #define _POSIX_SOURCE
-@@ -16686,16 +16687,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16689: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16690: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16692: \$? = $ac_status" >&5
-+  echo "$as_me:16693: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16695: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16696: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16698: \$? = $ac_status" >&5
-+  echo "$as_me:16699: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   sigact_bad=yes
- 
-@@ -16711,11 +16712,11 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:16714: result: $sigact_bad" >&5
-+echo "$as_me:16715: result: $sigact_bad" >&5
- echo "${ECHO_T}$sigact_bad" >&6
- fi
- 
--echo "$as_me:16718: checking if nanosleep really works" >&5
-+echo "$as_me:16719: checking if nanosleep really works" >&5
- echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6
- if test "${cf_cv_func_nanosleep+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16725,7 +16726,7 @@
-   cf_cv_func_nanosleep=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16728 "configure"
-+#line 16729 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -16750,15 +16751,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16753: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16754: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16756: \$? = $ac_status" >&5
-+  echo "$as_me:16757: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16758: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16759: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16761: \$? = $ac_status" >&5
-+  echo "$as_me:16762: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_nanosleep=yes
- else
-@@ -16770,7 +16771,7 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:16773: result: $cf_cv_func_nanosleep" >&5
-+echo "$as_me:16774: result: $cf_cv_func_nanosleep" >&5
- echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
- 
- test "$cf_cv_func_nanosleep" = "yes" &&
-@@ -16785,23 +16786,23 @@
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:16788: checking for $ac_header" >&5
-+echo "$as_me:16789: 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 16794 "configure"
-+#line 16795 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:16798: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:16799: \"$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:16804: \$? = $ac_status" >&5
-+  echo "$as_me:16805: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -16820,7 +16821,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:16823: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:16824: 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 <&5
-+echo "$as_me:16839: 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 16844 "configure"
-+#line 16845 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:16848: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:16849: \"$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:16854: \$? = $ac_status" >&5
-+  echo "$as_me:16855: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -16870,7 +16871,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:16873: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:16874: 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 <&5
-+	echo "$as_me:16892: 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 16894 "configure"
-+#line 16895 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -16903,16 +16904,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16906: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16907: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16909: \$? = $ac_status" >&5
-+  echo "$as_me:16910: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16912: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16913: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16915: \$? = $ac_status" >&5
-+  echo "$as_me:16916: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   termios_bad=no
- else
-@@ -16920,7 +16921,7 @@
- cat conftest.$ac_ext >&5
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 16923 "configure"
-+#line 16924 "configure"
- #include "confdefs.h"
- 
- #define _POSIX_SOURCE
-@@ -16934,16 +16935,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16937: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16938: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16940: \$? = $ac_status" >&5
-+  echo "$as_me:16941: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16943: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16944: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16946: \$? = $ac_status" >&5
-+  echo "$as_me:16947: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   termios_bad=unknown
- else
-@@ -16959,19 +16960,19 @@
- 
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:16962: result: $termios_bad" >&5
-+	echo "$as_me:16963: result: $termios_bad" >&5
- echo "${ECHO_T}$termios_bad" >&6
- 	fi
- fi
- 
--echo "$as_me:16967: checking for tcgetattr" >&5
-+echo "$as_me:16968: checking for tcgetattr" >&5
- echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6
- if test "${cf_cv_have_tcgetattr+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16974 "configure"
-+#line 16975 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -16999,16 +17000,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17002: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17003: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17005: \$? = $ac_status" >&5
-+  echo "$as_me:17006: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17008: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17009: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17011: \$? = $ac_status" >&5
-+  echo "$as_me:17012: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_tcgetattr=yes
- else
-@@ -17018,21 +17019,21 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17021: result: $cf_cv_have_tcgetattr" >&5
-+echo "$as_me:17022: result: $cf_cv_have_tcgetattr" >&5
- echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6
- test "$cf_cv_have_tcgetattr" = yes &&
- cat >>confdefs.h <<\EOF
- #define HAVE_TCGETATTR 1
- EOF
- 
--echo "$as_me:17028: checking for vsscanf function or workaround" >&5
-+echo "$as_me:17029: checking for vsscanf function or workaround" >&5
- echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6
- if test "${cf_cv_func_vsscanf+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17035 "configure"
-+#line 17036 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -17048,16 +17049,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17051: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17052: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17054: \$? = $ac_status" >&5
-+  echo "$as_me:17055: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17057: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17058: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17060: \$? = $ac_status" >&5
-+  echo "$as_me:17061: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=vsscanf
- else
-@@ -17065,7 +17066,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17068 "configure"
-+#line 17069 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -17087,16 +17088,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17090: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17091: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17093: \$? = $ac_status" >&5
-+  echo "$as_me:17094: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17096: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17097: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17099: \$? = $ac_status" >&5
-+  echo "$as_me:17100: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=vfscanf
- else
-@@ -17104,7 +17105,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17107 "configure"
-+#line 17108 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -17126,16 +17127,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17129: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17130: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17132: \$? = $ac_status" >&5
-+  echo "$as_me:17133: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17135: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17136: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17138: \$? = $ac_status" >&5
-+  echo "$as_me:17139: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=_doscan
- else
-@@ -17150,7 +17151,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17153: result: $cf_cv_func_vsscanf" >&5
-+echo "$as_me:17154: result: $cf_cv_func_vsscanf" >&5
- echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
- 
- case $cf_cv_func_vsscanf in
-@@ -17171,7 +17172,7 @@
- ;;
- esac
- 
--echo "$as_me:17174: checking for working mkstemp" >&5
-+echo "$as_me:17175: checking for working mkstemp" >&5
- echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
- if test "${cf_cv_func_mkstemp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17182,7 +17183,7 @@
-   cf_cv_func_mkstemp=maybe
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17185 "configure"
-+#line 17186 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -17220,15 +17221,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17223: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17224: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17226: \$? = $ac_status" >&5
-+  echo "$as_me:17227: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17228: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17229: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17231: \$? = $ac_status" >&5
-+  echo "$as_me:17232: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_mkstemp=yes
- 
-@@ -17243,16 +17244,16 @@
- fi
- 
- fi
--echo "$as_me:17246: result: $cf_cv_func_mkstemp" >&5
-+echo "$as_me:17247: result: $cf_cv_func_mkstemp" >&5
- echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
- if test "x$cf_cv_func_mkstemp" = xmaybe ; then
--	echo "$as_me:17249: checking for mkstemp" >&5
-+	echo "$as_me:17250: checking for mkstemp" >&5
- echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
- if test "${ac_cv_func_mkstemp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17255 "configure"
-+#line 17256 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char mkstemp (); below.  */
-@@ -17283,16 +17284,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17286: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17287: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17289: \$? = $ac_status" >&5
-+  echo "$as_me:17290: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17292: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17293: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17295: \$? = $ac_status" >&5
-+  echo "$as_me:17296: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_mkstemp=yes
- else
-@@ -17302,7 +17303,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17305: result: $ac_cv_func_mkstemp" >&5
-+echo "$as_me:17306: result: $ac_cv_func_mkstemp" >&5
- echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
- 
- fi
-@@ -17323,21 +17324,21 @@
- fi
- 
- if test "x$cross_compiling" = xyes ; then
--	{ echo "$as_me:17326: WARNING: cross compiling: assume setvbuf params not reversed" >&5
-+	{ echo "$as_me:17327: WARNING: cross compiling: assume setvbuf params not reversed" >&5
- echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;}
- else
--	echo "$as_me:17329: checking whether setvbuf arguments are reversed" >&5
-+	echo "$as_me:17330: checking whether setvbuf arguments are reversed" >&5
- echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6
- if test "${ac_cv_func_setvbuf_reversed+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:17335: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:17336: 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 17340 "configure"
-+#line 17341 "configure"
- #include "confdefs.h"
- #include 
- /* If setvbuf has the reversed format, exit 0. */
-@@ -17354,15 +17355,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17357: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17358: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17360: \$? = $ac_status" >&5
-+  echo "$as_me:17361: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17362: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17363: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17365: \$? = $ac_status" >&5
-+  echo "$as_me:17366: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_setvbuf_reversed=yes
- else
-@@ -17375,7 +17376,7 @@
- fi
- rm -f core core.* *.core
- fi
--echo "$as_me:17378: result: $ac_cv_func_setvbuf_reversed" >&5
-+echo "$as_me:17379: result: $ac_cv_func_setvbuf_reversed" >&5
- echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6
- if test $ac_cv_func_setvbuf_reversed = yes; then
- 
-@@ -17386,13 +17387,13 @@
- fi
- 
- fi
--echo "$as_me:17389: checking for intptr_t" >&5
-+echo "$as_me:17390: 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 17395 "configure"
-+#line 17396 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -17407,16 +17408,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17410: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17411: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17413: \$? = $ac_status" >&5
-+  echo "$as_me:17414: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17416: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17417: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17419: \$? = $ac_status" >&5
-+  echo "$as_me:17420: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_intptr_t=yes
- else
-@@ -17426,7 +17427,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:17429: result: $ac_cv_type_intptr_t" >&5
-+echo "$as_me:17430: 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
-   :
-@@ -17438,13 +17439,13 @@
- 
- fi
- 
--echo "$as_me:17441: checking for ssize_t" >&5
-+echo "$as_me:17442: 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 17447 "configure"
-+#line 17448 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -17459,16 +17460,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17462: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17463: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17465: \$? = $ac_status" >&5
-+  echo "$as_me:17466: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17468: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17469: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17471: \$? = $ac_status" >&5
-+  echo "$as_me:17472: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_ssize_t=yes
- else
-@@ -17478,7 +17479,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:17481: result: $ac_cv_type_ssize_t" >&5
-+echo "$as_me:17482: 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
-   :
-@@ -17490,14 +17491,14 @@
- 
- fi
- 
--echo "$as_me:17493: checking for type sigaction_t" >&5
-+echo "$as_me:17494: checking for type sigaction_t" >&5
- echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6
- if test "${cf_cv_type_sigaction+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 17500 "configure"
-+#line 17501 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -17510,16 +17511,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17513: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17514: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17516: \$? = $ac_status" >&5
-+  echo "$as_me:17517: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17519: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17520: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17522: \$? = $ac_status" >&5
-+  echo "$as_me:17523: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_sigaction=yes
- else
-@@ -17530,14 +17531,14 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- 
--echo "$as_me:17533: result: $cf_cv_type_sigaction" >&5
-+echo "$as_me:17534: result: $cf_cv_type_sigaction" >&5
- echo "${ECHO_T}$cf_cv_type_sigaction" >&6
- test "$cf_cv_type_sigaction" = yes &&
- cat >>confdefs.h <<\EOF
- #define HAVE_TYPE_SIGACTION 1
- EOF
- 
--echo "$as_me:17540: checking declaration of size-change" >&5
-+echo "$as_me:17541: 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
-@@ -17552,7 +17553,7 @@
- 	CPPFLAGS="$cf_save_CPPFLAGS"
- 	test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 17555 "configure"
-+#line 17556 "configure"
- #include "confdefs.h"
- #include 
- #ifdef HAVE_TERMIOS_H
-@@ -17596,16 +17597,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17599: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17600: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17602: \$? = $ac_status" >&5
-+  echo "$as_me:17603: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17605: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17606: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17608: \$? = $ac_status" >&5
-+  echo "$as_me:17609: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sizechange=yes
- else
-@@ -17624,7 +17625,7 @@
- done
- 
- fi
--echo "$as_me:17627: result: $cf_cv_sizechange" >&5
-+echo "$as_me:17628: result: $cf_cv_sizechange" >&5
- echo "${ECHO_T}$cf_cv_sizechange" >&6
- if test "$cf_cv_sizechange" != no ; then
- 
-@@ -17642,13 +17643,13 @@
- 	esac
- fi
- 
--echo "$as_me:17645: checking for memmove" >&5
-+echo "$as_me:17646: checking for memmove" >&5
- echo $ECHO_N "checking for memmove... $ECHO_C" >&6
- if test "${ac_cv_func_memmove+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17651 "configure"
-+#line 17652 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char memmove (); below.  */
-@@ -17679,16 +17680,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17682: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17683: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17685: \$? = $ac_status" >&5
-+  echo "$as_me:17686: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17688: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17689: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17691: \$? = $ac_status" >&5
-+  echo "$as_me:17692: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_memmove=yes
- else
-@@ -17698,19 +17699,19 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17701: result: $ac_cv_func_memmove" >&5
-+echo "$as_me:17702: result: $ac_cv_func_memmove" >&5
- echo "${ECHO_T}$ac_cv_func_memmove" >&6
- if test $ac_cv_func_memmove = yes; then
-   :
- else
- 
--echo "$as_me:17707: checking for bcopy" >&5
-+echo "$as_me:17708: checking for bcopy" >&5
- echo $ECHO_N "checking for bcopy... $ECHO_C" >&6
- if test "${ac_cv_func_bcopy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17713 "configure"
-+#line 17714 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char bcopy (); below.  */
-@@ -17741,16 +17742,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17744: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17745: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17747: \$? = $ac_status" >&5
-+  echo "$as_me:17748: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17750: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17751: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17753: \$? = $ac_status" >&5
-+  echo "$as_me:17754: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_bcopy=yes
- else
-@@ -17760,11 +17761,11 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17763: result: $ac_cv_func_bcopy" >&5
-+echo "$as_me:17764: result: $ac_cv_func_bcopy" >&5
- echo "${ECHO_T}$ac_cv_func_bcopy" >&6
- if test $ac_cv_func_bcopy = yes; then
- 
--	echo "$as_me:17767: checking if bcopy does overlapping moves" >&5
-+	echo "$as_me:17768: checking if bcopy does overlapping moves" >&5
- echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6
- if test "${cf_cv_good_bcopy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17774,7 +17775,7 @@
-   cf_cv_good_bcopy=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17777 "configure"
-+#line 17778 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -17788,15 +17789,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17791: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17792: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17794: \$? = $ac_status" >&5
-+  echo "$as_me:17795: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17796: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17797: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17799: \$? = $ac_status" >&5
-+  echo "$as_me:17800: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_good_bcopy=yes
- else
-@@ -17809,7 +17810,7 @@
- fi
- 
- fi
--echo "$as_me:17812: result: $cf_cv_good_bcopy" >&5
-+echo "$as_me:17813: result: $cf_cv_good_bcopy" >&5
- echo "${ECHO_T}$cf_cv_good_bcopy" >&6
- 
- else
-@@ -17832,7 +17833,7 @@
- 
- fi
- 
--echo "$as_me:17835: checking if poll really works" >&5
-+echo "$as_me:17836: checking if poll really works" >&5
- echo $ECHO_N "checking if poll really works... $ECHO_C" >&6
- if test "${cf_cv_working_poll+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17842,7 +17843,7 @@
-   cf_cv_working_poll=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17845 "configure"
-+#line 17846 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -17889,15 +17890,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17892: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17893: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17895: \$? = $ac_status" >&5
-+  echo "$as_me:17896: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17897: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17898: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17900: \$? = $ac_status" >&5
-+  echo "$as_me:17901: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_working_poll=yes
- else
-@@ -17909,21 +17910,21 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:17912: result: $cf_cv_working_poll" >&5
-+echo "$as_me:17913: result: $cf_cv_working_poll" >&5
- echo "${ECHO_T}$cf_cv_working_poll" >&6
- test "$cf_cv_working_poll" = "yes" &&
- cat >>confdefs.h <<\EOF
- #define HAVE_WORKING_POLL 1
- EOF
- 
--echo "$as_me:17919: checking for va_copy" >&5
-+echo "$as_me:17920: checking for va_copy" >&5
- echo $ECHO_N "checking for va_copy... $ECHO_C" >&6
- if test "${cf_cv_have_va_copy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17926 "configure"
-+#line 17927 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -17940,16 +17941,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17943: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17944: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17946: \$? = $ac_status" >&5
-+  echo "$as_me:17947: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17949: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17950: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17952: \$? = $ac_status" >&5
-+  echo "$as_me:17953: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_va_copy=yes
- else
-@@ -17959,7 +17960,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17962: result: $cf_cv_have_va_copy" >&5
-+echo "$as_me:17963: result: $cf_cv_have_va_copy" >&5
- echo "${ECHO_T}$cf_cv_have_va_copy" >&6
- 
- test "$cf_cv_have_va_copy" = yes &&
-@@ -17967,14 +17968,14 @@
- #define HAVE_VA_COPY 1
- EOF
- 
--echo "$as_me:17970: checking for __va_copy" >&5
-+echo "$as_me:17971: checking for __va_copy" >&5
- echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6
- if test "${cf_cv_have___va_copy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17977 "configure"
-+#line 17978 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -17991,16 +17992,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17994: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17995: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17997: \$? = $ac_status" >&5
-+  echo "$as_me:17998: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18000: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18001: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18003: \$? = $ac_status" >&5
-+  echo "$as_me:18004: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have___va_copy=yes
- else
-@@ -18010,7 +18011,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:18013: result: $cf_cv_have___va_copy" >&5
-+echo "$as_me:18014: result: $cf_cv_have___va_copy" >&5
- echo "${ECHO_T}$cf_cv_have___va_copy" >&6
- 
- test "$cf_cv_have___va_copy" = yes &&
-@@ -18018,13 +18019,13 @@
- #define HAVE___VA_COPY 1
- EOF
- 
--echo "$as_me:18021: checking for pid_t" >&5
-+echo "$as_me:18022: 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 18027 "configure"
-+#line 18028 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -18039,16 +18040,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18042: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18043: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18045: \$? = $ac_status" >&5
-+  echo "$as_me:18046: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18048: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18049: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18051: \$? = $ac_status" >&5
-+  echo "$as_me:18052: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_pid_t=yes
- else
-@@ -18058,7 +18059,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:18061: result: $ac_cv_type_pid_t" >&5
-+echo "$as_me:18062: 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
-   :
-@@ -18073,23 +18074,23 @@
- for ac_header in unistd.h vfork.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:18076: checking for $ac_header" >&5
-+echo "$as_me:18077: 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 18082 "configure"
-+#line 18083 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:18086: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:18087: \"$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:18092: \$? = $ac_status" >&5
-+  echo "$as_me:18093: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -18108,7 +18109,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:18111: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:18112: 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 <&5
-+echo "$as_me:18125: 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 18130 "configure"
-+#line 18131 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -18158,16 +18159,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18161: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18162: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18164: \$? = $ac_status" >&5
-+  echo "$as_me:18165: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18167: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18168: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18170: \$? = $ac_status" >&5
-+  echo "$as_me:18171: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -18177,7 +18178,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:18180: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:18181: 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 <&5
-+  echo "$as_me:18193: 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
-@@ -18212,15 +18213,15 @@
-       }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:18215: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18216: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18218: \$? = $ac_status" >&5
-+  echo "$as_me:18219: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:18220: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18221: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18223: \$? = $ac_status" >&5
-+  echo "$as_me:18224: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_fork_works=yes
- else
-@@ -18232,7 +18233,7 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:18235: result: $ac_cv_func_fork_works" >&5
-+echo "$as_me:18236: result: $ac_cv_func_fork_works" >&5
- echo "${ECHO_T}$ac_cv_func_fork_works" >&6
- 
- fi
-@@ -18246,12 +18247,12 @@
-       ac_cv_func_fork_works=yes
-       ;;
-   esac
--  { echo "$as_me:18249: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
-+  { echo "$as_me:18250: 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:18254: checking for working vfork" >&5
-+  echo "$as_me:18255: 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
-@@ -18260,7 +18261,7 @@
-   ac_cv_func_vfork_works=cross
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18263 "configure"
-+#line 18264 "configure"
- #include "confdefs.h"
- /* Thanks to Paul Eggert for this test.  */
- #include 
-@@ -18357,15 +18358,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:18360: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18361: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18363: \$? = $ac_status" >&5
-+  echo "$as_me:18364: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:18365: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18366: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18368: \$? = $ac_status" >&5
-+  echo "$as_me:18369: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_vfork_works=yes
- else
-@@ -18377,13 +18378,13 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:18380: result: $ac_cv_func_vfork_works" >&5
-+echo "$as_me:18381: 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:18386: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
-+  { echo "$as_me:18387: 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
- 
-@@ -18410,7 +18411,7 @@
- 
- # special check for test/ditto.c
- 
--echo "$as_me:18413: checking for openpty in -lutil" >&5
-+echo "$as_me:18414: checking for openpty in -lutil" >&5
- echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
- if test "${ac_cv_lib_util_openpty+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18418,7 +18419,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lutil  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 18421 "configure"
-+#line 18422 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -18437,16 +18438,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18440: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18441: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18443: \$? = $ac_status" >&5
-+  echo "$as_me:18444: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18446: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18447: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18449: \$? = $ac_status" >&5
-+  echo "$as_me:18450: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_util_openpty=yes
- else
-@@ -18457,7 +18458,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:18460: result: $ac_cv_lib_util_openpty" >&5
-+echo "$as_me:18461: result: $ac_cv_lib_util_openpty" >&5
- echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
- if test $ac_cv_lib_util_openpty = yes; then
-   cf_cv_lib_util=yes
-@@ -18465,14 +18466,14 @@
-   cf_cv_lib_util=no
- fi
- 
--echo "$as_me:18468: checking for openpty header" >&5
-+echo "$as_me:18469: checking for openpty header" >&5
- echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
- if test "${cf_cv_func_openpty+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cf_save_LIBS="$LIBS"
--	test $cf_cv_lib_util = yes &&
-+	test $cf_cv_lib_util = yes && {
- cf_add_libs="-lutil"
- # Filter out duplicates - this happens with badly-designed ".pc" files...
- for cf_add_1lib in $LIBS
-@@ -18488,11 +18489,11 @@
- 	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
- done
- LIBS="$cf_add_libs"
--
-+ }
- 	for cf_header in pty.h libutil.h util.h
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 18495 "configure"
-+#line 18496 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -18509,16 +18510,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18512: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18513: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18515: \$? = $ac_status" >&5
-+  echo "$as_me:18516: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18518: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18519: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18521: \$? = $ac_status" >&5
-+  echo "$as_me:18522: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 		cf_cv_func_openpty=$cf_header
-@@ -18536,7 +18537,7 @@
- 	LIBS="$cf_save_LIBS"
- 
- fi
--echo "$as_me:18539: result: $cf_cv_func_openpty" >&5
-+echo "$as_me:18540: result: $cf_cv_func_openpty" >&5
- echo "${ECHO_T}$cf_cv_func_openpty" >&6
- 
- if test "$cf_cv_func_openpty" != no ; then
-@@ -18606,7 +18607,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 18609 "configure"
-+#line 18610 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -18618,16 +18619,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18621: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18622: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18624: \$? = $ac_status" >&5
-+  echo "$as_me:18625: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18627: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18628: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18630: \$? = $ac_status" >&5
-+  echo "$as_me:18631: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -18644,7 +18645,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:18647: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:18648: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -18680,7 +18681,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:18683: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:18684: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -18691,7 +18692,7 @@
- 	else
- 		case "$with_hashed_db" in
- 		(./*|../*|/*)
--			{ echo "$as_me:18694: WARNING: no such directory $with_hashed_db" >&5
-+			{ echo "$as_me:18695: WARNING: no such directory $with_hashed_db" >&5
- echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
- 			;;
- 		(*)
-@@ -18760,7 +18761,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 18763 "configure"
-+#line 18764 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -18772,16 +18773,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18775: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18776: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18778: \$? = $ac_status" >&5
-+  echo "$as_me:18779: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18781: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18782: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18784: \$? = $ac_status" >&5
-+  echo "$as_me:18785: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -18798,7 +18799,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:18801: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:18802: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -18878,7 +18879,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:18881: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:18882: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -18895,23 +18896,23 @@
- 	fi
- esac
- 
--echo "$as_me:18898: checking for db.h" >&5
-+echo "$as_me:18899: checking for db.h" >&5
- echo $ECHO_N "checking for db.h... $ECHO_C" >&6
- if test "${ac_cv_header_db_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18904 "configure"
-+#line 18905 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:18908: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:18909: \"$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:18914: \$? = $ac_status" >&5
-+  echo "$as_me:18915: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -18930,11 +18931,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:18933: result: $ac_cv_header_db_h" >&5
-+echo "$as_me:18934: result: $ac_cv_header_db_h" >&5
- echo "${ECHO_T}$ac_cv_header_db_h" >&6
- if test $ac_cv_header_db_h = yes; then
- 
--echo "$as_me:18937: checking for version of db" >&5
-+echo "$as_me:18938: checking for version of db" >&5
- echo $ECHO_N "checking for version of db... $ECHO_C" >&6
- if test "${cf_cv_hashed_db_version+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18945,10 +18946,10 @@
- for cf_db_version in 1 2 3 4 5 6
- do
- 
--echo "${as_me:-configure}:18948: testing checking for db version $cf_db_version ..." 1>&5
-+echo "${as_me:-configure}:18949: testing checking for db version $cf_db_version ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 18951 "configure"
-+#line 18952 "configure"
- #include "confdefs.h"
- 
- $ac_includes_default
-@@ -18978,16 +18979,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18981: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18982: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18984: \$? = $ac_status" >&5
-+  echo "$as_me:18985: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18987: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18988: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18990: \$? = $ac_status" >&5
-+  echo "$as_me:18991: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_hashed_db_version=$cf_db_version
-@@ -19001,16 +19002,16 @@
- done
- 
- fi
--echo "$as_me:19004: result: $cf_cv_hashed_db_version" >&5
-+echo "$as_me:19005: result: $cf_cv_hashed_db_version" >&5
- echo "${ECHO_T}$cf_cv_hashed_db_version" >&6
- 
- if test "$cf_cv_hashed_db_version" = unknown ; then
--	{ { echo "$as_me:19008: error: Cannot determine version of db" >&5
-+	{ { echo "$as_me:19009: error: Cannot determine version of db" >&5
- echo "$as_me: error: Cannot determine version of db" >&2;}
-    { (exit 1); exit 1; }; }
- else
- 
--echo "$as_me:19013: checking for db libraries" >&5
-+echo "$as_me:19014: checking for db libraries" >&5
- echo $ECHO_N "checking for db libraries... $ECHO_C" >&6
- if test "${cf_cv_hashed_db_libs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19040,10 +19041,10 @@
- 
- 	fi
- 
--echo "${as_me:-configure}:19043: testing checking for library "$cf_db_libs" ..." 1>&5
-+echo "${as_me:-configure}:19044: testing checking for library "$cf_db_libs" ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19046 "configure"
-+#line 19047 "configure"
- #include "confdefs.h"
- 
- $ac_includes_default
-@@ -19098,16 +19099,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19101: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19102: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19104: \$? = $ac_status" >&5
-+  echo "$as_me:19105: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19107: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19108: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19110: \$? = $ac_status" >&5
-+  echo "$as_me:19111: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	if test -n "$cf_db_libs" ; then
-@@ -19127,11 +19128,11 @@
- done
- 
- fi
--echo "$as_me:19130: result: $cf_cv_hashed_db_libs" >&5
-+echo "$as_me:19131: result: $cf_cv_hashed_db_libs" >&5
- echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6
- 
- 	if test "$cf_cv_hashed_db_libs" = unknown ; then
--		{ { echo "$as_me:19134: error: Cannot determine library for db" >&5
-+		{ { echo "$as_me:19135: error: Cannot determine library for db" >&5
- echo "$as_me: error: Cannot determine library for db" >&2;}
-    { (exit 1); exit 1; }; }
- 	elif test "$cf_cv_hashed_db_libs" != default ; then
-@@ -19157,7 +19158,7 @@
- 
- else
- 
--	{ { echo "$as_me:19160: error: Cannot find db.h" >&5
-+	{ { echo "$as_me:19161: error: Cannot find db.h" >&5
- echo "$as_me: error: Cannot find db.h" >&2;}
-    { (exit 1); exit 1; }; }
- 
-@@ -19172,7 +19173,7 @@
- 
- # Just in case, check if the C compiler has a bool type.
- 
--echo "$as_me:19175: checking if we should include stdbool.h" >&5
-+echo "$as_me:19176: checking if we should include stdbool.h" >&5
- echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
- 
- if test "${cf_cv_header_stdbool_h+set}" = set; then
-@@ -19180,7 +19181,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19183 "configure"
-+#line 19184 "configure"
- #include "confdefs.h"
- 
- int
-@@ -19192,23 +19193,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19195: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19196: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19198: \$? = $ac_status" >&5
-+  echo "$as_me:19199: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19201: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19202: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19204: \$? = $ac_status" >&5
-+  echo "$as_me:19205: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=0
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 19211 "configure"
-+#line 19212 "configure"
- #include "confdefs.h"
- 
- #ifndef __BEOS__
-@@ -19224,16 +19225,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19227: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19228: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19230: \$? = $ac_status" >&5
-+  echo "$as_me:19231: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19233: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19234: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19236: \$? = $ac_status" >&5
-+  echo "$as_me:19237: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=1
- else
-@@ -19247,13 +19248,13 @@
- fi
- 
- if test "$cf_cv_header_stdbool_h" = 1
--then	echo "$as_me:19250: result: yes" >&5
-+then	echo "$as_me:19251: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:19252: result: no" >&5
-+else	echo "$as_me:19253: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:19256: checking for builtin bool type" >&5
-+echo "$as_me:19257: checking for builtin bool type" >&5
- echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
- 
- if test "${cf_cv_cc_bool_type+set}" = set; then
-@@ -19261,7 +19262,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19264 "configure"
-+#line 19265 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -19276,16 +19277,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19279: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19280: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19282: \$? = $ac_status" >&5
-+  echo "$as_me:19283: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19285: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19286: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19288: \$? = $ac_status" >&5
-+  echo "$as_me:19289: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cc_bool_type=1
- else
-@@ -19298,9 +19299,9 @@
- fi
- 
- if test "$cf_cv_cc_bool_type" = 1
--then	echo "$as_me:19301: result: yes" >&5
-+then	echo "$as_me:19302: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:19303: result: no" >&5
-+else	echo "$as_me:19304: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -19314,21 +19315,67 @@
- ac_main_return=return
- 
- if test -n "$GXX" ; then
--case $cf_cv_system_name in
--(os2*)
--	cf_stdcpp_libname=stdcpp
--	;;
--(*)
--	cf_stdcpp_libname=stdc++
--	;;
--esac
--echo "$as_me:19325: checking for library $cf_stdcpp_libname" >&5
-+
-+	cf_save="$LIBS"
-+	LIBS="$LIBS $CXXLIBS"
-+	echo "$as_me:19321: checking if we already have C++ library" >&5
-+echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6
-+	cat >conftest.$ac_ext <<_ACEOF
-+#line 19324 "configure"
-+#include "confdefs.h"
-+
-+			#include 
-+int
-+main ()
-+{
-+
-+			std::cout << "Hello World!" << std::endl;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:19338: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:19341: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:19344: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:19347: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  cf_have_libstdcpp=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+cf_have_libstdcpp=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+	echo "$as_me:19356: result: $cf_have_libstdcpp" >&5
-+echo "${ECHO_T}$cf_have_libstdcpp" >&6
-+	LIBS="$cf_save"
-+
-+	if test $cf_have_libstdcpp != yes
-+	then
-+		case $cf_cv_system_name in
-+		(os2*)
-+			cf_stdcpp_libname=stdcpp
-+			;;
-+		(*)
-+			cf_stdcpp_libname=stdc++
-+			;;
-+		esac
-+
-+		echo "$as_me:19371: checking for library $cf_stdcpp_libname" >&5
- echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6
- if test "${cf_cv_libstdcpp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
--	cf_save="$LIBS"
-+			cf_save="$LIBS"
-+			LIBS="$LIBS $CXXLIBS"
- 
- cf_add_libs="-l$cf_stdcpp_libname"
- # Filter out duplicates - this happens with badly-designed ".pc" files...
-@@ -19346,33 +19393,31 @@
- done
- LIBS="$cf_add_libs"
- 
--cat >conftest.$ac_ext <<_ACEOF
--#line 19350 "configure"
-+		cat >conftest.$ac_ext <<_ACEOF
-+#line 19397 "configure"
- #include "confdefs.h"
- 
--#include 
-+				#include 
- int
- main ()
- {
- 
--char buf[80];
--strstreambuf foo(buf, sizeof(buf))
--
-+				std::cout << "Hello World!" << std::endl;
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19366: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19411: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19369: \$? = $ac_status" >&5
-+  echo "$as_me:19414: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19372: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19417: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19375: \$? = $ac_status" >&5
-+  echo "$as_me:19420: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_libstdcpp=yes
- else
-@@ -19381,12 +19426,12 @@
- cf_cv_libstdcpp=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--	LIBS="$cf_save"
-+			LIBS="$cf_save"
- 
- fi
--echo "$as_me:19387: result: $cf_cv_libstdcpp" >&5
-+echo "$as_me:19432: result: $cf_cv_libstdcpp" >&5
- echo "${ECHO_T}$cf_cv_libstdcpp" >&6
--test "$cf_cv_libstdcpp" = yes &&
-+		test "$cf_cv_libstdcpp" = yes && {
- cf_add_libs="-l$cf_stdcpp_libname"
- # Filter out duplicates - this happens with badly-designed ".pc" files...
- for cf_add_1lib in $CXXLIBS
-@@ -19402,10 +19447,11 @@
- 	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
- done
- CXXLIBS="$cf_add_libs"
--
-+ }
-+	fi
- fi
- 
--	echo "$as_me:19408: checking whether $CXX understands -c and -o together" >&5
-+	echo "$as_me:19454: checking whether $CXX understands -c and -o together" >&5
- echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6
- if test "${cf_cv_prog_CXX_c_o+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19421,15 +19467,15 @@
- # We do the test twice because some compilers refuse to overwrite an
- # existing .o file with -o, though they will create one.
- ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
--if { (eval echo "$as_me:19424: \"$ac_try\"") >&5
-+if { (eval echo "$as_me:19470: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19427: \$? = $ac_status" >&5
-+  echo "$as_me:19473: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--  test -f conftest2.$ac_objext && { (eval echo "$as_me:19429: \"$ac_try\"") >&5
-+  test -f conftest2.$ac_objext && { (eval echo "$as_me:19475: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19432: \$? = $ac_status" >&5
-+  echo "$as_me:19478: \$? = $ac_status" >&5
-   (exit $ac_status); };
- then
-   eval cf_cv_prog_CXX_c_o=yes
-@@ -19440,10 +19486,10 @@
- 
- fi
- if test $cf_cv_prog_CXX_c_o = yes; then
--  echo "$as_me:19443: result: yes" >&5
-+  echo "$as_me:19489: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--  echo "$as_me:19446: result: no" >&5
-+  echo "$as_me:19492: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -19463,7 +19509,7 @@
- 	;;
- esac
- if test "$GXX" = yes; then
--	echo "$as_me:19466: checking for lib$cf_gpp_libname" >&5
-+	echo "$as_me:19512: checking for lib$cf_gpp_libname" >&5
- echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
- 	cf_save="$LIBS"
- 
-@@ -19484,7 +19530,7 @@
- LIBS="$cf_add_libs"
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19487 "configure"
-+#line 19533 "configure"
- #include "confdefs.h"
- 
- #include <$cf_gpp_libname/builtin.h>
-@@ -19498,16 +19544,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19501: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19547: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19504: \$? = $ac_status" >&5
-+  echo "$as_me:19550: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19507: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19553: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19510: \$? = $ac_status" >&5
-+  echo "$as_me:19556: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cxx_library=yes
- 
-@@ -19544,7 +19590,7 @@
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 19547 "configure"
-+#line 19593 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -19558,16 +19604,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19561: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19607: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19564: \$? = $ac_status" >&5
-+  echo "$as_me:19610: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19567: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19613: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19570: \$? = $ac_status" >&5
-+  echo "$as_me:19616: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cxx_library=yes
- 
-@@ -19600,7 +19646,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	LIBS="$cf_save"
--	echo "$as_me:19603: result: $cf_cxx_library" >&5
-+	echo "$as_me:19649: result: $cf_cxx_library" >&5
- echo "${ECHO_T}$cf_cxx_library" >&6
- fi
- 
-@@ -19616,7 +19662,7 @@
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- ac_main_return=return
--echo "$as_me:19619: checking how to run the C++ preprocessor" >&5
-+echo "$as_me:19665: checking how to run the C++ preprocessor" >&5
- echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
- if test -z "$CXXCPP"; then
-   if test "${ac_cv_prog_CXXCPP+set}" = set; then
-@@ -19633,18 +19679,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19636 "configure"
-+#line 19682 "configure"
- #include "confdefs.h"
- #include 
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:19641: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19687: \"$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:19647: \$? = $ac_status" >&5
-+  echo "$as_me:19693: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19667,17 +19713,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19670 "configure"
-+#line 19716 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:19674: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19720: \"$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:19680: \$? = $ac_status" >&5
-+  echo "$as_me:19726: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19714,7 +19760,7 @@
- else
-   ac_cv_prog_CXXCPP=$CXXCPP
- fi
--echo "$as_me:19717: result: $CXXCPP" >&5
-+echo "$as_me:19763: result: $CXXCPP" >&5
- echo "${ECHO_T}$CXXCPP" >&6
- ac_preproc_ok=false
- for ac_cxx_preproc_warn_flag in '' yes
-@@ -19724,18 +19770,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19727 "configure"
-+#line 19773 "configure"
- #include "confdefs.h"
- #include 
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:19732: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19778: \"$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:19738: \$? = $ac_status" >&5
-+  echo "$as_me:19784: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19758,17 +19804,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19761 "configure"
-+#line 19807 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:19765: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19811: \"$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:19771: \$? = $ac_status" >&5
-+  echo "$as_me:19817: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19796,7 +19842,7 @@
- if $ac_preproc_ok; then
-   :
- else
--  { { echo "$as_me:19799: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
-+  { { echo "$as_me:19845: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
- echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -19811,23 +19857,23 @@
- for ac_header in typeinfo
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:19814: checking for $ac_header" >&5
-+echo "$as_me:19860: 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 19820 "configure"
-+#line 19866 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:19824: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19870: \"$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:19830: \$? = $ac_status" >&5
-+  echo "$as_me:19876: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19846,7 +19892,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:19849: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:19895: 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 <&5
-+echo "$as_me:19908: 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 19868 "configure"
-+#line 19914 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:19872: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19918: \"$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:19878: \$? = $ac_status" >&5
-+  echo "$as_me:19924: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19894,7 +19940,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:19897: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:19943: 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 <&5
-+	echo "$as_me:19954: checking if iostream uses std-namespace" >&5
- echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19911 "configure"
-+#line 19957 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -19925,16 +19971,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19928: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19974: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19931: \$? = $ac_status" >&5
-+  echo "$as_me:19977: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19934: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19980: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19937: \$? = $ac_status" >&5
-+  echo "$as_me:19983: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_iostream_namespace=yes
- else
-@@ -19943,7 +19989,7 @@
- cf_iostream_namespace=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:19946: result: $cf_iostream_namespace" >&5
-+	echo "$as_me:19992: result: $cf_iostream_namespace" >&5
- echo "${ECHO_T}$cf_iostream_namespace" >&6
- 	if test "$cf_iostream_namespace" = yes ; then
- 
-@@ -19954,7 +20000,7 @@
- 	fi
- fi
- 
--echo "$as_me:19957: checking if we should include stdbool.h" >&5
-+echo "$as_me:20003: checking if we should include stdbool.h" >&5
- echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
- 
- if test "${cf_cv_header_stdbool_h+set}" = set; then
-@@ -19962,7 +20008,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19965 "configure"
-+#line 20011 "configure"
- #include "confdefs.h"
- 
- int
-@@ -19974,23 +20020,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19977: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20023: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19980: \$? = $ac_status" >&5
-+  echo "$as_me:20026: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19983: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20029: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19986: \$? = $ac_status" >&5
-+  echo "$as_me:20032: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=0
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 19993 "configure"
-+#line 20039 "configure"
- #include "confdefs.h"
- 
- #ifndef __BEOS__
-@@ -20006,16 +20052,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20009: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20055: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20012: \$? = $ac_status" >&5
-+  echo "$as_me:20058: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20015: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20061: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20018: \$? = $ac_status" >&5
-+  echo "$as_me:20064: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=1
- else
-@@ -20029,13 +20075,13 @@
- fi
- 
- if test "$cf_cv_header_stdbool_h" = 1
--then	echo "$as_me:20032: result: yes" >&5
-+then	echo "$as_me:20078: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:20034: result: no" >&5
-+else	echo "$as_me:20080: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:20038: checking for builtin bool type" >&5
-+echo "$as_me:20084: checking for builtin bool type" >&5
- echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
- 
- if test "${cf_cv_builtin_bool+set}" = set; then
-@@ -20043,7 +20089,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 20046 "configure"
-+#line 20092 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -20058,16 +20104,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20061: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20107: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20064: \$? = $ac_status" >&5
-+  echo "$as_me:20110: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20067: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20113: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20070: \$? = $ac_status" >&5
-+  echo "$as_me:20116: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_builtin_bool=1
- else
-@@ -20080,13 +20126,13 @@
- fi
- 
- if test "$cf_cv_builtin_bool" = 1
--then	echo "$as_me:20083: result: yes" >&5
-+then	echo "$as_me:20129: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:20085: result: no" >&5
-+else	echo "$as_me:20131: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:20089: checking for size of bool" >&5
-+echo "$as_me:20135: checking for size of bool" >&5
- echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
- if test "${cf_cv_type_of_bool+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20097,7 +20143,7 @@
-   cf_cv_type_of_bool=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20100 "configure"
-+#line 20146 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -20139,15 +20185,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20142: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20188: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20145: \$? = $ac_status" >&5
-+  echo "$as_me:20191: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20147: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20193: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20150: \$? = $ac_status" >&5
-+  echo "$as_me:20196: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_of_bool=`cat cf_test.out`
- 		 if test -z "$cf_cv_type_of_bool"; then
-@@ -20165,18 +20211,18 @@
- fi
- 
- 	rm -f cf_test.out
--echo "$as_me:20168: result: $cf_cv_type_of_bool" >&5
-+echo "$as_me:20214: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- if test "$cf_cv_type_of_bool" = unknown ; then
- 	case .$NCURSES_BOOL in
- 	(.auto|.) NCURSES_BOOL=unsigned;;
- 	esac
--	{ echo "$as_me:20174: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-+	{ echo "$as_me:20220: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
- echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
- 	cf_cv_type_of_bool=$NCURSES_BOOL
- fi
- 
--echo "$as_me:20179: checking for special defines needed for etip.h" >&5
-+echo "$as_me:20225: checking for special defines needed for etip.h" >&5
- echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6
- cf_save_CXXFLAGS="$CXXFLAGS"
- cf_result="none"
-@@ -20194,7 +20240,7 @@
- 	test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}"
- 	test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
- cat >conftest.$ac_ext <<_ACEOF
--#line 20197 "configure"
-+#line 20243 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -20208,16 +20254,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20211: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20257: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20214: \$? = $ac_status" >&5
-+  echo "$as_me:20260: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20217: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20263: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20220: \$? = $ac_status" >&5
-+  echo "$as_me:20266: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	test -n "$cf_math" && cat >>confdefs.h <&5
-+echo "$as_me:20287: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- CXXFLAGS="$cf_save_CXXFLAGS"
- 
- if test -n "$CXX"; then
--echo "$as_me:20246: checking if $CXX accepts parameter initialization" >&5
-+echo "$as_me:20292: checking if $CXX accepts parameter initialization" >&5
- echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6
- if test "${cf_cv_cpp_param_init+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20260,7 +20306,7 @@
-   cf_cv_cpp_param_init=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20263 "configure"
-+#line 20309 "configure"
- #include "confdefs.h"
- 
- class TEST {
-@@ -20279,15 +20325,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20282: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20328: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20285: \$? = $ac_status" >&5
-+  echo "$as_me:20331: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20287: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20333: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20290: \$? = $ac_status" >&5
-+  echo "$as_me:20336: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cpp_param_init=yes
- else
-@@ -20306,7 +20352,7 @@
- ac_main_return=return
- 
- fi
--echo "$as_me:20309: result: $cf_cv_cpp_param_init" >&5
-+echo "$as_me:20355: result: $cf_cv_cpp_param_init" >&5
- echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
- fi
- test "$cf_cv_cpp_param_init" = yes &&
-@@ -20316,7 +20362,7 @@
- 
- if test -n "$CXX"; then
- 
--echo "$as_me:20319: checking if $CXX accepts static_cast" >&5
-+echo "$as_me:20365: checking if $CXX accepts static_cast" >&5
- echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6
- if test "${cf_cv_cpp_static_cast+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20330,7 +20376,7 @@
- ac_main_return=return
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 20333 "configure"
-+#line 20379 "configure"
- #include "confdefs.h"
- 
- class NCursesPanel
-@@ -20374,16 +20420,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20377: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20423: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20380: \$? = $ac_status" >&5
-+  echo "$as_me:20426: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20383: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20429: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20386: \$? = $ac_status" >&5
-+  echo "$as_me:20432: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cpp_static_cast=yes
- else
-@@ -20401,7 +20447,7 @@
- ac_main_return=return
- 
- fi
--echo "$as_me:20404: result: $cf_cv_cpp_static_cast" >&5
-+echo "$as_me:20450: result: $cf_cv_cpp_static_cast" >&5
- echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
- 
- fi
-@@ -20450,7 +20496,7 @@
- 	else
- 		if test "$cf_cv_header_stdbool_h" = 1 ; then
- 
--echo "$as_me:20453: checking for size of bool" >&5
-+echo "$as_me:20499: checking for size of bool" >&5
- echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
- if test "${cf_cv_type_of_bool+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20461,7 +20507,7 @@
-   cf_cv_type_of_bool=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20464 "configure"
-+#line 20510 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -20503,15 +20549,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20506: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20552: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20509: \$? = $ac_status" >&5
-+  echo "$as_me:20555: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20511: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20557: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20514: \$? = $ac_status" >&5
-+  echo "$as_me:20560: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_of_bool=`cat cf_test.out`
- 		 if test -z "$cf_cv_type_of_bool"; then
-@@ -20529,25 +20575,25 @@
- fi
- 
- 	rm -f cf_test.out
--echo "$as_me:20532: result: $cf_cv_type_of_bool" >&5
-+echo "$as_me:20578: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- if test "$cf_cv_type_of_bool" = unknown ; then
- 	case .$NCURSES_BOOL in
- 	(.auto|.) NCURSES_BOOL=unsigned;;
- 	esac
--	{ echo "$as_me:20538: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-+	{ echo "$as_me:20584: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
- echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
- 	cf_cv_type_of_bool=$NCURSES_BOOL
- fi
- 
- 		else
--			echo "$as_me:20544: checking for fallback type of bool" >&5
-+			echo "$as_me:20590: checking for fallback type of bool" >&5
- echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
- 			case "$host_cpu" in
- 			(i?86)	cf_cv_type_of_bool=char	;;
- 			(*)	cf_cv_type_of_bool=int	;;
- 			esac
--			echo "$as_me:20550: result: $cf_cv_type_of_bool" >&5
-+			echo "$as_me:20596: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- 		fi
- 	fi
-@@ -20576,7 +20622,7 @@
- 
- 	if test "$cf_with_ada" != "no" ; then
- 		if test "$with_libtool" != "no"; then
--			{ echo "$as_me:20579: WARNING: libtool does not support Ada - disabling feature" >&5
-+			{ echo "$as_me:20625: WARNING: libtool does not support Ada - disabling feature" >&5
- echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
- 			cf_with_ada=no
- 		fi
-@@ -20587,7 +20633,7 @@
- cf_ada_make=gnatmake
- # Extract the first word of "$cf_ada_make", so it can be a program name with args.
- set dummy $cf_ada_make; ac_word=$2
--echo "$as_me:20590: checking for $ac_word" >&5
-+echo "$as_me:20636: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_gnat_exists+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20602,7 +20648,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_gnat_exists="yes"
--echo "$as_me:20605: found $ac_dir/$ac_word" >&5
-+echo "$as_me:20651: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -20611,10 +20657,10 @@
- fi
- gnat_exists=$ac_cv_prog_gnat_exists
- if test -n "$gnat_exists"; then
--  echo "$as_me:20614: result: $gnat_exists" >&5
-+  echo "$as_me:20660: result: $gnat_exists" >&5
- echo "${ECHO_T}$gnat_exists" >&6
- else
--  echo "$as_me:20617: result: no" >&5
-+  echo "$as_me:20663: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -20623,12 +20669,12 @@
- 	cf_cv_prog_gnat_correct=no
- else
- 
--echo "$as_me:20626: checking for gnat version" >&5
-+echo "$as_me:20672: checking for gnat version" >&5
- echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
- cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
- 	grep '[0-9].[0-9][0-9]*' |\
- 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
--echo "$as_me:20631: result: $cf_gnat_version" >&5
-+echo "$as_me:20677: result: $cf_gnat_version" >&5
- echo "${ECHO_T}$cf_gnat_version" >&6
- 
- case $cf_gnat_version in
-@@ -20636,7 +20682,7 @@
- 	cf_cv_prog_gnat_correct=yes
- 	;;
- (*)
--	{ echo "$as_me:20639: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
-+	{ echo "$as_me:20685: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
- echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
- 	cf_cv_prog_gnat_correct=no
- 	;;
-@@ -20644,7 +20690,7 @@
- 
- 	# Extract the first word of "m4", so it can be a program name with args.
- set dummy m4; ac_word=$2
--echo "$as_me:20647: checking for $ac_word" >&5
-+echo "$as_me:20693: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_M4_exists+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20659,7 +20705,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_M4_exists="yes"
--echo "$as_me:20662: found $ac_dir/$ac_word" >&5
-+echo "$as_me:20708: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -20668,10 +20714,10 @@
- fi
- M4_exists=$ac_cv_prog_M4_exists
- if test -n "$M4_exists"; then
--  echo "$as_me:20671: result: $M4_exists" >&5
-+  echo "$as_me:20717: result: $M4_exists" >&5
- echo "${ECHO_T}$M4_exists" >&6
- else
--  echo "$as_me:20674: result: no" >&5
-+  echo "$as_me:20720: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -20680,7 +20726,7 @@
- 		echo Ada95 binding required program m4 not found. Ada95 binding disabled.
- 	fi
- 	if test "$cf_cv_prog_gnat_correct" = yes; then
--		echo "$as_me:20683: checking if GNAT works" >&5
-+		echo "$as_me:20729: checking if GNAT works" >&5
- echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
- 
- rm -rf conftest* *~conftest*
-@@ -20708,7 +20754,7 @@
- fi
- rm -rf conftest* *~conftest*
- 
--		echo "$as_me:20711: result: $cf_cv_prog_gnat_correct" >&5
-+		echo "$as_me:20757: result: $cf_cv_prog_gnat_correct" >&5
- echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
- 	fi
- fi
-@@ -20717,7 +20763,7 @@
- 
-  	ADAFLAGS="$ADAFLAGS -gnatpn"
- 
--	echo "$as_me:20720: checking optimization options for ADAFLAGS" >&5
-+	echo "$as_me:20766: checking optimization options for ADAFLAGS" >&5
- echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
- 	case "$CFLAGS" in
- 	(*-g*)
-@@ -20734,10 +20780,10 @@
- 
- 		;;
- 	esac
--	echo "$as_me:20737: result: $ADAFLAGS" >&5
-+	echo "$as_me:20783: result: $ADAFLAGS" >&5
- echo "${ECHO_T}$ADAFLAGS" >&6
- 
--echo "$as_me:20740: checking if GNATPREP supports -T option" >&5
-+echo "$as_me:20786: checking if GNATPREP supports -T option" >&5
- echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
- if test "${cf_cv_gnatprep_opt_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20747,11 +20793,11 @@
- gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
- 
- fi
--echo "$as_me:20750: result: $cf_cv_gnatprep_opt_t" >&5
-+echo "$as_me:20796: result: $cf_cv_gnatprep_opt_t" >&5
- echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
- test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
- 
--echo "$as_me:20754: checking if GNAT supports generics" >&5
-+echo "$as_me:20800: checking if GNAT supports generics" >&5
- echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
- case $cf_gnat_version in
- (3.[1-9]*|[4-9].*)
-@@ -20761,7 +20807,7 @@
- 	cf_gnat_generics=no
- 	;;
- esac
--echo "$as_me:20764: result: $cf_gnat_generics" >&5
-+echo "$as_me:20810: result: $cf_gnat_generics" >&5
- echo "${ECHO_T}$cf_gnat_generics" >&6
- 
- if test "$cf_gnat_generics" = yes
-@@ -20773,7 +20819,7 @@
- 	cf_generic_objects=
- fi
- 
--echo "$as_me:20776: checking if GNAT supports SIGINT" >&5
-+echo "$as_me:20822: checking if GNAT supports SIGINT" >&5
- echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
- if test "${cf_cv_gnat_sigint+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20821,7 +20867,7 @@
- rm -rf conftest* *~conftest*
- 
- fi
--echo "$as_me:20824: result: $cf_cv_gnat_sigint" >&5
-+echo "$as_me:20870: result: $cf_cv_gnat_sigint" >&5
- echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
- 
- if test $cf_cv_gnat_sigint = yes ; then
-@@ -20834,7 +20880,7 @@
- cf_gnat_projects=no
- 
- if test "$enable_gnat_projects" != no ; then
--echo "$as_me:20837: checking if GNAT supports project files" >&5
-+echo "$as_me:20883: checking if GNAT supports project files" >&5
- echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
- case $cf_gnat_version in
- (3.[0-9]*)
-@@ -20894,15 +20940,15 @@
- 	esac
- 	;;
- esac
--echo "$as_me:20897: result: $cf_gnat_projects" >&5
-+echo "$as_me:20943: result: $cf_gnat_projects" >&5
- echo "${ECHO_T}$cf_gnat_projects" >&6
- fi # enable_gnat_projects
- 
- if test $cf_gnat_projects = yes
- then
--	echo "$as_me:20903: checking if GNAT supports libraries" >&5
-+	echo "$as_me:20949: checking if GNAT supports libraries" >&5
- echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
--	echo "$as_me:20905: result: $cf_gnat_libraries" >&5
-+	echo "$as_me:20951: result: $cf_gnat_libraries" >&5
- echo "${ECHO_T}$cf_gnat_libraries" >&6
- fi
- 
-@@ -20922,7 +20968,7 @@
- 	USE_GNAT_LIBRARIES="#"
- fi
- 
--echo "$as_me:20925: checking for ada-compiler" >&5
-+echo "$as_me:20971: checking for ada-compiler" >&5
- echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
- 
- # Check whether --with-ada-compiler or --without-ada-compiler was given.
-@@ -20933,12 +20979,12 @@
-   cf_ada_compiler=gnatmake
- fi;
- 
--echo "$as_me:20936: result: $cf_ada_compiler" >&5
-+echo "$as_me:20982: result: $cf_ada_compiler" >&5
- echo "${ECHO_T}$cf_ada_compiler" >&6
- 
- 			cf_ada_package=terminal_interface
- 
--echo "$as_me:20941: checking for ada-include" >&5
-+echo "$as_me:20987: checking for ada-include" >&5
- echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
- 
- # Check whether --with-ada-include or --without-ada-include was given.
-@@ -20974,7 +21020,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:20977: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:21023: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -20983,10 +21029,10 @@
- fi
- eval ADA_INCLUDE="$withval"
- 
--echo "$as_me:20986: result: $ADA_INCLUDE" >&5
-+echo "$as_me:21032: result: $ADA_INCLUDE" >&5
- echo "${ECHO_T}$ADA_INCLUDE" >&6
- 
--echo "$as_me:20989: checking for ada-objects" >&5
-+echo "$as_me:21035: checking for ada-objects" >&5
- echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
- 
- # Check whether --with-ada-objects or --without-ada-objects was given.
-@@ -21022,7 +21068,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:21025: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:21071: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -21031,10 +21077,10 @@
- fi
- eval ADA_OBJECTS="$withval"
- 
--echo "$as_me:21034: result: $ADA_OBJECTS" >&5
-+echo "$as_me:21080: result: $ADA_OBJECTS" >&5
- echo "${ECHO_T}$ADA_OBJECTS" >&6
- 
--echo "$as_me:21037: checking if an Ada95 shared-library should be built" >&5
-+echo "$as_me:21083: checking if an Ada95 shared-library should be built" >&5
- echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
- 
- # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
-@@ -21044,7 +21090,7 @@
- else
-   with_ada_sharedlib=no
- fi;
--echo "$as_me:21047: result: $with_ada_sharedlib" >&5
-+echo "$as_me:21093: result: $with_ada_sharedlib" >&5
- echo "${ECHO_T}$with_ada_sharedlib" >&6
- 
- ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
-@@ -21067,13 +21113,13 @@
- 
- # do this "late" to avoid conflict with header-checks
- if test "x$with_widec" = xyes ; then
--	echo "$as_me:21070: checking for wchar_t" >&5
-+	echo "$as_me:21116: checking for wchar_t" >&5
- echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6
- if test "${ac_cv_type_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 21076 "configure"
-+#line 21122 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21088,16 +21134,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21091: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21137: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21094: \$? = $ac_status" >&5
-+  echo "$as_me:21140: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21097: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21143: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21100: \$? = $ac_status" >&5
-+  echo "$as_me:21146: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_wchar_t=yes
- else
-@@ -21107,10 +21153,10 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:21110: result: $ac_cv_type_wchar_t" >&5
-+echo "$as_me:21156: result: $ac_cv_type_wchar_t" >&5
- echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
- 
--echo "$as_me:21113: checking size of wchar_t" >&5
-+echo "$as_me:21159: checking size of wchar_t" >&5
- echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6
- if test "${ac_cv_sizeof_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -21119,7 +21165,7 @@
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
--#line 21122 "configure"
-+#line 21168 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21131,21 +21177,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21134: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21180: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21137: \$? = $ac_status" >&5
-+  echo "$as_me:21183: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21140: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21186: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21143: \$? = $ac_status" >&5
-+  echo "$as_me:21189: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=0 ac_mid=0
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 21148 "configure"
-+#line 21194 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21157,16 +21203,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21160: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21206: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21163: \$? = $ac_status" >&5
-+  echo "$as_me:21209: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21166: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21212: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21169: \$? = $ac_status" >&5
-+  echo "$as_me:21215: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid; break
- else
-@@ -21182,7 +21228,7 @@
- ac_hi=-1 ac_mid=-1
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 21185 "configure"
-+#line 21231 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21194,16 +21240,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21197: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21243: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21200: \$? = $ac_status" >&5
-+  echo "$as_me:21246: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21203: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21249: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21206: \$? = $ac_status" >&5
-+  echo "$as_me:21252: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=$ac_mid; break
- else
-@@ -21219,7 +21265,7 @@
- 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 21222 "configure"
-+#line 21268 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21231,16 +21277,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21234: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21280: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21237: \$? = $ac_status" >&5
-+  echo "$as_me:21283: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21240: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21286: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21243: \$? = $ac_status" >&5
-+  echo "$as_me:21289: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid
- else
-@@ -21253,12 +21299,12 @@
- ac_cv_sizeof_wchar_t=$ac_lo
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:21256: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:21302: 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 21261 "configure"
-+#line 21307 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21274,15 +21320,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:21277: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21323: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:21280: \$? = $ac_status" >&5
-+  echo "$as_me:21326: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:21282: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21328: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21285: \$? = $ac_status" >&5
-+  echo "$as_me:21331: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_wchar_t=`cat conftest.val`
- else
-@@ -21298,7 +21344,7 @@
-   ac_cv_sizeof_wchar_t=0
- fi
- fi
--echo "$as_me:21301: result: $ac_cv_sizeof_wchar_t" >&5
-+echo "$as_me:21347: result: $ac_cv_sizeof_wchar_t" >&5
- echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
- cat >>confdefs.h <&5
-+echo "$as_me:21365: checking for library subsets" >&5
- echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
- LIB_SUBSETS=
- 
-@@ -21358,7 +21404,7 @@
- test "x$with_widec"     = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
- test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
- 
--echo "$as_me:21361: result: $LIB_SUBSETS" >&5
-+echo "$as_me:21407: result: $LIB_SUBSETS" >&5
- echo "${ECHO_T}$LIB_SUBSETS" >&6
- 
- ### Construct the list of include-directories to be generated
-@@ -21389,7 +21435,7 @@
- fi
- 
- ### Build up pieces for makefile rules
--echo "$as_me:21392: checking default library suffix" >&5
-+echo "$as_me:21438: checking default library suffix" >&5
- echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -21400,10 +21446,10 @@
- 	(shared)  DFT_ARG_SUFFIX=''   ;;
- 	esac
- 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
--echo "$as_me:21403: result: $DFT_ARG_SUFFIX" >&5
-+echo "$as_me:21449: result: $DFT_ARG_SUFFIX" >&5
- echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
- 
--echo "$as_me:21406: checking default library-dependency suffix" >&5
-+echo "$as_me:21452: checking default library-dependency suffix" >&5
- echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
- 
- 	case X$DFT_LWR_MODEL in
-@@ -21461,10 +21507,10 @@
- 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
- 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
- 	fi
--echo "$as_me:21464: result: $DFT_DEP_SUFFIX" >&5
-+echo "$as_me:21510: result: $DFT_DEP_SUFFIX" >&5
- echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
- 
--echo "$as_me:21467: checking default object directory" >&5
-+echo "$as_me:21513: checking default object directory" >&5
- echo $ECHO_N "checking default object directory... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -21480,11 +21526,11 @@
- 			DFT_OBJ_SUBDIR='obj_s' ;;
- 		esac
- 	esac
--echo "$as_me:21483: result: $DFT_OBJ_SUBDIR" >&5
-+echo "$as_me:21529: result: $DFT_OBJ_SUBDIR" >&5
- echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
- 
- if test "x$cf_with_cxx" = xyes ; then
--echo "$as_me:21487: checking c++ library-dependency suffix" >&5
-+echo "$as_me:21533: checking c++ library-dependency suffix" >&5
- echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
- if test "$with_libtool" != "no"; then
- 	# libtool thinks it can make c++ shared libraries (perhaps only g++)
-@@ -21552,7 +21598,7 @@
- 	fi
- 
- fi
--echo "$as_me:21555: result: $CXX_LIB_SUFFIX" >&5
-+echo "$as_me:21601: result: $CXX_LIB_SUFFIX" >&5
- echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
- 
- fi
-@@ -21725,19 +21771,19 @@
- 
- if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
- then
--	echo "$as_me:21728: checking if linker supports switching between static/dynamic" >&5
-+	echo "$as_me:21774: checking if linker supports switching between static/dynamic" >&5
- echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6
- 
- 	rm -f libconftest.a
- 	cat >conftest.$ac_ext <
- int cf_ldflags_static(FILE *fp) { return fflush(fp); }
- EOF
--	if { (eval echo "$as_me:21737: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:21783: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21740: \$? = $ac_status" >&5
-+  echo "$as_me:21786: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 		( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null
- 		( eval $RANLIB libconftest.a ) 2>&5 >/dev/null
-@@ -21748,10 +21794,10 @@
- 
- 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 21751 "configure"
-+#line 21797 "configure"
- #include "confdefs.h"
- 
--#line 21754 "configure"
-+#line 21800 "configure"
- #include 
- int cf_ldflags_static(FILE *fp);
- 
-@@ -21766,16 +21812,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:21769: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21815: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:21772: \$? = $ac_status" >&5
-+  echo "$as_me:21818: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:21775: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21821: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21778: \$? = $ac_status" >&5
-+  echo "$as_me:21824: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	# some linkers simply ignore the -dynamic
-@@ -21798,7 +21844,7 @@
- 	rm -f libconftest.*
- 	LIBS="$cf_save_LIBS"
- 
--	echo "$as_me:21801: result: $cf_ldflags_static" >&5
-+	echo "$as_me:21847: result: $cf_ldflags_static" >&5
- echo "${ECHO_T}$cf_ldflags_static" >&6
- 
- 	if test $cf_ldflags_static != yes
-@@ -21814,7 +21860,7 @@
- 	;;
- esac
- 
--echo "$as_me:21817: checking where we will install curses.h" >&5
-+echo "$as_me:21863: checking where we will install curses.h" >&5
- echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
- 
- includesubdir=
-@@ -21824,7 +21870,7 @@
- then
- 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
- fi
--echo "$as_me:21827: result: ${includedir}${includesubdir}" >&5
-+echo "$as_me:21873: result: ${includedir}${includesubdir}" >&5
- echo "${ECHO_T}${includedir}${includesubdir}" >&6
- 
- ### Resolve a conflict between normal and wide-curses by forcing applications
-@@ -21832,7 +21878,7 @@
- if test "$with_overwrite" != no ; then
- if test "$NCURSES_LIBUTF8" = 1 ; then
- 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
--	{ echo "$as_me:21835: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
-+	{ echo "$as_me:21881: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
- echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
- fi
- fi
-@@ -21850,7 +21896,7 @@
- ### Construct the list of subdirectories for which we'll customize makefiles
- ### with the appropriate compile-rules.
- 
--echo "$as_me:21853: checking for src modules" >&5
-+echo "$as_me:21899: checking for src modules" >&5
- echo $ECHO_N "checking for src modules... $ECHO_C" >&6
- 
- # dependencies and linker-arguments for test-programs
-@@ -21915,7 +21961,7 @@
- 		fi
- 	fi
- done
--echo "$as_me:21918: result: $cf_cv_src_modules" >&5
-+echo "$as_me:21964: result: $cf_cv_src_modules" >&5
- echo "${ECHO_T}$cf_cv_src_modules" >&6
- 
- TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
-@@ -22135,7 +22181,7 @@
- 
- # Extract the first word of "tic", so it can be a program name with args.
- set dummy tic; ac_word=$2
--echo "$as_me:22138: checking for $ac_word" >&5
-+echo "$as_me:22184: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_TIC_PATH+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -22152,7 +22198,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   if $as_executable_p "$ac_dir/$ac_word"; then
-    ac_cv_path_TIC_PATH="$ac_dir/$ac_word"
--   echo "$as_me:22155: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:22201: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -22164,10 +22210,10 @@
- TIC_PATH=$ac_cv_path_TIC_PATH
- 
- if test -n "$TIC_PATH"; then
--  echo "$as_me:22167: result: $TIC_PATH" >&5
-+  echo "$as_me:22213: result: $TIC_PATH" >&5
- echo "${ECHO_T}$TIC_PATH" >&6
- else
--  echo "$as_me:22170: result: no" >&5
-+  echo "$as_me:22216: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -22175,7 +22221,7 @@
- then
- 	if test "$TIC_PATH" = unknown
- 	then
--		{ echo "$as_me:22178: WARNING: no tic program found for fallbacks" >&5
-+		{ echo "$as_me:22224: WARNING: no tic program found for fallbacks" >&5
- echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
- 	fi
- fi
-@@ -22201,7 +22247,7 @@
- 	(*-D_XOPEN_SOURCE_EXTENDED*)
- 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
- 
--echo "${as_me:-configure}:22204: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
-+echo "${as_me:-configure}:22250: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
- 
- 		CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
- 		CPPFLAGS=`echo "x$CPPFLAGS" | sed -e  's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'`
-@@ -22212,7 +22258,7 @@
- 
- # Help to automatically enable the extended curses features when using either
- # the *-config or the ".pc" files by adding defines.
--echo "$as_me:22215: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
-+echo "$as_me:22261: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
- echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6
- PKG_CFLAGS=
- for cf_loop1 in $CPPFLAGS_after_XOPEN
-@@ -22228,7 +22274,7 @@
- 	done
- 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
- done
--echo "$as_me:22231: result: $PKG_CFLAGS" >&5
-+echo "$as_me:22277: result: $PKG_CFLAGS" >&5
- echo "${ECHO_T}$PKG_CFLAGS" >&6
- 
- # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
-@@ -22285,7 +22331,7 @@
- 	cf_filter_syms=$cf_dft_filter_syms
- 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_version" 1>&6
- 
--echo "${as_me:-configure}:22288: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
-+echo "${as_me:-configure}:22334: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
- 
- fi
- 
-@@ -22387,7 +22433,7 @@
- : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ echo "$as_me:22390: creating $CONFIG_STATUS" >&5
-+{ echo "$as_me:22436: creating $CONFIG_STATUS" >&5
- echo "$as_me: creating $CONFIG_STATUS" >&6;}
- cat >$CONFIG_STATUS <<_ACEOF
- #! $SHELL
-@@ -22563,7 +22609,7 @@
-     echo "$ac_cs_version"; exit 0 ;;
-   --he | --h)
-     # Conflict between --help and --header
--    { { echo "$as_me:22566: error: ambiguous option: $1
-+    { { echo "$as_me:22612: 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;}
-@@ -22582,7 +22628,7 @@
-     ac_need_defaults=false;;
- 
-   # This is an error.
--  -*) { { echo "$as_me:22585: error: unrecognized option: $1
-+  -*) { { echo "$as_me:22631: 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;}
-@@ -22700,7 +22746,7 @@
-   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
--  *) { { echo "$as_me:22703: error: invalid argument: $ac_config_target" >&5
-+  *) { { echo "$as_me:22749: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
-@@ -23155,7 +23201,7 @@
-   esac
- 
-   if test x"$ac_file" != x-; then
--    { echo "$as_me:23158: creating $ac_file" >&5
-+    { echo "$as_me:23204: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
-     rm -f "$ac_file"
-   fi
-@@ -23173,7 +23219,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:23176: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:23222: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -23186,7 +23232,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:23189: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:23235: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -23202,7 +23248,7 @@
-       if test -n "$ac_seen"; then
-         ac_used=`grep '@datarootdir@' $ac_item`
-         if test -z "$ac_used"; then
--          { echo "$as_me:23205: WARNING: datarootdir was used implicitly but not set:
-+          { echo "$as_me:23251: 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;}
-@@ -23211,7 +23257,7 @@
-       fi
-       ac_seen=`grep '${datarootdir}' $ac_item`
-       if test -n "$ac_seen"; then
--        { echo "$as_me:23214: WARNING: datarootdir was used explicitly but not set:
-+        { echo "$as_me:23260: 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;}
-@@ -23248,7 +23294,7 @@
-             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:23251: WARNING: Variable $ac_name is used but was not set:
-+              { echo "$as_me:23297: 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;}
-@@ -23259,7 +23305,7 @@
-     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:23262: WARNING: Some variables may not be substituted:
-+      { echo "$as_me:23308: WARNING: Some variables may not be substituted:
- $ac_seen" >&5
- echo "$as_me: WARNING: Some variables may not be substituted:
- $ac_seen" >&2;}
-@@ -23308,7 +23354,7 @@
-   * )   ac_file_in=$ac_file.in ;;
-   esac
- 
--  test x"$ac_file" != x- && { echo "$as_me:23311: creating $ac_file" >&5
-+  test x"$ac_file" != x- && { echo "$as_me:23357: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
- 
-   # First look for the input files in the build tree, otherwise in the
-@@ -23319,7 +23365,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:23322: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:23368: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -23332,7 +23378,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:23335: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:23381: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -23390,7 +23436,7 @@
-   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:23393: $ac_file is unchanged" >&5
-+      { echo "$as_me:23439: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
-     else
-       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-@@ -23728,7 +23774,7 @@
- 				(cygdll|msysdll|mingw)
- 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
- 
--echo "${as_me:-configure}:23731: testing overriding CXX_MODEL to SHARED ..." 1>&5
-+echo "${as_me:-configure}:23777: testing overriding CXX_MODEL to SHARED ..." 1>&5
- 
- 					with_shared_cxx=yes
- 					;;
-Index: dist.mk
-Prereq:  1.1069 
---- ncurses-6.0-20150905+/dist.mk	2015-09-05 21:14:02.000000000 +0000
-+++ ncurses-6.0-20150912/dist.mk	2015-09-12 16:17:30.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1069 2015/09/05 21:14:02 tom Exp $
-+# $Id: dist.mk,v 1.1070 2015/09/12 16:17:30 tom Exp $
- # Makefile for creating ncurses distributions.
- #
- # This only needs to be used directly as a makefile by developers, but
-@@ -37,7 +37,7 @@
- # These define the major/minor/patch versions of ncurses.
- NCURSES_MAJOR = 6
- NCURSES_MINOR = 0
--NCURSES_PATCH = 20150905
-+NCURSES_PATCH = 20150912
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: include/ncurses_cfg.hin
-Prereq:  1.7 
---- ncurses-6.0-20150905+/include/ncurses_cfg.hin	2005-01-02 01:26:58.000000000 +0000
-+++ ncurses-6.0-20150912/include/ncurses_cfg.hin	2015-09-12 20:49:54.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2005,2015 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -27,10 +27,10 @@
-  ****************************************************************************/
- 
- /****************************************************************************
-- *  Author: Thomas E. Dickey  1997                        *
-+ *  Author: Thomas E. Dickey      1997-on                                   *
-  ****************************************************************************/
- /*
-- * $Id: ncurses_cfg.hin,v 1.7 2005/01/02 01:26:58 tom Exp $
-+ * $Id: ncurses_cfg.hin,v 1.8 2015/09/12 20:49:54 tom Exp $
-  *
-  * This is a template-file used to generate the "ncurses_cfg.h" file.
-  *
-@@ -52,7 +52,7 @@
- #ifdef __cplusplus
- #undef const
- #undef inline
--#else
-+#elif !defined(__clang__)
- #if defined(lint) || defined(TRACE)
- #undef inline
- #define inline /* nothing */
-Index: ncurses/base/lib_screen.c
-Prereq:  1.77 
---- ncurses-6.0-20150905+/ncurses/base/lib_screen.c	2015-07-04 22:54:14.000000000 +0000
-+++ ncurses-6.0-20150912/ncurses/base/lib_screen.c	2015-09-12 20:47:43.000000000 +0000
-@@ -41,7 +41,7 @@
- #define CUR SP_TERMTYPE
- #endif
- 
--MODULE_ID("$Id: lib_screen.c,v 1.77 2015/07/04 22:54:14 tom Exp $")
-+MODULE_ID("$Id: lib_screen.c,v 1.78 2015/09/12 20:47:43 tom Exp $")
- 
- #define MAX_SIZE 0x3fff		/* 16k is big enough for a window or pad */
- 
-@@ -751,7 +751,6 @@
- 	    break;
- 	}
-     }
--    target += strlen(target);
- #endif
- }
- #endif
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20150905+/package/debian-mingw/changelog	2015-09-05 21:14:03.000000000 +0000
-+++ ncurses-6.0-20150912/package/debian-mingw/changelog	2015-09-12 16:17:30.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150905) unstable; urgency=low
-+ncurses6 (6.0+20150912) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 05 Sep 2015 17:14:03 -0400
-+ -- Thomas E. Dickey   Sat, 12 Sep 2015 12:17:30 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20150905+/package/debian-mingw64/changelog	2015-09-05 21:14:03.000000000 +0000
-+++ ncurses-6.0-20150912/package/debian-mingw64/changelog	2015-09-12 16:17:30.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150905) unstable; urgency=low
-+ncurses6 (6.0+20150912) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 05 Sep 2015 17:14:03 -0400
-+ -- Thomas E. Dickey   Sat, 12 Sep 2015 12:17:30 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.0-20150905+/package/debian/changelog	2015-09-05 21:14:03.000000000 +0000
-+++ ncurses-6.0-20150912/package/debian/changelog	2015-09-12 16:17:30.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150905) unstable; urgency=low
-+ncurses6 (6.0+20150912) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 05 Sep 2015 17:14:03 -0400
-+ -- Thomas E. Dickey   Sat, 12 Sep 2015 12:17:30 -0400
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.122 
---- ncurses-6.0-20150905+/package/mingw-ncurses.nsi	2015-09-05 21:14:03.000000000 +0000
-+++ ncurses-6.0-20150912/package/mingw-ncurses.nsi	2015-09-12 16:17:30.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.122 2015/09/05 21:14:03 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.123 2015/09/12 16:17:30 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "0"
- !define VERSION_YYYY  "2015"
--!define VERSION_MMDD  "0905"
-+!define VERSION_MMDD  "0912"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20150905+/package/mingw-ncurses.spec	2015-09-05 21:14:03.000000000 +0000
-+++ ncurses-6.0-20150912/package/mingw-ncurses.spec	2015-09-12 16:17:30.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.0
--Release: 20150905
-+Release: 20150912
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20150905+/package/ncurses.spec	2015-09-05 21:14:03.000000000 +0000
-+++ ncurses-6.0-20150912/package/ncurses.spec	2015-09-12 16:17:30.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.0
--Release: 20150905
-+Release: 20150912
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
diff --git a/ncurses-6.0-20150919.patch b/ncurses-6.0-20150919.patch
deleted file mode 100644
index 13646a7..0000000
--- a/ncurses-6.0-20150919.patch
+++ /dev/null
@@ -1,9184 +0,0 @@
-# ncurses 6.0 - patch 20150919 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.0 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.0 are in the subdirectory
-# 	ftp://invisible-island.net/ncurses/6.0
-#
-# ------------------------------------------------------------------------------
-# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20150919.patch.gz
-# patch by Thomas E. Dickey 
-# created  Sun Sep 20 01:24:12 UTC 2015
-# ------------------------------------------------------------------------------
-# Ada95/configure                   | 2807 ++++++++++++++++++++----------------
-# Ada95/configure.in                |   13 
-# NEWS                              |   10 
-# VERSION                           |    2 
-# dist.mk                           |    4 
-# doc/html/man/captoinfo.1m.html    |    2 
-# doc/html/man/clear.1.html         |    2 
-# doc/html/man/curs_addch.3x.html   |    2 
-# doc/html/man/curs_getch.3x.html   |  113 -
-# doc/html/man/curs_threads.3x.html |    2 
-# doc/html/man/form.3x.html         |    2 
-# doc/html/man/infocmp.1m.html      |    2 
-# doc/html/man/infotocap.1m.html    |    2 
-# doc/html/man/menu.3x.html         |    2 
-# doc/html/man/ncurses.3x.html      |    2 
-# doc/html/man/panel.3x.html        |    2 
-# doc/html/man/resizeterm.3x.html   |   35 
-# doc/html/man/tabs.1.html          |    2 
-# doc/html/man/terminfo.5.html      |    2 
-# doc/html/man/tic.1m.html          |    2 
-# doc/html/man/toe.1m.html          |    2 
-# doc/html/man/tput.1.html          |    2 
-# doc/html/man/tset.1.html          |    2 
-# man/curs_getch.3x                 |   14 
-# man/resizeterm.3x                 |   24 
-# package/debian-mingw/changelog    |    4 
-# package/debian-mingw64/changelog  |    4 
-# package/debian/changelog          |    4 
-# package/mingw-ncurses.nsi         |    4 
-# package/mingw-ncurses.spec        |    2 
-# package/ncurses.spec              |    2 
-# 31 files changed, 1806 insertions(+), 1268 deletions(-)
-# ------------------------------------------------------------------------------
-Index: Ada95/configure
---- ncurses-6.0-20150912+/Ada95/configure	2015-08-22 21:14:42.000000000 +0000
-+++ ncurses-6.0-20150919/Ada95/configure	2015-09-19 20:50:21.000000000 +0000
-@@ -1,5 +1,5 @@
- #! /bin/sh
--# From configure.in Revision: 1.60 .
-+# From configure.in Revision: 1.61 .
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by Autoconf 2.52.20141204.
- #
-@@ -106,6 +106,42 @@
- : ${ac_max_here_lines=38}
- 
- ac_unique_file="gen/gen.c"
-+# Factoring default headers for most tests.
-+ac_includes_default="\
-+#include 
-+#if HAVE_SYS_TYPES_H
-+# include 
-+#endif
-+#if HAVE_SYS_STAT_H
-+# include 
-+#endif
-+#if STDC_HEADERS
-+# include 
-+# include 
-+#else
-+# if HAVE_STDLIB_H
-+#  include 
-+# endif
-+#endif
-+#if HAVE_STRING_H
-+# if !STDC_HEADERS && HAVE_MEMORY_H
-+#  include 
-+# endif
-+# include 
-+#endif
-+#if HAVE_STRINGS_H
-+# include 
-+#endif
-+#if HAVE_INTTYPES_H
-+# include 
-+#else
-+# if HAVE_STDINT_H
-+#  include 
-+# endif
-+#endif
-+#if HAVE_UNISTD_H
-+# include 
-+#endif"
- 
- # Initialize some variables set by options.
- ac_init_help=
-@@ -892,7 +928,7 @@
- fi
- for ac_site_file in $CONFIG_SITE; do
-   if test -r "$ac_site_file"; then
--    { echo "$as_me:895: loading site script $ac_site_file" >&5
-+    { echo "$as_me:931: loading site script $ac_site_file" >&5
- echo "$as_me: loading site script $ac_site_file" >&6;}
-     cat "$ac_site_file" >&5
-     . "$ac_site_file"
-@@ -903,7 +939,7 @@
-   # Some versions of bash will fail to source /dev/null (special
-   # files actually), so we avoid doing that.
-   if test -f "$cache_file"; then
--    { echo "$as_me:906: loading cache $cache_file" >&5
-+    { echo "$as_me:942: loading cache $cache_file" >&5
- echo "$as_me: loading cache $cache_file" >&6;}
-     case $cache_file in
-       [\\/]* | ?:[\\/]* ) . $cache_file;;
-@@ -911,7 +947,7 @@
-     esac
-   fi
- else
--  { echo "$as_me:914: creating cache $cache_file" >&5
-+  { echo "$as_me:950: creating cache $cache_file" >&5
- echo "$as_me: creating cache $cache_file" >&6;}
-   >$cache_file
- fi
-@@ -927,21 +963,21 @@
-   eval ac_new_val="\$ac_env_${ac_var}_value"
-   case $ac_old_set,$ac_new_set in
-     set,)
--      { echo "$as_me:930: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-+      { echo "$as_me:966: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
- echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-       ac_cache_corrupted=: ;;
-     ,set)
--      { echo "$as_me:934: error: \`$ac_var' was not set in the previous run" >&5
-+      { echo "$as_me:970: error: \`$ac_var' was not set in the previous run" >&5
- echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-       ac_cache_corrupted=: ;;
-     ,);;
-     *)
-       if test "x$ac_old_val" != "x$ac_new_val"; then
--        { echo "$as_me:940: error: \`$ac_var' has changed since the previous run:" >&5
-+        { echo "$as_me:976: error: \`$ac_var' has changed since the previous run:" >&5
- echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
--        { echo "$as_me:942:   former value:  $ac_old_val" >&5
-+        { echo "$as_me:978:   former value:  $ac_old_val" >&5
- echo "$as_me:   former value:  $ac_old_val" >&2;}
--        { echo "$as_me:944:   current value: $ac_new_val" >&5
-+        { echo "$as_me:980:   current value: $ac_new_val" >&5
- echo "$as_me:   current value: $ac_new_val" >&2;}
-         ac_cache_corrupted=:
-       fi;;
-@@ -960,9 +996,9 @@
-   fi
- done
- if $ac_cache_corrupted; then
--  { echo "$as_me:963: error: changes in the environment can compromise the build" >&5
-+  { echo "$as_me:999: error: changes in the environment can compromise the build" >&5
- echo "$as_me: error: changes in the environment can compromise the build" >&2;}
--  { { echo "$as_me:965: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-+  { { echo "$as_me:1001: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
- echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -983,10 +1019,10 @@
- echo "#! $SHELL" >conftest.sh
- echo  "exit 0"   >>conftest.sh
- chmod +x conftest.sh
--if { (echo "$as_me:986: PATH=\".;.\"; conftest.sh") >&5
-+if { (echo "$as_me:1022: PATH=\".;.\"; conftest.sh") >&5
-   (PATH=".;."; conftest.sh) 2>&5
-   ac_status=$?
--  echo "$as_me:989: \$? = $ac_status" >&5
-+  echo "$as_me:1025: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   ac_path_separator=';'
- else
-@@ -1016,7 +1052,7 @@
-   fi
- done
- if test -z "$ac_aux_dir"; then
--  { { echo "$as_me:1019: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
-+  { { echo "$as_me:1055: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
- echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -1026,11 +1062,11 @@
- 
- # Make sure we can run config.sub.
- $ac_config_sub sun4 >/dev/null 2>&1 ||
--  { { echo "$as_me:1029: error: cannot run $ac_config_sub" >&5
-+  { { echo "$as_me:1065: error: cannot run $ac_config_sub" >&5
- echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-    { (exit 1); exit 1; }; }
- 
--echo "$as_me:1033: checking build system type" >&5
-+echo "$as_me:1069: checking build system type" >&5
- echo $ECHO_N "checking build system type... $ECHO_C" >&6
- if test "${ac_cv_build+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1039,23 +1075,23 @@
- test -z "$ac_cv_build_alias" &&
-   ac_cv_build_alias=`$ac_config_guess`
- test -z "$ac_cv_build_alias" &&
--  { { echo "$as_me:1042: error: cannot guess build type; you must specify one" >&5
-+  { { echo "$as_me:1078: error: cannot guess build type; you must specify one" >&5
- echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-    { (exit 1); exit 1; }; }
- ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
--  { { echo "$as_me:1046: error: $ac_config_sub $ac_cv_build_alias failed." >&5
-+  { { echo "$as_me:1082: error: $ac_config_sub $ac_cv_build_alias failed." >&5
- echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
--echo "$as_me:1051: result: $ac_cv_build" >&5
-+echo "$as_me:1087: result: $ac_cv_build" >&5
- echo "${ECHO_T}$ac_cv_build" >&6
- build=$ac_cv_build
- build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
- build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
- build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
- 
--echo "$as_me:1058: checking host system type" >&5
-+echo "$as_me:1094: checking host system type" >&5
- echo $ECHO_N "checking host system type... $ECHO_C" >&6
- if test "${ac_cv_host+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1064,12 +1100,12 @@
- test -z "$ac_cv_host_alias" &&
-   ac_cv_host_alias=$ac_cv_build_alias
- ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
--  { { echo "$as_me:1067: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-+  { { echo "$as_me:1103: error: $ac_config_sub $ac_cv_host_alias failed" >&5
- echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
--echo "$as_me:1072: result: $ac_cv_host" >&5
-+echo "$as_me:1108: result: $ac_cv_host" >&5
- echo "${ECHO_T}$ac_cv_host" >&6
- host=$ac_cv_host
- host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-@@ -1077,7 +1113,7 @@
- host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
- 
- if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
--	echo "$as_me:1080: checking target system type" >&5
-+	echo "$as_me:1116: checking target system type" >&5
- echo $ECHO_N "checking target system type... $ECHO_C" >&6
- if test "${ac_cv_target+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1086,12 +1122,12 @@
- test "x$ac_cv_target_alias" = "x" &&
-   ac_cv_target_alias=$ac_cv_host_alias
- ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
--  { { echo "$as_me:1089: error: $ac_config_sub $ac_cv_target_alias failed" >&5
-+  { { echo "$as_me:1125: error: $ac_config_sub $ac_cv_target_alias failed" >&5
- echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
--echo "$as_me:1094: result: $ac_cv_target" >&5
-+echo "$as_me:1130: result: $ac_cv_target" >&5
- echo "${ECHO_T}$ac_cv_target" >&6
- target=$ac_cv_target
- target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-@@ -1123,13 +1159,13 @@
- fi
- 
- test -z "$system_name" && system_name="$cf_cv_system_name"
--test -n "$cf_cv_system_name" && echo "$as_me:1126: result: Configuring for $cf_cv_system_name" >&5
-+test -n "$cf_cv_system_name" && echo "$as_me:1162: result: Configuring for $cf_cv_system_name" >&5
- echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
- 
- if test ".$system_name" != ".$cf_cv_system_name" ; then
--	echo "$as_me:1130: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
-+	echo "$as_me:1166: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
- echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
--	{ { echo "$as_me:1132: error: \"Please remove config.cache and try again.\"" >&5
-+	{ { echo "$as_me:1168: error: \"Please remove config.cache and try again.\"" >&5
- echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -1137,7 +1173,7 @@
- # Check whether --with-system-type or --without-system-type was given.
- if test "${with_system_type+set}" = set; then
-   withval="$with_system_type"
--  { echo "$as_me:1140: WARNING: overriding system type to $withval" >&5
-+  { echo "$as_me:1176: WARNING: overriding system type to $withval" >&5
- echo "$as_me: WARNING: overriding system type to $withval" >&2;}
- 	cf_cv_system_name=$withval
- 	host_os=$withval
-@@ -1149,7 +1185,7 @@
- 
- ###	Default install-location
- 
--echo "$as_me:1152: checking for prefix" >&5
-+echo "$as_me:1188: checking for prefix" >&5
- echo $ECHO_N "checking for prefix... $ECHO_C" >&6
- if test "x$prefix" = "xNONE" ; then
- 	case "$cf_cv_system_name" in
-@@ -1161,11 +1197,11 @@
- 		;;
- 	esac
- fi
--echo "$as_me:1164: result: $prefix" >&5
-+echo "$as_me:1200: result: $prefix" >&5
- echo "${ECHO_T}$prefix" >&6
- 
- if test "x$prefix" = "xNONE" ; then
--echo "$as_me:1168: checking for default include-directory" >&5
-+echo "$as_me:1204: checking for default include-directory" >&5
- echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6
- test -n "$verbose" && echo 1>&6
- for cf_symbol in \
-@@ -1188,7 +1224,7 @@
- 	fi
- 	test -n "$verbose"  && echo "	tested $cf_dir" 1>&6
- done
--echo "$as_me:1191: result: $includedir" >&5
-+echo "$as_me:1227: result: $includedir" >&5
- echo "${ECHO_T}$includedir" >&6
- fi
- 
-@@ -1205,7 +1241,7 @@
-   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:1208: checking for $ac_word" >&5
-+echo "$as_me:1244: 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
-@@ -1220,7 +1256,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
--echo "$as_me:1223: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1259: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1228,10 +1264,10 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  echo "$as_me:1231: result: $CC" >&5
-+  echo "$as_me:1267: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6
- else
--  echo "$as_me:1234: result: no" >&5
-+  echo "$as_me:1270: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1244,7 +1280,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:1247: checking for $ac_word" >&5
-+echo "$as_me:1283: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1259,7 +1295,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_CC="$ac_prog"
--echo "$as_me:1262: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1298: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1267,10 +1303,10 @@
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
--  echo "$as_me:1270: result: $ac_ct_CC" >&5
-+  echo "$as_me:1306: result: $ac_ct_CC" >&5
- echo "${ECHO_T}$ac_ct_CC" >&6
- else
--  echo "$as_me:1273: result: no" >&5
-+  echo "$as_me:1309: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1280,32 +1316,32 @@
-   CC=$ac_ct_CC
- fi
- 
--test -z "$CC" && { { echo "$as_me:1283: error: no acceptable cc found in \$PATH" >&5
-+test -z "$CC" && { { echo "$as_me:1319: error: no acceptable cc found in \$PATH" >&5
- echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
-    { (exit 1); exit 1; }; }
- 
- # Provide some information about the compiler.
--echo "$as_me:1288:" \
-+echo "$as_me:1324:" \
-      "checking for C compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:1291: \"$ac_compiler --version &5\"") >&5
-+{ (eval echo "$as_me:1327: \"$ac_compiler --version &5\"") >&5
-   (eval $ac_compiler --version &5) 2>&5
-   ac_status=$?
--  echo "$as_me:1294: \$? = $ac_status" >&5
-+  echo "$as_me:1330: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:1296: \"$ac_compiler -v &5\"") >&5
-+{ (eval echo "$as_me:1332: \"$ac_compiler -v &5\"") >&5
-   (eval $ac_compiler -v &5) 2>&5
-   ac_status=$?
--  echo "$as_me:1299: \$? = $ac_status" >&5
-+  echo "$as_me:1335: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:1301: \"$ac_compiler -V &5\"") >&5
-+{ (eval echo "$as_me:1337: \"$ac_compiler -V &5\"") >&5
-   (eval $ac_compiler -V &5) 2>&5
-   ac_status=$?
--  echo "$as_me:1304: \$? = $ac_status" >&5
-+  echo "$as_me:1340: \$? = $ac_status" >&5
-   (exit $ac_status); }
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 1308 "configure"
-+#line 1344 "configure"
- #include "confdefs.h"
- 
- int
-@@ -1321,13 +1357,13 @@
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--echo "$as_me:1324: checking for C compiler default output" >&5
-+echo "$as_me:1360: checking for C compiler default output" >&5
- echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
- ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
--if { (eval echo "$as_me:1327: \"$ac_link_default\"") >&5
-+if { (eval echo "$as_me:1363: \"$ac_link_default\"") >&5
-   (eval $ac_link_default) 2>&5
-   ac_status=$?
--  echo "$as_me:1330: \$? = $ac_status" >&5
-+  echo "$as_me:1366: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   # Find the output, starting from the most likely.  This scheme is
- # not robust to junk in `.', hence go to wildcards (a.*) only as a last
-@@ -1350,34 +1386,34 @@
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--{ { echo "$as_me:1353: error: C compiler cannot create executables" >&5
-+{ { echo "$as_me:1389: error: C compiler cannot create executables" >&5
- echo "$as_me: error: C compiler cannot create executables" >&2;}
-    { (exit 77); exit 77; }; }
- fi
- 
- ac_exeext=$ac_cv_exeext
--echo "$as_me:1359: result: $ac_file" >&5
-+echo "$as_me:1395: result: $ac_file" >&5
- echo "${ECHO_T}$ac_file" >&6
- 
- # Check the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
--echo "$as_me:1364: checking whether the C compiler works" >&5
-+echo "$as_me:1400: checking whether the C compiler works" >&5
- echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
- # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
- # If not cross compiling, check that we can run a simple program.
- if test "$cross_compiling" != yes; then
-   if { ac_try='./$ac_file'
--  { (eval echo "$as_me:1370: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1406: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1373: \$? = $ac_status" >&5
-+  echo "$as_me:1409: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-     cross_compiling=no
-   else
-     if test "$cross_compiling" = maybe; then
- 	cross_compiling=yes
-     else
--	{ { echo "$as_me:1380: error: cannot run C compiled programs.
-+	{ { echo "$as_me:1416: error: cannot run C compiled programs.
- If you meant to cross compile, use \`--host'." >&5
- echo "$as_me: error: cannot run C compiled programs.
- If you meant to cross compile, use \`--host'." >&2;}
-@@ -1385,24 +1421,24 @@
-     fi
-   fi
- fi
--echo "$as_me:1388: result: yes" >&5
-+echo "$as_me:1424: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
- rm -f a.out a.exe conftest$ac_cv_exeext
- ac_clean_files=$ac_clean_files_save
- # Check the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
--echo "$as_me:1395: checking whether we are cross compiling" >&5
-+echo "$as_me:1431: checking whether we are cross compiling" >&5
- echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
--echo "$as_me:1397: result: $cross_compiling" >&5
-+echo "$as_me:1433: result: $cross_compiling" >&5
- echo "${ECHO_T}$cross_compiling" >&6
- 
--echo "$as_me:1400: checking for executable suffix" >&5
-+echo "$as_me:1436: checking for executable suffix" >&5
- echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
--if { (eval echo "$as_me:1402: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:1438: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:1405: \$? = $ac_status" >&5
-+  echo "$as_me:1441: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   # If both `conftest.exe' and `conftest' are `present' (well, observable)
- # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-@@ -1418,25 +1454,25 @@
-   esac
- done
- else
--  { { echo "$as_me:1421: error: cannot compute EXEEXT: cannot compile and link" >&5
-+  { { echo "$as_me:1457: error: cannot compute EXEEXT: cannot compile and link" >&5
- echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- rm -f conftest$ac_cv_exeext
--echo "$as_me:1427: result: $ac_cv_exeext" >&5
-+echo "$as_me:1463: result: $ac_cv_exeext" >&5
- echo "${ECHO_T}$ac_cv_exeext" >&6
- 
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
--echo "$as_me:1433: checking for object suffix" >&5
-+echo "$as_me:1469: checking for object suffix" >&5
- echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
- if test "${ac_cv_objext+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1439 "configure"
-+#line 1475 "configure"
- #include "confdefs.h"
- 
- int
-@@ -1448,10 +1484,10 @@
- }
- _ACEOF
- rm -f conftest.o conftest.obj
--if { (eval echo "$as_me:1451: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1487: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1454: \$? = $ac_status" >&5
-+  echo "$as_me:1490: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
-   case $ac_file in
-@@ -1463,24 +1499,24 @@
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--{ { echo "$as_me:1466: error: cannot compute OBJEXT: cannot compile" >&5
-+{ { echo "$as_me:1502: error: cannot compute OBJEXT: cannot compile" >&5
- echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
--echo "$as_me:1473: result: $ac_cv_objext" >&5
-+echo "$as_me:1509: result: $ac_cv_objext" >&5
- echo "${ECHO_T}$ac_cv_objext" >&6
- OBJEXT=$ac_cv_objext
- ac_objext=$OBJEXT
--echo "$as_me:1477: checking whether we are using the GNU C compiler" >&5
-+echo "$as_me:1513: checking whether we are using the GNU C compiler" >&5
- echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
- if test "${ac_cv_c_compiler_gnu+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1483 "configure"
-+#line 1519 "configure"
- #include "confdefs.h"
- 
- int
-@@ -1495,16 +1531,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1498: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1534: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1501: \$? = $ac_status" >&5
-+  echo "$as_me:1537: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:1504: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1540: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1507: \$? = $ac_status" >&5
-+  echo "$as_me:1543: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_compiler_gnu=yes
- else
-@@ -1516,19 +1552,19 @@
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
- 
- fi
--echo "$as_me:1519: result: $ac_cv_c_compiler_gnu" >&5
-+echo "$as_me:1555: result: $ac_cv_c_compiler_gnu" >&5
- echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
- GCC=`test $ac_compiler_gnu = yes && echo yes`
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
- CFLAGS="-g"
--echo "$as_me:1525: checking whether $CC accepts -g" >&5
-+echo "$as_me:1561: checking whether $CC accepts -g" >&5
- echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
- if test "${ac_cv_prog_cc_g+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1531 "configure"
-+#line 1567 "configure"
- #include "confdefs.h"
- 
- int
-@@ -1540,16 +1576,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1543: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1579: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1546: \$? = $ac_status" >&5
-+  echo "$as_me:1582: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:1549: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1585: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1552: \$? = $ac_status" >&5
-+  echo "$as_me:1588: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_prog_cc_g=yes
- else
-@@ -1559,7 +1595,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:1562: result: $ac_cv_prog_cc_g" >&5
-+echo "$as_me:1598: result: $ac_cv_prog_cc_g" >&5
- echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
- if test "$ac_test_CFLAGS" = set; then
-   CFLAGS=$ac_save_CFLAGS
-@@ -1586,16 +1622,16 @@
- #endif
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1589: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1625: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1592: \$? = $ac_status" >&5
-+  echo "$as_me:1628: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:1595: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1631: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1598: \$? = $ac_status" >&5
-+  echo "$as_me:1634: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   for ac_declaration in \
-    ''\
-@@ -1607,7 +1643,7 @@
-    'void exit (int);'
- do
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1610 "configure"
-+#line 1646 "configure"
- #include "confdefs.h"
- #include 
- $ac_declaration
-@@ -1620,16 +1656,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1623: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1659: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1626: \$? = $ac_status" >&5
-+  echo "$as_me:1662: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:1629: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1665: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1632: \$? = $ac_status" >&5
-+  echo "$as_me:1668: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -1639,7 +1675,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1642 "configure"
-+#line 1678 "configure"
- #include "confdefs.h"
- $ac_declaration
- int
-@@ -1651,16 +1687,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1654: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1690: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1657: \$? = $ac_status" >&5
-+  echo "$as_me:1693: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:1660: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1696: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1663: \$? = $ac_status" >&5
-+  echo "$as_me:1699: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -1690,15 +1726,15 @@
- 
- GCC_VERSION=none
- if test "$GCC" = yes ; then
--	echo "$as_me:1693: checking version of $CC" >&5
-+	echo "$as_me:1729: checking version of $CC" >&5
- echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
- 	GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
- 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
--	echo "$as_me:1697: result: $GCC_VERSION" >&5
-+	echo "$as_me:1733: result: $GCC_VERSION" >&5
- echo "${ECHO_T}$GCC_VERSION" >&6
- fi
- 
--echo "$as_me:1701: checking for $CC option to accept ANSI C" >&5
-+echo "$as_me:1737: checking for $CC option to accept ANSI C" >&5
- echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
- if test "${ac_cv_prog_cc_stdc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1706,7 +1742,7 @@
-   ac_cv_prog_cc_stdc=no
- ac_save_CC=$CC
- cat >conftest.$ac_ext <<_ACEOF
--#line 1709 "configure"
-+#line 1745 "configure"
- #include "confdefs.h"
- #include 
- #include 
-@@ -1755,16 +1791,16 @@
- do
-   CC="$ac_save_CC $ac_arg"
-   rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1758: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1794: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1761: \$? = $ac_status" >&5
-+  echo "$as_me:1797: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:1764: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1800: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1767: \$? = $ac_status" >&5
-+  echo "$as_me:1803: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_prog_cc_stdc=$ac_arg
- break
-@@ -1781,10 +1817,10 @@
- 
- case "x$ac_cv_prog_cc_stdc" in
-   x|xno)
--    echo "$as_me:1784: result: none needed" >&5
-+    echo "$as_me:1820: result: none needed" >&5
- echo "${ECHO_T}none needed" >&6 ;;
-   *)
--    echo "$as_me:1787: result: $ac_cv_prog_cc_stdc" >&5
-+    echo "$as_me:1823: result: $ac_cv_prog_cc_stdc" >&5
- echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-     CC="$CC $ac_cv_prog_cc_stdc" ;;
- esac
-@@ -1792,13 +1828,13 @@
- # This should have been defined by AC_PROG_CC
- : ${CC:=cc}
- 
--echo "$as_me:1795: checking \$CC variable" >&5
-+echo "$as_me:1831: checking \$CC variable" >&5
- echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
- case "$CC" in
- (*[\ \	]-[IUD]*)
--	echo "$as_me:1799: result: broken" >&5
-+	echo "$as_me:1835: result: broken" >&5
- echo "${ECHO_T}broken" >&6
--	{ echo "$as_me:1801: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
-+	{ echo "$as_me:1837: 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_flags=`echo "$CC" | sed -e 's/^[^ 	]*[ 	]//'`
-@@ -1884,7 +1920,7 @@
- 
- 	;;
- (*)
--	echo "$as_me:1887: result: ok" >&5
-+	echo "$as_me:1923: result: ok" >&5
- echo "${ECHO_T}ok" >&6
- 	;;
- esac
-@@ -1895,7 +1931,7 @@
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ac_main_return=return
--echo "$as_me:1898: checking how to run the C preprocessor" >&5
-+echo "$as_me:1934: checking how to run the C preprocessor" >&5
- echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
-@@ -1916,18 +1952,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1919 "configure"
-+#line 1955 "configure"
- #include "confdefs.h"
- #include 
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:1924: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:1960: \"$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:1930: \$? = $ac_status" >&5
-+  echo "$as_me:1966: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -1950,17 +1986,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1953 "configure"
-+#line 1989 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:1957: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:1993: \"$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:1963: \$? = $ac_status" >&5
-+  echo "$as_me:1999: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -1997,7 +2033,7 @@
- else
-   ac_cv_prog_CPP=$CPP
- fi
--echo "$as_me:2000: result: $CPP" >&5
-+echo "$as_me:2036: result: $CPP" >&5
- echo "${ECHO_T}$CPP" >&6
- ac_preproc_ok=false
- for ac_c_preproc_warn_flag in '' yes
-@@ -2007,18 +2043,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2010 "configure"
-+#line 2046 "configure"
- #include "confdefs.h"
- #include 
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:2015: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:2051: \"$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:2021: \$? = $ac_status" >&5
-+  echo "$as_me:2057: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -2041,17 +2077,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2044 "configure"
-+#line 2080 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:2048: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:2084: \"$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:2054: \$? = $ac_status" >&5
-+  echo "$as_me:2090: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -2079,7 +2115,7 @@
- if $ac_preproc_ok; then
-   :
- else
--  { { echo "$as_me:2082: error: C preprocessor \"$CPP\" fails sanity check" >&5
-+  { { echo "$as_me:2118: error: C preprocessor \"$CPP\" fails sanity check" >&5
- echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -2092,14 +2128,14 @@
- ac_main_return=return
- 
- if test $ac_cv_c_compiler_gnu = yes; then
--    echo "$as_me:2095: checking whether $CC needs -traditional" >&5
-+    echo "$as_me:2131: checking whether $CC needs -traditional" >&5
- echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
- if test "${ac_cv_prog_gcc_traditional+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-     ac_pattern="Autoconf.*'x'"
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2102 "configure"
-+#line 2138 "configure"
- #include "confdefs.h"
- #include 
- int Autoconf = TIOCGETP;
-@@ -2114,7 +2150,7 @@
- 
-   if test $ac_cv_prog_gcc_traditional = no; then
-     cat >conftest.$ac_ext <<_ACEOF
--#line 2117 "configure"
-+#line 2153 "configure"
- #include "confdefs.h"
- #include 
- int Autoconf = TCGETA;
-@@ -2127,14 +2163,14 @@
- 
-   fi
- fi
--echo "$as_me:2130: result: $ac_cv_prog_gcc_traditional" >&5
-+echo "$as_me:2166: result: $ac_cv_prog_gcc_traditional" >&5
- echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
-   if test $ac_cv_prog_gcc_traditional = yes; then
-     CC="$CC -traditional"
-   fi
- fi
- 
--echo "$as_me:2137: checking whether $CC understands -c and -o together" >&5
-+echo "$as_me:2173: checking whether $CC understands -c and -o together" >&5
- echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6
- if test "${cf_cv_prog_CC_c_o+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2150,15 +2186,15 @@
- # We do the test twice because some compilers refuse to overwrite an
- # existing .o file with -o, though they will create one.
- ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
--if { (eval echo "$as_me:2153: \"$ac_try\"") >&5
-+if { (eval echo "$as_me:2189: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2156: \$? = $ac_status" >&5
-+  echo "$as_me:2192: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--  test -f conftest2.$ac_objext && { (eval echo "$as_me:2158: \"$ac_try\"") >&5
-+  test -f conftest2.$ac_objext && { (eval echo "$as_me:2194: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2161: \$? = $ac_status" >&5
-+  echo "$as_me:2197: \$? = $ac_status" >&5
-   (exit $ac_status); };
- then
-   eval cf_cv_prog_CC_c_o=yes
-@@ -2169,10 +2205,10 @@
- 
- fi
- if test $cf_cv_prog_CC_c_o = yes; then
--  echo "$as_me:2172: result: yes" >&5
-+  echo "$as_me:2208: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--  echo "$as_me:2175: result: no" >&5
-+  echo "$as_me:2211: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -2193,7 +2229,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:2196: checking for $ac_word" >&5
-+echo "$as_me:2232: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_AWK+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2208,7 +2244,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_AWK="$ac_prog"
--echo "$as_me:2211: found $ac_dir/$ac_word" >&5
-+echo "$as_me:2247: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -2216,21 +2252,21 @@
- fi
- AWK=$ac_cv_prog_AWK
- if test -n "$AWK"; then
--  echo "$as_me:2219: result: $AWK" >&5
-+  echo "$as_me:2255: result: $AWK" >&5
- echo "${ECHO_T}$AWK" >&6
- else
--  echo "$as_me:2222: result: no" >&5
-+  echo "$as_me:2258: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-   test -n "$AWK" && break
- done
- 
--test -z "$AWK" && { { echo "$as_me:2229: error: No awk program found" >&5
-+test -z "$AWK" && { { echo "$as_me:2265: error: No awk program found" >&5
- echo "$as_me: error: No awk program found" >&2;}
-    { (exit 1); exit 1; }; }
- 
--echo "$as_me:2233: checking for egrep" >&5
-+echo "$as_me:2269: checking for egrep" >&5
- echo $ECHO_N "checking for egrep... $ECHO_C" >&6
- if test "${ac_cv_prog_egrep+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2240,11 +2276,11 @@
- 		else ac_cv_prog_egrep='egrep'
- 	fi
- fi
--echo "$as_me:2243: result: $ac_cv_prog_egrep" >&5
-+echo "$as_me:2279: result: $ac_cv_prog_egrep" >&5
- echo "${ECHO_T}$ac_cv_prog_egrep" >&6
- 	EGREP=$ac_cv_prog_egrep
- 
--	test -z "$EGREP" && { { echo "$as_me:2247: error: No egrep program found" >&5
-+	test -z "$EGREP" && { { echo "$as_me:2283: error: No egrep program found" >&5
- echo "$as_me: error: No egrep program found" >&2;}
-    { (exit 1); exit 1; }; }
- 
-@@ -2260,7 +2296,7 @@
- # 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:2263: checking for a BSD compatible install" >&5
-+echo "$as_me:2299: 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
-@@ -2309,7 +2345,7 @@
-     INSTALL=$ac_install_sh
-   fi
- fi
--echo "$as_me:2312: result: $INSTALL" >&5
-+echo "$as_me:2348: result: $INSTALL" >&5
- echo "${ECHO_T}$INSTALL" >&6
- 
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2320,18 +2356,18 @@
- 
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- 
--echo "$as_me:2323: checking whether ln -s works" >&5
-+echo "$as_me:2359: 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:2327: result: yes" >&5
-+  echo "$as_me:2363: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--  echo "$as_me:2330: result: no, using $LN_S" >&5
-+  echo "$as_me:2366: result: no, using $LN_S" >&5
- echo "${ECHO_T}no, using $LN_S" >&6
- fi
- 
--echo "$as_me:2334: checking if $LN_S -f options work" >&5
-+echo "$as_me:2370: checking if $LN_S -f options work" >&5
- echo $ECHO_N "checking if $LN_S -f options work... $ECHO_C" >&6
- 
- rm -f conf$$.src conf$$dst
-@@ -2343,12 +2379,12 @@
- 	cf_prog_ln_sf=no
- fi
- rm -f conf$$.dst conf$$src
--echo "$as_me:2346: result: $cf_prog_ln_sf" >&5
-+echo "$as_me:2382: result: $cf_prog_ln_sf" >&5
- echo "${ECHO_T}$cf_prog_ln_sf" >&6
- 
- test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
- 
--echo "$as_me:2351: checking for long file names" >&5
-+echo "$as_me:2387: checking for long file names" >&5
- echo $ECHO_N "checking for long file names... $ECHO_C" >&6
- if test "${ac_cv_sys_long_file_names+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2387,7 +2423,7 @@
-   rm -rf $ac_xdir 2>/dev/null
- done
- fi
--echo "$as_me:2390: result: $ac_cv_sys_long_file_names" >&5
-+echo "$as_me:2426: result: $ac_cv_sys_long_file_names" >&5
- echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
- if test $ac_cv_sys_long_file_names = yes; then
- 
-@@ -2399,7 +2435,7 @@
- 
- # if we find pkg-config, check if we should install the ".pc" files.
- 
--echo "$as_me:2402: checking if you want to use pkg-config" >&5
-+echo "$as_me:2438: 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.
-@@ -2409,7 +2445,7 @@
- else
-   cf_pkg_config=yes
- fi;
--echo "$as_me:2412: result: $cf_pkg_config" >&5
-+echo "$as_me:2448: result: $cf_pkg_config" >&5
- echo "${ECHO_T}$cf_pkg_config" >&6
- 
- case $cf_pkg_config in
-@@ -2421,7 +2457,7 @@
- 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:2424: checking for $ac_word" >&5
-+echo "$as_me:2460: 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
-@@ -2438,7 +2474,7 @@
-   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:2441: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:2477: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -2449,10 +2485,10 @@
- PKG_CONFIG=$ac_cv_path_PKG_CONFIG
- 
- if test -n "$PKG_CONFIG"; then
--  echo "$as_me:2452: result: $PKG_CONFIG" >&5
-+  echo "$as_me:2488: result: $PKG_CONFIG" >&5
- echo "${ECHO_T}$PKG_CONFIG" >&6
- else
--  echo "$as_me:2455: result: no" >&5
-+  echo "$as_me:2491: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -2461,7 +2497,7 @@
-   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:2464: checking for $ac_word" >&5
-+echo "$as_me:2500: 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
-@@ -2478,7 +2514,7 @@
-   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:2481: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:2517: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -2490,10 +2526,10 @@
- ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
- 
- if test -n "$ac_pt_PKG_CONFIG"; then
--  echo "$as_me:2493: result: $ac_pt_PKG_CONFIG" >&5
-+  echo "$as_me:2529: result: $ac_pt_PKG_CONFIG" >&5
- echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
- else
--  echo "$as_me:2496: result: no" >&5
-+  echo "$as_me:2532: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -2536,24 +2572,24 @@
- 	PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:2539: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
-+	{ { echo "$as_me:2575: 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:2546: WARNING: pkg-config is not installed" >&5
-+	{ echo "$as_me:2582: WARNING: pkg-config is not installed" >&5
- echo "$as_me: WARNING: pkg-config is not installed" >&2;}
- fi
- 
- case $PKG_CONFIG in
- (no|none|yes)
--	echo "$as_me:2552: checking for pkg-config library directory" >&5
-+	echo "$as_me:2588: checking for pkg-config library directory" >&5
- echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
- 	;;
- (*)
--	echo "$as_me:2556: checking for $PKG_CONFIG library directory" >&5
-+	echo "$as_me:2592: checking for $PKG_CONFIG library directory" >&5
- echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
- 	;;
- esac
-@@ -2608,18 +2644,18 @@
- 
- 	test -n "$verbose" && echo "	list..." 1>&6
- 
--echo "${as_me:-configure}:2611: testing list... ..." 1>&5
-+echo "${as_me:-configure}:2647: testing list... ..." 1>&5
- 
- 	for cf_config in $cf_search_path
- 	do
- 		test -n "$verbose" && echo "	checking $cf_config/pkgconfig" 1>&6
- 
--echo "${as_me:-configure}:2617: testing checking $cf_config/pkgconfig ..." 1>&5
-+echo "${as_me:-configure}:2653: testing checking $cf_config/pkgconfig ..." 1>&5
- 
- 		if test -d $cf_config/pkgconfig
- 		then
- 			PKG_CONFIG_LIBDIR=$cf_config/pkgconfig
--			echo "$as_me:2622: checking done" >&5
-+			echo "$as_me:2658: checking done" >&5
- echo $ECHO_N "checking done... $ECHO_C" >&6
- 			break
- 		fi
-@@ -2630,11 +2666,11 @@
- esac
- 
- if test "x$PKG_CONFIG_LIBDIR" != xno ; then
--	echo "$as_me:2633: result: $PKG_CONFIG_LIBDIR" >&5
-+	echo "$as_me:2669: result: $PKG_CONFIG_LIBDIR" >&5
- echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
- fi
- 
--echo "$as_me:2637: checking if you want to build test-programs" >&5
-+echo "$as_me:2673: checking if you want to build test-programs" >&5
- echo $ECHO_N "checking if you want to build test-programs... $ECHO_C" >&6
- 
- # Check whether --with-tests or --without-tests was given.
-@@ -2644,10 +2680,10 @@
- else
-   cf_with_tests=yes
- fi;
--echo "$as_me:2647: result: $cf_with_tests" >&5
-+echo "$as_me:2683: result: $cf_with_tests" >&5
- echo "${ECHO_T}$cf_with_tests" >&6
- 
--echo "$as_me:2650: checking if we should assume mixed-case filenames" >&5
-+echo "$as_me:2686: checking if we should assume mixed-case filenames" >&5
- echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6
- 
- # Check whether --enable-mixed-case or --disable-mixed-case was given.
-@@ -2657,11 +2693,11 @@
- else
-   enable_mixedcase=auto
- fi;
--echo "$as_me:2660: result: $enable_mixedcase" >&5
-+echo "$as_me:2696: result: $enable_mixedcase" >&5
- echo "${ECHO_T}$enable_mixedcase" >&6
- if test "$enable_mixedcase" = "auto" ; then
- 
--echo "$as_me:2664: checking if filesystem supports mixed-case filenames" >&5
-+echo "$as_me:2700: 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
-@@ -2688,7 +2724,7 @@
- fi
- 
- fi
--echo "$as_me:2691: result: $cf_cv_mixedcase" >&5
-+echo "$as_me:2727: result: $cf_cv_mixedcase" >&5
- echo "${ECHO_T}$cf_cv_mixedcase" >&6
- test "$cf_cv_mixedcase" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -2706,7 +2742,7 @@
- fi
- 
- # do this after mixed-case option (tags/TAGS is not as important as tic).
--echo "$as_me:2709: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+echo "$as_me:2745: 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
-@@ -2726,11 +2762,11 @@
- rm -f conftest.make
- fi
- if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
--  echo "$as_me:2729: result: yes" >&5
-+  echo "$as_me:2765: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-   SET_MAKE=
- else
--  echo "$as_me:2733: result: no" >&5
-+  echo "$as_me:2769: result: no" >&5
- echo "${ECHO_T}no" >&6
-   SET_MAKE="MAKE=${MAKE-make}"
- fi
-@@ -2739,7 +2775,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:2742: checking for $ac_word" >&5
-+echo "$as_me:2778: 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
-@@ -2754,7 +2790,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_CTAGS="$ac_prog"
--echo "$as_me:2757: found $ac_dir/$ac_word" >&5
-+echo "$as_me:2793: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -2762,10 +2798,10 @@
- fi
- CTAGS=$ac_cv_prog_CTAGS
- if test -n "$CTAGS"; then
--  echo "$as_me:2765: result: $CTAGS" >&5
-+  echo "$as_me:2801: result: $CTAGS" >&5
- echo "${ECHO_T}$CTAGS" >&6
- else
--  echo "$as_me:2768: result: no" >&5
-+  echo "$as_me:2804: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -2776,7 +2812,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:2779: checking for $ac_word" >&5
-+echo "$as_me:2815: 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
-@@ -2791,7 +2827,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ETAGS="$ac_prog"
--echo "$as_me:2794: found $ac_dir/$ac_word" >&5
-+echo "$as_me:2830: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -2799,10 +2835,10 @@
- fi
- ETAGS=$ac_cv_prog_ETAGS
- if test -n "$ETAGS"; then
--  echo "$as_me:2802: result: $ETAGS" >&5
-+  echo "$as_me:2838: result: $ETAGS" >&5
- echo "${ECHO_T}$ETAGS" >&6
- else
--  echo "$as_me:2805: result: no" >&5
-+  echo "$as_me:2841: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -2811,7 +2847,7 @@
- 
- # 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:2814: checking for $ac_word" >&5
-+echo "$as_me:2850: 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
-@@ -2826,7 +2862,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_MAKE_LOWER_TAGS="yes"
--echo "$as_me:2829: found $ac_dir/$ac_word" >&5
-+echo "$as_me:2865: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -2835,17 +2871,17 @@
- fi
- MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
- if test -n "$MAKE_LOWER_TAGS"; then
--  echo "$as_me:2838: result: $MAKE_LOWER_TAGS" >&5
-+  echo "$as_me:2874: result: $MAKE_LOWER_TAGS" >&5
- echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
- else
--  echo "$as_me:2841: result: no" >&5
-+  echo "$as_me:2877: 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:2848: checking for $ac_word" >&5
-+echo "$as_me:2884: 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
-@@ -2860,7 +2896,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_MAKE_UPPER_TAGS="yes"
--echo "$as_me:2863: found $ac_dir/$ac_word" >&5
-+echo "$as_me:2899: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -2869,10 +2905,10 @@
- fi
- MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
- if test -n "$MAKE_UPPER_TAGS"; then
--  echo "$as_me:2872: result: $MAKE_UPPER_TAGS" >&5
-+  echo "$as_me:2908: result: $MAKE_UPPER_TAGS" >&5
- echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
- else
--  echo "$as_me:2875: result: no" >&5
-+  echo "$as_me:2911: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -2892,7 +2928,7 @@
- 	MAKE_LOWER_TAGS="#"
- fi
- 
--echo "$as_me:2895: checking for makeflags variable" >&5
-+echo "$as_me:2931: 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
-@@ -2926,13 +2962,13 @@
- 	rm -f cf_makeflags.tmp
- 
- fi
--echo "$as_me:2929: result: $cf_cv_makeflags" >&5
-+echo "$as_me:2965: result: $cf_cv_makeflags" >&5
- echo "${ECHO_T}$cf_cv_makeflags" >&6
- 
- 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:2935: checking for $ac_word" >&5
-+echo "$as_me:2971: 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
-@@ -2947,7 +2983,7 @@
-   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:2950: found $ac_dir/$ac_word" >&5
-+echo "$as_me:2986: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -2955,10 +2991,10 @@
- fi
- RANLIB=$ac_cv_prog_RANLIB
- if test -n "$RANLIB"; then
--  echo "$as_me:2958: result: $RANLIB" >&5
-+  echo "$as_me:2994: result: $RANLIB" >&5
- echo "${ECHO_T}$RANLIB" >&6
- else
--  echo "$as_me:2961: result: no" >&5
-+  echo "$as_me:2997: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -2967,7 +3003,7 @@
-   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:2970: checking for $ac_word" >&5
-+echo "$as_me:3006: 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
-@@ -2982,7 +3018,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_RANLIB="ranlib"
--echo "$as_me:2985: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3021: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -2991,10 +3027,10 @@
- fi
- ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
- if test -n "$ac_ct_RANLIB"; then
--  echo "$as_me:2994: result: $ac_ct_RANLIB" >&5
-+  echo "$as_me:3030: result: $ac_ct_RANLIB" >&5
- echo "${ECHO_T}$ac_ct_RANLIB" >&6
- else
--  echo "$as_me:2997: result: no" >&5
-+  echo "$as_me:3033: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3006,7 +3042,7 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ld; ac_word=$2
--echo "$as_me:3009: checking for $ac_word" >&5
-+echo "$as_me:3045: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_LD+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3021,7 +3057,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_LD="${ac_tool_prefix}ld"
--echo "$as_me:3024: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3060: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3029,10 +3065,10 @@
- fi
- LD=$ac_cv_prog_LD
- if test -n "$LD"; then
--  echo "$as_me:3032: result: $LD" >&5
-+  echo "$as_me:3068: result: $LD" >&5
- echo "${ECHO_T}$LD" >&6
- else
--  echo "$as_me:3035: result: no" >&5
-+  echo "$as_me:3071: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3041,7 +3077,7 @@
-   ac_ct_LD=$LD
-   # Extract the first word of "ld", so it can be a program name with args.
- set dummy ld; ac_word=$2
--echo "$as_me:3044: checking for $ac_word" >&5
-+echo "$as_me:3080: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3056,7 +3092,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_LD="ld"
--echo "$as_me:3059: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3095: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3065,10 +3101,10 @@
- fi
- ac_ct_LD=$ac_cv_prog_ac_ct_LD
- if test -n "$ac_ct_LD"; then
--  echo "$as_me:3068: result: $ac_ct_LD" >&5
-+  echo "$as_me:3104: result: $ac_ct_LD" >&5
- echo "${ECHO_T}$ac_ct_LD" >&6
- else
--  echo "$as_me:3071: result: no" >&5
-+  echo "$as_me:3107: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3080,7 +3116,7 @@
- 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:3083: checking for $ac_word" >&5
-+echo "$as_me:3119: 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
-@@ -3095,7 +3131,7 @@
-   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:3098: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3134: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3103,10 +3139,10 @@
- fi
- AR=$ac_cv_prog_AR
- if test -n "$AR"; then
--  echo "$as_me:3106: result: $AR" >&5
-+  echo "$as_me:3142: result: $AR" >&5
- echo "${ECHO_T}$AR" >&6
- else
--  echo "$as_me:3109: result: no" >&5
-+  echo "$as_me:3145: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3115,7 +3151,7 @@
-   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:3118: checking for $ac_word" >&5
-+echo "$as_me:3154: 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
-@@ -3130,7 +3166,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_AR="ar"
--echo "$as_me:3133: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3169: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3139,10 +3175,10 @@
- fi
- ac_ct_AR=$ac_cv_prog_ac_ct_AR
- if test -n "$ac_ct_AR"; then
--  echo "$as_me:3142: result: $ac_ct_AR" >&5
-+  echo "$as_me:3178: result: $ac_ct_AR" >&5
- echo "${ECHO_T}$ac_ct_AR" >&6
- else
--  echo "$as_me:3145: result: no" >&5
-+  echo "$as_me:3181: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3154,7 +3190,7 @@
- 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:3157: checking for $ac_word" >&5
-+echo "$as_me:3193: 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
-@@ -3169,7 +3205,7 @@
-   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:3172: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3208: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3177,10 +3213,10 @@
- fi
- AR=$ac_cv_prog_AR
- if test -n "$AR"; then
--  echo "$as_me:3180: result: $AR" >&5
-+  echo "$as_me:3216: result: $AR" >&5
- echo "${ECHO_T}$AR" >&6
- else
--  echo "$as_me:3183: result: no" >&5
-+  echo "$as_me:3219: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3189,7 +3225,7 @@
-   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:3192: checking for $ac_word" >&5
-+echo "$as_me:3228: 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
-@@ -3204,7 +3240,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_AR="ar"
--echo "$as_me:3207: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3243: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3213,10 +3249,10 @@
- fi
- ac_ct_AR=$ac_cv_prog_ac_ct_AR
- if test -n "$ac_ct_AR"; then
--  echo "$as_me:3216: result: $ac_ct_AR" >&5
-+  echo "$as_me:3252: result: $ac_ct_AR" >&5
- echo "${ECHO_T}$ac_ct_AR" >&6
- else
--  echo "$as_me:3219: result: no" >&5
-+  echo "$as_me:3255: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3225,7 +3261,7 @@
-   AR="$ac_cv_prog_AR"
- fi
- 
--echo "$as_me:3228: checking for options to update archives" >&5
-+echo "$as_me:3264: 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
-@@ -3248,13 +3284,13 @@
- 		rm -f conftest.a
- 
- 		cat >conftest.$ac_ext <&5
-+		if { (eval echo "$as_me:3290: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:3257: \$? = $ac_status" >&5
-+  echo "$as_me:3293: \$? = $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
-@@ -3265,7 +3301,7 @@
- 		else
- 			test -n "$verbose" && echo "	cannot compile test-program" 1>&6
- 
--echo "${as_me:-configure}:3268: testing cannot compile test-program ..." 1>&5
-+echo "${as_me:-configure}:3304: testing cannot compile test-program ..." 1>&5
- 
- 			break
- 		fi
-@@ -3273,7 +3309,7 @@
- 	rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
- 
- fi
--echo "$as_me:3276: result: $cf_cv_ar_flags" >&5
-+echo "$as_me:3312: result: $cf_cv_ar_flags" >&5
- echo "${ECHO_T}$cf_cv_ar_flags" >&6
- 
- if test -n "$ARFLAGS" ; then
-@@ -3284,17 +3320,17 @@
- 	ARFLAGS=$cf_cv_ar_flags
- fi
- 
--	echo "$as_me:3287: checking for PATH separator" >&5
-+	echo "$as_me:3323: 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:3294: result: $PATH_SEPARATOR" >&5
-+	echo "$as_me:3330: result: $PATH_SEPARATOR" >&5
- echo "${ECHO_T}$PATH_SEPARATOR" >&6
- 
--echo "$as_me:3297: checking if you have specified an install-prefix" >&5
-+echo "$as_me:3333: checking if you have specified an install-prefix" >&5
- echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6
- 
- # Check whether --with-install-prefix or --without-install-prefix was given.
-@@ -3307,7 +3343,7 @@
- 		;;
- 	esac
- fi;
--echo "$as_me:3310: result: $DESTDIR" >&5
-+echo "$as_me:3346: result: $DESTDIR" >&5
- echo "${ECHO_T}$DESTDIR" >&6
- 
- ###############################################################################
-@@ -3335,7 +3371,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:3338: checking for $ac_word" >&5
-+echo "$as_me:3374: 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
-@@ -3350,7 +3386,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_BUILD_CC="$ac_prog"
--echo "$as_me:3353: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3389: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3358,10 +3394,10 @@
- fi
- BUILD_CC=$ac_cv_prog_BUILD_CC
- if test -n "$BUILD_CC"; then
--  echo "$as_me:3361: result: $BUILD_CC" >&5
-+  echo "$as_me:3397: result: $BUILD_CC" >&5
- echo "${ECHO_T}$BUILD_CC" >&6
- else
--  echo "$as_me:3364: result: no" >&5
-+  echo "$as_me:3400: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3369,12 +3405,12 @@
- done
- 
- fi;
--	echo "$as_me:3372: checking for native build C compiler" >&5
-+	echo "$as_me:3408: checking for native build C compiler" >&5
- echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
--	echo "$as_me:3374: result: $BUILD_CC" >&5
-+	echo "$as_me:3410: result: $BUILD_CC" >&5
- echo "${ECHO_T}$BUILD_CC" >&6
- 
--	echo "$as_me:3377: checking for native build C preprocessor" >&5
-+	echo "$as_me:3413: 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.
-@@ -3384,10 +3420,10 @@
- else
-   BUILD_CPP='${BUILD_CC} -E'
- fi;
--	echo "$as_me:3387: result: $BUILD_CPP" >&5
-+	echo "$as_me:3423: result: $BUILD_CPP" >&5
- echo "${ECHO_T}$BUILD_CPP" >&6
- 
--	echo "$as_me:3390: checking for native build C flags" >&5
-+	echo "$as_me:3426: 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.
-@@ -3395,10 +3431,10 @@
-   withval="$with_build_cflags"
-   BUILD_CFLAGS="$withval"
- fi;
--	echo "$as_me:3398: result: $BUILD_CFLAGS" >&5
-+	echo "$as_me:3434: result: $BUILD_CFLAGS" >&5
- echo "${ECHO_T}$BUILD_CFLAGS" >&6
- 
--	echo "$as_me:3401: checking for native build C preprocessor-flags" >&5
-+	echo "$as_me:3437: 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.
-@@ -3406,10 +3442,10 @@
-   withval="$with_build_cppflags"
-   BUILD_CPPFLAGS="$withval"
- fi;
--	echo "$as_me:3409: result: $BUILD_CPPFLAGS" >&5
-+	echo "$as_me:3445: result: $BUILD_CPPFLAGS" >&5
- echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
- 
--	echo "$as_me:3412: checking for native build linker-flags" >&5
-+	echo "$as_me:3448: 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.
-@@ -3417,10 +3453,10 @@
-   withval="$with_build_ldflags"
-   BUILD_LDFLAGS="$withval"
- fi;
--	echo "$as_me:3420: result: $BUILD_LDFLAGS" >&5
-+	echo "$as_me:3456: result: $BUILD_LDFLAGS" >&5
- echo "${ECHO_T}$BUILD_LDFLAGS" >&6
- 
--	echo "$as_me:3423: checking for native build linker-libraries" >&5
-+	echo "$as_me:3459: 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.
-@@ -3428,7 +3464,7 @@
-   withval="$with_build_libs"
-   BUILD_LIBS="$withval"
- fi;
--	echo "$as_me:3431: result: $BUILD_LIBS" >&5
-+	echo "$as_me:3467: result: $BUILD_LIBS" >&5
- echo "${ECHO_T}$BUILD_LIBS" >&6
- 
- 	# this assumes we're on Unix.
-@@ -3438,7 +3474,7 @@
- 	: ${BUILD_CC:='${CC}'}
- 
- 	if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
--		{ { echo "$as_me:3441: error: Cross-build requires two compilers.
-+		{ { echo "$as_me:3477: 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;}
-@@ -3463,7 +3499,7 @@
- ### shared, for example.
- cf_list_models=""
- 
--echo "$as_me:3466: checking if you want to build shared C-objects" >&5
-+echo "$as_me:3502: checking if you want to build shared C-objects" >&5
- echo $ECHO_N "checking if you want to build shared C-objects... $ECHO_C" >&6
- 
- # Check whether --with-shared or --without-shared was given.
-@@ -3473,27 +3509,27 @@
- else
-   with_shared=no
- fi;
--echo "$as_me:3476: result: $with_shared" >&5
-+echo "$as_me:3512: result: $with_shared" >&5
- echo "${ECHO_T}$with_shared" >&6
- test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
- 
--echo "$as_me:3480: checking for specified models" >&5
-+echo "$as_me:3516: checking for specified models" >&5
- echo $ECHO_N "checking for specified models... $ECHO_C" >&6
- test -z "$cf_list_models" && cf_list_models=normal
--echo "$as_me:3483: result: $cf_list_models" >&5
-+echo "$as_me:3519: result: $cf_list_models" >&5
- echo "${ECHO_T}$cf_list_models" >&6
- 
- ### Use the first model as the default, and save its suffix for use in building
- ### up test-applications.
--echo "$as_me:3488: checking for default model" >&5
-+echo "$as_me:3524: checking for default model" >&5
- echo $ECHO_N "checking for default model... $ECHO_C" >&6
- DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'`
--echo "$as_me:3491: result: $DFT_LWR_MODEL" >&5
-+echo "$as_me:3527: result: $DFT_LWR_MODEL" >&5
- echo "${ECHO_T}$DFT_LWR_MODEL" >&6
- 
- DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
- 
--echo "$as_me:3496: checking for specific curses-directory" >&5
-+echo "$as_me:3532: 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.
-@@ -3503,7 +3539,7 @@
- else
-   cf_cv_curses_dir=no
- fi;
--echo "$as_me:3506: result: $cf_cv_curses_dir" >&5
-+echo "$as_me:3542: 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" )
-@@ -3534,7 +3570,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:3537: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:3573: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -3567,7 +3603,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 3570 "configure"
-+#line 3606 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -3579,16 +3615,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:3582: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3618: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:3585: \$? = $ac_status" >&5
-+  echo "$as_me:3621: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:3588: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3624: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3591: \$? = $ac_status" >&5
-+  echo "$as_me:3627: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -3605,7 +3641,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:3608: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:3644: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -3641,7 +3677,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:3644: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:3680: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -3656,13 +3692,13 @@
- cf_have_ncuconfig=no
- 
- if test "x${PKG_CONFIG:=none}" != xnone; then
--	echo "$as_me:3659: checking pkg-config for $cf_ncuconfig_root" >&5
-+	echo "$as_me:3695: 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:3662: result: yes" >&5
-+		echo "$as_me:3698: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
--		echo "$as_me:3665: checking if the $cf_ncuconfig_root package files work" >&5
-+		echo "$as_me:3701: 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
- 
-@@ -3688,7 +3724,7 @@
- LIBS="$cf_add_libs"
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 3691 "configure"
-+#line 3727 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -3700,37 +3736,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:3703: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:3739: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:3706: \$? = $ac_status" >&5
-+  echo "$as_me:3742: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:3709: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3745: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3712: \$? = $ac_status" >&5
-+  echo "$as_me:3748: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   if test "$cross_compiling" = yes; then
-   cf_have_ncuconfig=maybe
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 3718 "configure"
-+#line 3754 "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:3725: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:3761: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:3728: \$? = $ac_status" >&5
-+  echo "$as_me:3764: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:3730: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3766: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3733: \$? = $ac_status" >&5
-+  echo "$as_me:3769: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_have_ncuconfig=yes
- else
-@@ -3747,7 +3783,7 @@
- cf_have_ncuconfig=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--		echo "$as_me:3750: result: $cf_have_ncuconfig" >&5
-+		echo "$as_me:3786: 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"
-@@ -3765,7 +3801,7 @@
- 		fi
- 
- 	else
--		echo "$as_me:3768: result: no" >&5
-+		echo "$as_me:3804: result: no" >&5
- echo "${ECHO_T}no" >&6
- 		NCURSES_CONFIG_PKG=none
- 	fi
-@@ -3781,7 +3817,7 @@
-   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:3784: checking for $ac_word" >&5
-+echo "$as_me:3820: 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
-@@ -3796,7 +3832,7 @@
-   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:3799: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3835: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3804,10 +3840,10 @@
- fi
- NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
- if test -n "$NCURSES_CONFIG"; then
--  echo "$as_me:3807: result: $NCURSES_CONFIG" >&5
-+  echo "$as_me:3843: result: $NCURSES_CONFIG" >&5
- echo "${ECHO_T}$NCURSES_CONFIG" >&6
- else
--  echo "$as_me:3810: result: no" >&5
-+  echo "$as_me:3846: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3820,7 +3856,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:3823: checking for $ac_word" >&5
-+echo "$as_me:3859: 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
-@@ -3835,7 +3871,7 @@
-   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:3838: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3874: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3843,10 +3879,10 @@
- fi
- ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
- if test -n "$ac_ct_NCURSES_CONFIG"; then
--  echo "$as_me:3846: result: $ac_ct_NCURSES_CONFIG" >&5
-+  echo "$as_me:3882: result: $ac_ct_NCURSES_CONFIG" >&5
- echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
- else
--  echo "$as_me:3849: result: no" >&5
-+  echo "$as_me:3885: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3879,7 +3915,7 @@
- 
- 		# even with config script, some packages use no-override for curses.h
- 
--echo "$as_me:3882: checking if we have identified curses headers" >&5
-+echo "$as_me:3918: 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
-@@ -3891,7 +3927,7 @@
- 	curses.h ncurses/curses.h
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 3894 "configure"
-+#line 3930 "configure"
- #include "confdefs.h"
- #include <${cf_header}>
- int
-@@ -3903,16 +3939,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:3906: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3942: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:3909: \$? = $ac_status" >&5
-+  echo "$as_me:3945: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:3912: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3948: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3915: \$? = $ac_status" >&5
-+  echo "$as_me:3951: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_header=$cf_header; break
- else
-@@ -3923,11 +3959,11 @@
- done
- 
- fi
--echo "$as_me:3926: result: $cf_cv_ncurses_header" >&5
-+echo "$as_me:3962: 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:3930: error: No curses header-files found" >&5
-+	{ { echo "$as_me:3966: error: No curses header-files found" >&5
- echo "$as_me: error: No curses header-files found" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -3937,23 +3973,23 @@
- for ac_header in $cf_cv_ncurses_header
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:3940: checking for $ac_header" >&5
-+echo "$as_me:3976: 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 3946 "configure"
-+#line 3982 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:3950: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:3986: \"$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:3956: \$? = $ac_status" >&5
-+  echo "$as_me:3992: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -3972,7 +4008,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:3975: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:4011: 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 <conftest.$ac_ext <<_ACEOF
--#line 4028 "configure"
-+#line 4064 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -4037,16 +4073,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4040: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4076: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:4043: \$? = $ac_status" >&5
-+  echo "$as_me:4079: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:4046: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4082: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4049: \$? = $ac_status" >&5
-+  echo "$as_me:4085: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -4063,7 +4099,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:4066: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:4102: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -4082,7 +4118,7 @@
- 
- }
- 
--echo "$as_me:4085: checking for $cf_ncuhdr_root header in include-path" >&5
-+echo "$as_me:4121: 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
-@@ -4094,7 +4130,7 @@
- 	do
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 4097 "configure"
-+#line 4133 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -4118,16 +4154,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4121: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4157: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:4124: \$? = $ac_status" >&5
-+  echo "$as_me:4160: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:4127: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4163: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4130: \$? = $ac_status" >&5
-+  echo "$as_me:4166: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_h=$cf_header
- 
-@@ -4142,14 +4178,14 @@
- 	done
- 
- fi
--echo "$as_me:4145: result: $cf_cv_ncurses_h" >&5
-+echo "$as_me:4181: 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:4152: checking for $cf_ncuhdr_root include-path" >&5
-+echo "$as_me:4188: 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
-@@ -4267,7 +4303,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 4270 "configure"
-+#line 4306 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -4279,16 +4315,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4282: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4318: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:4285: \$? = $ac_status" >&5
-+  echo "$as_me:4321: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:4288: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4324: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4291: \$? = $ac_status" >&5
-+  echo "$as_me:4327: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -4305,7 +4341,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:4308: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:4344: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -4328,7 +4364,7 @@
- 		do
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 4331 "configure"
-+#line 4367 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -4352,16 +4388,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4355: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4391: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:4358: \$? = $ac_status" >&5
-+  echo "$as_me:4394: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:4361: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4397: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4364: \$? = $ac_status" >&5
-+  echo "$as_me:4400: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_h2=$cf_header
- 
-@@ -4382,12 +4418,12 @@
- 		CPPFLAGS="$cf_save2_CPPFLAGS"
- 		test "$cf_cv_ncurses_h2" != no && break
- 	done
--	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:4385: error: not found" >&5
-+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:4421: error: not found" >&5
- echo "$as_me: error: not found" >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
--echo "$as_me:4390: result: $cf_cv_ncurses_h2" >&5
-+echo "$as_me:4426: 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%/[^/]*$%%'`
-@@ -4420,7 +4456,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 4423 "configure"
-+#line 4459 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -4432,16 +4468,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4435: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4471: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:4438: \$? = $ac_status" >&5
-+  echo "$as_me:4474: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:4441: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4477: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4444: \$? = $ac_status" >&5
-+  echo "$as_me:4480: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -4458,7 +4494,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:4461: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:4497: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -4506,7 +4542,7 @@
- 	;;
- esac
- 
--echo "$as_me:4509: checking for terminfo header" >&5
-+echo "$as_me:4545: 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
-@@ -4524,7 +4560,7 @@
- for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 4527 "configure"
-+#line 4563 "configure"
- #include "confdefs.h"
- #include 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -4539,16 +4575,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4542: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4578: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:4545: \$? = $ac_status" >&5
-+  echo "$as_me:4581: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:4548: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4584: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4551: \$? = $ac_status" >&5
-+  echo "$as_me:4587: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_term_header="$cf_test"
-@@ -4564,7 +4600,7 @@
- done
- 
- fi
--echo "$as_me:4567: result: $cf_cv_term_header" >&5
-+echo "$as_me:4603: result: $cf_cv_term_header" >&5
- echo "${ECHO_T}$cf_cv_term_header" >&6
- 
- # Set definitions to allow ifdef'ing to accommodate subdirectories
-@@ -4602,7 +4638,7 @@
- #define NCURSES 1
- EOF
- 
--echo "$as_me:4605: checking for ncurses version" >&5
-+echo "$as_me:4641: 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
-@@ -4628,10 +4664,10 @@
- #endif
- EOF
- 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
--	{ (eval echo "$as_me:4631: \"$cf_try\"") >&5
-+	{ (eval echo "$as_me:4667: \"$cf_try\"") >&5
-   (eval $cf_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4634: \$? = $ac_status" >&5
-+  echo "$as_me:4670: \$? = $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%".*%%'`
-@@ -4641,7 +4677,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 4644 "configure"
-+#line 4680 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -4666,15 +4702,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:4669: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4705: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4672: \$? = $ac_status" >&5
-+  echo "$as_me:4708: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:4674: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4710: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4677: \$? = $ac_status" >&5
-+  echo "$as_me:4713: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_ncurses_version=`cat $cf_tempfile`
-@@ -4688,7 +4724,7 @@
- 	rm -f $cf_tempfile
- 
- fi
--echo "$as_me:4691: result: $cf_cv_ncurses_version" >&5
-+echo "$as_me:4727: result: $cf_cv_ncurses_version" >&5
- echo "${ECHO_T}$cf_cv_ncurses_version" >&6
- test "$cf_cv_ncurses_version" = no ||
- cat >>confdefs.h <<\EOF
-@@ -4701,7 +4737,7 @@
- 	# to link gpm.
- cf_ncurses_LIBS=""
- cf_ncurses_SAVE="$LIBS"
--echo "$as_me:4704: checking for Gpm_Open in -lgpm" >&5
-+echo "$as_me:4740: 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
-@@ -4709,7 +4745,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 4712 "configure"
-+#line 4748 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -4728,16 +4764,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:4731: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4767: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4734: \$? = $ac_status" >&5
-+  echo "$as_me:4770: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:4737: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4773: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4740: \$? = $ac_status" >&5
-+  echo "$as_me:4776: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_Gpm_Open=yes
- else
-@@ -4748,10 +4784,10 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:4751: result: $ac_cv_lib_gpm_Gpm_Open" >&5
-+echo "$as_me:4787: 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:4754: checking for initscr in -lgpm" >&5
-+  echo "$as_me:4790: 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
-@@ -4759,7 +4795,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 4762 "configure"
-+#line 4798 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -4778,16 +4814,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:4781: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4817: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4784: \$? = $ac_status" >&5
-+  echo "$as_me:4820: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:4787: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4823: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4790: \$? = $ac_status" >&5
-+  echo "$as_me:4826: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_initscr=yes
- else
-@@ -4798,7 +4834,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:4801: result: $ac_cv_lib_gpm_initscr" >&5
-+echo "$as_me:4837: 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"
-@@ -4813,7 +4849,7 @@
- 	# 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:4816: checking for tgoto in -lmytinfo" >&5
-+		echo "$as_me:4852: 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
-@@ -4821,7 +4857,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmytinfo  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 4824 "configure"
-+#line 4860 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -4840,16 +4876,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:4843: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4879: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4846: \$? = $ac_status" >&5
-+  echo "$as_me:4882: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:4849: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4885: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4852: \$? = $ac_status" >&5
-+  echo "$as_me:4888: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_mytinfo_tgoto=yes
- else
-@@ -4860,7 +4896,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:4863: result: $ac_cv_lib_mytinfo_tgoto" >&5
-+echo "$as_me:4899: 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"
-@@ -4909,13 +4945,13 @@
- 
- 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
- 	cf_libdir=""
--	echo "$as_me:4912: checking for initscr" >&5
-+	echo "$as_me:4948: 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 4918 "configure"
-+#line 4954 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char initscr (); below.  */
-@@ -4946,16 +4982,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:4949: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4985: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4952: \$? = $ac_status" >&5
-+  echo "$as_me:4988: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:4955: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4991: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4958: \$? = $ac_status" >&5
-+  echo "$as_me:4994: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_initscr=yes
- else
-@@ -4965,18 +5001,18 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:4968: result: $ac_cv_func_initscr" >&5
-+echo "$as_me:5004: 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:4975: checking for initscr in -l$cf_nculib_root" >&5
-+		echo "$as_me:5011: 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 4979 "configure"
-+#line 5015 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -4988,25 +5024,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:4991: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5027: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4994: \$? = $ac_status" >&5
-+  echo "$as_me:5030: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:4997: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5033: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5000: \$? = $ac_status" >&5
-+  echo "$as_me:5036: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:5002: result: yes" >&5
-+  echo "$as_me:5038: 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:5009: result: no" >&5
-+echo "$as_me:5045: result: no" >&5
- echo "${ECHO_T}no" >&6
- 
- cf_search=
-@@ -5074,11 +5110,11 @@
- 
- 			for cf_libdir in $cf_search
- 			do
--				echo "$as_me:5077: checking for -l$cf_nculib_root in $cf_libdir" >&5
-+				echo "$as_me:5113: 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 5081 "configure"
-+#line 5117 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -5090,25 +5126,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5093: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5129: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5096: \$? = $ac_status" >&5
-+  echo "$as_me:5132: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5099: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5135: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5102: \$? = $ac_status" >&5
-+  echo "$as_me:5138: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:5104: result: yes" >&5
-+  echo "$as_me:5140: 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:5111: result: no" >&5
-+echo "$as_me:5147: result: no" >&5
- echo "${ECHO_T}no" >&6
- 					 LIBS="$cf_save_LIBS"
- fi
-@@ -5123,7 +5159,7 @@
- eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
- 
- if test $cf_found_library = no ; then
--	{ { echo "$as_me:5126: error: Cannot link $cf_nculib_root library" >&5
-+	{ { echo "$as_me:5162: error: Cannot link $cf_nculib_root library" >&5
- echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -5131,7 +5167,7 @@
- fi
- 
- if test -n "$cf_ncurses_LIBS" ; then
--	echo "$as_me:5134: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
-+	echo "$as_me:5170: 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
-@@ -5141,7 +5177,7 @@
- 		fi
- 	done
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 5144 "configure"
-+#line 5180 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -5153,23 +5189,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5156: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5192: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5159: \$? = $ac_status" >&5
-+  echo "$as_me:5195: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5162: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5198: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5165: \$? = $ac_status" >&5
-+  echo "$as_me:5201: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:5167: result: yes" >&5
-+  echo "$as_me:5203: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:5172: result: no" >&5
-+echo "$as_me:5208: result: no" >&5
- echo "${ECHO_T}no" >&6
- 		 LIBS="$cf_ncurses_SAVE"
- fi
-@@ -5187,7 +5223,7 @@
- 	NCURSES_CONFIG=none
- fi
- 
--echo "$as_me:5190: checking if you want wide-character code" >&5
-+echo "$as_me:5226: checking if you want wide-character code" >&5
- echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6
- 
- # Check whether --enable-widec or --disable-widec was given.
-@@ -5197,11 +5233,11 @@
- else
-   with_widec=no
- fi;
--echo "$as_me:5200: result: $with_widec" >&5
-+echo "$as_me:5236: result: $with_widec" >&5
- echo "${ECHO_T}$with_widec" >&6
- if test "$with_widec" = yes ; then
- 
--echo "$as_me:5204: checking for multibyte character support" >&5
-+echo "$as_me:5240: 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
-@@ -5209,7 +5245,7 @@
- 
- 	cf_save_LIBS="$LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 5212 "configure"
-+#line 5248 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -5222,16 +5258,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5225: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5261: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5228: \$? = $ac_status" >&5
-+  echo "$as_me:5264: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5231: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5267: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5234: \$? = $ac_status" >&5
-+  echo "$as_me:5270: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_utf8_lib=yes
- else
-@@ -5243,12 +5279,12 @@
- cf_cv_header_path_utf8=
- cf_cv_library_path_utf8=
- 
--echo "${as_me:-configure}:5246: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:5282: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
- 
- cf_save_LIBS="$LIBS"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 5251 "configure"
-+#line 5287 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -5261,16 +5297,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5264: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5300: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5267: \$? = $ac_status" >&5
-+  echo "$as_me:5303: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5270: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5306: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5273: \$? = $ac_status" >&5
-+  echo "$as_me:5309: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_find_linkage_utf8=yes
-@@ -5284,7 +5320,7 @@
- LIBS="-lutf8  $cf_save_LIBS"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 5287 "configure"
-+#line 5323 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -5297,16 +5333,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5300: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5336: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5303: \$? = $ac_status" >&5
-+  echo "$as_me:5339: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5306: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5342: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5309: \$? = $ac_status" >&5
-+  echo "$as_me:5345: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_find_linkage_utf8=yes
-@@ -5323,9 +5359,9 @@
- 
- 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
- 
--echo "${as_me:-configure}:5326: testing find linkage for utf8 library ..." 1>&5
-+echo "${as_me:-configure}:5362: testing find linkage for utf8 library ..." 1>&5
- 
--echo "${as_me:-configure}:5328: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:5364: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
- 
- 	cf_save_CPPFLAGS="$CPPFLAGS"
- 	cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -5416,11 +5452,11 @@
- 		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}:5419: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:5455: 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 5423 "configure"
-+#line 5459 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -5433,21 +5469,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:5436: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5472: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:5439: \$? = $ac_status" >&5
-+  echo "$as_me:5475: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:5442: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5478: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5445: \$? = $ac_status" >&5
-+  echo "$as_me:5481: \$? = $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}:5450: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:5486: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
- 
- 				cf_cv_find_linkage_utf8=maybe
- 				cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -5465,7 +5501,7 @@
- 
- 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
- 
--echo "${as_me:-configure}:5468: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:5504: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
- 
- 		cf_save_LIBS="$LIBS"
- 		cf_save_LDFLAGS="$LDFLAGS"
-@@ -5540,13 +5576,13 @@
- 				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}:5543: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:5579: 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 5549 "configure"
-+#line 5585 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -5559,21 +5595,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5562: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5598: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5565: \$? = $ac_status" >&5
-+  echo "$as_me:5601: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5568: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5604: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5571: \$? = $ac_status" >&5
-+  echo "$as_me:5607: \$? = $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}:5576: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:5612: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
- 
- 					cf_cv_find_linkage_utf8=yes
- 					cf_cv_library_file_utf8="-lutf8"
-@@ -5615,7 +5651,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:5618: result: $cf_cv_utf8_lib" >&5
-+echo "$as_me:5654: 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
-@@ -5650,7 +5686,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 5653 "configure"
-+#line 5689 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -5662,16 +5698,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:5665: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5701: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:5668: \$? = $ac_status" >&5
-+  echo "$as_me:5704: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:5671: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5707: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5674: \$? = $ac_status" >&5
-+  echo "$as_me:5710: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -5688,7 +5724,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:5691: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:5727: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -5724,7 +5760,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:5727: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:5763: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -5754,13 +5790,13 @@
- cf_have_ncuconfig=no
- 
- if test "x${PKG_CONFIG:=none}" != xnone; then
--	echo "$as_me:5757: checking pkg-config for $cf_ncuconfig_root" >&5
-+	echo "$as_me:5793: 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:5760: result: yes" >&5
-+		echo "$as_me:5796: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
--		echo "$as_me:5763: checking if the $cf_ncuconfig_root package files work" >&5
-+		echo "$as_me:5799: 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
- 
-@@ -5786,7 +5822,7 @@
- LIBS="$cf_add_libs"
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 5789 "configure"
-+#line 5825 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -5798,37 +5834,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5801: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5837: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5804: \$? = $ac_status" >&5
-+  echo "$as_me:5840: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5807: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5843: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5810: \$? = $ac_status" >&5
-+  echo "$as_me:5846: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   if test "$cross_compiling" = yes; then
-   cf_have_ncuconfig=maybe
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5816 "configure"
-+#line 5852 "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:5823: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5859: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5826: \$? = $ac_status" >&5
-+  echo "$as_me:5862: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:5828: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5864: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5831: \$? = $ac_status" >&5
-+  echo "$as_me:5867: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_have_ncuconfig=yes
- else
-@@ -5845,7 +5881,7 @@
- cf_have_ncuconfig=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--		echo "$as_me:5848: result: $cf_have_ncuconfig" >&5
-+		echo "$as_me:5884: 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"
-@@ -5863,7 +5899,7 @@
- 		fi
- 
- 	else
--		echo "$as_me:5866: result: no" >&5
-+		echo "$as_me:5902: result: no" >&5
- echo "${ECHO_T}no" >&6
- 		NCURSES_CONFIG_PKG=none
- 	fi
-@@ -5879,7 +5915,7 @@
-   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:5882: checking for $ac_word" >&5
-+echo "$as_me:5918: 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
-@@ -5894,7 +5930,7 @@
-   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:5897: found $ac_dir/$ac_word" >&5
-+echo "$as_me:5933: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -5902,10 +5938,10 @@
- fi
- NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
- if test -n "$NCURSES_CONFIG"; then
--  echo "$as_me:5905: result: $NCURSES_CONFIG" >&5
-+  echo "$as_me:5941: result: $NCURSES_CONFIG" >&5
- echo "${ECHO_T}$NCURSES_CONFIG" >&6
- else
--  echo "$as_me:5908: result: no" >&5
-+  echo "$as_me:5944: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -5918,7 +5954,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:5921: checking for $ac_word" >&5
-+echo "$as_me:5957: 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
-@@ -5933,7 +5969,7 @@
-   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:5936: found $ac_dir/$ac_word" >&5
-+echo "$as_me:5972: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -5941,10 +5977,10 @@
- fi
- ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
- if test -n "$ac_ct_NCURSES_CONFIG"; then
--  echo "$as_me:5944: result: $ac_ct_NCURSES_CONFIG" >&5
-+  echo "$as_me:5980: result: $ac_ct_NCURSES_CONFIG" >&5
- echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
- else
--  echo "$as_me:5947: result: no" >&5
-+  echo "$as_me:5983: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -5977,7 +6013,7 @@
- 
- 		# even with config script, some packages use no-override for curses.h
- 
--echo "$as_me:5980: checking if we have identified curses headers" >&5
-+echo "$as_me:6016: 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
-@@ -5989,7 +6025,7 @@
- 	curses.h ncursesw/curses.h
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 5992 "configure"
-+#line 6028 "configure"
- #include "confdefs.h"
- #include <${cf_header}>
- int
-@@ -6001,16 +6037,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6004: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6040: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6007: \$? = $ac_status" >&5
-+  echo "$as_me:6043: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6010: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6046: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6013: \$? = $ac_status" >&5
-+  echo "$as_me:6049: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_header=$cf_header; break
- else
-@@ -6021,11 +6057,11 @@
- done
- 
- fi
--echo "$as_me:6024: result: $cf_cv_ncurses_header" >&5
-+echo "$as_me:6060: 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:6028: error: No curses header-files found" >&5
-+	{ { echo "$as_me:6064: error: No curses header-files found" >&5
- echo "$as_me: error: No curses header-files found" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -6035,23 +6071,23 @@
- for ac_header in $cf_cv_ncurses_header
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:6038: checking for $ac_header" >&5
-+echo "$as_me:6074: 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 6044 "configure"
-+#line 6080 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:6048: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:6084: \"$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:6054: \$? = $ac_status" >&5
-+  echo "$as_me:6090: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -6070,7 +6106,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:6073: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:6109: 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 <conftest.$ac_ext <<_ACEOF
--#line 6126 "configure"
-+#line 6162 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -6135,16 +6171,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6138: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6174: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6141: \$? = $ac_status" >&5
-+  echo "$as_me:6177: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6144: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6180: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6147: \$? = $ac_status" >&5
-+  echo "$as_me:6183: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -6161,7 +6197,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:6164: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:6200: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -6180,7 +6216,7 @@
- 
- }
- 
--echo "$as_me:6183: checking for $cf_ncuhdr_root header in include-path" >&5
-+echo "$as_me:6219: 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
-@@ -6192,7 +6228,7 @@
- 	do
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 6195 "configure"
-+#line 6231 "configure"
- #include "confdefs.h"
- 
- #define _XOPEN_SOURCE_EXTENDED
-@@ -6224,16 +6260,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6227: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6263: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6230: \$? = $ac_status" >&5
-+  echo "$as_me:6266: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6233: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6269: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6236: \$? = $ac_status" >&5
-+  echo "$as_me:6272: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_h=$cf_header
- 
-@@ -6248,14 +6284,14 @@
- 	done
- 
- fi
--echo "$as_me:6251: result: $cf_cv_ncurses_h" >&5
-+echo "$as_me:6287: 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:6258: checking for $cf_ncuhdr_root include-path" >&5
-+echo "$as_me:6294: 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
-@@ -6373,7 +6409,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 6376 "configure"
-+#line 6412 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -6385,16 +6421,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6388: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6424: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6391: \$? = $ac_status" >&5
-+  echo "$as_me:6427: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6394: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6430: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6397: \$? = $ac_status" >&5
-+  echo "$as_me:6433: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -6411,7 +6447,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:6414: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:6450: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -6434,7 +6470,7 @@
- 		do
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 6437 "configure"
-+#line 6473 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -6458,16 +6494,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6461: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6497: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6464: \$? = $ac_status" >&5
-+  echo "$as_me:6500: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6467: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6503: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6470: \$? = $ac_status" >&5
-+  echo "$as_me:6506: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_h2=$cf_header
- 
-@@ -6488,12 +6524,12 @@
- 		CPPFLAGS="$cf_save2_CPPFLAGS"
- 		test "$cf_cv_ncurses_h2" != no && break
- 	done
--	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6491: error: not found" >&5
-+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6527: error: not found" >&5
- echo "$as_me: error: not found" >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
--echo "$as_me:6496: result: $cf_cv_ncurses_h2" >&5
-+echo "$as_me:6532: 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%/[^/]*$%%'`
-@@ -6526,7 +6562,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 6529 "configure"
-+#line 6565 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -6538,16 +6574,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6541: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6577: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6544: \$? = $ac_status" >&5
-+  echo "$as_me:6580: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6547: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6583: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6550: \$? = $ac_status" >&5
-+  echo "$as_me:6586: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -6564,7 +6600,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:6567: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:6603: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -6612,7 +6648,7 @@
- 	;;
- esac
- 
--echo "$as_me:6615: checking for terminfo header" >&5
-+echo "$as_me:6651: 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
-@@ -6630,7 +6666,7 @@
- for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 6633 "configure"
-+#line 6669 "configure"
- #include "confdefs.h"
- #include 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -6645,16 +6681,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6648: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6684: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6651: \$? = $ac_status" >&5
-+  echo "$as_me:6687: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6654: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6690: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6657: \$? = $ac_status" >&5
-+  echo "$as_me:6693: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_term_header="$cf_test"
-@@ -6670,7 +6706,7 @@
- done
- 
- fi
--echo "$as_me:6673: result: $cf_cv_term_header" >&5
-+echo "$as_me:6709: result: $cf_cv_term_header" >&5
- echo "${ECHO_T}$cf_cv_term_header" >&6
- 
- # Set definitions to allow ifdef'ing to accommodate subdirectories
-@@ -6708,7 +6744,7 @@
- #define NCURSES 1
- EOF
- 
--echo "$as_me:6711: checking for ncurses version" >&5
-+echo "$as_me:6747: 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
-@@ -6734,10 +6770,10 @@
- #endif
- EOF
- 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
--	{ (eval echo "$as_me:6737: \"$cf_try\"") >&5
-+	{ (eval echo "$as_me:6773: \"$cf_try\"") >&5
-   (eval $cf_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6740: \$? = $ac_status" >&5
-+  echo "$as_me:6776: \$? = $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%".*%%'`
-@@ -6747,7 +6783,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 6750 "configure"
-+#line 6786 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -6772,15 +6808,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:6775: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6811: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6778: \$? = $ac_status" >&5
-+  echo "$as_me:6814: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:6780: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6816: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6783: \$? = $ac_status" >&5
-+  echo "$as_me:6819: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_ncurses_version=`cat $cf_tempfile`
-@@ -6794,7 +6830,7 @@
- 	rm -f $cf_tempfile
- 
- fi
--echo "$as_me:6797: result: $cf_cv_ncurses_version" >&5
-+echo "$as_me:6833: result: $cf_cv_ncurses_version" >&5
- echo "${ECHO_T}$cf_cv_ncurses_version" >&6
- test "$cf_cv_ncurses_version" = no ||
- cat >>confdefs.h <<\EOF
-@@ -6807,7 +6843,7 @@
- 	# to link gpm.
- cf_ncurses_LIBS=""
- cf_ncurses_SAVE="$LIBS"
--echo "$as_me:6810: checking for Gpm_Open in -lgpm" >&5
-+echo "$as_me:6846: 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
-@@ -6815,7 +6851,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 6818 "configure"
-+#line 6854 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -6834,16 +6870,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6837: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6873: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6840: \$? = $ac_status" >&5
-+  echo "$as_me:6876: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6843: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6879: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6846: \$? = $ac_status" >&5
-+  echo "$as_me:6882: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_Gpm_Open=yes
- else
-@@ -6854,10 +6890,10 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:6857: result: $ac_cv_lib_gpm_Gpm_Open" >&5
-+echo "$as_me:6893: 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:6860: checking for initscr in -lgpm" >&5
-+  echo "$as_me:6896: 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
-@@ -6865,7 +6901,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 6868 "configure"
-+#line 6904 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -6884,16 +6920,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6887: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6923: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6890: \$? = $ac_status" >&5
-+  echo "$as_me:6926: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6893: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6929: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6896: \$? = $ac_status" >&5
-+  echo "$as_me:6932: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_initscr=yes
- else
-@@ -6904,7 +6940,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:6907: result: $ac_cv_lib_gpm_initscr" >&5
-+echo "$as_me:6943: 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"
-@@ -6919,7 +6955,7 @@
- 	# 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:6922: checking for tgoto in -lmytinfo" >&5
-+		echo "$as_me:6958: 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
-@@ -6927,7 +6963,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmytinfo  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 6930 "configure"
-+#line 6966 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -6946,16 +6982,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6949: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6985: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6952: \$? = $ac_status" >&5
-+  echo "$as_me:6988: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6955: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6991: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6958: \$? = $ac_status" >&5
-+  echo "$as_me:6994: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_mytinfo_tgoto=yes
- else
-@@ -6966,7 +7002,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:6969: result: $ac_cv_lib_mytinfo_tgoto" >&5
-+echo "$as_me:7005: 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"
-@@ -7015,13 +7051,13 @@
- 
- 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
- 	cf_libdir=""
--	echo "$as_me:7018: checking for initscr" >&5
-+	echo "$as_me:7054: 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 7024 "configure"
-+#line 7060 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char initscr (); below.  */
-@@ -7052,16 +7088,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7055: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7091: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7058: \$? = $ac_status" >&5
-+  echo "$as_me:7094: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7061: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7097: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7064: \$? = $ac_status" >&5
-+  echo "$as_me:7100: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_initscr=yes
- else
-@@ -7071,18 +7107,18 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:7074: result: $ac_cv_func_initscr" >&5
-+echo "$as_me:7110: 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:7081: checking for initscr in -l$cf_nculib_root" >&5
-+		echo "$as_me:7117: 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 7085 "configure"
-+#line 7121 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -7094,25 +7130,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7097: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7133: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7100: \$? = $ac_status" >&5
-+  echo "$as_me:7136: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7103: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7139: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7106: \$? = $ac_status" >&5
-+  echo "$as_me:7142: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:7108: result: yes" >&5
-+  echo "$as_me:7144: 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:7115: result: no" >&5
-+echo "$as_me:7151: result: no" >&5
- echo "${ECHO_T}no" >&6
- 
- cf_search=
-@@ -7180,11 +7216,11 @@
- 
- 			for cf_libdir in $cf_search
- 			do
--				echo "$as_me:7183: checking for -l$cf_nculib_root in $cf_libdir" >&5
-+				echo "$as_me:7219: 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 7187 "configure"
-+#line 7223 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -7196,25 +7232,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7199: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7235: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7202: \$? = $ac_status" >&5
-+  echo "$as_me:7238: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7205: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7241: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7208: \$? = $ac_status" >&5
-+  echo "$as_me:7244: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:7210: result: yes" >&5
-+  echo "$as_me:7246: 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:7217: result: no" >&5
-+echo "$as_me:7253: result: no" >&5
- echo "${ECHO_T}no" >&6
- 					 LIBS="$cf_save_LIBS"
- fi
-@@ -7229,7 +7265,7 @@
- eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
- 
- if test $cf_found_library = no ; then
--	{ { echo "$as_me:7232: error: Cannot link $cf_nculib_root library" >&5
-+	{ { echo "$as_me:7268: error: Cannot link $cf_nculib_root library" >&5
- echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -7237,7 +7273,7 @@
- fi
- 
- if test -n "$cf_ncurses_LIBS" ; then
--	echo "$as_me:7240: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
-+	echo "$as_me:7276: 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
-@@ -7247,7 +7283,7 @@
- 		fi
- 	done
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 7250 "configure"
-+#line 7286 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -7259,23 +7295,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7262: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7298: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7265: \$? = $ac_status" >&5
-+  echo "$as_me:7301: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7268: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7304: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7271: \$? = $ac_status" >&5
-+  echo "$as_me:7307: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:7273: result: yes" >&5
-+  echo "$as_me:7309: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:7278: result: no" >&5
-+echo "$as_me:7314: result: no" >&5
- echo "${ECHO_T}no" >&6
- 		 LIBS="$cf_ncurses_SAVE"
- fi
-@@ -7299,13 +7335,13 @@
- cf_have_ncuconfig=no
- 
- if test "x${PKG_CONFIG:=none}" != xnone; then
--	echo "$as_me:7302: checking pkg-config for $cf_ncuconfig_root" >&5
-+	echo "$as_me:7338: 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:7305: result: yes" >&5
-+		echo "$as_me:7341: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
--		echo "$as_me:7308: checking if the $cf_ncuconfig_root package files work" >&5
-+		echo "$as_me:7344: 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
- 
-@@ -7331,7 +7367,7 @@
- LIBS="$cf_add_libs"
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 7334 "configure"
-+#line 7370 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -7343,37 +7379,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7346: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7382: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7349: \$? = $ac_status" >&5
-+  echo "$as_me:7385: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7352: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7388: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7355: \$? = $ac_status" >&5
-+  echo "$as_me:7391: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   if test "$cross_compiling" = yes; then
-   cf_have_ncuconfig=maybe
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7361 "configure"
-+#line 7397 "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:7368: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7404: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7371: \$? = $ac_status" >&5
-+  echo "$as_me:7407: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:7373: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7409: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7376: \$? = $ac_status" >&5
-+  echo "$as_me:7412: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_have_ncuconfig=yes
- else
-@@ -7390,7 +7426,7 @@
- cf_have_ncuconfig=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--		echo "$as_me:7393: result: $cf_have_ncuconfig" >&5
-+		echo "$as_me:7429: 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"
-@@ -7408,7 +7444,7 @@
- 		fi
- 
- 	else
--		echo "$as_me:7411: result: no" >&5
-+		echo "$as_me:7447: result: no" >&5
- echo "${ECHO_T}no" >&6
- 		NCURSES_CONFIG_PKG=none
- 	fi
-@@ -7424,7 +7460,7 @@
-   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:7427: checking for $ac_word" >&5
-+echo "$as_me:7463: 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
-@@ -7439,7 +7475,7 @@
-   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:7442: found $ac_dir/$ac_word" >&5
-+echo "$as_me:7478: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -7447,10 +7483,10 @@
- fi
- NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
- if test -n "$NCURSES_CONFIG"; then
--  echo "$as_me:7450: result: $NCURSES_CONFIG" >&5
-+  echo "$as_me:7486: result: $NCURSES_CONFIG" >&5
- echo "${ECHO_T}$NCURSES_CONFIG" >&6
- else
--  echo "$as_me:7453: result: no" >&5
-+  echo "$as_me:7489: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -7463,7 +7499,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:7466: checking for $ac_word" >&5
-+echo "$as_me:7502: 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
-@@ -7478,7 +7514,7 @@
-   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:7481: found $ac_dir/$ac_word" >&5
-+echo "$as_me:7517: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -7486,10 +7522,10 @@
- fi
- ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
- if test -n "$ac_ct_NCURSES_CONFIG"; then
--  echo "$as_me:7489: result: $ac_ct_NCURSES_CONFIG" >&5
-+  echo "$as_me:7525: result: $ac_ct_NCURSES_CONFIG" >&5
- echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
- else
--  echo "$as_me:7492: result: no" >&5
-+  echo "$as_me:7528: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -7522,7 +7558,7 @@
- 
- 		# even with config script, some packages use no-override for curses.h
- 
--echo "$as_me:7525: checking if we have identified curses headers" >&5
-+echo "$as_me:7561: 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
-@@ -7534,7 +7570,7 @@
- 	curses.h ncurses/curses.h
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 7537 "configure"
-+#line 7573 "configure"
- #include "confdefs.h"
- #include <${cf_header}>
- int
-@@ -7546,16 +7582,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7549: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7585: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7552: \$? = $ac_status" >&5
-+  echo "$as_me:7588: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7555: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7591: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7558: \$? = $ac_status" >&5
-+  echo "$as_me:7594: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_header=$cf_header; break
- else
-@@ -7566,11 +7602,11 @@
- done
- 
- fi
--echo "$as_me:7569: result: $cf_cv_ncurses_header" >&5
-+echo "$as_me:7605: 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:7573: error: No curses header-files found" >&5
-+	{ { echo "$as_me:7609: error: No curses header-files found" >&5
- echo "$as_me: error: No curses header-files found" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -7580,23 +7616,23 @@
- for ac_header in $cf_cv_ncurses_header
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:7583: checking for $ac_header" >&5
-+echo "$as_me:7619: 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 7589 "configure"
-+#line 7625 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:7593: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:7629: \"$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:7599: \$? = $ac_status" >&5
-+  echo "$as_me:7635: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -7615,7 +7651,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:7618: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:7654: 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 <conftest.$ac_ext <<_ACEOF
--#line 7671 "configure"
-+#line 7707 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -7680,16 +7716,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7683: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7719: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7686: \$? = $ac_status" >&5
-+  echo "$as_me:7722: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7689: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7725: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7692: \$? = $ac_status" >&5
-+  echo "$as_me:7728: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -7706,7 +7742,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:7709: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:7745: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -7725,7 +7761,7 @@
- 
- }
- 
--echo "$as_me:7728: checking for $cf_ncuhdr_root header in include-path" >&5
-+echo "$as_me:7764: 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
-@@ -7737,7 +7773,7 @@
- 	do
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 7740 "configure"
-+#line 7776 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -7761,16 +7797,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7764: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7800: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7767: \$? = $ac_status" >&5
-+  echo "$as_me:7803: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7770: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7806: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7773: \$? = $ac_status" >&5
-+  echo "$as_me:7809: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_h=$cf_header
- 
-@@ -7785,14 +7821,14 @@
- 	done
- 
- fi
--echo "$as_me:7788: result: $cf_cv_ncurses_h" >&5
-+echo "$as_me:7824: 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:7795: checking for $cf_ncuhdr_root include-path" >&5
-+echo "$as_me:7831: 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
-@@ -7910,7 +7946,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 7913 "configure"
-+#line 7949 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -7922,16 +7958,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7925: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7961: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7928: \$? = $ac_status" >&5
-+  echo "$as_me:7964: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7931: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7967: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7934: \$? = $ac_status" >&5
-+  echo "$as_me:7970: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -7948,7 +7984,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:7951: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:7987: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -7971,7 +8007,7 @@
- 		do
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 7974 "configure"
-+#line 8010 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -7995,16 +8031,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7998: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8034: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8001: \$? = $ac_status" >&5
-+  echo "$as_me:8037: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8004: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8040: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8007: \$? = $ac_status" >&5
-+  echo "$as_me:8043: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_h2=$cf_header
- 
-@@ -8025,12 +8061,12 @@
- 		CPPFLAGS="$cf_save2_CPPFLAGS"
- 		test "$cf_cv_ncurses_h2" != no && break
- 	done
--	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8028: error: not found" >&5
-+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8064: error: not found" >&5
- echo "$as_me: error: not found" >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
--echo "$as_me:8033: result: $cf_cv_ncurses_h2" >&5
-+echo "$as_me:8069: 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%/[^/]*$%%'`
-@@ -8063,7 +8099,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 8066 "configure"
-+#line 8102 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -8075,16 +8111,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8078: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8114: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8081: \$? = $ac_status" >&5
-+  echo "$as_me:8117: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8084: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8120: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8087: \$? = $ac_status" >&5
-+  echo "$as_me:8123: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8101,7 +8137,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:8104: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:8140: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -8149,7 +8185,7 @@
- 	;;
- esac
- 
--echo "$as_me:8152: checking for terminfo header" >&5
-+echo "$as_me:8188: 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
-@@ -8167,7 +8203,7 @@
- for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 8170 "configure"
-+#line 8206 "configure"
- #include "confdefs.h"
- #include 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -8182,16 +8218,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8185: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8221: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8188: \$? = $ac_status" >&5
-+  echo "$as_me:8224: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8191: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8227: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8194: \$? = $ac_status" >&5
-+  echo "$as_me:8230: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_term_header="$cf_test"
-@@ -8207,7 +8243,7 @@
- done
- 
- fi
--echo "$as_me:8210: result: $cf_cv_term_header" >&5
-+echo "$as_me:8246: result: $cf_cv_term_header" >&5
- echo "${ECHO_T}$cf_cv_term_header" >&6
- 
- # Set definitions to allow ifdef'ing to accommodate subdirectories
-@@ -8245,7 +8281,7 @@
- #define NCURSES 1
- EOF
- 
--echo "$as_me:8248: checking for ncurses version" >&5
-+echo "$as_me:8284: 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
-@@ -8271,10 +8307,10 @@
- #endif
- EOF
- 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
--	{ (eval echo "$as_me:8274: \"$cf_try\"") >&5
-+	{ (eval echo "$as_me:8310: \"$cf_try\"") >&5
-   (eval $cf_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8277: \$? = $ac_status" >&5
-+  echo "$as_me:8313: \$? = $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%".*%%'`
-@@ -8284,7 +8320,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8287 "configure"
-+#line 8323 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -8309,15 +8345,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:8312: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8348: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8315: \$? = $ac_status" >&5
-+  echo "$as_me:8351: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:8317: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8353: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8320: \$? = $ac_status" >&5
-+  echo "$as_me:8356: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_ncurses_version=`cat $cf_tempfile`
-@@ -8331,7 +8367,7 @@
- 	rm -f $cf_tempfile
- 
- fi
--echo "$as_me:8334: result: $cf_cv_ncurses_version" >&5
-+echo "$as_me:8370: result: $cf_cv_ncurses_version" >&5
- echo "${ECHO_T}$cf_cv_ncurses_version" >&6
- test "$cf_cv_ncurses_version" = no ||
- cat >>confdefs.h <<\EOF
-@@ -8344,7 +8380,7 @@
- 	# to link gpm.
- cf_ncurses_LIBS=""
- cf_ncurses_SAVE="$LIBS"
--echo "$as_me:8347: checking for Gpm_Open in -lgpm" >&5
-+echo "$as_me:8383: 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
-@@ -8352,7 +8388,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 8355 "configure"
-+#line 8391 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -8371,16 +8407,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8374: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8410: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8377: \$? = $ac_status" >&5
-+  echo "$as_me:8413: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8380: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8416: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8383: \$? = $ac_status" >&5
-+  echo "$as_me:8419: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_Gpm_Open=yes
- else
-@@ -8391,10 +8427,10 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:8394: result: $ac_cv_lib_gpm_Gpm_Open" >&5
-+echo "$as_me:8430: 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:8397: checking for initscr in -lgpm" >&5
-+  echo "$as_me:8433: 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
-@@ -8402,7 +8438,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 8405 "configure"
-+#line 8441 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -8421,16 +8457,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8424: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8460: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8427: \$? = $ac_status" >&5
-+  echo "$as_me:8463: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8430: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8466: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8433: \$? = $ac_status" >&5
-+  echo "$as_me:8469: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_initscr=yes
- else
-@@ -8441,7 +8477,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:8444: result: $ac_cv_lib_gpm_initscr" >&5
-+echo "$as_me:8480: 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"
-@@ -8456,7 +8492,7 @@
- 	# 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:8459: checking for tgoto in -lmytinfo" >&5
-+		echo "$as_me:8495: 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
-@@ -8464,7 +8500,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmytinfo  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 8467 "configure"
-+#line 8503 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -8483,16 +8519,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8486: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8522: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8489: \$? = $ac_status" >&5
-+  echo "$as_me:8525: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8492: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8528: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8495: \$? = $ac_status" >&5
-+  echo "$as_me:8531: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_mytinfo_tgoto=yes
- else
-@@ -8503,7 +8539,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:8506: result: $ac_cv_lib_mytinfo_tgoto" >&5
-+echo "$as_me:8542: 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"
-@@ -8552,13 +8588,13 @@
- 
- 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
- 	cf_libdir=""
--	echo "$as_me:8555: checking for initscr" >&5
-+	echo "$as_me:8591: 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 8561 "configure"
-+#line 8597 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char initscr (); below.  */
-@@ -8589,16 +8625,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8592: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8628: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8595: \$? = $ac_status" >&5
-+  echo "$as_me:8631: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8598: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8634: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8601: \$? = $ac_status" >&5
-+  echo "$as_me:8637: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_initscr=yes
- else
-@@ -8608,18 +8644,18 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:8611: result: $ac_cv_func_initscr" >&5
-+echo "$as_me:8647: 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:8618: checking for initscr in -l$cf_nculib_root" >&5
-+		echo "$as_me:8654: 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 8622 "configure"
-+#line 8658 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -8631,25 +8667,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8634: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8670: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8637: \$? = $ac_status" >&5
-+  echo "$as_me:8673: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8640: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8676: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8643: \$? = $ac_status" >&5
-+  echo "$as_me:8679: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:8645: result: yes" >&5
-+  echo "$as_me:8681: 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:8652: result: no" >&5
-+echo "$as_me:8688: result: no" >&5
- echo "${ECHO_T}no" >&6
- 
- cf_search=
-@@ -8717,11 +8753,11 @@
- 
- 			for cf_libdir in $cf_search
- 			do
--				echo "$as_me:8720: checking for -l$cf_nculib_root in $cf_libdir" >&5
-+				echo "$as_me:8756: 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 8724 "configure"
-+#line 8760 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -8733,25 +8769,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8736: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8772: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8739: \$? = $ac_status" >&5
-+  echo "$as_me:8775: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8742: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8778: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8745: \$? = $ac_status" >&5
-+  echo "$as_me:8781: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:8747: result: yes" >&5
-+  echo "$as_me:8783: 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:8754: result: no" >&5
-+echo "$as_me:8790: result: no" >&5
- echo "${ECHO_T}no" >&6
- 					 LIBS="$cf_save_LIBS"
- fi
-@@ -8766,7 +8802,7 @@
- eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
- 
- if test $cf_found_library = no ; then
--	{ { echo "$as_me:8769: error: Cannot link $cf_nculib_root library" >&5
-+	{ { echo "$as_me:8805: error: Cannot link $cf_nculib_root library" >&5
- echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -8774,7 +8810,7 @@
- fi
- 
- if test -n "$cf_ncurses_LIBS" ; then
--	echo "$as_me:8777: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
-+	echo "$as_me:8813: 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
-@@ -8784,7 +8820,7 @@
- 		fi
- 	done
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 8787 "configure"
-+#line 8823 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -8796,23 +8832,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8799: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8835: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8802: \$? = $ac_status" >&5
-+  echo "$as_me:8838: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8805: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8841: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8808: \$? = $ac_status" >&5
-+  echo "$as_me:8844: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:8810: result: yes" >&5
-+  echo "$as_me:8846: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:8815: result: no" >&5
-+echo "$as_me:8851: result: no" >&5
- echo "${ECHO_T}no" >&6
- 		 LIBS="$cf_ncurses_SAVE"
- fi
-@@ -8865,10 +8901,10 @@
- 	AUTOCONF_$cf_name NCURSES_VERSION_$cf_name
- CF_EOF
- 		cf_try="$ac_cpp conftest.$ac_ext 2>&5 | fgrep AUTOCONF_$cf_name >conftest.out"
--		{ (eval echo "$as_me:8868: \"$cf_try\"") >&5
-+		{ (eval echo "$as_me:8904: \"$cf_try\"") >&5
-   (eval $cf_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8871: \$? = $ac_status" >&5
-+  echo "$as_me:8907: \$? = $ac_status" >&5
-   (exit $ac_status); }
- 		if test -f conftest.out ; then
- 			cf_result=`cat conftest.out | sed -e "s/^.*AUTOCONF_$cf_name[ 	][ 	]*//"`
-@@ -8886,10 +8922,10 @@
- 
- cf_cv_timestamp=`date`
- 
--echo "$as_me:8889: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
-+echo "$as_me:8925: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
- echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6
- 
--echo "$as_me:8892: checking if you want to have a library-prefix" >&5
-+echo "$as_me:8928: checking if you want to have a library-prefix" >&5
- echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6
- 
- # Check whether --with-lib-prefix or --without-lib-prefix was given.
-@@ -8899,7 +8935,7 @@
- else
-   with_lib_prefix=auto
- fi;
--echo "$as_me:8902: result: $with_lib_prefix" >&5
-+echo "$as_me:8938: result: $with_lib_prefix" >&5
- echo "${ECHO_T}$with_lib_prefix" >&6
- 
- if test $with_lib_prefix = auto
-@@ -8930,7 +8966,7 @@
- 	test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT=''
- fi
- 
--echo "$as_me:8933: checking for default loader flags" >&5
-+echo "$as_me:8969: checking for default loader flags" >&5
- echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
- case $DFT_LWR_MODEL in
- (normal)  LD_MODEL=''   ;;
-@@ -8938,11 +8974,11 @@
- (profile) LD_MODEL='-pg';;
- (shared)  LD_MODEL=''   ;;
- esac
--echo "$as_me:8941: result: $LD_MODEL" >&5
-+echo "$as_me:8977: result: $LD_MODEL" >&5
- echo "${ECHO_T}$LD_MODEL" >&6
- 
- LD_RPATH_OPT=
--echo "$as_me:8945: checking for an rpath option" >&5
-+echo "$as_me:8981: checking for an rpath option" >&5
- echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
- case $cf_cv_system_name in
- (irix*)
-@@ -8973,12 +9009,12 @@
- (*)
- 	;;
- esac
--echo "$as_me:8976: result: $LD_RPATH_OPT" >&5
-+echo "$as_me:9012: result: $LD_RPATH_OPT" >&5
- echo "${ECHO_T}$LD_RPATH_OPT" >&6
- 
- case "x$LD_RPATH_OPT" in
- (x-R*)
--	echo "$as_me:8981: checking if we need a space after rpath option" >&5
-+	echo "$as_me:9017: 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"
- 
-@@ -8999,7 +9035,7 @@
- LIBS="$cf_add_libs"
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9002 "configure"
-+#line 9038 "configure"
- #include "confdefs.h"
- 
- int
-@@ -9011,16 +9047,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9014: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9050: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9017: \$? = $ac_status" >&5
-+  echo "$as_me:9053: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9020: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9056: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9023: \$? = $ac_status" >&5
-+  echo "$as_me:9059: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_rpath_space=no
- else
-@@ -9030,7 +9066,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	LIBS="$cf_save_LIBS"
--	echo "$as_me:9033: result: $cf_rpath_space" >&5
-+	echo "$as_me:9069: result: $cf_rpath_space" >&5
- echo "${ECHO_T}$cf_rpath_space" >&6
- 	test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
- 	;;
-@@ -9051,7 +9087,7 @@
- 	cf_ld_rpath_opt=
- 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
- 
--	echo "$as_me:9054: checking if release/abi version should be used for shared libs" >&5
-+	echo "$as_me:9090: checking if release/abi version should be used for shared libs" >&5
- echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6
- 
- # Check whether --with-shlib-version or --without-shlib-version was given.
-@@ -9066,9 +9102,9 @@
- 		cf_cv_shlib_version=$withval
- 		;;
- 	(*)
--		echo "$as_me:9069: result: $withval" >&5
-+		echo "$as_me:9105: result: $withval" >&5
- echo "${ECHO_T}$withval" >&6
--		{ { echo "$as_me:9071: error: option value must be one of: rel, abi, or auto" >&5
-+		{ { echo "$as_me:9107: error: option value must be one of: rel, abi, or auto" >&5
- echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
-    { (exit 1); exit 1; }; }
- 		;;
-@@ -9077,7 +9113,7 @@
- else
-   cf_cv_shlib_version=auto
- fi;
--	echo "$as_me:9080: result: $cf_cv_shlib_version" >&5
-+	echo "$as_me:9116: result: $cf_cv_shlib_version" >&5
- echo "${ECHO_T}$cf_cv_shlib_version" >&6
- 
- 	cf_cv_rm_so_locs=no
-@@ -9087,14 +9123,14 @@
- 	CC_SHARED_OPTS=
- 	if test "$GCC" = yes
- 	then
--		echo "$as_me:9090: checking which $CC option to use" >&5
-+		echo "$as_me:9126: checking which $CC option to use" >&5
- echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
- 		cf_save_CFLAGS="$CFLAGS"
- 		for CC_SHARED_OPTS in -fPIC -fpic ''
- 		do
- 			CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 9097 "configure"
-+#line 9133 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -9106,16 +9142,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9109: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9145: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9112: \$? = $ac_status" >&5
-+  echo "$as_me:9148: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9115: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9151: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9118: \$? = $ac_status" >&5
-+  echo "$as_me:9154: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -9124,7 +9160,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		done
--		echo "$as_me:9127: result: $CC_SHARED_OPTS" >&5
-+		echo "$as_me:9163: result: $CC_SHARED_OPTS" >&5
- echo "${ECHO_T}$CC_SHARED_OPTS" >&6
- 		CFLAGS="$cf_save_CFLAGS"
- 	fi
-@@ -9195,7 +9231,7 @@
- 		MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
- 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
- 		cf_cv_shlib_version_infix=yes
--		echo "$as_me:9198: checking if ld -search_paths_first works" >&5
-+		echo "$as_me:9234: checking if ld -search_paths_first works" >&5
- echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6
- if test "${cf_cv_ldflags_search_paths_first+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9204,7 +9240,7 @@
- 			cf_save_LDFLAGS=$LDFLAGS
- 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 9207 "configure"
-+#line 9243 "configure"
- #include "confdefs.h"
- 
- int
-@@ -9216,16 +9252,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9219: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9255: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9222: \$? = $ac_status" >&5
-+  echo "$as_me:9258: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9225: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9261: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9228: \$? = $ac_status" >&5
-+  echo "$as_me:9264: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ldflags_search_paths_first=yes
- else
-@@ -9236,7 +9272,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 				LDFLAGS=$cf_save_LDFLAGS
- fi
--echo "$as_me:9239: result: $cf_cv_ldflags_search_paths_first" >&5
-+echo "$as_me:9275: result: $cf_cv_ldflags_search_paths_first" >&5
- echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
- 		if test $cf_cv_ldflags_search_paths_first = yes; then
- 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
-@@ -9461,7 +9497,7 @@
- 			do
- 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
- 				cat >conftest.$ac_ext <<_ACEOF
--#line 9464 "configure"
-+#line 9500 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -9473,16 +9509,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9476: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9512: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9479: \$? = $ac_status" >&5
-+  echo "$as_me:9515: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9482: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9518: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9485: \$? = $ac_status" >&5
-+  echo "$as_me:9521: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -9519,7 +9555,7 @@
- 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
- 			;;
- 		(*)
--			{ echo "$as_me:9522: WARNING: ignored --with-shlib-version" >&5
-+			{ echo "$as_me:9558: WARNING: ignored --with-shlib-version" >&5
- echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
- 			;;
- 		esac
-@@ -9529,7 +9565,7 @@
- 	if test -n "$cf_try_cflags"
- 	then
- cat > conftest.$ac_ext <
- int main(int argc, char *argv[])
- {
-@@ -9541,18 +9577,18 @@
- 		for cf_opt in $cf_try_cflags
- 		do
- 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
--			echo "$as_me:9544: checking if CFLAGS option -$cf_opt works" >&5
-+			echo "$as_me:9580: checking if CFLAGS option -$cf_opt works" >&5
- echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6
--			if { (eval echo "$as_me:9546: \"$ac_compile\"") >&5
-+			if { (eval echo "$as_me:9582: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9549: \$? = $ac_status" >&5
-+  echo "$as_me:9585: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--				echo "$as_me:9551: result: yes" >&5
-+				echo "$as_me:9587: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 				cf_save_CFLAGS="$CFLAGS"
- 			else
--				echo "$as_me:9555: result: no" >&5
-+				echo "$as_me:9591: result: no" >&5
- echo "${ECHO_T}no" >&6
- 			fi
- 		done
-@@ -9567,17 +9603,17 @@
- 
- 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
- 
--echo "${as_me:-configure}:9570: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
-+echo "${as_me:-configure}:9606: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
- 
- 	test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
- 
--echo "${as_me:-configure}:9574: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
-+echo "${as_me:-configure}:9610: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
- 
- # The test/sample programs in the original tree link using rpath option.
- # Make it optional for packagers.
- if test -n "$LOCAL_LDFLAGS"
- then
--	echo "$as_me:9580: checking if you want to link sample programs with rpath option" >&5
-+	echo "$as_me:9616: checking if you want to link sample programs with rpath option" >&5
- echo $ECHO_N "checking if you want to link sample programs with rpath option... $ECHO_C" >&6
- 
- # Check whether --enable-rpath-link or --disable-rpath-link was given.
-@@ -9587,7 +9623,7 @@
- else
-   with_rpath_link=yes
- fi;
--	echo "$as_me:9590: result: $with_rpath_link" >&5
-+	echo "$as_me:9626: result: $with_rpath_link" >&5
- echo "${ECHO_T}$with_rpath_link" >&6
- 	if test "$with_rpath_link" = no
- 	then
-@@ -9599,7 +9635,7 @@
- ###############################################################################
- 
- ###   use option --enable-broken-linker to force on use of broken-linker support
--echo "$as_me:9602: checking if you want broken-linker support code" >&5
-+echo "$as_me:9638: checking if you want broken-linker support code" >&5
- echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
- 
- # Check whether --enable-broken_linker or --disable-broken_linker was given.
-@@ -9609,7 +9645,7 @@
- else
-   with_broken_linker=${BROKEN_LINKER:-no}
- fi;
--echo "$as_me:9612: result: $with_broken_linker" >&5
-+echo "$as_me:9648: result: $with_broken_linker" >&5
- echo "${ECHO_T}$with_broken_linker" >&6
- 
- BROKEN_LINKER=0
-@@ -9629,7 +9665,7 @@
- 		BROKEN_LINKER=1
- 		test -n "$verbose" && echo "	cygwin linker is broken anyway" 1>&6
- 
--echo "${as_me:-configure}:9632: testing cygwin linker is broken anyway ..." 1>&5
-+echo "${as_me:-configure}:9668: testing cygwin linker is broken anyway ..." 1>&5
- 
- 		;;
- 	esac
-@@ -9675,14 +9711,14 @@
- 	;;
- (linux*|gnu*|mint*|k*bsd*-gnu)
- 
--echo "$as_me:9678: checking if we must define _GNU_SOURCE" >&5
-+echo "$as_me:9714: 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 9685 "configure"
-+#line 9721 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -9697,16 +9733,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9700: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9736: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9703: \$? = $ac_status" >&5
-+  echo "$as_me:9739: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9706: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9742: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9709: \$? = $ac_status" >&5
-+  echo "$as_me:9745: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -9715,7 +9751,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 9718 "configure"
-+#line 9754 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -9730,16 +9766,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9733: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9769: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9736: \$? = $ac_status" >&5
-+  echo "$as_me:9772: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9739: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9775: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9742: \$? = $ac_status" >&5
-+  echo "$as_me:9778: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -9754,7 +9790,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:9757: result: $cf_cv_gnu_source" >&5
-+echo "$as_me:9793: result: $cf_cv_gnu_source" >&5
- echo "${ECHO_T}$cf_cv_gnu_source" >&6
- test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- 
-@@ -9779,16 +9815,16 @@
- 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
- 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
- 
--echo "$as_me:9782: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "$as_me:9818: 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}:9788: testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me:-configure}:9824: testing if the symbol is already defined go no further ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9791 "configure"
-+#line 9827 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -9803,16 +9839,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9806: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9842: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9809: \$? = $ac_status" >&5
-+  echo "$as_me:9845: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9812: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9848: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9815: \$? = $ac_status" >&5
-+  echo "$as_me:9851: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_posix_c_source=no
- else
-@@ -9833,7 +9869,7 @@
- 	 esac
- 	 if test "$cf_want_posix_source" = yes ; then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 9836 "configure"
-+#line 9872 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -9848,16 +9884,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9851: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9887: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9854: \$? = $ac_status" >&5
-+  echo "$as_me:9890: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9857: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9893: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9860: \$? = $ac_status" >&5
-+  echo "$as_me:9896: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -9868,15 +9904,15 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	 fi
- 
--echo "${as_me:-configure}:9871: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me:-configure}:9907: 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}:9876: testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me:-configure}:9912: testing if the second compile does not leave our definition intact error ..." 1>&5
- 
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 9879 "configure"
-+#line 9915 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -9891,16 +9927,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9894: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9930: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9897: \$? = $ac_status" >&5
-+  echo "$as_me:9933: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9900: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9936: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9903: \$? = $ac_status" >&5
-+  echo "$as_me:9939: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -9916,7 +9952,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:9919: result: $cf_cv_posix_c_source" >&5
-+echo "$as_me:9955: 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
-@@ -10034,14 +10070,14 @@
- 	;;
- (*)
- 
--echo "$as_me:10037: checking if we should define _XOPEN_SOURCE" >&5
-+echo "$as_me:10073: 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 10044 "configure"
-+#line 10080 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10060,16 +10096,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10063: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10099: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10066: \$? = $ac_status" >&5
-+  echo "$as_me:10102: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10069: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10105: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10072: \$? = $ac_status" >&5
-+  echo "$as_me:10108: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -10078,7 +10114,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 10081 "configure"
-+#line 10117 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10097,16 +10133,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10100: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10136: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10103: \$? = $ac_status" >&5
-+  echo "$as_me:10139: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10106: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10142: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10109: \$? = $ac_status" >&5
-+  echo "$as_me:10145: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -10121,7 +10157,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:10124: result: $cf_cv_xopen_source" >&5
-+echo "$as_me:10160: result: $cf_cv_xopen_source" >&5
- echo "${ECHO_T}$cf_cv_xopen_source" >&6
- 
- if test "$cf_cv_xopen_source" != no ; then
-@@ -10229,16 +10265,16 @@
- 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
- 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
- 
--echo "$as_me:10232: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "$as_me:10268: 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}:10238: testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me:-configure}:10274: testing if the symbol is already defined go no further ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 10241 "configure"
-+#line 10277 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -10253,16 +10289,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10256: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10292: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10259: \$? = $ac_status" >&5
-+  echo "$as_me:10295: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10262: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10298: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10265: \$? = $ac_status" >&5
-+  echo "$as_me:10301: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_posix_c_source=no
- else
-@@ -10283,7 +10319,7 @@
- 	 esac
- 	 if test "$cf_want_posix_source" = yes ; then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 10286 "configure"
-+#line 10322 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -10298,16 +10334,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10301: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10337: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10304: \$? = $ac_status" >&5
-+  echo "$as_me:10340: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10307: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10343: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10310: \$? = $ac_status" >&5
-+  echo "$as_me:10346: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -10318,15 +10354,15 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	 fi
- 
--echo "${as_me:-configure}:10321: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me:-configure}:10357: 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}:10326: testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me:-configure}:10362: testing if the second compile does not leave our definition intact error ..." 1>&5
- 
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 10329 "configure"
-+#line 10365 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -10341,16 +10377,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10344: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10380: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10347: \$? = $ac_status" >&5
-+  echo "$as_me:10383: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10350: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10386: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10353: \$? = $ac_status" >&5
-+  echo "$as_me:10389: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -10366,7 +10402,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:10369: result: $cf_cv_posix_c_source" >&5
-+echo "$as_me:10405: 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
-@@ -10524,7 +10560,7 @@
- if test -n "$cf_new_cflags" ; then
- 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
- 
--echo "${as_me:-configure}:10527: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
-+echo "${as_me:-configure}:10563: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
- 
- 	CFLAGS="$CFLAGS $cf_new_cflags"
- fi
-@@ -10532,7 +10568,7 @@
- if test -n "$cf_new_cppflags" ; then
- 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
- 
--echo "${as_me:-configure}:10535: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
-+echo "${as_me:-configure}:10571: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
- 
- 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
- fi
-@@ -10540,7 +10576,7 @@
- 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}:10543: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
-+echo "${as_me:-configure}:10579: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
- 
- 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
- fi
-@@ -10548,10 +10584,10 @@
- fi
- 
- if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
--	echo "$as_me:10551: checking if _XOPEN_SOURCE really is set" >&5
-+	echo "$as_me:10587: 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 10554 "configure"
-+#line 10590 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -10566,16 +10602,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10569: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10605: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10572: \$? = $ac_status" >&5
-+  echo "$as_me:10608: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10575: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10611: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10578: \$? = $ac_status" >&5
-+  echo "$as_me:10614: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_XOPEN_SOURCE_set=yes
- else
-@@ -10584,12 +10620,12 @@
- cf_XOPEN_SOURCE_set=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:10587: result: $cf_XOPEN_SOURCE_set" >&5
-+	echo "$as_me:10623: 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 10592 "configure"
-+#line 10628 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -10604,16 +10640,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10607: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10643: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10610: \$? = $ac_status" >&5
-+  echo "$as_me:10646: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10613: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10649: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10616: \$? = $ac_status" >&5
-+  echo "$as_me:10652: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_XOPEN_SOURCE_set_ok=yes
- else
-@@ -10624,19 +10660,19 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		if test $cf_XOPEN_SOURCE_set_ok = no
- 		then
--			{ echo "$as_me:10627: WARNING: _XOPEN_SOURCE is lower than requested" >&5
-+			{ echo "$as_me:10663: WARNING: _XOPEN_SOURCE is lower than requested" >&5
- echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
- 		fi
- 	else
- 
--echo "$as_me:10632: checking if we should define _XOPEN_SOURCE" >&5
-+echo "$as_me:10668: 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 10639 "configure"
-+#line 10675 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10655,16 +10691,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10658: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10694: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10661: \$? = $ac_status" >&5
-+  echo "$as_me:10697: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10664: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10700: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10667: \$? = $ac_status" >&5
-+  echo "$as_me:10703: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -10673,7 +10709,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 10676 "configure"
-+#line 10712 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10692,16 +10728,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10695: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10731: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10698: \$? = $ac_status" >&5
-+  echo "$as_me:10734: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10701: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10737: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10704: \$? = $ac_status" >&5
-+  echo "$as_me:10740: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -10716,7 +10752,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:10719: result: $cf_cv_xopen_source" >&5
-+echo "$as_me:10755: result: $cf_cv_xopen_source" >&5
- echo "${ECHO_T}$cf_cv_xopen_source" >&6
- 
- if test "$cf_cv_xopen_source" != no ; then
-@@ -10821,7 +10857,7 @@
- fi;
- if test "$enable_largefile" != no; then
- 
--  echo "$as_me:10824: checking for special C compiler options needed for large files" >&5
-+  echo "$as_me:10860: 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
-@@ -10833,7 +10869,7 @@
-      	 # 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 10836 "configure"
-+#line 10872 "configure"
- #include "confdefs.h"
- #include 
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10853,16 +10889,16 @@
- }
- _ACEOF
-      	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10856: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10892: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10859: \$? = $ac_status" >&5
-+  echo "$as_me:10895: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10862: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10898: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10865: \$? = $ac_status" >&5
-+  echo "$as_me:10901: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10872,16 +10908,16 @@
- rm -f conftest.$ac_objext
-      	 CC="$CC -n32"
-      	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10875: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10911: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10878: \$? = $ac_status" >&5
-+  echo "$as_me:10914: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10881: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10917: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10884: \$? = $ac_status" >&5
-+  echo "$as_me:10920: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_largefile_CC=' -n32'; break
- else
-@@ -10895,13 +10931,13 @@
-        rm -f conftest.$ac_ext
-     fi
- fi
--echo "$as_me:10898: result: $ac_cv_sys_largefile_CC" >&5
-+echo "$as_me:10934: 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:10904: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-+  echo "$as_me:10940: 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
-@@ -10909,7 +10945,7 @@
-   while :; do
-   ac_cv_sys_file_offset_bits=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10912 "configure"
-+#line 10948 "configure"
- #include "confdefs.h"
- #include 
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10929,16 +10965,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10932: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10968: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10935: \$? = $ac_status" >&5
-+  echo "$as_me:10971: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10938: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10974: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10941: \$? = $ac_status" >&5
-+  echo "$as_me:10977: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10947,7 +10983,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10950 "configure"
-+#line 10986 "configure"
- #include "confdefs.h"
- #define _FILE_OFFSET_BITS 64
- #include 
-@@ -10968,16 +11004,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10971: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11007: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10974: \$? = $ac_status" >&5
-+  echo "$as_me:11010: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10977: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11013: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10980: \$? = $ac_status" >&5
-+  echo "$as_me:11016: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_file_offset_bits=64; break
- else
-@@ -10988,7 +11024,7 @@
-   break
- done
- fi
--echo "$as_me:10991: result: $ac_cv_sys_file_offset_bits" >&5
-+echo "$as_me:11027: 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
- 
-@@ -10998,7 +11034,7 @@
- 
- fi
- rm -rf conftest*
--  echo "$as_me:11001: checking for _LARGE_FILES value needed for large files" >&5
-+  echo "$as_me:11037: 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
-@@ -11006,7 +11042,7 @@
-   while :; do
-   ac_cv_sys_large_files=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11009 "configure"
-+#line 11045 "configure"
- #include "confdefs.h"
- #include 
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -11026,16 +11062,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11029: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11065: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11032: \$? = $ac_status" >&5
-+  echo "$as_me:11068: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11035: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11071: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11038: \$? = $ac_status" >&5
-+  echo "$as_me:11074: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -11044,7 +11080,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11047 "configure"
-+#line 11083 "configure"
- #include "confdefs.h"
- #define _LARGE_FILES 1
- #include 
-@@ -11065,16 +11101,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11068: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11104: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11071: \$? = $ac_status" >&5
-+  echo "$as_me:11107: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11074: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11110: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11077: \$? = $ac_status" >&5
-+  echo "$as_me:11113: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_large_files=1; break
- else
-@@ -11085,7 +11121,7 @@
-   break
- done
- fi
--echo "$as_me:11088: result: $ac_cv_sys_large_files" >&5
-+echo "$as_me:11124: 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
- 
-@@ -11098,7 +11134,7 @@
- fi
- 
- 	if test "$enable_largefile" != no ; then
--	echo "$as_me:11101: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-+	echo "$as_me:11137: 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
-@@ -11106,7 +11142,7 @@
-   while :; do
-   ac_cv_sys_largefile_source=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11109 "configure"
-+#line 11145 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -11118,16 +11154,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11121: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11157: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11124: \$? = $ac_status" >&5
-+  echo "$as_me:11160: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11127: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11163: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11130: \$? = $ac_status" >&5
-+  echo "$as_me:11166: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -11136,7 +11172,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11139 "configure"
-+#line 11175 "configure"
- #include "confdefs.h"
- #define _LARGEFILE_SOURCE 1
- #include 
-@@ -11149,16 +11185,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11152: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11188: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11155: \$? = $ac_status" >&5
-+  echo "$as_me:11191: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11158: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11194: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11161: \$? = $ac_status" >&5
-+  echo "$as_me:11197: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_largefile_source=1; break
- else
-@@ -11169,7 +11205,7 @@
-   break
- done
- fi
--echo "$as_me:11172: result: $ac_cv_sys_largefile_source" >&5
-+echo "$as_me:11208: 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
- 
-@@ -11183,13 +11219,13 @@
- # 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:11186: checking for fseeko" >&5
-+echo "$as_me:11222: 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 11192 "configure"
-+#line 11228 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -11201,16 +11237,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11204: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11240: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11207: \$? = $ac_status" >&5
-+  echo "$as_me:11243: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11210: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11246: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11213: \$? = $ac_status" >&5
-+  echo "$as_me:11249: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_fseeko=yes
- else
-@@ -11220,7 +11256,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:11223: result: $ac_cv_func_fseeko" >&5
-+echo "$as_me:11259: result: $ac_cv_func_fseeko" >&5
- echo "${ECHO_T}$ac_cv_func_fseeko" >&6
- if test $ac_cv_func_fseeko = yes; then
- 
-@@ -11241,14 +11277,14 @@
- 	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:11244: checking whether to use struct dirent64" >&5
-+	echo "$as_me:11280: 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 11251 "configure"
-+#line 11287 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -11269,16 +11305,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11272: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11308: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11275: \$? = $ac_status" >&5
-+  echo "$as_me:11311: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11278: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11314: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11281: \$? = $ac_status" >&5
-+  echo "$as_me:11317: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_struct_dirent64=yes
- else
-@@ -11289,7 +11325,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:11292: result: $cf_cv_struct_dirent64" >&5
-+echo "$as_me:11328: result: $cf_cv_struct_dirent64" >&5
- echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
- 	test "$cf_cv_struct_dirent64" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -11299,7 +11335,7 @@
- 	fi
- 
- ### Enable compiling-in rcs id's
--echo "$as_me:11302: checking if RCS identifiers should be compiled-in" >&5
-+echo "$as_me:11338: checking if RCS identifiers should be compiled-in" >&5
- echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6
- 
- # Check whether --with-rcs-ids or --without-rcs-ids was given.
-@@ -11309,7 +11345,7 @@
- else
-   with_rcs_ids=no
- fi;
--echo "$as_me:11312: result: $with_rcs_ids" >&5
-+echo "$as_me:11348: result: $with_rcs_ids" >&5
- echo "${ECHO_T}$with_rcs_ids" >&6
- test "$with_rcs_ids" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -11319,7 +11355,7 @@
- ###############################################################################
- 
- ### Note that some functions (such as const) are normally disabled anyway.
--echo "$as_me:11322: checking if you want to build with function extensions" >&5
-+echo "$as_me:11358: checking if you want to build with function extensions" >&5
- echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6
- 
- # Check whether --enable-ext-funcs or --disable-ext-funcs was given.
-@@ -11329,7 +11365,7 @@
- else
-   with_ext_funcs=yes
- fi;
--echo "$as_me:11332: result: $with_ext_funcs" >&5
-+echo "$as_me:11368: result: $with_ext_funcs" >&5
- echo "${ECHO_T}$with_ext_funcs" >&6
- if test "$with_ext_funcs" = yes ; then
- 	NCURSES_EXT_FUNCS=1
-@@ -11347,7 +11383,7 @@
- fi
- 
- ###   use option --enable-const to turn on use of const beyond that in XSI.
--echo "$as_me:11350: checking for extended use of const keyword" >&5
-+echo "$as_me:11386: checking for extended use of const keyword" >&5
- echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
- 
- # Check whether --enable-const or --disable-const was given.
-@@ -11357,7 +11393,7 @@
- else
-   with_ext_const=no
- fi;
--echo "$as_me:11360: result: $with_ext_const" >&5
-+echo "$as_me:11396: result: $with_ext_const" >&5
- echo "${ECHO_T}$with_ext_const" >&6
- NCURSES_CONST='/*nothing*/'
- if test "$with_ext_const" = yes ; then
-@@ -11367,7 +11403,7 @@
- ###############################################################################
- # These options are relatively safe to experiment with.
- 
--echo "$as_me:11370: checking if you want all development code" >&5
-+echo "$as_me:11406: checking if you want all development code" >&5
- echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
- 
- # Check whether --with-develop or --without-develop was given.
-@@ -11377,7 +11413,7 @@
- else
-   with_develop=no
- fi;
--echo "$as_me:11380: result: $with_develop" >&5
-+echo "$as_me:11416: result: $with_develop" >&5
- echo "${ECHO_T}$with_develop" >&6
- 
- ###############################################################################
-@@ -11386,7 +11422,7 @@
- # This is still experimental (20080329), but should ultimately be moved to
- # the script-block --with-normal, etc.
- 
--echo "$as_me:11389: checking if you want to link with the pthread library" >&5
-+echo "$as_me:11425: checking if you want to link with the pthread library" >&5
- echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6
- 
- # Check whether --with-pthread or --without-pthread was given.
-@@ -11396,27 +11432,27 @@
- else
-   with_pthread=no
- fi;
--echo "$as_me:11399: result: $with_pthread" >&5
-+echo "$as_me:11435: result: $with_pthread" >&5
- echo "${ECHO_T}$with_pthread" >&6
- 
- if test "$with_pthread" != no ; then
--	echo "$as_me:11403: checking for pthread.h" >&5
-+	echo "$as_me:11439: checking for pthread.h" >&5
- echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
- if test "${ac_cv_header_pthread_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11409 "configure"
-+#line 11445 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:11413: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:11449: \"$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:11419: \$? = $ac_status" >&5
-+  echo "$as_me:11455: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -11435,7 +11471,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:11438: result: $ac_cv_header_pthread_h" >&5
-+echo "$as_me:11474: result: $ac_cv_header_pthread_h" >&5
- echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
- if test $ac_cv_header_pthread_h = yes; then
- 
-@@ -11445,7 +11481,7 @@
- 
- 	for cf_lib_pthread in pthread c_r
- 	do
--	    echo "$as_me:11448: checking if we can link with the $cf_lib_pthread library" >&5
-+	    echo "$as_me:11484: checking if we can link with the $cf_lib_pthread library" >&5
- echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6
- 	    cf_save_LIBS="$LIBS"
- 
-@@ -11466,7 +11502,7 @@
- LIBS="$cf_add_libs"
- 
- 	    cat >conftest.$ac_ext <<_ACEOF
--#line 11469 "configure"
-+#line 11505 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -11483,16 +11519,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11486: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11522: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11489: \$? = $ac_status" >&5
-+  echo "$as_me:11525: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11492: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11528: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11495: \$? = $ac_status" >&5
-+  echo "$as_me:11531: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   with_pthread=yes
- else
-@@ -11502,7 +11538,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	    LIBS="$cf_save_LIBS"
--	    echo "$as_me:11505: result: $with_pthread" >&5
-+	    echo "$as_me:11541: result: $with_pthread" >&5
- echo "${ECHO_T}$with_pthread" >&6
- 	    test "$with_pthread" = yes && break
- 	done
-@@ -11530,7 +11566,7 @@
- EOF
- 
- 	else
--	    { { echo "$as_me:11533: error: Cannot link with pthread library" >&5
-+	    { { echo "$as_me:11569: error: Cannot link with pthread library" >&5
- echo "$as_me: error: Cannot link with pthread library" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
-@@ -11539,7 +11575,7 @@
- 
- fi
- 
--echo "$as_me:11542: checking if you want to use weak-symbols for pthreads" >&5
-+echo "$as_me:11578: checking if you want to use weak-symbols for pthreads" >&5
- echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6
- 
- # Check whether --enable-weak-symbols or --disable-weak-symbols was given.
-@@ -11549,18 +11585,18 @@
- else
-   use_weak_symbols=no
- fi;
--echo "$as_me:11552: result: $use_weak_symbols" >&5
-+echo "$as_me:11588: result: $use_weak_symbols" >&5
- echo "${ECHO_T}$use_weak_symbols" >&6
- if test "$use_weak_symbols" = yes ; then
- 
--echo "$as_me:11556: checking if $CC supports weak symbols" >&5
-+echo "$as_me:11592: checking if $CC supports weak symbols" >&5
- echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6
- if test "${cf_cv_weak_symbols+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 11563 "configure"
-+#line 11599 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -11586,16 +11622,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11589: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11625: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11592: \$? = $ac_status" >&5
-+  echo "$as_me:11628: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11595: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11631: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11598: \$? = $ac_status" >&5
-+  echo "$as_me:11634: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_weak_symbols=yes
- else
-@@ -11606,7 +11642,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:11609: result: $cf_cv_weak_symbols" >&5
-+echo "$as_me:11645: result: $cf_cv_weak_symbols" >&5
- echo "${ECHO_T}$cf_cv_weak_symbols" >&6
- 
- else
-@@ -11635,13 +11671,13 @@
- fi
- 
- # OpenSUSE is installing ncurses6, using reentrant option.
--echo "$as_me:11638: checking for _nc_TABSIZE" >&5
-+echo "$as_me:11674: checking for _nc_TABSIZE" >&5
- echo $ECHO_N "checking for _nc_TABSIZE... $ECHO_C" >&6
- if test "${ac_cv_func__nc_TABSIZE+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11644 "configure"
-+#line 11680 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char _nc_TABSIZE (); below.  */
-@@ -11672,16 +11708,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11675: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11711: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11678: \$? = $ac_status" >&5
-+  echo "$as_me:11714: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11681: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11717: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11684: \$? = $ac_status" >&5
-+  echo "$as_me:11720: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func__nc_TABSIZE=yes
- else
-@@ -11691,7 +11727,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:11694: result: $ac_cv_func__nc_TABSIZE" >&5
-+echo "$as_me:11730: result: $ac_cv_func__nc_TABSIZE" >&5
- echo "${ECHO_T}$ac_cv_func__nc_TABSIZE" >&6
- if test $ac_cv_func__nc_TABSIZE = yes; then
-   assume_reentrant=yes
-@@ -11703,7 +11739,7 @@
- # opaque outside of that, so there is no --enable-opaque option.  We can use
- # this option without --with-pthreads, but this will be always set for
- # pthreads.
--echo "$as_me:11706: checking if you want experimental reentrant code" >&5
-+echo "$as_me:11742: checking if you want experimental reentrant code" >&5
- echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6
- 
- # Check whether --enable-reentrant or --disable-reentrant was given.
-@@ -11713,7 +11749,7 @@
- else
-   with_reentrant=$assume_reentrant
- fi;
--echo "$as_me:11716: result: $with_reentrant" >&5
-+echo "$as_me:11752: result: $with_reentrant" >&5
- echo "${ECHO_T}$with_reentrant" >&6
- if test "$with_reentrant" = yes ; then
- 	cf_cv_enable_reentrant=1
-@@ -11736,7 +11772,7 @@
- 
- ### Allow using a different wrap-prefix
- if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
--	echo "$as_me:11739: checking for prefix used to wrap public variables" >&5
-+	echo "$as_me:11775: checking for prefix used to wrap public variables" >&5
- echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6
- 
- # Check whether --with-wrap-prefix or --without-wrap-prefix was given.
-@@ -11746,7 +11782,7 @@
- else
-   NCURSES_WRAP_PREFIX=_nc_
- fi;
--	echo "$as_me:11749: result: $NCURSES_WRAP_PREFIX" >&5
-+	echo "$as_me:11785: result: $NCURSES_WRAP_PREFIX" >&5
- echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
- else
- 	NCURSES_WRAP_PREFIX=_nc_
-@@ -11760,7 +11796,7 @@
- 
- ###	use option --disable-echo to suppress full display compiling commands
- 
--echo "$as_me:11763: checking if you want to see long compiling messages" >&5
-+echo "$as_me:11799: 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.
-@@ -11794,11 +11830,11 @@
- 	ECHO_CC=''
- 
- fi;
--echo "$as_me:11797: result: $enableval" >&5
-+echo "$as_me:11833: result: $enableval" >&5
- echo "${ECHO_T}$enableval" >&6
- 
- ###	use option --enable-warnings to turn on all gcc warnings
--echo "$as_me:11801: checking if you want to see compiler warnings" >&5
-+echo "$as_me:11837: checking if you want to see compiler warnings" >&5
- echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
- 
- # Check whether --enable-warnings or --disable-warnings was given.
-@@ -11806,7 +11842,7 @@
-   enableval="$enable_warnings"
-   with_warnings=$enableval
- fi;
--echo "$as_me:11809: result: $with_warnings" >&5
-+echo "$as_me:11845: result: $with_warnings" >&5
- echo "${ECHO_T}$with_warnings" >&6
- 
- if test "x$with_warnings" = "xyes"; then
-@@ -11818,12 +11854,12 @@
- if test "$GCC" = yes ; then
- 	case $host_os in
- 	(linux*|gnu*)
--		echo "$as_me:11821: checking if this is really Intel C compiler" >&5
-+		echo "$as_me:11857: 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 11826 "configure"
-+#line 11862 "configure"
- #include "confdefs.h"
- 
- int
-@@ -11840,16 +11876,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11843: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11879: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11846: \$? = $ac_status" >&5
-+  echo "$as_me:11882: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11849: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11885: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11852: \$? = $ac_status" >&5
-+  echo "$as_me:11888: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   INTEL_COMPILER=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -we147"
-@@ -11860,7 +11896,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		CFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:11863: result: $INTEL_COMPILER" >&5
-+		echo "$as_me:11899: result: $INTEL_COMPILER" >&5
- echo "${ECHO_T}$INTEL_COMPILER" >&6
- 		;;
- 	esac
-@@ -11869,12 +11905,12 @@
- CLANG_COMPILER=no
- 
- if test "$GCC" = yes ; then
--	echo "$as_me:11872: checking if this is really Clang C compiler" >&5
-+	echo "$as_me:11908: 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 11877 "configure"
-+#line 11913 "configure"
- #include "confdefs.h"
- 
- int
-@@ -11891,16 +11927,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11894: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11930: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11897: \$? = $ac_status" >&5
-+  echo "$as_me:11933: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11900: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11936: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11903: \$? = $ac_status" >&5
-+  echo "$as_me:11939: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   CLANG_COMPILER=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
-@@ -11911,12 +11947,12 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	CFLAGS="$cf_save_CFLAGS"
--	echo "$as_me:11914: result: $CLANG_COMPILER" >&5
-+	echo "$as_me:11950: result: $CLANG_COMPILER" >&5
- echo "${ECHO_T}$CLANG_COMPILER" >&6
- fi
- 
- cat > conftest.$ac_ext <&5
-+	{ echo "$as_me:11972: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS="-Wall"
-@@ -11949,12 +11985,12 @@
- 		wd981
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:11952: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:11988: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11955: \$? = $ac_status" >&5
-+  echo "$as_me:11991: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:11957: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:11993: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
- 		fi
-@@ -11963,7 +11999,7 @@
- 
- elif test "$GCC" = yes
- then
--	{ echo "$as_me:11966: checking for $CC warning options..." >&5
-+	{ echo "$as_me:12002: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS=
-@@ -11987,12 +12023,12 @@
- 		Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:11990: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:12026: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11993: \$? = $ac_status" >&5
-+  echo "$as_me:12029: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:11995: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:12031: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			case $cf_opt in
- 			(Wcast-qual)
-@@ -12003,7 +12039,7 @@
- 				([34].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:12006: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:12042: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -12013,7 +12049,7 @@
- 				([12].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:12016: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:12052: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -12046,10 +12082,10 @@
- EOF
- if test "$GCC" = yes
- then
--	{ echo "$as_me:12049: checking for $CC __attribute__ directives..." >&5
-+	{ echo "$as_me:12085: checking for $CC __attribute__ directives..." >&5
- echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
- cat > conftest.$ac_ext <&5
-+		if { (eval echo "$as_me:12137: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12104: \$? = $ac_status" >&5
-+  echo "$as_me:12140: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:12106: result: ... $cf_attribute" >&5
-+			test -n "$verbose" && echo "$as_me:12142: result: ... $cf_attribute" >&5
- echo "${ECHO_T}... $cf_attribute" >&6
- 			cat conftest.h >>confdefs.h
- 			case $cf_attribute in
-@@ -12163,7 +12199,7 @@
- fi
- 
- ###	use option --enable-assertions to turn on generation of assertion code
--echo "$as_me:12166: checking if you want to enable runtime assertions" >&5
-+echo "$as_me:12202: checking if you want to enable runtime assertions" >&5
- echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
- 
- # Check whether --enable-assertions or --disable-assertions was given.
-@@ -12173,7 +12209,7 @@
- else
-   with_assertions=no
- fi;
--echo "$as_me:12176: result: $with_assertions" >&5
-+echo "$as_me:12212: result: $with_assertions" >&5
- echo "${ECHO_T}$with_assertions" >&6
- if test -n "$GCC"
- then
-@@ -12226,7 +12262,7 @@
- 	;;
- esac
- 
--echo "$as_me:12229: checking whether to add trace feature to all models" >&5
-+echo "$as_me:12265: checking whether to add trace feature to all models" >&5
- echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
- 
- # Check whether --with-trace or --without-trace was given.
-@@ -12236,7 +12272,7 @@
- else
-   cf_with_trace=$cf_all_traces
- fi;
--echo "$as_me:12239: result: $cf_with_trace" >&5
-+echo "$as_me:12275: result: $cf_with_trace" >&5
- echo "${ECHO_T}$cf_with_trace" >&6
- 
- if test "$cf_with_trace" = yes ; then
-@@ -12324,7 +12360,7 @@
- 	ADA_TRACE=FALSE
- fi
- 
--echo "$as_me:12327: checking if we want to use GNAT projects" >&5
-+echo "$as_me:12363: checking if we want to use GNAT projects" >&5
- echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6
- 
- # Check whether --enable-gnat-projects or --disable-gnat-projects was given.
-@@ -12341,7 +12377,7 @@
- 	enable_gnat_projects=yes
- 
- fi;
--echo "$as_me:12344: result: $enable_gnat_projects" >&5
-+echo "$as_me:12380: result: $enable_gnat_projects" >&5
- echo "${ECHO_T}$enable_gnat_projects" >&6
- 
- ###	Checks for libraries.
-@@ -12349,13 +12385,13 @@
- (*mingw32*)
- 	;;
- (*)
--echo "$as_me:12352: checking for gettimeofday" >&5
-+echo "$as_me:12388: checking for gettimeofday" >&5
- echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
- if test "${ac_cv_func_gettimeofday+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12358 "configure"
-+#line 12394 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char gettimeofday (); below.  */
-@@ -12386,16 +12422,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12389: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12425: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12392: \$? = $ac_status" >&5
-+  echo "$as_me:12428: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12395: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12431: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12398: \$? = $ac_status" >&5
-+  echo "$as_me:12434: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_gettimeofday=yes
- else
-@@ -12405,7 +12441,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:12408: result: $ac_cv_func_gettimeofday" >&5
-+echo "$as_me:12444: result: $ac_cv_func_gettimeofday" >&5
- echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
- if test $ac_cv_func_gettimeofday = yes; then
-   cat >>confdefs.h <<\EOF
-@@ -12414,7 +12450,7 @@
- 
- else
- 
--echo "$as_me:12417: checking for gettimeofday in -lbsd" >&5
-+echo "$as_me:12453: checking for gettimeofday in -lbsd" >&5
- echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
- if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12422,7 +12458,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbsd  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 12425 "configure"
-+#line 12461 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -12441,16 +12477,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12444: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12480: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12447: \$? = $ac_status" >&5
-+  echo "$as_me:12483: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12450: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12486: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12453: \$? = $ac_status" >&5
-+  echo "$as_me:12489: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_bsd_gettimeofday=yes
- else
-@@ -12461,7 +12497,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:12464: result: $ac_cv_lib_bsd_gettimeofday" >&5
-+echo "$as_me:12500: result: $ac_cv_lib_bsd_gettimeofday" >&5
- echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
- if test $ac_cv_lib_bsd_gettimeofday = yes; then
- 
-@@ -12477,13 +12513,13 @@
- esac
- 
- ###	Checks for header files.
--echo "$as_me:12480: checking for ANSI C header files" >&5
-+echo "$as_me:12516: 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 12486 "configure"
-+#line 12522 "configure"
- #include "confdefs.h"
- #include 
- #include 
-@@ -12491,13 +12527,13 @@
- #include 
- 
- _ACEOF
--if { (eval echo "$as_me:12494: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:12530: \"$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:12500: \$? = $ac_status" >&5
-+  echo "$as_me:12536: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -12519,7 +12555,7 @@
- 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 12522 "configure"
-+#line 12558 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -12537,7 +12573,7 @@
- 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 12540 "configure"
-+#line 12576 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -12558,7 +12594,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12561 "configure"
-+#line 12597 "configure"
- #include "confdefs.h"
- #include 
- #if ((' ' & 0x0FF) == 0x020)
-@@ -12584,15 +12620,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:12587: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12623: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12590: \$? = $ac_status" >&5
-+  echo "$as_me:12626: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:12592: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12628: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12595: \$? = $ac_status" >&5
-+  echo "$as_me:12631: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -12605,7 +12641,429 @@
- fi
- fi
- fi
--echo "$as_me:12608: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:12644: result: $ac_cv_header_stdc" >&5
-+echo "${ECHO_T}$ac_cv_header_stdc" >&6
-+if test $ac_cv_header_stdc = yes; then
-+
-+cat >>confdefs.h <<\EOF
-+#define STDC_HEADERS 1
-+EOF
-+
-+fi
-+
-+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-+
-+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:12660: 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 12666 "configure"
-+#include "confdefs.h"
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:12672: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:12675: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:12678: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:12681: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  eval "$as_ac_Header=yes"
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+eval "$as_ac_Header=no"
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:12691: 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 <&5
-+echo $ECHO_N "checking for signed char... $ECHO_C" >&6
-+if test "${ac_cv_type_signed_char+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line 12707 "configure"
-+#include "confdefs.h"
-+$ac_includes_default
-+int
-+main ()
-+{
-+if ((signed char *) 0)
-+  return 0;
-+if (sizeof (signed char))
-+  return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:12722: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:12725: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:12728: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:12731: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_type_signed_char=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_type_signed_char=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:12741: result: $ac_cv_type_signed_char" >&5
-+echo "${ECHO_T}$ac_cv_type_signed_char" >&6
-+
-+echo "$as_me:12744: checking size of signed char" >&5
-+echo $ECHO_N "checking size of signed char... $ECHO_C" >&6
-+if test "${ac_cv_sizeof_signed_char+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test "$ac_cv_type_signed_char" = yes; then
-+  if test "$cross_compiling" = yes; then
-+  # Depending upon the size, compute the lo and hi bounds.
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 12753 "configure"
-+#include "confdefs.h"
-+$ac_includes_default
-+int
-+main ()
-+{
-+int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:12765: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:12768: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:12771: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:12774: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_lo=0 ac_mid=0
-+  while :; do
-+    cat >conftest.$ac_ext <<_ACEOF
-+#line 12779 "configure"
-+#include "confdefs.h"
-+$ac_includes_default
-+int
-+main ()
-+{
-+int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:12791: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:12794: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:12797: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:12800: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_hi=$ac_mid; break
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1`
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_hi=-1 ac_mid=-1
-+  while :; do
-+    cat >conftest.$ac_ext <<_ACEOF
-+#line 12816 "configure"
-+#include "confdefs.h"
-+$ac_includes_default
-+int
-+main ()
-+{
-+int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:12828: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:12831: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:12834: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:12837: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_lo=$ac_mid; break
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid`
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+  done
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+# Binary search between lo and hi bounds.
-+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 12853 "configure"
-+#include "confdefs.h"
-+$ac_includes_default
-+int
-+main ()
-+{
-+int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:12865: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:12868: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:12871: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:12874: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_hi=$ac_mid
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_lo=`expr $ac_mid + 1`
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+done
-+ac_cv_sizeof_signed_char=$ac_lo
-+else
-+  if test "$cross_compiling" = yes; then
-+  { { echo "$as_me:12887: 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 12892 "configure"
-+#include "confdefs.h"
-+$ac_includes_default
-+int
-+main ()
-+{
-+FILE *f = fopen ("conftest.val", "w");
-+if (!f)
-+  $ac_main_return (1);
-+fprintf (f, "%d", (sizeof (signed char)));
-+fclose (f);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:12908: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:12911: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+  { (eval echo "$as_me:12913: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:12916: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_sizeof_signed_char=`cat conftest.val`
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+fi
-+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+fi
-+rm -f conftest.val
-+else
-+  ac_cv_sizeof_signed_char=0
-+fi
-+fi
-+echo "$as_me:12932: result: $ac_cv_sizeof_signed_char" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
-+cat >>confdefs.h <&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 12944 "configure"
-+#include "confdefs.h"
-+#include 
-+#include 
-+#include 
-+#include 
-+
-+_ACEOF
-+if { (eval echo "$as_me:12952: \"$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:12958: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  ac_cv_header_stdc=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  ac_cv_header_stdc=no
-+fi
-+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 12980 "configure"
-+#include "confdefs.h"
-+#include 
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  egrep "memchr" >/dev/null 2>&1; then
-+  :
-+else
-+  ac_cv_header_stdc=no
-+fi
-+rm -rf conftest*
-+
-+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 12998 "configure"
-+#include "confdefs.h"
-+#include 
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  egrep "free" >/dev/null 2>&1; then
-+  :
-+else
-+  ac_cv_header_stdc=no
-+fi
-+rm -rf conftest*
-+
-+fi
-+
-+if test $ac_cv_header_stdc = yes; then
-+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-+  if test "$cross_compiling" = yes; then
-+  :
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line 13019 "configure"
-+#include "confdefs.h"
-+#include 
-+#if ((' ' & 0x0FF) == 0x020)
-+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-+#else
-+# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \
-+                     || ('j' <= (c) && (c) <= 'r') \
-+                     || ('s' <= (c) && (c) <= 'z'))
-+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-+#endif
-+
-+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-+int
-+main ()
-+{
-+  int i;
-+  for (i = 0; i < 256; i++)
-+    if (XOR (islower (i), ISLOWER (i))
-+        || toupper (i) != TOUPPER (i))
-+      $ac_main_return(2);
-+  $ac_main_return (0);
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:13045: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:13048: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+  { (eval echo "$as_me:13050: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:13053: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  :
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_header_stdc=no
-+fi
-+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+fi
-+fi
-+echo "$as_me:13066: result: $ac_cv_header_stdc" >&5
- echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
- 
-@@ -12618,13 +13076,13 @@
- 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:12621: checking for $ac_hdr that defines DIR" >&5
-+echo "$as_me:13079: 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 12627 "configure"
-+#line 13085 "configure"
- #include "confdefs.h"
- #include 
- #include <$ac_hdr>
-@@ -12639,16 +13097,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12642: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13100: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12645: \$? = $ac_status" >&5
-+  echo "$as_me:13103: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12648: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13106: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12651: \$? = $ac_status" >&5
-+  echo "$as_me:13109: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Header=yes"
- else
-@@ -12658,7 +13116,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:12661: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:13119: 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 <&5
-+  echo "$as_me:13132: 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
-@@ -12679,7 +13137,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldir  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 12682 "configure"
-+#line 13140 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -12698,16 +13156,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12701: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13159: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12704: \$? = $ac_status" >&5
-+  echo "$as_me:13162: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12707: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13165: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12710: \$? = $ac_status" >&5
-+  echo "$as_me:13168: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dir_opendir=yes
- else
-@@ -12718,14 +13176,14 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:12721: result: $ac_cv_lib_dir_opendir" >&5
-+echo "$as_me:13179: 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:12728: checking for opendir in -lx" >&5
-+  echo "$as_me:13186: 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
-@@ -12733,7 +13191,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lx  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 12736 "configure"
-+#line 13194 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -12752,16 +13210,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12755: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13213: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12758: \$? = $ac_status" >&5
-+  echo "$as_me:13216: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12761: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13219: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12764: \$? = $ac_status" >&5
-+  echo "$as_me:13222: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_x_opendir=yes
- else
-@@ -12772,7 +13230,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:12775: result: $ac_cv_lib_x_opendir" >&5
-+echo "$as_me:13233: 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"
-@@ -12780,13 +13238,13 @@
- 
- fi
- 
--echo "$as_me:12783: checking whether time.h and sys/time.h may both be included" >&5
-+echo "$as_me:13241: 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 12789 "configure"
-+#line 13247 "configure"
- #include "confdefs.h"
- #include 
- #include 
-@@ -12802,16 +13260,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12805: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13263: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12808: \$? = $ac_status" >&5
-+  echo "$as_me:13266: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12811: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13269: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12814: \$? = $ac_status" >&5
-+  echo "$as_me:13272: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_header_time=yes
- else
-@@ -12821,7 +13279,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:12824: result: $ac_cv_header_time" >&5
-+echo "$as_me:13282: result: $ac_cv_header_time" >&5
- echo "${ECHO_T}$ac_cv_header_time" >&6
- if test $ac_cv_header_time = yes; then
- 
-@@ -12839,13 +13297,13 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ac_main_return=return
- 
--echo "$as_me:12842: checking for an ANSI C-conforming const" >&5
-+echo "$as_me:13300: checking for an ANSI C-conforming const" >&5
- echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
- if test "${ac_cv_c_const+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12848 "configure"
-+#line 13306 "configure"
- #include "confdefs.h"
- 
- int
-@@ -12903,16 +13361,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12906: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13364: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12909: \$? = $ac_status" >&5
-+  echo "$as_me:13367: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12912: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13370: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12915: \$? = $ac_status" >&5
-+  echo "$as_me:13373: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_const=yes
- else
-@@ -12922,7 +13380,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:12925: result: $ac_cv_c_const" >&5
-+echo "$as_me:13383: result: $ac_cv_c_const" >&5
- echo "${ECHO_T}$ac_cv_c_const" >&6
- if test $ac_cv_c_const = no; then
- 
-@@ -12934,7 +13392,7 @@
- 
- ###	Checks for external-data
- 
--echo "$as_me:12937: checking if data-only library module links" >&5
-+echo "$as_me:13395: checking if data-only library module links" >&5
- echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
- if test "${cf_cv_link_dataonly+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12942,20 +13400,20 @@
- 
- 	rm -f conftest.a
- 	cat >conftest.$ac_ext <&5
-+	if { (eval echo "$as_me:13406: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12951: \$? = $ac_status" >&5
-+  echo "$as_me:13409: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 		mv conftest.o data.o && \
- 		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
- 	fi
- 	rm -f conftest.$ac_ext data.o
- 	cat >conftest.$ac_ext <&5
-+	if { (eval echo "$as_me:13429: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12974: \$? = $ac_status" >&5
-+  echo "$as_me:13432: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
- 		mv conftest.o func.o && \
- 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
-@@ -12984,7 +13442,7 @@
-   cf_cv_link_dataonly=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12987 "configure"
-+#line 13445 "configure"
- #include "confdefs.h"
- 
- 	int main()
-@@ -12995,15 +13453,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:12998: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13456: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13001: \$? = $ac_status" >&5
-+  echo "$as_me:13459: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:13003: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13461: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13006: \$? = $ac_status" >&5
-+  echo "$as_me:13464: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_link_dataonly=yes
- else
-@@ -13018,7 +13476,7 @@
- 
- fi
- 
--echo "$as_me:13021: result: $cf_cv_link_dataonly" >&5
-+echo "$as_me:13479: result: $cf_cv_link_dataonly" >&5
- echo "${ECHO_T}$cf_cv_link_dataonly" >&6
- 
- if test "$cf_cv_link_dataonly" = no ; then
-@@ -13032,7 +13490,7 @@
- 
- ###	Checks for library functions.
- 
--echo "$as_me:13035: checking for working mkstemp" >&5
-+echo "$as_me:13493: checking for working mkstemp" >&5
- echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
- if test "${cf_cv_func_mkstemp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13043,7 +13501,7 @@
-   cf_cv_func_mkstemp=maybe
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13046 "configure"
-+#line 13504 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -13081,15 +13539,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:13084: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13542: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13087: \$? = $ac_status" >&5
-+  echo "$as_me:13545: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:13089: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13547: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13092: \$? = $ac_status" >&5
-+  echo "$as_me:13550: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_mkstemp=yes
- 
-@@ -13104,16 +13562,16 @@
- fi
- 
- fi
--echo "$as_me:13107: result: $cf_cv_func_mkstemp" >&5
-+echo "$as_me:13565: result: $cf_cv_func_mkstemp" >&5
- echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
- if test "x$cf_cv_func_mkstemp" = xmaybe ; then
--	echo "$as_me:13110: checking for mkstemp" >&5
-+	echo "$as_me:13568: checking for mkstemp" >&5
- echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
- if test "${ac_cv_func_mkstemp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13116 "configure"
-+#line 13574 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char mkstemp (); below.  */
-@@ -13144,16 +13602,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13147: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13605: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13150: \$? = $ac_status" >&5
-+  echo "$as_me:13608: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13153: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13611: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13156: \$? = $ac_status" >&5
-+  echo "$as_me:13614: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_mkstemp=yes
- else
-@@ -13163,7 +13621,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:13166: result: $ac_cv_func_mkstemp" >&5
-+echo "$as_me:13624: result: $ac_cv_func_mkstemp" >&5
- echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
- 
- fi
-@@ -13186,7 +13644,7 @@
- cf_ada_make=gnatmake
- # Extract the first word of "$cf_ada_make", so it can be a program name with args.
- set dummy $cf_ada_make; ac_word=$2
--echo "$as_me:13189: checking for $ac_word" >&5
-+echo "$as_me:13647: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_gnat_exists+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13201,7 +13659,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_gnat_exists="yes"
--echo "$as_me:13204: found $ac_dir/$ac_word" >&5
-+echo "$as_me:13662: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -13210,10 +13668,10 @@
- fi
- gnat_exists=$ac_cv_prog_gnat_exists
- if test -n "$gnat_exists"; then
--  echo "$as_me:13213: result: $gnat_exists" >&5
-+  echo "$as_me:13671: result: $gnat_exists" >&5
- echo "${ECHO_T}$gnat_exists" >&6
- else
--  echo "$as_me:13216: result: no" >&5
-+  echo "$as_me:13674: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -13222,12 +13680,12 @@
- 	cf_cv_prog_gnat_correct=no
- else
- 
--echo "$as_me:13225: checking for gnat version" >&5
-+echo "$as_me:13683: checking for gnat version" >&5
- echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
- cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
- 	grep '[0-9].[0-9][0-9]*' |\
- 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
--echo "$as_me:13230: result: $cf_gnat_version" >&5
-+echo "$as_me:13688: result: $cf_gnat_version" >&5
- echo "${ECHO_T}$cf_gnat_version" >&6
- 
- case $cf_gnat_version in
-@@ -13235,7 +13693,7 @@
- 	cf_cv_prog_gnat_correct=yes
- 	;;
- (*)
--	{ echo "$as_me:13238: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
-+	{ echo "$as_me:13696: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
- echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
- 	cf_cv_prog_gnat_correct=no
- 	;;
-@@ -13243,7 +13701,7 @@
- 
- 	# Extract the first word of "m4", so it can be a program name with args.
- set dummy m4; ac_word=$2
--echo "$as_me:13246: checking for $ac_word" >&5
-+echo "$as_me:13704: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_M4_exists+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13258,7 +13716,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_M4_exists="yes"
--echo "$as_me:13261: found $ac_dir/$ac_word" >&5
-+echo "$as_me:13719: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -13267,10 +13725,10 @@
- fi
- M4_exists=$ac_cv_prog_M4_exists
- if test -n "$M4_exists"; then
--  echo "$as_me:13270: result: $M4_exists" >&5
-+  echo "$as_me:13728: result: $M4_exists" >&5
- echo "${ECHO_T}$M4_exists" >&6
- else
--  echo "$as_me:13273: result: no" >&5
-+  echo "$as_me:13731: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -13279,7 +13737,7 @@
- 		echo Ada95 binding required program m4 not found. Ada95 binding disabled.
- 	fi
- 	if test "$cf_cv_prog_gnat_correct" = yes; then
--		echo "$as_me:13282: checking if GNAT works" >&5
-+		echo "$as_me:13740: checking if GNAT works" >&5
- echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
- 
- rm -rf conftest* *~conftest*
-@@ -13307,14 +13765,14 @@
- fi
- rm -rf conftest* *~conftest*
- 
--		echo "$as_me:13310: result: $cf_cv_prog_gnat_correct" >&5
-+		echo "$as_me:13768: result: $cf_cv_prog_gnat_correct" >&5
- echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
- 	fi
- fi
- 
- 	if test	"$cf_cv_prog_gnat_correct" = yes; then
- 
--	echo "$as_me:13317: checking optimization options for ADAFLAGS" >&5
-+	echo "$as_me:13775: checking optimization options for ADAFLAGS" >&5
- echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
- 	case "$CFLAGS" in
- 	(*-g*)
-@@ -13331,10 +13789,10 @@
- 
- 		;;
- 	esac
--	echo "$as_me:13334: result: $ADAFLAGS" >&5
-+	echo "$as_me:13792: result: $ADAFLAGS" >&5
- echo "${ECHO_T}$ADAFLAGS" >&6
- 
--echo "$as_me:13337: checking if GNATPREP supports -T option" >&5
-+echo "$as_me:13795: checking if GNATPREP supports -T option" >&5
- echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
- if test "${cf_cv_gnatprep_opt_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13344,11 +13802,11 @@
- gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
- 
- fi
--echo "$as_me:13347: result: $cf_cv_gnatprep_opt_t" >&5
-+echo "$as_me:13805: result: $cf_cv_gnatprep_opt_t" >&5
- echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
- test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
- 
--echo "$as_me:13351: checking if GNAT supports generics" >&5
-+echo "$as_me:13809: checking if GNAT supports generics" >&5
- echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
- case $cf_gnat_version in
- (3.[1-9]*|[4-9].*)
-@@ -13358,7 +13816,7 @@
- 	cf_gnat_generics=no
- 	;;
- esac
--echo "$as_me:13361: result: $cf_gnat_generics" >&5
-+echo "$as_me:13819: result: $cf_gnat_generics" >&5
- echo "${ECHO_T}$cf_gnat_generics" >&6
- 
- if test "$cf_gnat_generics" = yes
-@@ -13370,7 +13828,7 @@
- 	cf_generic_objects=
- fi
- 
--echo "$as_me:13373: checking if GNAT supports SIGINT" >&5
-+echo "$as_me:13831: checking if GNAT supports SIGINT" >&5
- echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
- if test "${cf_cv_gnat_sigint+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13418,7 +13876,7 @@
- rm -rf conftest* *~conftest*
- 
- fi
--echo "$as_me:13421: result: $cf_cv_gnat_sigint" >&5
-+echo "$as_me:13879: result: $cf_cv_gnat_sigint" >&5
- echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
- 
- if test $cf_cv_gnat_sigint = yes ; then
-@@ -13431,7 +13889,7 @@
- cf_gnat_projects=no
- 
- if test "$enable_gnat_projects" != no ; then
--echo "$as_me:13434: checking if GNAT supports project files" >&5
-+echo "$as_me:13892: checking if GNAT supports project files" >&5
- echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
- case $cf_gnat_version in
- (3.[0-9]*)
-@@ -13491,15 +13949,15 @@
- 	esac
- 	;;
- esac
--echo "$as_me:13494: result: $cf_gnat_projects" >&5
-+echo "$as_me:13952: result: $cf_gnat_projects" >&5
- echo "${ECHO_T}$cf_gnat_projects" >&6
- fi # enable_gnat_projects
- 
- if test $cf_gnat_projects = yes
- then
--	echo "$as_me:13500: checking if GNAT supports libraries" >&5
-+	echo "$as_me:13958: checking if GNAT supports libraries" >&5
- echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
--	echo "$as_me:13502: result: $cf_gnat_libraries" >&5
-+	echo "$as_me:13960: result: $cf_gnat_libraries" >&5
- echo "${ECHO_T}$cf_gnat_libraries" >&6
- fi
- 
-@@ -13519,7 +13977,7 @@
- 	USE_GNAT_LIBRARIES="#"
- fi
- 
--echo "$as_me:13522: checking for ada-compiler" >&5
-+echo "$as_me:13980: checking for ada-compiler" >&5
- echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
- 
- # Check whether --with-ada-compiler or --without-ada-compiler was given.
-@@ -13530,12 +13988,12 @@
-   cf_ada_compiler=gnatmake
- fi;
- 
--echo "$as_me:13533: result: $cf_ada_compiler" >&5
-+echo "$as_me:13991: result: $cf_ada_compiler" >&5
- echo "${ECHO_T}$cf_ada_compiler" >&6
- 
- 		cf_ada_package=terminal_interface
- 
--echo "$as_me:13538: checking for ada-include" >&5
-+echo "$as_me:13996: checking for ada-include" >&5
- echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
- 
- # Check whether --with-ada-include or --without-ada-include was given.
-@@ -13571,7 +14029,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:13574: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:14032: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -13580,10 +14038,10 @@
- fi
- eval ADA_INCLUDE="$withval"
- 
--echo "$as_me:13583: result: $ADA_INCLUDE" >&5
-+echo "$as_me:14041: result: $ADA_INCLUDE" >&5
- echo "${ECHO_T}$ADA_INCLUDE" >&6
- 
--echo "$as_me:13586: checking for ada-objects" >&5
-+echo "$as_me:14044: checking for ada-objects" >&5
- echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
- 
- # Check whether --with-ada-objects or --without-ada-objects was given.
-@@ -13619,7 +14077,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:13622: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:14080: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -13628,10 +14086,10 @@
- fi
- eval ADA_OBJECTS="$withval"
- 
--echo "$as_me:13631: result: $ADA_OBJECTS" >&5
-+echo "$as_me:14089: result: $ADA_OBJECTS" >&5
- echo "${ECHO_T}$ADA_OBJECTS" >&6
- 
--echo "$as_me:13634: checking if an Ada95 shared-library should be built" >&5
-+echo "$as_me:14092: checking if an Ada95 shared-library should be built" >&5
- echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
- 
- # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
-@@ -13641,7 +14099,7 @@
- else
-   with_ada_sharedlib=no
- fi;
--echo "$as_me:13644: result: $with_ada_sharedlib" >&5
-+echo "$as_me:14102: result: $with_ada_sharedlib" >&5
- echo "${ECHO_T}$with_ada_sharedlib" >&6
- 
- ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
-@@ -13657,12 +14115,12 @@
- fi
- 
- 	else
--		{ { echo "$as_me:13660: error: No usable Ada compiler found" >&5
-+		{ { echo "$as_me:14118: error: No usable Ada compiler found" >&5
- echo "$as_me: error: No usable Ada compiler found" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
- else
--	{ { echo "$as_me:13665: error: The Ada compiler is needed for this package" >&5
-+	{ { echo "$as_me:14123: error: The Ada compiler is needed for this package" >&5
- echo "$as_me: error: The Ada compiler is needed for this package" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -13702,7 +14160,7 @@
- fi
- 
- ### Build up pieces for makefile rules
--echo "$as_me:13705: checking default library suffix" >&5
-+echo "$as_me:14163: checking default library suffix" >&5
- echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -13713,10 +14171,10 @@
- 	(shared)  DFT_ARG_SUFFIX=''   ;;
- 	esac
- 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
--echo "$as_me:13716: result: $DFT_ARG_SUFFIX" >&5
-+echo "$as_me:14174: result: $DFT_ARG_SUFFIX" >&5
- echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
- 
--echo "$as_me:13719: checking default library-dependency suffix" >&5
-+echo "$as_me:14177: checking default library-dependency suffix" >&5
- echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
- 
- 	case X$DFT_LWR_MODEL in
-@@ -13774,10 +14232,10 @@
- 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
- 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
- 	fi
--echo "$as_me:13777: result: $DFT_DEP_SUFFIX" >&5
-+echo "$as_me:14235: result: $DFT_DEP_SUFFIX" >&5
- echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
- 
--echo "$as_me:13780: checking default object directory" >&5
-+echo "$as_me:14238: checking default object directory" >&5
- echo $ECHO_N "checking default object directory... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -13793,7 +14251,7 @@
- 			DFT_OBJ_SUBDIR='obj_s' ;;
- 		esac
- 	esac
--echo "$as_me:13796: result: $DFT_OBJ_SUBDIR" >&5
-+echo "$as_me:14254: result: $DFT_OBJ_SUBDIR" >&5
- echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
- 
- ### Set up low-level terminfo dependencies for makefiles.
-@@ -13924,6 +14382,12 @@
- # match layout used by make-tar.sh
- ADAHTML_DIR=../doc/ada
- 
-+if test "x$cross_compiling" = xyes ; then
-+	ADAGEN_LDFLAGS='$(CROSS_LDFLAGS)'
-+else
-+	ADAGEN_LDFLAGS='$(NATIVE_LDFLAGS)'
-+fi
-+
- ac_config_files="$ac_config_files $SUB_MAKEFILES doc/adacurses${DFT_ARG_SUFFIX}-config.1:doc/MKada_config.in Makefile"
- ac_config_commands="$ac_config_commands default"
- cat >confcache <<\_ACEOF
-@@ -14005,7 +14469,7 @@
- : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ echo "$as_me:14008: creating $CONFIG_STATUS" >&5
-+{ echo "$as_me:14472: creating $CONFIG_STATUS" >&5
- echo "$as_me: creating $CONFIG_STATUS" >&6;}
- cat >$CONFIG_STATUS <<_ACEOF
- #! $SHELL
-@@ -14181,7 +14645,7 @@
-     echo "$ac_cs_version"; exit 0 ;;
-   --he | --h)
-     # Conflict between --help and --header
--    { { echo "$as_me:14184: error: ambiguous option: $1
-+    { { echo "$as_me:14648: 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;}
-@@ -14200,7 +14664,7 @@
-     ac_need_defaults=false;;
- 
-   # This is an error.
--  -*) { { echo "$as_me:14203: error: unrecognized option: $1
-+  -*) { { echo "$as_me:14667: 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;}
-@@ -14271,7 +14735,7 @@
-   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
--  *) { { echo "$as_me:14274: error: invalid argument: $ac_config_target" >&5
-+  *) { { echo "$as_me:14738: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
-@@ -14481,6 +14945,7 @@
- s,@NCURSES_TREE@,$NCURSES_TREE,;t t
- s,@EXTERNAL_TREE@,$EXTERNAL_TREE,;t t
- s,@ADAHTML_DIR@,$ADAHTML_DIR,;t t
-+s,@ADAGEN_LDFLAGS@,$ADAGEN_LDFLAGS,;t t
- CEOF
- 
- EOF
-@@ -14595,7 +15060,7 @@
-   esac
- 
-   if test x"$ac_file" != x-; then
--    { echo "$as_me:14598: creating $ac_file" >&5
-+    { echo "$as_me:15063: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
-     rm -f "$ac_file"
-   fi
-@@ -14613,7 +15078,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:14616: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:15081: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -14626,7 +15091,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:14629: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:15094: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -14642,7 +15107,7 @@
-       if test -n "$ac_seen"; then
-         ac_used=`grep '@datarootdir@' $ac_item`
-         if test -z "$ac_used"; then
--          { echo "$as_me:14645: WARNING: datarootdir was used implicitly but not set:
-+          { echo "$as_me:15110: 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;}
-@@ -14651,7 +15116,7 @@
-       fi
-       ac_seen=`grep '${datarootdir}' $ac_item`
-       if test -n "$ac_seen"; then
--        { echo "$as_me:14654: WARNING: datarootdir was used explicitly but not set:
-+        { echo "$as_me:15119: 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;}
-@@ -14688,7 +15153,7 @@
-             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:14691: WARNING: Variable $ac_name is used but was not set:
-+              { echo "$as_me:15156: 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;}
-@@ -14699,7 +15164,7 @@
-     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:14702: WARNING: Some variables may not be substituted:
-+      { echo "$as_me:15167: WARNING: Some variables may not be substituted:
- $ac_seen" >&5
- echo "$as_me: WARNING: Some variables may not be substituted:
- $ac_seen" >&2;}
-@@ -14748,7 +15213,7 @@
-   * )   ac_file_in=$ac_file.in ;;
-   esac
- 
--  test x"$ac_file" != x- && { echo "$as_me:14751: creating $ac_file" >&5
-+  test x"$ac_file" != x- && { echo "$as_me:15216: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
- 
-   # First look for the input files in the build tree, otherwise in the
-@@ -14759,7 +15224,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:14762: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:15227: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -14772,7 +15237,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:14775: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:15240: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -14830,7 +15295,7 @@
-   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:14833: $ac_file is unchanged" >&5
-+      { echo "$as_me:15298: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
-     else
-       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-Index: Ada95/configure.in
-Prereq:  1.60 
---- ncurses-6.0-20150912+/Ada95/configure.in	2015-04-18 18:49:57.000000000 +0000
-+++ ncurses-6.0-20150919/Ada95/configure.in	2015-09-19 20:33:36.000000000 +0000
-@@ -28,14 +28,14 @@
- dnl
- dnl Author: Thomas E. Dickey
- dnl
--dnl $Id: configure.in,v 1.60 2015/04/18 18:49:57 tom Exp $
-+dnl $Id: configure.in,v 1.61 2015/09/19 20:33:36 tom Exp $
- dnl Process this file with autoconf to produce a configure script.
- dnl
- dnl See http://invisible-island.net/autoconf/ for additional information.
- dnl
- dnl ---------------------------------------------------------------------------
- AC_PREREQ(2.52.20030208)
--AC_REVISION($Revision: 1.60 $)
-+AC_REVISION($Revision: 1.61 $)
- AC_INIT(gen/gen.c)
- AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
- 
-@@ -448,6 +448,7 @@
- esac
- 
- ###	Checks for header files.
-+AC_CHECK_SIZEOF([signed char], 0)
- AC_STDC_HEADERS
- AC_HEADER_DIRENT
- AC_HEADER_TIME
-@@ -584,6 +585,14 @@
- ADAHTML_DIR=../doc/ada
- AC_SUBST(ADAHTML_DIR)
- 
-+if test "x$cross_compiling" = xyes ; then
-+	ADAGEN_LDFLAGS='$(CROSS_LDFLAGS)'
-+else
-+	ADAGEN_LDFLAGS='$(NATIVE_LDFLAGS)'
-+fi
-+
-+AC_SUBST(ADAGEN_LDFLAGS)
-+
- AC_OUTPUT( \
- 	$SUB_MAKEFILES \
- 	doc/adacurses${DFT_ARG_SUFFIX}-config.1:doc/MKada_config.in \
-Index: NEWS
-Prereq:  1.2493 
---- ncurses-6.0-20150912+/NEWS	2015-09-12 19:52:57.000000000 +0000
-+++ ncurses-6.0-20150919/NEWS	2015-09-19 23:04:21.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.2493 2015/09/12 19:52:57 tom Exp $
-+-- $Id: NEWS,v 1.2496 2015/09/19 23:04:21 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,14 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20150919
-+	+ clarify in resizeterm.3x how KEY_RESIZE is pushed onto the input
-+	  stream.
-+	+ clarify in curs_getch.3x that the keypad mode affects ability to
-+	  read KEY_MOUSE codes, but does not affect KEY_RESIZE.
-+	+ add overlooked build-fix needed with Cygwin for separate Ada95
-+	  configure script, cf: 20150606 (report by Nicolas Boulenguez)
-+
- 20150912
- 	+ fixes for configure/build using clang on OSX (prompted by report by
- 	  William Gallafent).
-Index: VERSION
---- ncurses-6.0-20150912+/VERSION	2015-09-12 16:17:30.000000000 +0000
-+++ ncurses-6.0-20150919/VERSION	2015-09-19 19:40:14.000000000 +0000
-@@ -1 +1 @@
--5:0:9	6.0	20150912
-+5:0:9	6.0	20150919
-Index: dist.mk
-Prereq:  1.1070 
---- ncurses-6.0-20150912+/dist.mk	2015-09-12 16:17:30.000000000 +0000
-+++ ncurses-6.0-20150919/dist.mk	2015-09-19 19:40:14.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1070 2015/09/12 16:17:30 tom Exp $
-+# $Id: dist.mk,v 1.1071 2015/09/19 19:40:14 tom Exp $
- # Makefile for creating ncurses distributions.
- #
- # This only needs to be used directly as a makefile by developers, but
-@@ -37,7 +37,7 @@
- # These define the major/minor/patch versions of ncurses.
- NCURSES_MAJOR = 6
- NCURSES_MINOR = 0
--NCURSES_PATCH = 20150912
-+NCURSES_PATCH = 20150919
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: doc/html/man/captoinfo.1m.html
---- ncurses-6.0-20150912+/doc/html/man/captoinfo.1m.html	2015-09-05 21:19:32.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/captoinfo.1m.html	2015-09-19 23:18:49.000000000 +0000
-@@ -205,7 +205,7 @@
- 
SEE ALSO
-        infocmp(1m), curses(3x), terminfo(5)
- 
--       This describes ncurses version 6.0 (patch 20150905).
-+       This describes ncurses version 6.0 (patch 20150919).
- 
- 
- 

-Index: doc/html/man/clear.1.html
---- ncurses-6.0-20150912+/doc/html/man/clear.1.html	2015-09-05 21:19:32.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/clear.1.html	2015-09-19 23:18:49.000000000 +0000
-@@ -71,7 +71,7 @@
- 
SEE ALSO
-        tput(1), terminfo(5)
- 
--       This describes ncurses version 6.0 (patch 20150905).
-+       This describes ncurses version 6.0 (patch 20150919).
- 
- 
- 
-Index: doc/html/man/curs_addch.3x.html
---- ncurses-6.0-20150912+/doc/html/man/curs_addch.3x.html	2015-09-05 21:19:33.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/curs_addch.3x.html	2015-09-19 23:18:49.000000000 +0000
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_addch.3x,v 1.36 2015/07/16 09:14:44 tom Exp @
-+  * @Id: curs_addch.3x,v 1.37 2015/09/05 21:13:25 tom Exp @
- -->
- 
- 
-Index: doc/html/man/curs_getch.3x.html
---- ncurses-6.0-20150912+/doc/html/man/curs_getch.3x.html	2015-07-22 00:49:56.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/curs_getch.3x.html	2015-09-19 23:18:50.000000000 +0000
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_getch.3x,v 1.42 2015/07/21 08:44:04 tom Exp @
-+  * @Id: curs_getch.3x,v 1.43 2015/09/19 22:25:05 tom Exp @
- -->
- 
- 
-@@ -247,32 +247,37 @@
-        real key:
- 
-        o   KEY_RESIZE  is  returned  when the SIGWINCH signal has
--           been detected (see curs_initscr(3x) and resizeterm(3x)).
-+           been detected (see  curs_initscr(3x)  and  resizeterm(3x)).
-+           This  code  is returned whether or not keypad has been
-+           enabled.
- 
-        o   KEY_MOUSE   is   returned   for   mouse-events    (see
--           curs_mouse(3x)).
-+           curs_mouse(3x)).  This code relies upon whether or not
-+           keypad(3x) has been enabled, because (e.g., with xterm
-+           mouse  prototocol) ncurses must read escape sequences,
-+           just like a function key.
- 
- 
- 

- 
Testing key-codes
--       The  has_key routine takes a key-code value from the above
--       list, and returns TRUE or FALSE according to  whether  the
-+       The has_key routine takes a key-code value from the  above
-+       list,  and  returns TRUE or FALSE according to whether the
-        current terminal type recognizes a key with that value.
- 
-        The library also supports these extensions:
- 
-           define_key
--               defines  a  key-code  for  a given string (see de-
-+               defines a key-code for a  given  string  (see  de-
-                fine_key(3x)).
- 
-           key_defined
--               checks if there is a key-code defined for a  given
-+               checks  if there is a key-code defined for a given
-                string (see key_defined(3x)).
- 
- 
- 

- 
RETURN VALUE
--       All  routines  return  the integer ERR upon failure and an
-+       All routines return the integer ERR upon  failure  and  an
-        integer value other than ERR (OK in the case of ungetch())
-        upon successful completion.
- 
-@@ -280,94 +285,102 @@
-                returns ERR if there is no more room in the FIFO.
- 
-           wgetch
--               returns  ERR  if the window pointer is null, or if
-+               returns ERR if the window pointer is null,  or  if
-                its timeout expires without having any data.
- 
--       Functions with a "mv" prefix first perform a cursor  move-
--       ment  using  wmove, and return an error if the position is
-+       Functions  with a "mv" prefix first perform a cursor move-
-+       ment using wmove, and return an error if the  position  is
-        outside the window, or if the window pointer is null.
- 
- 
- 

- 
NOTES
-        Use of the escape key by a programmer for a single charac-
--       ter  function  is discouraged, as it will cause a delay of
-+       ter function is discouraged, as it will cause a  delay  of
-        up to one second while the keypad code looks for a follow-
-        ing function-key sequence.
- 
--       Some  keys  may be the same as commonly used control keys,
--       e.g., KEY_ENTER  versus  control/M,  KEY_BACKSPACE  versus
-+       Some keys may be the same as commonly used  control  keys,
-+       e.g.,  KEY_ENTER  versus  control/M,  KEY_BACKSPACE versus
-        control/H.  Some curses implementations may differ accord-
--       ing to whether they treat  these  control  keys  specially
--       (and  ignore  the  terminfo),  or use the terminfo defini-
--       tions.  Ncurses uses the terminfo definition.  If it  says
--       that  KEY_ENTER  is control/M, getch will return KEY_ENTER
-+       ing  to  whether  they  treat these control keys specially
-+       (and ignore the terminfo), or  use  the  terminfo  defini-
-+       tions.   Ncurses uses the terminfo definition.  If it says
-+       that KEY_ENTER is control/M, getch will  return  KEY_ENTER
-        when you press control/M.
- 
--       Generally, KEY_ENTER denotes the character(s) sent by  the
-+       Generally,  KEY_ENTER denotes the character(s) sent by the
-        Enter key on the numeric keypad:
- 
-        o   the terminal description lists the most useful keys,
- 
--       o   the  Enter key on the regular keyboard is already han-
-+       o   the Enter key on the regular keyboard is already  han-
-            dled by the standard ASCII characters for carriage-re-
-            turn and line-feed,
- 
--       o   depending  on  whether nl or nonl was called, pressing
--           "Enter" on the regular keyboard may  return  either  a
-+       o   depending on whether nl or nonl was  called,  pressing
-+           "Enter"  on  the  regular keyboard may return either a
-            carriage-return or line-feed, and finally
- 
--       o   "Enter  or  send" is the standard description for this
-+       o   "Enter or send" is the standard description  for  this
-            key.
- 
--       When using getch, wgetch, mvgetch, or  mvwgetch,  nocbreak
-+       When  using  getch, wgetch, mvgetch, or mvwgetch, nocbreak
-        mode (nocbreak) and echo mode (echo) should not be used at
--       the same time.  Depending on the state of the  tty  driver
--       when  each character is typed, the program may produce un-
-+       the  same  time.  Depending on the state of the tty driver
-+       when each character is typed, the program may produce  un-
-        desirable results.
- 
-        Note that getch, mvgetch, and mvwgetch may be macros.
- 
-        Historically, the set of keypad macros was largely defined
--       by  the  extremely  function-key-rich keyboard of the AT&T
--       7300, aka 3B1, aka Safari 4.   Modern  personal  computers
--       usually  have  only a small subset of these.  IBM PC-style
--       consoles  typically  support  little  more  than   KEY_UP,
--       KEY_DOWN,    KEY_LEFT,   KEY_RIGHT,   KEY_HOME,   KEY_END,
-+       by the extremely function-key-rich keyboard  of  the  AT&T
-+       7300,  aka  3B1,  aka Safari 4.  Modern personal computers
-+       usually have only a small subset of these.   IBM  PC-style
-+       consoles   typically  support  little  more  than  KEY_UP,
-+       KEY_DOWN,   KEY_LEFT,   KEY_RIGHT,   KEY_HOME,    KEY_END,
-        KEY_NPAGE, KEY_PPAGE, and function keys 1 through 12.  The
-        Ins key is usually mapped to KEY_IC.
- 
- 
- 

- 
PORTABILITY
--       The  *get* functions are described in the XSI Curses stan-
--       dard, Issue 4.  They  read  single-byte  characters  only.
--       The  standard  specifies  that they return ERR on failure,
-+       The *get* functions are described in the XSI Curses  stan-
-+       dard,  Issue  4.   They  read single-byte characters only.
-+       The standard specifies that they return  ERR  on  failure,
-        but specifies no error conditions.
- 
--       The echo behavior of these functions on input of  KEY_  or
--       backspace  characters  was not specified in the SVr4 docu-
-+       The  echo  behavior of these functions on input of KEY_ or
-+       backspace characters was not specified in the  SVr4  docu-
-        mentation.  This description is adopted from the XSI Curs-
-        es standard.
- 
--       The  behavior of getch and friends in the presence of han-
--       dled signals is unspecified in the  SVr4  and  XSI  Curses
--       documentation.   Under  historical curses implementations,
--       it varied depending on whether the operating system's  im-
--       plementation   of  handled  signal  receipt  interrupts  a
--       read(2) call in progress or not, and also (in some  imple-
--       mentations)  depending on whether an input timeout or non-
-+       The behavior of getch and friends in the presence of  han-
-+       dled  signals  is  unspecified  in the SVr4 and XSI Curses
-+       documentation.  Under historical  curses  implementations,
-+       it  varied depending on whether the operating system's im-
-+       plementation  of  handled  signal  receipt  interrupts   a
-+       read(2)  call in progress or not, and also (in some imple-
-+       mentations) depending on whether an input timeout or  non-
-        blocking mode has been set.
- 
-+       KEY_MOUSE is mentioned in XSI Curses, along with a few re-
-+       lated terminfo capabilities, but no higher-level functions
-+       use  the feature.  The implementation in ncurses is an ex-
-+       tension.
-+
-+       KEY_RESIZE is an extension first implemented for  ncurses.
-+       NetBSD curses later added this extension.
-+
-        Programmers concerned about portability should be prepared
--       for  either  of two cases: (a) signal receipt does not in-
--       terrupt getch; (b) signal  receipt  interrupts  getch  and
--       causes  it  to  return ERR with errno set to EINTR.  Under
--       the ncurses implementation, handled signals  never  inter-
-+       for either of two cases: (a) signal receipt does  not  in-
-+       terrupt  getch;  (b)  signal  receipt interrupts getch and
-+       causes it to return ERR with errno set  to  EINTR.   Under
-+       the  ncurses  implementation, handled signals never inter-
-        rupt getch.
- 
--       The  has_key  function is unique to ncurses.  We recommend
--       that any code using it be conditionalized  on  the  NCURS-
-+       The has_key function is unique to ncurses.   We  recommend
-+       that  any  code  using it be conditionalized on the NCURS-
-        ES_VERSION feature macro.
- 
- 
-@@ -377,7 +390,7 @@
-        curs_mouse(3x),   curs_move(3x),   curs_refresh(3x),   re-
-        sizeterm(3x).
- 
--       Comparable  functions in the wide-character (ncursesw) li-
-+       Comparable functions in the wide-character (ncursesw)  li-
-        brary are described in curs_get_wch(3x).
- 
- 
-Index: doc/html/man/curs_threads.3x.html
---- ncurses-6.0-20150912+/doc/html/man/curs_threads.3x.html	2015-05-13 19:27:46.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/curs_threads.3x.html	2015-09-19 23:18:52.000000000 +0000
-@@ -26,7 +26,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_threads.3x,v 1.21 2015/04/11 10:23:49 tom Exp @
-+  * @Id: curs_threads.3x,v 1.22 2015/09/05 21:13:25 tom Exp @
-   * ***************************************************************************
-   * ***************************************************************************
- -->
-Index: doc/html/man/form.3x.html
---- ncurses-6.0-20150912+/doc/html/man/form.3x.html	2015-09-05 21:19:36.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/form.3x.html	2015-09-19 23:18:53.000000000 +0000
-@@ -245,7 +245,7 @@
-        curses(3x) and related pages whose names begin "form_" for
-        detailed descriptions of the entry points.
- 
--       This describes ncurses version 6.0 (patch 20150905).
-+       This describes ncurses version 6.0 (patch 20150919).
- 
- 
- 
-Index: doc/html/man/infocmp.1m.html
---- ncurses-6.0-20150912+/doc/html/man/infocmp.1m.html	2015-09-05 21:19:38.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/infocmp.1m.html	2015-09-19 23:18:54.000000000 +0000
-@@ -487,7 +487,7 @@
- 
-        http://invisible-island.net/ncurses/tctest.html
- 
--       This describes ncurses version 6.0 (patch 20150905).
-+       This describes ncurses version 6.0 (patch 20150919).
- 
- 
- 

-Index: doc/html/man/infotocap.1m.html
---- ncurses-6.0-20150912+/doc/html/man/infotocap.1m.html	2015-09-05 21:19:38.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/infotocap.1m.html	2015-09-19 23:18:54.000000000 +0000
-@@ -94,7 +94,7 @@
- 
SEE ALSO
-        curses(3x), tic(1m), infocmp(1m), terminfo(5)
- 
--       This describes ncurses version 6.0 (patch 20150905).
-+       This describes ncurses version 6.0 (patch 20150919).
- 
- 
- 

-Index: doc/html/man/menu.3x.html
---- ncurses-6.0-20150912+/doc/html/man/menu.3x.html	2015-09-05 21:19:38.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/menu.3x.html	2015-09-19 23:18:55.000000000 +0000
-@@ -227,7 +227,7 @@
-        curses(3x) and related pages whose names begin "menu_" for
-        detailed descriptions of the entry points.
- 
--       This describes ncurses version 6.0 (patch 20150905).
-+       This describes ncurses version 6.0 (patch 20150919).
- 
- 
- 
-Index: doc/html/man/ncurses.3x.html
---- ncurses-6.0-20150912+/doc/html/man/ncurses.3x.html	2015-09-05 21:19:39.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/ncurses.3x.html	2015-09-19 23:18:56.000000000 +0000
-@@ -63,7 +63,7 @@
-        sonable optimization.  This implementation is "new curses"
-        (ncurses) and is the approved replacement for 4.4BSD clas-
-        sic  curses,  which has been discontinued.  This describes
--       ncurses version 6.0 (patch 20150905).
-+       ncurses version 6.0 (patch 20150919).
- 
-        The ncurses library emulates the curses library of  System
-        V  Release  4  UNIX,  and  XPG4 (X/Open Portability Guide)
-Index: doc/html/man/panel.3x.html
---- ncurses-6.0-20150912+/doc/html/man/panel.3x.html	2015-09-05 21:19:39.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/panel.3x.html	2015-09-19 23:18:56.000000000 +0000
-@@ -218,7 +218,7 @@
- 
SEE ALSO
-        curses(3x), curs_variables(3x),
- 
--       This describes ncurses version 6.0 (patch 20150905).
-+       This describes ncurses version 6.0 (patch 20150919).
- 
- 
- 

-Index: doc/html/man/resizeterm.3x.html
---- ncurses-6.0-20150912+/doc/html/man/resizeterm.3x.html	2015-06-06 23:47:48.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/resizeterm.3x.html	2015-09-19 23:18:56.000000000 +0000
-@@ -27,7 +27,7 @@
-   * authorization.                                                           *
-   ****************************************************************************
-   * Author: Thomas E. Dickey 1996-on
--  * @Id: resizeterm.3x,v 1.19 2015/06/06 23:38:18 tom Exp @
-+  * @Id: resizeterm.3x,v 1.20 2015/09/19 22:53:26 tom Exp @
- -->
- 
- 
-@@ -116,15 +116,30 @@
-        tions.
- 
-        If  ncurses  is configured to supply its own SIGWINCH han-
--       dler, the resizeterm function ungetch's a KEY_RESIZE which
--       will  be  read on the next call to getch.  This is used to
--       alert an application that the screen size has changed, and
--       that  it should repaint special features such as pads that
--       cannot be done automatically.
--
--       If the environment variables LINES  or  COLUMNS  are  set,
--       this  overrides  the  library's  use  of  the  window size
--       obtained from the operating system.  Thus, even if a  SIG-
-+       dler,
-+
-+       o   on receipt of a SIGWINCH, the handler sets a flag
-+
-+       o   which is tested in wgetch and doupdate,
-+
-+       o   in turn, calling the resizeterm function,
-+
-+       o   which ungetch's a KEY_RESIZE which will be read on the
-+           next call to wgetch.
-+
-+           The  KEY_RESIZE  alerts an application that the screen
-+           size has changed, and that it should  repaint  special
-+           features  such  as  pads that cannot be done automati-
-+           cally.
-+
-+           Calling resizeterm or resize_term directly from a sig-
-+           nal  handler  is unsafe.  This indirect method is used
-+           to provide a safe  way  to  resize  the  ncurses  data
-+           structures.
-+
-+       If  the  environment  variables  LINES or COLUMNS are set,
-+       this overrides  the  library's  use  of  the  window  size
-+       obtained  from the operating system.  Thus, even if a SIG-
-        WINCH is received, no screen size change may be recorded.
- 
- 
-Index: doc/html/man/tabs.1.html
---- ncurses-6.0-20150912+/doc/html/man/tabs.1.html	2015-09-05 21:19:40.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/tabs.1.html	2015-09-19 23:18:56.000000000 +0000
-@@ -168,7 +168,7 @@
- 
SEE ALSO
-        tset(1), infocmp(1m), curses(3x), terminfo(5).
- 
--       This describes ncurses version 6.0 (patch 20150905).
-+       This describes ncurses version 6.0 (patch 20150919).
- 
- 
- 
-Index: doc/html/man/terminfo.5.html
---- ncurses-6.0-20150912+/doc/html/man/terminfo.5.html	2015-09-05 21:19:40.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/terminfo.5.html	2015-09-19 23:18:56.000000000 +0000
-@@ -78,7 +78,7 @@
-        nals by giving a set of capabilities which they  have,  by
-        specifying how to perform screen operations, and by speci-
-        fying padding requirements and  initialization  sequences.
--       This describes ncurses version 6.0 (patch 20150905).
-+       This describes ncurses version 6.0 (patch 20150919).
- 
-        Entries in terminfo consist of a sequence of `,' separated
-        fields (embedded commas may be escaped with a backslash or
-Index: doc/html/man/tic.1m.html
---- ncurses-6.0-20150912+/doc/html/man/tic.1m.html	2015-09-05 21:19:40.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/tic.1m.html	2015-09-19 23:18:57.000000000 +0000
-@@ -408,7 +408,7 @@
-        infocmp(1m),    captoinfo(1m),   infotocap(1m),   toe(1m),
-        curses(3x), term(5).  terminfo(5).
- 
--       This describes ncurses version 6.0 (patch 20150905).
-+       This describes ncurses version 6.0 (patch 20150919).
- 
- 
- 

-Index: doc/html/man/toe.1m.html
---- ncurses-6.0-20150912+/doc/html/man/toe.1m.html	2015-09-05 21:19:40.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/toe.1m.html	2015-09-19 23:18:57.000000000 +0000
-@@ -122,7 +122,7 @@
-        tic(1m),   infocmp(1m),   captoinfo(1m),    infotocap(1m),
-        curses(3x), terminfo(5).
- 
--       This describes ncurses version 6.0 (patch 20150905).
-+       This describes ncurses version 6.0 (patch 20150919).
- 
- 
- 
-Index: doc/html/man/tput.1.html
---- ncurses-6.0-20150912+/doc/html/man/tput.1.html	2015-09-05 21:19:40.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/tput.1.html	2015-09-19 23:18:57.000000000 +0000
-@@ -338,7 +338,7 @@
- 
SEE ALSO
-        clear(1), stty(1), tabs(1), terminfo(5), curs_termcap(3x).
- 
--       This describes ncurses version 6.0 (patch 20150905).
-+       This describes ncurses version 6.0 (patch 20150919).
- 
- 
- 
-Index: doc/html/man/tset.1.html
---- ncurses-6.0-20150912+/doc/html/man/tset.1.html	2015-09-05 21:19:40.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/tset.1.html	2015-09-19 23:18:57.000000000 +0000
-@@ -319,7 +319,7 @@
-        csh(1),   sh(1),   stty(1),   curs_terminfo(3x),   tty(4),
-        terminfo(5), ttys(5), environ(7)
- 
--       This describes ncurses version 6.0 (patch 20150905).
-+       This describes ncurses version 6.0 (patch 20150919).
- 
- 
- 
-Index: man/curs_getch.3x
-Prereq:  1.42 
---- ncurses-6.0-20150912+/man/curs_getch.3x	2015-07-21 08:44:04.000000000 +0000
-+++ ncurses-6.0-20150919/man/curs_getch.3x	2015-09-19 22:25:05.000000000 +0000
-@@ -27,7 +27,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_getch.3x,v 1.42 2015/07/21 08:44:04 tom Exp $
-+.\" $Id: curs_getch.3x,v 1.43 2015/09/19 22:25:05 tom Exp $
- .TH curs_getch 3X ""
- .na
- .hy 0
-@@ -240,9 +240,14 @@
- .B KEY_RESIZE
- is returned when the \fBSIGWINCH\fP signal has been detected
- (see \fBinitscr\fP(3X) and \fBresizeterm\fR(3X)).
-+This code is returned whether or not \fBkeypad\fP has been enabled.
- .bP
- .B KEY_MOUSE
- is returned for mouse-events (see \fBcurs_mouse\fR(3X)).
-+This code relies upon whether or not \fBkeypad\fP(3X) has been enabled,
-+because (e.g., with \fIxterm\fP mouse prototocol) ncurses must
-+read escape sequences,
-+just like a function key.
- .SS Testing key-codes
- .PP
- The \fBhas_key\fR routine takes a key-code value from the above list, and
-@@ -347,6 +352,13 @@
- progress or not, and also (in some implementations) depending on whether an
- input timeout or non-blocking mode has been set.
- .PP
-+\fBKEY_MOUSE\fP is mentioned in XSI Curses, along with a few related
-+terminfo capabilities, but no higher-level functions use the feature.
-+The implementation in ncurses is an extension.
-+.PP
-+\fBKEY_RESIZE\fP is an extension first implemented for ncurses. 
-+NetBSD curses later added this extension.
-+.PP
- Programmers concerned about portability should be prepared for either of two
- cases: (a) signal receipt does not interrupt \fBgetch\fR; (b) signal receipt
- interrupts \fBgetch\fR and causes it to return ERR with \fBerrno\fR set to
-Index: man/resizeterm.3x
-Prereq:  1.19 
---- ncurses-6.0-20150912+/man/resizeterm.3x	2015-06-06 23:38:18.000000000 +0000
-+++ ncurses-6.0-20150919/man/resizeterm.3x	2015-09-19 22:53:26.000000000 +0000
-@@ -28,8 +28,11 @@
- .\"
- .\" Author: Thomas E. Dickey 1996-on
- .\"
--.\" $Id: resizeterm.3x,v 1.19 2015/06/06 23:38:18 tom Exp $
-+.\" $Id: resizeterm.3x,v 1.20 2015/09/19 22:53:26 tom Exp $
- .TH resizeterm 3X ""
-+.de bP
-+.IP \(bu 4
-+..
- .SH NAME
- \fBis_term_resized\fR,
- \fBresize_term\fR,
-@@ -81,11 +84,24 @@
- since it uses those functions.
- .PP
- If ncurses is configured to supply its own SIGWINCH handler,
--the \fBresizeterm\fR function \fBungetch\fP's a \fBKEY_RESIZE\fR which
--will be read on the next call to \fBgetch\fR.
--This is used to alert an application that the screen size has changed,
-+.bP
-+on receipt of a SIGWINCH, the handler sets a flag
-+.bP
-+which is tested in \fBwgetch\fP and \fBdoupdate\fP,
-+.bP
-+in turn, calling the \fBresizeterm\fR function,
-+.bP
-+which \fBungetch\fP's a \fBKEY_RESIZE\fR which
-+will be read on the next call to \fBwgetch\fR.
-+.IP
-+The \fBKEY_RESIZE\fP alerts an application that the screen size has changed,
- and that it should repaint special features such as pads that cannot
- be done automatically.
-+.IP
-+Calling \fBresizeterm\fP or \fBresize_term\fP
-+directly from a signal handler is unsafe.
-+This indirect method is used to provide a safe way to resize the ncurses
-+data structures.
- .PP
- If the environment variables \fBLINES\fP or \fBCOLUMNS\fP are set,
- this overrides the library's use of the window size obtained from
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20150912+/package/debian-mingw/changelog	2015-09-12 16:17:30.000000000 +0000
-+++ ncurses-6.0-20150919/package/debian-mingw/changelog	2015-09-19 19:40:14.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150912) unstable; urgency=low
-+ncurses6 (6.0+20150919) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 12 Sep 2015 12:17:30 -0400
-+ -- Thomas E. Dickey   Sat, 19 Sep 2015 15:40:14 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20150912+/package/debian-mingw64/changelog	2015-09-12 16:17:30.000000000 +0000
-+++ ncurses-6.0-20150919/package/debian-mingw64/changelog	2015-09-19 19:40:14.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150912) unstable; urgency=low
-+ncurses6 (6.0+20150919) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 12 Sep 2015 12:17:30 -0400
-+ -- Thomas E. Dickey   Sat, 19 Sep 2015 15:40:14 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.0-20150912+/package/debian/changelog	2015-09-12 16:17:30.000000000 +0000
-+++ ncurses-6.0-20150919/package/debian/changelog	2015-09-19 19:40:14.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150912) unstable; urgency=low
-+ncurses6 (6.0+20150919) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 12 Sep 2015 12:17:30 -0400
-+ -- Thomas E. Dickey   Sat, 19 Sep 2015 15:40:14 -0400
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.123 
---- ncurses-6.0-20150912+/package/mingw-ncurses.nsi	2015-09-12 16:17:30.000000000 +0000
-+++ ncurses-6.0-20150919/package/mingw-ncurses.nsi	2015-09-19 19:40:14.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.123 2015/09/12 16:17:30 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.124 2015/09/19 19:40:14 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "0"
- !define VERSION_YYYY  "2015"
--!define VERSION_MMDD  "0912"
-+!define VERSION_MMDD  "0919"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20150912+/package/mingw-ncurses.spec	2015-09-12 16:17:30.000000000 +0000
-+++ ncurses-6.0-20150919/package/mingw-ncurses.spec	2015-09-19 19:40:14.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.0
--Release: 20150912
-+Release: 20150919
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20150912+/package/ncurses.spec	2015-09-12 16:17:30.000000000 +0000
-+++ ncurses-6.0-20150919/package/ncurses.spec	2015-09-19 19:40:14.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.0
--Release: 20150912
-+Release: 20150919
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
diff --git a/ncurses-6.0-20150926.patch b/ncurses-6.0-20150926.patch
deleted file mode 100644
index d675a26..0000000
--- a/ncurses-6.0-20150926.patch
+++ /dev/null
@@ -1,596 +0,0 @@
-# ncurses 6.0 - patch 20150926 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.0 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.0 can be found at
-# 	ftp://invisible-island.net/ncurses/6.0
-#	http://invisible-mirror.net/archives/ncurses/6.0 
-#
-# ------------------------------------------------------------------------------
-# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20150926.patch.gz
-# patch by Thomas E. Dickey 
-# created  Sun Sep 27 01:08:16 UTC 2015
-# ------------------------------------------------------------------------------
-# INSTALL                          |    5 ++++-
-# NEWS                             |    8 +++++++-
-# VERSION                          |    2 +-
-# aclocal.m4                       |    6 +++---
-# configure                        |    2 +-
-# dist.mk                          |    4 ++--
-# doc/html/man/captoinfo.1m.html   |    2 +-
-# doc/html/man/clear.1.html        |    2 +-
-# doc/html/man/curs_attr.3x.html   |    2 +-
-# doc/html/man/form.3x.html        |    2 +-
-# doc/html/man/infocmp.1m.html     |    2 +-
-# doc/html/man/infotocap.1m.html   |    2 +-
-# doc/html/man/menu.3x.html        |    2 +-
-# doc/html/man/ncurses.3x.html     |    2 +-
-# doc/html/man/panel.3x.html       |    2 +-
-# doc/html/man/resizeterm.3x.html  |   17 ++++++++++++++++-
-# doc/html/man/tabs.1.html         |    2 +-
-# doc/html/man/terminfo.5.html     |    2 +-
-# doc/html/man/tic.1m.html         |    2 +-
-# doc/html/man/toe.1m.html         |    2 +-
-# doc/html/man/tput.1.html         |    2 +-
-# doc/html/man/tset.1.html         |    2 +-
-# doc/html/man/wresize.3x.html     |   13 +++++++++++--
-# man/resizeterm.3x                |   15 ++++++++++++++-
-# man/wresize.3x                   |   10 ++++++++--
-# package/debian-mingw/changelog   |    4 ++--
-# package/debian-mingw64/changelog |    4 ++--
-# package/debian/changelog         |    4 ++--
-# package/debian/rules             |    1 +
-# package/mingw-ncurses.nsi        |    4 ++--
-# package/mingw-ncurses.spec       |    2 +-
-# package/ncurses.spec             |    2 +-
-# 32 files changed, 93 insertions(+), 40 deletions(-)
-# ------------------------------------------------------------------------------
-Index: INSTALL
-Prereq:  1.192 
---- ncurses-6.0-20150919+/INSTALL	2015-08-15 20:11:48.000000000 +0000
-+++ ncurses-6.0-20150926/INSTALL	2015-09-26 21:34:14.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: INSTALL,v 1.192 2015/08/15 20:11:48 tom Exp $
-+-- $Id: INSTALL,v 1.193 2015/09/26 21:34:14 tom Exp $
- ---------------------------------------------------------------------
-              How to install Ncurses/Terminfo on your system
- ---------------------------------------------------------------------
-@@ -1093,6 +1093,9 @@
- 	Specify a search-list of terminfo directories which will be compiled
- 	into the ncurses library (default: DATADIR/terminfo)
- 
-+	This is a colon-separated list, like the TERMINFO_DIRS environment
-+	variable.
-+
-     --with-termlib[=XXX]
- 	When building the ncurses library, organize this as two parts:  the
- 	curses library (libncurses) and the low-level terminfo library
-Index: NEWS
-Prereq:  1.2496 
---- ncurses-6.0-20150919+/NEWS	2015-09-19 23:04:21.000000000 +0000
-+++ ncurses-6.0-20150926/NEWS	2015-09-26 21:58:14.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.2496 2015/09/19 23:04:21 tom Exp $
-+-- $Id: NEWS,v 1.2499 2015/09/26 21:58:14 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,12 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20150926
-+	+ change makefile rule for removing resulting.map to distclean rather
-+	  than clean.
-+	+ add /lib/terminfo to terminfo-dirs in ".deb" test-package.
-+	+ add note on portability of resizeterm and wresize to manual pages.
-+
- 20150919
- 	+ clarify in resizeterm.3x how KEY_RESIZE is pushed onto the input
- 	  stream.
-Index: VERSION
---- ncurses-6.0-20150919+/VERSION	2015-09-19 19:40:14.000000000 +0000
-+++ ncurses-6.0-20150926/VERSION	2015-09-26 18:50:05.000000000 +0000
-@@ -1 +1 @@
--5:0:9	6.0	20150919
-+5:0:9	6.0	20150926
-Index: aclocal.m4
-Prereq:  1.767 
---- ncurses-6.0-20150919+/aclocal.m4	2015-09-12 20:00:59.000000000 +0000
-+++ ncurses-6.0-20150926/aclocal.m4	2015-09-26 21:56:12.000000000 +0000
-@@ -28,7 +28,7 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: aclocal.m4,v 1.767 2015/09/12 20:00:59 tom Exp $
-+dnl $Id: aclocal.m4,v 1.768 2015/09/26 21:56:12 tom Exp $
- dnl Macros used in NCURSES auto-configuration script.
- dnl
- dnl These macros are maintained separately from NCURSES.  The copyright on
-@@ -3228,7 +3228,7 @@
- 	AC_SUBST(LIB_PREFIX)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_LIB_RULES version: 83 updated: 2015/08/05 20:44:28
-+dnl CF_LIB_RULES version: 84 updated: 2015/09/26 17:54:46
- dnl ------------
- dnl Append definitions and rules for the given models to the subdirectory
- dnl Makefiles, and the recursion rule for the top-level Makefile.  If the
-@@ -3301,7 +3301,7 @@
- resulting.map: $UNALTERED_SYMS
- 	sed $cf_sed_options < $UNALTERED_SYMS >\[$]@
- 
--clean::
-+distclean::
- 	rm -f resulting.map
- CF_EOF
- 		fi
-Index: configure
---- ncurses-6.0-20150919+/configure	2015-09-12 20:01:47.000000000 +0000
-+++ ncurses-6.0-20150926/configure	2015-09-26 21:56:47.000000000 +0000
-@@ -23555,7 +23555,7 @@
- resulting.map: $UNALTERED_SYMS
- 	sed $cf_sed_options < $UNALTERED_SYMS >\$@
- 
--clean::
-+distclean::
- 	rm -f resulting.map
- CF_EOF
- 		fi
-Index: dist.mk
-Prereq:  1.1071 
---- ncurses-6.0-20150919+/dist.mk	2015-09-19 19:40:14.000000000 +0000
-+++ ncurses-6.0-20150926/dist.mk	2015-09-26 18:50:05.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1071 2015/09/19 19:40:14 tom Exp $
-+# $Id: dist.mk,v 1.1072 2015/09/26 18:50:05 tom Exp $
- # Makefile for creating ncurses distributions.
- #
- # This only needs to be used directly as a makefile by developers, but
-@@ -37,7 +37,7 @@
- # These define the major/minor/patch versions of ncurses.
- NCURSES_MAJOR = 6
- NCURSES_MINOR = 0
--NCURSES_PATCH = 20150919
-+NCURSES_PATCH = 20150926
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: doc/html/man/captoinfo.1m.html
---- ncurses-6.0-20150919+/doc/html/man/captoinfo.1m.html	2015-09-19 23:18:49.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/captoinfo.1m.html	2015-09-26 22:08:45.000000000 +0000
-@@ -205,7 +205,7 @@
- 
SEE ALSO
-        infocmp(1m), curses(3x), terminfo(5)
- 
--       This describes ncurses version 6.0 (patch 20150919).
-+       This describes ncurses version 6.0 (patch 20150926).
- 
- 
- 

-Index: doc/html/man/clear.1.html
---- ncurses-6.0-20150919+/doc/html/man/clear.1.html	2015-09-19 23:18:49.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/clear.1.html	2015-09-26 22:08:45.000000000 +0000
-@@ -71,7 +71,7 @@
- 
SEE ALSO
-        tput(1), terminfo(5)
- 
--       This describes ncurses version 6.0 (patch 20150919).
-+       This describes ncurses version 6.0 (patch 20150926).
- 
- 
- 
-Index: doc/html/man/curs_attr.3x.html
---- ncurses-6.0-20150919+/doc/html/man/curs_attr.3x.html	2015-09-05 23:05:55.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/curs_attr.3x.html	2015-09-26 23:25:17.000000000 +0000
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_attr.3x,v 1.40 2015/07/20 23:35:38 tom Exp @
-+  * @Id: curs_attr.3x,v 1.41 2015/09/05 21:13:25 tom Exp @
- -->
- 
- 
-Index: doc/html/man/form.3x.html
---- ncurses-6.0-20150919+/doc/html/man/form.3x.html	2015-09-19 23:18:53.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/form.3x.html	2015-09-26 22:08:49.000000000 +0000
-@@ -245,7 +245,7 @@
-        curses(3x) and related pages whose names begin "form_" for
-        detailed descriptions of the entry points.
- 
--       This describes ncurses version 6.0 (patch 20150919).
-+       This describes ncurses version 6.0 (patch 20150926).
- 
- 
- 
-Index: doc/html/man/infocmp.1m.html
---- ncurses-6.0-20150919+/doc/html/man/infocmp.1m.html	2015-09-19 23:18:54.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/infocmp.1m.html	2015-09-26 22:08:50.000000000 +0000
-@@ -487,7 +487,7 @@
- 
-        http://invisible-island.net/ncurses/tctest.html
- 
--       This describes ncurses version 6.0 (patch 20150919).
-+       This describes ncurses version 6.0 (patch 20150926).
- 
- 
- 

-Index: doc/html/man/infotocap.1m.html
---- ncurses-6.0-20150919+/doc/html/man/infotocap.1m.html	2015-09-19 23:18:54.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/infotocap.1m.html	2015-09-26 22:08:50.000000000 +0000
-@@ -94,7 +94,7 @@
- 
SEE ALSO
-        curses(3x), tic(1m), infocmp(1m), terminfo(5)
- 
--       This describes ncurses version 6.0 (patch 20150919).
-+       This describes ncurses version 6.0 (patch 20150926).
- 
- 
- 

-Index: doc/html/man/menu.3x.html
---- ncurses-6.0-20150919+/doc/html/man/menu.3x.html	2015-09-19 23:18:55.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/menu.3x.html	2015-09-26 22:08:51.000000000 +0000
-@@ -227,7 +227,7 @@
-        curses(3x) and related pages whose names begin "menu_" for
-        detailed descriptions of the entry points.
- 
--       This describes ncurses version 6.0 (patch 20150919).
-+       This describes ncurses version 6.0 (patch 20150926).
- 
- 
- 
-Index: doc/html/man/ncurses.3x.html
---- ncurses-6.0-20150919+/doc/html/man/ncurses.3x.html	2015-09-19 23:18:56.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/ncurses.3x.html	2015-09-26 22:08:52.000000000 +0000
-@@ -63,7 +63,7 @@
-        sonable optimization.  This implementation is "new curses"
-        (ncurses) and is the approved replacement for 4.4BSD clas-
-        sic  curses,  which has been discontinued.  This describes
--       ncurses version 6.0 (patch 20150919).
-+       ncurses version 6.0 (patch 20150926).
- 
-        The ncurses library emulates the curses library of  System
-        V  Release  4  UNIX,  and  XPG4 (X/Open Portability Guide)
-Index: doc/html/man/panel.3x.html
---- ncurses-6.0-20150919+/doc/html/man/panel.3x.html	2015-09-19 23:18:56.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/panel.3x.html	2015-09-26 22:08:52.000000000 +0000
-@@ -218,7 +218,7 @@
- 
SEE ALSO
-        curses(3x), curs_variables(3x),
- 
--       This describes ncurses version 6.0 (patch 20150919).
-+       This describes ncurses version 6.0 (patch 20150926).
- 
- 
- 

-Index: doc/html/man/resizeterm.3x.html
---- ncurses-6.0-20150919+/doc/html/man/resizeterm.3x.html	2015-09-19 23:18:56.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/resizeterm.3x.html	2015-09-26 22:08:52.000000000 +0000
-@@ -27,7 +27,7 @@
-   * authorization.                                                           *
-   ****************************************************************************
-   * Author: Thomas E. Dickey 1996-on
--  * @Id: resizeterm.3x,v 1.20 2015/09/19 22:53:26 tom Exp @
-+  * @Id: resizeterm.3x,v 1.21 2015/09/26 19:55:32 tom Exp @
- -->
- 
- 
-@@ -144,6 +144,20 @@
- 
- 
- 

-+
PORTABILITY
-+       It is possible to resize the screen with SVr4 curses, by
-+
-+       o   exiting curses with endwin(3x) and
-+
-+       o   resuming using refresh(3x).
-+
-+       Doing that clears the screen and is visually distracting.
-+
-+       This extension of ncurses was introduced in mid-1995.   It
-+       was adopted in NetBSD curses (2001) and PDCurses (2003).
-+
-+
-+

- 
SEE ALSO
-        curs_getch(3x), curs_variables(3x), wresize(3x).
- 
-@@ -170,6 +184,7 @@
- 
- 
  • RETURN VALUE
    • 
- 
  • NOTES
    • 
-+
  • PORTABILITY
    • 
- 
  • SEE ALSO
    • 
- 
  • AUTHOR
    • 
- 
-Index: doc/html/man/tabs.1.html
---- ncurses-6.0-20150919+/doc/html/man/tabs.1.html	2015-09-19 23:18:56.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/tabs.1.html	2015-09-26 22:08:52.000000000 +0000
-@@ -168,7 +168,7 @@
- 
    SEE ALSO
    -        tset(1), infocmp(1m), curses(3x), terminfo(5).
- 
--       This describes ncurses version 6.0 (patch 20150919).
-+       This describes ncurses version 6.0 (patch 20150926).
- 
- 
- 
-Index: doc/html/man/terminfo.5.html
---- ncurses-6.0-20150919+/doc/html/man/terminfo.5.html	2015-09-19 23:18:56.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/terminfo.5.html	2015-09-26 22:08:53.000000000 +0000
-@@ -78,7 +78,7 @@
-        nals by giving a set of capabilities which they  have,  by
-        specifying how to perform screen operations, and by speci-
-        fying padding requirements and  initialization  sequences.
--       This describes ncurses version 6.0 (patch 20150919).
-+       This describes ncurses version 6.0 (patch 20150926).
- 
-        Entries in terminfo consist of a sequence of `,' separated
-        fields (embedded commas may be escaped with a backslash or
-Index: doc/html/man/tic.1m.html
---- ncurses-6.0-20150919+/doc/html/man/tic.1m.html	2015-09-19 23:18:57.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/tic.1m.html	2015-09-26 22:08:53.000000000 +0000
-@@ -408,7 +408,7 @@
-        infocmp(1m),    captoinfo(1m),   infotocap(1m),   toe(1m),
-        curses(3x), term(5).  terminfo(5).
- 
--       This describes ncurses version 6.0 (patch 20150919).
-+       This describes ncurses version 6.0 (patch 20150926).
- 
- 
- 
    
-Index: doc/html/man/toe.1m.html
---- ncurses-6.0-20150919+/doc/html/man/toe.1m.html	2015-09-19 23:18:57.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/toe.1m.html	2015-09-26 22:08:53.000000000 +0000
-@@ -122,7 +122,7 @@
-        tic(1m),   infocmp(1m),   captoinfo(1m),    infotocap(1m),
-        curses(3x), terminfo(5).
- 
--       This describes ncurses version 6.0 (patch 20150919).
-+       This describes ncurses version 6.0 (patch 20150926).
- 
- 
- 
-Index: doc/html/man/tput.1.html
---- ncurses-6.0-20150919+/doc/html/man/tput.1.html	2015-09-19 23:18:57.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/tput.1.html	2015-09-26 22:08:53.000000000 +0000
-@@ -338,7 +338,7 @@
- 
    SEE ALSO
    -        clear(1), stty(1), tabs(1), terminfo(5), curs_termcap(3x).
- 
--       This describes ncurses version 6.0 (patch 20150919).
-+       This describes ncurses version 6.0 (patch 20150926).
- 
- 
- 
-Index: doc/html/man/tset.1.html
---- ncurses-6.0-20150919+/doc/html/man/tset.1.html	2015-09-19 23:18:57.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/tset.1.html	2015-09-26 22:08:53.000000000 +0000
-@@ -319,7 +319,7 @@
-        csh(1),   sh(1),   stty(1),   curs_terminfo(3x),   tty(4),
-        terminfo(5), ttys(5), environ(7)
- 
--       This describes ncurses version 6.0 (patch 20150919).
-+       This describes ncurses version 6.0 (patch 20150926).
- 
- 
- 
-Index: doc/html/man/wresize.3x.html
---- ncurses-6.0-20150919+/doc/html/man/wresize.3x.html	2015-05-13 19:27:50.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/wresize.3x.html	2015-09-26 22:08:53.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-@@ -86,6 +86,14 @@
- 
- 
- 
    
-+
    PORTABILITY
    -+       It is not possible to resize windows with SVr4 curses.
-+
-+       This  extension of ncurses was introduced in mid-1995.  It
-+       was adopted in NetBSD curses (2001) and PDCurses (2003).
-+
-+
-+
    
- 
    SEE ALSO
    -        resizeterm(3x).
- 
-@@ -106,6 +114,7 @@
- 
  • DESCRIPTION
    • 
- 
  • RETURN VALUE
    • 
- 
  • NOTES
    • 
-+
  • PORTABILITY
    • 
- 
  • SEE ALSO
    • 
- 
  • AUTHOR
    • 
- 
-Index: man/resizeterm.3x
-Prereq:  1.20 
---- ncurses-6.0-20150919+/man/resizeterm.3x	2015-09-19 22:53:26.000000000 +0000
-+++ ncurses-6.0-20150926/man/resizeterm.3x	2015-09-26 19:55:32.000000000 +0000
-@@ -28,7 +28,7 @@
- .\"
- .\" Author: Thomas E. Dickey 1996-on
- .\"
--.\" $Id: resizeterm.3x,v 1.20 2015/09/19 22:53:26 tom Exp $
-+.\" $Id: resizeterm.3x,v 1.21 2015/09/26 19:55:32 tom Exp $
- .TH resizeterm 3X ""
- .de bP
- .IP \(bu 4
-@@ -108,6 +108,19 @@
- the operating system.
- Thus, even if a SIGWINCH is received,
- no screen size change may be recorded.
-+.SH PORTABILITY
-+.PP
-+It is possible to resize the screen with SVr4 curses,
-+by
-+.bP
-+exiting curses with \fBendwin\fP(3X) and
-+.bP
-+resuming using \fBrefresh\fP(3X).
-+.PP
-+Doing that clears the screen and is visually distracting.
-+.PP
-+This extension of ncurses was introduced in mid-1995.
-+It was adopted in NetBSD curses (2001) and PDCurses (2003).
- .SH SEE ALSO
- \fBcurs_getch\fR(3X),
- \fBcurs_variables\fR(3X),
-Index: man/wresize.3x
-Prereq:  1.13 
---- ncurses-6.0-20150919+/man/wresize.3x	2010-12-04 18:40:45.000000000 +0000
-+++ ncurses-6.0-20150926/man/wresize.3x	2015-09-26 19:57:24.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -28,7 +28,7 @@
- .\"
- .\" Author: Thomas E. Dickey 1996
- .\"
--.\" $Id: wresize.3x,v 1.13 2010/12/04 18:40:45 tom Exp $
-+.\" $Id: wresize.3x,v 1.14 2015/09/26 19:57:24 tom Exp $
- .TH wresize 3X ""
- .SH NAME
- \fBwresize\fR \- resize a curses window
-@@ -53,6 +53,12 @@
- simplify the logic of \fBresizeterm\fR.
- The caller must ensure that the window's dimensions fit within the
- actual screen dimensions.
-+.SH PORTABILITY
-+.PP
-+It is not possible to resize windows with SVr4 curses.
-+.PP
-+This extension of ncurses was introduced in mid-1995.
-+It was adopted in NetBSD curses (2001) and PDCurses (2003).
- .SH SEE ALSO
- \fBresizeterm\fR(3X).
- .SH AUTHOR
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20150919+/package/debian-mingw/changelog	2015-09-19 19:40:14.000000000 +0000
-+++ ncurses-6.0-20150926/package/debian-mingw/changelog	2015-09-26 18:50:05.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150919) unstable; urgency=low
-+ncurses6 (6.0+20150926) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 19 Sep 2015 15:40:14 -0400
-+ -- Thomas E. Dickey   Sat, 26 Sep 2015 14:50:05 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20150919+/package/debian-mingw64/changelog	2015-09-19 19:40:14.000000000 +0000
-+++ ncurses-6.0-20150926/package/debian-mingw64/changelog	2015-09-26 18:50:05.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150919) unstable; urgency=low
-+ncurses6 (6.0+20150926) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 19 Sep 2015 15:40:14 -0400
-+ -- Thomas E. Dickey   Sat, 26 Sep 2015 14:50:05 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.0-20150919+/package/debian/changelog	2015-09-19 19:40:14.000000000 +0000
-+++ ncurses-6.0-20150926/package/debian/changelog	2015-09-26 18:50:05.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150919) unstable; urgency=low
-+ncurses6 (6.0+20150926) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 19 Sep 2015 15:40:14 -0400
-+ -- Thomas E. Dickey   Sat, 26 Sep 2015 14:50:05 -0400
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/debian/rules
---- ncurses-6.0-20150919+/package/debian/rules	2015-07-11 22:42:03.000000000 +0000
-+++ ncurses-6.0-20150926/package/debian/rules	2015-09-26 21:29:58.000000000 +0000
-@@ -78,6 +78,7 @@
- 		--with-ticlib \
- 		--with-trace \
- 		--with-cxx-shared \
-+		--with-terminfo-dirs=/lib/terminfo:/usr/share/terminfo \
- 		--with-versioned-syms \
- 		--with-xterm-kbs=DEL \
- 		--without-ada \
-Index: package/mingw-ncurses.nsi
-Prereq:  1.124 
---- ncurses-6.0-20150919+/package/mingw-ncurses.nsi	2015-09-19 19:40:14.000000000 +0000
-+++ ncurses-6.0-20150926/package/mingw-ncurses.nsi	2015-09-26 18:50:05.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.124 2015/09/19 19:40:14 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.125 2015/09/26 18:50:05 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "0"
- !define VERSION_YYYY  "2015"
--!define VERSION_MMDD  "0919"
-+!define VERSION_MMDD  "0926"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20150919+/package/mingw-ncurses.spec	2015-09-19 19:40:14.000000000 +0000
-+++ ncurses-6.0-20150926/package/mingw-ncurses.spec	2015-09-26 18:50:05.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.0
--Release: 20150919
-+Release: 20150926
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20150919+/package/ncurses.spec	2015-09-19 19:40:14.000000000 +0000
-+++ ncurses-6.0-20150926/package/ncurses.spec	2015-09-26 18:50:05.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.0
--Release: 20150919
-+Release: 20150926
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
diff --git a/ncurses-6.0-20151010.patch b/ncurses-6.0-20151010.patch
deleted file mode 100644
index 1f9e949..0000000
--- a/ncurses-6.0-20151010.patch
+++ /dev/null
@@ -1,5485 +0,0 @@
-# ncurses 6.0 - patch 20151010 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.0 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.0 can be found at
-# 	ftp://invisible-island.net/ncurses/6.0
-#	http://invisible-mirror.net/archives/ncurses/6.0 
-#
-# ------------------------------------------------------------------------------
-# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20151010.patch.gz
-# patch by Thomas E. Dickey 
-# created  Sun Oct 11 01:01:49 UTC 2015
-# ------------------------------------------------------------------------------
-# Ada95/aclocal.m4                 |   10 
-# Ada95/configure                  |   54 +-
-# NEWS                             |   12 
-# VERSION                          |    2 
-# aclocal.m4                       |   20 
-# configure                        |  861 ++++++++++++++++++++-----------------
-# dist.mk                          |    4 
-# ncurses/base/MKlib_gen.sh        |    3 
-# ncurses/base/resizeterm.c        |   12 
-# package/debian-mingw/changelog   |    4 
-# package/debian-mingw64/changelog |    4 
-# package/debian/changelog         |    4 
-# package/mingw-ncurses.nsi        |    4 
-# package/mingw-ncurses.spec       |    2 
-# package/ncurses.spec             |    2 
-# test/aclocal.m4                  |   30 +
-# test/configure                   |  722 +++++++++++++++++++------------
-# test/configure.in                |   13 
-# test/demo_termcap.c              |    4 
-# test/demo_terminfo.c             |    6 
-# test/view.c                      |   26 -
-# 21 files changed, 1085 insertions(+), 714 deletions(-)
-# ------------------------------------------------------------------------------
-Index: Ada95/aclocal.m4
-Prereq:  1.106 
---- ncurses-6.0-20150926+/Ada95/aclocal.m4	2015-08-22 21:14:14.000000000 +0000
-+++ ncurses-6.0-20151010/Ada95/aclocal.m4	2015-10-10 19:52:33.000000000 +0000
-@@ -28,7 +28,7 @@
- dnl
- dnl Author: Thomas E. Dickey
- dnl
--dnl $Id: aclocal.m4,v 1.106 2015/08/22 21:14:14 tom Exp $
-+dnl $Id: aclocal.m4,v 1.107 2015/10/10 19:52:33 tom Exp $
- dnl Macros used in NCURSES Ada95 auto-configuration script.
- dnl
- dnl These macros are maintained separately from NCURSES.  The copyright on
-@@ -365,15 +365,19 @@
- ])dnl
- ])])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_AR_FLAGS version: 5 updated: 2010/05/20 20:24:29
-+dnl CF_AR_FLAGS version: 6 updated: 2015/10/10 15:25:05
- dnl -----------
- dnl Check for suitable "ar" (archiver) options for updating an archive.
-+dnl
-+dnl In particular, handle some obsolete cases where the "-" might be omitted,
-+dnl as well as a workaround for breakage of make's archive rules by the GNU
-+dnl binutils "ar" program.
- AC_DEFUN([CF_AR_FLAGS],[
- AC_REQUIRE([CF_PROG_AR])
- 
- AC_CACHE_CHECK(for options to update archives, cf_cv_ar_flags,[
- 	cf_cv_ar_flags=unknown
--	for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv
-+	for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv
- 	do
- 
- 		# check if $ARFLAGS already contains this choice
-Index: Ada95/configure
---- ncurses-6.0-20150926+/Ada95/configure	2015-09-19 20:50:21.000000000 +0000
-+++ ncurses-6.0-20151010/Ada95/configure	2015-10-10 19:53:00.000000000 +0000
-@@ -1,7 +1,7 @@
- #! /bin/sh
- # From configure.in Revision: 1.61 .
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by Autoconf 2.52.20141204.
-+# Generated by Autoconf 2.52.20150926.
- #
- # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
- # Free Software Foundation, Inc.
-@@ -804,7 +804,7 @@
- running configure, to aid debugging if configure makes a mistake.
- 
- It was created by $as_me, which was
--generated by GNU Autoconf 2.52.20141204.  Invocation command line was
-+generated by GNU Autoconf 2.52.20150926.  Invocation command line was
- 
-   $ $0 $@
- 
-@@ -3268,7 +3268,7 @@
- else
- 
- 	cf_cv_ar_flags=unknown
--	for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv
-+	for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv
- 	do
- 
- 		# check if $ARFLAGS already contains this choice
-@@ -14601,7 +14601,7 @@
- cat >>$CONFIG_STATUS <$tmp/subs-$ac_sed_frag.sed
-+      # It is possible to make a multiline substitution using escaped newlines.
-+      # Ensure that we do not split the substitution between script fragments.
-+      ac_BEG=$ac_end
-+      ac_END=`expr $ac_end + $ac_max_sed_lines`
-+      sed "1,${ac_BEG}d; ${ac_END}p; q" $tmp/subs.sed >$tmp/subs.next
-+      if test -s $tmp/subs.next; then
-+        grep '^s,@[^@,][^@,]*@,.*\\$' $tmp/subs.next >$tmp/subs.edit
-+        if test ! -s $tmp/subs.edit; then
-+          grep "^s,@[^@,][^@,]*@,.*,;t t$" $tmp/subs.next >$tmp/subs.edit
-+          if test ! -s $tmp/subs.edit; then
-+            if test $ac_beg -gt 1; then
-+              ac_end=`expr $ac_end - 1`
-+              continue
-+            fi
-+          fi
-+        fi
-+      fi
-+
-       if test -z "$ac_sed_cmds"; then
--  	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-+        ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-       else
--  	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-+        ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-       fi
-       ac_sed_frag=`expr $ac_sed_frag + 1`
-       ac_beg=$ac_end
-@@ -15060,7 +15078,7 @@
-   esac
- 
-   if test x"$ac_file" != x-; then
--    { echo "$as_me:15063: creating $ac_file" >&5
-+    { echo "$as_me:15081: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
-     rm -f "$ac_file"
-   fi
-@@ -15078,7 +15096,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:15081: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:15099: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -15091,7 +15109,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:15094: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:15112: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -15107,7 +15125,7 @@
-       if test -n "$ac_seen"; then
-         ac_used=`grep '@datarootdir@' $ac_item`
-         if test -z "$ac_used"; then
--          { echo "$as_me:15110: WARNING: datarootdir was used implicitly but not set:
-+          { echo "$as_me:15128: 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;}
-@@ -15116,7 +15134,7 @@
-       fi
-       ac_seen=`grep '${datarootdir}' $ac_item`
-       if test -n "$ac_seen"; then
--        { echo "$as_me:15119: WARNING: datarootdir was used explicitly but not set:
-+        { echo "$as_me:15137: 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;}
-@@ -15153,7 +15171,7 @@
-             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:15156: WARNING: Variable $ac_name is used but was not set:
-+              { echo "$as_me:15174: 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;}
-@@ -15164,7 +15182,7 @@
-     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:15167: WARNING: Some variables may not be substituted:
-+      { echo "$as_me:15185: WARNING: Some variables may not be substituted:
- $ac_seen" >&5
- echo "$as_me: WARNING: Some variables may not be substituted:
- $ac_seen" >&2;}
-@@ -15213,7 +15231,7 @@
-   * )   ac_file_in=$ac_file.in ;;
-   esac
- 
--  test x"$ac_file" != x- && { echo "$as_me:15216: creating $ac_file" >&5
-+  test x"$ac_file" != x- && { echo "$as_me:15234: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
- 
-   # First look for the input files in the build tree, otherwise in the
-@@ -15224,7 +15242,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:15227: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:15245: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -15237,7 +15255,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:15240: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:15258: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -15295,7 +15313,7 @@
-   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:15298: $ac_file is unchanged" >&5
-+      { echo "$as_me:15316: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
-     else
-       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-Index: NEWS
-Prereq:  1.2499 
---- ncurses-6.0-20150926+/NEWS	2015-09-26 21:58:14.000000000 +0000
-+++ ncurses-6.0-20151010/NEWS	2015-10-10 20:24:26.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.2499 2015/09/26 21:58:14 tom Exp $
-+-- $Id: NEWS,v 1.2505 2015/10/10 20:24:26 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,16 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20151010
-+	+ add configure check for openpty to test/configure script, for ditto.
-+	+ minor fixes to test/view.c in investigating Debian #790847.
-+	+ update autoconf patch to 2.52.20150926, incorporates a fix for Cdk.
-+	+ add workaround for breakage of POSIX makefiles by recent binutils
-+	  change.
-+	+ improve check for working poll() by using posix_openpt() as a
-+	  fallback in case there is no valid terminal on the standard input
-+	  (prompted by discussion on bug-ncurses mailing list, Debian #676461).
-+
- 20150926
- 	+ change makefile rule for removing resulting.map to distclean rather
- 	  than clean.
-Index: VERSION
---- ncurses-6.0-20150926+/VERSION	2015-09-26 18:50:05.000000000 +0000
-+++ ncurses-6.0-20151010/VERSION	2015-10-10 17:06:12.000000000 +0000
-@@ -1 +1 @@
--5:0:9	6.0	20150926
-+5:0:9	6.0	20151010
-Index: aclocal.m4
-Prereq:  1.768 
---- ncurses-6.0-20150926+/aclocal.m4	2015-09-26 21:56:12.000000000 +0000
-+++ ncurses-6.0-20151010/aclocal.m4	2015-10-10 19:27:07.000000000 +0000
-@@ -28,7 +28,7 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: aclocal.m4,v 1.768 2015/09/26 21:56:12 tom Exp $
-+dnl $Id: aclocal.m4,v 1.770 2015/10/10 19:27:07 tom Exp $
- dnl Macros used in NCURSES auto-configuration script.
- dnl
- dnl These macros are maintained separately from NCURSES.  The copyright on
-@@ -423,15 +423,19 @@
- ])dnl
- ])])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_AR_FLAGS version: 5 updated: 2010/05/20 20:24:29
-+dnl CF_AR_FLAGS version: 6 updated: 2015/10/10 15:25:05
- dnl -----------
- dnl Check for suitable "ar" (archiver) options for updating an archive.
-+dnl
-+dnl In particular, handle some obsolete cases where the "-" might be omitted,
-+dnl as well as a workaround for breakage of make's archive rules by the GNU
-+dnl binutils "ar" program.
- AC_DEFUN([CF_AR_FLAGS],[
- AC_REQUIRE([CF_PROG_AR])
- 
- AC_CACHE_CHECK(for options to update archives, cf_cv_ar_flags,[
- 	cf_cv_ar_flags=unknown
--	for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv
-+	for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv
- 	do
- 
- 		# check if $ARFLAGS already contains this choice
-@@ -1821,11 +1825,12 @@
- ])
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_FUNC_POLL version: 8 updated: 2012/10/04 05:24:07
-+dnl CF_FUNC_POLL version: 9 updated: 2015/10/10 13:27:32
- dnl ------------
- dnl See if the poll function really works.  Some platforms have poll(), but
- dnl it does not work for terminals or files.
- AC_DEFUN([CF_FUNC_POLL],[
-+tty 2>&1 >/dev/null || { AC_CHECK_FUNCS(posix_openpt) }
- AC_CACHE_CHECK(if poll really works,cf_cv_working_poll,[
- AC_TRY_RUN([
- #include 
-@@ -1837,7 +1842,7 @@
- #else
- #include 
- #endif
--int main() {
-+int main(void) {
- 	struct pollfd myfds;
- 	int ret;
- 
-@@ -1857,6 +1862,11 @@
- 		if (!isatty(fd)) {
- 			fd = open("/dev/tty", 2);	/* O_RDWR */
- 		}
-+#ifdef HAVE_POSIX_OPENPT
-+		if (fd < 0) {
-+			fd = posix_openpt(O_RDWR);
-+		}
-+#endif
- 
- 		if (fd >= 0) {
- 			/* also check with standard input */
-Index: configure
---- ncurses-6.0-20150926+/configure	2015-09-26 21:56:47.000000000 +0000
-+++ ncurses-6.0-20151010/configure	2015-10-10 19:18:37.000000000 +0000
-@@ -1,7 +1,7 @@
- #! /bin/sh
- # From configure.in Revision: 1.619 .
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by Autoconf 2.52.20141204.
-+# Generated by Autoconf 2.52.20150926.
- #
- # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
- # Free Software Foundation, Inc.
-@@ -907,7 +907,7 @@
- running configure, to aid debugging if configure makes a mistake.
- 
- It was created by $as_me, which was
--generated by GNU Autoconf 2.52.20141204.  Invocation command line was
-+generated by GNU Autoconf 2.52.20150926.  Invocation command line was
- 
-   $ $0 $@
- 
-@@ -4408,7 +4408,7 @@
- else
- 
- 	cf_cv_ar_flags=unknown
--	for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv
-+	for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv
- 	do
- 
- 		# check if $ARFLAGS already contains this choice
-@@ -17833,7 +17833,77 @@
- 
- fi
- 
--echo "$as_me:17836: checking if poll really works" >&5
-+tty 2>&1 >/dev/null || {
-+for ac_func in posix_openpt
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+echo "$as_me:17840: 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 17846 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func (); below.  */
-+#include 
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+   builtin and then its argument prototype would still apply.  */
-+char $ac_func ();
-+char (*f) ();
-+
-+int
-+main ()
-+{
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
-+#endif
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:17877: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:17880: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:17883: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:17886: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  eval "$as_ac_var=yes"
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+eval "$as_ac_var=no"
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:17896: 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 <&5
- echo $ECHO_N "checking if poll really works... $ECHO_C" >&6
- if test "${cf_cv_working_poll+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17843,7 +17913,7 @@
-   cf_cv_working_poll=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17846 "configure"
-+#line 17916 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -17855,7 +17925,7 @@
- #else
- #include 
- #endif
--int main() {
-+int main(void) {
- 	struct pollfd myfds;
- 	int ret;
- 
-@@ -17875,6 +17945,11 @@
- 		if (!isatty(fd)) {
- 			fd = open("/dev/tty", 2);	/* O_RDWR */
- 		}
-+#ifdef HAVE_POSIX_OPENPT
-+		if (fd < 0) {
-+			fd = posix_openpt(O_RDWR);
-+		}
-+#endif
- 
- 		if (fd >= 0) {
- 			/* also check with standard input */
-@@ -17890,15 +17965,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17893: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17968: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17896: \$? = $ac_status" >&5
-+  echo "$as_me:17971: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17898: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17973: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17901: \$? = $ac_status" >&5
-+  echo "$as_me:17976: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_working_poll=yes
- else
-@@ -17910,21 +17985,21 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:17913: result: $cf_cv_working_poll" >&5
-+echo "$as_me:17988: result: $cf_cv_working_poll" >&5
- echo "${ECHO_T}$cf_cv_working_poll" >&6
- test "$cf_cv_working_poll" = "yes" &&
- cat >>confdefs.h <<\EOF
- #define HAVE_WORKING_POLL 1
- EOF
- 
--echo "$as_me:17920: checking for va_copy" >&5
-+echo "$as_me:17995: checking for va_copy" >&5
- echo $ECHO_N "checking for va_copy... $ECHO_C" >&6
- if test "${cf_cv_have_va_copy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17927 "configure"
-+#line 18002 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -17941,16 +18016,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17944: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18019: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17947: \$? = $ac_status" >&5
-+  echo "$as_me:18022: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17950: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18025: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17953: \$? = $ac_status" >&5
-+  echo "$as_me:18028: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_va_copy=yes
- else
-@@ -17960,7 +18035,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17963: result: $cf_cv_have_va_copy" >&5
-+echo "$as_me:18038: result: $cf_cv_have_va_copy" >&5
- echo "${ECHO_T}$cf_cv_have_va_copy" >&6
- 
- test "$cf_cv_have_va_copy" = yes &&
-@@ -17968,14 +18043,14 @@
- #define HAVE_VA_COPY 1
- EOF
- 
--echo "$as_me:17971: checking for __va_copy" >&5
-+echo "$as_me:18046: checking for __va_copy" >&5
- echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6
- if test "${cf_cv_have___va_copy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17978 "configure"
-+#line 18053 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -17992,16 +18067,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17995: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18070: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17998: \$? = $ac_status" >&5
-+  echo "$as_me:18073: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18001: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18076: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18004: \$? = $ac_status" >&5
-+  echo "$as_me:18079: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have___va_copy=yes
- else
-@@ -18011,7 +18086,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:18014: result: $cf_cv_have___va_copy" >&5
-+echo "$as_me:18089: result: $cf_cv_have___va_copy" >&5
- echo "${ECHO_T}$cf_cv_have___va_copy" >&6
- 
- test "$cf_cv_have___va_copy" = yes &&
-@@ -18019,13 +18094,13 @@
- #define HAVE___VA_COPY 1
- EOF
- 
--echo "$as_me:18022: checking for pid_t" >&5
-+echo "$as_me:18097: 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 18028 "configure"
-+#line 18103 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -18040,16 +18115,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18043: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18118: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18046: \$? = $ac_status" >&5
-+  echo "$as_me:18121: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18049: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18124: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18052: \$? = $ac_status" >&5
-+  echo "$as_me:18127: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_pid_t=yes
- else
-@@ -18059,7 +18134,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:18062: result: $ac_cv_type_pid_t" >&5
-+echo "$as_me:18137: 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
-   :
-@@ -18074,23 +18149,23 @@
- for ac_header in unistd.h vfork.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:18077: checking for $ac_header" >&5
-+echo "$as_me:18152: 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 18083 "configure"
-+#line 18158 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:18087: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:18162: \"$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:18093: \$? = $ac_status" >&5
-+  echo "$as_me:18168: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -18109,7 +18184,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:18112: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:18187: 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 <&5
-+echo "$as_me:18200: 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 18131 "configure"
-+#line 18206 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -18159,16 +18234,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18162: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18237: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18165: \$? = $ac_status" >&5
-+  echo "$as_me:18240: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18168: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18243: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18171: \$? = $ac_status" >&5
-+  echo "$as_me:18246: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -18178,7 +18253,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:18181: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:18256: 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 <&5
-+  echo "$as_me:18268: 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
-@@ -18213,15 +18288,15 @@
-       }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:18216: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18291: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18219: \$? = $ac_status" >&5
-+  echo "$as_me:18294: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:18221: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18296: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18224: \$? = $ac_status" >&5
-+  echo "$as_me:18299: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_fork_works=yes
- else
-@@ -18233,7 +18308,7 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:18236: result: $ac_cv_func_fork_works" >&5
-+echo "$as_me:18311: result: $ac_cv_func_fork_works" >&5
- echo "${ECHO_T}$ac_cv_func_fork_works" >&6
- 
- fi
-@@ -18247,12 +18322,12 @@
-       ac_cv_func_fork_works=yes
-       ;;
-   esac
--  { echo "$as_me:18250: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
-+  { echo "$as_me:18325: 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:18255: checking for working vfork" >&5
-+  echo "$as_me:18330: 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
-@@ -18261,7 +18336,7 @@
-   ac_cv_func_vfork_works=cross
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18264 "configure"
-+#line 18339 "configure"
- #include "confdefs.h"
- /* Thanks to Paul Eggert for this test.  */
- #include 
-@@ -18358,15 +18433,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:18361: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18436: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18364: \$? = $ac_status" >&5
-+  echo "$as_me:18439: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:18366: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18441: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18369: \$? = $ac_status" >&5
-+  echo "$as_me:18444: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_vfork_works=yes
- else
-@@ -18378,13 +18453,13 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:18381: result: $ac_cv_func_vfork_works" >&5
-+echo "$as_me:18456: 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:18387: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
-+  { echo "$as_me:18462: 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
- 
-@@ -18411,7 +18486,7 @@
- 
- # special check for test/ditto.c
- 
--echo "$as_me:18414: checking for openpty in -lutil" >&5
-+echo "$as_me:18489: checking for openpty in -lutil" >&5
- echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
- if test "${ac_cv_lib_util_openpty+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18419,7 +18494,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lutil  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 18422 "configure"
-+#line 18497 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -18438,16 +18513,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18441: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18516: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18444: \$? = $ac_status" >&5
-+  echo "$as_me:18519: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18447: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18522: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18450: \$? = $ac_status" >&5
-+  echo "$as_me:18525: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_util_openpty=yes
- else
-@@ -18458,7 +18533,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:18461: result: $ac_cv_lib_util_openpty" >&5
-+echo "$as_me:18536: result: $ac_cv_lib_util_openpty" >&5
- echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
- if test $ac_cv_lib_util_openpty = yes; then
-   cf_cv_lib_util=yes
-@@ -18466,7 +18541,7 @@
-   cf_cv_lib_util=no
- fi
- 
--echo "$as_me:18469: checking for openpty header" >&5
-+echo "$as_me:18544: checking for openpty header" >&5
- echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
- if test "${cf_cv_func_openpty+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18493,7 +18568,7 @@
- 	for cf_header in pty.h libutil.h util.h
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 18496 "configure"
-+#line 18571 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -18510,16 +18585,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18513: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18588: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18516: \$? = $ac_status" >&5
-+  echo "$as_me:18591: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18519: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18594: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18522: \$? = $ac_status" >&5
-+  echo "$as_me:18597: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 		cf_cv_func_openpty=$cf_header
-@@ -18537,7 +18612,7 @@
- 	LIBS="$cf_save_LIBS"
- 
- fi
--echo "$as_me:18540: result: $cf_cv_func_openpty" >&5
-+echo "$as_me:18615: result: $cf_cv_func_openpty" >&5
- echo "${ECHO_T}$cf_cv_func_openpty" >&6
- 
- if test "$cf_cv_func_openpty" != no ; then
-@@ -18607,7 +18682,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 18610 "configure"
-+#line 18685 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -18619,16 +18694,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18622: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18697: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18625: \$? = $ac_status" >&5
-+  echo "$as_me:18700: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18628: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18703: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18631: \$? = $ac_status" >&5
-+  echo "$as_me:18706: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -18645,7 +18720,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:18648: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:18723: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -18681,7 +18756,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:18684: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:18759: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -18692,7 +18767,7 @@
- 	else
- 		case "$with_hashed_db" in
- 		(./*|../*|/*)
--			{ echo "$as_me:18695: WARNING: no such directory $with_hashed_db" >&5
-+			{ echo "$as_me:18770: WARNING: no such directory $with_hashed_db" >&5
- echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
- 			;;
- 		(*)
-@@ -18761,7 +18836,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 18764 "configure"
-+#line 18839 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -18773,16 +18848,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18776: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18851: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18779: \$? = $ac_status" >&5
-+  echo "$as_me:18854: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18782: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18857: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18785: \$? = $ac_status" >&5
-+  echo "$as_me:18860: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -18799,7 +18874,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:18802: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:18877: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -18879,7 +18954,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:18882: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:18957: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -18896,23 +18971,23 @@
- 	fi
- esac
- 
--echo "$as_me:18899: checking for db.h" >&5
-+echo "$as_me:18974: checking for db.h" >&5
- echo $ECHO_N "checking for db.h... $ECHO_C" >&6
- if test "${ac_cv_header_db_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18905 "configure"
-+#line 18980 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:18909: \"$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:18915: \$? = $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
-@@ -18931,11 +19006,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:18934: result: $ac_cv_header_db_h" >&5
-+echo "$as_me:19009: result: $ac_cv_header_db_h" >&5
- echo "${ECHO_T}$ac_cv_header_db_h" >&6
- if test $ac_cv_header_db_h = yes; then
- 
--echo "$as_me:18938: checking for version of db" >&5
-+echo "$as_me:19013: checking for version of db" >&5
- echo $ECHO_N "checking for version of db... $ECHO_C" >&6
- if test "${cf_cv_hashed_db_version+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18946,10 +19021,10 @@
- for cf_db_version in 1 2 3 4 5 6
- do
- 
--echo "${as_me:-configure}:18949: testing checking for db version $cf_db_version ..." 1>&5
-+echo "${as_me:-configure}:19024: testing checking for db version $cf_db_version ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 18952 "configure"
-+#line 19027 "configure"
- #include "confdefs.h"
- 
- $ac_includes_default
-@@ -18979,16 +19054,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18982: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19057: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18985: \$? = $ac_status" >&5
-+  echo "$as_me:19060: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18988: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19063: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18991: \$? = $ac_status" >&5
-+  echo "$as_me:19066: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_hashed_db_version=$cf_db_version
-@@ -19002,16 +19077,16 @@
- done
- 
- fi
--echo "$as_me:19005: result: $cf_cv_hashed_db_version" >&5
-+echo "$as_me:19080: result: $cf_cv_hashed_db_version" >&5
- echo "${ECHO_T}$cf_cv_hashed_db_version" >&6
- 
- if test "$cf_cv_hashed_db_version" = unknown ; then
--	{ { echo "$as_me:19009: error: Cannot determine version of db" >&5
-+	{ { echo "$as_me:19084: error: Cannot determine version of db" >&5
- echo "$as_me: error: Cannot determine version of db" >&2;}
-    { (exit 1); exit 1; }; }
- else
- 
--echo "$as_me:19014: checking for db libraries" >&5
-+echo "$as_me:19089: checking for db libraries" >&5
- echo $ECHO_N "checking for db libraries... $ECHO_C" >&6
- if test "${cf_cv_hashed_db_libs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19041,10 +19116,10 @@
- 
- 	fi
- 
--echo "${as_me:-configure}:19044: testing checking for library "$cf_db_libs" ..." 1>&5
-+echo "${as_me:-configure}:19119: testing checking for library "$cf_db_libs" ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19047 "configure"
-+#line 19122 "configure"
- #include "confdefs.h"
- 
- $ac_includes_default
-@@ -19099,16 +19174,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19102: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19177: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19105: \$? = $ac_status" >&5
-+  echo "$as_me:19180: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19108: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19183: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19111: \$? = $ac_status" >&5
-+  echo "$as_me:19186: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	if test -n "$cf_db_libs" ; then
-@@ -19128,11 +19203,11 @@
- done
- 
- fi
--echo "$as_me:19131: result: $cf_cv_hashed_db_libs" >&5
-+echo "$as_me:19206: result: $cf_cv_hashed_db_libs" >&5
- echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6
- 
- 	if test "$cf_cv_hashed_db_libs" = unknown ; then
--		{ { echo "$as_me:19135: error: Cannot determine library for db" >&5
-+		{ { echo "$as_me:19210: error: Cannot determine library for db" >&5
- echo "$as_me: error: Cannot determine library for db" >&2;}
-    { (exit 1); exit 1; }; }
- 	elif test "$cf_cv_hashed_db_libs" != default ; then
-@@ -19158,7 +19233,7 @@
- 
- else
- 
--	{ { echo "$as_me:19161: error: Cannot find db.h" >&5
-+	{ { echo "$as_me:19236: error: Cannot find db.h" >&5
- echo "$as_me: error: Cannot find db.h" >&2;}
-    { (exit 1); exit 1; }; }
- 
-@@ -19173,7 +19248,7 @@
- 
- # Just in case, check if the C compiler has a bool type.
- 
--echo "$as_me:19176: checking if we should include stdbool.h" >&5
-+echo "$as_me:19251: checking if we should include stdbool.h" >&5
- echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
- 
- if test "${cf_cv_header_stdbool_h+set}" = set; then
-@@ -19181,7 +19256,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19184 "configure"
-+#line 19259 "configure"
- #include "confdefs.h"
- 
- int
-@@ -19193,23 +19268,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19196: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19271: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19199: \$? = $ac_status" >&5
-+  echo "$as_me:19274: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19202: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19277: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19205: \$? = $ac_status" >&5
-+  echo "$as_me:19280: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=0
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 19212 "configure"
-+#line 19287 "configure"
- #include "confdefs.h"
- 
- #ifndef __BEOS__
-@@ -19225,16 +19300,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19228: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19303: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19231: \$? = $ac_status" >&5
-+  echo "$as_me:19306: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19234: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19309: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19237: \$? = $ac_status" >&5
-+  echo "$as_me:19312: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=1
- else
-@@ -19248,13 +19323,13 @@
- fi
- 
- if test "$cf_cv_header_stdbool_h" = 1
--then	echo "$as_me:19251: result: yes" >&5
-+then	echo "$as_me:19326: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:19253: result: no" >&5
-+else	echo "$as_me:19328: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:19257: checking for builtin bool type" >&5
-+echo "$as_me:19332: checking for builtin bool type" >&5
- echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
- 
- if test "${cf_cv_cc_bool_type+set}" = set; then
-@@ -19262,7 +19337,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19265 "configure"
-+#line 19340 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -19277,16 +19352,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19280: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19355: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19283: \$? = $ac_status" >&5
-+  echo "$as_me:19358: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19286: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19361: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19289: \$? = $ac_status" >&5
-+  echo "$as_me:19364: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cc_bool_type=1
- else
-@@ -19299,9 +19374,9 @@
- fi
- 
- if test "$cf_cv_cc_bool_type" = 1
--then	echo "$as_me:19302: result: yes" >&5
-+then	echo "$as_me:19377: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:19304: result: no" >&5
-+else	echo "$as_me:19379: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -19318,10 +19393,10 @@
- 
- 	cf_save="$LIBS"
- 	LIBS="$LIBS $CXXLIBS"
--	echo "$as_me:19321: checking if we already have C++ library" >&5
-+	echo "$as_me:19396: checking if we already have C++ library" >&5
- echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19324 "configure"
-+#line 19399 "configure"
- #include "confdefs.h"
- 
- 			#include 
-@@ -19335,16 +19410,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19338: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19413: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19341: \$? = $ac_status" >&5
-+  echo "$as_me:19416: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19344: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19419: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19347: \$? = $ac_status" >&5
-+  echo "$as_me:19422: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_have_libstdcpp=yes
- else
-@@ -19353,7 +19428,7 @@
- cf_have_libstdcpp=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--	echo "$as_me:19356: result: $cf_have_libstdcpp" >&5
-+	echo "$as_me:19431: result: $cf_have_libstdcpp" >&5
- echo "${ECHO_T}$cf_have_libstdcpp" >&6
- 	LIBS="$cf_save"
- 
-@@ -19368,7 +19443,7 @@
- 			;;
- 		esac
- 
--		echo "$as_me:19371: checking for library $cf_stdcpp_libname" >&5
-+		echo "$as_me:19446: checking for library $cf_stdcpp_libname" >&5
- echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6
- if test "${cf_cv_libstdcpp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19394,7 +19469,7 @@
- LIBS="$cf_add_libs"
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 19397 "configure"
-+#line 19472 "configure"
- #include "confdefs.h"
- 
- 				#include 
-@@ -19408,16 +19483,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19411: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19486: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19414: \$? = $ac_status" >&5
-+  echo "$as_me:19489: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19417: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19492: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19420: \$? = $ac_status" >&5
-+  echo "$as_me:19495: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_libstdcpp=yes
- else
-@@ -19429,7 +19504,7 @@
- 			LIBS="$cf_save"
- 
- fi
--echo "$as_me:19432: result: $cf_cv_libstdcpp" >&5
-+echo "$as_me:19507: result: $cf_cv_libstdcpp" >&5
- echo "${ECHO_T}$cf_cv_libstdcpp" >&6
- 		test "$cf_cv_libstdcpp" = yes && {
- cf_add_libs="-l$cf_stdcpp_libname"
-@@ -19451,7 +19526,7 @@
- 	fi
- fi
- 
--	echo "$as_me:19454: checking whether $CXX understands -c and -o together" >&5
-+	echo "$as_me:19529: checking whether $CXX understands -c and -o together" >&5
- echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6
- if test "${cf_cv_prog_CXX_c_o+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19467,15 +19542,15 @@
- # We do the test twice because some compilers refuse to overwrite an
- # existing .o file with -o, though they will create one.
- ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
--if { (eval echo "$as_me:19470: \"$ac_try\"") >&5
-+if { (eval echo "$as_me:19545: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19473: \$? = $ac_status" >&5
-+  echo "$as_me:19548: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--  test -f conftest2.$ac_objext && { (eval echo "$as_me:19475: \"$ac_try\"") >&5
-+  test -f conftest2.$ac_objext && { (eval echo "$as_me:19550: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19478: \$? = $ac_status" >&5
-+  echo "$as_me:19553: \$? = $ac_status" >&5
-   (exit $ac_status); };
- then
-   eval cf_cv_prog_CXX_c_o=yes
-@@ -19486,10 +19561,10 @@
- 
- fi
- if test $cf_cv_prog_CXX_c_o = yes; then
--  echo "$as_me:19489: result: yes" >&5
-+  echo "$as_me:19564: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--  echo "$as_me:19492: result: no" >&5
-+  echo "$as_me:19567: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -19509,7 +19584,7 @@
- 	;;
- esac
- if test "$GXX" = yes; then
--	echo "$as_me:19512: checking for lib$cf_gpp_libname" >&5
-+	echo "$as_me:19587: checking for lib$cf_gpp_libname" >&5
- echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
- 	cf_save="$LIBS"
- 
-@@ -19530,7 +19605,7 @@
- LIBS="$cf_add_libs"
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19533 "configure"
-+#line 19608 "configure"
- #include "confdefs.h"
- 
- #include <$cf_gpp_libname/builtin.h>
-@@ -19544,16 +19619,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19547: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19622: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19550: \$? = $ac_status" >&5
-+  echo "$as_me:19625: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19553: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19628: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19556: \$? = $ac_status" >&5
-+  echo "$as_me:19631: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cxx_library=yes
- 
-@@ -19590,7 +19665,7 @@
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 19593 "configure"
-+#line 19668 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -19604,16 +19679,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19607: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19682: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19610: \$? = $ac_status" >&5
-+  echo "$as_me:19685: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19613: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19688: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19616: \$? = $ac_status" >&5
-+  echo "$as_me:19691: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cxx_library=yes
- 
-@@ -19646,7 +19721,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	LIBS="$cf_save"
--	echo "$as_me:19649: result: $cf_cxx_library" >&5
-+	echo "$as_me:19724: result: $cf_cxx_library" >&5
- echo "${ECHO_T}$cf_cxx_library" >&6
- fi
- 
-@@ -19662,7 +19737,7 @@
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- ac_main_return=return
--echo "$as_me:19665: checking how to run the C++ preprocessor" >&5
-+echo "$as_me:19740: checking how to run the C++ preprocessor" >&5
- echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
- if test -z "$CXXCPP"; then
-   if test "${ac_cv_prog_CXXCPP+set}" = set; then
-@@ -19679,18 +19754,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19682 "configure"
-+#line 19757 "configure"
- #include "confdefs.h"
- #include 
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:19687: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19762: \"$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:19693: \$? = $ac_status" >&5
-+  echo "$as_me:19768: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19713,17 +19788,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19716 "configure"
-+#line 19791 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:19720: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19795: \"$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:19726: \$? = $ac_status" >&5
-+  echo "$as_me:19801: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19760,7 +19835,7 @@
- else
-   ac_cv_prog_CXXCPP=$CXXCPP
- fi
--echo "$as_me:19763: result: $CXXCPP" >&5
-+echo "$as_me:19838: result: $CXXCPP" >&5
- echo "${ECHO_T}$CXXCPP" >&6
- ac_preproc_ok=false
- for ac_cxx_preproc_warn_flag in '' yes
-@@ -19770,18 +19845,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19773 "configure"
-+#line 19848 "configure"
- #include "confdefs.h"
- #include 
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:19778: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19853: \"$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:19784: \$? = $ac_status" >&5
-+  echo "$as_me:19859: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19804,17 +19879,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19807 "configure"
-+#line 19882 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:19811: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19886: \"$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:19817: \$? = $ac_status" >&5
-+  echo "$as_me:19892: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19842,7 +19917,7 @@
- if $ac_preproc_ok; then
-   :
- else
--  { { echo "$as_me:19845: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
-+  { { echo "$as_me:19920: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
- echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -19857,23 +19932,23 @@
- for ac_header in typeinfo
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:19860: checking for $ac_header" >&5
-+echo "$as_me:19935: 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 19866 "configure"
-+#line 19941 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:19870: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19945: \"$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:19876: \$? = $ac_status" >&5
-+  echo "$as_me:19951: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19892,7 +19967,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:19895: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:19970: 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 <&5
-+echo "$as_me:19983: 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 19914 "configure"
-+#line 19989 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:19918: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19993: \"$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:19924: \$? = $ac_status" >&5
-+  echo "$as_me:19999: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19940,7 +20015,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:19943: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:20018: 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 <&5
-+	echo "$as_me:20029: checking if iostream uses std-namespace" >&5
- echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19957 "configure"
-+#line 20032 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -19971,16 +20046,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19974: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20049: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19977: \$? = $ac_status" >&5
-+  echo "$as_me:20052: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19980: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20055: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19983: \$? = $ac_status" >&5
-+  echo "$as_me:20058: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_iostream_namespace=yes
- else
-@@ -19989,7 +20064,7 @@
- cf_iostream_namespace=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:19992: result: $cf_iostream_namespace" >&5
-+	echo "$as_me:20067: result: $cf_iostream_namespace" >&5
- echo "${ECHO_T}$cf_iostream_namespace" >&6
- 	if test "$cf_iostream_namespace" = yes ; then
- 
-@@ -20000,7 +20075,7 @@
- 	fi
- fi
- 
--echo "$as_me:20003: checking if we should include stdbool.h" >&5
-+echo "$as_me:20078: checking if we should include stdbool.h" >&5
- echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
- 
- if test "${cf_cv_header_stdbool_h+set}" = set; then
-@@ -20008,7 +20083,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 20011 "configure"
-+#line 20086 "configure"
- #include "confdefs.h"
- 
- int
-@@ -20020,23 +20095,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20023: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20098: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20026: \$? = $ac_status" >&5
-+  echo "$as_me:20101: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20029: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20104: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20032: \$? = $ac_status" >&5
-+  echo "$as_me:20107: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=0
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 20039 "configure"
-+#line 20114 "configure"
- #include "confdefs.h"
- 
- #ifndef __BEOS__
-@@ -20052,16 +20127,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20055: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20130: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20058: \$? = $ac_status" >&5
-+  echo "$as_me:20133: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20061: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20136: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20064: \$? = $ac_status" >&5
-+  echo "$as_me:20139: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=1
- else
-@@ -20075,13 +20150,13 @@
- fi
- 
- if test "$cf_cv_header_stdbool_h" = 1
--then	echo "$as_me:20078: result: yes" >&5
-+then	echo "$as_me:20153: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:20080: result: no" >&5
-+else	echo "$as_me:20155: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:20084: checking for builtin bool type" >&5
-+echo "$as_me:20159: checking for builtin bool type" >&5
- echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
- 
- if test "${cf_cv_builtin_bool+set}" = set; then
-@@ -20089,7 +20164,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 20092 "configure"
-+#line 20167 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -20104,16 +20179,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20107: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20182: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20110: \$? = $ac_status" >&5
-+  echo "$as_me:20185: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20113: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20188: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20116: \$? = $ac_status" >&5
-+  echo "$as_me:20191: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_builtin_bool=1
- else
-@@ -20126,13 +20201,13 @@
- fi
- 
- if test "$cf_cv_builtin_bool" = 1
--then	echo "$as_me:20129: result: yes" >&5
-+then	echo "$as_me:20204: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:20131: result: no" >&5
-+else	echo "$as_me:20206: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:20135: checking for size of bool" >&5
-+echo "$as_me:20210: checking for size of bool" >&5
- echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
- if test "${cf_cv_type_of_bool+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20143,7 +20218,7 @@
-   cf_cv_type_of_bool=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20146 "configure"
-+#line 20221 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -20185,15 +20260,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20188: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20263: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20191: \$? = $ac_status" >&5
-+  echo "$as_me:20266: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20193: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20268: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20196: \$? = $ac_status" >&5
-+  echo "$as_me:20271: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_of_bool=`cat cf_test.out`
- 		 if test -z "$cf_cv_type_of_bool"; then
-@@ -20211,18 +20286,18 @@
- fi
- 
- 	rm -f cf_test.out
--echo "$as_me:20214: result: $cf_cv_type_of_bool" >&5
-+echo "$as_me:20289: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- if test "$cf_cv_type_of_bool" = unknown ; then
- 	case .$NCURSES_BOOL in
- 	(.auto|.) NCURSES_BOOL=unsigned;;
- 	esac
--	{ echo "$as_me:20220: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-+	{ echo "$as_me:20295: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
- echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
- 	cf_cv_type_of_bool=$NCURSES_BOOL
- fi
- 
--echo "$as_me:20225: checking for special defines needed for etip.h" >&5
-+echo "$as_me:20300: checking for special defines needed for etip.h" >&5
- echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6
- cf_save_CXXFLAGS="$CXXFLAGS"
- cf_result="none"
-@@ -20240,7 +20315,7 @@
- 	test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}"
- 	test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
- cat >conftest.$ac_ext <<_ACEOF
--#line 20243 "configure"
-+#line 20318 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -20254,16 +20329,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20257: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20332: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20260: \$? = $ac_status" >&5
-+  echo "$as_me:20335: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20263: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20338: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20266: \$? = $ac_status" >&5
-+  echo "$as_me:20341: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	test -n "$cf_math" && cat >>confdefs.h <&5
-+echo "$as_me:20362: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- CXXFLAGS="$cf_save_CXXFLAGS"
- 
- if test -n "$CXX"; then
--echo "$as_me:20292: checking if $CXX accepts parameter initialization" >&5
-+echo "$as_me:20367: checking if $CXX accepts parameter initialization" >&5
- echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6
- if test "${cf_cv_cpp_param_init+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20306,7 +20381,7 @@
-   cf_cv_cpp_param_init=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20309 "configure"
-+#line 20384 "configure"
- #include "confdefs.h"
- 
- class TEST {
-@@ -20325,15 +20400,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20328: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20403: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20331: \$? = $ac_status" >&5
-+  echo "$as_me:20406: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20333: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20408: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20336: \$? = $ac_status" >&5
-+  echo "$as_me:20411: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cpp_param_init=yes
- else
-@@ -20352,7 +20427,7 @@
- ac_main_return=return
- 
- fi
--echo "$as_me:20355: result: $cf_cv_cpp_param_init" >&5
-+echo "$as_me:20430: result: $cf_cv_cpp_param_init" >&5
- echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
- fi
- test "$cf_cv_cpp_param_init" = yes &&
-@@ -20362,7 +20437,7 @@
- 
- if test -n "$CXX"; then
- 
--echo "$as_me:20365: checking if $CXX accepts static_cast" >&5
-+echo "$as_me:20440: checking if $CXX accepts static_cast" >&5
- echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6
- if test "${cf_cv_cpp_static_cast+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20376,7 +20451,7 @@
- ac_main_return=return
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 20379 "configure"
-+#line 20454 "configure"
- #include "confdefs.h"
- 
- class NCursesPanel
-@@ -20420,16 +20495,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20423: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20498: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20426: \$? = $ac_status" >&5
-+  echo "$as_me:20501: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20429: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20504: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20432: \$? = $ac_status" >&5
-+  echo "$as_me:20507: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cpp_static_cast=yes
- else
-@@ -20447,7 +20522,7 @@
- ac_main_return=return
- 
- fi
--echo "$as_me:20450: result: $cf_cv_cpp_static_cast" >&5
-+echo "$as_me:20525: result: $cf_cv_cpp_static_cast" >&5
- echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
- 
- fi
-@@ -20496,7 +20571,7 @@
- 	else
- 		if test "$cf_cv_header_stdbool_h" = 1 ; then
- 
--echo "$as_me:20499: checking for size of bool" >&5
-+echo "$as_me:20574: checking for size of bool" >&5
- echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
- if test "${cf_cv_type_of_bool+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20507,7 +20582,7 @@
-   cf_cv_type_of_bool=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20510 "configure"
-+#line 20585 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -20549,15 +20624,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20552: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20627: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20555: \$? = $ac_status" >&5
-+  echo "$as_me:20630: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20557: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20632: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20560: \$? = $ac_status" >&5
-+  echo "$as_me:20635: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_of_bool=`cat cf_test.out`
- 		 if test -z "$cf_cv_type_of_bool"; then
-@@ -20575,25 +20650,25 @@
- fi
- 
- 	rm -f cf_test.out
--echo "$as_me:20578: result: $cf_cv_type_of_bool" >&5
-+echo "$as_me:20653: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- if test "$cf_cv_type_of_bool" = unknown ; then
- 	case .$NCURSES_BOOL in
- 	(.auto|.) NCURSES_BOOL=unsigned;;
- 	esac
--	{ echo "$as_me:20584: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-+	{ echo "$as_me:20659: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
- echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
- 	cf_cv_type_of_bool=$NCURSES_BOOL
- fi
- 
- 		else
--			echo "$as_me:20590: checking for fallback type of bool" >&5
-+			echo "$as_me:20665: checking for fallback type of bool" >&5
- echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
- 			case "$host_cpu" in
- 			(i?86)	cf_cv_type_of_bool=char	;;
- 			(*)	cf_cv_type_of_bool=int	;;
- 			esac
--			echo "$as_me:20596: result: $cf_cv_type_of_bool" >&5
-+			echo "$as_me:20671: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- 		fi
- 	fi
-@@ -20622,7 +20697,7 @@
- 
- 	if test "$cf_with_ada" != "no" ; then
- 		if test "$with_libtool" != "no"; then
--			{ echo "$as_me:20625: WARNING: libtool does not support Ada - disabling feature" >&5
-+			{ echo "$as_me:20700: WARNING: libtool does not support Ada - disabling feature" >&5
- echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
- 			cf_with_ada=no
- 		fi
-@@ -20633,7 +20708,7 @@
- cf_ada_make=gnatmake
- # Extract the first word of "$cf_ada_make", so it can be a program name with args.
- set dummy $cf_ada_make; ac_word=$2
--echo "$as_me:20636: checking for $ac_word" >&5
-+echo "$as_me:20711: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_gnat_exists+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20648,7 +20723,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_gnat_exists="yes"
--echo "$as_me:20651: found $ac_dir/$ac_word" >&5
-+echo "$as_me:20726: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -20657,10 +20732,10 @@
- fi
- gnat_exists=$ac_cv_prog_gnat_exists
- if test -n "$gnat_exists"; then
--  echo "$as_me:20660: result: $gnat_exists" >&5
-+  echo "$as_me:20735: result: $gnat_exists" >&5
- echo "${ECHO_T}$gnat_exists" >&6
- else
--  echo "$as_me:20663: result: no" >&5
-+  echo "$as_me:20738: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -20669,12 +20744,12 @@
- 	cf_cv_prog_gnat_correct=no
- else
- 
--echo "$as_me:20672: checking for gnat version" >&5
-+echo "$as_me:20747: checking for gnat version" >&5
- echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
- cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
- 	grep '[0-9].[0-9][0-9]*' |\
- 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
--echo "$as_me:20677: result: $cf_gnat_version" >&5
-+echo "$as_me:20752: result: $cf_gnat_version" >&5
- echo "${ECHO_T}$cf_gnat_version" >&6
- 
- case $cf_gnat_version in
-@@ -20682,7 +20757,7 @@
- 	cf_cv_prog_gnat_correct=yes
- 	;;
- (*)
--	{ echo "$as_me:20685: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
-+	{ echo "$as_me:20760: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
- echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
- 	cf_cv_prog_gnat_correct=no
- 	;;
-@@ -20690,7 +20765,7 @@
- 
- 	# Extract the first word of "m4", so it can be a program name with args.
- set dummy m4; ac_word=$2
--echo "$as_me:20693: checking for $ac_word" >&5
-+echo "$as_me:20768: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_M4_exists+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20705,7 +20780,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_M4_exists="yes"
--echo "$as_me:20708: found $ac_dir/$ac_word" >&5
-+echo "$as_me:20783: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -20714,10 +20789,10 @@
- fi
- M4_exists=$ac_cv_prog_M4_exists
- if test -n "$M4_exists"; then
--  echo "$as_me:20717: result: $M4_exists" >&5
-+  echo "$as_me:20792: result: $M4_exists" >&5
- echo "${ECHO_T}$M4_exists" >&6
- else
--  echo "$as_me:20720: result: no" >&5
-+  echo "$as_me:20795: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -20726,7 +20801,7 @@
- 		echo Ada95 binding required program m4 not found. Ada95 binding disabled.
- 	fi
- 	if test "$cf_cv_prog_gnat_correct" = yes; then
--		echo "$as_me:20729: checking if GNAT works" >&5
-+		echo "$as_me:20804: checking if GNAT works" >&5
- echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
- 
- rm -rf conftest* *~conftest*
-@@ -20754,7 +20829,7 @@
- fi
- rm -rf conftest* *~conftest*
- 
--		echo "$as_me:20757: result: $cf_cv_prog_gnat_correct" >&5
-+		echo "$as_me:20832: result: $cf_cv_prog_gnat_correct" >&5
- echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
- 	fi
- fi
-@@ -20763,7 +20838,7 @@
- 
-  	ADAFLAGS="$ADAFLAGS -gnatpn"
- 
--	echo "$as_me:20766: checking optimization options for ADAFLAGS" >&5
-+	echo "$as_me:20841: checking optimization options for ADAFLAGS" >&5
- echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
- 	case "$CFLAGS" in
- 	(*-g*)
-@@ -20780,10 +20855,10 @@
- 
- 		;;
- 	esac
--	echo "$as_me:20783: result: $ADAFLAGS" >&5
-+	echo "$as_me:20858: result: $ADAFLAGS" >&5
- echo "${ECHO_T}$ADAFLAGS" >&6
- 
--echo "$as_me:20786: checking if GNATPREP supports -T option" >&5
-+echo "$as_me:20861: checking if GNATPREP supports -T option" >&5
- echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
- if test "${cf_cv_gnatprep_opt_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20793,11 +20868,11 @@
- gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
- 
- fi
--echo "$as_me:20796: result: $cf_cv_gnatprep_opt_t" >&5
-+echo "$as_me:20871: result: $cf_cv_gnatprep_opt_t" >&5
- echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
- test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
- 
--echo "$as_me:20800: checking if GNAT supports generics" >&5
-+echo "$as_me:20875: checking if GNAT supports generics" >&5
- echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
- case $cf_gnat_version in
- (3.[1-9]*|[4-9].*)
-@@ -20807,7 +20882,7 @@
- 	cf_gnat_generics=no
- 	;;
- esac
--echo "$as_me:20810: result: $cf_gnat_generics" >&5
-+echo "$as_me:20885: result: $cf_gnat_generics" >&5
- echo "${ECHO_T}$cf_gnat_generics" >&6
- 
- if test "$cf_gnat_generics" = yes
-@@ -20819,7 +20894,7 @@
- 	cf_generic_objects=
- fi
- 
--echo "$as_me:20822: checking if GNAT supports SIGINT" >&5
-+echo "$as_me:20897: checking if GNAT supports SIGINT" >&5
- echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
- if test "${cf_cv_gnat_sigint+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20867,7 +20942,7 @@
- rm -rf conftest* *~conftest*
- 
- fi
--echo "$as_me:20870: result: $cf_cv_gnat_sigint" >&5
-+echo "$as_me:20945: result: $cf_cv_gnat_sigint" >&5
- echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
- 
- if test $cf_cv_gnat_sigint = yes ; then
-@@ -20880,7 +20955,7 @@
- cf_gnat_projects=no
- 
- if test "$enable_gnat_projects" != no ; then
--echo "$as_me:20883: checking if GNAT supports project files" >&5
-+echo "$as_me:20958: checking if GNAT supports project files" >&5
- echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
- case $cf_gnat_version in
- (3.[0-9]*)
-@@ -20940,15 +21015,15 @@
- 	esac
- 	;;
- esac
--echo "$as_me:20943: result: $cf_gnat_projects" >&5
-+echo "$as_me:21018: result: $cf_gnat_projects" >&5
- echo "${ECHO_T}$cf_gnat_projects" >&6
- fi # enable_gnat_projects
- 
- if test $cf_gnat_projects = yes
- then
--	echo "$as_me:20949: checking if GNAT supports libraries" >&5
-+	echo "$as_me:21024: checking if GNAT supports libraries" >&5
- echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
--	echo "$as_me:20951: result: $cf_gnat_libraries" >&5
-+	echo "$as_me:21026: result: $cf_gnat_libraries" >&5
- echo "${ECHO_T}$cf_gnat_libraries" >&6
- fi
- 
-@@ -20968,7 +21043,7 @@
- 	USE_GNAT_LIBRARIES="#"
- fi
- 
--echo "$as_me:20971: checking for ada-compiler" >&5
-+echo "$as_me:21046: checking for ada-compiler" >&5
- echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
- 
- # Check whether --with-ada-compiler or --without-ada-compiler was given.
-@@ -20979,12 +21054,12 @@
-   cf_ada_compiler=gnatmake
- fi;
- 
--echo "$as_me:20982: result: $cf_ada_compiler" >&5
-+echo "$as_me:21057: result: $cf_ada_compiler" >&5
- echo "${ECHO_T}$cf_ada_compiler" >&6
- 
- 			cf_ada_package=terminal_interface
- 
--echo "$as_me:20987: checking for ada-include" >&5
-+echo "$as_me:21062: checking for ada-include" >&5
- echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
- 
- # Check whether --with-ada-include or --without-ada-include was given.
-@@ -21020,7 +21095,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:21023: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:21098: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -21029,10 +21104,10 @@
- fi
- eval ADA_INCLUDE="$withval"
- 
--echo "$as_me:21032: result: $ADA_INCLUDE" >&5
-+echo "$as_me:21107: result: $ADA_INCLUDE" >&5
- echo "${ECHO_T}$ADA_INCLUDE" >&6
- 
--echo "$as_me:21035: checking for ada-objects" >&5
-+echo "$as_me:21110: checking for ada-objects" >&5
- echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
- 
- # Check whether --with-ada-objects or --without-ada-objects was given.
-@@ -21068,7 +21143,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:21071: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:21146: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -21077,10 +21152,10 @@
- fi
- eval ADA_OBJECTS="$withval"
- 
--echo "$as_me:21080: result: $ADA_OBJECTS" >&5
-+echo "$as_me:21155: result: $ADA_OBJECTS" >&5
- echo "${ECHO_T}$ADA_OBJECTS" >&6
- 
--echo "$as_me:21083: checking if an Ada95 shared-library should be built" >&5
-+echo "$as_me:21158: checking if an Ada95 shared-library should be built" >&5
- echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
- 
- # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
-@@ -21090,7 +21165,7 @@
- else
-   with_ada_sharedlib=no
- fi;
--echo "$as_me:21093: result: $with_ada_sharedlib" >&5
-+echo "$as_me:21168: result: $with_ada_sharedlib" >&5
- echo "${ECHO_T}$with_ada_sharedlib" >&6
- 
- ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
-@@ -21113,13 +21188,13 @@
- 
- # do this "late" to avoid conflict with header-checks
- if test "x$with_widec" = xyes ; then
--	echo "$as_me:21116: checking for wchar_t" >&5
-+	echo "$as_me:21191: checking for wchar_t" >&5
- echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6
- if test "${ac_cv_type_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 21122 "configure"
-+#line 21197 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21134,16 +21209,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21137: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21212: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21140: \$? = $ac_status" >&5
-+  echo "$as_me:21215: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21143: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21218: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21146: \$? = $ac_status" >&5
-+  echo "$as_me:21221: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_wchar_t=yes
- else
-@@ -21153,10 +21228,10 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:21156: result: $ac_cv_type_wchar_t" >&5
-+echo "$as_me:21231: result: $ac_cv_type_wchar_t" >&5
- echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
- 
--echo "$as_me:21159: checking size of wchar_t" >&5
-+echo "$as_me:21234: checking size of wchar_t" >&5
- echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6
- if test "${ac_cv_sizeof_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -21165,7 +21240,7 @@
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
--#line 21168 "configure"
-+#line 21243 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21177,21 +21252,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21180: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21255: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21183: \$? = $ac_status" >&5
-+  echo "$as_me:21258: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21186: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21261: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21189: \$? = $ac_status" >&5
-+  echo "$as_me:21264: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=0 ac_mid=0
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 21194 "configure"
-+#line 21269 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21203,16 +21278,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21206: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21281: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21209: \$? = $ac_status" >&5
-+  echo "$as_me:21284: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21212: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21287: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21215: \$? = $ac_status" >&5
-+  echo "$as_me:21290: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid; break
- else
-@@ -21228,7 +21303,7 @@
- ac_hi=-1 ac_mid=-1
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 21231 "configure"
-+#line 21306 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21240,16 +21315,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21243: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21318: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21246: \$? = $ac_status" >&5
-+  echo "$as_me:21321: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21249: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21324: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21252: \$? = $ac_status" >&5
-+  echo "$as_me:21327: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=$ac_mid; break
- else
-@@ -21265,7 +21340,7 @@
- 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 21268 "configure"
-+#line 21343 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21277,16 +21352,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21280: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21355: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21283: \$? = $ac_status" >&5
-+  echo "$as_me:21358: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21286: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21361: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21289: \$? = $ac_status" >&5
-+  echo "$as_me:21364: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid
- else
-@@ -21299,12 +21374,12 @@
- ac_cv_sizeof_wchar_t=$ac_lo
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:21302: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:21377: 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 21307 "configure"
-+#line 21382 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21320,15 +21395,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:21323: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21398: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:21326: \$? = $ac_status" >&5
-+  echo "$as_me:21401: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:21328: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21403: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21331: \$? = $ac_status" >&5
-+  echo "$as_me:21406: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_wchar_t=`cat conftest.val`
- else
-@@ -21344,7 +21419,7 @@
-   ac_cv_sizeof_wchar_t=0
- fi
- fi
--echo "$as_me:21347: result: $ac_cv_sizeof_wchar_t" >&5
-+echo "$as_me:21422: result: $ac_cv_sizeof_wchar_t" >&5
- echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
- cat >>confdefs.h <&5
-+echo "$as_me:21440: checking for library subsets" >&5
- echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
- LIB_SUBSETS=
- 
-@@ -21404,7 +21479,7 @@
- test "x$with_widec"     = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
- test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
- 
--echo "$as_me:21407: result: $LIB_SUBSETS" >&5
-+echo "$as_me:21482: result: $LIB_SUBSETS" >&5
- echo "${ECHO_T}$LIB_SUBSETS" >&6
- 
- ### Construct the list of include-directories to be generated
-@@ -21435,7 +21510,7 @@
- fi
- 
- ### Build up pieces for makefile rules
--echo "$as_me:21438: checking default library suffix" >&5
-+echo "$as_me:21513: checking default library suffix" >&5
- echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -21446,10 +21521,10 @@
- 	(shared)  DFT_ARG_SUFFIX=''   ;;
- 	esac
- 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
--echo "$as_me:21449: result: $DFT_ARG_SUFFIX" >&5
-+echo "$as_me:21524: result: $DFT_ARG_SUFFIX" >&5
- echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
- 
--echo "$as_me:21452: checking default library-dependency suffix" >&5
-+echo "$as_me:21527: checking default library-dependency suffix" >&5
- echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
- 
- 	case X$DFT_LWR_MODEL in
-@@ -21507,10 +21582,10 @@
- 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
- 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
- 	fi
--echo "$as_me:21510: result: $DFT_DEP_SUFFIX" >&5
-+echo "$as_me:21585: result: $DFT_DEP_SUFFIX" >&5
- echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
- 
--echo "$as_me:21513: checking default object directory" >&5
-+echo "$as_me:21588: checking default object directory" >&5
- echo $ECHO_N "checking default object directory... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -21526,11 +21601,11 @@
- 			DFT_OBJ_SUBDIR='obj_s' ;;
- 		esac
- 	esac
--echo "$as_me:21529: result: $DFT_OBJ_SUBDIR" >&5
-+echo "$as_me:21604: result: $DFT_OBJ_SUBDIR" >&5
- echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
- 
- if test "x$cf_with_cxx" = xyes ; then
--echo "$as_me:21533: checking c++ library-dependency suffix" >&5
-+echo "$as_me:21608: checking c++ library-dependency suffix" >&5
- echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
- if test "$with_libtool" != "no"; then
- 	# libtool thinks it can make c++ shared libraries (perhaps only g++)
-@@ -21598,7 +21673,7 @@
- 	fi
- 
- fi
--echo "$as_me:21601: result: $CXX_LIB_SUFFIX" >&5
-+echo "$as_me:21676: result: $CXX_LIB_SUFFIX" >&5
- echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
- 
- fi
-@@ -21771,19 +21846,19 @@
- 
- if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
- then
--	echo "$as_me:21774: checking if linker supports switching between static/dynamic" >&5
-+	echo "$as_me:21849: checking if linker supports switching between static/dynamic" >&5
- echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6
- 
- 	rm -f libconftest.a
- 	cat >conftest.$ac_ext <
- int cf_ldflags_static(FILE *fp) { return fflush(fp); }
- EOF
--	if { (eval echo "$as_me:21783: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:21858: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21786: \$? = $ac_status" >&5
-+  echo "$as_me:21861: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 		( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null
- 		( eval $RANLIB libconftest.a ) 2>&5 >/dev/null
-@@ -21794,10 +21869,10 @@
- 
- 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 21797 "configure"
-+#line 21872 "configure"
- #include "confdefs.h"
- 
--#line 21800 "configure"
-+#line 21875 "configure"
- #include 
- int cf_ldflags_static(FILE *fp);
- 
-@@ -21812,16 +21887,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:21815: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21890: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:21818: \$? = $ac_status" >&5
-+  echo "$as_me:21893: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:21821: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21896: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21824: \$? = $ac_status" >&5
-+  echo "$as_me:21899: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	# some linkers simply ignore the -dynamic
-@@ -21844,7 +21919,7 @@
- 	rm -f libconftest.*
- 	LIBS="$cf_save_LIBS"
- 
--	echo "$as_me:21847: result: $cf_ldflags_static" >&5
-+	echo "$as_me:21922: result: $cf_ldflags_static" >&5
- echo "${ECHO_T}$cf_ldflags_static" >&6
- 
- 	if test $cf_ldflags_static != yes
-@@ -21860,7 +21935,7 @@
- 	;;
- esac
- 
--echo "$as_me:21863: checking where we will install curses.h" >&5
-+echo "$as_me:21938: checking where we will install curses.h" >&5
- echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
- 
- includesubdir=
-@@ -21870,7 +21945,7 @@
- then
- 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
- fi
--echo "$as_me:21873: result: ${includedir}${includesubdir}" >&5
-+echo "$as_me:21948: result: ${includedir}${includesubdir}" >&5
- echo "${ECHO_T}${includedir}${includesubdir}" >&6
- 
- ### Resolve a conflict between normal and wide-curses by forcing applications
-@@ -21878,7 +21953,7 @@
- if test "$with_overwrite" != no ; then
- if test "$NCURSES_LIBUTF8" = 1 ; then
- 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
--	{ echo "$as_me:21881: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
-+	{ echo "$as_me:21956: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
- echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
- fi
- fi
-@@ -21896,7 +21971,7 @@
- ### Construct the list of subdirectories for which we'll customize makefiles
- ### with the appropriate compile-rules.
- 
--echo "$as_me:21899: checking for src modules" >&5
-+echo "$as_me:21974: checking for src modules" >&5
- echo $ECHO_N "checking for src modules... $ECHO_C" >&6
- 
- # dependencies and linker-arguments for test-programs
-@@ -21961,7 +22036,7 @@
- 		fi
- 	fi
- done
--echo "$as_me:21964: result: $cf_cv_src_modules" >&5
-+echo "$as_me:22039: result: $cf_cv_src_modules" >&5
- echo "${ECHO_T}$cf_cv_src_modules" >&6
- 
- TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
-@@ -22181,7 +22256,7 @@
- 
- # Extract the first word of "tic", so it can be a program name with args.
- set dummy tic; ac_word=$2
--echo "$as_me:22184: checking for $ac_word" >&5
-+echo "$as_me:22259: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_TIC_PATH+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -22198,7 +22273,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   if $as_executable_p "$ac_dir/$ac_word"; then
-    ac_cv_path_TIC_PATH="$ac_dir/$ac_word"
--   echo "$as_me:22201: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:22276: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -22210,10 +22285,10 @@
- TIC_PATH=$ac_cv_path_TIC_PATH
- 
- if test -n "$TIC_PATH"; then
--  echo "$as_me:22213: result: $TIC_PATH" >&5
-+  echo "$as_me:22288: result: $TIC_PATH" >&5
- echo "${ECHO_T}$TIC_PATH" >&6
- else
--  echo "$as_me:22216: result: no" >&5
-+  echo "$as_me:22291: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -22221,7 +22296,7 @@
- then
- 	if test "$TIC_PATH" = unknown
- 	then
--		{ echo "$as_me:22224: WARNING: no tic program found for fallbacks" >&5
-+		{ echo "$as_me:22299: WARNING: no tic program found for fallbacks" >&5
- echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
- 	fi
- fi
-@@ -22247,7 +22322,7 @@
- 	(*-D_XOPEN_SOURCE_EXTENDED*)
- 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
- 
--echo "${as_me:-configure}:22250: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
-+echo "${as_me:-configure}:22325: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
- 
- 		CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
- 		CPPFLAGS=`echo "x$CPPFLAGS" | sed -e  's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'`
-@@ -22258,7 +22333,7 @@
- 
- # Help to automatically enable the extended curses features when using either
- # the *-config or the ".pc" files by adding defines.
--echo "$as_me:22261: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
-+echo "$as_me:22336: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
- echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6
- PKG_CFLAGS=
- for cf_loop1 in $CPPFLAGS_after_XOPEN
-@@ -22274,7 +22349,7 @@
- 	done
- 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
- done
--echo "$as_me:22277: result: $PKG_CFLAGS" >&5
-+echo "$as_me:22352: result: $PKG_CFLAGS" >&5
- echo "${ECHO_T}$PKG_CFLAGS" >&6
- 
- # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
-@@ -22331,7 +22406,7 @@
- 	cf_filter_syms=$cf_dft_filter_syms
- 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_version" 1>&6
- 
--echo "${as_me:-configure}:22334: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
-+echo "${as_me:-configure}:22409: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
- 
- fi
- 
-@@ -22433,7 +22508,7 @@
- : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ echo "$as_me:22436: creating $CONFIG_STATUS" >&5
-+{ echo "$as_me:22511: creating $CONFIG_STATUS" >&5
- echo "$as_me: creating $CONFIG_STATUS" >&6;}
- cat >$CONFIG_STATUS <<_ACEOF
- #! $SHELL
-@@ -22565,7 +22640,7 @@
- cat >>$CONFIG_STATUS <&5
- echo "$as_me: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&2;}
-@@ -22628,7 +22703,7 @@
-     ac_need_defaults=false;;
- 
-   # This is an error.
--  -*) { { echo "$as_me:22631: error: unrecognized option: $1
-+  -*) { { echo "$as_me:22706: 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;}
-@@ -22647,7 +22722,7 @@
- ## Running config.status.  ##
- ## ----------------------- ##
- 
--This file was extended by $as_me 2.52.20141204, executed with
-+This file was extended by $as_me 2.52.20150926, executed with
-   CONFIG_FILES    = $CONFIG_FILES
-   CONFIG_HEADERS  = $CONFIG_HEADERS
-   CONFIG_LINKS    = $CONFIG_LINKS
-@@ -22746,7 +22821,7 @@
-   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
--  *) { { echo "$as_me:22749: error: invalid argument: $ac_config_target" >&5
-+  *) { { echo "$as_me:22824: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
-@@ -23115,10 +23190,28 @@
-       # These are the two extra sed commands mentioned above.
-       (echo ':t
-   /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-+      # It is possible to make a multiline substitution using escaped newlines.
-+      # Ensure that we do not split the substitution between script fragments.
-+      ac_BEG=$ac_end
-+      ac_END=`expr $ac_end + $ac_max_sed_lines`
-+      sed "1,${ac_BEG}d; ${ac_END}p; q" $tmp/subs.sed >$tmp/subs.next
-+      if test -s $tmp/subs.next; then
-+        grep '^s,@[^@,][^@,]*@,.*\\$' $tmp/subs.next >$tmp/subs.edit
-+        if test ! -s $tmp/subs.edit; then
-+          grep "^s,@[^@,][^@,]*@,.*,;t t$" $tmp/subs.next >$tmp/subs.edit
-+          if test ! -s $tmp/subs.edit; then
-+            if test $ac_beg -gt 1; then
-+              ac_end=`expr $ac_end - 1`
-+              continue
-+            fi
-+          fi
-+        fi
-+      fi
-+
-       if test -z "$ac_sed_cmds"; then
--  	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-+        ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-       else
--  	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-+        ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-       fi
-       ac_sed_frag=`expr $ac_sed_frag + 1`
-       ac_beg=$ac_end
-@@ -23201,7 +23294,7 @@
-   esac
- 
-   if test x"$ac_file" != x-; then
--    { echo "$as_me:23204: creating $ac_file" >&5
-+    { echo "$as_me:23297: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
-     rm -f "$ac_file"
-   fi
-@@ -23219,7 +23312,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:23222: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:23315: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -23232,7 +23325,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:23235: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:23328: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -23248,7 +23341,7 @@
-       if test -n "$ac_seen"; then
-         ac_used=`grep '@datarootdir@' $ac_item`
-         if test -z "$ac_used"; then
--          { echo "$as_me:23251: WARNING: datarootdir was used implicitly but not set:
-+          { echo "$as_me:23344: 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;}
-@@ -23257,7 +23350,7 @@
-       fi
-       ac_seen=`grep '${datarootdir}' $ac_item`
-       if test -n "$ac_seen"; then
--        { echo "$as_me:23260: WARNING: datarootdir was used explicitly but not set:
-+        { echo "$as_me:23353: 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;}
-@@ -23294,7 +23387,7 @@
-             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:23297: WARNING: Variable $ac_name is used but was not set:
-+              { echo "$as_me:23390: 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;}
-@@ -23305,7 +23398,7 @@
-     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:23308: WARNING: Some variables may not be substituted:
-+      { echo "$as_me:23401: WARNING: Some variables may not be substituted:
- $ac_seen" >&5
- echo "$as_me: WARNING: Some variables may not be substituted:
- $ac_seen" >&2;}
-@@ -23354,7 +23447,7 @@
-   * )   ac_file_in=$ac_file.in ;;
-   esac
- 
--  test x"$ac_file" != x- && { echo "$as_me:23357: creating $ac_file" >&5
-+  test x"$ac_file" != x- && { echo "$as_me:23450: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
- 
-   # First look for the input files in the build tree, otherwise in the
-@@ -23365,7 +23458,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:23368: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:23461: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -23378,7 +23471,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:23381: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:23474: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -23436,7 +23529,7 @@
-   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:23439: $ac_file is unchanged" >&5
-+      { echo "$as_me:23532: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
-     else
-       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-@@ -23774,7 +23867,7 @@
- 				(cygdll|msysdll|mingw)
- 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
- 
--echo "${as_me:-configure}:23777: testing overriding CXX_MODEL to SHARED ..." 1>&5
-+echo "${as_me:-configure}:23870: testing overriding CXX_MODEL to SHARED ..." 1>&5
- 
- 					with_shared_cxx=yes
- 					;;
-Index: dist.mk
-Prereq:  1.1072 
---- ncurses-6.0-20150926+/dist.mk	2015-09-26 18:50:05.000000000 +0000
-+++ ncurses-6.0-20151010/dist.mk	2015-10-10 17:06:12.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1072 2015/09/26 18:50:05 tom Exp $
-+# $Id: dist.mk,v 1.1073 2015/10/10 17:06:12 tom Exp $
- # Makefile for creating ncurses distributions.
- #
- # This only needs to be used directly as a makefile by developers, but
-@@ -37,7 +37,7 @@
- # These define the major/minor/patch versions of ncurses.
- NCURSES_MAJOR = 6
- NCURSES_MINOR = 0
--NCURSES_PATCH = 20150926
-+NCURSES_PATCH = 20151010
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: ncurses/base/MKlib_gen.sh
-Prereq:  1.51 
---- ncurses-6.0-20150926+/ncurses/base/MKlib_gen.sh	2015-08-10 08:56:39.000000000 +0000
-+++ ncurses-6.0-20151010/ncurses/base/MKlib_gen.sh	2015-10-10 19:36:47.000000000 +0000
-@@ -2,7 +2,7 @@
- #
- # MKlib_gen.sh -- generate sources from curses.h macro definitions
- #
--# ($Id: MKlib_gen.sh,v 1.51 2015/08/10 08:56:39 tom Exp $)
-+# ($Id: MKlib_gen.sh,v 1.52 2015/10/10 19:36:47 tom Exp $)
- #
- ##############################################################################
- # Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.                #
-@@ -177,6 +177,7 @@
- if test "$USE" = generated ; then
- cat >$ED4 <$ED4 <  Sat, 26 Sep 2015 14:50:05 -0400
-+ -- Thomas E. Dickey   Sat, 10 Oct 2015 13:06:12 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20150926+/package/debian-mingw64/changelog	2015-09-26 18:50:05.000000000 +0000
-+++ ncurses-6.0-20151010/package/debian-mingw64/changelog	2015-10-10 17:06:12.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150926) unstable; urgency=low
-+ncurses6 (6.0+20151010) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 26 Sep 2015 14:50:05 -0400
-+ -- Thomas E. Dickey   Sat, 10 Oct 2015 13:06:12 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.0-20150926+/package/debian/changelog	2015-09-26 18:50:05.000000000 +0000
-+++ ncurses-6.0-20151010/package/debian/changelog	2015-10-10 17:06:12.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150926) unstable; urgency=low
-+ncurses6 (6.0+20151010) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 26 Sep 2015 14:50:05 -0400
-+ -- Thomas E. Dickey   Sat, 10 Oct 2015 13:06:12 -0400
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.125 
---- ncurses-6.0-20150926+/package/mingw-ncurses.nsi	2015-09-26 18:50:05.000000000 +0000
-+++ ncurses-6.0-20151010/package/mingw-ncurses.nsi	2015-10-10 17:06:12.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.125 2015/09/26 18:50:05 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.126 2015/10/10 17:06:12 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "0"
- !define VERSION_YYYY  "2015"
--!define VERSION_MMDD  "0926"
-+!define VERSION_MMDD  "1010"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20150926+/package/mingw-ncurses.spec	2015-09-26 18:50:05.000000000 +0000
-+++ ncurses-6.0-20151010/package/mingw-ncurses.spec	2015-10-10 17:06:12.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.0
--Release: 20150926
-+Release: 20151010
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20150926+/package/ncurses.spec	2015-09-26 18:50:05.000000000 +0000
-+++ ncurses-6.0-20151010/package/ncurses.spec	2015-10-10 17:06:12.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.0
--Release: 20150926
-+Release: 20151010
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: test/aclocal.m4
-Prereq:  1.120 
---- ncurses-6.0-20150926+/test/aclocal.m4	2015-08-08 14:27:27.000000000 +0000
-+++ ncurses-6.0-20151010/test/aclocal.m4	2015-10-10 20:30:48.000000000 +0000
-@@ -26,7 +26,7 @@
- dnl authorization.                                                           *
- dnl***************************************************************************
- dnl
--dnl $Id: aclocal.m4,v 1.120 2015/08/08 14:27:27 tom Exp $
-+dnl $Id: aclocal.m4,v 1.121 2015/10/10 20:30:48 tom Exp $
- dnl
- dnl Author: Thomas E. Dickey
- dnl
-@@ -1297,6 +1297,34 @@
- 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_OPENPTY version: 5 updated: 2015/09/12 14:46:50
-+dnl ---------------
-+dnl Check for openpty() function, along with  header.  It may need the
-+dnl "util" library as well.
-+AC_DEFUN([CF_FUNC_OPENPTY],
-+[
-+AC_CHECK_LIB(util,openpty,cf_cv_lib_util=yes,cf_cv_lib_util=no)
-+AC_CACHE_CHECK(for openpty header,cf_cv_func_openpty,[
-+	cf_save_LIBS="$LIBS"
-+	test $cf_cv_lib_util = yes && { CF_ADD_LIB(util) }
-+	for cf_header in pty.h libutil.h util.h
-+	do
-+	AC_TRY_LINK([
-+#include <$cf_header>
-+],[
-+	int x = openpty((int *)0, (int *)0, (char *)0,
-+				   (struct termios *)0, (struct winsize *)0);
-+],[
-+		cf_cv_func_openpty=$cf_header
-+		break
-+],[
-+		cf_cv_func_openpty=no
-+])
-+	done
-+	LIBS="$cf_save_LIBS"
-+])
-+])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_GCC_ATTRIBUTES version: 17 updated: 2015/04/12 15:39:00
- dnl -----------------
- dnl Test for availability of useful gcc __attribute__ directives to quiet
-Index: test/configure
---- ncurses-6.0-20150926+/test/configure	2015-08-08 20:32:27.000000000 +0000
-+++ ncurses-6.0-20151010/test/configure	2015-10-10 20:30:58.000000000 +0000
-@@ -1,6 +1,6 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by Autoconf 2.52.20141204.
-+# Generated by Autoconf 2.52.20150926.
- #
- # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
- # Free Software Foundation, Inc.
-@@ -748,7 +748,7 @@
- running configure, to aid debugging if configure makes a mistake.
- 
- It was created by $as_me, which was
--generated by GNU Autoconf 2.52.20141204.  Invocation command line was
-+generated by GNU Autoconf 2.52.20150926.  Invocation command line was
- 
-   $ $0 $@
- 
-@@ -14849,7 +14849,169 @@
- #define HAVE_SYS_TIME_SELECT 1
- EOF
- 
--echo "$as_me:14852: checking for function curses_version" >&5
-+# special check for test/ditto.c
-+
-+echo "$as_me:14854: checking for openpty in -lutil" >&5
-+echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
-+if test "${ac_cv_lib_util_openpty+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lutil  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 14862 "configure"
-+#include "confdefs.h"
-+
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+   builtin and then its argument prototype would still apply.  */
-+char openpty ();
-+int
-+main ()
-+{
-+openpty ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:14881: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:14884: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:14887: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:14890: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_util_openpty=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_lib_util_openpty=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:14901: result: $ac_cv_lib_util_openpty" >&5
-+echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
-+if test $ac_cv_lib_util_openpty = yes; then
-+  cf_cv_lib_util=yes
-+else
-+  cf_cv_lib_util=no
-+fi
-+
-+echo "$as_me:14909: checking for openpty header" >&5
-+echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
-+if test "${cf_cv_func_openpty+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+	cf_save_LIBS="$LIBS"
-+	test $cf_cv_lib_util = yes && {
-+cf_add_libs="-lutil"
-+# Filter out duplicates - this happens with badly-designed ".pc" files...
-+for cf_add_1lib in $LIBS
-+do
-+	for cf_add_2lib in $cf_add_libs
-+	do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
-+		then
-+			cf_add_1lib=
-+			break
-+		fi
-+	done
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+done
-+LIBS="$cf_add_libs"
-+ }
-+	for cf_header in pty.h libutil.h util.h
-+	do
-+	cat >conftest.$ac_ext <<_ACEOF
-+#line 14936 "configure"
-+#include "confdefs.h"
-+
-+#include <$cf_header>
-+
-+int
-+main ()
-+{
-+
-+	int x = openpty((int *)0, (int *)0, (char *)0,
-+				   (struct termios *)0, (struct winsize *)0);
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:14953: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:14956: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:14959: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:14962: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+
-+		cf_cv_func_openpty=$cf_header
-+		break
-+
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+
-+		cf_cv_func_openpty=no
-+
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+	done
-+	LIBS="$cf_save_LIBS"
-+
-+fi
-+echo "$as_me:14980: result: $cf_cv_func_openpty" >&5
-+echo "${ECHO_T}$cf_cv_func_openpty" >&6
-+
-+if test "$cf_cv_func_openpty" != no ; then
-+
-+cat >>confdefs.h <
-+EOF
-+
-+cat >>confdefs.h <<\EOF
-+#define USE_XTERM_PTY 1
-+EOF
-+
-+	if test "x$cf_cv_lib_util" = xyes ; then
-+
-+cf_add_libs="-lutil"
-+# Filter out duplicates - this happens with badly-designed ".pc" files...
-+for cf_add_1lib in $TEST_LIBS
-+do
-+	for cf_add_2lib in $cf_add_libs
-+	do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
-+		then
-+			cf_add_1lib=
-+			break
-+		fi
-+	done
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+done
-+TEST_LIBS="$cf_add_libs"
-+
-+	fi
-+fi
-+
-+echo "$as_me:15014: 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
-@@ -14859,7 +15021,7 @@
-   cf_cv_func_curses_version=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14862 "configure"
-+#line 15024 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -14872,15 +15034,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:14875: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15037: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14878: \$? = $ac_status" >&5
-+  echo "$as_me:15040: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:14880: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15042: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14883: \$? = $ac_status" >&5
-+  echo "$as_me:15045: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_curses_version=yes
- 
-@@ -14895,14 +15057,14 @@
- fi
- rm -f core
- fi
--echo "$as_me:14898: result: $cf_cv_func_curses_version" >&5
-+echo "$as_me:15060: result: $cf_cv_func_curses_version" >&5
- echo "${ECHO_T}$cf_cv_func_curses_version" >&6
- test "$cf_cv_func_curses_version" = yes &&
- cat >>confdefs.h <<\EOF
- #define HAVE_CURSES_VERSION 1
- EOF
- 
--echo "$as_me:14905: checking for alternate character set array" >&5
-+echo "$as_me:15067: checking for alternate character set array" >&5
- echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6
- if test "${cf_cv_curses_acs_map+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14912,7 +15074,7 @@
- for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 14915 "configure"
-+#line 15077 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -14928,16 +15090,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14931: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15093: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14934: \$? = $ac_status" >&5
-+  echo "$as_me:15096: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14937: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15099: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14940: \$? = $ac_status" >&5
-+  echo "$as_me:15102: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_curses_acs_map=$name; break
- else
-@@ -14948,7 +15110,7 @@
- done
- 
- fi
--echo "$as_me:14951: result: $cf_cv_curses_acs_map" >&5
-+echo "$as_me:15113: result: $cf_cv_curses_acs_map" >&5
- echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
- 
- test "$cf_cv_curses_acs_map" != unknown &&
-@@ -14958,7 +15120,7 @@
- 
- if test "$cf_enable_widec" = yes; then
- 
--echo "$as_me:14961: checking for wide alternate character set array" >&5
-+echo "$as_me:15123: checking for wide alternate character set array" >&5
- echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6
- if test "${cf_cv_curses_wacs_map+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14968,7 +15130,7 @@
- 	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 14971 "configure"
-+#line 15133 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -14984,16 +15146,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14987: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15149: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14990: \$? = $ac_status" >&5
-+  echo "$as_me:15152: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14993: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15155: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14996: \$? = $ac_status" >&5
-+  echo "$as_me:15158: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_curses_wacs_map=$name
- 	 break
-@@ -15004,7 +15166,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	done
- fi
--echo "$as_me:15007: result: $cf_cv_curses_wacs_map" >&5
-+echo "$as_me:15169: result: $cf_cv_curses_wacs_map" >&5
- echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
- 
- test "$cf_cv_curses_wacs_map" != unknown &&
-@@ -15012,7 +15174,7 @@
- #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
- EOF
- 
--echo "$as_me:15015: checking for wide alternate character constants" >&5
-+echo "$as_me:15177: checking for wide alternate character constants" >&5
- echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6
- if test "${cf_cv_curses_wacs_symbols+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15022,7 +15184,7 @@
- if test "$cf_cv_curses_wacs_map" != unknown
- then
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 15025 "configure"
-+#line 15187 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -15039,16 +15201,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15042: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15204: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15045: \$? = $ac_status" >&5
-+  echo "$as_me:15207: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15048: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15210: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15051: \$? = $ac_status" >&5
-+  echo "$as_me:15213: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_curses_wacs_symbols=yes
- else
-@@ -15058,7 +15220,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- else
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 15061 "configure"
-+#line 15223 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -15074,16 +15236,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15077: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15239: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15080: \$? = $ac_status" >&5
-+  echo "$as_me:15242: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15083: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15245: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15086: \$? = $ac_status" >&5
-+  echo "$as_me:15248: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_curses_wacs_symbols=yes
- else
-@@ -15094,7 +15256,7 @@
- fi
- 
- fi
--echo "$as_me:15097: result: $cf_cv_curses_wacs_symbols" >&5
-+echo "$as_me:15259: result: $cf_cv_curses_wacs_symbols" >&5
- echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
- 
- test "$cf_cv_curses_wacs_symbols" != no &&
-@@ -15104,10 +15266,10 @@
- 
- fi
- 
--echo "$as_me:15107: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:15269: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
- echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 15110 "configure"
-+#line 15272 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -15125,16 +15287,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15128: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15290: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15131: \$? = $ac_status" >&5
-+  echo "$as_me:15293: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15134: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15296: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15137: \$? = $ac_status" >&5
-+  echo "$as_me:15299: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -15143,7 +15305,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:15146: result: $cf_result" >&5
-+echo "$as_me:15308: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- if test $cf_result = yes ; then
- 
-@@ -15164,14 +15326,14 @@
- if test "$cf_enable_widec" = yes; then
- 
- # This is needed on Tru64 5.0 to declare mbstate_t
--echo "$as_me:15167: checking if we must include wchar.h to declare mbstate_t" >&5
-+echo "$as_me:15329: 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_mbstate_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 15174 "configure"
-+#line 15336 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -15189,23 +15351,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15192: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15354: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15195: \$? = $ac_status" >&5
-+  echo "$as_me:15357: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15198: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15360: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15201: \$? = $ac_status" >&5
-+  echo "$as_me:15363: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_mbstate_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 15208 "configure"
-+#line 15370 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -15224,16 +15386,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15227: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15389: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15230: \$? = $ac_status" >&5
-+  echo "$as_me:15392: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15233: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15395: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15236: \$? = $ac_status" >&5
-+  echo "$as_me:15398: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_mbstate_t=yes
- else
-@@ -15245,7 +15407,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:15248: result: $cf_cv_mbstate_t" >&5
-+echo "$as_me:15410: result: $cf_cv_mbstate_t" >&5
- echo "${ECHO_T}$cf_cv_mbstate_t" >&6
- 
- if test "$cf_cv_mbstate_t" = yes ; then
-@@ -15268,14 +15430,14 @@
- fi
- 
- # This is needed on Tru64 5.0 to declare wchar_t
--echo "$as_me:15271: checking if we must include wchar.h to declare wchar_t" >&5
-+echo "$as_me:15433: checking if we must include wchar.h to declare wchar_t" >&5
- echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
- if test "${cf_cv_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 15278 "configure"
-+#line 15440 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -15293,23 +15455,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15296: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15458: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15299: \$? = $ac_status" >&5
-+  echo "$as_me:15461: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15302: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15464: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15305: \$? = $ac_status" >&5
-+  echo "$as_me:15467: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 15312 "configure"
-+#line 15474 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -15328,16 +15490,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15331: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15493: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15334: \$? = $ac_status" >&5
-+  echo "$as_me:15496: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15337: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15499: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15340: \$? = $ac_status" >&5
-+  echo "$as_me:15502: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_t=yes
- else
-@@ -15349,7 +15511,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:15352: result: $cf_cv_wchar_t" >&5
-+echo "$as_me:15514: result: $cf_cv_wchar_t" >&5
- echo "${ECHO_T}$cf_cv_wchar_t" >&6
- 
- if test "$cf_cv_wchar_t" = yes ; then
-@@ -15372,14 +15534,14 @@
- fi
- 
- # This is needed on Tru64 5.0 to declare wint_t
--echo "$as_me:15375: checking if we must include wchar.h to declare wint_t" >&5
-+echo "$as_me:15537: checking if we must include wchar.h to declare wint_t" >&5
- echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
- if test "${cf_cv_wint_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 15382 "configure"
-+#line 15544 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -15397,23 +15559,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15400: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15562: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15403: \$? = $ac_status" >&5
-+  echo "$as_me:15565: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15406: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15568: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15409: \$? = $ac_status" >&5
-+  echo "$as_me:15571: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wint_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 15416 "configure"
-+#line 15578 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -15432,16 +15594,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15435: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15597: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15438: \$? = $ac_status" >&5
-+  echo "$as_me:15600: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15441: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15603: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15444: \$? = $ac_status" >&5
-+  echo "$as_me:15606: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wint_t=yes
- else
-@@ -15453,7 +15615,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:15456: result: $cf_cv_wint_t" >&5
-+echo "$as_me:15618: result: $cf_cv_wint_t" >&5
- echo "${ECHO_T}$cf_cv_wint_t" >&6
- 
- if test "$cf_cv_wint_t" = yes ; then
-@@ -15477,10 +15639,10 @@
- 
- 	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
- 
--echo "$as_me:15480: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:15642: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
- echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 15483 "configure"
-+#line 15645 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -15498,16 +15660,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15501: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15663: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15504: \$? = $ac_status" >&5
-+  echo "$as_me:15666: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15507: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15669: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15510: \$? = $ac_status" >&5
-+  echo "$as_me:15672: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -15516,7 +15678,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:15519: result: $cf_result" >&5
-+echo "$as_me:15681: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- if test $cf_result = yes ; then
- 
-@@ -15538,10 +15700,10 @@
- 
- 	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
- 
--echo "$as_me:15541: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:15703: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
- echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 15544 "configure"
-+#line 15706 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -15559,16 +15721,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15562: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15724: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15565: \$? = $ac_status" >&5
-+  echo "$as_me:15727: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15568: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15730: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15571: \$? = $ac_status" >&5
-+  echo "$as_me:15733: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -15577,7 +15739,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:15580: result: $cf_result" >&5
-+echo "$as_me:15742: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- if test $cf_result = yes ; then
- 
-@@ -15599,10 +15761,10 @@
- 
- 	if test "$NCURSES_OK_WINT_T" = 0 ; then
- 
--echo "$as_me:15602: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:15764: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
- echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 15605 "configure"
-+#line 15767 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -15620,16 +15782,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15623: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15785: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15626: \$? = $ac_status" >&5
-+  echo "$as_me:15788: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15629: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15791: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15632: \$? = $ac_status" >&5
-+  echo "$as_me:15794: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -15638,7 +15800,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:15641: result: $cf_result" >&5
-+echo "$as_me:15803: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- if test $cf_result = yes ; then
- 
-@@ -15659,11 +15821,11 @@
- 	fi
- fi
- 
--echo "$as_me:15662: checking for data ospeed declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:15824: checking for data ospeed declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
- echo $ECHO_N "checking for data ospeed declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 15666 "configure"
-+#line 15828 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -15691,16 +15853,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15694: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15856: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15697: \$? = $ac_status" >&5
-+  echo "$as_me:15859: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15700: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15862: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15703: \$? = $ac_status" >&5
-+  echo "$as_me:15865: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -15709,7 +15871,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:15712: result: $cf_result" >&5
-+echo "$as_me:15874: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 
- if test $cf_result = yes ; then
-@@ -15721,14 +15883,14 @@
- EOF
- 
- else
--	echo "$as_me:15724: checking for data ospeed in library" >&5
-+	echo "$as_me:15886: checking for data ospeed in library" >&5
- echo $ECHO_N "checking for data ospeed in library... $ECHO_C" >&6
- 	# BSD linkers insist on making weak linkage, but resolve at runtime.
- 	if test "$cross_compiling" = yes; then
- 
- 	# cross-compiling
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 15731 "configure"
-+#line 15893 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -15761,16 +15923,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15764: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15926: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15767: \$? = $ac_status" >&5
-+  echo "$as_me:15929: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15770: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15932: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15773: \$? = $ac_status" >&5
-+  echo "$as_me:15935: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -15782,7 +15944,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15785 "configure"
-+#line 15947 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -15808,15 +15970,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:15811: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15973: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15814: \$? = $ac_status" >&5
-+  echo "$as_me:15976: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:15816: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15978: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15819: \$? = $ac_status" >&5
-+  echo "$as_me:15981: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -15827,7 +15989,7 @@
- fi
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--	echo "$as_me:15830: result: $cf_result" >&5
-+	echo "$as_me:15992: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 	if test $cf_result = yes ; then
- 
-@@ -15840,11 +16002,11 @@
- 	fi
- fi
- 
--echo "$as_me:15843: checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:16005: checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
- echo $ECHO_N "checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 15847 "configure"
-+#line 16009 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -15872,16 +16034,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15875: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16037: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15878: \$? = $ac_status" >&5
-+  echo "$as_me:16040: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15881: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16043: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15884: \$? = $ac_status" >&5
-+  echo "$as_me:16046: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -15890,7 +16052,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:15893: result: $cf_result" >&5
-+echo "$as_me:16055: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 
- if test $cf_result = yes ; then
-@@ -15902,14 +16064,14 @@
- EOF
- 
- else
--	echo "$as_me:15905: checking for data boolnames in library" >&5
-+	echo "$as_me:16067: checking for data boolnames in library" >&5
- echo $ECHO_N "checking for data boolnames in library... $ECHO_C" >&6
- 	# BSD linkers insist on making weak linkage, but resolve at runtime.
- 	if test "$cross_compiling" = yes; then
- 
- 	# cross-compiling
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 15912 "configure"
-+#line 16074 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -15942,16 +16104,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15945: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16107: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15948: \$? = $ac_status" >&5
-+  echo "$as_me:16110: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15951: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16113: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15954: \$? = $ac_status" >&5
-+  echo "$as_me:16116: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -15963,7 +16125,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15966 "configure"
-+#line 16128 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -15989,15 +16151,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:15992: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16154: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15995: \$? = $ac_status" >&5
-+  echo "$as_me:16157: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:15997: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16159: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16000: \$? = $ac_status" >&5
-+  echo "$as_me:16162: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -16008,7 +16170,7 @@
- fi
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--	echo "$as_me:16011: result: $cf_result" >&5
-+	echo "$as_me:16173: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 	if test $cf_result = yes ; then
- 
-@@ -16021,11 +16183,11 @@
- 	fi
- fi
- 
--echo "$as_me:16024: checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:16186: checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
- echo $ECHO_N "checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16028 "configure"
-+#line 16190 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -16053,16 +16215,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16056: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16218: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16059: \$? = $ac_status" >&5
-+  echo "$as_me:16221: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16062: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16224: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16065: \$? = $ac_status" >&5
-+  echo "$as_me:16227: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -16071,7 +16233,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:16074: result: $cf_result" >&5
-+echo "$as_me:16236: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 
- if test $cf_result = yes ; then
-@@ -16083,14 +16245,14 @@
- EOF
- 
- else
--	echo "$as_me:16086: checking for data boolfnames in library" >&5
-+	echo "$as_me:16248: checking for data boolfnames in library" >&5
- echo $ECHO_N "checking for data boolfnames in library... $ECHO_C" >&6
- 	# BSD linkers insist on making weak linkage, but resolve at runtime.
- 	if test "$cross_compiling" = yes; then
- 
- 	# cross-compiling
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16093 "configure"
-+#line 16255 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -16123,16 +16285,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16126: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16288: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16129: \$? = $ac_status" >&5
-+  echo "$as_me:16291: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16132: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16294: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16135: \$? = $ac_status" >&5
-+  echo "$as_me:16297: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -16144,7 +16306,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16147 "configure"
-+#line 16309 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -16170,15 +16332,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16173: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16335: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16176: \$? = $ac_status" >&5
-+  echo "$as_me:16338: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16178: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16340: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16181: \$? = $ac_status" >&5
-+  echo "$as_me:16343: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -16189,7 +16351,7 @@
- fi
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--	echo "$as_me:16192: result: $cf_result" >&5
-+	echo "$as_me:16354: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 	if test $cf_result = yes ; then
- 
-@@ -16204,7 +16366,7 @@
- 
- if ( test "$GCC" = yes || test "$GXX" = yes )
- then
--echo "$as_me:16207: checking if you want to turn on gcc warnings" >&5
-+echo "$as_me:16369: 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.
-@@ -16221,7 +16383,7 @@
- 	with_warnings=no
- 
- fi;
--echo "$as_me:16224: result: $with_warnings" >&5
-+echo "$as_me:16386: result: $with_warnings" >&5
- echo "${ECHO_T}$with_warnings" >&6
- if test "$with_warnings" = "yes"
- then
-@@ -16244,10 +16406,10 @@
- EOF
- if test "$GCC" = yes
- then
--	{ echo "$as_me:16247: checking for $CC __attribute__ directives..." >&5
-+	{ echo "$as_me:16409: checking for $CC __attribute__ directives..." >&5
- echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
- cat > conftest.$ac_ext <&5
-+		if { (eval echo "$as_me:16461: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16302: \$? = $ac_status" >&5
-+  echo "$as_me:16464: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:16304: result: ... $cf_attribute" >&5
-+			test -n "$verbose" && echo "$as_me:16466: result: ... $cf_attribute" >&5
- echo "${ECHO_T}... $cf_attribute" >&6
- 			cat conftest.h >>confdefs.h
- 			case $cf_attribute in
-@@ -16365,12 +16527,12 @@
- if test "$GCC" = yes ; then
- 	case $host_os in
- 	(linux*|gnu*)
--		echo "$as_me:16368: checking if this is really Intel C compiler" >&5
-+		echo "$as_me:16530: 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 16373 "configure"
-+#line 16535 "configure"
- #include "confdefs.h"
- 
- int
-@@ -16387,16 +16549,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16390: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16552: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16393: \$? = $ac_status" >&5
-+  echo "$as_me:16555: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16396: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16558: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16399: \$? = $ac_status" >&5
-+  echo "$as_me:16561: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   INTEL_COMPILER=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -we147"
-@@ -16407,7 +16569,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		CFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:16410: result: $INTEL_COMPILER" >&5
-+		echo "$as_me:16572: result: $INTEL_COMPILER" >&5
- echo "${ECHO_T}$INTEL_COMPILER" >&6
- 		;;
- 	esac
-@@ -16416,12 +16578,12 @@
- CLANG_COMPILER=no
- 
- if test "$GCC" = yes ; then
--	echo "$as_me:16419: checking if this is really Clang C compiler" >&5
-+	echo "$as_me:16581: 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 16424 "configure"
-+#line 16586 "configure"
- #include "confdefs.h"
- 
- int
-@@ -16438,16 +16600,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16441: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16603: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16444: \$? = $ac_status" >&5
-+  echo "$as_me:16606: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16447: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16609: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16450: \$? = $ac_status" >&5
-+  echo "$as_me:16612: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   CLANG_COMPILER=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
-@@ -16458,12 +16620,12 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	CFLAGS="$cf_save_CFLAGS"
--	echo "$as_me:16461: result: $CLANG_COMPILER" >&5
-+	echo "$as_me:16623: result: $CLANG_COMPILER" >&5
- echo "${ECHO_T}$CLANG_COMPILER" >&6
- fi
- 
- cat > conftest.$ac_ext <&5
-+	{ echo "$as_me:16645: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS="-Wall"
-@@ -16496,12 +16658,12 @@
- 		wd981
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:16499: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:16661: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16502: \$? = $ac_status" >&5
-+  echo "$as_me:16664: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:16504: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:16666: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
- 		fi
-@@ -16510,7 +16672,7 @@
- 
- elif test "$GCC" = yes
- then
--	{ echo "$as_me:16513: checking for $CC warning options..." >&5
-+	{ echo "$as_me:16675: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS=
-@@ -16534,12 +16696,12 @@
- 		Wundef $cf_gcc_warnings $cf_warn_CONST
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:16537: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:16699: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16540: \$? = $ac_status" >&5
-+  echo "$as_me:16702: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:16542: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:16704: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			case $cf_opt in
- 			(Wcast-qual)
-@@ -16550,7 +16712,7 @@
- 				([34].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:16553: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:16715: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -16560,7 +16722,7 @@
- 				([12].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:16563: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:16725: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -16576,7 +16738,7 @@
- fi
- fi
- 
--echo "$as_me:16579: checking if you want to use dmalloc for testing" >&5
-+echo "$as_me:16741: 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.
-@@ -16593,7 +16755,7 @@
- else
-   with_dmalloc=
- fi;
--echo "$as_me:16596: result: ${with_dmalloc:-no}" >&5
-+echo "$as_me:16758: result: ${with_dmalloc:-no}" >&5
- echo "${ECHO_T}${with_dmalloc:-no}" >&6
- 
- case .$with_cflags in
-@@ -16687,23 +16849,23 @@
- esac
- 
- if test "$with_dmalloc" = yes ; then
--	echo "$as_me:16690: checking for dmalloc.h" >&5
-+	echo "$as_me:16852: 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 16696 "configure"
-+#line 16858 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:16700: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:16862: \"$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:16706: \$? = $ac_status" >&5
-+  echo "$as_me:16868: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -16722,11 +16884,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:16725: result: $ac_cv_header_dmalloc_h" >&5
-+echo "$as_me:16887: 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:16729: checking for dmalloc_debug in -ldmalloc" >&5
-+echo "$as_me:16891: 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
-@@ -16734,7 +16896,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 16737 "configure"
-+#line 16899 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -16753,16 +16915,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16756: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16918: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16759: \$? = $ac_status" >&5
-+  echo "$as_me:16921: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16762: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16924: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16765: \$? = $ac_status" >&5
-+  echo "$as_me:16927: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dmalloc_dmalloc_debug=yes
- else
-@@ -16773,7 +16935,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:16776: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
-+echo "$as_me:16938: 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 <&5
-+echo "$as_me:16953: 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.
-@@ -16805,7 +16967,7 @@
- else
-   with_dbmalloc=
- fi;
--echo "$as_me:16808: result: ${with_dbmalloc:-no}" >&5
-+echo "$as_me:16970: result: ${with_dbmalloc:-no}" >&5
- echo "${ECHO_T}${with_dbmalloc:-no}" >&6
- 
- case .$with_cflags in
-@@ -16899,23 +17061,23 @@
- esac
- 
- if test "$with_dbmalloc" = yes ; then
--	echo "$as_me:16902: checking for dbmalloc.h" >&5
-+	echo "$as_me:17064: 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 16908 "configure"
-+#line 17070 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:16912: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:17074: \"$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:16918: \$? = $ac_status" >&5
-+  echo "$as_me:17080: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -16934,11 +17096,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:16937: result: $ac_cv_header_dbmalloc_h" >&5
-+echo "$as_me:17099: 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:16941: checking for debug_malloc in -ldbmalloc" >&5
-+echo "$as_me:17103: 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
-@@ -16946,7 +17108,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldbmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 16949 "configure"
-+#line 17111 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -16965,16 +17127,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16968: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17130: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16971: \$? = $ac_status" >&5
-+  echo "$as_me:17133: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16974: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17136: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16977: \$? = $ac_status" >&5
-+  echo "$as_me:17139: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dbmalloc_debug_malloc=yes
- else
-@@ -16985,7 +17147,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:16988: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
-+echo "$as_me:17150: 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 <&5
-+echo "$as_me:17165: checking if you want to use valgrind for testing" >&5
- echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
- 
- # Check whether --with-valgrind or --without-valgrind was given.
-@@ -17017,7 +17179,7 @@
- else
-   with_valgrind=
- fi;
--echo "$as_me:17020: result: ${with_valgrind:-no}" >&5
-+echo "$as_me:17182: result: ${with_valgrind:-no}" >&5
- echo "${ECHO_T}${with_valgrind:-no}" >&6
- 
- case .$with_cflags in
-@@ -17110,7 +17272,7 @@
- 	;;
- esac
- 
--echo "$as_me:17113: checking if you want to perform memory-leak testing" >&5
-+echo "$as_me:17275: checking if you want to perform memory-leak testing" >&5
- echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
- 
- # Check whether --enable-leaks or --disable-leaks was given.
-@@ -17120,7 +17282,7 @@
- else
-   : ${with_no_leaks:=no}
- fi;
--echo "$as_me:17123: result: $with_no_leaks" >&5
-+echo "$as_me:17285: result: $with_no_leaks" >&5
- echo "${ECHO_T}$with_no_leaks" >&6
- 
- if test "$with_no_leaks" = yes ; then
-@@ -17136,7 +17298,7 @@
- fi
- 
- LD_RPATH_OPT=
--echo "$as_me:17139: checking for an rpath option" >&5
-+echo "$as_me:17301: checking for an rpath option" >&5
- echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
- case $cf_cv_system_name in
- (irix*)
-@@ -17167,12 +17329,12 @@
- (*)
- 	;;
- esac
--echo "$as_me:17170: result: $LD_RPATH_OPT" >&5
-+echo "$as_me:17332: result: $LD_RPATH_OPT" >&5
- echo "${ECHO_T}$LD_RPATH_OPT" >&6
- 
- case "x$LD_RPATH_OPT" in
- (x-R*)
--	echo "$as_me:17175: checking if we need a space after rpath option" >&5
-+	echo "$as_me:17337: 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"
- 
-@@ -17193,7 +17355,7 @@
- LIBS="$cf_add_libs"
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 17196 "configure"
-+#line 17358 "configure"
- #include "confdefs.h"
- 
- int
-@@ -17205,16 +17367,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17208: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17370: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17211: \$? = $ac_status" >&5
-+  echo "$as_me:17373: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17214: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17376: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17217: \$? = $ac_status" >&5
-+  echo "$as_me:17379: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_rpath_space=no
- else
-@@ -17224,13 +17386,13 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	LIBS="$cf_save_LIBS"
--	echo "$as_me:17227: result: $cf_rpath_space" >&5
-+	echo "$as_me:17389: 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:17233: checking if rpath-hack should be disabled" >&5
-+echo "$as_me:17395: 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.
-@@ -17247,21 +17409,21 @@
- 	cf_disable_rpath_hack=no
- 
- fi;
--echo "$as_me:17250: result: $cf_disable_rpath_hack" >&5
-+echo "$as_me:17412: 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:17254: checking for updated LDFLAGS" >&5
-+echo "$as_me:17416: 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:17257: result: maybe" >&5
-+	echo "$as_me:17419: 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:17264: checking for $ac_word" >&5
-+echo "$as_me:17426: 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
-@@ -17276,7 +17438,7 @@
-   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:17279: found $ac_dir/$ac_word" >&5
-+echo "$as_me:17441: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -17284,10 +17446,10 @@
- fi
- cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
- if test -n "$cf_ldd_prog"; then
--  echo "$as_me:17287: result: $cf_ldd_prog" >&5
-+  echo "$as_me:17449: result: $cf_ldd_prog" >&5
- echo "${ECHO_T}$cf_ldd_prog" >&6
- else
--  echo "$as_me:17290: result: no" >&5
-+  echo "$as_me:17452: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -17301,7 +17463,7 @@
- 		cf_rpath_oops=
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17304 "configure"
-+#line 17466 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -17313,16 +17475,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17316: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17478: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17319: \$? = $ac_status" >&5
-+  echo "$as_me:17481: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17322: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17484: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17325: \$? = $ac_status" >&5
-+  echo "$as_me:17487: \$? = $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`
-@@ -17350,7 +17512,7 @@
- 					then
- 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
- 
--echo "${as_me:-configure}:17353: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
-+echo "${as_me:-configure}:17515: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
- 
- 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
- 						break
-@@ -17362,11 +17524,11 @@
- 
- 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:17365: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:17527: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
- 
- test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:17369: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:17531: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
- 
- cf_rpath_dst=
- for cf_rpath_src in $LDFLAGS
-@@ -17403,7 +17565,7 @@
- 			then
- 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
- 
--echo "${as_me:-configure}:17406: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
-+echo "${as_me:-configure}:17568: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
- 
- 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
- 			fi
-@@ -17416,11 +17578,11 @@
- 
- test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:17419: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:17581: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
- 
- test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
- 
--echo "${as_me:-configure}:17423: testing ...checking LIBS $LIBS ..." 1>&5
-+echo "${as_me:-configure}:17585: testing ...checking LIBS $LIBS ..." 1>&5
- 
- cf_rpath_dst=
- for cf_rpath_src in $LIBS
-@@ -17457,7 +17619,7 @@
- 			then
- 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
- 
--echo "${as_me:-configure}:17460: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
-+echo "${as_me:-configure}:17622: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
- 
- 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
- 			fi
-@@ -17470,14 +17632,14 @@
- 
- test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
- 
--echo "${as_me:-configure}:17473: testing ...checked LIBS $LIBS ..." 1>&5
-+echo "${as_me:-configure}:17635: testing ...checked LIBS $LIBS ..." 1>&5
- 
- 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:17477: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:17639: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
- 
- else
--	echo "$as_me:17480: result: no" >&5
-+	echo "$as_me:17642: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -17567,7 +17729,7 @@
- : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ echo "$as_me:17570: creating $CONFIG_STATUS" >&5
-+{ echo "$as_me:17732: creating $CONFIG_STATUS" >&5
- echo "$as_me: creating $CONFIG_STATUS" >&6;}
- cat >$CONFIG_STATUS <<_ACEOF
- #! $SHELL
-@@ -17699,7 +17861,7 @@
- cat >>$CONFIG_STATUS <&5
- echo "$as_me: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&2;}
-@@ -17762,7 +17924,7 @@
-     ac_need_defaults=false;;
- 
-   # This is an error.
--  -*) { { echo "$as_me:17765: error: unrecognized option: $1
-+  -*) { { echo "$as_me:17927: 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;}
-@@ -17781,7 +17943,7 @@
- ## Running config.status.  ##
- ## ----------------------- ##
- 
--This file was extended by $as_me 2.52.20141204, executed with
-+This file was extended by $as_me 2.52.20150926, executed with
-   CONFIG_FILES    = $CONFIG_FILES
-   CONFIG_HEADERS  = $CONFIG_HEADERS
-   CONFIG_LINKS    = $CONFIG_LINKS
-@@ -17812,7 +17974,7 @@
-   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-   "ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ncurses_cfg.h:ncurses_tst.hin" ;;
--  *) { { echo "$as_me:17815: error: invalid argument: $ac_config_target" >&5
-+  *) { { echo "$as_me:17977: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
-@@ -17999,10 +18161,28 @@
-       # These are the two extra sed commands mentioned above.
-       (echo ':t
-   /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-+      # It is possible to make a multiline substitution using escaped newlines.
-+      # Ensure that we do not split the substitution between script fragments.
-+      ac_BEG=$ac_end
-+      ac_END=`expr $ac_end + $ac_max_sed_lines`
-+      sed "1,${ac_BEG}d; ${ac_END}p; q" $tmp/subs.sed >$tmp/subs.next
-+      if test -s $tmp/subs.next; then
-+        grep '^s,@[^@,][^@,]*@,.*\\$' $tmp/subs.next >$tmp/subs.edit
-+        if test ! -s $tmp/subs.edit; then
-+          grep "^s,@[^@,][^@,]*@,.*,;t t$" $tmp/subs.next >$tmp/subs.edit
-+          if test ! -s $tmp/subs.edit; then
-+            if test $ac_beg -gt 1; then
-+              ac_end=`expr $ac_end - 1`
-+              continue
-+            fi
-+          fi
-+        fi
-+      fi
-+
-       if test -z "$ac_sed_cmds"; then
--  	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-+        ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-       else
--  	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-+        ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-       fi
-       ac_sed_frag=`expr $ac_sed_frag + 1`
-       ac_beg=$ac_end
-@@ -18085,7 +18265,7 @@
-   esac
- 
-   if test x"$ac_file" != x-; then
--    { echo "$as_me:18088: creating $ac_file" >&5
-+    { echo "$as_me:18268: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
-     rm -f "$ac_file"
-   fi
-@@ -18103,7 +18283,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:18106: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:18286: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -18116,7 +18296,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:18119: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:18299: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -18132,7 +18312,7 @@
-       if test -n "$ac_seen"; then
-         ac_used=`grep '@datarootdir@' $ac_item`
-         if test -z "$ac_used"; then
--          { echo "$as_me:18135: WARNING: datarootdir was used implicitly but not set:
-+          { echo "$as_me:18315: 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;}
-@@ -18141,7 +18321,7 @@
-       fi
-       ac_seen=`grep '${datarootdir}' $ac_item`
-       if test -n "$ac_seen"; then
--        { echo "$as_me:18144: WARNING: datarootdir was used explicitly but not set:
-+        { echo "$as_me:18324: 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;}
-@@ -18178,7 +18358,7 @@
-             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:18181: WARNING: Variable $ac_name is used but was not set:
-+              { echo "$as_me:18361: 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;}
-@@ -18189,7 +18369,7 @@
-     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:18192: WARNING: Some variables may not be substituted:
-+      { echo "$as_me:18372: WARNING: Some variables may not be substituted:
- $ac_seen" >&5
- echo "$as_me: WARNING: Some variables may not be substituted:
- $ac_seen" >&2;}
-@@ -18238,7 +18418,7 @@
-   * )   ac_file_in=$ac_file.in ;;
-   esac
- 
--  test x"$ac_file" != x- && { echo "$as_me:18241: creating $ac_file" >&5
-+  test x"$ac_file" != x- && { echo "$as_me:18421: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
- 
-   # First look for the input files in the build tree, otherwise in the
-@@ -18249,7 +18429,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:18252: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:18432: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -18262,7 +18442,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:18265: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:18445: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -18320,7 +18500,7 @@
-   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:18323: $ac_file is unchanged" >&5
-+      { echo "$as_me:18503: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
-     else
-       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-Index: test/configure.in
-Prereq:  1.124 
---- ncurses-6.0-20150926+/test/configure.in	2015-08-08 20:24:49.000000000 +0000
-+++ ncurses-6.0-20151010/test/configure.in	2015-10-10 20:23:49.000000000 +0000
-@@ -28,7 +28,7 @@
- dnl
- dnl Author: Thomas E. Dickey 1996, etc.
- dnl
--dnl $Id: configure.in,v 1.124 2015/08/08 20:24:49 tom Exp $
-+dnl $Id: configure.in,v 1.125 2015/10/10 20:23:49 tom Exp $
- dnl This is a simple configuration-script for the ncurses test programs that
- dnl allows the test-directory to be separately configured against a reference
- dnl system (i.e., sysvr4 curses)
-@@ -302,6 +302,17 @@
- test $cf_cv_use_pthreads = yes && AC_DEFINE(USE_PTHREADS)
- 
- CF_SYS_TIME_SELECT
-+
-+# special check for test/ditto.c
-+CF_FUNC_OPENPTY
-+if test "$cf_cv_func_openpty" != no ; then
-+	AC_DEFINE_UNQUOTED(USE_OPENPTY_HEADER,<$cf_cv_func_openpty>,[Define to actual header for openpty function])
-+	AC_DEFINE(USE_XTERM_PTY,1,[Define to 1 if we should assume xterm pseudoterminal interface])
-+	if test "x$cf_cv_lib_util" = xyes ; then
-+		CF_ADD_LIB(util,TEST_LIBS)
-+	fi
-+fi
-+
- CF_FUNC_CURSES_VERSION
- 
- CF_CURSES_ACS_MAP
-Index: test/demo_termcap.c
-Prereq:  1.48 
---- ncurses-6.0-20150926+/test/demo_termcap.c	2015-08-08 20:25:39.000000000 +0000
-+++ ncurses-6.0-20151010/test/demo_termcap.c	2015-10-10 20:41:16.000000000 +0000
-@@ -29,7 +29,7 @@
- /*
-  * Author: Thomas E. Dickey
-  *
-- * $Id: demo_termcap.c,v 1.48 2015/08/08 20:25:39 tom Exp $
-+ * $Id: demo_termcap.c,v 1.49 2015/10/10 20:41:16 tom Exp $
-  *
-  * A simple demo of the termcap interface.
-  */
-@@ -50,6 +50,8 @@
- #include 
- #endif
- 
-+static void failed(const char *) GCC_NORETURN;
-+
- static void
- failed(const char *msg)
- {
-Index: test/demo_terminfo.c
-Prereq:  1.39 
---- ncurses-6.0-20150926+/test/demo_terminfo.c	2015-07-10 23:45:44.000000000 +0000
-+++ ncurses-6.0-20151010/test/demo_terminfo.c	2015-10-10 20:52:41.000000000 +0000
-@@ -29,7 +29,7 @@
- /*
-  * Author: Thomas E. Dickey
-  *
-- * $Id: demo_terminfo.c,v 1.39 2015/07/10 23:45:44 tom Exp $
-+ * $Id: demo_terminfo.c,v 1.40 2015/10/10 20:52:41 tom Exp $
-  *
-  * A simple demo of the terminfo interface.
-  */
-@@ -46,6 +46,8 @@
- #endif
- #endif
- 
-+static void failed(const char *) GCC_NORETURN;
-+
- static void
- failed(const char *msg)
- {
-@@ -914,7 +916,7 @@
- int
- main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
- {
--    printf("This program requires the terminfo functions such as tigetstr\n");
-+    failed("This program requires the terminfo functions such as tigetstr");
-     ExitProgram(EXIT_FAILURE);
- }
- #endif /* HAVE_TIGETSTR */
-Index: test/view.c
-Prereq:  1.94 
---- ncurses-6.0-20150926+/test/view.c	2013-09-28 21:58:42.000000000 +0000
-+++ ncurses-6.0-20151010/test/view.c	2015-10-10 20:03:58.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2012,2013 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2013,2015 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -50,7 +50,7 @@
-  * scroll operation worked, and the refresh() code only had to do a
-  * partial repaint.
-  *
-- * $Id: view.c,v 1.94 2013/09/28 21:58:42 tom Exp $
-+ * $Id: view.c,v 1.95 2015/10/10 20:03:58 tom Exp $
-  */
- 
- #include 
-@@ -188,20 +188,23 @@
-     for (j = k = 0; j < len; j++) {
- #if USE_WIDEC_SUPPORT
- 	rc = (size_t) check_mbytes(wch, src + j, len - j, state);
--	if (rc == (size_t) -1 || rc == (size_t) -2)
-+	if (rc == (size_t) -1 || rc == (size_t) -2) {
- 	    break;
-+	}
- 	j += rc - 1;
--	if ((width = wcwidth(wch)) < 0)
--	    break;
--	if ((width > 0 && l > 0) || l == CCHARW_MAX) {
-+	width = wcwidth(wch);
-+	if (width == 0) {
-+	    if (l == 0) {
-+		wstr[l++] = L' ';
-+	    }
-+	} else if ((l > 0) || (l == CCHARW_MAX)) {
- 	    wstr[l] = L'\0';
- 	    l = 0;
--	    if (setcchar(dst + k, wstr, 0, 0, NULL) != OK)
-+	    if (setcchar(dst + k, wstr, 0, 0, NULL) != OK) {
- 		break;
-+	    }
- 	    ++k;
- 	}
--	if (width == 0 && l == 0)
--	    wstr[l++] = L' ';
- 	wstr[l++] = wch;
- #else
- 	dst[k++] = (chtype) UChar(src[j]);
-@@ -329,10 +332,11 @@
- 	/* convert tabs and nonprinting chars so that shift will work properly */
- 	for (s = buf, d = temp, col = 0; (*d = *s) != '\0'; s++) {
- 	    if (*d == '\r') {
--		if (s[1] == '\n')
-+		if (s[1] == '\n') {
- 		    continue;
--		else
-+		} else {
- 		    break;
-+		}
- 	    }
- 	    if (*d == '\n') {
- 		*d = '\0';
diff --git a/ncurses-6.0-20151024.patch b/ncurses-6.0-20151024.patch
deleted file mode 100644
index 61f922f..0000000
--- a/ncurses-6.0-20151024.patch
+++ /dev/null
@@ -1,975 +0,0 @@
-# ncurses 6.0 - patch 20151024 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.0 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.0 can be found at
-# 	ftp://invisible-island.net/ncurses/6.0
-#	http://invisible-mirror.net/archives/ncurses/6.0 
-#
-# ------------------------------------------------------------------------------
-# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20151024.patch.gz
-# patch by Thomas E. Dickey 
-# created  Sun Oct 25 00:51:43 UTC 2015
-# ------------------------------------------------------------------------------
-# INSTALL                          |    4 -
-# NEWS                             |   23 ++++++
-# VERSION                          |    2 
-# aclocal.m4                       |    8 +-
-# config.guess                     |   14 ++--
-# config.sub                       |   11 ++-
-# configure                        |    8 +-
-# configure.in                     |    6 -
-# dist.mk                          |    4 -
-# doc/html/man/captoinfo.1m.html   |    2 
-# doc/html/man/clear.1.html        |    2 
-# doc/html/man/curs_attr.3x.html   |    4 -
-# doc/html/man/form.3x.html        |    2 
-# doc/html/man/infocmp.1m.html     |    2 
-# doc/html/man/infotocap.1m.html   |    2 
-# doc/html/man/menu.3x.html        |    2 
-# doc/html/man/ncurses.3x.html     |    2 
-# doc/html/man/panel.3x.html       |    2 
-# doc/html/man/tabs.1.html         |    2 
-# doc/html/man/terminfo.5.html     |    2 
-# doc/html/man/tic.1m.html         |    2 
-# doc/html/man/toe.1m.html         |    2 
-# doc/html/man/tput.1.html         |    2 
-# doc/html/man/tset.1.html         |    2 
-# man/curs_attr.3x                 |    4 -
-# misc/terminfo.src                |  124 ++++++++++++++++++++++++++++---------
-# ncurses/tty/MKexpanded.sh        |    6 -
-# package/debian-mingw/changelog   |    4 -
-# package/debian-mingw64/changelog |    4 -
-# package/debian/changelog         |    4 -
-# package/mingw-ncurses.nsi        |    4 -
-# package/mingw-ncurses.spec       |    2 
-# package/ncurses.spec             |    2 
-# test/ncurses.c                   |   26 +++----
-# 34 files changed, 195 insertions(+), 97 deletions(-)
-# ------------------------------------------------------------------------------
-Index: INSTALL
-Prereq:  1.193 
---- ncurses-6.0-20151017+/INSTALL	2015-09-26 21:34:14.000000000 +0000
-+++ ncurses-6.0-20151024/INSTALL	2015-10-24 19:03:42.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: INSTALL,v 1.193 2015/09/26 21:34:14 tom Exp $
-+-- $Id: INSTALL,v 1.194 2015/10/24 19:03:42 Tomas.Cech Exp $
- ---------------------------------------------------------------------
-              How to install Ncurses/Terminfo on your system
- ---------------------------------------------------------------------
-@@ -978,7 +978,7 @@
- 	copying the man-page for each alias.
- 
-     --with-manpage-tbl
--	Tell the configure script that you with to preprocess the manpages
-+	Tell the configure script that you wish to preprocess the manpages
- 	by running them through tbl to generate tables understandable by
- 	nroff.
- 
-Index: NEWS
-Prereq:  1.2509 
---- ncurses-6.0-20151017+/NEWS	2015-10-17 22:02:46.000000000 +0000
-+++ ncurses-6.0-20151024/NEWS	2015-10-25 00:17:28.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.2509 2015/10/17 22:02:46 tom Exp $
-+-- $Id: NEWS,v 1.2516 2015/10/25 00:17:28 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,27 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20151024
-+	+ modify MKexpanded.c to update the expansion of a temporary filename
-+	  to "expanded.c", for use in trace statements.
-+	+ modify layout of b/B tests in test/ncurses.c to allow for additional
-+	  annotation on the right margin; some terminals with partial support
-+	  did not display well.
-+	+ fix typo in curs_attr.3x (patch by Sven Joachim).
-+	+ fix typo in INSTALL (patch by Tomas Cech).
-+	+ improve configure check for setting WILDCARD_SYMS variable; on ppc64
-+	  the variable is in the Data section rather than Text (patch by Michel
-+	  Normand).
-+	+ using configure option "--without-fallbacks" incorrectly caused
-+	  FALLBACK_LIST to be set to "no" (patch by Tomas Cech).
-+	+ updated minitel entries to fix kel problem with emacs, and add
-+	  minitel1b-nb (Alexandre Montaron).
-+	+ reviewed/updated nsterm entry Terminal.app in OSX -TD
-+	+ replace some dead URLs in comments with equivalents from the
-+	  Internet Archive -TD
-+	+ update config.guess, config.sub from
-+		http://git.savannah.gnu.org/cgit/config.git
-+
- 20151017
- 	+ modify ncurses/Makefile.in to sort keys.list in POSIX locale
- 	  (Debian #801864, patch by Esa Peuha).
-Index: VERSION
---- ncurses-6.0-20151017+/VERSION	2015-10-17 20:29:47.000000000 +0000
-+++ ncurses-6.0-20151024/VERSION	2015-10-24 13:10:18.000000000 +0000
-@@ -1 +1 @@
--5:0:9	6.0	20151017
-+5:0:9	6.0	20151024
-Index: aclocal.m4
-Prereq:  1.774 
---- ncurses-6.0-20151017+/aclocal.m4	2015-10-17 23:05:09.000000000 +0000
-+++ ncurses-6.0-20151024/aclocal.m4	2015-10-25 00:51:20.000000000 +0000
-@@ -28,7 +28,7 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: aclocal.m4,v 1.774 2015/10/17 23:05:09 tom Exp $
-+dnl $Id: aclocal.m4,v 1.779 2015/10/25 00:51:20 tom Exp $
- dnl Macros used in NCURSES auto-configuration script.
- dnl
- dnl These macros are maintained separately from NCURSES.  The copyright on
-@@ -7524,7 +7524,7 @@
- 	[USE_VALGRIND])
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_WITH_VERSIONED_SYMS version: 5 updated: 2015/04/17 21:13:04
-+dnl CF_WITH_VERSIONED_SYMS version: 7 updated: 2015/10/24 20:50:26
- dnl ----------------------
- dnl Use this when building shared library with ELF, to markup symbols with the
- dnl version identifier from the given input file.  Generally that identifier is
-@@ -7638,8 +7638,8 @@
- 		# compile source, make library
- 		if make -f conftest.mk 2>&AC_FD_CC >/dev/null
- 		then
--			# test for missing symbol
--			cf_missing=`nm -P conftest.so 2>&AC_FD_CC |fgrep _ismissing | egrep '[[ 	]]T[[ 	]]'`
-+			# test for missing symbol in either Data or Text section
-+			cf_missing=`nm -P conftest.so 2>&AC_FD_CC |fgrep _ismissing | egrep '[[ 	]][[DT]][[ 	]]'`
- 			test -n "$cf_missing" && WILDCARD_SYMS=yes
- 		fi
- 		AC_MSG_RESULT($WILDCARD_SYMS)
-Index: config.guess
---- ncurses-6.0-20151017+/config.guess	2015-05-02 11:52:27.000000000 +0000
-+++ ncurses-6.0-20151024/config.guess	2015-10-24 18:37:54.000000000 +0000
-@@ -2,7 +2,7 @@
- # Attempt to guess a canonical system name.
- #   Copyright 1992-2015 Free Software Foundation, Inc.
- 
--timestamp='2015-03-04'
-+timestamp='2015-10-21'
- 
- # 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
-@@ -221,7 +221,7 @@
- 		release='-gnu'
- 		;;
- 	    *)
--		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-+		release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
- 		;;
- 	esac
- 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-@@ -249,6 +249,9 @@
-     *:MirBSD:*:*)
- 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
- 	exit ;;
-+    *:Sortix:*:*)
-+	echo ${UNAME_MACHINE}-unknown-sortix
-+	exit ;;
-     alpha:OSF1:*:*)
- 	case $UNAME_RELEASE in
- 	*4.0)
-@@ -962,6 +965,9 @@
-     ia64:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- 	exit ;;
-+    k1om:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+	exit ;;
-     m32r*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- 	exit ;;
-@@ -1038,7 +1044,7 @@
- 	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
- 	exit ;;
-     x86_64:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
- 	exit ;;
-     xtensa*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-@@ -1117,7 +1123,7 @@
- 	# uname -m prints for DJGPP always 'pc', but it prints nothing about
- 	# the processor, so we play safe by assuming i586.
- 	# Note: whatever this is, it MUST be the same as what config.sub
--	# prints for the "djgpp" host, or else GDB configury will decide that
-+	# prints for the "djgpp" host, or else GDB configure will decide that
- 	# this is a cross-build.
- 	echo i586-pc-msdosdjgpp
- 	exit ;;
-Index: config.sub
---- ncurses-6.0-20151017+/config.sub	2015-05-02 11:52:04.000000000 +0000
-+++ ncurses-6.0-20151024/config.sub	2015-10-24 18:37:37.000000000 +0000
-@@ -2,7 +2,7 @@
- # Configuration validation subroutine script.
- #   Copyright 1992-2015 Free Software Foundation, Inc.
- 
--timestamp='2015-03-08'
-+timestamp='2015-08-20'
- 
- # 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
-@@ -255,6 +255,7 @@
- 	| arc | arceb \
- 	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
- 	| avr | avr32 \
-+	| ba \
- 	| be32 | be64 \
- 	| bfin \
- 	| c4x | c8051 | clipper \
-@@ -305,7 +306,7 @@
- 	| riscv32 | riscv64 \
- 	| rl78 | rx \
- 	| score \
--	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- 	| sh64 | sh64le \
- 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
- 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-@@ -376,6 +377,7 @@
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
- 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
- 	| avr-* | avr32-* \
-+	| ba-* \
- 	| be32-* | be64-* \
- 	| bfin-* | bs2000-* \
- 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-@@ -428,12 +430,13 @@
- 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
- 	| pyramid-* \
-+	| riscv32-* | riscv64-* \
- 	| rl78-* | romp-* | rs6000-* | rx-* \
- 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
- 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
- 	| sparclite-* \
--	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
-+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
- 	| tahoe-* \
- 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
- 	| tile*-* \
-@@ -1376,7 +1379,7 @@
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- 	      | -sym* | -kopensolaris* | -plan9* \
- 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
--	      | -aos* | -aros* | -cloudabi* \
-+	      | -aos* | -aros* | -cloudabi* | -sortix* \
- 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-Index: configure
---- ncurses-6.0-20151017+/configure	2015-10-17 23:05:27.000000000 +0000
-+++ ncurses-6.0-20151024/configure	2015-10-24 22:43:05.000000000 +0000
-@@ -1,5 +1,5 @@
- #! /bin/sh
--# From configure.in Revision: 1.620 .
-+# From configure.in Revision: 1.621 .
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by Autoconf 2.52.20150926.
- #
-@@ -6663,8 +6663,8 @@
- 		# compile source, make library
- 		if make -f conftest.mk 2>&5 >/dev/null
- 		then
--			# test for missing symbol
--			cf_missing=`nm -P conftest.so 2>&5 |fgrep _ismissing | egrep '[ 	]T[ 	]'`
-+			# test for missing symbol in either Data or Text section
-+			cf_missing=`nm -P conftest.so 2>&5 |fgrep _ismissing | egrep '[ 	][DT][ 	]'`
- 			test -n "$cf_missing" && WILDCARD_SYMS=yes
- 		fi
- 		echo "$as_me:6670: result: $WILDCARD_SYMS" >&5
-@@ -7060,7 +7060,7 @@
- fi;
- echo "$as_me:7061: result: $with_fallback" >&5
- echo "${ECHO_T}$with_fallback" >&6
--FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'`
-+FALLBACK_LIST=`test "$with_fallback" != no && echo "$with_fallback" | sed -e 's/,/ /g'`
- 
- echo "$as_me:7065: checking if you want modern xterm or antique" >&5
- echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6
-Index: configure.in
-Prereq:  1.620 
---- ncurses-6.0-20151017+/configure.in	2015-10-17 23:01:54.000000000 +0000
-+++ ncurses-6.0-20151024/configure.in	2015-10-24 17:57:55.000000000 +0000
-@@ -28,14 +28,14 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: configure.in,v 1.620 2015/10/17 23:01:54 tom Exp $
-+dnl $Id: configure.in,v 1.621 2015/10/24 17:57:55 Tomas.Cech Exp $
- dnl Process this file with autoconf to produce a configure script.
- dnl
- dnl See http://invisible-island.net/autoconf/ for additional information.
- dnl
- dnl ---------------------------------------------------------------------------
- AC_PREREQ(2.52.20030208)
--AC_REVISION($Revision: 1.620 $)
-+AC_REVISION($Revision: 1.621 $)
- AC_INIT(ncurses/base/lib_initscr.c)
- AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
- 
-@@ -566,7 +566,7 @@
- 	[with_fallback=$withval],
- 	[with_fallback=])
- AC_MSG_RESULT($with_fallback)
--FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'`
-+FALLBACK_LIST=`test "$with_fallback" != no && echo "$with_fallback" | sed -e 's/,/ /g'`
- AC_SUBST(FALLBACK_LIST)
- 
- AC_MSG_CHECKING(if you want modern xterm or antique)
-Index: dist.mk
-Prereq:  1.1074 
---- ncurses-6.0-20151017+/dist.mk	2015-10-17 20:29:47.000000000 +0000
-+++ ncurses-6.0-20151024/dist.mk	2015-10-24 13:10:18.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1074 2015/10/17 20:29:47 tom Exp $
-+# $Id: dist.mk,v 1.1075 2015/10/24 13:10:18 tom Exp $
- # Makefile for creating ncurses distributions.
- #
- # This only needs to be used directly as a makefile by developers, but
-@@ -37,7 +37,7 @@
- # These define the major/minor/patch versions of ncurses.
- NCURSES_MAJOR = 6
- NCURSES_MINOR = 0
--NCURSES_PATCH = 20151017
-+NCURSES_PATCH = 20151024
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: doc/html/man/captoinfo.1m.html
---- ncurses-6.0-20151017+/doc/html/man/captoinfo.1m.html	2015-09-26 22:08:45.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/captoinfo.1m.html	2015-10-25 00:21:09.000000000 +0000
-@@ -205,7 +205,7 @@
- 
    SEE ALSO
    -        infocmp(1m), curses(3x), terminfo(5)
- 
--       This describes ncurses version 6.0 (patch 20150926).
-+       This describes ncurses version 6.0 (patch 20151024).
- 
- 
- 
    
-Index: doc/html/man/clear.1.html
---- ncurses-6.0-20151017+/doc/html/man/clear.1.html	2015-09-26 22:08:45.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/clear.1.html	2015-10-25 00:21:09.000000000 +0000
-@@ -71,7 +71,7 @@
- 
    SEE ALSO
    -        tput(1), terminfo(5)
- 
--       This describes ncurses version 6.0 (patch 20150926).
-+       This describes ncurses version 6.0 (patch 20151024).
- 
- 
- 
-Index: doc/html/man/curs_attr.3x.html
---- ncurses-6.0-20151017+/doc/html/man/curs_attr.3x.html	2015-09-26 23:25:17.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/curs_attr.3x.html	2015-10-25 00:23:27.000000000 +0000
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_attr.3x,v 1.41 2015/09/05 21:13:25 tom Exp @
-+  * @Id: curs_attr.3x,v 1.42 2015/10/24 19:10:42 Sven.Joachim Exp @
- -->
- 
- 
-@@ -126,7 +126,7 @@
- 
    attr_set
    -        The attrset routine is actually a legacy feature predating
-        SVr4 curses but kept in X/Open Curses for the same  reason
--       that  SVr4  curses kept it: compatbility.  The routine at-
-+       that  SVr4 curses kept it: compatibility.  The routine at-
-        tr_set provides for passing a color-pair parameter.
- 
-        The remaining attr_* functions operate  exactly  like  the
-Index: doc/html/man/form.3x.html
---- ncurses-6.0-20151017+/doc/html/man/form.3x.html	2015-09-26 22:08:49.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/form.3x.html	2015-10-25 00:21:13.000000000 +0000
-@@ -245,7 +245,7 @@
-        curses(3x) and related pages whose names begin "form_" for
-        detailed descriptions of the entry points.
- 
--       This describes ncurses version 6.0 (patch 20150926).
-+       This describes ncurses version 6.0 (patch 20151024).
- 
- 
- 
-Index: doc/html/man/infocmp.1m.html
---- ncurses-6.0-20151017+/doc/html/man/infocmp.1m.html	2015-09-26 22:08:50.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/infocmp.1m.html	2015-10-25 00:21:14.000000000 +0000
-@@ -487,7 +487,7 @@
- 
-        http://invisible-island.net/ncurses/tctest.html
- 
--       This describes ncurses version 6.0 (patch 20150926).
-+       This describes ncurses version 6.0 (patch 20151024).
- 
- 
- 
    
-Index: doc/html/man/infotocap.1m.html
---- ncurses-6.0-20151017+/doc/html/man/infotocap.1m.html	2015-09-26 22:08:50.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/infotocap.1m.html	2015-10-25 00:21:14.000000000 +0000
-@@ -94,7 +94,7 @@
- 
    SEE ALSO
    -        curses(3x), tic(1m), infocmp(1m), terminfo(5)
- 
--       This describes ncurses version 6.0 (patch 20150926).
-+       This describes ncurses version 6.0 (patch 20151024).
- 
- 
- 
    
-Index: doc/html/man/menu.3x.html
---- ncurses-6.0-20151017+/doc/html/man/menu.3x.html	2015-09-26 22:08:51.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/menu.3x.html	2015-10-25 00:21:15.000000000 +0000
-@@ -227,7 +227,7 @@
-        curses(3x) and related pages whose names begin "menu_" for
-        detailed descriptions of the entry points.
- 
--       This describes ncurses version 6.0 (patch 20150926).
-+       This describes ncurses version 6.0 (patch 20151024).
- 
- 
- 
-Index: doc/html/man/ncurses.3x.html
---- ncurses-6.0-20151017+/doc/html/man/ncurses.3x.html	2015-09-26 22:08:52.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/ncurses.3x.html	2015-10-25 00:21:16.000000000 +0000
-@@ -63,7 +63,7 @@
-        sonable optimization.  This implementation is "new curses"
-        (ncurses) and is the approved replacement for 4.4BSD clas-
-        sic  curses,  which has been discontinued.  This describes
--       ncurses version 6.0 (patch 20150926).
-+       ncurses version 6.0 (patch 20151024).
- 
-        The ncurses library emulates the curses library of  System
-        V  Release  4  UNIX,  and  XPG4 (X/Open Portability Guide)
-Index: doc/html/man/panel.3x.html
---- ncurses-6.0-20151017+/doc/html/man/panel.3x.html	2015-09-26 22:08:52.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/panel.3x.html	2015-10-25 00:21:16.000000000 +0000
-@@ -218,7 +218,7 @@
- 
    SEE ALSO
    -        curses(3x), curs_variables(3x),
- 
--       This describes ncurses version 6.0 (patch 20150926).
-+       This describes ncurses version 6.0 (patch 20151024).
- 
- 
- 
    
-Index: doc/html/man/tabs.1.html
---- ncurses-6.0-20151017+/doc/html/man/tabs.1.html	2015-09-26 22:08:52.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/tabs.1.html	2015-10-25 00:21:16.000000000 +0000
-@@ -168,7 +168,7 @@
- 
    SEE ALSO
    -        tset(1), infocmp(1m), curses(3x), terminfo(5).
- 
--       This describes ncurses version 6.0 (patch 20150926).
-+       This describes ncurses version 6.0 (patch 20151024).
- 
- 
- 
-Index: doc/html/man/terminfo.5.html
---- ncurses-6.0-20151017+/doc/html/man/terminfo.5.html	2015-09-26 22:08:53.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/terminfo.5.html	2015-10-25 00:21:17.000000000 +0000
-@@ -78,7 +78,7 @@
-        nals by giving a set of capabilities which they  have,  by
-        specifying how to perform screen operations, and by speci-
-        fying padding requirements and  initialization  sequences.
--       This describes ncurses version 6.0 (patch 20150926).
-+       This describes ncurses version 6.0 (patch 20151024).
- 
-        Entries in terminfo consist of a sequence of `,' separated
-        fields (embedded commas may be escaped with a backslash or
-Index: doc/html/man/tic.1m.html
---- ncurses-6.0-20151017+/doc/html/man/tic.1m.html	2015-09-26 22:08:53.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/tic.1m.html	2015-10-25 00:21:17.000000000 +0000
-@@ -408,7 +408,7 @@
-        infocmp(1m),    captoinfo(1m),   infotocap(1m),   toe(1m),
-        curses(3x), term(5).  terminfo(5).
- 
--       This describes ncurses version 6.0 (patch 20150926).
-+       This describes ncurses version 6.0 (patch 20151024).
- 
- 
- 
    
-Index: doc/html/man/toe.1m.html
---- ncurses-6.0-20151017+/doc/html/man/toe.1m.html	2015-09-26 22:08:53.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/toe.1m.html	2015-10-25 00:21:17.000000000 +0000
-@@ -122,7 +122,7 @@
-        tic(1m),   infocmp(1m),   captoinfo(1m),    infotocap(1m),
-        curses(3x), terminfo(5).
- 
--       This describes ncurses version 6.0 (patch 20150926).
-+       This describes ncurses version 6.0 (patch 20151024).
- 
- 
- 
-Index: doc/html/man/tput.1.html
---- ncurses-6.0-20151017+/doc/html/man/tput.1.html	2015-09-26 22:08:53.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/tput.1.html	2015-10-25 00:21:17.000000000 +0000
-@@ -338,7 +338,7 @@
- 
    SEE ALSO
    -        clear(1), stty(1), tabs(1), terminfo(5), curs_termcap(3x).
- 
--       This describes ncurses version 6.0 (patch 20150926).
-+       This describes ncurses version 6.0 (patch 20151024).
- 
- 
- 
-Index: doc/html/man/tset.1.html
---- ncurses-6.0-20151017+/doc/html/man/tset.1.html	2015-09-26 22:08:53.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/tset.1.html	2015-10-25 00:21:17.000000000 +0000
-@@ -319,7 +319,7 @@
-        csh(1),   sh(1),   stty(1),   curs_terminfo(3x),   tty(4),
-        terminfo(5), ttys(5), environ(7)
- 
--       This describes ncurses version 6.0 (patch 20150926).
-+       This describes ncurses version 6.0 (patch 20151024).
- 
- 
- 
-Index: man/curs_attr.3x
-Prereq:  1.41 
---- ncurses-6.0-20151017+/man/curs_attr.3x	2015-09-05 21:13:25.000000000 +0000
-+++ ncurses-6.0-20151024/man/curs_attr.3x	2015-10-24 19:10:42.000000000 +0000
-@@ -27,7 +27,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_attr.3x,v 1.41 2015/09/05 21:13:25 tom Exp $
-+.\" $Id: curs_attr.3x,v 1.42 2015/10/24 19:10:42 Sven.Joachim Exp $
- .TH curs_attr 3X ""
- .na
- .hy 0
-@@ -148,7 +148,7 @@
- .SS attr_set
- The \fBattrset\fP routine is actually a legacy feature predating SVr4 curses
- but kept in X/Open Curses for the same reason that SVr4 curses kept it:
--compatbility.
-+compatibility.
- The routine \fBattr_set\fP provides for passing a color-pair parameter.
- .PP
- The remaining \fBattr_\fR* functions operate exactly like the corresponding
-Index: misc/terminfo.src
---- ncurses-6.0-20151017+/misc/terminfo.src	2015-07-25 19:27:20.000000000 +0000
-+++ ncurses-6.0-20151024/misc/terminfo.src	2015-10-24 17:56:55.000000000 +0000
-@@ -6,8 +6,8 @@
- # Report bugs and new terminal descriptions to
- #	bug-ncurses@gnu.org
- #
--#	$Revision: 1.549 $
--#	$Date: 2015/07/25 19:27:20 $
-+#	$Revision: 1.554 $
-+#	$Date: 2015/10/24 16:00:04 $
- #
- # The original header is preserved below for reference.  It is noted that there
- # is a "newer" version which differs in some cosmetic details (but actually
-@@ -1246,9 +1246,50 @@
- nsterm-build343|Terminal.app in OS X 10.10,
- 	kend=\EOF, khome=\EOH, use=nsterm-build326,
- 
-+# reviewed Terminal.app in El Capitan (version 2.6 build 361) -TD
-+# Using vttest:
-+# + no vt52 mode for cursor keys, though vt52 screen works in vttest
-+# + f1-f4 map to pf1-pf4
-+# + no vt220 support aside from DECTCEM and ECH
-+# + there are no protected areas.  Forget about anything above vt220.
-+# + in ECMA-48 cursor movement, VPR and HPR fail.  Others work.
-+# + vttest color 11.6.4 and 11.6.5 (bce for ED/EL and ECH/indexing) are bce
-+# + but bce fails for 11.6.7.2 (test repeat).
-+# + SD (11.6.7.3) also fails, but SL/SR/SU work.
-+# + 11.6.6 (test insert/delete char/line with bce) has several failures.
-+# + normal (not X10 or Highlight tracking) mouse now works.
-+# + mouse any-event works
-+# + mouse button-event works
-+# + in alternate screen:
-+#   mode 47/48 work
-+#   mode 1047 fails to restore cursor position (do not use)
-+#   mode 1049 fails to restore screen contents (do not use)
-+# + dtterm window-modify operations work (some messages are not printed)
-+# + dtterm window-report gives size of window in characters/pixels as
-+#   well as state of window.
-+# Using tack:
-+# + there is no difference between cnorm/cvvis
-+# + has dim/invis/blink (no protect of course)
-+# + most function keys with shift/control modifiers give beep
-+#   (user can configure, but out-of-the-box is what I record)
-+# + shift-F5 is \E[25~ through shift-F12 is \E[34~ (skips \E[30~ between
-+#   F8 and F9).
-+# + kLFT5/kRIT5 work, but not up/down with control-modifier
-+# + kLFT/kRIT work, but not up/down with shift-modifier
-+# + there are a few predefined bindings with Alt, but no clear pattern.
-+# + uses alt-key as UTF-8 "meta" something like xterm altSendsEscape 
-+# Using ncurses test-program with xterm-new:
-+# + no italics
-+# Using xterm's scripts:
-+# + palette for 256-colors is hardcoded.
-+# + no support for "dynamic colors"
-+# + no support for tcap-query.
-+nsterm-build361|Terminal.app in OS X 10.11,
-+	kmous=\E[M, use=nsterm-build343,
-+
- # This is an alias which should always point to the "current" version
- nsterm|Apple_Terminal|AppKit Terminal.app,
--	use=nsterm-build343,
-+	use=nsterm-build361,
- 
- # iTerm.app from http://iterm.sourceforge.net/ is an alternative (and
- # more featureful) terminal emulator for Mac OS X. It is similar
-@@ -6278,7 +6319,7 @@
- #### Pilot Pro Palm-Top
- #
- # Termcap for Top Gun Telnet and SSH on the Palm Pilot.
--# http://www.ai/~iang/TGssh/
-+# https://web.archive.org/web/20051103015726/http://www.ai/~iang/TGssh/
- pilot|tgtelnet|Top Gun Telnet on the Palm Pilot Professional,
- 	OTbs, am, xenl,
- 	cols#39, lines#16,
-@@ -6429,7 +6470,7 @@
- # underline and standout.
- #
- # Since the documentation and terminfo do not agree, see also current code at
--# http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/uts/common/io/tem_safe.c
-+# https://web.archive.org/web/20091231042744/http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/uts/common/io/tem_safe.c
- #
- # That (actually a different driver which "supports" sun-color) also supports
- # these features:
-@@ -9708,7 +9749,8 @@
- # Wyse sales can be reached by phone at 1-800-GET-WYSE.  Tech support is at
- # (800)-800-WYSE (option 5 gets you a human).  There's a Web page at the
- # obvious address, .  They keep terminfo entries at
--# .
-+# https://web.archive.org/web/19970712022641/http://www.wyse.co.uk/support/appnotes/idxappnt.htm
-+# 
- #
- # Wyse bought out Link Technology, Inc. in 1990 and closed it down in 1995.
- # They now own the Qume and Amdek brands, too.  So these are the people to
-@@ -12980,7 +13022,7 @@
- #
- # Update by TD - 2004:
- # Adapted from
--#	http://www.cs.utk.edu/~shuford/terminal/adds_viewpoint_news.txt
-+#	https://web.archive.org/web/19990922005103/http://www.cs.utk.edu/~shuford/terminal/adds_viewpoint_news.txt
- #
- # COMMANDS                        ASCII CODE
- #
-@@ -18456,7 +18498,7 @@
- #
- 
- # See
--#	http://www.minix3.org/manpages/html4/console.html
-+#	https://web.archive.org/web/20120703021949/http://www.minix3.org/manpages/html4/console.html
- minix|minix console (v3),
- 	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
- 	kdch1=\177, kend=\E[Y, kf0=\E[21~, kf1=\E[11~, kf10=\E[21~,
-@@ -18644,16 +18686,19 @@
- minitel1|minitel 1,
- 	am, bw, eslok, hs, hz, msgr,
- 	colors#8, cols#40, lines#24, pairs#8,
--	acsc=+.\,\,./f0g1, bel=^G, blink=\EH, civis=^T, clear=^L,
--	cnorm=^Q, cr=^M, cub1=^H, cud1=^J, cuf1=^I,
--	cup=\037%p1%{65}%+%c%p2%{65}%+%c, cuu1=^K, el=^X,
--	enacs=^Y, fsl=^J, home=^^, ind=^J,
--	is2=\E;`ZQ\E\:iC\E\:iE\021, nel=^M^J, op=\EG,
--	rep=%p1%c\022%p2%{63}%+%c, rev=\E], ri=^K, rmso=\E\\,
--	setf=\E%?%p1%{1}%=%tD%e%p1%{3}%=%tF%e%p1%{4}%=%tA%e%p1%{6}%=%tC%e%p1%{64}%+%c%;,
-+	bel=^G, blink=\EH, civis=^T, clear=^L, cnorm=^Q, cr=^M,
-+	cub1=^H, cud1=^J, cuf1=^I,
-+	cup=\037%p1%'A'%+%c%p2%'A'%+%c, cuu1=^K, el=^X,
-+	flash=\037@A\EW \177\022\177\022P\r\030\n, fsl=^J,
-+	home=^^, ind=^J, is2=\E;`ZQ\E\:iC\E\:iE\021, nel=^M^J,
-+	op=\EG, rep=%p1%c\022%p2%'?'%+%c, rev=\E], ri=^K,
-+	rmso=\E\\,
-+	setf=\E%?%p1%{1}%=%tD%e%p1%{3}%=%tF%e%p1%{4}%=%tA%e%p1%{6}%=%tC%e%p1%'@'%+%c%;,
- 	sgr=%?%p1%t\E]%;%?%p3%t\E]%;%?%p4%t\EH%;,
--	sgr0=\EI\E\\, smso=\E], tsl=\037@%p1%{65}%+%c,
--# is2=Fnct TE, Fnct MR, Fnct CM et pour finir: curseur ON.
-+	sgr0=\EI\E\\, smso=\E], tsl=\037@%p1%'A'%+%c,
-+	u6=\037%c%'A'%-%c%'A'%-, u7=\Ea, .acsc=}#f0g1\,\,+../,
-+	.enacs=^Y, .rs2=^L, .u8=\001Br4\004, .u9=\E9{,
-+# is2=Fnct TE, Fnct ER, Fnct CM et pour finir: curseur ON.
- minitel1b|minitel 1-bistandard (in 40cols mode),
- 	mir,
- 	cub=\E[%p1%dD, cud=\E[%p1%dB, cuf=\E[%p1%dC,
-@@ -18661,21 +18706,37 @@
- 	dl1=\E[M, ed=\E[J, el1=\E[1K, il=\E[%p1%dL, il1=\E[L,
- 	is1=\E;iYA\E;jYC, kclr=\E[2J, kctab=^I, kcub1=\E[D,
- 	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P, kdl1=\E[M,
--	kel=^X, khome=\E[H, kich1=\E[4h, kil1=\E[L, rmir=\E[4l,
--	smir=\E[4h, smkx=\E;iYA\E;jYC, use=minitel1,
--#  posait des problemes (logout en sortant de vi).
-+	khome=\E[H, kich1=\E[4h, kil1=\E[L, rmir=\E[4l, smir=\E[4h,
-+	.ich=\E[%p1%d@, .ich1=\E[@, .kel=^X, .rmkx=\E;jYA,
-+	.smkx=\E;iYA\E;jYC, .u8=\001Cu<\004, use=minitel1,
-+# rmkx posait des problemes (logout en sortant de vi).
- minitel1b-80|minitel 1-bistandard (standard teleinformatique),
- 	am@, bw@, hz@,
- 	colors@, cols#80, it#8, pairs@,
- 	blink=\E[5m, bold=\E[1m, civis=\037@A\024\n,
--	clear=\E[H\E[2J, cnorm=\037@A\021\n, cuf1=\E[C,
-+	clear=\E[H\E[J, cnorm=\037@A\021\n, cuf1=\E[C,
- 	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, el=\E[K, home=\E[H,
--	ht=^I, ind=\ED, is1@, is2@, kent=\EOM, kf0=\EOp, kf1=\EOq,
--	kf2=\EOr, kf3=\EOs, kf4=\EOt, kf5=\EOu, kf6=\EOv, kf7=\EOw,
--	kf8=\EOx, kf9=\EOy, nel=\EE, op@, rc=\E8, rep@, rev=\E[7m,
--	ri=\EM, rmkx@, rmso=\E[27m, rmul=\E[24m, sc=\E7, setf@,
--	sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m,
--	sgr0=\E[m, smkx@, smso=\E[7m, smul=\E[4m, use=minitel1b,
-+	ht=^I, ind=\ED, is1@, is2@, kbs=\EOl, kcan=\EOQ, kent=\EOM,
-+	kf0=\EOp, kf1=\EOq, kf2=\EOr, kf3=\EOs, kf4=\EOt, kf5=\EOu,
-+	kf6=\EOv, kf7=\EOw, kf8=\EOx, kf9=\EOy, khlp=\EOm, knp=\EOn,
-+	kpp=\EOR, krfr=\EOS, nel=\EE, op@, rc=\E8, rep@, rev=\E[7m,
-+	ri=\EM, rmkx@, rmso=\E[27m, rmul=\E[24m, rs2=\E[H\E[J\E[m,
-+	sc=\E7, setf@, sgr@, sgr0=\E[m, smkx@, smso=\E[7m, smul=\E[4m,
-+	u6@, u7@, .acsc=}#f[, .enacs=^O, .mc0=\E[i, .rmacs=^O,
-+	.rs2=\Ec,
-+	.sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m,
-+	.smacs=^N, use=minitel1b,
-+minitel1b-nb|minitel 1b (40cols) noir & blanc sans couleurs avec bold et dim ...,
-+	colors@, pairs@,
-+	acsc=`>a9f!j%k4l/dev/null | \
--	sed -e '1,/^IGNORE$/d' -e 's/^@/#/' -e 's/^#if_/#if /'
-+	sed -e '1,/^IGNORE$/d' -e 's/^@/#/' -e 's/^#if_/#if /' -e "s,$TMP,expanded.c,"
- 
- cat <  Sat, 17 Oct 2015 16:29:47 -0400
-+ -- Thomas E. Dickey   Sat, 24 Oct 2015 09:10:18 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20151017+/package/debian-mingw64/changelog	2015-10-17 20:29:47.000000000 +0000
-+++ ncurses-6.0-20151024/package/debian-mingw64/changelog	2015-10-24 13:10:18.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151017) unstable; urgency=low
-+ncurses6 (6.0+20151024) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 17 Oct 2015 16:29:47 -0400
-+ -- Thomas E. Dickey   Sat, 24 Oct 2015 09:10:18 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.0-20151017+/package/debian/changelog	2015-10-17 20:29:47.000000000 +0000
-+++ ncurses-6.0-20151024/package/debian/changelog	2015-10-24 13:10:18.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151017) unstable; urgency=low
-+ncurses6 (6.0+20151024) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 17 Oct 2015 16:29:47 -0400
-+ -- Thomas E. Dickey   Sat, 24 Oct 2015 09:10:18 -0400
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.127 
---- ncurses-6.0-20151017+/package/mingw-ncurses.nsi	2015-10-17 20:29:47.000000000 +0000
-+++ ncurses-6.0-20151024/package/mingw-ncurses.nsi	2015-10-24 13:10:18.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.127 2015/10/17 20:29:47 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.128 2015/10/24 13:10:18 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "0"
- !define VERSION_YYYY  "2015"
--!define VERSION_MMDD  "1017"
-+!define VERSION_MMDD  "1024"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20151017+/package/mingw-ncurses.spec	2015-10-17 20:29:47.000000000 +0000
-+++ ncurses-6.0-20151024/package/mingw-ncurses.spec	2015-10-24 13:10:18.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.0
--Release: 20151017
-+Release: 20151024
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20151017+/package/ncurses.spec	2015-10-17 20:29:47.000000000 +0000
-+++ ncurses-6.0-20151024/package/ncurses.spec	2015-10-24 13:10:18.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.0
--Release: 20151017
-+Release: 20151024
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: test/ncurses.c
-Prereq:  1.420 
---- ncurses-6.0-20151017+/test/ncurses.c	2015-05-23 23:41:25.000000000 +0000
-+++ ncurses-6.0-20151024/test/ncurses.c	2015-10-24 23:32:57.000000000 +0000
-@@ -40,7 +40,7 @@
-    Author: Eric S. Raymond  1993
-            Thomas E. Dickey (beginning revision 1.27 in 1996).
- 
--$Id: ncurses.c,v 1.420 2015/05/23 23:41:25 tom Exp $
-+$Id: ncurses.c,v 1.421 2015/10/24 23:32:57 tom Exp $
- 
- ***************************************************************************/
- 
-@@ -1255,9 +1255,10 @@
- #define ATTRSTRING_1ST 32	/* ' ' */
- #define ATTRSTRING_END 126	/* '~' */
- 
--#define COL_ATTRSTRING 25
--#define MARGIN_4_ATTRS (COL_ATTRSTRING + 8)
--#define LEN_ATTRSTRING (COLS - MARGIN_4_ATTRS)
-+#define COLS_PRE_ATTRS 5
-+#define COLS_AFT_ATTRS 15
-+#define COL_ATTRSTRING (COLS_PRE_ATTRS + 17)
-+#define LEN_ATTRSTRING (COLS - (COL_ATTRSTRING + COLS_AFT_ATTRS))
- #define MAX_ATTRSTRING (ATTRSTRING_END + 1 - ATTRSTRING_1ST)
- 
- static char attr_test_string[MAX_ATTRSTRING + 1];
-@@ -1415,8 +1416,8 @@
-     chtype test = attr & (chtype) (~A_ALTCHARSET);
- 
-     if (arrow)
--	MvPrintw(row, 5, "-->");
--    MvPrintw(row, 8, "%s mode:", name);
-+	MvPrintw(row, COLS_PRE_ATTRS - 3, "-->");
-+    MvPrintw(row, COLS_PRE_ATTRS, "%s mode:", name);
-     MvPrintw(row, COL_ATTRSTRING - 1, "|");
-     if (skip)
- 	printw("%*s", skip, " ");
-@@ -1661,10 +1662,10 @@
- 				my_list[j].name);
- 	    }
- 
--	    MvPrintw(row, 8,
-+	    MvPrintw(row, COLS_PRE_ATTRS,
- 		     "This terminal does %shave the magic-cookie glitch",
- 		     get_xmc() > -1 ? "" : "not ");
--	    MvPrintw(row + 1, 8, "Enter '?' for help.");
-+	    MvPrintw(row + 1, COLS_PRE_ATTRS, "Enter '?' for help.");
- 	    show_color_attr(fg, bg, tx);
- 	    printw("  ACS (%d)", ac != 0);
- 
-@@ -1802,8 +1803,8 @@
-     chtype test = attr & ~WA_ALTCHARSET;
- 
-     if (arrow)
--	MvPrintw(row, 5, "-->");
--    MvPrintw(row, 8, "%s mode:", name);
-+	MvPrintw(row, COLS_PRE_ATTRS - 3, "-->");
-+    MvPrintw(row, COLS_PRE_ATTRS, "%s mode:", name);
-     MvPrintw(row, COL_ATTRSTRING - 1, "|");
-     if (skip)
- 	printw("%*s", skip, " ");
-@@ -2012,10 +2013,10 @@
- 				     my_list[j].name);
- 	    }
- 
--	    MvPrintw(row, 8,
-+	    MvPrintw(row, COLS_PRE_ATTRS,
- 		     "This terminal does %shave the magic-cookie glitch",
- 		     get_xmc() > -1 ? "" : "not ");
--	    MvPrintw(row + 1, 8, "Enter '?' for help.");
-+	    MvPrintw(row + 1, COLS_PRE_ATTRS, "Enter '?' for help.");
- 	    show_color_attr(fg, bg, tx);
- 	    printw("  ACS (%d)", ac != 0);
- 
-@@ -5523,7 +5524,6 @@
- 	Cannot("cannot create requested pad");
- 	return;
-     }
--
- #ifdef A_COLOR
-     if (colored && use_colors) {
- 	init_pair(1, COLOR_BLACK, COLOR_GREEN);
diff --git a/ncurses-6.0-20151101.patch b/ncurses-6.0-20151101.patch
deleted file mode 100644
index 7cae284..0000000
--- a/ncurses-6.0-20151101.patch
+++ /dev/null
@@ -1,12290 +0,0 @@
-# ncurses 6.0 - patch 20151101 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.0 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.0 can be found at
-# 	ftp://invisible-island.net/ncurses/6.0
-#	http://invisible-mirror.net/archives/ncurses/6.0 
-#
-# ------------------------------------------------------------------------------
-# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20151101.patch.gz
-# patch by Thomas E. Dickey 
-# created  Mon Nov  2 00:38:02 UTC 2015
-# ------------------------------------------------------------------------------
-# Ada95/aclocal.m4                 |   41 
-# NEWS                             |   15 
-# VERSION                          |    2 
-# aclocal.m4                       |   28 
-# configure                        | 3433 ++++++++++++++++++-------------------
-# configure.in                     |   10 
-# dist.mk                          |    4 
-# misc/Makefile.in                 |   32 
-# ncurses/base/lib_mouse.c         |    5 
-# package/debian-mingw/changelog   |    4 
-# package/debian-mingw64/changelog |    4 
-# package/debian/changelog         |    4 
-# package/mingw-ncurses.nsi        |    4 
-# package/mingw-ncurses.spec       |    2 
-# package/ncurses.spec             |    2 
-# test/ncurses.c                   |   10 
-# 16 files changed, 1800 insertions(+), 1800 deletions(-)
-# ------------------------------------------------------------------------------
-Index: Ada95/aclocal.m4
-Prereq:  1.108 
---- ncurses-6.0-20151024+/Ada95/aclocal.m4	2015-10-17 23:07:06.000000000 +0000
-+++ ncurses-6.0-20151101/Ada95/aclocal.m4	2015-11-01 01:03:41.000000000 +0000
-@@ -28,7 +28,7 @@
- dnl
- dnl Author: Thomas E. Dickey
- dnl
--dnl $Id: aclocal.m4,v 1.108 2015/10/17 23:07:06 tom Exp $
-+dnl $Id: aclocal.m4,v 1.109 2015/11/01 01:03:41 tom Exp $
- dnl Macros used in NCURSES Ada95 auto-configuration script.
- dnl
- dnl These macros are maintained separately from NCURSES.  The copyright on
-@@ -742,45 +742,6 @@
- AC_MSG_RESULT($enable_gnat_projects)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_ENABLE_PC_FILES version: 12 updated: 2015/04/17 21:13:04
--dnl ------------------
--dnl This is the "--enable-pc-files" option, which is available if there is a
--dnl pkg-config configuration on the local machine.
--AC_DEFUN([CF_ENABLE_PC_FILES],[
--AC_REQUIRE([CF_PKG_CONFIG])
--AC_REQUIRE([CF_WITH_PKG_CONFIG_LIBDIR])
--
--if test "x$PKG_CONFIG" != xnone
--then
--	AC_MSG_CHECKING(if we should install .pc files for $PKG_CONFIG)
--else
--	AC_MSG_CHECKING(if we should install .pc files)
--fi
--
--AC_ARG_ENABLE(pc-files,
--	[  --enable-pc-files       generate and install .pc files for pkg-config],
--	[enable_pc_files=$enableval],
--	[enable_pc_files=no])
--AC_MSG_RESULT($enable_pc_files)
--
--if test "x$enable_pc_files" != xno
--then
--	case "x$PKG_CONFIG_LIBDIR" in
--	(xno|xyes)
--		AC_MSG_WARN(no PKG_CONFIG_LIBDIR was found)
--		MAKE_PC_FILES="#"
--		;;
--	(*)
--		CF_PATH_SYNTAX(PKG_CONFIG_LIBDIR)
--		MAKE_PC_FILES=
--		;;
--	esac
--else
--	MAKE_PC_FILES="#"
--fi
--AC_SUBST(MAKE_PC_FILES)
--])dnl
--dnl ---------------------------------------------------------------------------
- dnl CF_FIND_LIBRARY version: 9 updated: 2008/03/23 14:48:54
- dnl ---------------
- dnl Look for a non-standard library, given parameters for AC_TRY_LINK.  We
-Index: NEWS
-Prereq:  1.2516 
---- ncurses-6.0-20151024+/NEWS	2015-10-25 00:17:28.000000000 +0000
-+++ ncurses-6.0-20151101/NEWS	2015-11-01 10:27:24.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.2516 2015/10/25 00:17:28 tom Exp $
-+-- $Id: NEWS,v 1.2522 2015/11/01 10:27:24 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,17 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20151101
-+	+ amend change for pkg-config which allows build of pc-files when no
-+	  valid pkg-config library directory was configured to suppress the
-+	  actual install if it is not overridden to a valid directory at
-+	  install time (cf: 20150822).
-+	+ modify editing script which generates resulting.map to work with the
-+	  clang configuration on recent FreeBSD, which gives an error on an
-+	  empty "local" section.
-+	+ fix a spurious "(Part)" message in test/ncurses.c b/B tests due
-+	  to incorrect attribute-masking.
-+
- 20151024
- 	+ modify MKexpanded.c to update the expansion of a temporary filename
- 	  to "expanded.c", for use in trace statements.
-@@ -55,7 +66,7 @@
- 	+ fix typo in INSTALL (patch by Tomas Cech).
- 	+ improve configure check for setting WILDCARD_SYMS variable; on ppc64
- 	  the variable is in the Data section rather than Text (patch by Michel
--	  Normand).
-+	  Normand, Novell #946048).
- 	+ using configure option "--without-fallbacks" incorrectly caused
- 	  FALLBACK_LIST to be set to "no" (patch by Tomas Cech).
- 	+ updated minitel entries to fix kel problem with emacs, and add
-Index: VERSION
---- ncurses-6.0-20151024+/VERSION	2015-10-24 13:10:18.000000000 +0000
-+++ ncurses-6.0-20151101/VERSION	2015-11-01 10:25:33.000000000 +0000
-@@ -1 +1 @@
--5:0:9	6.0	20151024
-+5:0:9	6.0	20151101
-Index: aclocal.m4
-Prereq:  1.779 
---- ncurses-6.0-20151024+/aclocal.m4	2015-10-25 00:51:20.000000000 +0000
-+++ ncurses-6.0-20151101/aclocal.m4	2015-11-01 10:29:05.000000000 +0000
-@@ -28,7 +28,7 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: aclocal.m4,v 1.779 2015/10/25 00:51:20 tom Exp $
-+dnl $Id: aclocal.m4,v 1.783 2015/11/01 10:29:05 tom Exp $
- dnl Macros used in NCURSES auto-configuration script.
- dnl
- dnl These macros are maintained separately from NCURSES.  The copyright on
-@@ -1377,7 +1377,7 @@
- fi
- ])
- dnl ---------------------------------------------------------------------------
--dnl CF_ENABLE_PC_FILES version: 12 updated: 2015/04/17 21:13:04
-+dnl CF_ENABLE_PC_FILES version: 13 updated: 2015/11/01 05:27:39
- dnl ------------------
- dnl This is the "--enable-pc-files" option, which is available if there is a
- dnl pkg-config configuration on the local machine.
-@@ -1400,14 +1400,13 @@
- 
- if test "x$enable_pc_files" != xno
- then
-+	MAKE_PC_FILES=
- 	case "x$PKG_CONFIG_LIBDIR" in
- 	(xno|xyes)
- 		AC_MSG_WARN(no PKG_CONFIG_LIBDIR was found)
--		MAKE_PC_FILES="#"
- 		;;
- 	(*)
- 		CF_PATH_SYNTAX(PKG_CONFIG_LIBDIR)
--		MAKE_PC_FILES=
- 		;;
- 	esac
- else
-@@ -3242,7 +3241,7 @@
- 	AC_SUBST(LIB_PREFIX)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_LIB_RULES version: 84 updated: 2015/09/26 17:54:46
-+dnl CF_LIB_RULES version: 85 updated: 2015/10/31 20:06:35
- dnl ------------
- dnl Append definitions and rules for the given models to the subdirectory
- dnl Makefiles, and the recursion rule for the top-level Makefile.  If the
-@@ -3295,25 +3294,32 @@
- 		SHARED_LIB=
- 		Libs_To_Make=
- 
--		cf_sed_options=
-+		cf_awk_program="BEGIN { skip = 1; last=\"\"; }"
- 		if test -n "${cf_cv_abi_version}" && test "x${cf_cv_abi_version}" != "x5"
- 		then
--			cf_sed_options="$cf_sed_options -e \"s/NCURSES\\([[WT]]\\+\\)\?_/NCURSES\\1${cf_cv_abi_version}_/g\""
--			cf_sed_options="$cf_sed_options -e \"/deprecated in ABI${cf_cv_abi_version}/d\""
-+			cf_awk_program="$cf_awk_program\
-+/deprecated in ABI${cf_cv_abi_version}/ { next; }\
-+{ sub(\"NCURSES([[WT]]+)?\", \"&${cf_cv_abi_version}\"); }\
-+"
- 		fi
- 
- 		if test "x$WILDCARD_SYMS" = xno
- 		then
--			cf_sed_options="$cf_sed_options -e \"s/_\*;//g\""
-+			cf_awk_program="$cf_awk_program\
-+/[[ 	]]_\\*;/ { skip=1; next; }\
-+"
- 		fi
- 
--		if test "x$cf_sed_options" != "x"
-+		if test "x$cf_awk_program" != "x"
- 		then
- 			cat >>$cf_dir/Makefile <\[$]@
-+	$AWK '$cf_awk_program \
-+{ if ( last != "" && ( skip == 0 || \[$]\[$]0 !~ /}/ ) ) { print last; }\
-+ skip = 0; last = \[$]\[$]0; } \
-+END { print last; }' < $UNALTERED_SYMS >\[$]@
- 
- distclean::
- 	rm -f resulting.map
-Index: configure
---- ncurses-6.0-20151024+/configure	2015-10-24 22:43:05.000000000 +0000
-+++ ncurses-6.0-20151101/configure	2015-11-01 10:12:02.000000000 +0000
-@@ -1,5 +1,5 @@
- #! /bin/sh
--# From configure.in Revision: 1.621 .
-+# From configure.in Revision: 1.622 .
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by Autoconf 2.52.20150926.
- #
-@@ -3679,11 +3679,11 @@
- 
- if test "x$enable_pc_files" != xno
- then
-+	MAKE_PC_FILES=
- 	case "x$PKG_CONFIG_LIBDIR" in
- 	(xno|xyes)
--		{ echo "$as_me:3684: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
-+		{ echo "$as_me:3685: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
- echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
--		MAKE_PC_FILES="#"
- 		;;
- 	(*)
- 
-@@ -3718,7 +3718,6 @@
- 	;;
- esac
- 
--		MAKE_PC_FILES=
- 		;;
- 	esac
- else
-@@ -3727,7 +3726,7 @@
- 
- if test -z "$MAKE_PC_FILES"
- then
--	echo "$as_me:3730: checking for suffix to add to pc-files" >&5
-+	echo "$as_me:3729: checking for suffix to add to pc-files" >&5
- echo $ECHO_N "checking for suffix to add to pc-files... $ECHO_C" >&6
- 
- # Check whether --with-pc-suffix or --without-pc-suffix was given.
-@@ -3742,13 +3741,13 @@
- 	esac
- fi;
- 	test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
--	echo "$as_me:3745: result: $PC_MODULE_SUFFIX" >&5
-+	echo "$as_me:3744: result: $PC_MODULE_SUFFIX" >&5
- echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
- 	test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
- 
- fi
- 
--echo "$as_me:3751: checking if we should assume mixed-case filenames" >&5
-+echo "$as_me:3750: checking if we should assume mixed-case filenames" >&5
- echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6
- 
- # Check whether --enable-mixed-case or --disable-mixed-case was given.
-@@ -3758,11 +3757,11 @@
- else
-   enable_mixedcase=auto
- fi;
--echo "$as_me:3761: result: $enable_mixedcase" >&5
-+echo "$as_me:3760: result: $enable_mixedcase" >&5
- echo "${ECHO_T}$enable_mixedcase" >&6
- if test "$enable_mixedcase" = "auto" ; then
- 
--echo "$as_me:3765: checking if filesystem supports mixed-case filenames" >&5
-+echo "$as_me:3764: 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
-@@ -3789,7 +3788,7 @@
- fi
- 
- fi
--echo "$as_me:3792: result: $cf_cv_mixedcase" >&5
-+echo "$as_me:3791: result: $cf_cv_mixedcase" >&5
- echo "${ECHO_T}$cf_cv_mixedcase" >&6
- test "$cf_cv_mixedcase" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -3808,7 +3807,7 @@
- fi
- 
- # do this after mixed-case option (tags/TAGS is not as important as tic).
--echo "$as_me:3811: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+echo "$as_me:3810: 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
-@@ -3828,11 +3827,11 @@
- rm -f conftest.make
- fi
- if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
--  echo "$as_me:3831: result: yes" >&5
-+  echo "$as_me:3830: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-   SET_MAKE=
- else
--  echo "$as_me:3835: result: no" >&5
-+  echo "$as_me:3834: result: no" >&5
- echo "${ECHO_T}no" >&6
-   SET_MAKE="MAKE=${MAKE-make}"
- fi
-@@ -3841,7 +3840,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:3844: checking for $ac_word" >&5
-+echo "$as_me:3843: 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
-@@ -3856,7 +3855,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_CTAGS="$ac_prog"
--echo "$as_me:3859: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3858: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3864,10 +3863,10 @@
- fi
- CTAGS=$ac_cv_prog_CTAGS
- if test -n "$CTAGS"; then
--  echo "$as_me:3867: result: $CTAGS" >&5
-+  echo "$as_me:3866: result: $CTAGS" >&5
- echo "${ECHO_T}$CTAGS" >&6
- else
--  echo "$as_me:3870: result: no" >&5
-+  echo "$as_me:3869: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3878,7 +3877,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:3881: checking for $ac_word" >&5
-+echo "$as_me:3880: 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
-@@ -3893,7 +3892,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ETAGS="$ac_prog"
--echo "$as_me:3896: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3895: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3901,10 +3900,10 @@
- fi
- ETAGS=$ac_cv_prog_ETAGS
- if test -n "$ETAGS"; then
--  echo "$as_me:3904: result: $ETAGS" >&5
-+  echo "$as_me:3903: result: $ETAGS" >&5
- echo "${ECHO_T}$ETAGS" >&6
- else
--  echo "$as_me:3907: result: no" >&5
-+  echo "$as_me:3906: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3913,7 +3912,7 @@
- 
- # 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:3916: checking for $ac_word" >&5
-+echo "$as_me:3915: 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
-@@ -3928,7 +3927,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_MAKE_LOWER_TAGS="yes"
--echo "$as_me:3931: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3930: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3937,17 +3936,17 @@
- fi
- MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
- if test -n "$MAKE_LOWER_TAGS"; then
--  echo "$as_me:3940: result: $MAKE_LOWER_TAGS" >&5
-+  echo "$as_me:3939: result: $MAKE_LOWER_TAGS" >&5
- echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
- else
--  echo "$as_me:3943: result: no" >&5
-+  echo "$as_me:3942: 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:3950: checking for $ac_word" >&5
-+echo "$as_me:3949: 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
-@@ -3962,7 +3961,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_MAKE_UPPER_TAGS="yes"
--echo "$as_me:3965: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3964: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3971,10 +3970,10 @@
- fi
- MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
- if test -n "$MAKE_UPPER_TAGS"; then
--  echo "$as_me:3974: result: $MAKE_UPPER_TAGS" >&5
-+  echo "$as_me:3973: result: $MAKE_UPPER_TAGS" >&5
- echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
- else
--  echo "$as_me:3977: result: no" >&5
-+  echo "$as_me:3976: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3994,7 +3993,7 @@
- 	MAKE_LOWER_TAGS="#"
- fi
- 
--echo "$as_me:3997: checking for makeflags variable" >&5
-+echo "$as_me:3996: 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
-@@ -4028,13 +4027,13 @@
- 	rm -f cf_makeflags.tmp
- 
- fi
--echo "$as_me:4031: result: $cf_cv_makeflags" >&5
-+echo "$as_me:4030: result: $cf_cv_makeflags" >&5
- echo "${ECHO_T}$cf_cv_makeflags" >&6
- 
- 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:4037: checking for $ac_word" >&5
-+echo "$as_me:4036: 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
-@@ -4049,7 +4048,7 @@
-   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:4052: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4051: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4057,10 +4056,10 @@
- fi
- RANLIB=$ac_cv_prog_RANLIB
- if test -n "$RANLIB"; then
--  echo "$as_me:4060: result: $RANLIB" >&5
-+  echo "$as_me:4059: result: $RANLIB" >&5
- echo "${ECHO_T}$RANLIB" >&6
- else
--  echo "$as_me:4063: result: no" >&5
-+  echo "$as_me:4062: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4069,7 +4068,7 @@
-   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:4072: checking for $ac_word" >&5
-+echo "$as_me:4071: 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
-@@ -4084,7 +4083,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_RANLIB="ranlib"
--echo "$as_me:4087: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4086: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4093,10 +4092,10 @@
- fi
- ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
- if test -n "$ac_ct_RANLIB"; then
--  echo "$as_me:4096: result: $ac_ct_RANLIB" >&5
-+  echo "$as_me:4095: result: $ac_ct_RANLIB" >&5
- echo "${ECHO_T}$ac_ct_RANLIB" >&6
- else
--  echo "$as_me:4099: result: no" >&5
-+  echo "$as_me:4098: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4108,7 +4107,7 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ld; ac_word=$2
--echo "$as_me:4111: checking for $ac_word" >&5
-+echo "$as_me:4110: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_LD+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4123,7 +4122,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_LD="${ac_tool_prefix}ld"
--echo "$as_me:4126: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4125: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4131,10 +4130,10 @@
- fi
- LD=$ac_cv_prog_LD
- if test -n "$LD"; then
--  echo "$as_me:4134: result: $LD" >&5
-+  echo "$as_me:4133: result: $LD" >&5
- echo "${ECHO_T}$LD" >&6
- else
--  echo "$as_me:4137: result: no" >&5
-+  echo "$as_me:4136: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4143,7 +4142,7 @@
-   ac_ct_LD=$LD
-   # Extract the first word of "ld", so it can be a program name with args.
- set dummy ld; ac_word=$2
--echo "$as_me:4146: checking for $ac_word" >&5
-+echo "$as_me:4145: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4158,7 +4157,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_LD="ld"
--echo "$as_me:4161: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4160: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4167,10 +4166,10 @@
- fi
- ac_ct_LD=$ac_cv_prog_ac_ct_LD
- if test -n "$ac_ct_LD"; then
--  echo "$as_me:4170: result: $ac_ct_LD" >&5
-+  echo "$as_me:4169: result: $ac_ct_LD" >&5
- echo "${ECHO_T}$ac_ct_LD" >&6
- else
--  echo "$as_me:4173: result: no" >&5
-+  echo "$as_me:4172: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4182,7 +4181,7 @@
- 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:4185: checking for $ac_word" >&5
-+echo "$as_me:4184: 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
-@@ -4197,7 +4196,7 @@
-   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:4200: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4199: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4205,10 +4204,10 @@
- fi
- AR=$ac_cv_prog_AR
- if test -n "$AR"; then
--  echo "$as_me:4208: result: $AR" >&5
-+  echo "$as_me:4207: result: $AR" >&5
- echo "${ECHO_T}$AR" >&6
- else
--  echo "$as_me:4211: result: no" >&5
-+  echo "$as_me:4210: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4217,7 +4216,7 @@
-   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:4220: checking for $ac_word" >&5
-+echo "$as_me:4219: 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
-@@ -4232,7 +4231,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_AR="ar"
--echo "$as_me:4235: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4234: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4241,10 +4240,10 @@
- fi
- ac_ct_AR=$ac_cv_prog_ac_ct_AR
- if test -n "$ac_ct_AR"; then
--  echo "$as_me:4244: result: $ac_ct_AR" >&5
-+  echo "$as_me:4243: result: $ac_ct_AR" >&5
- echo "${ECHO_T}$ac_ct_AR" >&6
- else
--  echo "$as_me:4247: result: no" >&5
-+  echo "$as_me:4246: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4256,7 +4255,7 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args.
- set dummy ${ac_tool_prefix}nm; ac_word=$2
--echo "$as_me:4259: checking for $ac_word" >&5
-+echo "$as_me:4258: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_NM+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4271,7 +4270,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_NM="${ac_tool_prefix}nm"
--echo "$as_me:4274: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4273: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4279,10 +4278,10 @@
- fi
- NM=$ac_cv_prog_NM
- if test -n "$NM"; then
--  echo "$as_me:4282: result: $NM" >&5
-+  echo "$as_me:4281: result: $NM" >&5
- echo "${ECHO_T}$NM" >&6
- else
--  echo "$as_me:4285: result: no" >&5
-+  echo "$as_me:4284: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4291,7 +4290,7 @@
-   ac_ct_NM=$NM
-   # Extract the first word of "nm", so it can be a program name with args.
- set dummy nm; ac_word=$2
--echo "$as_me:4294: checking for $ac_word" >&5
-+echo "$as_me:4293: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_NM+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4306,7 +4305,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_NM="nm"
--echo "$as_me:4309: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4308: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4315,10 +4314,10 @@
- fi
- ac_ct_NM=$ac_cv_prog_ac_ct_NM
- if test -n "$ac_ct_NM"; then
--  echo "$as_me:4318: result: $ac_ct_NM" >&5
-+  echo "$as_me:4317: result: $ac_ct_NM" >&5
- echo "${ECHO_T}$ac_ct_NM" >&6
- else
--  echo "$as_me:4321: result: no" >&5
-+  echo "$as_me:4320: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4330,7 +4329,7 @@
- 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:4333: checking for $ac_word" >&5
-+echo "$as_me:4332: 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
-@@ -4345,7 +4344,7 @@
-   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:4348: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4347: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4353,10 +4352,10 @@
- fi
- AR=$ac_cv_prog_AR
- if test -n "$AR"; then
--  echo "$as_me:4356: result: $AR" >&5
-+  echo "$as_me:4355: result: $AR" >&5
- echo "${ECHO_T}$AR" >&6
- else
--  echo "$as_me:4359: result: no" >&5
-+  echo "$as_me:4358: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4365,7 +4364,7 @@
-   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:4368: checking for $ac_word" >&5
-+echo "$as_me:4367: 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
-@@ -4380,7 +4379,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_AR="ar"
--echo "$as_me:4383: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4382: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4389,10 +4388,10 @@
- fi
- ac_ct_AR=$ac_cv_prog_ac_ct_AR
- if test -n "$ac_ct_AR"; then
--  echo "$as_me:4392: result: $ac_ct_AR" >&5
-+  echo "$as_me:4391: result: $ac_ct_AR" >&5
- echo "${ECHO_T}$ac_ct_AR" >&6
- else
--  echo "$as_me:4395: result: no" >&5
-+  echo "$as_me:4394: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4401,7 +4400,7 @@
-   AR="$ac_cv_prog_AR"
- fi
- 
--echo "$as_me:4404: checking for options to update archives" >&5
-+echo "$as_me:4403: 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
-@@ -4424,13 +4423,13 @@
- 		rm -f conftest.a
- 
- 		cat >conftest.$ac_ext <&5
-+		if { (eval echo "$as_me:4429: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:4433: \$? = $ac_status" >&5
-+  echo "$as_me:4432: \$? = $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
-@@ -4441,7 +4440,7 @@
- 		else
- 			test -n "$verbose" && echo "	cannot compile test-program" 1>&6
- 
--echo "${as_me:-configure}:4444: testing cannot compile test-program ..." 1>&5
-+echo "${as_me:-configure}:4443: testing cannot compile test-program ..." 1>&5
- 
- 			break
- 		fi
-@@ -4449,7 +4448,7 @@
- 	rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
- 
- fi
--echo "$as_me:4452: result: $cf_cv_ar_flags" >&5
-+echo "$as_me:4451: result: $cf_cv_ar_flags" >&5
- echo "${ECHO_T}$cf_cv_ar_flags" >&6
- 
- if test -n "$ARFLAGS" ; then
-@@ -4460,7 +4459,7 @@
- 	ARFLAGS=$cf_cv_ar_flags
- fi
- 
--echo "$as_me:4463: checking if you have specified an install-prefix" >&5
-+echo "$as_me:4462: checking if you have specified an install-prefix" >&5
- echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6
- 
- # Check whether --with-install-prefix or --without-install-prefix was given.
-@@ -4473,7 +4472,7 @@
- 		;;
- 	esac
- fi;
--echo "$as_me:4476: result: $DESTDIR" >&5
-+echo "$as_me:4475: result: $DESTDIR" >&5
- echo "${ECHO_T}$DESTDIR" >&6
- 
- ###############################################################################
-@@ -4501,7 +4500,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:4504: checking for $ac_word" >&5
-+echo "$as_me:4503: 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
-@@ -4516,7 +4515,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_BUILD_CC="$ac_prog"
--echo "$as_me:4519: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4518: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4524,10 +4523,10 @@
- fi
- BUILD_CC=$ac_cv_prog_BUILD_CC
- if test -n "$BUILD_CC"; then
--  echo "$as_me:4527: result: $BUILD_CC" >&5
-+  echo "$as_me:4526: result: $BUILD_CC" >&5
- echo "${ECHO_T}$BUILD_CC" >&6
- else
--  echo "$as_me:4530: result: no" >&5
-+  echo "$as_me:4529: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4535,12 +4534,12 @@
- done
- 
- fi;
--	echo "$as_me:4538: checking for native build C compiler" >&5
-+	echo "$as_me:4537: checking for native build C compiler" >&5
- echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
--	echo "$as_me:4540: result: $BUILD_CC" >&5
-+	echo "$as_me:4539: result: $BUILD_CC" >&5
- echo "${ECHO_T}$BUILD_CC" >&6
- 
--	echo "$as_me:4543: checking for native build C preprocessor" >&5
-+	echo "$as_me:4542: 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.
-@@ -4550,10 +4549,10 @@
- else
-   BUILD_CPP='${BUILD_CC} -E'
- fi;
--	echo "$as_me:4553: result: $BUILD_CPP" >&5
-+	echo "$as_me:4552: result: $BUILD_CPP" >&5
- echo "${ECHO_T}$BUILD_CPP" >&6
- 
--	echo "$as_me:4556: checking for native build C flags" >&5
-+	echo "$as_me:4555: 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.
-@@ -4561,10 +4560,10 @@
-   withval="$with_build_cflags"
-   BUILD_CFLAGS="$withval"
- fi;
--	echo "$as_me:4564: result: $BUILD_CFLAGS" >&5
-+	echo "$as_me:4563: result: $BUILD_CFLAGS" >&5
- echo "${ECHO_T}$BUILD_CFLAGS" >&6
- 
--	echo "$as_me:4567: checking for native build C preprocessor-flags" >&5
-+	echo "$as_me:4566: 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.
-@@ -4572,10 +4571,10 @@
-   withval="$with_build_cppflags"
-   BUILD_CPPFLAGS="$withval"
- fi;
--	echo "$as_me:4575: result: $BUILD_CPPFLAGS" >&5
-+	echo "$as_me:4574: result: $BUILD_CPPFLAGS" >&5
- echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
- 
--	echo "$as_me:4578: checking for native build linker-flags" >&5
-+	echo "$as_me:4577: 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.
-@@ -4583,10 +4582,10 @@
-   withval="$with_build_ldflags"
-   BUILD_LDFLAGS="$withval"
- fi;
--	echo "$as_me:4586: result: $BUILD_LDFLAGS" >&5
-+	echo "$as_me:4585: result: $BUILD_LDFLAGS" >&5
- echo "${ECHO_T}$BUILD_LDFLAGS" >&6
- 
--	echo "$as_me:4589: checking for native build linker-libraries" >&5
-+	echo "$as_me:4588: 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.
-@@ -4594,7 +4593,7 @@
-   withval="$with_build_libs"
-   BUILD_LIBS="$withval"
- fi;
--	echo "$as_me:4597: result: $BUILD_LIBS" >&5
-+	echo "$as_me:4596: result: $BUILD_LIBS" >&5
- echo "${ECHO_T}$BUILD_LIBS" >&6
- 
- 	# this assumes we're on Unix.
-@@ -4604,7 +4603,7 @@
- 	: ${BUILD_CC:='${CC}'}
- 
- 	if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
--		{ { echo "$as_me:4607: error: Cross-build requires two compilers.
-+		{ { echo "$as_me:4606: 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;}
-@@ -4629,7 +4628,7 @@
- ### shared, for example.
- cf_list_models=""
- 
--echo "$as_me:4632: checking if libtool -version-number should be used" >&5
-+echo "$as_me:4631: checking if libtool -version-number should be used" >&5
- echo $ECHO_N "checking if libtool -version-number should be used... $ECHO_C" >&6
- 
- # Check whether --enable-libtool-version or --disable-libtool-version was given.
-@@ -4646,7 +4645,7 @@
- 	cf_libtool_version=yes
- 
- fi;
--echo "$as_me:4649: result: $cf_libtool_version" >&5
-+echo "$as_me:4648: result: $cf_libtool_version" >&5
- echo "${ECHO_T}$cf_libtool_version" >&6
- 
- if test "$cf_libtool_version" = yes ; then
-@@ -4655,25 +4654,25 @@
- 	LIBTOOL_VERSION="-version-info"
- 	case "x$VERSION" in
- 	(x)
--		{ echo "$as_me:4658: WARNING: VERSION was not set" >&5
-+		{ echo "$as_me:4657: WARNING: VERSION was not set" >&5
- echo "$as_me: WARNING: VERSION was not set" >&2;}
- 		;;
- 	(x*.*.*)
- 		ABI_VERSION="$VERSION"
- 		test -n "$verbose" && echo "	ABI_VERSION: $ABI_VERSION" 1>&6
- 
--echo "${as_me:-configure}:4665: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
-+echo "${as_me:-configure}:4664: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
- 
- 		;;
- 	(x*:*:*)
- 		ABI_VERSION=`echo "$VERSION" | sed -e 's/:/./g'`
- 		test -n "$verbose" && echo "	ABI_VERSION: $ABI_VERSION" 1>&6
- 
--echo "${as_me:-configure}:4672: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
-+echo "${as_me:-configure}:4671: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
- 
- 		;;
- 	(*)
--		{ echo "$as_me:4676: WARNING: unexpected VERSION value: $VERSION" >&5
-+		{ echo "$as_me:4675: WARNING: unexpected VERSION value: $VERSION" >&5
- echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
- 		;;
- 	esac
-@@ -4695,7 +4694,7 @@
- LIB_INSTALL=
- LIB_UNINSTALL=
- 
--echo "$as_me:4698: checking if you want to build libraries with libtool" >&5
-+echo "$as_me:4697: checking if you want to build libraries with libtool" >&5
- echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6
- 
- # Check whether --with-libtool or --without-libtool was given.
-@@ -4705,7 +4704,7 @@
- else
-   with_libtool=no
- fi;
--echo "$as_me:4708: result: $with_libtool" >&5
-+echo "$as_me:4707: result: $with_libtool" >&5
- echo "${ECHO_T}$with_libtool" >&6
- if test "$with_libtool" != "no"; then
- 
-@@ -4736,7 +4735,7 @@
- 	with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:4739: error: expected a pathname, not \"$with_libtool\"" >&5
-+	{ { echo "$as_me:4738: error: expected a pathname, not \"$with_libtool\"" >&5
- echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -4749,7 +4748,7 @@
-   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:4752: checking for $ac_word" >&5
-+echo "$as_me:4751: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_LIBTOOL+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4764,7 +4763,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
--echo "$as_me:4767: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4766: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4772,10 +4771,10 @@
- fi
- LIBTOOL=$ac_cv_prog_LIBTOOL
- if test -n "$LIBTOOL"; then
--  echo "$as_me:4775: result: $LIBTOOL" >&5
-+  echo "$as_me:4774: result: $LIBTOOL" >&5
- echo "${ECHO_T}$LIBTOOL" >&6
- else
--  echo "$as_me:4778: result: no" >&5
-+  echo "$as_me:4777: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4788,7 +4787,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:4791: checking for $ac_word" >&5
-+echo "$as_me:4790: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4803,7 +4802,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
--echo "$as_me:4806: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4805: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4811,10 +4810,10 @@
- fi
- ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
- if test -n "$ac_ct_LIBTOOL"; then
--  echo "$as_me:4814: result: $ac_ct_LIBTOOL" >&5
-+  echo "$as_me:4813: result: $ac_ct_LIBTOOL" >&5
- echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
- else
--  echo "$as_me:4817: result: no" >&5
-+  echo "$as_me:4816: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4845,7 +4844,7 @@
-   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:4848: checking for $ac_word" >&5
-+echo "$as_me:4847: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_LIBTOOL+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4860,7 +4859,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
--echo "$as_me:4863: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4862: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4868,10 +4867,10 @@
- fi
- LIBTOOL=$ac_cv_prog_LIBTOOL
- if test -n "$LIBTOOL"; then
--  echo "$as_me:4871: result: $LIBTOOL" >&5
-+  echo "$as_me:4870: result: $LIBTOOL" >&5
- echo "${ECHO_T}$LIBTOOL" >&6
- else
--  echo "$as_me:4874: result: no" >&5
-+  echo "$as_me:4873: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4884,7 +4883,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:4887: checking for $ac_word" >&5
-+echo "$as_me:4886: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4899,7 +4898,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
--echo "$as_me:4902: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4901: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4907,10 +4906,10 @@
- fi
- ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
- if test -n "$ac_ct_LIBTOOL"; then
--  echo "$as_me:4910: result: $ac_ct_LIBTOOL" >&5
-+  echo "$as_me:4909: result: $ac_ct_LIBTOOL" >&5
- echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
- else
--  echo "$as_me:4913: result: no" >&5
-+  echo "$as_me:4912: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4932,7 +4931,7 @@
- 		fi
- 	fi
- 	if test -z "$LIBTOOL" ; then
--		{ { echo "$as_me:4935: error: Cannot find libtool" >&5
-+		{ { echo "$as_me:4934: error: Cannot find libtool" >&5
- echo "$as_me: error: Cannot find libtool" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
-@@ -4948,7 +4947,7 @@
- 
- if test -n "$LIBTOOL" && test "$LIBTOOL" != none
- then
--	echo "$as_me:4951: checking version of $LIBTOOL" >&5
-+	echo "$as_me:4950: checking version of $LIBTOOL" >&5
- echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
- 
- if test -n "$LIBTOOL" && test "$LIBTOOL" != none
-@@ -4959,15 +4958,15 @@
- fi
- test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
- 
--	echo "$as_me:4962: result: $cf_cv_libtool_version" >&5
-+	echo "$as_me:4961: result: $cf_cv_libtool_version" >&5
- echo "${ECHO_T}$cf_cv_libtool_version" >&6
- 	if test -z "$cf_cv_libtool_version" ; then
--		{ { echo "$as_me:4965: error: This is not GNU libtool" >&5
-+		{ { echo "$as_me:4964: error: This is not GNU libtool" >&5
- echo "$as_me: error: This is not GNU libtool" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
- else
--	{ { echo "$as_me:4970: error: GNU libtool has not been found" >&5
-+	{ { echo "$as_me:4969: error: GNU libtool has not been found" >&5
- echo "$as_me: error: GNU libtool has not been found" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -5003,7 +5002,7 @@
- 
- else
- 
--echo "$as_me:5006: checking if you want to build shared libraries" >&5
-+echo "$as_me:5005: checking if you want to build shared libraries" >&5
- echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6
- 
- # Check whether --with-shared or --without-shared was given.
-@@ -5013,11 +5012,11 @@
- else
-   with_shared=no
- fi;
--echo "$as_me:5016: result: $with_shared" >&5
-+echo "$as_me:5015: result: $with_shared" >&5
- echo "${ECHO_T}$with_shared" >&6
- test "x$with_shared" = "xyes" && cf_list_models="$cf_list_models shared"
- 
--echo "$as_me:5020: checking if you want to build static libraries" >&5
-+echo "$as_me:5019: checking if you want to build static libraries" >&5
- echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6
- 
- # Check whether --with-normal or --without-normal was given.
-@@ -5027,11 +5026,11 @@
- else
-   with_normal=yes
- fi;
--echo "$as_me:5030: result: $with_normal" >&5
-+echo "$as_me:5029: result: $with_normal" >&5
- echo "${ECHO_T}$with_normal" >&6
- test "x$with_normal" = "xyes" && cf_list_models="$cf_list_models normal"
- 
--echo "$as_me:5034: checking if you want to build debug libraries" >&5
-+echo "$as_me:5033: checking if you want to build debug libraries" >&5
- echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6
- 
- # Check whether --with-debug or --without-debug was given.
-@@ -5041,11 +5040,11 @@
- else
-   with_debug=yes
- fi;
--echo "$as_me:5044: result: $with_debug" >&5
-+echo "$as_me:5043: result: $with_debug" >&5
- echo "${ECHO_T}$with_debug" >&6
- test "x$with_debug" = "xyes" && cf_list_models="$cf_list_models debug"
- 
--echo "$as_me:5048: checking if you want to build profiling libraries" >&5
-+echo "$as_me:5047: checking if you want to build profiling libraries" >&5
- echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6
- 
- # Check whether --with-profile or --without-profile was given.
-@@ -5055,7 +5054,7 @@
- else
-   with_profile=no
- fi;
--echo "$as_me:5058: result: $with_profile" >&5
-+echo "$as_me:5057: result: $with_profile" >&5
- echo "${ECHO_T}$with_profile" >&6
- test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
- 
-@@ -5063,7 +5062,7 @@
- 
- if test "X$cf_with_cxx_binding" != Xno; then
- if test "x$with_shared" = "xyes"; then
--echo "$as_me:5066: checking if you want to build C++ shared libraries" >&5
-+echo "$as_me:5065: checking if you want to build C++ shared libraries" >&5
- echo $ECHO_N "checking if you want to build C++ shared libraries... $ECHO_C" >&6
- 
- # Check whether --with-cxx-shared or --without-cxx-shared was given.
-@@ -5073,26 +5072,26 @@
- else
-   with_shared_cxx=no
- fi;
--echo "$as_me:5076: result: $with_shared_cxx" >&5
-+echo "$as_me:5075: result: $with_shared_cxx" >&5
- echo "${ECHO_T}$with_shared_cxx" >&6
- fi
- fi
- 
- ###############################################################################
- 
--echo "$as_me:5083: checking for specified models" >&5
-+echo "$as_me:5082: checking for specified models" >&5
- echo $ECHO_N "checking for specified models... $ECHO_C" >&6
- test -z "$cf_list_models" && cf_list_models=normal
- test "$with_libtool" != "no" && cf_list_models=libtool
--echo "$as_me:5087: result: $cf_list_models" >&5
-+echo "$as_me:5086: result: $cf_list_models" >&5
- echo "${ECHO_T}$cf_list_models" >&6
- 
- ### Use the first model as the default, and save its suffix for use in building
- ### up test-applications.
--echo "$as_me:5092: checking for default model" >&5
-+echo "$as_me:5091: checking for default model" >&5
- echo $ECHO_N "checking for default model... $ECHO_C" >&6
- DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'`
--echo "$as_me:5095: result: $DFT_LWR_MODEL" >&5
-+echo "$as_me:5094: result: $DFT_LWR_MODEL" >&5
- echo "${ECHO_T}$DFT_LWR_MODEL" >&6
- 
- DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
-@@ -5106,7 +5105,7 @@
- LIB_DIR=../lib
- LIB_2ND=../../lib
- 
--echo "$as_me:5109: checking if you want to have a library-prefix" >&5
-+echo "$as_me:5108: checking if you want to have a library-prefix" >&5
- echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6
- 
- # Check whether --with-lib-prefix or --without-lib-prefix was given.
-@@ -5116,7 +5115,7 @@
- else
-   with_lib_prefix=auto
- fi;
--echo "$as_me:5119: result: $with_lib_prefix" >&5
-+echo "$as_me:5118: result: $with_lib_prefix" >&5
- echo "${ECHO_T}$with_lib_prefix" >&6
- 
- if test $with_lib_prefix = auto
-@@ -5144,19 +5143,19 @@
- 
- LIB_SUFFIX=
- 
--	echo "$as_me:5147: checking for PATH separator" >&5
-+	echo "$as_me:5146: 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:5154: result: $PATH_SEPARATOR" >&5
-+	echo "$as_me:5153: result: $PATH_SEPARATOR" >&5
- echo "${ECHO_T}$PATH_SEPARATOR" >&6
- 
- ###############################################################################
- 
--echo "$as_me:5159: checking if you want to build a separate terminfo library" >&5
-+echo "$as_me:5158: checking if you want to build a separate terminfo library" >&5
- echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6
- 
- # Check whether --with-termlib or --without-termlib was given.
-@@ -5166,10 +5165,10 @@
- else
-   with_termlib=no
- fi;
--echo "$as_me:5169: result: $with_termlib" >&5
-+echo "$as_me:5168: result: $with_termlib" >&5
- echo "${ECHO_T}$with_termlib" >&6
- 
--echo "$as_me:5172: checking if you want to build a separate tic library" >&5
-+echo "$as_me:5171: checking if you want to build a separate tic library" >&5
- echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6
- 
- # Check whether --with-ticlib or --without-ticlib was given.
-@@ -5179,13 +5178,13 @@
- else
-   with_ticlib=no
- fi;
--echo "$as_me:5182: result: $with_ticlib" >&5
-+echo "$as_me:5181: result: $with_ticlib" >&5
- echo "${ECHO_T}$with_ticlib" >&6
- 
- ### Checks for special libraries, must be done up-front.
- SHLIB_LIST=""
- 
--echo "$as_me:5188: checking if you want to link with the GPM mouse library" >&5
-+echo "$as_me:5187: checking if you want to link with the GPM mouse library" >&5
- echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6
- 
- # Check whether --with-gpm or --without-gpm was given.
-@@ -5195,27 +5194,27 @@
- else
-   with_gpm=maybe
- fi;
--echo "$as_me:5198: result: $with_gpm" >&5
-+echo "$as_me:5197: result: $with_gpm" >&5
- echo "${ECHO_T}$with_gpm" >&6
- 
- if test "$with_gpm" != no ; then
--	echo "$as_me:5202: checking for gpm.h" >&5
-+	echo "$as_me:5201: checking for gpm.h" >&5
- echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6
- if test "${ac_cv_header_gpm_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5208 "configure"
-+#line 5207 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:5212: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:5211: \"$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:5218: \$? = $ac_status" >&5
-+  echo "$as_me:5217: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -5234,7 +5233,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:5237: result: $ac_cv_header_gpm_h" >&5
-+echo "$as_me:5236: result: $ac_cv_header_gpm_h" >&5
- echo "${ECHO_T}$ac_cv_header_gpm_h" >&6
- if test $ac_cv_header_gpm_h = yes; then
- 
-@@ -5245,14 +5244,14 @@
- 		if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then
- 			test -n "$verbose" && echo "	assuming we really have GPM library" 1>&6
- 
--echo "${as_me:-configure}:5248: testing assuming we really have GPM library ..." 1>&5
-+echo "${as_me:-configure}:5247: testing assuming we really have GPM library ..." 1>&5
- 
- cat >>confdefs.h <<\EOF
- #define HAVE_LIBGPM 1
- EOF
- 
- 		else
--			echo "$as_me:5255: checking for Gpm_Open in -lgpm" >&5
-+			echo "$as_me:5254: 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
-@@ -5260,7 +5259,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5263 "configure"
-+#line 5262 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5279,16 +5278,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5282: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5281: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5285: \$? = $ac_status" >&5
-+  echo "$as_me:5284: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5288: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5287: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5291: \$? = $ac_status" >&5
-+  echo "$as_me:5290: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_Gpm_Open=yes
- else
-@@ -5299,13 +5298,13 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:5302: result: $ac_cv_lib_gpm_Gpm_Open" >&5
-+echo "$as_me:5301: 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
-   :
- else
- 
--				{ { echo "$as_me:5308: error: Cannot link with GPM library" >&5
-+				{ { echo "$as_me:5307: error: Cannot link with GPM library" >&5
- echo "$as_me: error: Cannot link with GPM library" >&2;}
-    { (exit 1); exit 1; }; }
- 		fi
-@@ -5315,7 +5314,7 @@
- 
- else
- 
--		test "$with_gpm" != maybe && { echo "$as_me:5318: WARNING: Cannot find GPM header" >&5
-+		test "$with_gpm" != maybe && { echo "$as_me:5317: WARNING: Cannot find GPM header" >&5
- echo "$as_me: WARNING: Cannot find GPM header" >&2;}
- 		with_gpm=no
- 
-@@ -5324,7 +5323,7 @@
- fi
- 
- if test "$with_gpm" != no ; then
--	echo "$as_me:5327: checking if you want to load GPM dynamically" >&5
-+	echo "$as_me:5326: checking if you want to load GPM dynamically" >&5
- echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6
- 
- # Check whether --with-dlsym or --without-dlsym was given.
-@@ -5334,18 +5333,18 @@
- else
-   with_dlsym=yes
- fi;
--	echo "$as_me:5337: result: $with_dlsym" >&5
-+	echo "$as_me:5336: result: $with_dlsym" >&5
- echo "${ECHO_T}$with_dlsym" >&6
- 	if test "x$with_dlsym" = xyes ; then
- 
- cf_have_dlsym=no
--echo "$as_me:5342: checking for dlsym" >&5
-+echo "$as_me:5341: checking for dlsym" >&5
- echo $ECHO_N "checking for dlsym... $ECHO_C" >&6
- if test "${ac_cv_func_dlsym+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5348 "configure"
-+#line 5347 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char dlsym (); below.  */
-@@ -5376,16 +5375,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5379: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5378: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5382: \$? = $ac_status" >&5
-+  echo "$as_me:5381: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5385: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5384: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5388: \$? = $ac_status" >&5
-+  echo "$as_me:5387: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_dlsym=yes
- else
-@@ -5395,14 +5394,14 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:5398: result: $ac_cv_func_dlsym" >&5
-+echo "$as_me:5397: result: $ac_cv_func_dlsym" >&5
- echo "${ECHO_T}$ac_cv_func_dlsym" >&6
- if test $ac_cv_func_dlsym = yes; then
-   cf_have_dlsym=yes
- else
- 
- cf_have_libdl=no
--echo "$as_me:5405: checking for dlsym in -ldl" >&5
-+echo "$as_me:5404: 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
-@@ -5410,7 +5409,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5413 "configure"
-+#line 5412 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5429,16 +5428,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5432: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5431: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5435: \$? = $ac_status" >&5
-+  echo "$as_me:5434: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5438: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5437: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5441: \$? = $ac_status" >&5
-+  echo "$as_me:5440: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dl_dlsym=yes
- else
-@@ -5449,7 +5448,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:5452: result: $ac_cv_lib_dl_dlsym" >&5
-+echo "$as_me:5451: 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
- 
-@@ -5478,10 +5477,10 @@
- LIBS="$cf_add_libs"
-  }
- 
--	echo "$as_me:5481: checking whether able to link to dl*() functions" >&5
-+	echo "$as_me:5480: checking whether able to link to dl*() functions" >&5
- echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 5484 "configure"
-+#line 5483 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -5499,16 +5498,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5502: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5501: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5505: \$? = $ac_status" >&5
-+  echo "$as_me:5504: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5508: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5507: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5511: \$? = $ac_status" >&5
-+  echo "$as_me:5510: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- cat >>confdefs.h <<\EOF
-@@ -5519,15 +5518,15 @@
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- 
--		{ { echo "$as_me:5522: error: Cannot link test program for libdl" >&5
-+		{ { echo "$as_me:5521: error: Cannot link test program for libdl" >&5
- echo "$as_me: error: Cannot link test program for libdl" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--	echo "$as_me:5527: result: ok" >&5
-+	echo "$as_me:5526: result: ok" >&5
- echo "${ECHO_T}ok" >&6
- else
--	{ { echo "$as_me:5530: error: Cannot find dlsym function" >&5
-+	{ { echo "$as_me:5529: error: Cannot find dlsym function" >&5
- echo "$as_me: error: Cannot find dlsym function" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -5535,12 +5534,12 @@
- 		if test "x$with_gpm" != xyes ; then
- 			test -n "$verbose" && echo "	assuming soname for gpm is $with_gpm" 1>&6
- 
--echo "${as_me:-configure}:5538: testing assuming soname for gpm is $with_gpm ..." 1>&5
-+echo "${as_me:-configure}:5537: testing assuming soname for gpm is $with_gpm ..." 1>&5
- 
- 			cf_cv_gpm_soname="$with_gpm"
- 		else
- 
--echo "$as_me:5543: checking for soname of gpm library" >&5
-+echo "$as_me:5542: checking for soname of gpm library" >&5
- echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6
- if test "${cf_cv_gpm_soname+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5574,15 +5573,15 @@
- done
- LIBS="$cf_add_libs"
- 
--	if { (eval echo "$as_me:5577: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:5576: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:5580: \$? = $ac_status" >&5
-+  echo "$as_me:5579: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
--		if { (eval echo "$as_me:5582: \"$ac_link\"") >&5
-+		if { (eval echo "$as_me:5581: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5585: \$? = $ac_status" >&5
-+  echo "$as_me:5584: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 			cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.`
- 			test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
-@@ -5593,7 +5592,7 @@
- fi
- 
- fi
--echo "$as_me:5596: result: $cf_cv_gpm_soname" >&5
-+echo "$as_me:5595: result: $cf_cv_gpm_soname" >&5
- echo "${ECHO_T}$cf_cv_gpm_soname" >&6
- 
- 		fi
-@@ -5628,7 +5627,7 @@
- #define HAVE_LIBGPM 1
- EOF
- 
--echo "$as_me:5631: checking for Gpm_Wgetch in -lgpm" >&5
-+echo "$as_me:5630: checking for Gpm_Wgetch in -lgpm" >&5
- echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6
- if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5636,7 +5635,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5639 "configure"
-+#line 5638 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5655,16 +5654,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5658: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5657: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5661: \$? = $ac_status" >&5
-+  echo "$as_me:5660: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5664: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5663: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5667: \$? = $ac_status" >&5
-+  echo "$as_me:5666: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_Gpm_Wgetch=yes
- else
-@@ -5675,11 +5674,11 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:5678: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
-+echo "$as_me:5677: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
- echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6
- if test $ac_cv_lib_gpm_Gpm_Wgetch = yes; then
- 
--echo "$as_me:5682: checking if GPM is weakly bound to curses library" >&5
-+echo "$as_me:5681: checking if GPM is weakly bound to curses library" >&5
- echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6
- if test "${cf_cv_check_gpm_wgetch+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5703,15 +5702,15 @@
- 	# to rely on the static library, noting that some packagers may not
- 	# include it.
- 	LIBS="-static -lgpm -dynamic $LIBS"
--	if { (eval echo "$as_me:5706: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:5705: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:5709: \$? = $ac_status" >&5
-+  echo "$as_me:5708: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
--		if { (eval echo "$as_me:5711: \"$ac_link\"") >&5
-+		if { (eval echo "$as_me:5710: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5714: \$? = $ac_status" >&5
-+  echo "$as_me:5713: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 			cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\' | egrep '\<[vVwW]\>'`
- 			test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
-@@ -5723,11 +5722,11 @@
- fi
- 
- fi
--echo "$as_me:5726: result: $cf_cv_check_gpm_wgetch" >&5
-+echo "$as_me:5725: result: $cf_cv_check_gpm_wgetch" >&5
- echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6
- 
- if test "$cf_cv_check_gpm_wgetch" != yes ; then
--	{ echo "$as_me:5730: WARNING: GPM library is already linked with curses - read the FAQ" >&5
-+	{ echo "$as_me:5729: WARNING: GPM library is already linked with curses - read the FAQ" >&5
- echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;}
- fi
- 
-@@ -5737,7 +5736,7 @@
- 
- # not everyone has "test -c"
- if test -c /dev/sysmouse 2>/dev/null ; then
--echo "$as_me:5740: checking if you want to use sysmouse" >&5
-+echo "$as_me:5739: checking if you want to use sysmouse" >&5
- echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6
- 
- # Check whether --with-sysmouse or --without-sysmouse was given.
-@@ -5749,7 +5748,7 @@
- fi;
- 	if test "$cf_with_sysmouse" != no ; then
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 5752 "configure"
-+#line 5751 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -5772,16 +5771,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:5775: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5774: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:5778: \$? = $ac_status" >&5
-+  echo "$as_me:5777: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:5781: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5780: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5784: \$? = $ac_status" >&5
-+  echo "$as_me:5783: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_with_sysmouse=yes
- else
-@@ -5791,7 +5790,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	fi
--echo "$as_me:5794: result: $cf_with_sysmouse" >&5
-+echo "$as_me:5793: result: $cf_with_sysmouse" >&5
- echo "${ECHO_T}$cf_with_sysmouse" >&6
- test "$cf_with_sysmouse" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -5810,7 +5809,7 @@
- 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
- fi
- 
--echo "$as_me:5813: checking for default loader flags" >&5
-+echo "$as_me:5812: checking for default loader flags" >&5
- echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
- case $DFT_LWR_MODEL in
- (libtool) LD_MODEL=''   ;;
-@@ -5819,13 +5818,13 @@
- (profile) LD_MODEL='-pg';;
- (shared)  LD_MODEL=''   ;;
- esac
--echo "$as_me:5822: result: $LD_MODEL" >&5
-+echo "$as_me:5821: result: $LD_MODEL" >&5
- echo "${ECHO_T}$LD_MODEL" >&6
- 
- case $DFT_LWR_MODEL in
- (shared)
- 
--echo "$as_me:5828: checking if rpath option should be used" >&5
-+echo "$as_me:5827: checking if rpath option should be used" >&5
- echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6
- 
- # Check whether --enable-rpath or --disable-rpath was given.
-@@ -5835,10 +5834,10 @@
- else
-   cf_cv_enable_rpath=no
- fi;
--echo "$as_me:5838: result: $cf_cv_enable_rpath" >&5
-+echo "$as_me:5837: result: $cf_cv_enable_rpath" >&5
- echo "${ECHO_T}$cf_cv_enable_rpath" >&6
- 
--echo "$as_me:5841: checking if shared libraries should be relinked during install" >&5
-+echo "$as_me:5840: checking if shared libraries should be relinked during install" >&5
- echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6
- 
- # Check whether --enable-relink or --disable-relink was given.
-@@ -5848,7 +5847,7 @@
- else
-   cf_cv_do_relink=yes
- fi;
--echo "$as_me:5851: result: $cf_cv_do_relink" >&5
-+echo "$as_me:5850: result: $cf_cv_do_relink" >&5
- echo "${ECHO_T}$cf_cv_do_relink" >&6
- 	;;
- esac
-@@ -5857,7 +5856,7 @@
- rel_builddir=..
- 
- LD_RPATH_OPT=
--echo "$as_me:5860: checking for an rpath option" >&5
-+echo "$as_me:5859: checking for an rpath option" >&5
- echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
- case $cf_cv_system_name in
- (irix*)
-@@ -5888,12 +5887,12 @@
- (*)
- 	;;
- esac
--echo "$as_me:5891: result: $LD_RPATH_OPT" >&5
-+echo "$as_me:5890: result: $LD_RPATH_OPT" >&5
- echo "${ECHO_T}$LD_RPATH_OPT" >&6
- 
- case "x$LD_RPATH_OPT" in
- (x-R*)
--	echo "$as_me:5896: checking if we need a space after rpath option" >&5
-+	echo "$as_me:5895: 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"
- 
-@@ -5914,7 +5913,7 @@
- LIBS="$cf_add_libs"
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 5917 "configure"
-+#line 5916 "configure"
- #include "confdefs.h"
- 
- int
-@@ -5926,16 +5925,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5929: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5928: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5932: \$? = $ac_status" >&5
-+  echo "$as_me:5931: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5935: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5934: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5938: \$? = $ac_status" >&5
-+  echo "$as_me:5937: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_rpath_space=no
- else
-@@ -5945,7 +5944,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	LIBS="$cf_save_LIBS"
--	echo "$as_me:5948: result: $cf_rpath_space" >&5
-+	echo "$as_me:5947: result: $cf_rpath_space" >&5
- echo "${ECHO_T}$cf_rpath_space" >&6
- 	test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
- 	;;
-@@ -5966,7 +5965,7 @@
- 	cf_ld_rpath_opt=
- 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
- 
--	echo "$as_me:5969: checking if release/abi version should be used for shared libs" >&5
-+	echo "$as_me:5968: checking if release/abi version should be used for shared libs" >&5
- echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6
- 
- # Check whether --with-shlib-version or --without-shlib-version was given.
-@@ -5981,9 +5980,9 @@
- 		cf_cv_shlib_version=$withval
- 		;;
- 	(*)
--		echo "$as_me:5984: result: $withval" >&5
-+		echo "$as_me:5983: result: $withval" >&5
- echo "${ECHO_T}$withval" >&6
--		{ { echo "$as_me:5986: error: option value must be one of: rel, abi, or auto" >&5
-+		{ { echo "$as_me:5985: error: option value must be one of: rel, abi, or auto" >&5
- echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
-    { (exit 1); exit 1; }; }
- 		;;
-@@ -5992,7 +5991,7 @@
- else
-   cf_cv_shlib_version=auto
- fi;
--	echo "$as_me:5995: result: $cf_cv_shlib_version" >&5
-+	echo "$as_me:5994: result: $cf_cv_shlib_version" >&5
- echo "${ECHO_T}$cf_cv_shlib_version" >&6
- 
- 	cf_cv_rm_so_locs=no
-@@ -6002,14 +6001,14 @@
- 	CC_SHARED_OPTS=
- 	if test "$GCC" = yes
- 	then
--		echo "$as_me:6005: checking which $CC option to use" >&5
-+		echo "$as_me:6004: checking which $CC option to use" >&5
- echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
- 		cf_save_CFLAGS="$CFLAGS"
- 		for CC_SHARED_OPTS in -fPIC -fpic ''
- 		do
- 			CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 6012 "configure"
-+#line 6011 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -6021,16 +6020,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6024: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6023: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6027: \$? = $ac_status" >&5
-+  echo "$as_me:6026: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6030: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6029: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6033: \$? = $ac_status" >&5
-+  echo "$as_me:6032: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -6039,7 +6038,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		done
--		echo "$as_me:6042: result: $CC_SHARED_OPTS" >&5
-+		echo "$as_me:6041: result: $CC_SHARED_OPTS" >&5
- echo "${ECHO_T}$CC_SHARED_OPTS" >&6
- 		CFLAGS="$cf_save_CFLAGS"
- 	fi
-@@ -6110,7 +6109,7 @@
- 		MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
- 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
- 		cf_cv_shlib_version_infix=yes
--		echo "$as_me:6113: checking if ld -search_paths_first works" >&5
-+		echo "$as_me:6112: checking if ld -search_paths_first works" >&5
- echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6
- if test "${cf_cv_ldflags_search_paths_first+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6119,7 +6118,7 @@
- 			cf_save_LDFLAGS=$LDFLAGS
- 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 6122 "configure"
-+#line 6121 "configure"
- #include "confdefs.h"
- 
- int
-@@ -6131,16 +6130,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6134: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6133: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6137: \$? = $ac_status" >&5
-+  echo "$as_me:6136: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6140: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6139: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6143: \$? = $ac_status" >&5
-+  echo "$as_me:6142: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ldflags_search_paths_first=yes
- else
-@@ -6151,7 +6150,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 				LDFLAGS=$cf_save_LDFLAGS
- fi
--echo "$as_me:6154: result: $cf_cv_ldflags_search_paths_first" >&5
-+echo "$as_me:6153: result: $cf_cv_ldflags_search_paths_first" >&5
- echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
- 		if test $cf_cv_ldflags_search_paths_first = yes; then
- 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
-@@ -6376,7 +6375,7 @@
- 			do
- 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
- 				cat >conftest.$ac_ext <<_ACEOF
--#line 6379 "configure"
-+#line 6378 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -6388,16 +6387,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6391: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6390: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6394: \$? = $ac_status" >&5
-+  echo "$as_me:6393: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6397: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6396: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6400: \$? = $ac_status" >&5
-+  echo "$as_me:6399: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -6434,7 +6433,7 @@
- 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
- 			;;
- 		(*)
--			{ echo "$as_me:6437: WARNING: ignored --with-shlib-version" >&5
-+			{ echo "$as_me:6436: WARNING: ignored --with-shlib-version" >&5
- echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
- 			;;
- 		esac
-@@ -6444,7 +6443,7 @@
- 	if test -n "$cf_try_cflags"
- 	then
- cat > conftest.$ac_ext <
- int main(int argc, char *argv[])
- {
-@@ -6456,18 +6455,18 @@
- 		for cf_opt in $cf_try_cflags
- 		do
- 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
--			echo "$as_me:6459: checking if CFLAGS option -$cf_opt works" >&5
-+			echo "$as_me:6458: checking if CFLAGS option -$cf_opt works" >&5
- echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6
--			if { (eval echo "$as_me:6461: \"$ac_compile\"") >&5
-+			if { (eval echo "$as_me:6460: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6464: \$? = $ac_status" >&5
-+  echo "$as_me:6463: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--				echo "$as_me:6466: result: yes" >&5
-+				echo "$as_me:6465: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 				cf_save_CFLAGS="$CFLAGS"
- 			else
--				echo "$as_me:6470: result: no" >&5
-+				echo "$as_me:6469: result: no" >&5
- echo "${ECHO_T}no" >&6
- 			fi
- 		done
-@@ -6482,17 +6481,17 @@
- 
- 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
- 
--echo "${as_me:-configure}:6485: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
-+echo "${as_me:-configure}:6484: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
- 
- 	test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
- 
--echo "${as_me:-configure}:6489: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
-+echo "${as_me:-configure}:6488: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
- 
- for model in $cf_list_models; do
- 	case $model in
- 	(libtool)
- 
--echo "$as_me:6495: checking for additional libtool options" >&5
-+echo "$as_me:6494: checking for additional libtool options" >&5
- echo $ECHO_N "checking for additional libtool options... $ECHO_C" >&6
- 
- # Check whether --with-libtool-opts or --without-libtool-opts was given.
-@@ -6502,7 +6501,7 @@
- else
-   with_libtool_opts=no
- fi;
--echo "$as_me:6505: result: $with_libtool_opts" >&5
-+echo "$as_me:6504: result: $with_libtool_opts" >&5
- echo "${ECHO_T}$with_libtool_opts" >&6
- 
- case .$with_libtool_opts in
-@@ -6513,7 +6512,7 @@
- 	;;
- esac
- 
--echo "$as_me:6516: checking if exported-symbols file should be used" >&5
-+echo "$as_me:6515: checking if exported-symbols file should be used" >&5
- echo $ECHO_N "checking if exported-symbols file should be used... $ECHO_C" >&6
- 
- # Check whether --with-export-syms or --without-export-syms was given.
-@@ -6528,7 +6527,7 @@
- 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
- 
- fi
--echo "$as_me:6531: result: $with_export_syms" >&5
-+echo "$as_me:6530: result: $with_export_syms" >&5
- echo "${ECHO_T}$with_export_syms" >&6
- if test "x$with_export_syms" != xno
- then
-@@ -6539,12 +6538,12 @@
- 		;;
- 	(shared)
- 		if test "$CC_SHARED_OPTS" = "unknown"; then
--			{ { echo "$as_me:6542: error: Shared libraries are not supported in this version" >&5
-+			{ { echo "$as_me:6541: error: Shared libraries are not supported in this version" >&5
- echo "$as_me: error: Shared libraries are not supported in this version" >&2;}
-    { (exit 1); exit 1; }; }
- 		fi
- 
--echo "$as_me:6547: checking if versioned-symbols file should be used" >&5
-+echo "$as_me:6546: checking if versioned-symbols file should be used" >&5
- echo $ECHO_N "checking if versioned-symbols file should be used... $ECHO_C" >&6
- 
- # Check whether --with-versioned-syms or --without-versioned-syms was given.
-@@ -6559,7 +6558,7 @@
- 	with_versioned_syms='${top_srcdir}/package/${PACKAGE}.map'
- 
- fi
--echo "$as_me:6562: result: $with_versioned_syms" >&5
-+echo "$as_me:6561: result: $with_versioned_syms" >&5
- echo "${ECHO_T}$with_versioned_syms" >&6
- 
- RESULTING_SYMS=
-@@ -6575,7 +6574,7 @@
- 		MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-Wl,%\\${VERSIONED_SYMS} -Wl,%"`
- 		test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
- 
--echo "${as_me:-configure}:6578: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
-+echo "${as_me:-configure}:6577: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
- 
- 		;;
- 	(*-dy\ *)
-@@ -6583,11 +6582,11 @@
- 		MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-dy%\\${VERSIONED_SYMS} -dy%"`
- 		test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
- 
--echo "${as_me:-configure}:6586: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
-+echo "${as_me:-configure}:6585: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
- 
- 		;;
- 	(*)
--		{ echo "$as_me:6590: WARNING: this system does not support versioned-symbols" >&5
-+		{ echo "$as_me:6589: WARNING: this system does not support versioned-symbols" >&5
- echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
- 		;;
- 	esac
-@@ -6599,7 +6598,7 @@
- 	# symbols.
- 	if test "x$VERSIONED_SYMS" != "x"
- 	then
--		echo "$as_me:6602: checking if wildcards can be used to selectively omit symbols" >&5
-+		echo "$as_me:6601: checking if wildcards can be used to selectively omit symbols" >&5
- echo $ECHO_N "checking if wildcards can be used to selectively omit symbols... $ECHO_C" >&6
- 		WILDCARD_SYMS=no
- 
-@@ -6636,7 +6635,7 @@
- } submodule_1.0;
- EOF
- 		cat >conftest.$ac_ext <&5 |fgrep _ismissing | egrep '[ 	][DT][ 	]'`
- 			test -n "$cf_missing" && WILDCARD_SYMS=yes
- 		fi
--		echo "$as_me:6670: result: $WILDCARD_SYMS" >&5
-+		echo "$as_me:6669: result: $WILDCARD_SYMS" >&5
- echo "${ECHO_T}$WILDCARD_SYMS" >&6
- 		rm -f conftest.*
- 	fi
-@@ -6678,7 +6677,7 @@
- done
- 
- # pretend that ncurses==ncursesw==ncursest
--echo "$as_me:6681: checking if you want to disable library suffixes" >&5
-+echo "$as_me:6680: checking if you want to disable library suffixes" >&5
- echo $ECHO_N "checking if you want to disable library suffixes... $ECHO_C" >&6
- 
- # Check whether --enable-lib-suffixes or --disable-lib-suffixes was given.
-@@ -6695,13 +6694,13 @@
- 	disable_lib_suffixes=no
- 
- fi;
--echo "$as_me:6698: result: $disable_lib_suffixes" >&5
-+echo "$as_me:6697: result: $disable_lib_suffixes" >&5
- echo "${ECHO_T}$disable_lib_suffixes" >&6
- 
- ### If we're building with rpath, try to link non-standard libs that way too.
- if test "$DFT_LWR_MODEL" = "shared"; then
- 
--echo "$as_me:6704: checking if rpath-hack should be disabled" >&5
-+echo "$as_me:6703: 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.
-@@ -6718,21 +6717,21 @@
- 	cf_disable_rpath_hack=no
- 
- fi;
--echo "$as_me:6721: result: $cf_disable_rpath_hack" >&5
-+echo "$as_me:6720: 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:6725: checking for updated LDFLAGS" >&5
-+echo "$as_me:6724: 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:6728: result: maybe" >&5
-+	echo "$as_me:6727: 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:6735: checking for $ac_word" >&5
-+echo "$as_me:6734: 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
-@@ -6747,7 +6746,7 @@
-   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:6750: found $ac_dir/$ac_word" >&5
-+echo "$as_me:6749: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -6755,10 +6754,10 @@
- fi
- cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
- if test -n "$cf_ldd_prog"; then
--  echo "$as_me:6758: result: $cf_ldd_prog" >&5
-+  echo "$as_me:6757: result: $cf_ldd_prog" >&5
- echo "${ECHO_T}$cf_ldd_prog" >&6
- else
--  echo "$as_me:6761: result: no" >&5
-+  echo "$as_me:6760: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -6772,7 +6771,7 @@
- 		cf_rpath_oops=
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 6775 "configure"
-+#line 6774 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -6784,16 +6783,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6787: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6786: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6790: \$? = $ac_status" >&5
-+  echo "$as_me:6789: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6793: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6792: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6796: \$? = $ac_status" >&5
-+  echo "$as_me:6795: \$? = $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`
-@@ -6821,7 +6820,7 @@
- 					then
- 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
- 
--echo "${as_me:-configure}:6824: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
-+echo "${as_me:-configure}:6823: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
- 
- 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
- 						break
-@@ -6833,11 +6832,11 @@
- 
- 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:6836: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6835: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
- 
- test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:6840: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6839: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
- 
- cf_rpath_dst=
- for cf_rpath_src in $LDFLAGS
-@@ -6874,7 +6873,7 @@
- 			then
- 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
- 
--echo "${as_me:-configure}:6877: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
-+echo "${as_me:-configure}:6876: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
- 
- 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
- 			fi
-@@ -6887,11 +6886,11 @@
- 
- test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:6890: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6889: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
- 
- test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
- 
--echo "${as_me:-configure}:6894: testing ...checking LIBS $LIBS ..." 1>&5
-+echo "${as_me:-configure}:6893: testing ...checking LIBS $LIBS ..." 1>&5
- 
- cf_rpath_dst=
- for cf_rpath_src in $LIBS
-@@ -6928,7 +6927,7 @@
- 			then
- 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
- 
--echo "${as_me:-configure}:6931: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
-+echo "${as_me:-configure}:6930: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
- 
- 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
- 			fi
-@@ -6941,14 +6940,14 @@
- 
- test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
- 
--echo "${as_me:-configure}:6944: testing ...checked LIBS $LIBS ..." 1>&5
-+echo "${as_me:-configure}:6943: testing ...checked LIBS $LIBS ..." 1>&5
- 
- 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:6948: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6947: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
- 
- else
--	echo "$as_me:6951: result: no" >&5
-+	echo "$as_me:6950: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -6959,7 +6958,7 @@
- ###############################################################################
- 
- ###	use option --with-extra-suffix to append suffix to headers and libraries
--echo "$as_me:6962: checking if you wish to append extra suffix to header/library paths" >&5
-+echo "$as_me:6961: checking if you wish to append extra suffix to header/library paths" >&5
- echo $ECHO_N "checking if you wish to append extra suffix to header/library paths... $ECHO_C" >&6
- EXTRA_SUFFIX=
- 
-@@ -6978,11 +6977,11 @@
- 	esac
- 
- fi;
--echo "$as_me:6981: result: $EXTRA_SUFFIX" >&5
-+echo "$as_me:6980: result: $EXTRA_SUFFIX" >&5
- echo "${ECHO_T}$EXTRA_SUFFIX" >&6
- 
- ###	use option --disable-overwrite to leave out the link to -lcurses
--echo "$as_me:6985: checking if you wish to install ncurses overwriting curses" >&5
-+echo "$as_me:6984: checking if you wish to install ncurses overwriting curses" >&5
- echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6
- 
- # Check whether --enable-overwrite or --disable-overwrite was given.
-@@ -6992,10 +6991,10 @@
- else
-   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
- fi;
--echo "$as_me:6995: result: $with_overwrite" >&5
-+echo "$as_me:6994: result: $with_overwrite" >&5
- echo "${ECHO_T}$with_overwrite" >&6
- 
--echo "$as_me:6998: checking if external terminfo-database is used" >&5
-+echo "$as_me:6997: checking if external terminfo-database is used" >&5
- echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6
- 
- # Check whether --enable-database or --disable-database was given.
-@@ -7005,7 +7004,7 @@
- else
-   use_database=yes
- fi;
--echo "$as_me:7008: result: $use_database" >&5
-+echo "$as_me:7007: result: $use_database" >&5
- echo "${ECHO_T}$use_database" >&6
- 
- case $host_os in
-@@ -7021,7 +7020,7 @@
- if test "$use_database" != no ; then
- 	NCURSES_USE_DATABASE=1
- 
--	echo "$as_me:7024: checking which terminfo source-file will be installed" >&5
-+	echo "$as_me:7023: checking which terminfo source-file will be installed" >&5
- echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6
- 
- # Check whether --with-database or --without-database was given.
-@@ -7029,10 +7028,10 @@
-   withval="$with_database"
-   TERMINFO_SRC=$withval
- fi;
--	echo "$as_me:7032: result: $TERMINFO_SRC" >&5
-+	echo "$as_me:7031: result: $TERMINFO_SRC" >&5
- echo "${ECHO_T}$TERMINFO_SRC" >&6
- 
--	echo "$as_me:7035: checking whether to use hashed database instead of directory/tree" >&5
-+	echo "$as_me:7034: checking whether to use hashed database instead of directory/tree" >&5
- echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6
- 
- # Check whether --with-hashed-db or --without-hashed-db was given.
-@@ -7042,13 +7041,13 @@
- else
-   with_hashed_db=no
- fi;
--	echo "$as_me:7045: result: $with_hashed_db" >&5
-+	echo "$as_me:7044: result: $with_hashed_db" >&5
- echo "${ECHO_T}$with_hashed_db" >&6
- else
- 	with_hashed_db=no
- fi
- 
--echo "$as_me:7051: checking for list of fallback descriptions" >&5
-+echo "$as_me:7050: checking for list of fallback descriptions" >&5
- echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6
- 
- # Check whether --with-fallbacks or --without-fallbacks was given.
-@@ -7058,11 +7057,11 @@
- else
-   with_fallback=
- fi;
--echo "$as_me:7061: result: $with_fallback" >&5
-+echo "$as_me:7060: result: $with_fallback" >&5
- echo "${ECHO_T}$with_fallback" >&6
- FALLBACK_LIST=`test "$with_fallback" != no && echo "$with_fallback" | sed -e 's/,/ /g'`
- 
--echo "$as_me:7065: checking if you want modern xterm or antique" >&5
-+echo "$as_me:7064: checking if you want modern xterm or antique" >&5
- echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6
- 
- # Check whether --with-xterm-new or --without-xterm-new was given.
-@@ -7076,11 +7075,11 @@
- (no) with_xterm_new=xterm-old;;
- (*)	 with_xterm_new=xterm-new;;
- esac
--echo "$as_me:7079: result: $with_xterm_new" >&5
-+echo "$as_me:7078: result: $with_xterm_new" >&5
- echo "${ECHO_T}$with_xterm_new" >&6
- WHICH_XTERM=$with_xterm_new
- 
--echo "$as_me:7083: checking if xterm backspace sends BS or DEL" >&5
-+echo "$as_me:7082: checking if xterm backspace sends BS or DEL" >&5
- echo $ECHO_N "checking if xterm backspace sends BS or DEL... $ECHO_C" >&6
- 
- # Check whether --with-xterm-kbs or --without-xterm-kbs was given.
-@@ -7101,7 +7100,7 @@
- 	with_xterm_kbs=$withval
- 	;;
- esac
--echo "$as_me:7104: result: $with_xterm_kbs" >&5
-+echo "$as_me:7103: result: $with_xterm_kbs" >&5
- echo "${ECHO_T}$with_xterm_kbs" >&6
- XTERM_KBS=$with_xterm_kbs
- 
-@@ -7111,7 +7110,7 @@
- 	MAKE_TERMINFO="#"
- else
- 
--echo "$as_me:7114: checking for list of terminfo directories" >&5
-+echo "$as_me:7113: checking for list of terminfo directories" >&5
- echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6
- 
- # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given.
-@@ -7151,7 +7150,7 @@
- 	cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:7154: error: expected a pathname, not \"$cf_src_path\"" >&5
-+	{ { echo "$as_me:7153: error: expected a pathname, not \"$cf_src_path\"" >&5
- echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -7174,14 +7173,14 @@
- 	;;
- esac
- 
--echo "$as_me:7177: result: $TERMINFO_DIRS" >&5
-+echo "$as_me:7176: result: $TERMINFO_DIRS" >&5
- echo "${ECHO_T}$TERMINFO_DIRS" >&6
- test -n "$TERMINFO_DIRS" &&
- cat >>confdefs.h <&5
-+echo "$as_me:7183: checking for default terminfo directory" >&5
- echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6
- 
- # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given.
-@@ -7217,7 +7216,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:7220: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:7219: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -7226,7 +7225,7 @@
- fi
- eval TERMINFO="$withval"
- 
--echo "$as_me:7229: result: $TERMINFO" >&5
-+echo "$as_me:7228: result: $TERMINFO" >&5
- echo "${ECHO_T}$TERMINFO" >&6
- 
- cat >>confdefs.h <&5
-+echo "$as_me:7239: checking if big-core option selected" >&5
- echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6
- 
- # Check whether --enable-big-core or --disable-big-core was given.
-@@ -7249,7 +7248,7 @@
-   with_big_core=no
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7252 "configure"
-+#line 7251 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -7263,15 +7262,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:7266: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7265: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7269: \$? = $ac_status" >&5
-+  echo "$as_me:7268: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:7271: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7270: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7274: \$? = $ac_status" >&5
-+  echo "$as_me:7273: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   with_big_core=yes
- else
-@@ -7283,7 +7282,7 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi;
--echo "$as_me:7286: result: $with_big_core" >&5
-+echo "$as_me:7285: result: $with_big_core" >&5
- echo "${ECHO_T}$with_big_core" >&6
- test "x$with_big_core" = "xyes" &&
- cat >>confdefs.h <<\EOF
-@@ -7293,7 +7292,7 @@
- ### ISO C only guarantees 512-char strings, we have tables which load faster
- ### when constructed using "big" strings.  More than the C compiler, the awk
- ### program is a limit on most vendor UNIX systems.  Check that we can build.
--echo "$as_me:7296: checking if big-strings option selected" >&5
-+echo "$as_me:7295: checking if big-strings option selected" >&5
- echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6
- 
- # Check whether --enable-big-strings or --disable-big-strings was given.
-@@ -7317,14 +7316,14 @@
- 	esac
- 
- fi;
--echo "$as_me:7320: result: $with_big_strings" >&5
-+echo "$as_me:7319: result: $with_big_strings" >&5
- echo "${ECHO_T}$with_big_strings" >&6
- 
- USE_BIG_STRINGS=0
- test "x$with_big_strings" = "xyes" && USE_BIG_STRINGS=1
- 
- ###	use option --enable-termcap to compile in the termcap fallback support
--echo "$as_me:7327: checking if you want termcap-fallback support" >&5
-+echo "$as_me:7326: checking if you want termcap-fallback support" >&5
- echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6
- 
- # Check whether --enable-termcap or --disable-termcap was given.
-@@ -7334,14 +7333,14 @@
- else
-   with_termcap=no
- fi;
--echo "$as_me:7337: result: $with_termcap" >&5
-+echo "$as_me:7336: result: $with_termcap" >&5
- echo "${ECHO_T}$with_termcap" >&6
- 
- NCURSES_USE_TERMCAP=0
- if test "x$with_termcap" != "xyes" ; then
- 	if test "$use_database" = no ; then
- 		if test -z "$with_fallback" ; then
--			{ { echo "$as_me:7344: error: You have disabled the database w/o specifying fallbacks" >&5
-+			{ { echo "$as_me:7343: error: You have disabled the database w/o specifying fallbacks" >&5
- echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;}
-    { (exit 1); exit 1; }; }
- 		fi
-@@ -7354,13 +7353,13 @@
- else
- 
- 	if test "$with_ticlib" != no ; then
--		{ { echo "$as_me:7357: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
-+		{ { echo "$as_me:7356: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
- echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
- 
- 	NCURSES_USE_TERMCAP=1
--	echo "$as_me:7363: checking for list of termcap files" >&5
-+	echo "$as_me:7362: checking for list of termcap files" >&5
- echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6
- 
- # Check whether --with-termpath or --without-termpath was given.
-@@ -7400,7 +7399,7 @@
- 	cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:7403: error: expected a pathname, not \"$cf_src_path\"" >&5
-+	{ { echo "$as_me:7402: error: expected a pathname, not \"$cf_src_path\"" >&5
- echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -7423,7 +7422,7 @@
- 	;;
- esac
- 
--	echo "$as_me:7426: result: $TERMPATH" >&5
-+	echo "$as_me:7425: result: $TERMPATH" >&5
- echo "${ECHO_T}$TERMPATH" >&6
- 	test -n "$TERMPATH" &&
- cat >>confdefs.h <&5
-+	echo "$as_me:7433: checking if fast termcap-loader is needed" >&5
- echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6
- 
- # Check whether --enable-getcap or --disable-getcap was given.
-@@ -7441,14 +7440,14 @@
- else
-   with_getcap=no
- fi;
--	echo "$as_me:7444: result: $with_getcap" >&5
-+	echo "$as_me:7443: result: $with_getcap" >&5
- echo "${ECHO_T}$with_getcap" >&6
- 	test "x$with_getcap" = "xyes" &&
- cat >>confdefs.h <<\EOF
- #define USE_GETCAP 1
- EOF
- 
--	echo "$as_me:7451: checking if translated termcaps will be cached in ~/.terminfo" >&5
-+	echo "$as_me:7450: checking if translated termcaps will be cached in ~/.terminfo" >&5
- echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6
- 
- # Check whether --enable-getcap-cache or --disable-getcap-cache was given.
-@@ -7458,7 +7457,7 @@
- else
-   with_getcap_cache=no
- fi;
--	echo "$as_me:7461: result: $with_getcap_cache" >&5
-+	echo "$as_me:7460: result: $with_getcap_cache" >&5
- echo "${ECHO_T}$with_getcap_cache" >&6
- 	test "x$with_getcap_cache" = "xyes" &&
- cat >>confdefs.h <<\EOF
-@@ -7468,7 +7467,7 @@
- fi
- 
- ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
--echo "$as_me:7471: checking if ~/.terminfo is wanted" >&5
-+echo "$as_me:7470: checking if ~/.terminfo is wanted" >&5
- echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6
- 
- # Check whether --enable-home-terminfo or --disable-home-terminfo was given.
-@@ -7478,14 +7477,14 @@
- else
-   with_home_terminfo=yes
- fi;
--echo "$as_me:7481: result: $with_home_terminfo" >&5
-+echo "$as_me:7480: result: $with_home_terminfo" >&5
- echo "${ECHO_T}$with_home_terminfo" >&6
- test "x$with_home_terminfo" = "xyes" &&
- cat >>confdefs.h <<\EOF
- #define USE_HOME_TERMINFO 1
- EOF
- 
--echo "$as_me:7488: checking if you want to use restricted environment when running as root" >&5
-+echo "$as_me:7487: checking if you want to use restricted environment when running as root" >&5
- echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6
- 
- # Check whether --enable-root-environ or --disable-root-environ was given.
-@@ -7495,7 +7494,7 @@
- else
-   with_root_environ=yes
- fi;
--echo "$as_me:7498: result: $with_root_environ" >&5
-+echo "$as_me:7497: result: $with_root_environ" >&5
- echo "${ECHO_T}$with_root_environ" >&6
- test "x$with_root_environ" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -7510,13 +7509,13 @@
- 	unlink
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:7513: checking for $ac_func" >&5
-+echo "$as_me:7512: 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 7519 "configure"
-+#line 7518 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -7547,16 +7546,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7550: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7549: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7553: \$? = $ac_status" >&5
-+  echo "$as_me:7552: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7556: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7555: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7559: \$? = $ac_status" >&5
-+  echo "$as_me:7558: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -7566,7 +7565,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:7569: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:7568: 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 <&5
-+echo "$as_me:7585: 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 7592 "configure"
-+#line 7591 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -7620,16 +7619,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7623: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7622: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7626: \$? = $ac_status" >&5
-+  echo "$as_me:7625: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7629: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7628: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7632: \$? = $ac_status" >&5
-+  echo "$as_me:7631: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -7639,7 +7638,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:7642: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:7641: 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 <&5
-+	echo "$as_me:7652: checking if link/symlink functions work" >&5
- echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6
- if test "${cf_cv_link_funcs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7663,7 +7662,7 @@
- 			eval 'ac_cv_func_'$cf_func'=error'
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7666 "configure"
-+#line 7665 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -7693,15 +7692,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:7696: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7695: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7699: \$? = $ac_status" >&5
-+  echo "$as_me:7698: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:7701: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7700: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7704: \$? = $ac_status" >&5
-+  echo "$as_me:7703: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
-@@ -7719,7 +7718,7 @@
- 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
- 
- fi
--echo "$as_me:7722: result: $cf_cv_link_funcs" >&5
-+echo "$as_me:7721: result: $cf_cv_link_funcs" >&5
- echo "${ECHO_T}$cf_cv_link_funcs" >&6
- 	test "$ac_cv_func_link"    = yes &&
- cat >>confdefs.h <<\EOF
-@@ -7739,7 +7738,7 @@
- # soft links (symbolic links) are useful for some systems where hard links do
- # not work, or to make it simpler to copy terminfo trees around.
- if test "x$ac_cv_func_symlink" = xyes ; then
--	echo "$as_me:7742: checking if tic should use symbolic links" >&5
-+	echo "$as_me:7741: checking if tic should use symbolic links" >&5
- echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6
- 
- # Check whether --enable-symlinks or --disable-symlinks was given.
-@@ -7749,21 +7748,21 @@
- else
-   with_symlinks=no
- fi;
--	echo "$as_me:7752: result: $with_symlinks" >&5
-+	echo "$as_me:7751: result: $with_symlinks" >&5
- echo "${ECHO_T}$with_symlinks" >&6
- fi
- 
- # If we have hard links and did not choose to use soft links instead, there is
- # no reason to make this choice optional - use the hard links.
- if test "$with_symlinks" = no ; then
--	echo "$as_me:7759: checking if tic should use hard links" >&5
-+	echo "$as_me:7758: checking if tic should use hard links" >&5
- echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6
- 	if test "x$ac_cv_func_link" = xyes ; then
- 		with_links=yes
- 	else
- 		with_links=no
- 	fi
--	echo "$as_me:7766: result: $with_links" >&5
-+	echo "$as_me:7765: result: $with_links" >&5
- echo "${ECHO_T}$with_links" >&6
- fi
- 
-@@ -7778,7 +7777,7 @@
- EOF
- 
- ###   use option --enable-broken-linker to force on use of broken-linker support
--echo "$as_me:7781: checking if you want broken-linker support code" >&5
-+echo "$as_me:7780: checking if you want broken-linker support code" >&5
- echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
- 
- # Check whether --enable-broken_linker or --disable-broken_linker was given.
-@@ -7788,7 +7787,7 @@
- else
-   with_broken_linker=${BROKEN_LINKER:-no}
- fi;
--echo "$as_me:7791: result: $with_broken_linker" >&5
-+echo "$as_me:7790: result: $with_broken_linker" >&5
- echo "${ECHO_T}$with_broken_linker" >&6
- 
- BROKEN_LINKER=0
-@@ -7810,14 +7809,14 @@
- 		BROKEN_LINKER=1
- 		test -n "$verbose" && echo "	cygwin linker is broken anyway" 1>&6
- 
--echo "${as_me:-configure}:7813: testing cygwin linker is broken anyway ..." 1>&5
-+echo "${as_me:-configure}:7812: testing cygwin linker is broken anyway ..." 1>&5
- 
- 		;;
- 	esac
- fi
- 
- ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
--echo "$as_me:7820: checking if tputs should process BSD-style prefix padding" >&5
-+echo "$as_me:7819: checking if tputs should process BSD-style prefix padding" >&5
- echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6
- 
- # Check whether --enable-bsdpad or --disable-bsdpad was given.
-@@ -7827,7 +7826,7 @@
- else
-   with_bsdpad=no
- fi;
--echo "$as_me:7830: result: $with_bsdpad" >&5
-+echo "$as_me:7829: result: $with_bsdpad" >&5
- echo "${ECHO_T}$with_bsdpad" >&6
- test "x$with_bsdpad" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -7884,14 +7883,14 @@
- 	;;
- (linux*|gnu*|mint*|k*bsd*-gnu)
- 
--echo "$as_me:7887: checking if we must define _GNU_SOURCE" >&5
-+echo "$as_me:7886: 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 7894 "configure"
-+#line 7893 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -7906,16 +7905,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7909: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7908: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7912: \$? = $ac_status" >&5
-+  echo "$as_me:7911: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7915: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7914: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7918: \$? = $ac_status" >&5
-+  echo "$as_me:7917: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -7924,7 +7923,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 7927 "configure"
-+#line 7926 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -7939,16 +7938,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7942: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7941: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7945: \$? = $ac_status" >&5
-+  echo "$as_me:7944: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7948: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7947: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7951: \$? = $ac_status" >&5
-+  echo "$as_me:7950: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -7963,7 +7962,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:7966: result: $cf_cv_gnu_source" >&5
-+echo "$as_me:7965: result: $cf_cv_gnu_source" >&5
- echo "${ECHO_T}$cf_cv_gnu_source" >&6
- test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- 
-@@ -7988,16 +7987,16 @@
- 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
- 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
- 
--echo "$as_me:7991: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "$as_me:7990: 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}:7997: testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me:-configure}:7996: testing if the symbol is already defined go no further ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 8000 "configure"
-+#line 7999 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -8012,16 +8011,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8015: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8014: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8018: \$? = $ac_status" >&5
-+  echo "$as_me:8017: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8021: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8020: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8024: \$? = $ac_status" >&5
-+  echo "$as_me:8023: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_posix_c_source=no
- else
-@@ -8042,7 +8041,7 @@
- 	 esac
- 	 if test "$cf_want_posix_source" = yes ; then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 8045 "configure"
-+#line 8044 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -8057,16 +8056,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8060: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8059: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8063: \$? = $ac_status" >&5
-+  echo "$as_me:8062: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8066: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8065: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8069: \$? = $ac_status" >&5
-+  echo "$as_me:8068: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8077,15 +8076,15 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	 fi
- 
--echo "${as_me:-configure}:8080: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me:-configure}:8079: 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}:8085: testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me:-configure}:8084: testing if the second compile does not leave our definition intact error ..." 1>&5
- 
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 8088 "configure"
-+#line 8087 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -8100,16 +8099,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8103: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8102: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8106: \$? = $ac_status" >&5
-+  echo "$as_me:8105: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8109: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8108: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8112: \$? = $ac_status" >&5
-+  echo "$as_me:8111: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8125,7 +8124,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:8128: result: $cf_cv_posix_c_source" >&5
-+echo "$as_me:8127: 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
-@@ -8246,14 +8245,14 @@
- 	;;
- (*)
- 
--echo "$as_me:8249: checking if we should define _XOPEN_SOURCE" >&5
-+echo "$as_me:8248: 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 8256 "configure"
-+#line 8255 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -8272,16 +8271,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8275: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8274: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8278: \$? = $ac_status" >&5
-+  echo "$as_me:8277: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8281: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8280: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8284: \$? = $ac_status" >&5
-+  echo "$as_me:8283: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -8290,7 +8289,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 8293 "configure"
-+#line 8292 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -8309,16 +8308,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8312: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8311: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8315: \$? = $ac_status" >&5
-+  echo "$as_me:8314: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8318: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8317: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8321: \$? = $ac_status" >&5
-+  echo "$as_me:8320: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -8333,7 +8332,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:8336: result: $cf_cv_xopen_source" >&5
-+echo "$as_me:8335: result: $cf_cv_xopen_source" >&5
- echo "${ECHO_T}$cf_cv_xopen_source" >&6
- 
- if test "$cf_cv_xopen_source" != no ; then
-@@ -8441,16 +8440,16 @@
- 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
- 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
- 
--echo "$as_me:8444: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "$as_me:8443: 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}:8450: testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me:-configure}:8449: testing if the symbol is already defined go no further ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 8453 "configure"
-+#line 8452 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -8465,16 +8464,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8468: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8467: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8471: \$? = $ac_status" >&5
-+  echo "$as_me:8470: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8474: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8473: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8477: \$? = $ac_status" >&5
-+  echo "$as_me:8476: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_posix_c_source=no
- else
-@@ -8495,7 +8494,7 @@
- 	 esac
- 	 if test "$cf_want_posix_source" = yes ; then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 8498 "configure"
-+#line 8497 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -8510,16 +8509,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8513: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8512: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8516: \$? = $ac_status" >&5
-+  echo "$as_me:8515: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8519: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8518: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8522: \$? = $ac_status" >&5
-+  echo "$as_me:8521: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8530,15 +8529,15 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	 fi
- 
--echo "${as_me:-configure}:8533: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me:-configure}:8532: 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}:8538: testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me:-configure}:8537: testing if the second compile does not leave our definition intact error ..." 1>&5
- 
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 8541 "configure"
-+#line 8540 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -8553,16 +8552,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8556: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8555: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8559: \$? = $ac_status" >&5
-+  echo "$as_me:8558: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8562: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8561: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8565: \$? = $ac_status" >&5
-+  echo "$as_me:8564: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8578,7 +8577,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:8581: result: $cf_cv_posix_c_source" >&5
-+echo "$as_me:8580: 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
-@@ -8736,7 +8735,7 @@
- if test -n "$cf_new_cflags" ; then
- 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
- 
--echo "${as_me:-configure}:8739: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
-+echo "${as_me:-configure}:8738: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
- 
- 	CFLAGS="$CFLAGS $cf_new_cflags"
- fi
-@@ -8744,7 +8743,7 @@
- if test -n "$cf_new_cppflags" ; then
- 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
- 
--echo "${as_me:-configure}:8747: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
-+echo "${as_me:-configure}:8746: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
- 
- 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
- fi
-@@ -8752,7 +8751,7 @@
- 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}:8755: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
-+echo "${as_me:-configure}:8754: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
- 
- 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
- fi
-@@ -8760,10 +8759,10 @@
- fi
- 
- if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
--	echo "$as_me:8763: checking if _XOPEN_SOURCE really is set" >&5
-+	echo "$as_me:8762: 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 8766 "configure"
-+#line 8765 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -8778,16 +8777,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8781: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8780: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8784: \$? = $ac_status" >&5
-+  echo "$as_me:8783: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8787: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8786: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8790: \$? = $ac_status" >&5
-+  echo "$as_me:8789: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_XOPEN_SOURCE_set=yes
- else
-@@ -8796,12 +8795,12 @@
- cf_XOPEN_SOURCE_set=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:8799: result: $cf_XOPEN_SOURCE_set" >&5
-+	echo "$as_me:8798: 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 8804 "configure"
-+#line 8803 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -8816,16 +8815,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8819: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8818: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8822: \$? = $ac_status" >&5
-+  echo "$as_me:8821: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8825: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8824: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8828: \$? = $ac_status" >&5
-+  echo "$as_me:8827: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_XOPEN_SOURCE_set_ok=yes
- else
-@@ -8836,19 +8835,19 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		if test $cf_XOPEN_SOURCE_set_ok = no
- 		then
--			{ echo "$as_me:8839: WARNING: _XOPEN_SOURCE is lower than requested" >&5
-+			{ echo "$as_me:8838: WARNING: _XOPEN_SOURCE is lower than requested" >&5
- echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
- 		fi
- 	else
- 
--echo "$as_me:8844: checking if we should define _XOPEN_SOURCE" >&5
-+echo "$as_me:8843: 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 8851 "configure"
-+#line 8850 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -8867,16 +8866,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8870: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8869: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8873: \$? = $ac_status" >&5
-+  echo "$as_me:8872: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8876: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8875: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8879: \$? = $ac_status" >&5
-+  echo "$as_me:8878: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -8885,7 +8884,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 8888 "configure"
-+#line 8887 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -8904,16 +8903,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8907: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8906: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8910: \$? = $ac_status" >&5
-+  echo "$as_me:8909: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8913: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8912: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8916: \$? = $ac_status" >&5
-+  echo "$as_me:8915: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -8928,7 +8927,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:8931: result: $cf_cv_xopen_source" >&5
-+echo "$as_me:8930: result: $cf_cv_xopen_source" >&5
- echo "${ECHO_T}$cf_cv_xopen_source" >&6
- 
- if test "$cf_cv_xopen_source" != no ; then
-@@ -9030,14 +9029,14 @@
- 
- # Work around breakage on OS X
- 
--echo "$as_me:9033: checking if SIGWINCH is defined" >&5
-+echo "$as_me:9032: 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 9040 "configure"
-+#line 9039 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -9052,23 +9051,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9055: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9054: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9058: \$? = $ac_status" >&5
-+  echo "$as_me:9057: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9061: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9060: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9064: \$? = $ac_status" >&5
-+  echo "$as_me:9063: \$? = $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 9071 "configure"
-+#line 9070 "configure"
- #include "confdefs.h"
- 
- #undef _XOPEN_SOURCE
-@@ -9086,16 +9085,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9089: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9088: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9092: \$? = $ac_status" >&5
-+  echo "$as_me:9091: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9095: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9094: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9098: \$? = $ac_status" >&5
-+  echo "$as_me:9097: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_define_sigwinch=maybe
- else
-@@ -9109,11 +9108,11 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:9112: result: $cf_cv_define_sigwinch" >&5
-+echo "$as_me:9111: 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:9116: checking for actual SIGWINCH definition" >&5
-+echo "$as_me:9115: 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
-@@ -9124,7 +9123,7 @@
- while test $cf_sigwinch != 1
- do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9127 "configure"
-+#line 9126 "configure"
- #include "confdefs.h"
- 
- #undef _XOPEN_SOURCE
-@@ -9146,16 +9145,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9149: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9148: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9152: \$? = $ac_status" >&5
-+  echo "$as_me:9151: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9155: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9154: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9158: \$? = $ac_status" >&5
-+  echo "$as_me:9157: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_fixup_sigwinch=$cf_sigwinch
- 	 break
-@@ -9169,7 +9168,7 @@
- done
- 
- fi
--echo "$as_me:9172: result: $cf_cv_fixup_sigwinch" >&5
-+echo "$as_me:9171: result: $cf_cv_fixup_sigwinch" >&5
- echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
- 
- 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
-@@ -9179,13 +9178,13 @@
- 
- # Checks for CODESET support.
- 
--echo "$as_me:9182: checking for nl_langinfo and CODESET" >&5
-+echo "$as_me:9181: 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 9188 "configure"
-+#line 9187 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -9197,16 +9196,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9200: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9199: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9203: \$? = $ac_status" >&5
-+  echo "$as_me:9202: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9206: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9205: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9209: \$? = $ac_status" >&5
-+  echo "$as_me:9208: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   am_cv_langinfo_codeset=yes
- else
-@@ -9217,7 +9216,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:9220: result: $am_cv_langinfo_codeset" >&5
-+echo "$as_me:9219: result: $am_cv_langinfo_codeset" >&5
- echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
- 	if test $am_cv_langinfo_codeset = yes; then
- 
-@@ -9231,7 +9230,7 @@
- NCURSES_OK_WCHAR_T=
- NCURSES_OK_WINT_T=
- 
--echo "$as_me:9234: checking if you want wide-character code" >&5
-+echo "$as_me:9233: checking if you want wide-character code" >&5
- echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6
- 
- # Check whether --enable-widec or --disable-widec was given.
-@@ -9241,7 +9240,7 @@
- else
-   with_widec=no
- fi;
--echo "$as_me:9244: result: $with_widec" >&5
-+echo "$as_me:9243: result: $with_widec" >&5
- echo "${ECHO_T}$with_widec" >&6
- if test "x$with_widec" = xyes ; then
- 	if test "x$disable_lib_suffixes" = xno ; then
-@@ -9256,14 +9255,14 @@
- #define NCURSES_WIDECHAR 1
- EOF
- 
--echo "$as_me:9259: checking if wchar.h can be used as is" >&5
-+echo "$as_me:9258: checking if wchar.h can be used as is" >&5
- echo $ECHO_N "checking if wchar.h can be used as is... $ECHO_C" >&6
- if test "${cf_cv_wchar_h_okay+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 9266 "configure"
-+#line 9265 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -9280,16 +9279,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9283: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9282: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9286: \$? = $ac_status" >&5
-+  echo "$as_me:9285: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9289: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9288: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9292: \$? = $ac_status" >&5
-+  echo "$as_me:9291: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_h_okay=yes
- else
-@@ -9299,16 +9298,16 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:9302: result: $cf_cv_wchar_h_okay" >&5
-+echo "$as_me:9301: result: $cf_cv_wchar_h_okay" >&5
- echo "${ECHO_T}$cf_cv_wchar_h_okay" >&6
- 
- if test $cf_cv_wchar_h_okay = no
- then
- 
--echo "$as_me:9308: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
-+echo "$as_me:9307: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
- echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 9311 "configure"
-+#line 9310 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -9324,16 +9323,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9327: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9326: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9330: \$? = $ac_status" >&5
-+  echo "$as_me:9329: \$? = $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:9332: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9336: \$? = $ac_status" >&5
-+  echo "$as_me:9335: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=no
- else
-@@ -9342,16 +9341,16 @@
- cf_result=yes
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:9345: result: $cf_result" >&5
-+echo "$as_me:9344: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 
- if test "$cf_result" = yes ; then
- 	CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
- elif test "x" != "x" ; then
--	echo "$as_me:9351: checking checking for compatible value versus " >&5
-+	echo "$as_me:9350: checking checking for compatible value versus " >&5
- echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9354 "configure"
-+#line 9353 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -9367,16 +9366,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9370: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9369: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9373: \$? = $ac_status" >&5
-+  echo "$as_me:9372: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9376: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9375: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9379: \$? = $ac_status" >&5
-+  echo "$as_me:9378: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -9385,7 +9384,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:9388: result: $cf_result" >&5
-+	echo "$as_me:9387: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 	if test "$cf_result" = no ; then
- 		# perhaps we can override it - try...
-@@ -9401,13 +9400,13 @@
- for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:9404: checking for $ac_func" >&5
-+echo "$as_me:9403: 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 9410 "configure"
-+#line 9409 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -9438,16 +9437,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9441: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9440: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9444: \$? = $ac_status" >&5
-+  echo "$as_me:9443: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9447: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9446: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9450: \$? = $ac_status" >&5
-+  echo "$as_me:9449: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -9457,7 +9456,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:9460: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:9459: 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 <&5
-+echo "$as_me:9471: 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
-@@ -9477,7 +9476,7 @@
- 
- 	cf_save_LIBS="$LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9480 "configure"
-+#line 9479 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -9490,16 +9489,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9493: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9492: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9496: \$? = $ac_status" >&5
-+  echo "$as_me:9495: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9499: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9498: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9502: \$? = $ac_status" >&5
-+  echo "$as_me:9501: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_utf8_lib=yes
- else
-@@ -9511,12 +9510,12 @@
- cf_cv_header_path_utf8=
- cf_cv_library_path_utf8=
- 
--echo "${as_me:-configure}:9514: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:9513: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
- 
- cf_save_LIBS="$LIBS"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 9519 "configure"
-+#line 9518 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -9529,16 +9528,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9532: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9531: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9535: \$? = $ac_status" >&5
-+  echo "$as_me:9534: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9538: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9537: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9541: \$? = $ac_status" >&5
-+  echo "$as_me:9540: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_find_linkage_utf8=yes
-@@ -9552,7 +9551,7 @@
- LIBS="-lutf8  $cf_save_LIBS"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 9555 "configure"
-+#line 9554 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -9565,16 +9564,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9568: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9567: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9571: \$? = $ac_status" >&5
-+  echo "$as_me:9570: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9574: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9573: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9577: \$? = $ac_status" >&5
-+  echo "$as_me:9576: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_find_linkage_utf8=yes
-@@ -9591,9 +9590,9 @@
- 
- 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
- 
--echo "${as_me:-configure}:9594: testing find linkage for utf8 library ..." 1>&5
-+echo "${as_me:-configure}:9593: testing find linkage for utf8 library ..." 1>&5
- 
--echo "${as_me:-configure}:9596: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:9595: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
- 
- 	cf_save_CPPFLAGS="$CPPFLAGS"
- 	cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -9684,11 +9683,11 @@
- 		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}:9687: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9686: 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 9691 "configure"
-+#line 9690 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -9701,21 +9700,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9704: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9703: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9707: \$? = $ac_status" >&5
-+  echo "$as_me:9706: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9710: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9709: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9713: \$? = $ac_status" >&5
-+  echo "$as_me:9712: \$? = $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}:9718: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9717: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
- 
- 				cf_cv_find_linkage_utf8=maybe
- 				cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -9733,7 +9732,7 @@
- 
- 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
- 
--echo "${as_me:-configure}:9736: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:9735: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
- 
- 		cf_save_LIBS="$LIBS"
- 		cf_save_LDFLAGS="$LDFLAGS"
-@@ -9808,13 +9807,13 @@
- 				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}:9811: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9810: 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 9817 "configure"
-+#line 9816 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -9827,21 +9826,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9830: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9829: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9833: \$? = $ac_status" >&5
-+  echo "$as_me:9832: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9836: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9835: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9839: \$? = $ac_status" >&5
-+  echo "$as_me:9838: \$? = $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}:9844: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9843: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
- 
- 					cf_cv_find_linkage_utf8=yes
- 					cf_cv_library_file_utf8="-lutf8"
-@@ -9883,7 +9882,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:9886: result: $cf_cv_utf8_lib" >&5
-+echo "$as_me:9885: 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
-@@ -9918,7 +9917,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 9921 "configure"
-+#line 9920 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -9930,16 +9929,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9933: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9932: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9936: \$? = $ac_status" >&5
-+  echo "$as_me:9935: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9939: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9938: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9942: \$? = $ac_status" >&5
-+  echo "$as_me:9941: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -9956,7 +9955,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:9959: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:9958: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -9992,7 +9991,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:9995: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:9994: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -10024,14 +10023,14 @@
- 	fi
- 
- # This is needed on Tru64 5.0 to declare mbstate_t
--echo "$as_me:10027: checking if we must include wchar.h to declare mbstate_t" >&5
-+echo "$as_me:10026: 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_mbstate_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 10034 "configure"
-+#line 10033 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10049,23 +10048,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10052: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10051: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10055: \$? = $ac_status" >&5
-+  echo "$as_me:10054: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10058: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10057: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10061: \$? = $ac_status" >&5
-+  echo "$as_me:10060: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_mbstate_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 10068 "configure"
-+#line 10067 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10084,16 +10083,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10087: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10086: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10090: \$? = $ac_status" >&5
-+  echo "$as_me:10089: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10093: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10092: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10096: \$? = $ac_status" >&5
-+  echo "$as_me:10095: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_mbstate_t=yes
- else
-@@ -10105,7 +10104,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:10108: result: $cf_cv_mbstate_t" >&5
-+echo "$as_me:10107: result: $cf_cv_mbstate_t" >&5
- echo "${ECHO_T}$cf_cv_mbstate_t" >&6
- 
- if test "$cf_cv_mbstate_t" = yes ; then
-@@ -10123,14 +10122,14 @@
- fi
- 
- # This is needed on Tru64 5.0 to declare wchar_t
--echo "$as_me:10126: checking if we must include wchar.h to declare wchar_t" >&5
-+echo "$as_me:10125: checking if we must include wchar.h to declare wchar_t" >&5
- echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
- if test "${cf_cv_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 10133 "configure"
-+#line 10132 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10148,23 +10147,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10151: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10150: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10154: \$? = $ac_status" >&5
-+  echo "$as_me:10153: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10157: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10156: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10160: \$? = $ac_status" >&5
-+  echo "$as_me:10159: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 10167 "configure"
-+#line 10166 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10183,16 +10182,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10186: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10185: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10189: \$? = $ac_status" >&5
-+  echo "$as_me:10188: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10192: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10191: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10195: \$? = $ac_status" >&5
-+  echo "$as_me:10194: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_t=yes
- else
-@@ -10204,7 +10203,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:10207: result: $cf_cv_wchar_t" >&5
-+echo "$as_me:10206: result: $cf_cv_wchar_t" >&5
- echo "${ECHO_T}$cf_cv_wchar_t" >&6
- 
- if test "$cf_cv_wchar_t" = yes ; then
-@@ -10227,14 +10226,14 @@
- fi
- 
- # This is needed on Tru64 5.0 to declare wint_t
--echo "$as_me:10230: checking if we must include wchar.h to declare wint_t" >&5
-+echo "$as_me:10229: checking if we must include wchar.h to declare wint_t" >&5
- echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
- if test "${cf_cv_wint_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 10237 "configure"
-+#line 10236 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10252,23 +10251,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10255: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10254: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10258: \$? = $ac_status" >&5
-+  echo "$as_me:10257: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10261: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10260: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10264: \$? = $ac_status" >&5
-+  echo "$as_me:10263: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wint_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 10271 "configure"
-+#line 10270 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10287,16 +10286,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10290: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10289: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10293: \$? = $ac_status" >&5
-+  echo "$as_me:10292: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10296: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10295: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10299: \$? = $ac_status" >&5
-+  echo "$as_me:10298: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wint_t=yes
- else
-@@ -10308,7 +10307,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:10311: result: $cf_cv_wint_t" >&5
-+echo "$as_me:10310: result: $cf_cv_wint_t" >&5
- echo "${ECHO_T}$cf_cv_wint_t" >&6
- 
- if test "$cf_cv_wint_t" = yes ; then
-@@ -10340,7 +10339,7 @@
- fi
- 
- ###   use option --disable-lp64 to allow long chtype
--echo "$as_me:10343: checking whether to enable _LP64 definition in curses.h" >&5
-+echo "$as_me:10342: checking whether to enable _LP64 definition in curses.h" >&5
- echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6
- 
- # Check whether --enable-lp64 or --disable-lp64 was given.
-@@ -10350,7 +10349,7 @@
- else
-   with_lp64=$cf_dft_with_lp64
- fi;
--echo "$as_me:10353: result: $with_lp64" >&5
-+echo "$as_me:10352: result: $with_lp64" >&5
- echo "${ECHO_T}$with_lp64" >&6
- 
- if test "x$with_lp64" = xyes ; then
-@@ -10366,7 +10365,7 @@
- fi;
- if test "$enable_largefile" != no; then
- 
--  echo "$as_me:10369: checking for special C compiler options needed for large files" >&5
-+  echo "$as_me:10368: 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
-@@ -10378,7 +10377,7 @@
-      	 # 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 10381 "configure"
-+#line 10380 "configure"
- #include "confdefs.h"
- #include 
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10398,16 +10397,16 @@
- }
- _ACEOF
-      	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10401: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10400: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10404: \$? = $ac_status" >&5
-+  echo "$as_me:10403: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10407: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10406: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10410: \$? = $ac_status" >&5
-+  echo "$as_me:10409: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10417,16 +10416,16 @@
- rm -f conftest.$ac_objext
-      	 CC="$CC -n32"
-      	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10420: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10419: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10423: \$? = $ac_status" >&5
-+  echo "$as_me:10422: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10426: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10425: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10429: \$? = $ac_status" >&5
-+  echo "$as_me:10428: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_largefile_CC=' -n32'; break
- else
-@@ -10440,13 +10439,13 @@
-        rm -f conftest.$ac_ext
-     fi
- fi
--echo "$as_me:10443: result: $ac_cv_sys_largefile_CC" >&5
-+echo "$as_me:10442: 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:10449: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-+  echo "$as_me:10448: 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
-@@ -10454,7 +10453,7 @@
-   while :; do
-   ac_cv_sys_file_offset_bits=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10457 "configure"
-+#line 10456 "configure"
- #include "confdefs.h"
- #include 
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10474,16 +10473,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10477: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10476: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10480: \$? = $ac_status" >&5
-+  echo "$as_me:10479: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10483: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10482: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10486: \$? = $ac_status" >&5
-+  echo "$as_me:10485: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10492,7 +10491,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10495 "configure"
-+#line 10494 "configure"
- #include "confdefs.h"
- #define _FILE_OFFSET_BITS 64
- #include 
-@@ -10513,16 +10512,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10516: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10515: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10519: \$? = $ac_status" >&5
-+  echo "$as_me:10518: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10522: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10521: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10525: \$? = $ac_status" >&5
-+  echo "$as_me:10524: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_file_offset_bits=64; break
- else
-@@ -10533,7 +10532,7 @@
-   break
- done
- fi
--echo "$as_me:10536: result: $ac_cv_sys_file_offset_bits" >&5
-+echo "$as_me:10535: 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
- 
-@@ -10543,7 +10542,7 @@
- 
- fi
- rm -rf conftest*
--  echo "$as_me:10546: checking for _LARGE_FILES value needed for large files" >&5
-+  echo "$as_me:10545: 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
-@@ -10551,7 +10550,7 @@
-   while :; do
-   ac_cv_sys_large_files=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10554 "configure"
-+#line 10553 "configure"
- #include "confdefs.h"
- #include 
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10571,16 +10570,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10574: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10573: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10577: \$? = $ac_status" >&5
-+  echo "$as_me:10576: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10580: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10579: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10583: \$? = $ac_status" >&5
-+  echo "$as_me:10582: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10589,7 +10588,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10592 "configure"
-+#line 10591 "configure"
- #include "confdefs.h"
- #define _LARGE_FILES 1
- #include 
-@@ -10610,16 +10609,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10613: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10612: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10616: \$? = $ac_status" >&5
-+  echo "$as_me:10615: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10619: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10618: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10622: \$? = $ac_status" >&5
-+  echo "$as_me:10621: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_large_files=1; break
- else
-@@ -10630,7 +10629,7 @@
-   break
- done
- fi
--echo "$as_me:10633: result: $ac_cv_sys_large_files" >&5
-+echo "$as_me:10632: 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
- 
-@@ -10643,7 +10642,7 @@
- fi
- 
- 	if test "$enable_largefile" != no ; then
--	echo "$as_me:10646: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-+	echo "$as_me:10645: 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
-@@ -10651,7 +10650,7 @@
-   while :; do
-   ac_cv_sys_largefile_source=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10654 "configure"
-+#line 10653 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -10663,16 +10662,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10666: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10665: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10669: \$? = $ac_status" >&5
-+  echo "$as_me:10668: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10672: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10671: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10675: \$? = $ac_status" >&5
-+  echo "$as_me:10674: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10681,7 +10680,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10684 "configure"
-+#line 10683 "configure"
- #include "confdefs.h"
- #define _LARGEFILE_SOURCE 1
- #include 
-@@ -10694,16 +10693,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10697: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10696: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10700: \$? = $ac_status" >&5
-+  echo "$as_me:10699: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10703: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10702: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10706: \$? = $ac_status" >&5
-+  echo "$as_me:10705: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_largefile_source=1; break
- else
-@@ -10714,7 +10713,7 @@
-   break
- done
- fi
--echo "$as_me:10717: result: $ac_cv_sys_largefile_source" >&5
-+echo "$as_me:10716: 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
- 
-@@ -10728,13 +10727,13 @@
- # 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:10731: checking for fseeko" >&5
-+echo "$as_me:10730: 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 10737 "configure"
-+#line 10736 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -10746,16 +10745,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:10749: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10748: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10752: \$? = $ac_status" >&5
-+  echo "$as_me:10751: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:10755: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10754: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10758: \$? = $ac_status" >&5
-+  echo "$as_me:10757: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_fseeko=yes
- else
-@@ -10765,7 +10764,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:10768: result: $ac_cv_func_fseeko" >&5
-+echo "$as_me:10767: result: $ac_cv_func_fseeko" >&5
- echo "${ECHO_T}$ac_cv_func_fseeko" >&6
- if test $ac_cv_func_fseeko = yes; then
- 
-@@ -10786,14 +10785,14 @@
- 	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:10789: checking whether to use struct dirent64" >&5
-+	echo "$as_me:10788: 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 10796 "configure"
-+#line 10795 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10814,16 +10813,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10817: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10816: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10820: \$? = $ac_status" >&5
-+  echo "$as_me:10819: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10823: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10822: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10826: \$? = $ac_status" >&5
-+  echo "$as_me:10825: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_struct_dirent64=yes
- else
-@@ -10834,7 +10833,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:10837: result: $cf_cv_struct_dirent64" >&5
-+echo "$as_me:10836: result: $cf_cv_struct_dirent64" >&5
- echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
- 	test "$cf_cv_struct_dirent64" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -10844,7 +10843,7 @@
- 	fi
- 
- ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
--echo "$as_me:10847: checking if you want tparm not to use X/Open fixed-parameter list" >&5
-+echo "$as_me:10846: checking if you want tparm not to use X/Open fixed-parameter list" >&5
- echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6
- 
- # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given.
-@@ -10854,14 +10853,14 @@
- else
-   with_tparm_varargs=yes
- fi;
--echo "$as_me:10857: result: $with_tparm_varargs" >&5
-+echo "$as_me:10856: result: $with_tparm_varargs" >&5
- echo "${ECHO_T}$with_tparm_varargs" >&6
- NCURSES_TPARM_VARARGS=0
- test "x$with_tparm_varargs" = xyes && NCURSES_TPARM_VARARGS=1
- 
- ###   use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw
- if test "$with_ticlib" != no ; then
--echo "$as_me:10864: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
-+echo "$as_me:10863: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
- echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6
- 
- # Check whether --enable-tic-depends or --disable-tic-depends was given.
-@@ -10871,14 +10870,14 @@
- else
-   with_tic_depends=yes
- fi;
--echo "$as_me:10874: result: $with_tic_depends" >&5
-+echo "$as_me:10873: result: $with_tic_depends" >&5
- echo "${ECHO_T}$with_tic_depends" >&6
- else
- 	with_tic_depends=no
- fi
- 
- ###   use option --with-bool to override bool's type
--echo "$as_me:10881: checking for type of bool" >&5
-+echo "$as_me:10880: checking for type of bool" >&5
- echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
- 
- # Check whether --with-bool or --without-bool was given.
-@@ -10888,10 +10887,10 @@
- else
-   NCURSES_BOOL=auto
- fi;
--echo "$as_me:10891: result: $NCURSES_BOOL" >&5
-+echo "$as_me:10890: result: $NCURSES_BOOL" >&5
- echo "${ECHO_T}$NCURSES_BOOL" >&6
- 
--echo "$as_me:10894: checking for alternate terminal capabilities file" >&5
-+echo "$as_me:10893: checking for alternate terminal capabilities file" >&5
- echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6
- 
- # Check whether --with-caps or --without-caps was given.
-@@ -10902,11 +10901,11 @@
-   TERMINFO_CAPS=Caps
- fi;
- test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
--echo "$as_me:10905: result: $TERMINFO_CAPS" >&5
-+echo "$as_me:10904: result: $TERMINFO_CAPS" >&5
- echo "${ECHO_T}$TERMINFO_CAPS" >&6
- 
- ###   use option --with-chtype to override chtype's type
--echo "$as_me:10909: checking for type of chtype" >&5
-+echo "$as_me:10908: checking for type of chtype" >&5
- echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
- 
- # Check whether --with-chtype or --without-chtype was given.
-@@ -10916,11 +10915,11 @@
- else
-   NCURSES_CHTYPE=$cf_dft_chtype
- fi;
--echo "$as_me:10919: result: $NCURSES_CHTYPE" >&5
-+echo "$as_me:10918: result: $NCURSES_CHTYPE" >&5
- echo "${ECHO_T}$NCURSES_CHTYPE" >&6
- 
- ###   use option --with-ospeed to override ospeed's type
--echo "$as_me:10923: checking for type of ospeed" >&5
-+echo "$as_me:10922: checking for type of ospeed" >&5
- echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6
- 
- # Check whether --with-ospeed or --without-ospeed was given.
-@@ -10930,11 +10929,11 @@
- else
-   NCURSES_OSPEED=short
- fi;
--echo "$as_me:10933: result: $NCURSES_OSPEED" >&5
-+echo "$as_me:10932: result: $NCURSES_OSPEED" >&5
- echo "${ECHO_T}$NCURSES_OSPEED" >&6
- 
- ###   use option --with-mmask-t to override mmask_t's type
--echo "$as_me:10937: checking for type of mmask_t" >&5
-+echo "$as_me:10936: checking for type of mmask_t" >&5
- echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6
- 
- # Check whether --with-mmask-t or --without-mmask-t was given.
-@@ -10944,11 +10943,11 @@
- else
-   NCURSES_MMASK_T=$cf_dft_mmask_t
- fi;
--echo "$as_me:10947: result: $NCURSES_MMASK_T" >&5
-+echo "$as_me:10946: result: $NCURSES_MMASK_T" >&5
- echo "${ECHO_T}$NCURSES_MMASK_T" >&6
- 
- ###   use option --with-ccharw-max to override CCHARW_MAX size
--echo "$as_me:10951: checking for size CCHARW_MAX" >&5
-+echo "$as_me:10950: checking for size CCHARW_MAX" >&5
- echo $ECHO_N "checking for size CCHARW_MAX... $ECHO_C" >&6
- 
- # Check whether --with-ccharw-max or --without-ccharw-max was given.
-@@ -10958,11 +10957,11 @@
- else
-   NCURSES_CCHARW_MAX=5
- fi;
--echo "$as_me:10961: result: $NCURSES_CCHARW_MAX" >&5
-+echo "$as_me:10960: result: $NCURSES_CCHARW_MAX" >&5
- echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
- 
- ###   use option --with-tparm-arg to override tparm's argument type
--echo "$as_me:10965: checking for type of tparm args" >&5
-+echo "$as_me:10964: checking for type of tparm args" >&5
- echo $ECHO_N "checking for type of tparm args... $ECHO_C" >&6
- 
- # Check whether --with-tparm-arg or --without-tparm-arg was given.
-@@ -10972,11 +10971,11 @@
- else
-   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
- fi;
--echo "$as_me:10975: result: $NCURSES_TPARM_ARG" >&5
-+echo "$as_me:10974: result: $NCURSES_TPARM_ARG" >&5
- echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
- 
- ### Enable compiling-in rcs id's
--echo "$as_me:10979: checking if RCS identifiers should be compiled-in" >&5
-+echo "$as_me:10978: checking if RCS identifiers should be compiled-in" >&5
- echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6
- 
- # Check whether --with-rcs-ids or --without-rcs-ids was given.
-@@ -10986,7 +10985,7 @@
- else
-   with_rcs_ids=no
- fi;
--echo "$as_me:10989: result: $with_rcs_ids" >&5
-+echo "$as_me:10988: result: $with_rcs_ids" >&5
- echo "${ECHO_T}$with_rcs_ids" >&6
- test "x$with_rcs_ids" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -10995,7 +10994,7 @@
- 
- ###############################################################################
- 
--echo "$as_me:10998: checking format of man-pages" >&5
-+echo "$as_me:10997: checking format of man-pages" >&5
- echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6
- 
- # Check whether --with-manpage-format or --without-manpage-format was given.
-@@ -11084,14 +11083,14 @@
- 	;;
- esac
- 
--echo "$as_me:11087: result: $MANPAGE_FORMAT" >&5
-+echo "$as_me:11086: result: $MANPAGE_FORMAT" >&5
- echo "${ECHO_T}$MANPAGE_FORMAT" >&6
- if test -n "$cf_unknown" ; then
--	{ echo "$as_me:11090: WARNING: Unexpected manpage-format $cf_unknown" >&5
-+	{ echo "$as_me:11089: WARNING: Unexpected manpage-format $cf_unknown" >&5
- echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
- fi
- 
--echo "$as_me:11094: checking for manpage renaming" >&5
-+echo "$as_me:11093: checking for manpage renaming" >&5
- echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6
- 
- # Check whether --with-manpage-renames or --without-manpage-renames was given.
-@@ -11119,7 +11118,7 @@
- 	if test -f $srcdir/man/$MANPAGE_RENAMES ; then
- 		MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES
- 	elif test ! -f $MANPAGE_RENAMES ; then
--		{ { echo "$as_me:11122: error: not a filename: $MANPAGE_RENAMES" >&5
-+		{ { echo "$as_me:11121: error: not a filename: $MANPAGE_RENAMES" >&5
- echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
-@@ -11133,10 +11132,10 @@
- 	fi
- fi
- 
--echo "$as_me:11136: result: $MANPAGE_RENAMES" >&5
-+echo "$as_me:11135: result: $MANPAGE_RENAMES" >&5
- echo "${ECHO_T}$MANPAGE_RENAMES" >&6
- 
--echo "$as_me:11139: checking if manpage aliases will be installed" >&5
-+echo "$as_me:11138: checking if manpage aliases will be installed" >&5
- echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6
- 
- # Check whether --with-manpage-aliases or --without-manpage-aliases was given.
-@@ -11147,7 +11146,7 @@
-   MANPAGE_ALIASES=yes
- fi;
- 
--echo "$as_me:11150: result: $MANPAGE_ALIASES" >&5
-+echo "$as_me:11149: result: $MANPAGE_ALIASES" >&5
- echo "${ECHO_T}$MANPAGE_ALIASES" >&6
- 
- case "x$LN_S" in
-@@ -11161,7 +11160,7 @@
- 
- MANPAGE_SYMLINKS=no
- if test "$MANPAGE_ALIASES" = yes ; then
--echo "$as_me:11164: checking if manpage symlinks should be used" >&5
-+echo "$as_me:11163: checking if manpage symlinks should be used" >&5
- echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6
- 
- # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given.
-@@ -11174,17 +11173,17 @@
- 
- if test "$$cf_use_symlinks" = no; then
- if test "$MANPAGE_SYMLINKS" = yes ; then
--	{ echo "$as_me:11177: WARNING: cannot make symlinks" >&5
-+	{ echo "$as_me:11176: WARNING: cannot make symlinks" >&5
- echo "$as_me: WARNING: cannot make symlinks" >&2;}
- 	MANPAGE_SYMLINKS=no
- fi
- fi
- 
--echo "$as_me:11183: result: $MANPAGE_SYMLINKS" >&5
-+echo "$as_me:11182: result: $MANPAGE_SYMLINKS" >&5
- echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
- fi
- 
--echo "$as_me:11187: checking for manpage tbl" >&5
-+echo "$as_me:11186: checking for manpage tbl" >&5
- echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6
- 
- # Check whether --with-manpage-tbl or --without-manpage-tbl was given.
-@@ -11195,7 +11194,7 @@
-   MANPAGE_TBL=no
- fi;
- 
--echo "$as_me:11198: result: $MANPAGE_TBL" >&5
-+echo "$as_me:11197: result: $MANPAGE_TBL" >&5
- echo "${ECHO_T}$MANPAGE_TBL" >&6
- 
- if test "$prefix" = "NONE" ; then
-@@ -11528,7 +11527,7 @@
- ###############################################################################
- 
- ### Note that some functions (such as const) are normally disabled anyway.
--echo "$as_me:11531: checking if you want to build with function extensions" >&5
-+echo "$as_me:11530: checking if you want to build with function extensions" >&5
- echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6
- 
- # Check whether --enable-ext-funcs or --disable-ext-funcs was given.
-@@ -11538,7 +11537,7 @@
- else
-   with_ext_funcs=yes
- fi;
--echo "$as_me:11541: result: $with_ext_funcs" >&5
-+echo "$as_me:11540: result: $with_ext_funcs" >&5
- echo "${ECHO_T}$with_ext_funcs" >&6
- if test "x$with_ext_funcs" = xyes ; then
- 	NCURSES_EXT_FUNCS=1
-@@ -11593,7 +11592,7 @@
- 	GENERATED_EXT_FUNCS=
- fi
- 
--echo "$as_me:11596: checking if you want to build with SCREEN extensions" >&5
-+echo "$as_me:11595: checking if you want to build with SCREEN extensions" >&5
- echo $ECHO_N "checking if you want to build with SCREEN extensions... $ECHO_C" >&6
- 
- # Check whether --enable-sp-funcs or --disable-sp-funcs was given.
-@@ -11603,7 +11602,7 @@
- else
-   with_sp_funcs=$cf_dft_ext_spfuncs
- fi;
--echo "$as_me:11606: result: $with_sp_funcs" >&5
-+echo "$as_me:11605: result: $with_sp_funcs" >&5
- echo "${ECHO_T}$with_sp_funcs" >&6
- if test "x$with_sp_funcs" = xyes ; then
- 	NCURSES_SP_FUNCS=1
-@@ -11618,7 +11617,7 @@
- 	GENERATED_SP_FUNCS=
- fi
- 
--echo "$as_me:11621: checking if you want to build with terminal-driver" >&5
-+echo "$as_me:11620: checking if you want to build with terminal-driver" >&5
- echo $ECHO_N "checking if you want to build with terminal-driver... $ECHO_C" >&6
- 
- # Check whether --enable-term-driver or --disable-term-driver was given.
-@@ -11628,7 +11627,7 @@
- else
-   with_term_driver=no
- fi;
--echo "$as_me:11631: result: $with_term_driver" >&5
-+echo "$as_me:11630: result: $with_term_driver" >&5
- echo "${ECHO_T}$with_term_driver" >&6
- if test "x$with_term_driver" = xyes ; then
- 
-@@ -11637,19 +11636,19 @@
- EOF
- 
- 	if test "x$with_termlib" != xno ; then
--		{ { echo "$as_me:11640: error: The term-driver option conflicts with the termlib option" >&5
-+		{ { echo "$as_me:11639: error: The term-driver option conflicts with the termlib option" >&5
- echo "$as_me: error: The term-driver option conflicts with the termlib option" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
- 	if test "x$with_sp_funcs" != xyes ; then
--		{ { echo "$as_me:11645: error: The term-driver option relies upon sp-funcs" >&5
-+		{ { echo "$as_me:11644: error: The term-driver option relies upon sp-funcs" >&5
- echo "$as_me: error: The term-driver option relies upon sp-funcs" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
- fi
- 
- ###   use option --enable-const to turn on use of const beyond that in XSI.
--echo "$as_me:11652: checking for extended use of const keyword" >&5
-+echo "$as_me:11651: checking for extended use of const keyword" >&5
- echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
- 
- # Check whether --enable-const or --disable-const was given.
-@@ -11659,7 +11658,7 @@
- else
-   with_ext_const=$cf_dft_ext_const
- fi;
--echo "$as_me:11662: result: $with_ext_const" >&5
-+echo "$as_me:11661: result: $with_ext_const" >&5
- echo "${ECHO_T}$with_ext_const" >&6
- NCURSES_CONST='/*nothing*/'
- if test "x$with_ext_const" = xyes ; then
-@@ -11667,7 +11666,7 @@
- fi
- 
- ###   use option --enable-ext-colors to turn on use of colors beyond 16.
--echo "$as_me:11670: checking if you want to use extended colors" >&5
-+echo "$as_me:11669: checking if you want to use extended colors" >&5
- echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6
- 
- # Check whether --enable-ext-colors or --disable-ext-colors was given.
-@@ -11677,12 +11676,12 @@
- else
-   with_ext_colors=$cf_dft_ext_colors
- fi;
--echo "$as_me:11680: result: $with_ext_colors" >&5
-+echo "$as_me:11679: result: $with_ext_colors" >&5
- echo "${ECHO_T}$with_ext_colors" >&6
- NCURSES_EXT_COLORS=0
- if test "x$with_ext_colors" = xyes ; then
- 	if test "x$with_widec" != xyes ; then
--		{ echo "$as_me:11685: WARNING: This option applies only to wide-character library" >&5
-+		{ echo "$as_me:11684: WARNING: This option applies only to wide-character library" >&5
- echo "$as_me: WARNING: This option applies only to wide-character library" >&2;}
- 	else
- 		# cannot be ABI 5 since it changes sizeof(cchar_t)
-@@ -11692,7 +11691,7 @@
- 	(5.*)
- 		cf_cv_rel_version=6.0
- 		cf_cv_abi_version=6
--		{ echo "$as_me:11695: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
-+		{ echo "$as_me:11694: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
- echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
- 		;;
- 	esac
-@@ -11708,7 +11707,7 @@
- fi
- 
- ###   use option --enable-ext-mouse to modify coding to support 5-button mice
--echo "$as_me:11711: checking if you want to use extended mouse encoding" >&5
-+echo "$as_me:11710: checking if you want to use extended mouse encoding" >&5
- echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6
- 
- # Check whether --enable-ext-mouse or --disable-ext-mouse was given.
-@@ -11718,7 +11717,7 @@
- else
-   with_ext_mouse=$cf_dft_ext_mouse
- fi;
--echo "$as_me:11721: result: $with_ext_mouse" >&5
-+echo "$as_me:11720: result: $with_ext_mouse" >&5
- echo "${ECHO_T}$with_ext_mouse" >&6
- NCURSES_MOUSE_VERSION=1
- if test "x$with_ext_mouse" = xyes ; then
-@@ -11729,7 +11728,7 @@
- 	(5.*)
- 		cf_cv_rel_version=6.0
- 		cf_cv_abi_version=6
--		{ echo "$as_me:11732: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
-+		{ echo "$as_me:11731: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
- echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
- 		;;
- 	esac
-@@ -11738,7 +11737,7 @@
- fi
- 
- ###   use option --enable-ext-putwin to turn on extended screendumps
--echo "$as_me:11741: checking if you want to use extended putwin/screendump" >&5
-+echo "$as_me:11740: checking if you want to use extended putwin/screendump" >&5
- echo $ECHO_N "checking if you want to use extended putwin/screendump... $ECHO_C" >&6
- 
- # Check whether --enable-ext-putwin or --disable-ext-putwin was given.
-@@ -11748,7 +11747,7 @@
- else
-   with_ext_putwin=$cf_dft_ext_putwin
- fi;
--echo "$as_me:11751: result: $with_ext_putwin" >&5
-+echo "$as_me:11750: result: $with_ext_putwin" >&5
- echo "${ECHO_T}$with_ext_putwin" >&6
- if test "x$with_ext_putwin" = xyes ; then
- 
-@@ -11758,7 +11757,7 @@
- 
- fi
- 
--echo "$as_me:11761: checking if you want \$NCURSES_NO_PADDING code" >&5
-+echo "$as_me:11760: checking if you want \$NCURSES_NO_PADDING code" >&5
- echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6
- 
- # Check whether --enable-no-padding or --disable-no-padding was given.
-@@ -11768,20 +11767,20 @@
- else
-   with_no_padding=$with_ext_funcs
- fi;
--echo "$as_me:11771: result: $with_no_padding" >&5
-+echo "$as_me:11770: result: $with_no_padding" >&5
- echo "${ECHO_T}$with_no_padding" >&6
- test "x$with_no_padding" = xyes &&
- cat >>confdefs.h <<\EOF
- #define NCURSES_NO_PADDING 1
- EOF
- 
--echo "$as_me:11778: checking for ANSI C header files" >&5
-+echo "$as_me:11777: 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 11784 "configure"
-+#line 11783 "configure"
- #include "confdefs.h"
- #include 
- #include 
-@@ -11789,13 +11788,13 @@
- #include 
- 
- _ACEOF
--if { (eval echo "$as_me:11792: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:11791: \"$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:11798: \$? = $ac_status" >&5
-+  echo "$as_me:11797: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -11817,7 +11816,7 @@
- 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 11820 "configure"
-+#line 11819 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -11835,7 +11834,7 @@
- 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 11838 "configure"
-+#line 11837 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -11856,7 +11855,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11859 "configure"
-+#line 11858 "configure"
- #include "confdefs.h"
- #include 
- #if ((' ' & 0x0FF) == 0x020)
-@@ -11882,15 +11881,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:11885: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11884: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11888: \$? = $ac_status" >&5
-+  echo "$as_me:11887: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:11890: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11889: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11893: \$? = $ac_status" >&5
-+  echo "$as_me:11892: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -11903,7 +11902,7 @@
- fi
- fi
- fi
--echo "$as_me:11906: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:11905: result: $ac_cv_header_stdc" >&5
- echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
- 
-@@ -11919,28 +11918,28 @@
-                   inttypes.h stdint.h unistd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:11922: checking for $ac_header" >&5
-+echo "$as_me:11921: 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 11928 "configure"
-+#line 11927 "configure"
- #include "confdefs.h"
- $ac_includes_default
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11934: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11933: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11937: \$? = $ac_status" >&5
-+  echo "$as_me:11936: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11940: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11939: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11943: \$? = $ac_status" >&5
-+  echo "$as_me:11942: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Header=yes"
- else
-@@ -11950,7 +11949,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:11953: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:11952: 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 <&5
-+echo "$as_me:11962: checking for signed char" >&5
- echo $ECHO_N "checking for signed char... $ECHO_C" >&6
- if test "${ac_cv_type_signed_char+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11969 "configure"
-+#line 11968 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -11981,16 +11980,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11984: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11983: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11987: \$? = $ac_status" >&5
-+  echo "$as_me:11986: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11990: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11989: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11993: \$? = $ac_status" >&5
-+  echo "$as_me:11992: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_signed_char=yes
- else
-@@ -12000,10 +11999,10 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:12003: result: $ac_cv_type_signed_char" >&5
-+echo "$as_me:12002: result: $ac_cv_type_signed_char" >&5
- echo "${ECHO_T}$ac_cv_type_signed_char" >&6
- 
--echo "$as_me:12006: checking size of signed char" >&5
-+echo "$as_me:12005: checking size of signed char" >&5
- echo $ECHO_N "checking size of signed char... $ECHO_C" >&6
- if test "${ac_cv_sizeof_signed_char+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12012,7 +12011,7 @@
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
--#line 12015 "configure"
-+#line 12014 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12024,21 +12023,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12027: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12026: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12030: \$? = $ac_status" >&5
-+  echo "$as_me:12029: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12033: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12032: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12036: \$? = $ac_status" >&5
-+  echo "$as_me:12035: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=0 ac_mid=0
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 12041 "configure"
-+#line 12040 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12050,16 +12049,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12053: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12052: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12056: \$? = $ac_status" >&5
-+  echo "$as_me:12055: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12059: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12058: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12062: \$? = $ac_status" >&5
-+  echo "$as_me:12061: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid; break
- else
-@@ -12075,7 +12074,7 @@
- ac_hi=-1 ac_mid=-1
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 12078 "configure"
-+#line 12077 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12087,16 +12086,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12090: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12089: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12093: \$? = $ac_status" >&5
-+  echo "$as_me:12092: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12096: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12095: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12099: \$? = $ac_status" >&5
-+  echo "$as_me:12098: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=$ac_mid; break
- else
-@@ -12112,7 +12111,7 @@
- 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 12115 "configure"
-+#line 12114 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12124,16 +12123,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12127: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12126: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12130: \$? = $ac_status" >&5
-+  echo "$as_me:12129: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12133: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12132: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12136: \$? = $ac_status" >&5
-+  echo "$as_me:12135: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid
- else
-@@ -12146,12 +12145,12 @@
- ac_cv_sizeof_signed_char=$ac_lo
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:12149: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:12148: 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 12154 "configure"
-+#line 12153 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12167,15 +12166,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:12170: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12169: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12173: \$? = $ac_status" >&5
-+  echo "$as_me:12172: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:12175: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12174: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12178: \$? = $ac_status" >&5
-+  echo "$as_me:12177: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_signed_char=`cat conftest.val`
- else
-@@ -12191,7 +12190,7 @@
-   ac_cv_sizeof_signed_char=0
- fi
- fi
--echo "$as_me:12194: result: $ac_cv_sizeof_signed_char" >&5
-+echo "$as_me:12193: result: $ac_cv_sizeof_signed_char" >&5
- echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
- cat >>confdefs.h <&5
-+echo "$as_me:12204: checking if you want to use signed Boolean array in term.h" >&5
- echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6
- 
- # Check whether --enable-signed-char or --disable-signed-char was given.
-@@ -12212,12 +12211,12 @@
- else
-   with_signed_char=no
- fi;
--echo "$as_me:12215: result: $with_signed_char" >&5
-+echo "$as_me:12214: result: $with_signed_char" >&5
- echo "${ECHO_T}$with_signed_char" >&6
- test "x$with_signed_char" != xyes && NCURSES_SBOOL="char"
- 
- ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
--echo "$as_me:12220: checking if you want SIGWINCH handler" >&5
-+echo "$as_me:12219: checking if you want SIGWINCH handler" >&5
- echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6
- 
- # Check whether --enable-sigwinch or --disable-sigwinch was given.
-@@ -12227,7 +12226,7 @@
- else
-   with_sigwinch=$with_ext_funcs
- fi;
--echo "$as_me:12230: result: $with_sigwinch" >&5
-+echo "$as_me:12229: result: $with_sigwinch" >&5
- echo "${ECHO_T}$with_sigwinch" >&6
- test "x$with_sigwinch" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12235,7 +12234,7 @@
- EOF
- 
- ###   use option --enable-tcap-names to allow user to define new capabilities
--echo "$as_me:12238: checking if you want user-definable terminal capabilities like termcap" >&5
-+echo "$as_me:12237: checking if you want user-definable terminal capabilities like termcap" >&5
- echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6
- 
- # Check whether --enable-tcap-names or --disable-tcap-names was given.
-@@ -12245,7 +12244,7 @@
- else
-   with_tcap_names=$with_ext_funcs
- fi;
--echo "$as_me:12248: result: $with_tcap_names" >&5
-+echo "$as_me:12247: result: $with_tcap_names" >&5
- echo "${ECHO_T}$with_tcap_names" >&6
- NCURSES_XNAMES=0
- test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1
-@@ -12253,7 +12252,7 @@
- ###############################################################################
- # These options are relatively safe to experiment with.
- 
--echo "$as_me:12256: checking if you want all development code" >&5
-+echo "$as_me:12255: checking if you want all development code" >&5
- echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
- 
- # Check whether --with-develop or --without-develop was given.
-@@ -12263,11 +12262,11 @@
- else
-   with_develop=no
- fi;
--echo "$as_me:12266: result: $with_develop" >&5
-+echo "$as_me:12265: result: $with_develop" >&5
- echo "${ECHO_T}$with_develop" >&6
- 
- ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
--echo "$as_me:12270: checking if you want hard-tabs code" >&5
-+echo "$as_me:12269: checking if you want hard-tabs code" >&5
- echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6
- 
- # Check whether --enable-hard-tabs or --disable-hard-tabs was given.
-@@ -12277,7 +12276,7 @@
- else
-   enable_hard_tabs=$with_develop
- fi;
--echo "$as_me:12280: result: $enable_hard_tabs" >&5
-+echo "$as_me:12279: result: $enable_hard_tabs" >&5
- echo "${ECHO_T}$enable_hard_tabs" >&6
- test "x$enable_hard_tabs" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12285,7 +12284,7 @@
- EOF
- 
- ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
--echo "$as_me:12288: checking if you want limited support for xmc" >&5
-+echo "$as_me:12287: checking if you want limited support for xmc" >&5
- echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6
- 
- # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given.
-@@ -12295,7 +12294,7 @@
- else
-   enable_xmc_glitch=$with_develop
- fi;
--echo "$as_me:12298: result: $enable_xmc_glitch" >&5
-+echo "$as_me:12297: result: $enable_xmc_glitch" >&5
- echo "${ECHO_T}$enable_xmc_glitch" >&6
- test "x$enable_xmc_glitch" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12305,7 +12304,7 @@
- ###############################################################################
- # These are just experimental, probably should not be in a package:
- 
--echo "$as_me:12308: checking if you do not want to assume colors are white-on-black" >&5
-+echo "$as_me:12307: checking if you do not want to assume colors are white-on-black" >&5
- echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6
- 
- # Check whether --enable-assumed-color or --disable-assumed-color was given.
-@@ -12315,7 +12314,7 @@
- else
-   with_assumed_color=yes
- fi;
--echo "$as_me:12318: result: $with_assumed_color" >&5
-+echo "$as_me:12317: result: $with_assumed_color" >&5
- echo "${ECHO_T}$with_assumed_color" >&6
- test "x$with_assumed_color" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12323,7 +12322,7 @@
- EOF
- 
- ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
--echo "$as_me:12326: checking if you want hashmap scrolling-optimization code" >&5
-+echo "$as_me:12325: checking if you want hashmap scrolling-optimization code" >&5
- echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6
- 
- # Check whether --enable-hashmap or --disable-hashmap was given.
-@@ -12333,7 +12332,7 @@
- else
-   with_hashmap=yes
- fi;
--echo "$as_me:12336: result: $with_hashmap" >&5
-+echo "$as_me:12335: result: $with_hashmap" >&5
- echo "${ECHO_T}$with_hashmap" >&6
- test "x$with_hashmap" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12341,7 +12340,7 @@
- EOF
- 
- ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
--echo "$as_me:12344: checking if you want colorfgbg code" >&5
-+echo "$as_me:12343: checking if you want colorfgbg code" >&5
- echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6
- 
- # Check whether --enable-colorfgbg or --disable-colorfgbg was given.
-@@ -12351,7 +12350,7 @@
- else
-   with_colorfgbg=no
- fi;
--echo "$as_me:12354: result: $with_colorfgbg" >&5
-+echo "$as_me:12353: result: $with_colorfgbg" >&5
- echo "${ECHO_T}$with_colorfgbg" >&6
- test "x$with_colorfgbg" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12359,7 +12358,7 @@
- EOF
- 
- ###   use option --enable-interop to turn on use of bindings used for interop
--echo "$as_me:12362: checking if you want interop bindings" >&5
-+echo "$as_me:12361: checking if you want interop bindings" >&5
- echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6
- 
- # Check whether --enable-interop or --disable-interop was given.
-@@ -12369,7 +12368,7 @@
- else
-   with_exp_interop=$cf_dft_interop
- fi;
--echo "$as_me:12372: result: $with_exp_interop" >&5
-+echo "$as_me:12371: result: $with_exp_interop" >&5
- echo "${ECHO_T}$with_exp_interop" >&6
- 
- NCURSES_INTEROP_FUNCS=0
-@@ -12378,7 +12377,7 @@
- # This is still experimental (20080329), but should ultimately be moved to
- # the script-block --with-normal, etc.
- 
--echo "$as_me:12381: checking if you want to link with the pthread library" >&5
-+echo "$as_me:12380: checking if you want to link with the pthread library" >&5
- echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6
- 
- # Check whether --with-pthread or --without-pthread was given.
-@@ -12388,27 +12387,27 @@
- else
-   with_pthread=no
- fi;
--echo "$as_me:12391: result: $with_pthread" >&5
-+echo "$as_me:12390: result: $with_pthread" >&5
- echo "${ECHO_T}$with_pthread" >&6
- 
- if test "$with_pthread" != no ; then
--	echo "$as_me:12395: checking for pthread.h" >&5
-+	echo "$as_me:12394: checking for pthread.h" >&5
- echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
- if test "${ac_cv_header_pthread_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12401 "configure"
-+#line 12400 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:12405: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:12404: \"$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:12411: \$? = $ac_status" >&5
-+  echo "$as_me:12410: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -12427,7 +12426,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:12430: result: $ac_cv_header_pthread_h" >&5
-+echo "$as_me:12429: result: $ac_cv_header_pthread_h" >&5
- echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
- if test $ac_cv_header_pthread_h = yes; then
- 
-@@ -12437,7 +12436,7 @@
- 
- 	for cf_lib_pthread in pthread c_r
- 	do
--	    echo "$as_me:12440: checking if we can link with the $cf_lib_pthread library" >&5
-+	    echo "$as_me:12439: checking if we can link with the $cf_lib_pthread library" >&5
- echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6
- 	    cf_save_LIBS="$LIBS"
- 
-@@ -12458,7 +12457,7 @@
- LIBS="$cf_add_libs"
- 
- 	    cat >conftest.$ac_ext <<_ACEOF
--#line 12461 "configure"
-+#line 12460 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -12475,16 +12474,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12478: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12477: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12481: \$? = $ac_status" >&5
-+  echo "$as_me:12480: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12484: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12483: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12487: \$? = $ac_status" >&5
-+  echo "$as_me:12486: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   with_pthread=yes
- else
-@@ -12494,7 +12493,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	    LIBS="$cf_save_LIBS"
--	    echo "$as_me:12497: result: $with_pthread" >&5
-+	    echo "$as_me:12496: result: $with_pthread" >&5
- echo "${ECHO_T}$with_pthread" >&6
- 	    test "$with_pthread" = yes && break
- 	done
-@@ -12522,7 +12521,7 @@
- EOF
- 
- 	else
--	    { { echo "$as_me:12525: error: Cannot link with pthread library" >&5
-+	    { { echo "$as_me:12524: error: Cannot link with pthread library" >&5
- echo "$as_me: error: Cannot link with pthread library" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
-@@ -12532,13 +12531,13 @@
- fi
- 
- if test "x$with_pthread" != xno; then
--	echo "$as_me:12535: checking for pthread_kill" >&5
-+	echo "$as_me:12534: checking for pthread_kill" >&5
- echo $ECHO_N "checking for pthread_kill... $ECHO_C" >&6
- if test "${ac_cv_func_pthread_kill+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12541 "configure"
-+#line 12540 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char pthread_kill (); below.  */
-@@ -12569,16 +12568,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12572: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12571: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12575: \$? = $ac_status" >&5
-+  echo "$as_me:12574: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12578: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12577: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12581: \$? = $ac_status" >&5
-+  echo "$as_me:12580: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_pthread_kill=yes
- else
-@@ -12588,11 +12587,11 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:12591: result: $ac_cv_func_pthread_kill" >&5
-+echo "$as_me:12590: result: $ac_cv_func_pthread_kill" >&5
- echo "${ECHO_T}$ac_cv_func_pthread_kill" >&6
- if test $ac_cv_func_pthread_kill = yes; then
- 
--		echo "$as_me:12595: checking if you want to allow EINTR in wgetch with pthreads" >&5
-+		echo "$as_me:12594: checking if you want to allow EINTR in wgetch with pthreads" >&5
- echo $ECHO_N "checking if you want to allow EINTR in wgetch with pthreads... $ECHO_C" >&6
- 
- # Check whether --enable-pthreads-eintr or --disable-pthreads-eintr was given.
-@@ -12602,7 +12601,7 @@
- else
-   use_pthreads_eintr=no
- fi;
--		echo "$as_me:12605: result: $use_pthreads_eintr" >&5
-+		echo "$as_me:12604: result: $use_pthreads_eintr" >&5
- echo "${ECHO_T}$use_pthreads_eintr" >&6
- 		if test "x$use_pthreads_eintr" = xyes ; then
- 
-@@ -12613,7 +12612,7 @@
- 		fi
- fi
- 
--	echo "$as_me:12616: checking if you want to use weak-symbols for pthreads" >&5
-+	echo "$as_me:12615: checking if you want to use weak-symbols for pthreads" >&5
- echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6
- 
- # Check whether --enable-weak-symbols or --disable-weak-symbols was given.
-@@ -12623,18 +12622,18 @@
- else
-   use_weak_symbols=no
- fi;
--	echo "$as_me:12626: result: $use_weak_symbols" >&5
-+	echo "$as_me:12625: result: $use_weak_symbols" >&5
- echo "${ECHO_T}$use_weak_symbols" >&6
- 	if test "x$use_weak_symbols" = xyes ; then
- 
--echo "$as_me:12630: checking if $CC supports weak symbols" >&5
-+echo "$as_me:12629: checking if $CC supports weak symbols" >&5
- echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6
- if test "${cf_cv_weak_symbols+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 12637 "configure"
-+#line 12636 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -12660,16 +12659,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12663: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12662: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12666: \$? = $ac_status" >&5
-+  echo "$as_me:12665: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12669: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12668: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12672: \$? = $ac_status" >&5
-+  echo "$as_me:12671: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_weak_symbols=yes
- else
-@@ -12680,7 +12679,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:12683: result: $cf_cv_weak_symbols" >&5
-+echo "$as_me:12682: result: $cf_cv_weak_symbols" >&5
- echo "${ECHO_T}$cf_cv_weak_symbols" >&6
- 
- 	else
-@@ -12713,7 +12712,7 @@
- # opaque outside of that, so there is no --enable-opaque option.  We can use
- # this option without --with-pthreads, but this will be always set for
- # pthreads.
--echo "$as_me:12716: checking if you want reentrant code" >&5
-+echo "$as_me:12715: checking if you want reentrant code" >&5
- echo $ECHO_N "checking if you want reentrant code... $ECHO_C" >&6
- 
- # Check whether --enable-reentrant or --disable-reentrant was given.
-@@ -12723,7 +12722,7 @@
- else
-   with_reentrant=no
- fi;
--echo "$as_me:12726: result: $with_reentrant" >&5
-+echo "$as_me:12725: result: $with_reentrant" >&5
- echo "${ECHO_T}$with_reentrant" >&6
- if test "x$with_reentrant" = xyes ; then
- 	cf_cv_enable_reentrant=1
-@@ -12796,7 +12795,7 @@
- 	(5.*)
- 		cf_cv_rel_version=6.0
- 		cf_cv_abi_version=6
--		{ echo "$as_me:12799: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
-+		{ echo "$as_me:12798: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
- echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
- 		;;
- 	esac
-@@ -12811,7 +12810,7 @@
- 
- ### Allow using a different wrap-prefix
- if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
--	echo "$as_me:12814: checking for prefix used to wrap public variables" >&5
-+	echo "$as_me:12813: checking for prefix used to wrap public variables" >&5
- echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6
- 
- # Check whether --with-wrap-prefix or --without-wrap-prefix was given.
-@@ -12821,7 +12820,7 @@
- else
-   NCURSES_WRAP_PREFIX=_nc_
- fi;
--	echo "$as_me:12824: result: $NCURSES_WRAP_PREFIX" >&5
-+	echo "$as_me:12823: result: $NCURSES_WRAP_PREFIX" >&5
- echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
- else
- 	NCURSES_WRAP_PREFIX=_nc_
-@@ -12831,7 +12830,7 @@
- #define NCURSES_WRAP_PREFIX "$NCURSES_WRAP_PREFIX"
- EOF
- 
--echo "$as_me:12834: checking if you want experimental safe-sprintf code" >&5
-+echo "$as_me:12833: checking if you want experimental safe-sprintf code" >&5
- echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6
- 
- # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given.
-@@ -12841,7 +12840,7 @@
- else
-   with_safe_sprintf=no
- fi;
--echo "$as_me:12844: result: $with_safe_sprintf" >&5
-+echo "$as_me:12843: result: $with_safe_sprintf" >&5
- echo "${ECHO_T}$with_safe_sprintf" >&6
- test "x$with_safe_sprintf" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12851,7 +12850,7 @@
- ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
- # when hashmap is used scroll hints are useless
- if test "$with_hashmap" = no ; then
--echo "$as_me:12854: checking if you want to experiment without scrolling-hints code" >&5
-+echo "$as_me:12853: checking if you want to experiment without scrolling-hints code" >&5
- echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6
- 
- # Check whether --enable-scroll-hints or --disable-scroll-hints was given.
-@@ -12861,7 +12860,7 @@
- else
-   with_scroll_hints=yes
- fi;
--echo "$as_me:12864: result: $with_scroll_hints" >&5
-+echo "$as_me:12863: result: $with_scroll_hints" >&5
- echo "${ECHO_T}$with_scroll_hints" >&6
- test "x$with_scroll_hints" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12870,7 +12869,7 @@
- 
- fi
- 
--echo "$as_me:12873: checking if you want wgetch-events code" >&5
-+echo "$as_me:12872: checking if you want wgetch-events code" >&5
- echo $ECHO_N "checking if you want wgetch-events code... $ECHO_C" >&6
- 
- # Check whether --enable-wgetch-events or --disable-wgetch-events was given.
-@@ -12880,7 +12879,7 @@
- else
-   with_wgetch_events=no
- fi;
--echo "$as_me:12883: result: $with_wgetch_events" >&5
-+echo "$as_me:12882: result: $with_wgetch_events" >&5
- echo "${ECHO_T}$with_wgetch_events" >&6
- test "x$with_wgetch_events" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12891,7 +12890,7 @@
- 
- ###	use option --disable-echo to suppress full display compiling commands
- 
--echo "$as_me:12894: checking if you want to see long compiling messages" >&5
-+echo "$as_me:12893: 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.
-@@ -12925,7 +12924,7 @@
- 	ECHO_CC=''
- 
- fi;
--echo "$as_me:12928: result: $enableval" >&5
-+echo "$as_me:12927: result: $enableval" >&5
- echo "${ECHO_T}$enableval" >&6
- 
- if test "x$enable_echo" = xyes; then
-@@ -12937,7 +12936,7 @@
- fi
- 
- ###	use option --enable-warnings to turn on all gcc warnings
--echo "$as_me:12940: checking if you want to see compiler warnings" >&5
-+echo "$as_me:12939: checking if you want to see compiler warnings" >&5
- echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
- 
- # Check whether --enable-warnings or --disable-warnings was given.
-@@ -12945,7 +12944,7 @@
-   enableval="$enable_warnings"
-   with_warnings=$enableval
- fi;
--echo "$as_me:12948: result: $with_warnings" >&5
-+echo "$as_me:12947: result: $with_warnings" >&5
- echo "${ECHO_T}$with_warnings" >&6
- 
- if test "x$with_warnings" = "xyes"; then
-@@ -12957,12 +12956,12 @@
- if test "$GCC" = yes ; then
- 	case $host_os in
- 	(linux*|gnu*)
--		echo "$as_me:12960: checking if this is really Intel C compiler" >&5
-+		echo "$as_me:12959: 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 12965 "configure"
-+#line 12964 "configure"
- #include "confdefs.h"
- 
- int
-@@ -12979,16 +12978,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12982: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12981: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12985: \$? = $ac_status" >&5
-+  echo "$as_me:12984: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12988: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12987: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12991: \$? = $ac_status" >&5
-+  echo "$as_me:12990: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   INTEL_COMPILER=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -we147"
-@@ -12999,7 +12998,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		CFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:13002: result: $INTEL_COMPILER" >&5
-+		echo "$as_me:13001: result: $INTEL_COMPILER" >&5
- echo "${ECHO_T}$INTEL_COMPILER" >&6
- 		;;
- 	esac
-@@ -13008,12 +13007,12 @@
- CLANG_COMPILER=no
- 
- if test "$GCC" = yes ; then
--	echo "$as_me:13011: checking if this is really Clang C compiler" >&5
-+	echo "$as_me:13010: 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 13016 "configure"
-+#line 13015 "configure"
- #include "confdefs.h"
- 
- int
-@@ -13030,16 +13029,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13033: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13032: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13036: \$? = $ac_status" >&5
-+  echo "$as_me:13035: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13039: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13038: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13042: \$? = $ac_status" >&5
-+  echo "$as_me:13041: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   CLANG_COMPILER=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
-@@ -13050,12 +13049,12 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	CFLAGS="$cf_save_CFLAGS"
--	echo "$as_me:13053: result: $CLANG_COMPILER" >&5
-+	echo "$as_me:13052: result: $CLANG_COMPILER" >&5
- echo "${ECHO_T}$CLANG_COMPILER" >&6
- fi
- 
- cat > conftest.$ac_ext <&5
-+	{ echo "$as_me:13074: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS="-Wall"
-@@ -13088,12 +13087,12 @@
- 		wd981
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:13091: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13090: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13094: \$? = $ac_status" >&5
-+  echo "$as_me:13093: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13096: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13095: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
- 		fi
-@@ -13102,7 +13101,7 @@
- 
- elif test "$GCC" = yes
- then
--	{ echo "$as_me:13105: checking for $CC warning options..." >&5
-+	{ echo "$as_me:13104: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS=
-@@ -13126,12 +13125,12 @@
- 		Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:13129: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13128: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13132: \$? = $ac_status" >&5
-+  echo "$as_me:13131: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13134: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13133: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			case $cf_opt in
- 			(Wcast-qual)
-@@ -13142,7 +13141,7 @@
- 				([34].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:13145: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:13144: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -13152,7 +13151,7 @@
- 				([12].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:13155: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:13154: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -13172,12 +13171,12 @@
- if test "$GCC" = yes ; then
- 	case $host_os in
- 	(linux*|gnu*)
--		echo "$as_me:13175: checking if this is really Intel C++ compiler" >&5
-+		echo "$as_me:13174: 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="$CXXFLAGS"
- 		CXXFLAGS="$CXXFLAGS -no-gcc"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 13180 "configure"
-+#line 13179 "configure"
- #include "confdefs.h"
- 
- int
-@@ -13194,16 +13193,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13197: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13196: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13200: \$? = $ac_status" >&5
-+  echo "$as_me:13199: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13203: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13202: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13206: \$? = $ac_status" >&5
-+  echo "$as_me:13205: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   INTEL_CPLUSPLUS=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -we147"
-@@ -13214,7 +13213,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		CXXFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:13217: result: $INTEL_CPLUSPLUS" >&5
-+		echo "$as_me:13216: result: $INTEL_CPLUSPLUS" >&5
- echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
- 		;;
- 	esac
-@@ -13223,12 +13222,12 @@
- CLANG_CPLUSPLUS=no
- 
- if test "$GCC" = yes ; then
--	echo "$as_me:13226: checking if this is really Clang C++ compiler" >&5
-+	echo "$as_me:13225: 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="$CXXFLAGS"
- 	CXXFLAGS="$CXXFLAGS -Qunused-arguments"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 13231 "configure"
-+#line 13230 "configure"
- #include "confdefs.h"
- 
- int
-@@ -13245,16 +13244,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13248: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13247: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13251: \$? = $ac_status" >&5
-+  echo "$as_me:13250: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13254: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13253: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13257: \$? = $ac_status" >&5
-+  echo "$as_me:13256: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   CLANG_CPLUSPLUS=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
-@@ -13265,7 +13264,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	CXXFLAGS="$cf_save_CFLAGS"
--	echo "$as_me:13268: result: $CLANG_CPLUSPLUS" >&5
-+	echo "$as_me:13267: result: $CLANG_CPLUSPLUS" >&5
- echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
- fi
- 
-@@ -13277,7 +13276,7 @@
- ac_main_return=return
- 
- cat > conftest.$ac_ext <&5
-+	{ echo "$as_me:13297: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CXXFLAGS="$CXXFLAGS"
- 	EXTRA_CXXFLAGS="-Wall"
-@@ -13312,12 +13311,12 @@
- 		wd981
- 	do
- 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
--		if { (eval echo "$as_me:13315: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13314: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13318: \$? = $ac_status" >&5
-+  echo "$as_me:13317: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13320: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13319: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
- 		fi
-@@ -13326,7 +13325,7 @@
- 
- elif test "$GXX" = yes
- then
--	{ echo "$as_me:13329: checking for $CXX warning options..." >&5
-+	{ echo "$as_me:13328: checking for $CXX warning options..." >&5
- echo "$as_me: checking for $CXX warning options..." >&6;}
- 	cf_save_CXXFLAGS="$CXXFLAGS"
- 	EXTRA_CXXFLAGS="-W -Wall"
-@@ -13356,16 +13355,16 @@
- 		Wundef $cf_gxx_extra_warnings Wno-unused
- 	do
- 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
--		if { (eval echo "$as_me:13359: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13358: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13362: \$? = $ac_status" >&5
-+  echo "$as_me:13361: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13364: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13363: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
- 		else
--			test -n "$verbose" && echo "$as_me:13368: result: ... no -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13367: result: ... no -$cf_opt" >&5
- echo "${ECHO_T}... no -$cf_opt" >&6
- 		fi
- 	done
-@@ -13401,10 +13400,10 @@
- EOF
- if test "$GCC" = yes
- then
--	{ echo "$as_me:13404: checking for $CC __attribute__ directives..." >&5
-+	{ echo "$as_me:13403: checking for $CC __attribute__ directives..." >&5
- echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
- cat > conftest.$ac_ext <&5
-+		if { (eval echo "$as_me:13455: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13459: \$? = $ac_status" >&5
-+  echo "$as_me:13458: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13461: result: ... $cf_attribute" >&5
-+			test -n "$verbose" && echo "$as_me:13460: result: ... $cf_attribute" >&5
- echo "${ECHO_T}... $cf_attribute" >&6
- 			cat conftest.h >>confdefs.h
- 			case $cf_attribute in
-@@ -13517,7 +13516,7 @@
- rm -rf conftest*
- fi
- 
--echo "$as_me:13520: checking if you want to work around bogus compiler/loader warnings" >&5
-+echo "$as_me:13519: checking if you want to work around bogus compiler/loader warnings" >&5
- echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6
- 
- # Check whether --enable-string-hacks or --disable-string-hacks was given.
-@@ -13527,7 +13526,7 @@
- else
-   with_string_hacks=no
- fi;
--echo "$as_me:13530: result: $with_string_hacks" >&5
-+echo "$as_me:13529: result: $with_string_hacks" >&5
- echo "${ECHO_T}$with_string_hacks" >&6
- 
- if test "x$with_string_hacks" = "xyes"; then
-@@ -13536,19 +13535,19 @@
- #define USE_STRING_HACKS 1
- EOF
- 
--	{ echo "$as_me:13539: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
-+	{ echo "$as_me:13538: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
- echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;}
- 
- for ac_func in strlcat strlcpy snprintf
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:13545: checking for $ac_func" >&5
-+echo "$as_me:13544: 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 13551 "configure"
-+#line 13550 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -13579,16 +13578,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13582: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13581: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13585: \$? = $ac_status" >&5
-+  echo "$as_me:13584: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13588: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13587: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13591: \$? = $ac_status" >&5
-+  echo "$as_me:13590: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -13598,7 +13597,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:13601: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:13600: 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 <&5
-+echo "$as_me:13613: checking if you want to enable runtime assertions" >&5
- echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
- 
- # Check whether --enable-assertions or --disable-assertions was given.
-@@ -13621,7 +13620,7 @@
- else
-   with_assertions=no
- fi;
--echo "$as_me:13624: result: $with_assertions" >&5
-+echo "$as_me:13623: result: $with_assertions" >&5
- echo "${ECHO_T}$with_assertions" >&6
- if test -n "$GCC"
- then
-@@ -13637,7 +13636,7 @@
- 
- ###	use option --disable-leaks to suppress "permanent" leaks, for testing
- 
--echo "$as_me:13640: checking if you want to use dmalloc for testing" >&5
-+echo "$as_me:13639: 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.
-@@ -13654,7 +13653,7 @@
- else
-   with_dmalloc=
- fi;
--echo "$as_me:13657: result: ${with_dmalloc:-no}" >&5
-+echo "$as_me:13656: result: ${with_dmalloc:-no}" >&5
- echo "${ECHO_T}${with_dmalloc:-no}" >&6
- 
- case .$with_cflags in
-@@ -13748,23 +13747,23 @@
- esac
- 
- if test "$with_dmalloc" = yes ; then
--	echo "$as_me:13751: checking for dmalloc.h" >&5
-+	echo "$as_me:13750: 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 13757 "configure"
-+#line 13756 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:13761: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:13760: \"$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:13767: \$? = $ac_status" >&5
-+  echo "$as_me:13766: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -13783,11 +13782,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:13786: result: $ac_cv_header_dmalloc_h" >&5
-+echo "$as_me:13785: 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:13790: checking for dmalloc_debug in -ldmalloc" >&5
-+echo "$as_me:13789: 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
-@@ -13795,7 +13794,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 13798 "configure"
-+#line 13797 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -13814,16 +13813,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13817: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13816: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13820: \$? = $ac_status" >&5
-+  echo "$as_me:13819: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13823: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13822: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13826: \$? = $ac_status" >&5
-+  echo "$as_me:13825: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dmalloc_dmalloc_debug=yes
- else
-@@ -13834,7 +13833,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:13837: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
-+echo "$as_me:13836: 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 <&5
-+echo "$as_me:13851: 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.
-@@ -13866,7 +13865,7 @@
- else
-   with_dbmalloc=
- fi;
--echo "$as_me:13869: result: ${with_dbmalloc:-no}" >&5
-+echo "$as_me:13868: result: ${with_dbmalloc:-no}" >&5
- echo "${ECHO_T}${with_dbmalloc:-no}" >&6
- 
- case .$with_cflags in
-@@ -13960,23 +13959,23 @@
- esac
- 
- if test "$with_dbmalloc" = yes ; then
--	echo "$as_me:13963: checking for dbmalloc.h" >&5
-+	echo "$as_me:13962: 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 13969 "configure"
-+#line 13968 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:13973: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:13972: \"$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:13979: \$? = $ac_status" >&5
-+  echo "$as_me:13978: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -13995,11 +13994,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:13998: result: $ac_cv_header_dbmalloc_h" >&5
-+echo "$as_me:13997: 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:14002: checking for debug_malloc in -ldbmalloc" >&5
-+echo "$as_me:14001: 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
-@@ -14007,7 +14006,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldbmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14010 "configure"
-+#line 14009 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14026,16 +14025,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14029: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14028: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14032: \$? = $ac_status" >&5
-+  echo "$as_me:14031: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14035: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14034: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14038: \$? = $ac_status" >&5
-+  echo "$as_me:14037: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dbmalloc_debug_malloc=yes
- else
-@@ -14046,7 +14045,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:14049: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
-+echo "$as_me:14048: 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 <&5
-+echo "$as_me:14063: checking if you want to use valgrind for testing" >&5
- echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
- 
- # Check whether --with-valgrind or --without-valgrind was given.
-@@ -14078,7 +14077,7 @@
- else
-   with_valgrind=
- fi;
--echo "$as_me:14081: result: ${with_valgrind:-no}" >&5
-+echo "$as_me:14080: result: ${with_valgrind:-no}" >&5
- echo "${ECHO_T}${with_valgrind:-no}" >&6
- 
- case .$with_cflags in
-@@ -14171,7 +14170,7 @@
- 	;;
- esac
- 
--echo "$as_me:14174: checking if you want to perform memory-leak testing" >&5
-+echo "$as_me:14173: checking if you want to perform memory-leak testing" >&5
- echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
- 
- # Check whether --enable-leaks or --disable-leaks was given.
-@@ -14181,7 +14180,7 @@
- else
-   : ${with_no_leaks:=no}
- fi;
--echo "$as_me:14184: result: $with_no_leaks" >&5
-+echo "$as_me:14183: result: $with_no_leaks" >&5
- echo "${ECHO_T}$with_no_leaks" >&6
- 
- if test "$with_no_leaks" = yes ; then
-@@ -14233,7 +14232,7 @@
- 	;;
- esac
- 
--echo "$as_me:14236: checking whether to add trace feature to all models" >&5
-+echo "$as_me:14235: checking whether to add trace feature to all models" >&5
- echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
- 
- # Check whether --with-trace or --without-trace was given.
-@@ -14243,7 +14242,7 @@
- else
-   cf_with_trace=$cf_all_traces
- fi;
--echo "$as_me:14246: result: $cf_with_trace" >&5
-+echo "$as_me:14245: result: $cf_with_trace" >&5
- echo "${ECHO_T}$cf_with_trace" >&6
- 
- if test "x$cf_with_trace" = xyes ; then
-@@ -14333,7 +14332,7 @@
- 	ADA_TRACE=FALSE
- fi
- 
--echo "$as_me:14336: checking if we want to use GNAT projects" >&5
-+echo "$as_me:14335: checking if we want to use GNAT projects" >&5
- echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6
- 
- # Check whether --enable-gnat-projects or --disable-gnat-projects was given.
-@@ -14350,7 +14349,7 @@
- 	enable_gnat_projects=yes
- 
- fi;
--echo "$as_me:14353: result: $enable_gnat_projects" >&5
-+echo "$as_me:14352: result: $enable_gnat_projects" >&5
- echo "${ECHO_T}$enable_gnat_projects" >&6
- 
- ###	Checks for libraries.
-@@ -14360,13 +14359,13 @@
- 	LIBS=" -lpsapi $LIBS"
- 	;;
- (*)
--echo "$as_me:14363: checking for gettimeofday" >&5
-+echo "$as_me:14362: checking for gettimeofday" >&5
- echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
- if test "${ac_cv_func_gettimeofday+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14369 "configure"
-+#line 14368 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char gettimeofday (); below.  */
-@@ -14397,16 +14396,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14400: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14399: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14403: \$? = $ac_status" >&5
-+  echo "$as_me:14402: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14406: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14405: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14409: \$? = $ac_status" >&5
-+  echo "$as_me:14408: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_gettimeofday=yes
- else
-@@ -14416,7 +14415,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:14419: result: $ac_cv_func_gettimeofday" >&5
-+echo "$as_me:14418: result: $ac_cv_func_gettimeofday" >&5
- echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
- if test $ac_cv_func_gettimeofday = yes; then
- 
-@@ -14426,7 +14425,7 @@
- 
- else
- 
--echo "$as_me:14429: checking for gettimeofday in -lbsd" >&5
-+echo "$as_me:14428: checking for gettimeofday in -lbsd" >&5
- echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
- if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14434,7 +14433,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbsd  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14437 "configure"
-+#line 14436 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14453,16 +14452,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14456: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14455: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14459: \$? = $ac_status" >&5
-+  echo "$as_me:14458: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14462: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14461: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14465: \$? = $ac_status" >&5
-+  echo "$as_me:14464: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_bsd_gettimeofday=yes
- else
-@@ -14473,7 +14472,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:14476: result: $ac_cv_lib_bsd_gettimeofday" >&5
-+echo "$as_me:14475: result: $ac_cv_lib_bsd_gettimeofday" >&5
- echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
- if test $ac_cv_lib_bsd_gettimeofday = yes; then
- 
-@@ -14503,14 +14502,14 @@
- 	;;
- esac
- 
--echo "$as_me:14506: checking if -lm needed for math functions" >&5
-+echo "$as_me:14505: 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 14513 "configure"
-+#line 14512 "configure"
- #include "confdefs.h"
- 
- 	#include 
-@@ -14525,16 +14524,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14528: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14527: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14531: \$? = $ac_status" >&5
-+  echo "$as_me:14530: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14534: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14533: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14537: \$? = $ac_status" >&5
-+  echo "$as_me:14536: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_need_libm=no
- else
-@@ -14544,7 +14543,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:14547: result: $cf_cv_need_libm" >&5
-+echo "$as_me:14546: result: $cf_cv_need_libm" >&5
- echo "${ECHO_T}$cf_cv_need_libm" >&6
- if test "$cf_cv_need_libm" = yes
- then
-@@ -14552,13 +14551,13 @@
- fi
- 
- ###	Checks for header files.
--echo "$as_me:14555: checking for ANSI C header files" >&5
-+echo "$as_me:14554: 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 14561 "configure"
-+#line 14560 "configure"
- #include "confdefs.h"
- #include 
- #include 
-@@ -14566,13 +14565,13 @@
- #include 
- 
- _ACEOF
--if { (eval echo "$as_me:14569: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:14568: \"$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:14575: \$? = $ac_status" >&5
-+  echo "$as_me:14574: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -14594,7 +14593,7 @@
- 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 14597 "configure"
-+#line 14596 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -14612,7 +14611,7 @@
- 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 14615 "configure"
-+#line 14614 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -14633,7 +14632,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14636 "configure"
-+#line 14635 "configure"
- #include "confdefs.h"
- #include 
- #if ((' ' & 0x0FF) == 0x020)
-@@ -14659,15 +14658,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:14662: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14661: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14665: \$? = $ac_status" >&5
-+  echo "$as_me:14664: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:14667: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14666: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14670: \$? = $ac_status" >&5
-+  echo "$as_me:14669: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -14680,7 +14679,7 @@
- fi
- fi
- fi
--echo "$as_me:14683: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:14682: result: $ac_cv_header_stdc" >&5
- echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
- 
-@@ -14693,13 +14692,13 @@
- 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:14696: checking for $ac_hdr that defines DIR" >&5
-+echo "$as_me:14695: 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 14702 "configure"
-+#line 14701 "configure"
- #include "confdefs.h"
- #include 
- #include <$ac_hdr>
-@@ -14714,16 +14713,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14717: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14716: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14720: \$? = $ac_status" >&5
-+  echo "$as_me:14719: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14723: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14722: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14726: \$? = $ac_status" >&5
-+  echo "$as_me:14725: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Header=yes"
- else
-@@ -14733,7 +14732,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:14736: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:14735: 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 <&5
-+  echo "$as_me:14748: 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
-@@ -14754,7 +14753,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldir  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14757 "configure"
-+#line 14756 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14773,16 +14772,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14776: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14775: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14779: \$? = $ac_status" >&5
-+  echo "$as_me:14778: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14782: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14781: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14785: \$? = $ac_status" >&5
-+  echo "$as_me:14784: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dir_opendir=yes
- else
-@@ -14793,14 +14792,14 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:14796: result: $ac_cv_lib_dir_opendir" >&5
-+echo "$as_me:14795: 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:14803: checking for opendir in -lx" >&5
-+  echo "$as_me:14802: 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
-@@ -14808,7 +14807,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lx  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14811 "configure"
-+#line 14810 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14827,16 +14826,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14830: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14829: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14833: \$? = $ac_status" >&5
-+  echo "$as_me:14832: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14836: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14835: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14839: \$? = $ac_status" >&5
-+  echo "$as_me:14838: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_x_opendir=yes
- else
-@@ -14847,7 +14846,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:14850: result: $ac_cv_lib_x_opendir" >&5
-+echo "$as_me:14849: 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"
-@@ -14855,13 +14854,13 @@
- 
- fi
- 
--echo "$as_me:14858: checking whether time.h and sys/time.h may both be included" >&5
-+echo "$as_me:14857: 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 14864 "configure"
-+#line 14863 "configure"
- #include "confdefs.h"
- #include 
- #include 
-@@ -14877,16 +14876,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14880: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14879: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14883: \$? = $ac_status" >&5
-+  echo "$as_me:14882: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14886: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14885: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14889: \$? = $ac_status" >&5
-+  echo "$as_me:14888: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_header_time=yes
- else
-@@ -14896,7 +14895,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:14899: result: $ac_cv_header_time" >&5
-+echo "$as_me:14898: result: $ac_cv_header_time" >&5
- echo "${ECHO_T}$ac_cv_header_time" >&6
- if test $ac_cv_header_time = yes; then
- 
-@@ -14915,13 +14914,13 @@
- 	;;
- esac
- 
--echo "$as_me:14918: checking for regcomp" >&5
-+echo "$as_me:14917: checking for regcomp" >&5
- echo $ECHO_N "checking for regcomp... $ECHO_C" >&6
- if test "${ac_cv_func_regcomp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14924 "configure"
-+#line 14923 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char regcomp (); below.  */
-@@ -14952,16 +14951,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14955: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14954: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14958: \$? = $ac_status" >&5
-+  echo "$as_me:14957: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14961: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14960: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14964: \$? = $ac_status" >&5
-+  echo "$as_me:14963: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_regcomp=yes
- else
-@@ -14971,7 +14970,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:14974: result: $ac_cv_func_regcomp" >&5
-+echo "$as_me:14973: result: $ac_cv_func_regcomp" >&5
- echo "${ECHO_T}$ac_cv_func_regcomp" >&6
- if test $ac_cv_func_regcomp = yes; then
-   cf_regex_func=regcomp
-@@ -14980,7 +14979,7 @@
- 	for cf_regex_lib in $cf_regex_libs
- 	do
- 		as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh`
--echo "$as_me:14983: checking for regcomp in -l$cf_regex_lib" >&5
-+echo "$as_me:14982: checking for regcomp in -l$cf_regex_lib" >&5
- echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14988,7 +14987,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-l$cf_regex_lib  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14991 "configure"
-+#line 14990 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -15007,16 +15006,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15010: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15009: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15013: \$? = $ac_status" >&5
-+  echo "$as_me:15012: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15016: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15015: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15019: \$? = $ac_status" >&5
-+  echo "$as_me:15018: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Lib=yes"
- else
-@@ -15027,7 +15026,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:15030: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-+echo "$as_me:15029: 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
- 
-@@ -15056,13 +15055,13 @@
- fi
- 
- if test "$cf_regex_func" = no ; then
--	echo "$as_me:15059: checking for compile" >&5
-+	echo "$as_me:15058: checking for compile" >&5
- echo $ECHO_N "checking for compile... $ECHO_C" >&6
- if test "${ac_cv_func_compile+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15065 "configure"
-+#line 15064 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char compile (); below.  */
-@@ -15093,16 +15092,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15096: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15095: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15099: \$? = $ac_status" >&5
-+  echo "$as_me:15098: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15102: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15101: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15105: \$? = $ac_status" >&5
-+  echo "$as_me:15104: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_compile=yes
- else
-@@ -15112,13 +15111,13 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:15115: result: $ac_cv_func_compile" >&5
-+echo "$as_me:15114: result: $ac_cv_func_compile" >&5
- echo "${ECHO_T}$ac_cv_func_compile" >&6
- if test $ac_cv_func_compile = yes; then
-   cf_regex_func=compile
- else
- 
--		echo "$as_me:15121: checking for compile in -lgen" >&5
-+		echo "$as_me:15120: checking for compile in -lgen" >&5
- echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6
- if test "${ac_cv_lib_gen_compile+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15126,7 +15125,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgen  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 15129 "configure"
-+#line 15128 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -15145,16 +15144,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15148: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15147: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15151: \$? = $ac_status" >&5
-+  echo "$as_me:15150: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15154: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15153: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15157: \$? = $ac_status" >&5
-+  echo "$as_me:15156: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gen_compile=yes
- else
-@@ -15165,7 +15164,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:15168: result: $ac_cv_lib_gen_compile" >&5
-+echo "$as_me:15167: result: $ac_cv_lib_gen_compile" >&5
- echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6
- if test $ac_cv_lib_gen_compile = yes; then
- 
-@@ -15193,11 +15192,11 @@
- fi
- 
- if test "$cf_regex_func" = no ; then
--	{ echo "$as_me:15196: WARNING: cannot find regular expression library" >&5
-+	{ echo "$as_me:15195: WARNING: cannot find regular expression library" >&5
- echo "$as_me: WARNING: cannot find regular expression library" >&2;}
- fi
- 
--echo "$as_me:15200: checking for regular-expression headers" >&5
-+echo "$as_me:15199: checking for regular-expression headers" >&5
- echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
- if test "${cf_cv_regex_hdrs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15209,7 +15208,7 @@
- 	for cf_regex_hdr in regexp.h regexpr.h
- 	do
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 15212 "configure"
-+#line 15211 "configure"
- #include "confdefs.h"
- #include <$cf_regex_hdr>
- int
-@@ -15224,16 +15223,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15227: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15226: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15230: \$? = $ac_status" >&5
-+  echo "$as_me:15229: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15233: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15232: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15236: \$? = $ac_status" >&5
-+  echo "$as_me:15235: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 			cf_cv_regex_hdrs=$cf_regex_hdr
-@@ -15250,7 +15249,7 @@
- 	for cf_regex_hdr in regex.h
- 	do
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 15253 "configure"
-+#line 15252 "configure"
- #include "confdefs.h"
- #include 
- #include <$cf_regex_hdr>
-@@ -15268,16 +15267,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15271: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15270: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15274: \$? = $ac_status" >&5
-+  echo "$as_me:15273: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15277: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15276: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15280: \$? = $ac_status" >&5
-+  echo "$as_me:15279: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 			cf_cv_regex_hdrs=$cf_regex_hdr
-@@ -15293,11 +15292,11 @@
- esac
- 
- fi
--echo "$as_me:15296: result: $cf_cv_regex_hdrs" >&5
-+echo "$as_me:15295: result: $cf_cv_regex_hdrs" >&5
- echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
- 
- case $cf_cv_regex_hdrs in
--	(no)		{ echo "$as_me:15300: WARNING: no regular expression header found" >&5
-+	(no)		{ echo "$as_me:15299: WARNING: no regular expression header found" >&5
- echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
- 	(regex.h)
- cat >>confdefs.h <<\EOF
-@@ -15336,23 +15335,23 @@
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:15339: checking for $ac_header" >&5
-+echo "$as_me:15338: 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 15345 "configure"
-+#line 15344 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:15349: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:15348: \"$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:15355: \$? = $ac_status" >&5
-+  echo "$as_me:15354: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -15371,7 +15370,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:15374: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:15373: 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 <&5
-+echo "$as_me:15386: 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 15393 "configure"
-+#line 15392 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:15397: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:15396: \"$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:15403: \$? = $ac_status" >&5
-+  echo "$as_me:15402: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -15419,7 +15418,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:15422: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:15421: 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 <&5
-+echo "$as_me:15431: checking for header declaring getopt variables" >&5
- echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6
- if test "${cf_cv_getopt_header+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15439,7 +15438,7 @@
- for cf_header in stdio.h stdlib.h unistd.h getopt.h
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 15442 "configure"
-+#line 15441 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -15452,16 +15451,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15455: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15454: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15458: \$? = $ac_status" >&5
-+  echo "$as_me:15457: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15461: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15460: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15464: \$? = $ac_status" >&5
-+  echo "$as_me:15463: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_getopt_header=$cf_header
-  break
-@@ -15473,7 +15472,7 @@
- done
- 
- fi
--echo "$as_me:15476: result: $cf_cv_getopt_header" >&5
-+echo "$as_me:15475: result: $cf_cv_getopt_header" >&5
- echo "${ECHO_T}$cf_cv_getopt_header" >&6
- if test $cf_cv_getopt_header != none ; then
- 
-@@ -15494,7 +15493,7 @@
- # Note: even non-Posix ISC needs  to declare fd_set
- if test "x$ISC" = xyes ; then
- 
--echo "$as_me:15497: checking for main in -lcposix" >&5
-+echo "$as_me:15496: checking for main in -lcposix" >&5
- echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6
- if test "${ac_cv_lib_cposix_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15502,7 +15501,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lcposix  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 15505 "configure"
-+#line 15504 "configure"
- #include "confdefs.h"
- 
- int
-@@ -15514,16 +15513,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15517: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15516: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15520: \$? = $ac_status" >&5
-+  echo "$as_me:15519: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15523: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15522: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15526: \$? = $ac_status" >&5
-+  echo "$as_me:15525: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_cposix_main=yes
- else
-@@ -15534,7 +15533,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:15537: result: $ac_cv_lib_cposix_main" >&5
-+echo "$as_me:15536: result: $ac_cv_lib_cposix_main" >&5
- echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6
- if test $ac_cv_lib_cposix_main = yes; then
-   cat >>confdefs.h <&5
-+	echo "$as_me:15547: checking for bzero in -linet" >&5
- echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6
- if test "${ac_cv_lib_inet_bzero+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15553,7 +15552,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-linet  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 15556 "configure"
-+#line 15555 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -15572,16 +15571,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15575: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15574: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15578: \$? = $ac_status" >&5
-+  echo "$as_me:15577: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15581: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15580: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15584: \$? = $ac_status" >&5
-+  echo "$as_me:15583: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_inet_bzero=yes
- else
-@@ -15592,7 +15591,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:15595: result: $ac_cv_lib_inet_bzero" >&5
-+echo "$as_me:15594: result: $ac_cv_lib_inet_bzero" >&5
- echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6
- if test $ac_cv_lib_inet_bzero = yes; then
- 
-@@ -15615,14 +15614,14 @@
- fi
- fi
- 
--echo "$as_me:15618: checking if sys/time.h works with sys/select.h" >&5
-+echo "$as_me:15617: checking if sys/time.h works with sys/select.h" >&5
- echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
- if test "${cf_cv_sys_time_select+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 15625 "configure"
-+#line 15624 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -15642,16 +15641,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15645: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15644: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15648: \$? = $ac_status" >&5
-+  echo "$as_me:15647: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15651: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15650: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15654: \$? = $ac_status" >&5
-+  echo "$as_me:15653: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sys_time_select=yes
- else
-@@ -15663,7 +15662,7 @@
- 
- fi
- 
--echo "$as_me:15666: result: $cf_cv_sys_time_select" >&5
-+echo "$as_me:15665: result: $cf_cv_sys_time_select" >&5
- echo "${ECHO_T}$cf_cv_sys_time_select" >&6
- test "$cf_cv_sys_time_select" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -15678,13 +15677,13 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ac_main_return=return
- 
--echo "$as_me:15681: checking for an ANSI C-conforming const" >&5
-+echo "$as_me:15680: checking for an ANSI C-conforming const" >&5
- echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
- if test "${ac_cv_c_const+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15687 "configure"
-+#line 15686 "configure"
- #include "confdefs.h"
- 
- int
-@@ -15742,16 +15741,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15745: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15744: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15748: \$? = $ac_status" >&5
-+  echo "$as_me:15747: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15751: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15750: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15754: \$? = $ac_status" >&5
-+  echo "$as_me:15753: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_const=yes
- else
-@@ -15761,7 +15760,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:15764: result: $ac_cv_c_const" >&5
-+echo "$as_me:15763: result: $ac_cv_c_const" >&5
- echo "${ECHO_T}$ac_cv_c_const" >&6
- if test $ac_cv_c_const = no; then
- 
-@@ -15771,7 +15770,7 @@
- 
- fi
- 
--echo "$as_me:15774: checking for inline" >&5
-+echo "$as_me:15773: 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
-@@ -15779,7 +15778,7 @@
-   ac_cv_c_inline=no
- for ac_kw in inline __inline__ __inline; do
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15782 "configure"
-+#line 15781 "configure"
- #include "confdefs.h"
- #ifndef __cplusplus
- static $ac_kw int static_foo () {return 0; }
-@@ -15788,16 +15787,16 @@
- 
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15791: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15790: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15794: \$? = $ac_status" >&5
-+  echo "$as_me:15793: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15797: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15796: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15800: \$? = $ac_status" >&5
-+  echo "$as_me:15799: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_inline=$ac_kw; break
- else
-@@ -15808,7 +15807,7 @@
- done
- 
- fi
--echo "$as_me:15811: result: $ac_cv_c_inline" >&5
-+echo "$as_me:15810: result: $ac_cv_c_inline" >&5
- echo "${ECHO_T}$ac_cv_c_inline" >&6
- case $ac_cv_c_inline in
-   inline | yes) ;;
-@@ -15834,7 +15833,7 @@
- 		:
- 	elif test "$GCC" = yes
- 	then
--		echo "$as_me:15837: checking if $CC supports options to tune inlining" >&5
-+		echo "$as_me:15836: checking if $CC supports options to tune inlining" >&5
- echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6
- if test "${cf_cv_gcc_inline+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15843,7 +15842,7 @@
- 		cf_save_CFLAGS=$CFLAGS
- 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 15846 "configure"
-+#line 15845 "configure"
- #include "confdefs.h"
- inline int foo(void) { return 1; }
- int
-@@ -15855,16 +15854,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15858: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15857: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15861: \$? = $ac_status" >&5
-+  echo "$as_me:15860: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15864: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15863: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15867: \$? = $ac_status" >&5
-+  echo "$as_me:15866: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gcc_inline=yes
- else
-@@ -15876,7 +15875,7 @@
- 		CFLAGS=$cf_save_CFLAGS
- 
- fi
--echo "$as_me:15879: result: $cf_cv_gcc_inline" >&5
-+echo "$as_me:15878: result: $cf_cv_gcc_inline" >&5
- echo "${ECHO_T}$cf_cv_gcc_inline" >&6
- 		if test "$cf_cv_gcc_inline" = yes ; then
- 
-@@ -15962,7 +15961,7 @@
- 	fi
- fi
- 
--echo "$as_me:15965: checking for signal global datatype" >&5
-+echo "$as_me:15964: checking for signal global datatype" >&5
- echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6
- if test "${cf_cv_sig_atomic_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15974,7 +15973,7 @@
- 		"int"
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 15977 "configure"
-+#line 15976 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -15997,16 +15996,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16000: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15999: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16003: \$? = $ac_status" >&5
-+  echo "$as_me:16002: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16006: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16005: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16009: \$? = $ac_status" >&5
-+  echo "$as_me:16008: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sig_atomic_t=$cf_type
- else
-@@ -16020,7 +16019,7 @@
- 
- fi
- 
--echo "$as_me:16023: result: $cf_cv_sig_atomic_t" >&5
-+echo "$as_me:16022: result: $cf_cv_sig_atomic_t" >&5
- echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
- test "$cf_cv_sig_atomic_t" != no &&
- cat >>confdefs.h <&5
-+echo "$as_me:16031: checking for type of chtype" >&5
- echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
- if test "${cf_cv_typeof_chtype+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16039,7 +16038,7 @@
-   cf_cv_typeof_chtype=long
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16042 "configure"
-+#line 16041 "configure"
- #include "confdefs.h"
- 
- #define WANT_BITS 31
-@@ -16074,15 +16073,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16077: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16076: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16080: \$? = $ac_status" >&5
-+  echo "$as_me:16079: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16082: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16081: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16085: \$? = $ac_status" >&5
-+  echo "$as_me:16084: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_typeof_chtype=`cat cf_test.out`
- else
-@@ -16097,7 +16096,7 @@
- 
- fi
- 
--echo "$as_me:16100: result: $cf_cv_typeof_chtype" >&5
-+echo "$as_me:16099: result: $cf_cv_typeof_chtype" >&5
- echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
- 
- cat >>confdefs.h <&5
-+echo "$as_me:16111: checking if unsigned literals are legal" >&5
- echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6
- if test "${cf_cv_unsigned_literals+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16119 "configure"
-+#line 16118 "configure"
- #include "confdefs.h"
- 
- int
-@@ -16128,16 +16127,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16131: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16130: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16134: \$? = $ac_status" >&5
-+  echo "$as_me:16133: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16137: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16136: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16140: \$? = $ac_status" >&5
-+  echo "$as_me:16139: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_unsigned_literals=yes
- else
-@@ -16149,7 +16148,7 @@
- 
- fi
- 
--echo "$as_me:16152: result: $cf_cv_unsigned_literals" >&5
-+echo "$as_me:16151: result: $cf_cv_unsigned_literals" >&5
- echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
- 
- cf_cv_1UL="1"
-@@ -16165,14 +16164,14 @@
- 
- ###	Checks for external-data
- 
--echo "$as_me:16168: checking if external errno is declared" >&5
-+echo "$as_me:16167: 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 16175 "configure"
-+#line 16174 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_STDLIB_H
-@@ -16190,16 +16189,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16193: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16192: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16196: \$? = $ac_status" >&5
-+  echo "$as_me:16195: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16199: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16198: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16202: \$? = $ac_status" >&5
-+  echo "$as_me:16201: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_dcl_errno=yes
- else
-@@ -16210,7 +16209,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:16213: result: $cf_cv_dcl_errno" >&5
-+echo "$as_me:16212: result: $cf_cv_dcl_errno" >&5
- echo "${ECHO_T}$cf_cv_dcl_errno" >&6
- 
- if test "$cf_cv_dcl_errno" = no ; then
-@@ -16225,14 +16224,14 @@
- 
- # It's possible (for near-UNIX clones) that the data doesn't exist
- 
--echo "$as_me:16228: checking if external errno exists" >&5
-+echo "$as_me:16227: 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 16235 "configure"
-+#line 16234 "configure"
- #include "confdefs.h"
- 
- #undef errno
-@@ -16247,16 +16246,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16250: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16249: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16253: \$? = $ac_status" >&5
-+  echo "$as_me:16252: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16256: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16255: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16259: \$? = $ac_status" >&5
-+  echo "$as_me:16258: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_errno=yes
- else
-@@ -16267,7 +16266,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:16270: result: $cf_cv_have_errno" >&5
-+echo "$as_me:16269: result: $cf_cv_have_errno" >&5
- echo "${ECHO_T}$cf_cv_have_errno" >&6
- 
- if test "$cf_cv_have_errno" = yes ; then
-@@ -16280,7 +16279,7 @@
- 
- fi
- 
--echo "$as_me:16283: checking if data-only library module links" >&5
-+echo "$as_me:16282: checking if data-only library module links" >&5
- echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
- if test "${cf_cv_link_dataonly+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16288,20 +16287,20 @@
- 
- 	rm -f conftest.a
- 	cat >conftest.$ac_ext <&5
-+	if { (eval echo "$as_me:16293: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16297: \$? = $ac_status" >&5
-+  echo "$as_me:16296: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 		mv conftest.o data.o && \
- 		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
- 	fi
- 	rm -f conftest.$ac_ext data.o
- 	cat >conftest.$ac_ext <&5
-+	if { (eval echo "$as_me:16316: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16320: \$? = $ac_status" >&5
-+  echo "$as_me:16319: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
- 		mv conftest.o func.o && \
- 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
-@@ -16330,7 +16329,7 @@
-   cf_cv_link_dataonly=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16333 "configure"
-+#line 16332 "configure"
- #include "confdefs.h"
- 
- 	int main()
-@@ -16341,15 +16340,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16344: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16343: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16347: \$? = $ac_status" >&5
-+  echo "$as_me:16346: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16349: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16348: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16352: \$? = $ac_status" >&5
-+  echo "$as_me:16351: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_link_dataonly=yes
- else
-@@ -16364,7 +16363,7 @@
- 
- fi
- 
--echo "$as_me:16367: result: $cf_cv_link_dataonly" >&5
-+echo "$as_me:16366: result: $cf_cv_link_dataonly" >&5
- echo "${ECHO_T}$cf_cv_link_dataonly" >&6
- 
- if test "$cf_cv_link_dataonly" = no ; then
-@@ -16403,13 +16402,13 @@
- 
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:16406: checking for $ac_func" >&5
-+echo "$as_me:16405: 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 16412 "configure"
-+#line 16411 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -16440,16 +16439,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16443: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16442: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16446: \$? = $ac_status" >&5
-+  echo "$as_me:16445: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16449: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16448: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16452: \$? = $ac_status" >&5
-+  echo "$as_me:16451: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -16459,7 +16458,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:16462: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:16461: 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 <&5
-+	{ { echo "$as_me:16473: error: getopt is required for building programs" >&5
- echo "$as_me: error: getopt is required for building programs" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- if test "x$with_getcap" = "xyes" ; then
- 
--echo "$as_me:16481: checking for terminal-capability database functions" >&5
-+echo "$as_me:16480: checking for terminal-capability database functions" >&5
- echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6
- if test "${cf_cv_cgetent+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16488 "configure"
-+#line 16487 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -16505,16 +16504,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16508: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16507: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16511: \$? = $ac_status" >&5
-+  echo "$as_me:16510: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16514: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16513: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16517: \$? = $ac_status" >&5
-+  echo "$as_me:16516: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cgetent=yes
- else
-@@ -16525,7 +16524,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:16528: result: $cf_cv_cgetent" >&5
-+echo "$as_me:16527: result: $cf_cv_cgetent" >&5
- echo "${ECHO_T}$cf_cv_cgetent" >&6
- 
- if test "$cf_cv_cgetent" = yes
-@@ -16535,14 +16534,14 @@
- #define HAVE_BSD_CGETENT 1
- EOF
- 
--echo "$as_me:16538: checking if cgetent uses const parameter" >&5
-+echo "$as_me:16537: checking if cgetent uses const parameter" >&5
- echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6
- if test "${cf_cv_cgetent_const+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16545 "configure"
-+#line 16544 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -16564,16 +16563,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16567: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16566: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16570: \$? = $ac_status" >&5
-+  echo "$as_me:16569: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16573: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16572: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16576: \$? = $ac_status" >&5
-+  echo "$as_me:16575: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cgetent_const=yes
- else
-@@ -16584,7 +16583,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:16587: result: $cf_cv_cgetent_const" >&5
-+echo "$as_me:16586: result: $cf_cv_cgetent_const" >&5
- echo "${ECHO_T}$cf_cv_cgetent_const" >&6
- 	if test "$cf_cv_cgetent_const" = yes
- 	then
-@@ -16598,14 +16597,14 @@
- 
- fi
- 
--echo "$as_me:16601: checking for isascii" >&5
-+echo "$as_me:16600: checking for isascii" >&5
- echo $ECHO_N "checking for isascii... $ECHO_C" >&6
- if test "${cf_cv_have_isascii+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16608 "configure"
-+#line 16607 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -16617,16 +16616,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16620: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16619: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16623: \$? = $ac_status" >&5
-+  echo "$as_me:16622: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16626: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16625: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16629: \$? = $ac_status" >&5
-+  echo "$as_me:16628: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_isascii=yes
- else
-@@ -16637,7 +16636,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:16640: result: $cf_cv_have_isascii" >&5
-+echo "$as_me:16639: result: $cf_cv_have_isascii" >&5
- echo "${ECHO_T}$cf_cv_have_isascii" >&6
- test "$cf_cv_have_isascii" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -16645,10 +16644,10 @@
- EOF
- 
- if test "$ac_cv_func_sigaction" = yes; then
--echo "$as_me:16648: checking whether sigaction needs _POSIX_SOURCE" >&5
-+echo "$as_me:16647: checking whether sigaction needs _POSIX_SOURCE" >&5
- echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 16651 "configure"
-+#line 16650 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -16662,16 +16661,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16665: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16664: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16668: \$? = $ac_status" >&5
-+  echo "$as_me:16667: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16671: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16670: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16674: \$? = $ac_status" >&5
-+  echo "$as_me:16673: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   sigact_bad=no
- else
-@@ -16679,7 +16678,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16682 "configure"
-+#line 16681 "configure"
- #include "confdefs.h"
- 
- #define _POSIX_SOURCE
-@@ -16694,16 +16693,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16697: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16696: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16700: \$? = $ac_status" >&5
-+  echo "$as_me:16699: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16703: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16702: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16706: \$? = $ac_status" >&5
-+  echo "$as_me:16705: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   sigact_bad=yes
- 
-@@ -16719,11 +16718,11 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:16722: result: $sigact_bad" >&5
-+echo "$as_me:16721: result: $sigact_bad" >&5
- echo "${ECHO_T}$sigact_bad" >&6
- fi
- 
--echo "$as_me:16726: checking if nanosleep really works" >&5
-+echo "$as_me:16725: checking if nanosleep really works" >&5
- echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6
- if test "${cf_cv_func_nanosleep+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16733,7 +16732,7 @@
-   cf_cv_func_nanosleep=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16736 "configure"
-+#line 16735 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -16758,15 +16757,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16761: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16760: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16764: \$? = $ac_status" >&5
-+  echo "$as_me:16763: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16766: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16765: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16769: \$? = $ac_status" >&5
-+  echo "$as_me:16768: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_nanosleep=yes
- else
-@@ -16778,7 +16777,7 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:16781: result: $cf_cv_func_nanosleep" >&5
-+echo "$as_me:16780: result: $cf_cv_func_nanosleep" >&5
- echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
- 
- test "$cf_cv_func_nanosleep" = "yes" &&
-@@ -16793,23 +16792,23 @@
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:16796: checking for $ac_header" >&5
-+echo "$as_me:16795: 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 16802 "configure"
-+#line 16801 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:16806: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:16805: \"$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:16812: \$? = $ac_status" >&5
-+  echo "$as_me:16811: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -16828,7 +16827,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:16831: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:16830: 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 <&5
-+echo "$as_me:16845: 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 16852 "configure"
-+#line 16851 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:16856: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:16855: \"$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:16862: \$? = $ac_status" >&5
-+  echo "$as_me:16861: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -16878,7 +16877,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:16881: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:16880: 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 <&5
-+	echo "$as_me:16898: 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 16902 "configure"
-+#line 16901 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -16911,16 +16910,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16914: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16913: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16917: \$? = $ac_status" >&5
-+  echo "$as_me:16916: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16920: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16919: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16923: \$? = $ac_status" >&5
-+  echo "$as_me:16922: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   termios_bad=no
- else
-@@ -16928,7 +16927,7 @@
- cat conftest.$ac_ext >&5
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 16931 "configure"
-+#line 16930 "configure"
- #include "confdefs.h"
- 
- #define _POSIX_SOURCE
-@@ -16942,16 +16941,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16945: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16944: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16948: \$? = $ac_status" >&5
-+  echo "$as_me:16947: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16951: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16950: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16954: \$? = $ac_status" >&5
-+  echo "$as_me:16953: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   termios_bad=unknown
- else
-@@ -16967,19 +16966,19 @@
- 
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:16970: result: $termios_bad" >&5
-+	echo "$as_me:16969: result: $termios_bad" >&5
- echo "${ECHO_T}$termios_bad" >&6
- 	fi
- fi
- 
--echo "$as_me:16975: checking for tcgetattr" >&5
-+echo "$as_me:16974: checking for tcgetattr" >&5
- echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6
- if test "${cf_cv_have_tcgetattr+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16982 "configure"
-+#line 16981 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -17007,16 +17006,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17010: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17009: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17013: \$? = $ac_status" >&5
-+  echo "$as_me:17012: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17016: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17015: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17019: \$? = $ac_status" >&5
-+  echo "$as_me:17018: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_tcgetattr=yes
- else
-@@ -17026,21 +17025,21 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17029: result: $cf_cv_have_tcgetattr" >&5
-+echo "$as_me:17028: result: $cf_cv_have_tcgetattr" >&5
- echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6
- test "$cf_cv_have_tcgetattr" = yes &&
- cat >>confdefs.h <<\EOF
- #define HAVE_TCGETATTR 1
- EOF
- 
--echo "$as_me:17036: checking for vsscanf function or workaround" >&5
-+echo "$as_me:17035: checking for vsscanf function or workaround" >&5
- echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6
- if test "${cf_cv_func_vsscanf+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17043 "configure"
-+#line 17042 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -17056,16 +17055,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17059: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17058: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17062: \$? = $ac_status" >&5
-+  echo "$as_me:17061: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17065: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17064: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17068: \$? = $ac_status" >&5
-+  echo "$as_me:17067: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=vsscanf
- else
-@@ -17073,7 +17072,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17076 "configure"
-+#line 17075 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -17095,16 +17094,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17098: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17097: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17101: \$? = $ac_status" >&5
-+  echo "$as_me:17100: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17104: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17103: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17107: \$? = $ac_status" >&5
-+  echo "$as_me:17106: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=vfscanf
- else
-@@ -17112,7 +17111,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17115 "configure"
-+#line 17114 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -17134,16 +17133,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17137: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17136: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17140: \$? = $ac_status" >&5
-+  echo "$as_me:17139: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17143: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17142: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17146: \$? = $ac_status" >&5
-+  echo "$as_me:17145: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=_doscan
- else
-@@ -17158,7 +17157,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17161: result: $cf_cv_func_vsscanf" >&5
-+echo "$as_me:17160: result: $cf_cv_func_vsscanf" >&5
- echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
- 
- case $cf_cv_func_vsscanf in
-@@ -17179,7 +17178,7 @@
- ;;
- esac
- 
--echo "$as_me:17182: checking for working mkstemp" >&5
-+echo "$as_me:17181: checking for working mkstemp" >&5
- echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
- if test "${cf_cv_func_mkstemp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17190,7 +17189,7 @@
-   cf_cv_func_mkstemp=maybe
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17193 "configure"
-+#line 17192 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -17228,15 +17227,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17231: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17230: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17234: \$? = $ac_status" >&5
-+  echo "$as_me:17233: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17236: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17235: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17239: \$? = $ac_status" >&5
-+  echo "$as_me:17238: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_mkstemp=yes
- 
-@@ -17251,16 +17250,16 @@
- fi
- 
- fi
--echo "$as_me:17254: result: $cf_cv_func_mkstemp" >&5
-+echo "$as_me:17253: result: $cf_cv_func_mkstemp" >&5
- echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
- if test "x$cf_cv_func_mkstemp" = xmaybe ; then
--	echo "$as_me:17257: checking for mkstemp" >&5
-+	echo "$as_me:17256: checking for mkstemp" >&5
- echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
- if test "${ac_cv_func_mkstemp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17263 "configure"
-+#line 17262 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char mkstemp (); below.  */
-@@ -17291,16 +17290,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17294: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17293: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17297: \$? = $ac_status" >&5
-+  echo "$as_me:17296: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17300: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17299: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17303: \$? = $ac_status" >&5
-+  echo "$as_me:17302: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_mkstemp=yes
- else
-@@ -17310,7 +17309,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17313: result: $ac_cv_func_mkstemp" >&5
-+echo "$as_me:17312: result: $ac_cv_func_mkstemp" >&5
- echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
- 
- fi
-@@ -17331,21 +17330,21 @@
- fi
- 
- if test "x$cross_compiling" = xyes ; then
--	{ echo "$as_me:17334: WARNING: cross compiling: assume setvbuf params not reversed" >&5
-+	{ echo "$as_me:17333: WARNING: cross compiling: assume setvbuf params not reversed" >&5
- echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;}
- else
--	echo "$as_me:17337: checking whether setvbuf arguments are reversed" >&5
-+	echo "$as_me:17336: checking whether setvbuf arguments are reversed" >&5
- echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6
- if test "${ac_cv_func_setvbuf_reversed+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:17343: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:17342: 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 17348 "configure"
-+#line 17347 "configure"
- #include "confdefs.h"
- #include 
- /* If setvbuf has the reversed format, exit 0. */
-@@ -17362,15 +17361,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17365: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17364: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17368: \$? = $ac_status" >&5
-+  echo "$as_me:17367: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17370: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17369: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17373: \$? = $ac_status" >&5
-+  echo "$as_me:17372: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_setvbuf_reversed=yes
- else
-@@ -17383,7 +17382,7 @@
- fi
- rm -f core core.* *.core
- fi
--echo "$as_me:17386: result: $ac_cv_func_setvbuf_reversed" >&5
-+echo "$as_me:17385: result: $ac_cv_func_setvbuf_reversed" >&5
- echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6
- if test $ac_cv_func_setvbuf_reversed = yes; then
- 
-@@ -17394,13 +17393,13 @@
- fi
- 
- fi
--echo "$as_me:17397: checking for intptr_t" >&5
-+echo "$as_me:17396: 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 17403 "configure"
-+#line 17402 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -17415,16 +17414,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17418: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17417: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17421: \$? = $ac_status" >&5
-+  echo "$as_me:17420: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17424: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17423: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17427: \$? = $ac_status" >&5
-+  echo "$as_me:17426: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_intptr_t=yes
- else
-@@ -17434,7 +17433,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:17437: result: $ac_cv_type_intptr_t" >&5
-+echo "$as_me:17436: 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
-   :
-@@ -17446,13 +17445,13 @@
- 
- fi
- 
--echo "$as_me:17449: checking for ssize_t" >&5
-+echo "$as_me:17448: 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 17455 "configure"
-+#line 17454 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -17467,16 +17466,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17470: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17469: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17473: \$? = $ac_status" >&5
-+  echo "$as_me:17472: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17476: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17475: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17479: \$? = $ac_status" >&5
-+  echo "$as_me:17478: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_ssize_t=yes
- else
-@@ -17486,7 +17485,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:17489: result: $ac_cv_type_ssize_t" >&5
-+echo "$as_me:17488: 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
-   :
-@@ -17498,14 +17497,14 @@
- 
- fi
- 
--echo "$as_me:17501: checking for type sigaction_t" >&5
-+echo "$as_me:17500: checking for type sigaction_t" >&5
- echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6
- if test "${cf_cv_type_sigaction+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 17508 "configure"
-+#line 17507 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -17518,16 +17517,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17521: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17520: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17524: \$? = $ac_status" >&5
-+  echo "$as_me:17523: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17527: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17526: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17530: \$? = $ac_status" >&5
-+  echo "$as_me:17529: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_sigaction=yes
- else
-@@ -17538,14 +17537,14 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- 
--echo "$as_me:17541: result: $cf_cv_type_sigaction" >&5
-+echo "$as_me:17540: result: $cf_cv_type_sigaction" >&5
- echo "${ECHO_T}$cf_cv_type_sigaction" >&6
- test "$cf_cv_type_sigaction" = yes &&
- cat >>confdefs.h <<\EOF
- #define HAVE_TYPE_SIGACTION 1
- EOF
- 
--echo "$as_me:17548: checking declaration of size-change" >&5
-+echo "$as_me:17547: 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
-@@ -17560,7 +17559,7 @@
- 	CPPFLAGS="$cf_save_CPPFLAGS"
- 	test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 17563 "configure"
-+#line 17562 "configure"
- #include "confdefs.h"
- #include 
- #ifdef HAVE_TERMIOS_H
-@@ -17604,16 +17603,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17607: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17606: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17610: \$? = $ac_status" >&5
-+  echo "$as_me:17609: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17613: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17612: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17616: \$? = $ac_status" >&5
-+  echo "$as_me:17615: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sizechange=yes
- else
-@@ -17632,7 +17631,7 @@
- done
- 
- fi
--echo "$as_me:17635: result: $cf_cv_sizechange" >&5
-+echo "$as_me:17634: result: $cf_cv_sizechange" >&5
- echo "${ECHO_T}$cf_cv_sizechange" >&6
- if test "$cf_cv_sizechange" != no ; then
- 
-@@ -17650,13 +17649,13 @@
- 	esac
- fi
- 
--echo "$as_me:17653: checking for memmove" >&5
-+echo "$as_me:17652: checking for memmove" >&5
- echo $ECHO_N "checking for memmove... $ECHO_C" >&6
- if test "${ac_cv_func_memmove+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17659 "configure"
-+#line 17658 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char memmove (); below.  */
-@@ -17687,16 +17686,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17690: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17689: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17693: \$? = $ac_status" >&5
-+  echo "$as_me:17692: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17696: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17695: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17699: \$? = $ac_status" >&5
-+  echo "$as_me:17698: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_memmove=yes
- else
-@@ -17706,19 +17705,19 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17709: result: $ac_cv_func_memmove" >&5
-+echo "$as_me:17708: result: $ac_cv_func_memmove" >&5
- echo "${ECHO_T}$ac_cv_func_memmove" >&6
- if test $ac_cv_func_memmove = yes; then
-   :
- else
- 
--echo "$as_me:17715: checking for bcopy" >&5
-+echo "$as_me:17714: checking for bcopy" >&5
- echo $ECHO_N "checking for bcopy... $ECHO_C" >&6
- if test "${ac_cv_func_bcopy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17721 "configure"
-+#line 17720 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char bcopy (); below.  */
-@@ -17749,16 +17748,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17752: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17751: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17755: \$? = $ac_status" >&5
-+  echo "$as_me:17754: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17758: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17757: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17761: \$? = $ac_status" >&5
-+  echo "$as_me:17760: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_bcopy=yes
- else
-@@ -17768,11 +17767,11 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17771: result: $ac_cv_func_bcopy" >&5
-+echo "$as_me:17770: result: $ac_cv_func_bcopy" >&5
- echo "${ECHO_T}$ac_cv_func_bcopy" >&6
- if test $ac_cv_func_bcopy = yes; then
- 
--	echo "$as_me:17775: checking if bcopy does overlapping moves" >&5
-+	echo "$as_me:17774: checking if bcopy does overlapping moves" >&5
- echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6
- if test "${cf_cv_good_bcopy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17782,7 +17781,7 @@
-   cf_cv_good_bcopy=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17785 "configure"
-+#line 17784 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -17796,15 +17795,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17799: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17798: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17802: \$? = $ac_status" >&5
-+  echo "$as_me:17801: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17804: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17803: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17807: \$? = $ac_status" >&5
-+  echo "$as_me:17806: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_good_bcopy=yes
- else
-@@ -17817,7 +17816,7 @@
- fi
- 
- fi
--echo "$as_me:17820: result: $cf_cv_good_bcopy" >&5
-+echo "$as_me:17819: result: $cf_cv_good_bcopy" >&5
- echo "${ECHO_T}$cf_cv_good_bcopy" >&6
- 
- else
-@@ -17844,13 +17843,13 @@
- for ac_func in posix_openpt
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:17847: checking for $ac_func" >&5
-+echo "$as_me:17846: 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 17853 "configure"
-+#line 17852 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -17881,16 +17880,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17884: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17883: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17887: \$? = $ac_status" >&5
-+  echo "$as_me:17886: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17890: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17889: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17893: \$? = $ac_status" >&5
-+  echo "$as_me:17892: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -17900,7 +17899,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17903: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:17902: 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 <&5
-+echo "$as_me:17912: checking if poll really works" >&5
- echo $ECHO_N "checking if poll really works... $ECHO_C" >&6
- if test "${cf_cv_working_poll+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17920,7 +17919,7 @@
-   cf_cv_working_poll=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17923 "configure"
-+#line 17922 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -17972,15 +17971,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17975: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17974: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17978: \$? = $ac_status" >&5
-+  echo "$as_me:17977: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17980: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17979: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17983: \$? = $ac_status" >&5
-+  echo "$as_me:17982: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_working_poll=yes
- else
-@@ -17992,21 +17991,21 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:17995: result: $cf_cv_working_poll" >&5
-+echo "$as_me:17994: result: $cf_cv_working_poll" >&5
- echo "${ECHO_T}$cf_cv_working_poll" >&6
- test "$cf_cv_working_poll" = "yes" &&
- cat >>confdefs.h <<\EOF
- #define HAVE_WORKING_POLL 1
- EOF
- 
--echo "$as_me:18002: checking for va_copy" >&5
-+echo "$as_me:18001: checking for va_copy" >&5
- echo $ECHO_N "checking for va_copy... $ECHO_C" >&6
- if test "${cf_cv_have_va_copy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 18009 "configure"
-+#line 18008 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -18023,16 +18022,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18026: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18025: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18029: \$? = $ac_status" >&5
-+  echo "$as_me:18028: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18032: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18031: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18035: \$? = $ac_status" >&5
-+  echo "$as_me:18034: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_va_copy=yes
- else
-@@ -18042,7 +18041,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:18045: result: $cf_cv_have_va_copy" >&5
-+echo "$as_me:18044: result: $cf_cv_have_va_copy" >&5
- echo "${ECHO_T}$cf_cv_have_va_copy" >&6
- 
- test "$cf_cv_have_va_copy" = yes &&
-@@ -18050,14 +18049,14 @@
- #define HAVE_VA_COPY 1
- EOF
- 
--echo "$as_me:18053: checking for __va_copy" >&5
-+echo "$as_me:18052: checking for __va_copy" >&5
- echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6
- if test "${cf_cv_have___va_copy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 18060 "configure"
-+#line 18059 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -18074,16 +18073,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18077: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18076: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18080: \$? = $ac_status" >&5
-+  echo "$as_me:18079: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18083: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18082: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18086: \$? = $ac_status" >&5
-+  echo "$as_me:18085: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have___va_copy=yes
- else
-@@ -18093,7 +18092,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:18096: result: $cf_cv_have___va_copy" >&5
-+echo "$as_me:18095: result: $cf_cv_have___va_copy" >&5
- echo "${ECHO_T}$cf_cv_have___va_copy" >&6
- 
- test "$cf_cv_have___va_copy" = yes &&
-@@ -18101,13 +18100,13 @@
- #define HAVE___VA_COPY 1
- EOF
- 
--echo "$as_me:18104: checking for pid_t" >&5
-+echo "$as_me:18103: 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 18110 "configure"
-+#line 18109 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -18122,16 +18121,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18125: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18124: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18128: \$? = $ac_status" >&5
-+  echo "$as_me:18127: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18131: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18130: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18134: \$? = $ac_status" >&5
-+  echo "$as_me:18133: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_pid_t=yes
- else
-@@ -18141,7 +18140,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:18144: result: $ac_cv_type_pid_t" >&5
-+echo "$as_me:18143: 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
-   :
-@@ -18156,23 +18155,23 @@
- for ac_header in unistd.h vfork.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:18159: checking for $ac_header" >&5
-+echo "$as_me:18158: 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 18165 "configure"
-+#line 18164 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:18169: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:18168: \"$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:18175: \$? = $ac_status" >&5
-+  echo "$as_me:18174: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -18191,7 +18190,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:18194: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:18193: 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 <&5
-+echo "$as_me:18206: 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 18213 "configure"
-+#line 18212 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -18241,16 +18240,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18244: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18243: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18247: \$? = $ac_status" >&5
-+  echo "$as_me:18246: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18250: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18249: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18253: \$? = $ac_status" >&5
-+  echo "$as_me:18252: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -18260,7 +18259,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:18263: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:18262: 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 <&5
-+  echo "$as_me:18274: 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
-@@ -18295,15 +18294,15 @@
-       }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:18298: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18297: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18301: \$? = $ac_status" >&5
-+  echo "$as_me:18300: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:18303: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18302: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18306: \$? = $ac_status" >&5
-+  echo "$as_me:18305: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_fork_works=yes
- else
-@@ -18315,7 +18314,7 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:18318: result: $ac_cv_func_fork_works" >&5
-+echo "$as_me:18317: result: $ac_cv_func_fork_works" >&5
- echo "${ECHO_T}$ac_cv_func_fork_works" >&6
- 
- fi
-@@ -18329,12 +18328,12 @@
-       ac_cv_func_fork_works=yes
-       ;;
-   esac
--  { echo "$as_me:18332: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
-+  { echo "$as_me:18331: 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:18337: checking for working vfork" >&5
-+  echo "$as_me:18336: 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
-@@ -18343,7 +18342,7 @@
-   ac_cv_func_vfork_works=cross
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18346 "configure"
-+#line 18345 "configure"
- #include "confdefs.h"
- /* Thanks to Paul Eggert for this test.  */
- #include 
-@@ -18440,15 +18439,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:18443: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18442: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18446: \$? = $ac_status" >&5
-+  echo "$as_me:18445: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:18448: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18447: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18451: \$? = $ac_status" >&5
-+  echo "$as_me:18450: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_vfork_works=yes
- else
-@@ -18460,13 +18459,13 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:18463: result: $ac_cv_func_vfork_works" >&5
-+echo "$as_me:18462: 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:18469: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
-+  { echo "$as_me:18468: 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
- 
-@@ -18493,7 +18492,7 @@
- 
- # special check for test/ditto.c
- 
--echo "$as_me:18496: checking for openpty in -lutil" >&5
-+echo "$as_me:18495: checking for openpty in -lutil" >&5
- echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
- if test "${ac_cv_lib_util_openpty+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18501,7 +18500,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lutil  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 18504 "configure"
-+#line 18503 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -18520,16 +18519,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18523: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18522: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18526: \$? = $ac_status" >&5
-+  echo "$as_me:18525: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18529: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18528: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18532: \$? = $ac_status" >&5
-+  echo "$as_me:18531: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_util_openpty=yes
- else
-@@ -18540,7 +18539,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:18543: result: $ac_cv_lib_util_openpty" >&5
-+echo "$as_me:18542: result: $ac_cv_lib_util_openpty" >&5
- echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
- if test $ac_cv_lib_util_openpty = yes; then
-   cf_cv_lib_util=yes
-@@ -18548,7 +18547,7 @@
-   cf_cv_lib_util=no
- fi
- 
--echo "$as_me:18551: checking for openpty header" >&5
-+echo "$as_me:18550: checking for openpty header" >&5
- echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
- if test "${cf_cv_func_openpty+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18575,7 +18574,7 @@
- 	for cf_header in pty.h libutil.h util.h
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 18578 "configure"
-+#line 18577 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -18592,16 +18591,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18595: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18594: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18598: \$? = $ac_status" >&5
-+  echo "$as_me:18597: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18601: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18600: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18604: \$? = $ac_status" >&5
-+  echo "$as_me:18603: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 		cf_cv_func_openpty=$cf_header
-@@ -18619,7 +18618,7 @@
- 	LIBS="$cf_save_LIBS"
- 
- fi
--echo "$as_me:18622: result: $cf_cv_func_openpty" >&5
-+echo "$as_me:18621: result: $cf_cv_func_openpty" >&5
- echo "${ECHO_T}$cf_cv_func_openpty" >&6
- 
- if test "$cf_cv_func_openpty" != no ; then
-@@ -18689,7 +18688,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 18692 "configure"
-+#line 18691 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -18701,16 +18700,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18704: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18703: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18707: \$? = $ac_status" >&5
-+  echo "$as_me:18706: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18710: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18709: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18713: \$? = $ac_status" >&5
-+  echo "$as_me:18712: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -18727,7 +18726,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:18730: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:18729: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -18763,7 +18762,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:18766: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:18765: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -18774,7 +18773,7 @@
- 	else
- 		case "$with_hashed_db" in
- 		(./*|../*|/*)
--			{ echo "$as_me:18777: WARNING: no such directory $with_hashed_db" >&5
-+			{ echo "$as_me:18776: WARNING: no such directory $with_hashed_db" >&5
- echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
- 			;;
- 		(*)
-@@ -18843,7 +18842,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 18846 "configure"
-+#line 18845 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -18855,16 +18854,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18858: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18857: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18861: \$? = $ac_status" >&5
-+  echo "$as_me:18860: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18864: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18863: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18867: \$? = $ac_status" >&5
-+  echo "$as_me:18866: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -18881,7 +18880,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:18884: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:18883: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -18961,7 +18960,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:18964: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:18963: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -18978,23 +18977,23 @@
- 	fi
- esac
- 
--echo "$as_me:18981: checking for db.h" >&5
-+echo "$as_me:18980: checking for db.h" >&5
- echo $ECHO_N "checking for db.h... $ECHO_C" >&6
- if test "${ac_cv_header_db_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18987 "configure"
-+#line 18986 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:18991: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:18990: \"$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:18997: \$? = $ac_status" >&5
-+  echo "$as_me:18996: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -19013,11 +19012,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:19016: result: $ac_cv_header_db_h" >&5
-+echo "$as_me:19015: result: $ac_cv_header_db_h" >&5
- echo "${ECHO_T}$ac_cv_header_db_h" >&6
- if test $ac_cv_header_db_h = yes; then
- 
--echo "$as_me:19020: checking for version of db" >&5
-+echo "$as_me:19019: checking for version of db" >&5
- echo $ECHO_N "checking for version of db... $ECHO_C" >&6
- if test "${cf_cv_hashed_db_version+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19028,10 +19027,10 @@
- for cf_db_version in 1 2 3 4 5 6
- do
- 
--echo "${as_me:-configure}:19031: testing checking for db version $cf_db_version ..." 1>&5
-+echo "${as_me:-configure}:19030: testing checking for db version $cf_db_version ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19034 "configure"
-+#line 19033 "configure"
- #include "confdefs.h"
- 
- $ac_includes_default
-@@ -19061,16 +19060,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19064: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19063: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19067: \$? = $ac_status" >&5
-+  echo "$as_me:19066: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19070: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19069: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19073: \$? = $ac_status" >&5
-+  echo "$as_me:19072: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_hashed_db_version=$cf_db_version
-@@ -19084,16 +19083,16 @@
- done
- 
- fi
--echo "$as_me:19087: result: $cf_cv_hashed_db_version" >&5
-+echo "$as_me:19086: result: $cf_cv_hashed_db_version" >&5
- echo "${ECHO_T}$cf_cv_hashed_db_version" >&6
- 
- if test "$cf_cv_hashed_db_version" = unknown ; then
--	{ { echo "$as_me:19091: error: Cannot determine version of db" >&5
-+	{ { echo "$as_me:19090: error: Cannot determine version of db" >&5
- echo "$as_me: error: Cannot determine version of db" >&2;}
-    { (exit 1); exit 1; }; }
- else
- 
--echo "$as_me:19096: checking for db libraries" >&5
-+echo "$as_me:19095: checking for db libraries" >&5
- echo $ECHO_N "checking for db libraries... $ECHO_C" >&6
- if test "${cf_cv_hashed_db_libs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19123,10 +19122,10 @@
- 
- 	fi
- 
--echo "${as_me:-configure}:19126: testing checking for library "$cf_db_libs" ..." 1>&5
-+echo "${as_me:-configure}:19125: testing checking for library "$cf_db_libs" ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19129 "configure"
-+#line 19128 "configure"
- #include "confdefs.h"
- 
- $ac_includes_default
-@@ -19181,16 +19180,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19184: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19183: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19187: \$? = $ac_status" >&5
-+  echo "$as_me:19186: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19190: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19189: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19193: \$? = $ac_status" >&5
-+  echo "$as_me:19192: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	if test -n "$cf_db_libs" ; then
-@@ -19210,11 +19209,11 @@
- done
- 
- fi
--echo "$as_me:19213: result: $cf_cv_hashed_db_libs" >&5
-+echo "$as_me:19212: result: $cf_cv_hashed_db_libs" >&5
- echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6
- 
- 	if test "$cf_cv_hashed_db_libs" = unknown ; then
--		{ { echo "$as_me:19217: error: Cannot determine library for db" >&5
-+		{ { echo "$as_me:19216: error: Cannot determine library for db" >&5
- echo "$as_me: error: Cannot determine library for db" >&2;}
-    { (exit 1); exit 1; }; }
- 	elif test "$cf_cv_hashed_db_libs" != default ; then
-@@ -19240,7 +19239,7 @@
- 
- else
- 
--	{ { echo "$as_me:19243: error: Cannot find db.h" >&5
-+	{ { echo "$as_me:19242: error: Cannot find db.h" >&5
- echo "$as_me: error: Cannot find db.h" >&2;}
-    { (exit 1); exit 1; }; }
- 
-@@ -19255,7 +19254,7 @@
- 
- # Just in case, check if the C compiler has a bool type.
- 
--echo "$as_me:19258: checking if we should include stdbool.h" >&5
-+echo "$as_me:19257: checking if we should include stdbool.h" >&5
- echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
- 
- if test "${cf_cv_header_stdbool_h+set}" = set; then
-@@ -19263,7 +19262,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19266 "configure"
-+#line 19265 "configure"
- #include "confdefs.h"
- 
- int
-@@ -19275,23 +19274,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19278: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19277: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19281: \$? = $ac_status" >&5
-+  echo "$as_me:19280: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19284: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19283: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19287: \$? = $ac_status" >&5
-+  echo "$as_me:19286: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=0
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 19294 "configure"
-+#line 19293 "configure"
- #include "confdefs.h"
- 
- #ifndef __BEOS__
-@@ -19307,16 +19306,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19310: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19309: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19313: \$? = $ac_status" >&5
-+  echo "$as_me:19312: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19316: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19315: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19319: \$? = $ac_status" >&5
-+  echo "$as_me:19318: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=1
- else
-@@ -19330,13 +19329,13 @@
- fi
- 
- if test "$cf_cv_header_stdbool_h" = 1
--then	echo "$as_me:19333: result: yes" >&5
-+then	echo "$as_me:19332: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:19335: result: no" >&5
-+else	echo "$as_me:19334: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:19339: checking for builtin bool type" >&5
-+echo "$as_me:19338: checking for builtin bool type" >&5
- echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
- 
- if test "${cf_cv_cc_bool_type+set}" = set; then
-@@ -19344,7 +19343,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19347 "configure"
-+#line 19346 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -19359,16 +19358,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19362: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19361: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19365: \$? = $ac_status" >&5
-+  echo "$as_me:19364: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19368: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19367: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19371: \$? = $ac_status" >&5
-+  echo "$as_me:19370: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cc_bool_type=1
- else
-@@ -19381,9 +19380,9 @@
- fi
- 
- if test "$cf_cv_cc_bool_type" = 1
--then	echo "$as_me:19384: result: yes" >&5
-+then	echo "$as_me:19383: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:19386: result: no" >&5
-+else	echo "$as_me:19385: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -19400,10 +19399,10 @@
- 
- 	cf_save="$LIBS"
- 	LIBS="$LIBS $CXXLIBS"
--	echo "$as_me:19403: checking if we already have C++ library" >&5
-+	echo "$as_me:19402: checking if we already have C++ library" >&5
- echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19406 "configure"
-+#line 19405 "configure"
- #include "confdefs.h"
- 
- 			#include 
-@@ -19417,16 +19416,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19420: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19419: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19423: \$? = $ac_status" >&5
-+  echo "$as_me:19422: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19426: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19425: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19429: \$? = $ac_status" >&5
-+  echo "$as_me:19428: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_have_libstdcpp=yes
- else
-@@ -19435,7 +19434,7 @@
- cf_have_libstdcpp=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--	echo "$as_me:19438: result: $cf_have_libstdcpp" >&5
-+	echo "$as_me:19437: result: $cf_have_libstdcpp" >&5
- echo "${ECHO_T}$cf_have_libstdcpp" >&6
- 	LIBS="$cf_save"
- 
-@@ -19454,7 +19453,7 @@
- 			;;
- 		esac
- 
--		echo "$as_me:19457: checking for library $cf_stdcpp_libname" >&5
-+		echo "$as_me:19456: checking for library $cf_stdcpp_libname" >&5
- echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6
- if test "${cf_cv_libstdcpp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19480,7 +19479,7 @@
- LIBS="$cf_add_libs"
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 19483 "configure"
-+#line 19482 "configure"
- #include "confdefs.h"
- 
- 				#include 
-@@ -19494,16 +19493,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19497: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19496: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19500: \$? = $ac_status" >&5
-+  echo "$as_me:19499: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19503: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19502: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19506: \$? = $ac_status" >&5
-+  echo "$as_me:19505: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_libstdcpp=yes
- else
-@@ -19515,7 +19514,7 @@
- 			LIBS="$cf_save"
- 
- fi
--echo "$as_me:19518: result: $cf_cv_libstdcpp" >&5
-+echo "$as_me:19517: result: $cf_cv_libstdcpp" >&5
- echo "${ECHO_T}$cf_cv_libstdcpp" >&6
- 		test "$cf_cv_libstdcpp" = yes && {
- cf_add_libs="-l$cf_stdcpp_libname"
-@@ -19537,7 +19536,7 @@
- 	fi
- fi
- 
--	echo "$as_me:19540: checking whether $CXX understands -c and -o together" >&5
-+	echo "$as_me:19539: checking whether $CXX understands -c and -o together" >&5
- echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6
- if test "${cf_cv_prog_CXX_c_o+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19553,15 +19552,15 @@
- # We do the test twice because some compilers refuse to overwrite an
- # existing .o file with -o, though they will create one.
- ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
--if { (eval echo "$as_me:19556: \"$ac_try\"") >&5
-+if { (eval echo "$as_me:19555: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19559: \$? = $ac_status" >&5
-+  echo "$as_me:19558: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--  test -f conftest2.$ac_objext && { (eval echo "$as_me:19561: \"$ac_try\"") >&5
-+  test -f conftest2.$ac_objext && { (eval echo "$as_me:19560: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19564: \$? = $ac_status" >&5
-+  echo "$as_me:19563: \$? = $ac_status" >&5
-   (exit $ac_status); };
- then
-   eval cf_cv_prog_CXX_c_o=yes
-@@ -19572,10 +19571,10 @@
- 
- fi
- if test $cf_cv_prog_CXX_c_o = yes; then
--  echo "$as_me:19575: result: yes" >&5
-+  echo "$as_me:19574: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--  echo "$as_me:19578: result: no" >&5
-+  echo "$as_me:19577: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -19595,7 +19594,7 @@
- 	;;
- esac
- if test "$GXX" = yes; then
--	echo "$as_me:19598: checking for lib$cf_gpp_libname" >&5
-+	echo "$as_me:19597: checking for lib$cf_gpp_libname" >&5
- echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
- 	cf_save="$LIBS"
- 
-@@ -19616,7 +19615,7 @@
- LIBS="$cf_add_libs"
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19619 "configure"
-+#line 19618 "configure"
- #include "confdefs.h"
- 
- #include <$cf_gpp_libname/builtin.h>
-@@ -19630,16 +19629,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19633: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19632: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19636: \$? = $ac_status" >&5
-+  echo "$as_me:19635: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19639: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19638: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19642: \$? = $ac_status" >&5
-+  echo "$as_me:19641: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cxx_library=yes
- 
-@@ -19676,7 +19675,7 @@
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 19679 "configure"
-+#line 19678 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -19690,16 +19689,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19693: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19692: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19696: \$? = $ac_status" >&5
-+  echo "$as_me:19695: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19699: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19698: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19702: \$? = $ac_status" >&5
-+  echo "$as_me:19701: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cxx_library=yes
- 
-@@ -19732,7 +19731,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	LIBS="$cf_save"
--	echo "$as_me:19735: result: $cf_cxx_library" >&5
-+	echo "$as_me:19734: result: $cf_cxx_library" >&5
- echo "${ECHO_T}$cf_cxx_library" >&6
- fi
- 
-@@ -19748,7 +19747,7 @@
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- ac_main_return=return
--echo "$as_me:19751: checking how to run the C++ preprocessor" >&5
-+echo "$as_me:19750: checking how to run the C++ preprocessor" >&5
- echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
- if test -z "$CXXCPP"; then
-   if test "${ac_cv_prog_CXXCPP+set}" = set; then
-@@ -19765,18 +19764,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19768 "configure"
-+#line 19767 "configure"
- #include "confdefs.h"
- #include 
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:19773: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19772: \"$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:19779: \$? = $ac_status" >&5
-+  echo "$as_me:19778: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19799,17 +19798,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19802 "configure"
-+#line 19801 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:19806: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19805: \"$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:19812: \$? = $ac_status" >&5
-+  echo "$as_me:19811: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19846,7 +19845,7 @@
- else
-   ac_cv_prog_CXXCPP=$CXXCPP
- fi
--echo "$as_me:19849: result: $CXXCPP" >&5
-+echo "$as_me:19848: result: $CXXCPP" >&5
- echo "${ECHO_T}$CXXCPP" >&6
- ac_preproc_ok=false
- for ac_cxx_preproc_warn_flag in '' yes
-@@ -19856,18 +19855,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19859 "configure"
-+#line 19858 "configure"
- #include "confdefs.h"
- #include 
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:19864: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19863: \"$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:19870: \$? = $ac_status" >&5
-+  echo "$as_me:19869: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19890,17 +19889,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19893 "configure"
-+#line 19892 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:19897: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19896: \"$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:19903: \$? = $ac_status" >&5
-+  echo "$as_me:19902: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19928,7 +19927,7 @@
- if $ac_preproc_ok; then
-   :
- else
--  { { echo "$as_me:19931: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
-+  { { echo "$as_me:19930: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
- echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -19943,23 +19942,23 @@
- for ac_header in typeinfo
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:19946: checking for $ac_header" >&5
-+echo "$as_me:19945: 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 19952 "configure"
-+#line 19951 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:19956: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19955: \"$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:19962: \$? = $ac_status" >&5
-+  echo "$as_me:19961: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19978,7 +19977,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:19981: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:19980: 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 <&5
-+echo "$as_me:19993: 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 20000 "configure"
-+#line 19999 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:20004: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:20003: \"$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:20010: \$? = $ac_status" >&5
-+  echo "$as_me:20009: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -20026,7 +20025,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:20029: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:20028: 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 <&5
-+	echo "$as_me:20039: checking if iostream uses std-namespace" >&5
- echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 20043 "configure"
-+#line 20042 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -20057,16 +20056,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20060: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20059: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20063: \$? = $ac_status" >&5
-+  echo "$as_me:20062: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20066: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20065: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20069: \$? = $ac_status" >&5
-+  echo "$as_me:20068: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_iostream_namespace=yes
- else
-@@ -20075,7 +20074,7 @@
- cf_iostream_namespace=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:20078: result: $cf_iostream_namespace" >&5
-+	echo "$as_me:20077: result: $cf_iostream_namespace" >&5
- echo "${ECHO_T}$cf_iostream_namespace" >&6
- 	if test "$cf_iostream_namespace" = yes ; then
- 
-@@ -20086,7 +20085,7 @@
- 	fi
- fi
- 
--echo "$as_me:20089: checking if we should include stdbool.h" >&5
-+echo "$as_me:20088: checking if we should include stdbool.h" >&5
- echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
- 
- if test "${cf_cv_header_stdbool_h+set}" = set; then
-@@ -20094,7 +20093,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 20097 "configure"
-+#line 20096 "configure"
- #include "confdefs.h"
- 
- int
-@@ -20106,23 +20105,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20109: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20108: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20112: \$? = $ac_status" >&5
-+  echo "$as_me:20111: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20115: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20114: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20118: \$? = $ac_status" >&5
-+  echo "$as_me:20117: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=0
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 20125 "configure"
-+#line 20124 "configure"
- #include "confdefs.h"
- 
- #ifndef __BEOS__
-@@ -20138,16 +20137,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20141: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20140: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20144: \$? = $ac_status" >&5
-+  echo "$as_me:20143: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20147: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20146: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20150: \$? = $ac_status" >&5
-+  echo "$as_me:20149: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=1
- else
-@@ -20161,13 +20160,13 @@
- fi
- 
- if test "$cf_cv_header_stdbool_h" = 1
--then	echo "$as_me:20164: result: yes" >&5
-+then	echo "$as_me:20163: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:20166: result: no" >&5
-+else	echo "$as_me:20165: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:20170: checking for builtin bool type" >&5
-+echo "$as_me:20169: checking for builtin bool type" >&5
- echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
- 
- if test "${cf_cv_builtin_bool+set}" = set; then
-@@ -20175,7 +20174,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 20178 "configure"
-+#line 20177 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -20190,16 +20189,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20193: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20192: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20196: \$? = $ac_status" >&5
-+  echo "$as_me:20195: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20199: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20198: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20202: \$? = $ac_status" >&5
-+  echo "$as_me:20201: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_builtin_bool=1
- else
-@@ -20212,13 +20211,13 @@
- fi
- 
- if test "$cf_cv_builtin_bool" = 1
--then	echo "$as_me:20215: result: yes" >&5
-+then	echo "$as_me:20214: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:20217: result: no" >&5
-+else	echo "$as_me:20216: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:20221: checking for size of bool" >&5
-+echo "$as_me:20220: checking for size of bool" >&5
- echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
- if test "${cf_cv_type_of_bool+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20229,7 +20228,7 @@
-   cf_cv_type_of_bool=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20232 "configure"
-+#line 20231 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -20271,15 +20270,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20274: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20273: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20277: \$? = $ac_status" >&5
-+  echo "$as_me:20276: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20279: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20278: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20282: \$? = $ac_status" >&5
-+  echo "$as_me:20281: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_of_bool=`cat cf_test.out`
- 		 if test -z "$cf_cv_type_of_bool"; then
-@@ -20297,18 +20296,18 @@
- fi
- 
- 	rm -f cf_test.out
--echo "$as_me:20300: result: $cf_cv_type_of_bool" >&5
-+echo "$as_me:20299: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- if test "$cf_cv_type_of_bool" = unknown ; then
- 	case .$NCURSES_BOOL in
- 	(.auto|.) NCURSES_BOOL=unsigned;;
- 	esac
--	{ echo "$as_me:20306: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-+	{ echo "$as_me:20305: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
- echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
- 	cf_cv_type_of_bool=$NCURSES_BOOL
- fi
- 
--echo "$as_me:20311: checking for special defines needed for etip.h" >&5
-+echo "$as_me:20310: checking for special defines needed for etip.h" >&5
- echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6
- cf_save_CXXFLAGS="$CXXFLAGS"
- cf_result="none"
-@@ -20326,7 +20325,7 @@
- 	test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}"
- 	test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
- cat >conftest.$ac_ext <<_ACEOF
--#line 20329 "configure"
-+#line 20328 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -20340,16 +20339,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20343: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20342: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20346: \$? = $ac_status" >&5
-+  echo "$as_me:20345: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20349: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20348: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20352: \$? = $ac_status" >&5
-+  echo "$as_me:20351: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	test -n "$cf_math" && cat >>confdefs.h <&5
-+echo "$as_me:20372: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- CXXFLAGS="$cf_save_CXXFLAGS"
- 
- if test -n "$CXX"; then
--echo "$as_me:20378: checking if $CXX accepts parameter initialization" >&5
-+echo "$as_me:20377: checking if $CXX accepts parameter initialization" >&5
- echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6
- if test "${cf_cv_cpp_param_init+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20392,7 +20391,7 @@
-   cf_cv_cpp_param_init=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20395 "configure"
-+#line 20394 "configure"
- #include "confdefs.h"
- 
- class TEST {
-@@ -20411,15 +20410,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20414: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20413: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20417: \$? = $ac_status" >&5
-+  echo "$as_me:20416: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20419: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20418: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20422: \$? = $ac_status" >&5
-+  echo "$as_me:20421: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cpp_param_init=yes
- else
-@@ -20438,7 +20437,7 @@
- ac_main_return=return
- 
- fi
--echo "$as_me:20441: result: $cf_cv_cpp_param_init" >&5
-+echo "$as_me:20440: result: $cf_cv_cpp_param_init" >&5
- echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
- fi
- test "$cf_cv_cpp_param_init" = yes &&
-@@ -20448,7 +20447,7 @@
- 
- if test -n "$CXX"; then
- 
--echo "$as_me:20451: checking if $CXX accepts static_cast" >&5
-+echo "$as_me:20450: checking if $CXX accepts static_cast" >&5
- echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6
- if test "${cf_cv_cpp_static_cast+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20462,7 +20461,7 @@
- ac_main_return=return
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 20465 "configure"
-+#line 20464 "configure"
- #include "confdefs.h"
- 
- class NCursesPanel
-@@ -20506,16 +20505,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20509: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20508: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20512: \$? = $ac_status" >&5
-+  echo "$as_me:20511: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20515: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20514: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20518: \$? = $ac_status" >&5
-+  echo "$as_me:20517: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cpp_static_cast=yes
- else
-@@ -20533,7 +20532,7 @@
- ac_main_return=return
- 
- fi
--echo "$as_me:20536: result: $cf_cv_cpp_static_cast" >&5
-+echo "$as_me:20535: result: $cf_cv_cpp_static_cast" >&5
- echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
- 
- fi
-@@ -20582,7 +20581,7 @@
- 	else
- 		if test "$cf_cv_header_stdbool_h" = 1 ; then
- 
--echo "$as_me:20585: checking for size of bool" >&5
-+echo "$as_me:20584: checking for size of bool" >&5
- echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
- if test "${cf_cv_type_of_bool+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20593,7 +20592,7 @@
-   cf_cv_type_of_bool=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20596 "configure"
-+#line 20595 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -20635,15 +20634,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20638: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20637: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20641: \$? = $ac_status" >&5
-+  echo "$as_me:20640: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20643: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20642: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20646: \$? = $ac_status" >&5
-+  echo "$as_me:20645: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_of_bool=`cat cf_test.out`
- 		 if test -z "$cf_cv_type_of_bool"; then
-@@ -20661,25 +20660,25 @@
- fi
- 
- 	rm -f cf_test.out
--echo "$as_me:20664: result: $cf_cv_type_of_bool" >&5
-+echo "$as_me:20663: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- if test "$cf_cv_type_of_bool" = unknown ; then
- 	case .$NCURSES_BOOL in
- 	(.auto|.) NCURSES_BOOL=unsigned;;
- 	esac
--	{ echo "$as_me:20670: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-+	{ echo "$as_me:20669: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
- echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
- 	cf_cv_type_of_bool=$NCURSES_BOOL
- fi
- 
- 		else
--			echo "$as_me:20676: checking for fallback type of bool" >&5
-+			echo "$as_me:20675: checking for fallback type of bool" >&5
- echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
- 			case "$host_cpu" in
- 			(i?86)	cf_cv_type_of_bool=char	;;
- 			(*)	cf_cv_type_of_bool=int	;;
- 			esac
--			echo "$as_me:20682: result: $cf_cv_type_of_bool" >&5
-+			echo "$as_me:20681: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- 		fi
- 	fi
-@@ -20708,7 +20707,7 @@
- 
- 	if test "$cf_with_ada" != "no" ; then
- 		if test "$with_libtool" != "no"; then
--			{ echo "$as_me:20711: WARNING: libtool does not support Ada - disabling feature" >&5
-+			{ echo "$as_me:20710: WARNING: libtool does not support Ada - disabling feature" >&5
- echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
- 			cf_with_ada=no
- 		fi
-@@ -20719,7 +20718,7 @@
- cf_ada_make=gnatmake
- # Extract the first word of "$cf_ada_make", so it can be a program name with args.
- set dummy $cf_ada_make; ac_word=$2
--echo "$as_me:20722: checking for $ac_word" >&5
-+echo "$as_me:20721: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_gnat_exists+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20734,7 +20733,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_gnat_exists="yes"
--echo "$as_me:20737: found $ac_dir/$ac_word" >&5
-+echo "$as_me:20736: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -20743,10 +20742,10 @@
- fi
- gnat_exists=$ac_cv_prog_gnat_exists
- if test -n "$gnat_exists"; then
--  echo "$as_me:20746: result: $gnat_exists" >&5
-+  echo "$as_me:20745: result: $gnat_exists" >&5
- echo "${ECHO_T}$gnat_exists" >&6
- else
--  echo "$as_me:20749: result: no" >&5
-+  echo "$as_me:20748: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -20755,12 +20754,12 @@
- 	cf_cv_prog_gnat_correct=no
- else
- 
--echo "$as_me:20758: checking for gnat version" >&5
-+echo "$as_me:20757: checking for gnat version" >&5
- echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
- cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
- 	grep '[0-9].[0-9][0-9]*' |\
- 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
--echo "$as_me:20763: result: $cf_gnat_version" >&5
-+echo "$as_me:20762: result: $cf_gnat_version" >&5
- echo "${ECHO_T}$cf_gnat_version" >&6
- 
- case $cf_gnat_version in
-@@ -20768,7 +20767,7 @@
- 	cf_cv_prog_gnat_correct=yes
- 	;;
- (*)
--	{ echo "$as_me:20771: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
-+	{ echo "$as_me:20770: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
- echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
- 	cf_cv_prog_gnat_correct=no
- 	;;
-@@ -20776,7 +20775,7 @@
- 
- 	# Extract the first word of "m4", so it can be a program name with args.
- set dummy m4; ac_word=$2
--echo "$as_me:20779: checking for $ac_word" >&5
-+echo "$as_me:20778: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_M4_exists+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20791,7 +20790,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_M4_exists="yes"
--echo "$as_me:20794: found $ac_dir/$ac_word" >&5
-+echo "$as_me:20793: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -20800,10 +20799,10 @@
- fi
- M4_exists=$ac_cv_prog_M4_exists
- if test -n "$M4_exists"; then
--  echo "$as_me:20803: result: $M4_exists" >&5
-+  echo "$as_me:20802: result: $M4_exists" >&5
- echo "${ECHO_T}$M4_exists" >&6
- else
--  echo "$as_me:20806: result: no" >&5
-+  echo "$as_me:20805: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -20812,7 +20811,7 @@
- 		echo Ada95 binding required program m4 not found. Ada95 binding disabled.
- 	fi
- 	if test "$cf_cv_prog_gnat_correct" = yes; then
--		echo "$as_me:20815: checking if GNAT works" >&5
-+		echo "$as_me:20814: checking if GNAT works" >&5
- echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
- 
- rm -rf conftest* *~conftest*
-@@ -20840,7 +20839,7 @@
- fi
- rm -rf conftest* *~conftest*
- 
--		echo "$as_me:20843: result: $cf_cv_prog_gnat_correct" >&5
-+		echo "$as_me:20842: result: $cf_cv_prog_gnat_correct" >&5
- echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
- 	fi
- fi
-@@ -20849,7 +20848,7 @@
- 
-  	ADAFLAGS="$ADAFLAGS -gnatpn"
- 
--	echo "$as_me:20852: checking optimization options for ADAFLAGS" >&5
-+	echo "$as_me:20851: checking optimization options for ADAFLAGS" >&5
- echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
- 	case "$CFLAGS" in
- 	(*-g*)
-@@ -20866,10 +20865,10 @@
- 
- 		;;
- 	esac
--	echo "$as_me:20869: result: $ADAFLAGS" >&5
-+	echo "$as_me:20868: result: $ADAFLAGS" >&5
- echo "${ECHO_T}$ADAFLAGS" >&6
- 
--echo "$as_me:20872: checking if GNATPREP supports -T option" >&5
-+echo "$as_me:20871: checking if GNATPREP supports -T option" >&5
- echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
- if test "${cf_cv_gnatprep_opt_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20879,11 +20878,11 @@
- gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
- 
- fi
--echo "$as_me:20882: result: $cf_cv_gnatprep_opt_t" >&5
-+echo "$as_me:20881: result: $cf_cv_gnatprep_opt_t" >&5
- echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
- test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
- 
--echo "$as_me:20886: checking if GNAT supports generics" >&5
-+echo "$as_me:20885: checking if GNAT supports generics" >&5
- echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
- case $cf_gnat_version in
- (3.[1-9]*|[4-9].*)
-@@ -20893,7 +20892,7 @@
- 	cf_gnat_generics=no
- 	;;
- esac
--echo "$as_me:20896: result: $cf_gnat_generics" >&5
-+echo "$as_me:20895: result: $cf_gnat_generics" >&5
- echo "${ECHO_T}$cf_gnat_generics" >&6
- 
- if test "$cf_gnat_generics" = yes
-@@ -20905,7 +20904,7 @@
- 	cf_generic_objects=
- fi
- 
--echo "$as_me:20908: checking if GNAT supports SIGINT" >&5
-+echo "$as_me:20907: checking if GNAT supports SIGINT" >&5
- echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
- if test "${cf_cv_gnat_sigint+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20953,7 +20952,7 @@
- rm -rf conftest* *~conftest*
- 
- fi
--echo "$as_me:20956: result: $cf_cv_gnat_sigint" >&5
-+echo "$as_me:20955: result: $cf_cv_gnat_sigint" >&5
- echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
- 
- if test $cf_cv_gnat_sigint = yes ; then
-@@ -20966,7 +20965,7 @@
- cf_gnat_projects=no
- 
- if test "$enable_gnat_projects" != no ; then
--echo "$as_me:20969: checking if GNAT supports project files" >&5
-+echo "$as_me:20968: checking if GNAT supports project files" >&5
- echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
- case $cf_gnat_version in
- (3.[0-9]*)
-@@ -21026,15 +21025,15 @@
- 	esac
- 	;;
- esac
--echo "$as_me:21029: result: $cf_gnat_projects" >&5
-+echo "$as_me:21028: result: $cf_gnat_projects" >&5
- echo "${ECHO_T}$cf_gnat_projects" >&6
- fi # enable_gnat_projects
- 
- if test $cf_gnat_projects = yes
- then
--	echo "$as_me:21035: checking if GNAT supports libraries" >&5
-+	echo "$as_me:21034: checking if GNAT supports libraries" >&5
- echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
--	echo "$as_me:21037: result: $cf_gnat_libraries" >&5
-+	echo "$as_me:21036: result: $cf_gnat_libraries" >&5
- echo "${ECHO_T}$cf_gnat_libraries" >&6
- fi
- 
-@@ -21054,7 +21053,7 @@
- 	USE_GNAT_LIBRARIES="#"
- fi
- 
--echo "$as_me:21057: checking for ada-compiler" >&5
-+echo "$as_me:21056: checking for ada-compiler" >&5
- echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
- 
- # Check whether --with-ada-compiler or --without-ada-compiler was given.
-@@ -21065,12 +21064,12 @@
-   cf_ada_compiler=gnatmake
- fi;
- 
--echo "$as_me:21068: result: $cf_ada_compiler" >&5
-+echo "$as_me:21067: result: $cf_ada_compiler" >&5
- echo "${ECHO_T}$cf_ada_compiler" >&6
- 
- 			cf_ada_package=terminal_interface
- 
--echo "$as_me:21073: checking for ada-include" >&5
-+echo "$as_me:21072: checking for ada-include" >&5
- echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
- 
- # Check whether --with-ada-include or --without-ada-include was given.
-@@ -21106,7 +21105,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:21109: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:21108: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -21115,10 +21114,10 @@
- fi
- eval ADA_INCLUDE="$withval"
- 
--echo "$as_me:21118: result: $ADA_INCLUDE" >&5
-+echo "$as_me:21117: result: $ADA_INCLUDE" >&5
- echo "${ECHO_T}$ADA_INCLUDE" >&6
- 
--echo "$as_me:21121: checking for ada-objects" >&5
-+echo "$as_me:21120: checking for ada-objects" >&5
- echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
- 
- # Check whether --with-ada-objects or --without-ada-objects was given.
-@@ -21154,7 +21153,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:21157: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:21156: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -21163,10 +21162,10 @@
- fi
- eval ADA_OBJECTS="$withval"
- 
--echo "$as_me:21166: result: $ADA_OBJECTS" >&5
-+echo "$as_me:21165: result: $ADA_OBJECTS" >&5
- echo "${ECHO_T}$ADA_OBJECTS" >&6
- 
--echo "$as_me:21169: checking if an Ada95 shared-library should be built" >&5
-+echo "$as_me:21168: checking if an Ada95 shared-library should be built" >&5
- echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
- 
- # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
-@@ -21176,7 +21175,7 @@
- else
-   with_ada_sharedlib=no
- fi;
--echo "$as_me:21179: result: $with_ada_sharedlib" >&5
-+echo "$as_me:21178: result: $with_ada_sharedlib" >&5
- echo "${ECHO_T}$with_ada_sharedlib" >&6
- 
- ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
-@@ -21199,13 +21198,13 @@
- 
- # do this "late" to avoid conflict with header-checks
- if test "x$with_widec" = xyes ; then
--	echo "$as_me:21202: checking for wchar_t" >&5
-+	echo "$as_me:21201: checking for wchar_t" >&5
- echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6
- if test "${ac_cv_type_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 21208 "configure"
-+#line 21207 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21220,16 +21219,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21223: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21222: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21226: \$? = $ac_status" >&5
-+  echo "$as_me:21225: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21229: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21228: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21232: \$? = $ac_status" >&5
-+  echo "$as_me:21231: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_wchar_t=yes
- else
-@@ -21239,10 +21238,10 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:21242: result: $ac_cv_type_wchar_t" >&5
-+echo "$as_me:21241: result: $ac_cv_type_wchar_t" >&5
- echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
- 
--echo "$as_me:21245: checking size of wchar_t" >&5
-+echo "$as_me:21244: checking size of wchar_t" >&5
- echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6
- if test "${ac_cv_sizeof_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -21251,7 +21250,7 @@
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
--#line 21254 "configure"
-+#line 21253 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21263,21 +21262,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21266: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21265: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21269: \$? = $ac_status" >&5
-+  echo "$as_me:21268: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21272: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21271: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21275: \$? = $ac_status" >&5
-+  echo "$as_me:21274: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=0 ac_mid=0
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 21280 "configure"
-+#line 21279 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21289,16 +21288,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21292: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21291: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21295: \$? = $ac_status" >&5
-+  echo "$as_me:21294: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21298: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21297: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21301: \$? = $ac_status" >&5
-+  echo "$as_me:21300: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid; break
- else
-@@ -21314,7 +21313,7 @@
- ac_hi=-1 ac_mid=-1
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 21317 "configure"
-+#line 21316 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21326,16 +21325,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21329: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21328: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21332: \$? = $ac_status" >&5
-+  echo "$as_me:21331: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21335: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21334: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21338: \$? = $ac_status" >&5
-+  echo "$as_me:21337: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=$ac_mid; break
- else
-@@ -21351,7 +21350,7 @@
- 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 21354 "configure"
-+#line 21353 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21363,16 +21362,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21366: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21365: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21369: \$? = $ac_status" >&5
-+  echo "$as_me:21368: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21372: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21371: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21375: \$? = $ac_status" >&5
-+  echo "$as_me:21374: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid
- else
-@@ -21385,12 +21384,12 @@
- ac_cv_sizeof_wchar_t=$ac_lo
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:21388: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:21387: 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 21393 "configure"
-+#line 21392 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21406,15 +21405,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:21409: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21408: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:21412: \$? = $ac_status" >&5
-+  echo "$as_me:21411: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:21414: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21413: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21417: \$? = $ac_status" >&5
-+  echo "$as_me:21416: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_wchar_t=`cat conftest.val`
- else
-@@ -21430,7 +21429,7 @@
-   ac_cv_sizeof_wchar_t=0
- fi
- fi
--echo "$as_me:21433: result: $ac_cv_sizeof_wchar_t" >&5
-+echo "$as_me:21432: result: $ac_cv_sizeof_wchar_t" >&5
- echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
- cat >>confdefs.h <&5
-+echo "$as_me:21450: checking for library subsets" >&5
- echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
- LIB_SUBSETS=
- 
-@@ -21490,7 +21489,7 @@
- test "x$with_widec"     = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
- test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
- 
--echo "$as_me:21493: result: $LIB_SUBSETS" >&5
-+echo "$as_me:21492: result: $LIB_SUBSETS" >&5
- echo "${ECHO_T}$LIB_SUBSETS" >&6
- 
- ### Construct the list of include-directories to be generated
-@@ -21521,7 +21520,7 @@
- fi
- 
- ### Build up pieces for makefile rules
--echo "$as_me:21524: checking default library suffix" >&5
-+echo "$as_me:21523: checking default library suffix" >&5
- echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -21532,10 +21531,10 @@
- 	(shared)  DFT_ARG_SUFFIX=''   ;;
- 	esac
- 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
--echo "$as_me:21535: result: $DFT_ARG_SUFFIX" >&5
-+echo "$as_me:21534: result: $DFT_ARG_SUFFIX" >&5
- echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
- 
--echo "$as_me:21538: checking default library-dependency suffix" >&5
-+echo "$as_me:21537: checking default library-dependency suffix" >&5
- echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
- 
- 	case X$DFT_LWR_MODEL in
-@@ -21593,10 +21592,10 @@
- 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
- 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
- 	fi
--echo "$as_me:21596: result: $DFT_DEP_SUFFIX" >&5
-+echo "$as_me:21595: result: $DFT_DEP_SUFFIX" >&5
- echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
- 
--echo "$as_me:21599: checking default object directory" >&5
-+echo "$as_me:21598: checking default object directory" >&5
- echo $ECHO_N "checking default object directory... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -21612,11 +21611,11 @@
- 			DFT_OBJ_SUBDIR='obj_s' ;;
- 		esac
- 	esac
--echo "$as_me:21615: result: $DFT_OBJ_SUBDIR" >&5
-+echo "$as_me:21614: result: $DFT_OBJ_SUBDIR" >&5
- echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
- 
- if test "x$cf_with_cxx" = xyes ; then
--echo "$as_me:21619: checking c++ library-dependency suffix" >&5
-+echo "$as_me:21618: checking c++ library-dependency suffix" >&5
- echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
- if test "$with_libtool" != "no"; then
- 	# libtool thinks it can make c++ shared libraries (perhaps only g++)
-@@ -21684,7 +21683,7 @@
- 	fi
- 
- fi
--echo "$as_me:21687: result: $CXX_LIB_SUFFIX" >&5
-+echo "$as_me:21686: result: $CXX_LIB_SUFFIX" >&5
- echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
- 
- fi
-@@ -21857,19 +21856,19 @@
- 
- if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
- then
--	echo "$as_me:21860: checking if linker supports switching between static/dynamic" >&5
-+	echo "$as_me:21859: checking if linker supports switching between static/dynamic" >&5
- echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6
- 
- 	rm -f libconftest.a
- 	cat >conftest.$ac_ext <
- int cf_ldflags_static(FILE *fp) { return fflush(fp); }
- EOF
--	if { (eval echo "$as_me:21869: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:21868: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21872: \$? = $ac_status" >&5
-+  echo "$as_me:21871: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 		( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null
- 		( eval $RANLIB libconftest.a ) 2>&5 >/dev/null
-@@ -21880,10 +21879,10 @@
- 
- 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 21883 "configure"
-+#line 21882 "configure"
- #include "confdefs.h"
- 
--#line 21886 "configure"
-+#line 21885 "configure"
- #include 
- int cf_ldflags_static(FILE *fp);
- 
-@@ -21898,16 +21897,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:21901: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21900: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:21904: \$? = $ac_status" >&5
-+  echo "$as_me:21903: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:21907: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21906: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21910: \$? = $ac_status" >&5
-+  echo "$as_me:21909: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	# some linkers simply ignore the -dynamic
-@@ -21930,7 +21929,7 @@
- 	rm -f libconftest.*
- 	LIBS="$cf_save_LIBS"
- 
--	echo "$as_me:21933: result: $cf_ldflags_static" >&5
-+	echo "$as_me:21932: result: $cf_ldflags_static" >&5
- echo "${ECHO_T}$cf_ldflags_static" >&6
- 
- 	if test $cf_ldflags_static != yes
-@@ -21946,7 +21945,7 @@
- 	;;
- esac
- 
--echo "$as_me:21949: checking where we will install curses.h" >&5
-+echo "$as_me:21948: checking where we will install curses.h" >&5
- echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
- 
- includesubdir=
-@@ -21956,7 +21955,7 @@
- then
- 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
- fi
--echo "$as_me:21959: result: ${includedir}${includesubdir}" >&5
-+echo "$as_me:21958: result: ${includedir}${includesubdir}" >&5
- echo "${ECHO_T}${includedir}${includesubdir}" >&6
- 
- ### Resolve a conflict between normal and wide-curses by forcing applications
-@@ -21964,7 +21963,7 @@
- if test "$with_overwrite" != no ; then
- if test "$NCURSES_LIBUTF8" = 1 ; then
- 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
--	{ echo "$as_me:21967: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
-+	{ echo "$as_me:21966: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
- echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
- fi
- fi
-@@ -21982,7 +21981,7 @@
- ### Construct the list of subdirectories for which we'll customize makefiles
- ### with the appropriate compile-rules.
- 
--echo "$as_me:21985: checking for src modules" >&5
-+echo "$as_me:21984: checking for src modules" >&5
- echo $ECHO_N "checking for src modules... $ECHO_C" >&6
- 
- # dependencies and linker-arguments for test-programs
-@@ -22047,7 +22046,7 @@
- 		fi
- 	fi
- done
--echo "$as_me:22050: result: $cf_cv_src_modules" >&5
-+echo "$as_me:22049: result: $cf_cv_src_modules" >&5
- echo "${ECHO_T}$cf_cv_src_modules" >&6
- 
- TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
-@@ -22258,16 +22257,13 @@
- SUB_MAKEFILES="$SUB_MAKEFILES misc/ncurses-config:misc/ncurses-config.in"
- SUB_MAKEFILES="$SUB_MAKEFILES man/ncurses${USE_CFG_SUFFIX}-config.1:man/MKncu_config.in"
- 
--if test "x$enable_pc_files" = xyes ; then \
-+if test "x$enable_pc_files" = xyes && test -z "$MAKE_PC_FILES" ; then
- SUB_MAKEFILES="$SUB_MAKEFILES misc/gen-pkgconfig:misc/gen-pkgconfig.in"
--MAKE_PC_FILES=
--else
--MAKE_PC_FILES="#"
- fi
- 
- # Extract the first word of "tic", so it can be a program name with args.
- set dummy tic; ac_word=$2
--echo "$as_me:22270: checking for $ac_word" >&5
-+echo "$as_me:22266: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_TIC_PATH+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -22284,7 +22280,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   if $as_executable_p "$ac_dir/$ac_word"; then
-    ac_cv_path_TIC_PATH="$ac_dir/$ac_word"
--   echo "$as_me:22287: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:22283: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -22296,10 +22292,10 @@
- TIC_PATH=$ac_cv_path_TIC_PATH
- 
- if test -n "$TIC_PATH"; then
--  echo "$as_me:22299: result: $TIC_PATH" >&5
-+  echo "$as_me:22295: result: $TIC_PATH" >&5
- echo "${ECHO_T}$TIC_PATH" >&6
- else
--  echo "$as_me:22302: result: no" >&5
-+  echo "$as_me:22298: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -22307,7 +22303,7 @@
- then
- 	if test "$TIC_PATH" = unknown
- 	then
--		{ echo "$as_me:22310: WARNING: no tic program found for fallbacks" >&5
-+		{ echo "$as_me:22306: WARNING: no tic program found for fallbacks" >&5
- echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
- 	fi
- fi
-@@ -22343,7 +22339,7 @@
- 	(*-D_XOPEN_SOURCE_EXTENDED*)
- 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
- 
--echo "${as_me:-configure}:22346: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
-+echo "${as_me:-configure}:22342: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
- 
- 		CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
- 		CPPFLAGS=`echo "x$CPPFLAGS" | sed -e  's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'`
-@@ -22354,7 +22350,7 @@
- 
- # Help to automatically enable the extended curses features when using either
- # the *-config or the ".pc" files by adding defines.
--echo "$as_me:22357: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
-+echo "$as_me:22353: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
- echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6
- PKG_CFLAGS=
- for cf_loop1 in $CPPFLAGS_after_XOPEN
-@@ -22370,7 +22366,7 @@
- 	done
- 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
- done
--echo "$as_me:22373: result: $PKG_CFLAGS" >&5
-+echo "$as_me:22369: result: $PKG_CFLAGS" >&5
- echo "${ECHO_T}$PKG_CFLAGS" >&6
- 
- # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
-@@ -22427,7 +22423,7 @@
- 	cf_filter_syms=$cf_dft_filter_syms
- 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_version" 1>&6
- 
--echo "${as_me:-configure}:22430: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
-+echo "${as_me:-configure}:22426: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
- 
- fi
- 
-@@ -22529,7 +22525,7 @@
- : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ echo "$as_me:22532: creating $CONFIG_STATUS" >&5
-+{ echo "$as_me:22528: creating $CONFIG_STATUS" >&5
- echo "$as_me: creating $CONFIG_STATUS" >&6;}
- cat >$CONFIG_STATUS <<_ACEOF
- #! $SHELL
-@@ -22705,7 +22701,7 @@
-     echo "$ac_cs_version"; exit 0 ;;
-   --he | --h)
-     # Conflict between --help and --header
--    { { echo "$as_me:22708: error: ambiguous option: $1
-+    { { echo "$as_me:22704: 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;}
-@@ -22724,7 +22720,7 @@
-     ac_need_defaults=false;;
- 
-   # This is an error.
--  -*) { { echo "$as_me:22727: error: unrecognized option: $1
-+  -*) { { echo "$as_me:22723: 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;}
-@@ -22842,7 +22838,7 @@
-   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
--  *) { { echo "$as_me:22845: error: invalid argument: $ac_config_target" >&5
-+  *) { { echo "$as_me:22841: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
-@@ -23316,7 +23312,7 @@
-   esac
- 
-   if test x"$ac_file" != x-; then
--    { echo "$as_me:23319: creating $ac_file" >&5
-+    { echo "$as_me:23315: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
-     rm -f "$ac_file"
-   fi
-@@ -23334,7 +23330,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:23337: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:23333: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -23347,7 +23343,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:23350: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:23346: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -23363,7 +23359,7 @@
-       if test -n "$ac_seen"; then
-         ac_used=`grep '@datarootdir@' $ac_item`
-         if test -z "$ac_used"; then
--          { echo "$as_me:23366: WARNING: datarootdir was used implicitly but not set:
-+          { echo "$as_me:23362: 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;}
-@@ -23372,7 +23368,7 @@
-       fi
-       ac_seen=`grep '${datarootdir}' $ac_item`
-       if test -n "$ac_seen"; then
--        { echo "$as_me:23375: WARNING: datarootdir was used explicitly but not set:
-+        { echo "$as_me:23371: 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;}
-@@ -23409,7 +23405,7 @@
-             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:23412: WARNING: Variable $ac_name is used but was not set:
-+              { echo "$as_me:23408: 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;}
-@@ -23420,7 +23416,7 @@
-     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:23423: WARNING: Some variables may not be substituted:
-+      { echo "$as_me:23419: WARNING: Some variables may not be substituted:
- $ac_seen" >&5
- echo "$as_me: WARNING: Some variables may not be substituted:
- $ac_seen" >&2;}
-@@ -23469,7 +23465,7 @@
-   * )   ac_file_in=$ac_file.in ;;
-   esac
- 
--  test x"$ac_file" != x- && { echo "$as_me:23472: creating $ac_file" >&5
-+  test x"$ac_file" != x- && { echo "$as_me:23468: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
- 
-   # First look for the input files in the build tree, otherwise in the
-@@ -23480,7 +23476,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:23483: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:23479: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -23493,7 +23489,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:23496: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:23492: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -23551,7 +23547,7 @@
-   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:23554: $ac_file is unchanged" >&5
-+      { echo "$as_me:23550: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
-     else
-       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-@@ -23650,25 +23646,32 @@
- 		SHARED_LIB=
- 		Libs_To_Make=
- 
--		cf_sed_options=
-+		cf_awk_program="BEGIN { skip = 1; last=\"\"; }"
- 		if test -n "${cf_cv_abi_version}" && test "x${cf_cv_abi_version}" != "x5"
- 		then
--			cf_sed_options="$cf_sed_options -e \"s/NCURSES\\([WT]\\+\\)\?_/NCURSES\\1${cf_cv_abi_version}_/g\""
--			cf_sed_options="$cf_sed_options -e \"/deprecated in ABI${cf_cv_abi_version}/d\""
-+			cf_awk_program="$cf_awk_program\
-+/deprecated in ABI${cf_cv_abi_version}/ { next; }\
-+{ sub(\"NCURSES([WT]+)?\", \"&${cf_cv_abi_version}\"); }\
-+"
- 		fi
- 
- 		if test "x$WILDCARD_SYMS" = xno
- 		then
--			cf_sed_options="$cf_sed_options -e \"s/_\*;//g\""
-+			cf_awk_program="$cf_awk_program\
-+/[ 	]_\\*;/ { skip=1; next; }\
-+"
- 		fi
- 
--		if test "x$cf_sed_options" != "x"
-+		if test "x$cf_awk_program" != "x"
- 		then
- 			cat >>$cf_dir/Makefile <\$@
-+	$AWK '$cf_awk_program \
-+{ if ( last != "" && ( skip == 0 || \$\$0 !~ /}/ ) ) { print last; }\
-+ skip = 0; last = \$\$0; } \
-+END { print last; }' < $UNALTERED_SYMS >\$@
- 
- distclean::
- 	rm -f resulting.map
-@@ -23889,7 +23892,7 @@
- 				(cygdll|msysdll|mingw)
- 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
- 
--echo "${as_me:-configure}:23892: testing overriding CXX_MODEL to SHARED ..." 1>&5
-+echo "${as_me:-configure}:23895: testing overriding CXX_MODEL to SHARED ..." 1>&5
- 
- 					with_shared_cxx=yes
- 					;;
-Index: configure.in
-Prereq:  1.621 
---- ncurses-6.0-20151024+/configure.in	2015-10-24 17:57:55.000000000 +0000
-+++ ncurses-6.0-20151101/configure.in	2015-11-01 01:22:57.000000000 +0000
-@@ -28,14 +28,14 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: configure.in,v 1.621 2015/10/24 17:57:55 Tomas.Cech Exp $
-+dnl $Id: configure.in,v 1.622 2015/11/01 01:22:57 tom Exp $
- dnl Process this file with autoconf to produce a configure script.
- dnl
- dnl See http://invisible-island.net/autoconf/ for additional information.
- dnl
- dnl ---------------------------------------------------------------------------
- AC_PREREQ(2.52.20030208)
--AC_REVISION($Revision: 1.621 $)
-+AC_REVISION($Revision: 1.622 $)
- AC_INIT(ncurses/base/lib_initscr.c)
- AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
- 
-@@ -2035,13 +2035,9 @@
- SUB_MAKEFILES="$SUB_MAKEFILES misc/ncurses-config:misc/ncurses-config.in"
- SUB_MAKEFILES="$SUB_MAKEFILES man/ncurses${USE_CFG_SUFFIX}-config.1:man/MKncu_config.in"
- 
--if test "x$enable_pc_files" = xyes ; then \
-+if test "x$enable_pc_files" = xyes && test -z "$MAKE_PC_FILES" ; then
- SUB_MAKEFILES="$SUB_MAKEFILES misc/gen-pkgconfig:misc/gen-pkgconfig.in"
--MAKE_PC_FILES=
--else
--MAKE_PC_FILES="#"
- fi
--AC_SUBST(MAKE_PC_FILES)
- AC_SUBST(cross_compiling)
- 
- AC_PATH_PROG(TIC_PATH,tic,unknown,$PATH:/usr/local/ncurses/bin)
-Index: dist.mk
-Prereq:  1.1075 
---- ncurses-6.0-20151024+/dist.mk	2015-10-24 13:10:18.000000000 +0000
-+++ ncurses-6.0-20151101/dist.mk	2015-11-01 10:25:33.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1075 2015/10/24 13:10:18 tom Exp $
-+# $Id: dist.mk,v 1.1077 2015/11/01 10:25:33 tom Exp $
- # Makefile for creating ncurses distributions.
- #
- # This only needs to be used directly as a makefile by developers, but
-@@ -37,7 +37,7 @@
- # These define the major/minor/patch versions of ncurses.
- NCURSES_MAJOR = 6
- NCURSES_MINOR = 0
--NCURSES_PATCH = 20151024
-+NCURSES_PATCH = 20151101
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: misc/Makefile.in
-Prereq:  1.63 
---- ncurses-6.0-20151024+/misc/Makefile.in	2015-08-05 23:15:41.000000000 +0000
-+++ ncurses-6.0-20151101/misc/Makefile.in	2015-11-01 20:01:20.000000000 +0000
-@@ -1,4 +1,4 @@
--# $Id: Makefile.in,v 1.63 2015/08/05 23:15:41 tom Exp $
-+# $Id: Makefile.in,v 1.65 2015/11/01 20:01:20 tom Exp $
- ##############################################################################
- # Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.                #
- #                                                                            #
-@@ -110,8 +110,22 @@
- install.libs :: $(DESTDIR)$(bindir) ncurses-config
- 	$(INSTALL_SCRIPT) ncurses-config $(DESTDIR)$(bindir)/$(NCURSES_CONFIG)
- 
--@MAKE_PC_FILES@install.libs :: pc-files $(DESTDIR)$(PKG_CONFIG_LIBDIR)
--@MAKE_PC_FILES@	$(SHELL) -c 'for name in *.pc; do $(INSTALL_DATA) $$name $(DESTDIR)$(PKG_CONFIG_LIBDIR)/$$name; done'
-+# some packagers prefer to be able to construct pc-files on servers where
-+# pkg-config is not installed.  Work around that by creating the library
-+# directory during this rule:
-+@MAKE_PC_FILES@install.libs :: pc-files
-+@MAKE_PC_FILES@	@$(SHELL) -c 'case "x$(DESTDIR)$(PKG_CONFIG_LIBDIR)" in \
-+	(x/*) \
-+		mkdir -p $(DESTDIR)$(PKG_CONFIG_LIBDIR); \
-+		for name in *.pc; do \
-+			echo installing $$name; \
-+			$(INSTALL_DATA) $$name $(DESTDIR)$(PKG_CONFIG_LIBDIR)/$$name; \
-+		done \
-+		;; \
-+	(*) \
-+		echo "...skip actual install: no destination was given" ; \
-+		;; \
-+	esac'
- 
- @MAKE_PC_FILES@sources :: pc-files
- @MAKE_PC_FILES@pc-files :
-@@ -131,8 +145,7 @@
- $(DESTDIR)$(bindir) \
- $(DESTDIR)$(libdir) \
- $(DESTDIR)$(datadir) \
--$(DESTDIR)$(tabsetdir) \
--$(DESTDIR)$(PKG_CONFIG_LIBDIR) :
-+$(DESTDIR)$(tabsetdir) :
- 	mkdir -p $@
- 
- uninstall : @MISC_UNINSTALL_DATA@ uninstall.libs
-@@ -144,7 +157,14 @@
- 
- uninstall.libs :
- 	-rm -f $(DESTDIR)$(bindir)/$(NCURSES_CONFIG)
--@MAKE_PC_FILES@	$(SHELL) -c 'for name in *.pc; do rm -f $(DESTDIR)$(PKG_CONFIG_LIBDIR)/$$name; done'
-+@MAKE_PC_FILES@	@$(SHELL) -c 'case x$(DESTDIR)$(PKG_CONFIG_LIBDIR) in \
-+	(x/*) \
-+		for name in *.pc; do \
-+			echo uninstalling $$name; \
-+			rm -f $(DESTDIR)$(PKG_CONFIG_LIBDIR)/$$name; \
-+		done \
-+		;; \
-+	esac'
- 
- tags :
- 
-Index: ncurses/base/lib_mouse.c
-Prereq:  1.167 
---- ncurses-6.0-20151024+/ncurses/base/lib_mouse.c	2015-10-17 22:08:05.000000000 +0000
-+++ ncurses-6.0-20151101/ncurses/base/lib_mouse.c	2015-10-31 20:47:41.000000000 +0000
-@@ -84,7 +84,7 @@
- #define CUR SP_TERMTYPE
- #endif
- 
--MODULE_ID("$Id: lib_mouse.c,v 1.167 2015/10/17 22:08:05 KO.Myung-Hun Exp $")
-+MODULE_ID("$Id: lib_mouse.c,v 1.168 2015/10/31 20:47:41 tom Exp $")
- 
- #include 
- 
-@@ -641,13 +641,14 @@
- 
- #if USE_SYSMOUSE
-     {
-+	static char dev_tty[] = "/dev/tty";
- 	struct mouse_info the_mouse;
- 	char *the_device = 0;
- 
- 	if (NC_ISATTY(sp->_ifd))
- 	    the_device = ttyname(sp->_ifd);
- 	if (the_device == 0)
--	    the_device = "/dev/tty";
-+	    the_device = dev_tty;
- 
- 	sp->_mouse_fd = open(the_device, O_RDWR);
- 
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20151024+/package/debian-mingw/changelog	2015-10-24 13:10:18.000000000 +0000
-+++ ncurses-6.0-20151101/package/debian-mingw/changelog	2015-11-01 10:25:33.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151024) unstable; urgency=low
-+ncurses6 (6.0+20151101) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 24 Oct 2015 09:10:18 -0400
-+ -- Thomas E. Dickey   Sun, 01 Nov 2015 05:25:33 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20151024+/package/debian-mingw64/changelog	2015-10-24 13:10:18.000000000 +0000
-+++ ncurses-6.0-20151101/package/debian-mingw64/changelog	2015-11-01 10:25:33.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151024) unstable; urgency=low
-+ncurses6 (6.0+20151101) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 24 Oct 2015 09:10:18 -0400
-+ -- Thomas E. Dickey   Sun, 01 Nov 2015 05:25:33 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.0-20151024+/package/debian/changelog	2015-10-24 13:10:18.000000000 +0000
-+++ ncurses-6.0-20151101/package/debian/changelog	2015-11-01 10:25:33.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151024) unstable; urgency=low
-+ncurses6 (6.0+20151101) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 24 Oct 2015 09:10:18 -0400
-+ -- Thomas E. Dickey   Sun, 01 Nov 2015 05:25:33 -0500
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.128 
---- ncurses-6.0-20151024+/package/mingw-ncurses.nsi	2015-10-24 13:10:18.000000000 +0000
-+++ ncurses-6.0-20151101/package/mingw-ncurses.nsi	2015-11-01 10:25:33.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.128 2015/10/24 13:10:18 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.130 2015/11/01 10:25:33 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "0"
- !define VERSION_YYYY  "2015"
--!define VERSION_MMDD  "1024"
-+!define VERSION_MMDD  "1101"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20151024+/package/mingw-ncurses.spec	2015-10-24 13:10:18.000000000 +0000
-+++ ncurses-6.0-20151101/package/mingw-ncurses.spec	2015-11-01 10:25:33.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.0
--Release: 20151024
-+Release: 20151101
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20151024+/package/ncurses.spec	2015-10-24 13:10:18.000000000 +0000
-+++ ncurses-6.0-20151101/package/ncurses.spec	2015-11-01 10:25:33.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.0
--Release: 20151024
-+Release: 20151101
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: test/ncurses.c
-Prereq:  1.421 
---- ncurses-6.0-20151024+/test/ncurses.c	2015-10-24 23:32:57.000000000 +0000
-+++ ncurses-6.0-20151101/test/ncurses.c	2015-10-31 19:53:06.000000000 +0000
-@@ -40,7 +40,7 @@
-    Author: Eric S. Raymond  1993
-            Thomas E. Dickey (beginning revision 1.27 in 1996).
- 
--$Id: ncurses.c,v 1.421 2015/10/24 23:32:57 tom Exp $
-+$Id: ncurses.c,v 1.423 2015/10/31 19:53:06 tom Exp $
- 
- ***************************************************************************/
- 
-@@ -1413,7 +1413,7 @@
- show_attr(WINDOW *win, int row, int skip, bool arrow, chtype attr, const char *name)
- {
-     int ncv = get_ncv();
--    chtype test = attr & (chtype) (~A_ALTCHARSET);
-+    chtype test = attr & (chtype) (~(A_ALTCHARSET | A_CHARTEXT));
- 
-     if (arrow)
- 	MvPrintw(row, COLS_PRE_ATTRS - 3, "-->");
-@@ -1478,8 +1478,9 @@
- 		if (found)
- 		    printw(" (NCV)");
- 	    }
--	    if ((termattrs() & test) != test)
-+	    if ((termattrs() & test) != test) {
- 		printw(" (Part)");
-+	    }
- 	}
-     }
-     return row + 2;
-@@ -1868,8 +1869,9 @@
- 		if (found)
- 		    printw(" (NCV)");
- 	    }
--	    if ((term_attrs() & test) != test)
-+	    if ((term_attrs() & test) != test) {
- 		printw(" (Part)");
-+	    }
- 	}
-     }
-     return row + 2;
diff --git a/ncurses-6.0-20151107.patch b/ncurses-6.0-20151107.patch
deleted file mode 100644
index f2567c9..0000000
--- a/ncurses-6.0-20151107.patch
+++ /dev/null
@@ -1,694 +0,0 @@
-# ncurses 6.0 - patch 20151107 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.0 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.0 can be found at
-# 	ftp://invisible-island.net/ncurses/6.0
-#	http://invisible-mirror.net/archives/ncurses/6.0 
-#
-# ------------------------------------------------------------------------------
-# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20151107.patch.gz
-# patch by Thomas E. Dickey 
-# created  Sun Nov  8 02:34:05 UTC 2015
-# ------------------------------------------------------------------------------
-# NEWS                             |   15 +++++
-# VERSION                          |    2 
-# aclocal.m4                       |   10 +--
-# configure                        |   96 +++++++++++++++++++------------------
-# configure.in                     |   10 ++-
-# dist.mk                          |    4 -
-# package/debian-mingw/changelog   |    4 -
-# package/debian-mingw64/changelog |    4 -
-# package/debian/changelog         |    4 -
-# package/mingw-ncurses.nsi        |    4 -
-# package/mingw-ncurses.spec       |    2 
-# package/ncurses.spec             |    2 
-# progs/tset.c                     |    7 --
-# 13 files changed, 91 insertions(+), 73 deletions(-)
-# ------------------------------------------------------------------------------
-Index: NEWS
-Prereq:  1.2522 
---- ncurses-6.0-20151101+/NEWS	2015-11-01 10:27:24.000000000 +0000
-+++ ncurses-6.0-20151107/NEWS	2015-11-08 01:57:15.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.2522 2015/11/01 10:27:24 tom Exp $
-+-- $Id: NEWS,v 1.2526 2015/11/08 01:57:15 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,19 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20151107
-+	+ modify tset's assignment to TERM in its output to reflect the name by
-+	  which the terminal description is found, rather than the primary
-+	  name.  That was an unnecessary part from the initial conversion of
-+	  tset from termcap to terminfo.  The termcap program in 4.3BSD did
-+	  this to avoid using the short 2-character name (report by Rich
-+	  Burridge).
-+	+ minor fix to configure script to ensure that rules for resulting.map
-+	  are only generated when needed (cf: 20151101).
-+	+ modify configure script to handle the case where tic-library is
-+	  renamed, but the --with-debug option is used by itself without
-+	  normal or shared libraries (prompted by comment in Debian #803482).
-+
- 20151101
- 	+ amend change for pkg-config which allows build of pc-files when no
- 	  valid pkg-config library directory was configured to suppress the
-Index: VERSION
---- ncurses-6.0-20151101+/VERSION	2015-11-01 10:25:33.000000000 +0000
-+++ ncurses-6.0-20151107/VERSION	2015-11-06 00:44:10.000000000 +0000
-@@ -1 +1 @@
--5:0:9	6.0	20151101
-+5:0:9	6.0	20151107
-Index: aclocal.m4
-Prereq:  1.783 
---- ncurses-6.0-20151101+/aclocal.m4	2015-11-01 10:29:05.000000000 +0000
-+++ ncurses-6.0-20151107/aclocal.m4	2015-11-08 01:03:06.000000000 +0000
-@@ -28,7 +28,7 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: aclocal.m4,v 1.783 2015/11/01 10:29:05 tom Exp $
-+dnl $Id: aclocal.m4,v 1.785 2015/11/08 01:03:06 tom Exp $
- dnl Macros used in NCURSES auto-configuration script.
- dnl
- dnl These macros are maintained separately from NCURSES.  The copyright on
-@@ -3241,7 +3241,7 @@
- 	AC_SUBST(LIB_PREFIX)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_LIB_RULES version: 85 updated: 2015/10/31 20:06:35
-+dnl CF_LIB_RULES version: 86 updated: 2015/11/07 20:01:34
- dnl ------------
- dnl Append definitions and rules for the given models to the subdirectory
- dnl Makefiles, and the recursion rule for the top-level Makefile.  If the
-@@ -3293,8 +3293,7 @@
- 
- 		SHARED_LIB=
- 		Libs_To_Make=
--
--		cf_awk_program="BEGIN { skip = 1; last=\"\"; }"
-+		cf_awk_program=
- 		if test -n "${cf_cv_abi_version}" && test "x${cf_cv_abi_version}" != "x5"
- 		then
- 			cf_awk_program="$cf_awk_program\
-@@ -3316,7 +3315,8 @@
- 
- # Generated by CF_LIB_RULES
- resulting.map: $UNALTERED_SYMS
--	$AWK '$cf_awk_program \
-+	$AWK 'BEGIN { skip = 1; last=""; } \
-+$cf_awk_program \
- { if ( last != "" && ( skip == 0 || \[$]\[$]0 !~ /}/ ) ) { print last; }\
-  skip = 0; last = \[$]\[$]0; } \
- END { print last; }' < $UNALTERED_SYMS >\[$]@
-Index: configure
---- ncurses-6.0-20151101+/configure	2015-11-01 10:12:02.000000000 +0000
-+++ ncurses-6.0-20151107/configure	2015-11-08 01:06:42.000000000 +0000
-@@ -1,5 +1,5 @@
- #! /bin/sh
--# From configure.in Revision: 1.622 .
-+# From configure.in Revision: 1.623 .
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by Autoconf 2.52.20150926.
- #
-@@ -21722,17 +21722,20 @@
- 
- 	if test "x$with_ticlib" != xyes ; then
- 		TICS_NAME=$with_ticlib
-+		TICS_SUFFIX="`echo ${DFT_LIB_SUFFIX}|sed -e "s/^${USE_LIB_SUFFIX}//"`"
- 		TICS_ARG_SUFFIX="${with_ticlib}`echo ${USE_ARG_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
- 		TICS_DEP_SUFFIX="${with_ticlib}`echo ${DFT_DEP_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
- 		TICS_LIB_SUFFIX="${with_ticlib}"
- 	else
-+		TICS_SUFFIX=${DFT_LIB_SUFFIX}
- 		TICS_ARG_SUFFIX="${TICS_NAME}${USE_ARG_SUFFIX}"
- 		TICS_DEP_SUFFIX="${TICS_NAME}${DFT_DEP_SUFFIX}"
- 		TICS_LIB_SUFFIX="${TICS_NAME}${USE_LIB_SUFFIX}"
- 	fi
- 	TICS_LDFLAGS="-L${LIB_DIR}"
--	TICS_LIBS="-l${TICS_LIB_SUFFIX}"
-+	TICS_LIBS="-l${TICS_ARG_SUFFIX}"
- else
-+	TICS_SUFFIX=${DFT_LIB_SUFFIX}
- 	TICS_LDFLAGS="-L${LIB_DIR}"
- 	TICS_LIBS="-l${LIB_NAME}${USE_ARG_SUFFIX}"
- fi
-@@ -21856,19 +21859,19 @@
- 
- if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
- then
--	echo "$as_me:21859: checking if linker supports switching between static/dynamic" >&5
-+	echo "$as_me:21862: checking if linker supports switching between static/dynamic" >&5
- echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6
- 
- 	rm -f libconftest.a
- 	cat >conftest.$ac_ext <
- int cf_ldflags_static(FILE *fp) { return fflush(fp); }
- EOF
--	if { (eval echo "$as_me:21868: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:21871: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21871: \$? = $ac_status" >&5
-+  echo "$as_me:21874: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 		( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null
- 		( eval $RANLIB libconftest.a ) 2>&5 >/dev/null
-@@ -21879,10 +21882,10 @@
- 
- 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 21882 "configure"
-+#line 21885 "configure"
- #include "confdefs.h"
- 
--#line 21885 "configure"
-+#line 21888 "configure"
- #include 
- int cf_ldflags_static(FILE *fp);
- 
-@@ -21897,16 +21900,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:21900: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21903: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:21903: \$? = $ac_status" >&5
-+  echo "$as_me:21906: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:21906: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21909: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21909: \$? = $ac_status" >&5
-+  echo "$as_me:21912: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	# some linkers simply ignore the -dynamic
-@@ -21929,7 +21932,7 @@
- 	rm -f libconftest.*
- 	LIBS="$cf_save_LIBS"
- 
--	echo "$as_me:21932: result: $cf_ldflags_static" >&5
-+	echo "$as_me:21935: result: $cf_ldflags_static" >&5
- echo "${ECHO_T}$cf_ldflags_static" >&6
- 
- 	if test $cf_ldflags_static != yes
-@@ -21945,7 +21948,7 @@
- 	;;
- esac
- 
--echo "$as_me:21948: checking where we will install curses.h" >&5
-+echo "$as_me:21951: checking where we will install curses.h" >&5
- echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
- 
- includesubdir=
-@@ -21955,7 +21958,7 @@
- then
- 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
- fi
--echo "$as_me:21958: result: ${includedir}${includesubdir}" >&5
-+echo "$as_me:21961: result: ${includedir}${includesubdir}" >&5
- echo "${ECHO_T}${includedir}${includesubdir}" >&6
- 
- ### Resolve a conflict between normal and wide-curses by forcing applications
-@@ -21963,7 +21966,7 @@
- if test "$with_overwrite" != no ; then
- if test "$NCURSES_LIBUTF8" = 1 ; then
- 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
--	{ echo "$as_me:21966: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
-+	{ echo "$as_me:21969: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
- echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
- fi
- fi
-@@ -21981,7 +21984,7 @@
- ### Construct the list of subdirectories for which we'll customize makefiles
- ### with the appropriate compile-rules.
- 
--echo "$as_me:21984: checking for src modules" >&5
-+echo "$as_me:21987: checking for src modules" >&5
- echo $ECHO_N "checking for src modules... $ECHO_C" >&6
- 
- # dependencies and linker-arguments for test-programs
-@@ -22046,7 +22049,7 @@
- 		fi
- 	fi
- done
--echo "$as_me:22049: result: $cf_cv_src_modules" >&5
-+echo "$as_me:22052: result: $cf_cv_src_modules" >&5
- echo "${ECHO_T}$cf_cv_src_modules" >&6
- 
- TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
-@@ -22263,7 +22266,7 @@
- 
- # Extract the first word of "tic", so it can be a program name with args.
- set dummy tic; ac_word=$2
--echo "$as_me:22266: checking for $ac_word" >&5
-+echo "$as_me:22269: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_TIC_PATH+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -22280,7 +22283,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   if $as_executable_p "$ac_dir/$ac_word"; then
-    ac_cv_path_TIC_PATH="$ac_dir/$ac_word"
--   echo "$as_me:22283: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:22286: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -22292,10 +22295,10 @@
- TIC_PATH=$ac_cv_path_TIC_PATH
- 
- if test -n "$TIC_PATH"; then
--  echo "$as_me:22295: result: $TIC_PATH" >&5
-+  echo "$as_me:22298: result: $TIC_PATH" >&5
- echo "${ECHO_T}$TIC_PATH" >&6
- else
--  echo "$as_me:22298: result: no" >&5
-+  echo "$as_me:22301: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -22303,7 +22306,7 @@
- then
- 	if test "$TIC_PATH" = unknown
- 	then
--		{ echo "$as_me:22306: WARNING: no tic program found for fallbacks" >&5
-+		{ echo "$as_me:22309: WARNING: no tic program found for fallbacks" >&5
- echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
- 	fi
- fi
-@@ -22339,7 +22342,7 @@
- 	(*-D_XOPEN_SOURCE_EXTENDED*)
- 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
- 
--echo "${as_me:-configure}:22342: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
-+echo "${as_me:-configure}:22345: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
- 
- 		CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
- 		CPPFLAGS=`echo "x$CPPFLAGS" | sed -e  's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'`
-@@ -22350,7 +22353,7 @@
- 
- # Help to automatically enable the extended curses features when using either
- # the *-config or the ".pc" files by adding defines.
--echo "$as_me:22353: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
-+echo "$as_me:22356: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
- echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6
- PKG_CFLAGS=
- for cf_loop1 in $CPPFLAGS_after_XOPEN
-@@ -22366,7 +22369,7 @@
- 	done
- 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
- done
--echo "$as_me:22369: result: $PKG_CFLAGS" >&5
-+echo "$as_me:22372: result: $PKG_CFLAGS" >&5
- echo "${ECHO_T}$PKG_CFLAGS" >&6
- 
- # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
-@@ -22423,7 +22426,7 @@
- 	cf_filter_syms=$cf_dft_filter_syms
- 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_version" 1>&6
- 
--echo "${as_me:-configure}:22426: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
-+echo "${as_me:-configure}:22429: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
- 
- fi
- 
-@@ -22525,7 +22528,7 @@
- : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ echo "$as_me:22528: creating $CONFIG_STATUS" >&5
-+{ echo "$as_me:22531: creating $CONFIG_STATUS" >&5
- echo "$as_me: creating $CONFIG_STATUS" >&6;}
- cat >$CONFIG_STATUS <<_ACEOF
- #! $SHELL
-@@ -22701,7 +22704,7 @@
-     echo "$ac_cs_version"; exit 0 ;;
-   --he | --h)
-     # Conflict between --help and --header
--    { { echo "$as_me:22704: error: ambiguous option: $1
-+    { { echo "$as_me:22707: 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;}
-@@ -22720,7 +22723,7 @@
-     ac_need_defaults=false;;
- 
-   # This is an error.
--  -*) { { echo "$as_me:22723: error: unrecognized option: $1
-+  -*) { { echo "$as_me:22726: 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;}
-@@ -22782,6 +22785,7 @@
- TICS_ARG_SUFFIX="$TICS_ARG_SUFFIX"
- TICS_LIB_SUFFIX="$TICS_LIB_SUFFIX"
- TICS_NAME="$TICS_NAME"
-+TICS_SUFFIX="$TICS_SUFFIX"
- TIC_PATH="$TIC_PATH"
- TINFO_ARG_SUFFIX="$TINFO_ARG_SUFFIX"
- TINFO_LIB_SUFFIX="$TINFO_LIB_SUFFIX"
-@@ -22838,7 +22842,7 @@
-   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
--  *) { { echo "$as_me:22841: error: invalid argument: $ac_config_target" >&5
-+  *) { { echo "$as_me:22845: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
-@@ -23312,7 +23316,7 @@
-   esac
- 
-   if test x"$ac_file" != x-; then
--    { echo "$as_me:23315: creating $ac_file" >&5
-+    { echo "$as_me:23319: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
-     rm -f "$ac_file"
-   fi
-@@ -23330,7 +23334,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:23333: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:23337: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -23343,7 +23347,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:23346: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:23350: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -23359,7 +23363,7 @@
-       if test -n "$ac_seen"; then
-         ac_used=`grep '@datarootdir@' $ac_item`
-         if test -z "$ac_used"; then
--          { echo "$as_me:23362: WARNING: datarootdir was used implicitly but not set:
-+          { echo "$as_me:23366: 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;}
-@@ -23368,7 +23372,7 @@
-       fi
-       ac_seen=`grep '${datarootdir}' $ac_item`
-       if test -n "$ac_seen"; then
--        { echo "$as_me:23371: WARNING: datarootdir was used explicitly but not set:
-+        { echo "$as_me:23375: 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;}
-@@ -23405,7 +23409,7 @@
-             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:23408: WARNING: Variable $ac_name is used but was not set:
-+              { echo "$as_me:23412: 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;}
-@@ -23416,7 +23420,7 @@
-     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:23419: WARNING: Some variables may not be substituted:
-+      { echo "$as_me:23423: WARNING: Some variables may not be substituted:
- $ac_seen" >&5
- echo "$as_me: WARNING: Some variables may not be substituted:
- $ac_seen" >&2;}
-@@ -23465,7 +23469,7 @@
-   * )   ac_file_in=$ac_file.in ;;
-   esac
- 
--  test x"$ac_file" != x- && { echo "$as_me:23468: creating $ac_file" >&5
-+  test x"$ac_file" != x- && { echo "$as_me:23472: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
- 
-   # First look for the input files in the build tree, otherwise in the
-@@ -23476,7 +23480,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:23479: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:23483: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -23489,7 +23493,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:23492: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:23496: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -23547,7 +23551,7 @@
-   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:23550: $ac_file is unchanged" >&5
-+      { echo "$as_me:23554: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
-     else
-       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-@@ -23645,8 +23649,7 @@
- 
- 		SHARED_LIB=
- 		Libs_To_Make=
--
--		cf_awk_program="BEGIN { skip = 1; last=\"\"; }"
-+		cf_awk_program=
- 		if test -n "${cf_cv_abi_version}" && test "x${cf_cv_abi_version}" != "x5"
- 		then
- 			cf_awk_program="$cf_awk_program\
-@@ -23668,7 +23671,8 @@
- 
- # Generated by CF_LIB_RULES
- resulting.map: $UNALTERED_SYMS
--	$AWK '$cf_awk_program \
-+	$AWK 'BEGIN { skip = 1; last=""; } \
-+$cf_awk_program \
- { if ( last != "" && ( skip == 0 || \$\$0 !~ /}/ ) ) { print last; }\
-  skip = 0; last = \$\$0; } \
- END { print last; }' < $UNALTERED_SYMS >\$@
-@@ -23892,7 +23896,7 @@
- 				(cygdll|msysdll|mingw)
- 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
- 
--echo "${as_me:-configure}:23895: testing overriding CXX_MODEL to SHARED ..." 1>&5
-+echo "${as_me:-configure}:23899: testing overriding CXX_MODEL to SHARED ..." 1>&5
- 
- 					with_shared_cxx=yes
- 					;;
-Index: configure.in
-Prereq:  1.622 
---- ncurses-6.0-20151101+/configure.in	2015-11-01 01:22:57.000000000 +0000
-+++ ncurses-6.0-20151107/configure.in	2015-11-07 22:41:37.000000000 +0000
-@@ -28,14 +28,14 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: configure.in,v 1.622 2015/11/01 01:22:57 tom Exp $
-+dnl $Id: configure.in,v 1.623 2015/11/07 22:41:37 tom Exp $
- dnl Process this file with autoconf to produce a configure script.
- dnl
- dnl See http://invisible-island.net/autoconf/ for additional information.
- dnl
- dnl ---------------------------------------------------------------------------
- AC_PREREQ(2.52.20030208)
--AC_REVISION($Revision: 1.622 $)
-+AC_REVISION($Revision: 1.623 $)
- AC_INIT(ncurses/base/lib_initscr.c)
- AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
- 
-@@ -1859,17 +1859,20 @@
- 
- 	if test "x$with_ticlib" != xyes ; then
- 		TICS_NAME=$with_ticlib
-+		TICS_SUFFIX="`echo ${DFT_LIB_SUFFIX}|sed -e "s/^${USE_LIB_SUFFIX}//"`"
- 		TICS_ARG_SUFFIX="${with_ticlib}`echo ${USE_ARG_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
- 		TICS_DEP_SUFFIX="${with_ticlib}`echo ${DFT_DEP_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
- 		TICS_LIB_SUFFIX="${with_ticlib}"
- 	else
-+		TICS_SUFFIX=${DFT_LIB_SUFFIX}
- 		TICS_ARG_SUFFIX="${TICS_NAME}${USE_ARG_SUFFIX}"
- 		TICS_DEP_SUFFIX="${TICS_NAME}${DFT_DEP_SUFFIX}"
- 		TICS_LIB_SUFFIX="${TICS_NAME}${USE_LIB_SUFFIX}"
- 	fi
- 	TICS_LDFLAGS="-L${LIB_DIR}"
--	TICS_LIBS="-l${TICS_LIB_SUFFIX}"
-+	TICS_LIBS="-l${TICS_ARG_SUFFIX}"
- else
-+	TICS_SUFFIX=${DFT_LIB_SUFFIX}
- 	TICS_LDFLAGS="-L${LIB_DIR}"
- 	TICS_LIBS="-l${LIB_NAME}${USE_ARG_SUFFIX}"
- fi
-@@ -2236,6 +2239,7 @@
- TICS_ARG_SUFFIX="$TICS_ARG_SUFFIX"
- TICS_LIB_SUFFIX="$TICS_LIB_SUFFIX"
- TICS_NAME="$TICS_NAME"
-+TICS_SUFFIX="$TICS_SUFFIX"
- TIC_PATH="$TIC_PATH"
- TINFO_ARG_SUFFIX="$TINFO_ARG_SUFFIX"
- TINFO_LIB_SUFFIX="$TINFO_LIB_SUFFIX"
-Index: dist.mk
-Prereq:  1.1077 
---- ncurses-6.0-20151101+/dist.mk	2015-11-01 10:25:33.000000000 +0000
-+++ ncurses-6.0-20151107/dist.mk	2015-11-06 00:44:10.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1077 2015/11/01 10:25:33 tom Exp $
-+# $Id: dist.mk,v 1.1078 2015/11/06 00:44:10 tom Exp $
- # Makefile for creating ncurses distributions.
- #
- # This only needs to be used directly as a makefile by developers, but
-@@ -37,7 +37,7 @@
- # These define the major/minor/patch versions of ncurses.
- NCURSES_MAJOR = 6
- NCURSES_MINOR = 0
--NCURSES_PATCH = 20151101
-+NCURSES_PATCH = 20151107
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20151101+/package/debian-mingw/changelog	2015-11-01 10:25:33.000000000 +0000
-+++ ncurses-6.0-20151107/package/debian-mingw/changelog	2015-11-06 00:44:10.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151101) unstable; urgency=low
-+ncurses6 (6.0+20151107) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sun, 01 Nov 2015 05:25:33 -0500
-+ -- Thomas E. Dickey   Thu, 05 Nov 2015 19:44:10 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20151101+/package/debian-mingw64/changelog	2015-11-01 10:25:33.000000000 +0000
-+++ ncurses-6.0-20151107/package/debian-mingw64/changelog	2015-11-06 00:44:10.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151101) unstable; urgency=low
-+ncurses6 (6.0+20151107) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sun, 01 Nov 2015 05:25:33 -0500
-+ -- Thomas E. Dickey   Thu, 05 Nov 2015 19:44:10 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.0-20151101+/package/debian/changelog	2015-11-01 10:25:33.000000000 +0000
-+++ ncurses-6.0-20151107/package/debian/changelog	2015-11-06 00:44:10.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151101) unstable; urgency=low
-+ncurses6 (6.0+20151107) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sun, 01 Nov 2015 05:25:33 -0500
-+ -- Thomas E. Dickey   Thu, 05 Nov 2015 19:44:10 -0500
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.130 
---- ncurses-6.0-20151101+/package/mingw-ncurses.nsi	2015-11-01 10:25:33.000000000 +0000
-+++ ncurses-6.0-20151107/package/mingw-ncurses.nsi	2015-11-06 00:44:10.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.130 2015/11/01 10:25:33 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.131 2015/11/06 00:44:10 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "0"
- !define VERSION_YYYY  "2015"
--!define VERSION_MMDD  "1101"
-+!define VERSION_MMDD  "1107"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20151101+/package/mingw-ncurses.spec	2015-11-01 10:25:33.000000000 +0000
-+++ ncurses-6.0-20151107/package/mingw-ncurses.spec	2015-11-06 00:44:10.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.0
--Release: 20151101
-+Release: 20151107
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20151101+/package/ncurses.spec	2015-11-01 10:25:33.000000000 +0000
-+++ ncurses-6.0-20151107/package/ncurses.spec	2015-11-06 00:44:10.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.0
--Release: 20151101
-+Release: 20151107
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: progs/tset.c
-Prereq:  1.96 
---- ncurses-6.0-20151101+/progs/tset.c	2015-04-12 15:36:06.000000000 +0000
-+++ ncurses-6.0-20151107/progs/tset.c	2015-11-08 01:45:47.000000000 +0000
-@@ -119,7 +119,7 @@
- #include 
- #include 
- 
--MODULE_ID("$Id: tset.c,v 1.96 2015/04/12 15:36:06 tom Exp $")
-+MODULE_ID("$Id: tset.c,v 1.97 2015/11/08 01:45:47 tom Exp $")
- 
- /*
-  * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,
-@@ -1293,7 +1293,7 @@
- 	reset_mode();
-     }
- 
--    (void) get_termcap_entry(*argv);
-+    ttype = get_termcap_entry(*argv);
- 
-     if (!noset) {
- #if HAVE_SIZECHANGE
-@@ -1327,9 +1327,6 @@
- 	}
-     }
- 
--    /* Get the terminal name from the entry. */
--    ttype = _nc_first_name(cur_term->type.term_names);
--
-     if (noset)
- 	(void) printf("%s\n", ttype);
-     else {
diff --git a/ncurses-6.0-20151121.patch b/ncurses-6.0-20151121.patch
deleted file mode 100644
index 1e51f6c..0000000
--- a/ncurses-6.0-20151121.patch
+++ /dev/null
@@ -1,720 +0,0 @@
-# ncurses 6.0 - patch 20151121 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.0 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.0 can be found at
-# 	ftp://invisible-island.net/ncurses/6.0
-#	http://invisible-mirror.net/archives/ncurses/6.0 
-#
-# ------------------------------------------------------------------------------
-# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20151121.patch.gz
-# patch by Thomas E. Dickey 
-# created  Sun Nov 22 02:17:21 UTC 2015
-# ------------------------------------------------------------------------------
-# MANIFEST                             |    1 
-# NEWS                                 |    8 
-# VERSION                              |    2 
-# dist.mk                              |    4 
-# man/curs_bkgd.3x                     |    3 
-# misc/terminfo.src                    |   56 +++--
-# ncurses-6.0-20151121/test/test_sgr.c |  363 +++++++++++++++++++++++++++++++++
-# package/debian-mingw/changelog       |    4 
-# package/debian-mingw64/changelog     |    4 
-# package/debian/changelog             |    4 
-# package/mingw-ncurses.nsi            |    4 
-# package/mingw-ncurses.spec           |    2 
-# package/ncurses.spec                 |    2 
-# test/modules                         |    3 
-# test/programs                        |    3 
-# 15 files changed, 428 insertions(+), 35 deletions(-)
-# ------------------------------------------------------------------------------
-Index: MANIFEST
---- ncurses-6.0-20151107+/MANIFEST	2015-06-27 19:49:54.000000000 +0000
-+++ ncurses-6.0-20151121/MANIFEST	2015-11-22 01:12:19.000000000 +0000
-@@ -1162,6 +1162,7 @@
- ./test/test_inwstr.c
- ./test/test_opaque.c
- ./test/test_setupterm.c
-+./test/test_sgr.c
- ./test/test_vid_puts.c
- ./test/test_vidputs.c
- ./test/testaddch.c
-Index: NEWS
-Prereq:  1.2526 
---- ncurses-6.0-20151107+/NEWS	2015-11-08 01:57:15.000000000 +0000
-+++ ncurses-6.0-20151121/NEWS	2015-11-21 23:33:30.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.2526 2015/11/08 01:57:15 tom Exp $
-+-- $Id: NEWS,v 1.2530 2015/11/21 23:33:30 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,12 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20151121
-+	+ fix some inconsistencies in the pccon* entries -TD
-+	+ add bold to pccon+sgr+acs and pccon-base (Tati Chevron).
-+	+ add keys f12-f124 to pccon+keys (Tati Chevron).
-+	+ add test/test_sgr.c program to exercise all combinations of sgr.
-+
- 20151107
- 	+ modify tset's assignment to TERM in its output to reflect the name by
- 	  which the terminal description is found, rather than the primary
-Index: VERSION
---- ncurses-6.0-20151107+/VERSION	2015-11-06 00:44:10.000000000 +0000
-+++ ncurses-6.0-20151121/VERSION	2015-11-21 15:55:51.000000000 +0000
-@@ -1 +1 @@
--5:0:9	6.0	20151107
-+5:0:9	6.0	20151121
-Index: dist.mk
-Prereq:  1.1078 
---- ncurses-6.0-20151107+/dist.mk	2015-11-06 00:44:10.000000000 +0000
-+++ ncurses-6.0-20151121/dist.mk	2015-11-21 15:55:51.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1078 2015/11/06 00:44:10 tom Exp $
-+# $Id: dist.mk,v 1.1080 2015/11/21 15:55:51 tom Exp $
- # Makefile for creating ncurses distributions.
- #
- # This only needs to be used directly as a makefile by developers, but
-@@ -37,7 +37,7 @@
- # These define the major/minor/patch versions of ncurses.
- NCURSES_MAJOR = 6
- NCURSES_MINOR = 0
--NCURSES_PATCH = 20151107
-+NCURSES_PATCH = 20151121
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: man/curs_bkgd.3x
-Prereq:  1.23 
---- ncurses-6.0-20151107+/man/curs_bkgd.3x	2015-07-21 00:11:05.000000000 +0000
-+++ ncurses-6.0-20151121/man/curs_bkgd.3x	2015-11-21 01:53:42.000000000 +0000
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_bkgd.3x,v 1.23 2015/07/21 00:11:05 tom Exp $
-+.\" $Id: curs_bkgd.3x,v 1.24 2015/11/21 01:53:42 tom Exp $
- .de bP
- .IP \(bu 4
- ..
-@@ -76,7 +76,6 @@
- .bP
- Wherever the former background character
- appears, it is changed to the new background character.
--.RE
- .SS getbkgd
- .PP
- The \fBgetbkgd\fR function returns the given window's current background
-Index: misc/terminfo.src
---- ncurses-6.0-20151107+/misc/terminfo.src	2015-10-24 17:56:55.000000000 +0000
-+++ ncurses-6.0-20151121/misc/terminfo.src	2015-11-22 01:01:00.000000000 +0000
-@@ -6,8 +6,8 @@
- # Report bugs and new terminal descriptions to
- #	bug-ncurses@gnu.org
- #
--#	$Revision: 1.554 $
--#	$Date: 2015/10/24 16:00:04 $
-+#	$Revision: 1.558 $
-+#	$Date: 2015/11/22 01:01:00 $
- #
- # The original header is preserved below for reference.  It is noted that there
- # is a "newer" version which differs in some cosmetic details (but actually
-@@ -1277,7 +1277,7 @@
- # + kLFT5/kRIT5 work, but not up/down with control-modifier
- # + kLFT/kRIT work, but not up/down with shift-modifier
- # + there are a few predefined bindings with Alt, but no clear pattern.
--# + uses alt-key as UTF-8 "meta" something like xterm altSendsEscape 
-+# + uses alt-key as UTF-8 "meta" something like xterm altSendsEscape
- # Using ncurses test-program with xterm-new:
- # + no italics
- # Using xterm's scripts:
-@@ -2211,37 +2211,52 @@
- # Added several capabilities to pccon+base, reading wsemul_vt100_subr.c -TD
- # Changed kbs to DEL and removed keys that duplicate stty settings -TD
- #
-+# Notes from testing with vttest:
-+#	fails wrapping test
-+#	no 8-bit controls
-+#	identifies as vt200 with selective erase, but does not implement DECSCA
-+#	no vt52 mode
-+#	also lacks these:
-+# 		ESC # 8   DEC Screen Alignment Test (DECALN).
-+# 		CSI ? 5 h Reverse Video (DECSCNM).
-+#
- pccon+keys|OpenBSD PC keyboard keys,
- 	kbs=\177, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
- 	kdch1=\E[3~, kend=\E[8~, kent=^M, kf1=\E[11~, kf10=\E[21~,
--	kf11=\E[23~, kf12=\E[24~, kf2=\E[12~, kf3=\E[13~,
-+	kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~,
-+	kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~,
-+	kf19=\E[33~, kf2=\E[12~, kf20=\E[34~, kf21=\E[35~,
-+	kf22=\E[36~, kf23=\E[37~, kf24=\E[38~, kf3=\E[13~,
- 	kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
- 	kf9=\E[20~, khome=\E[7~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
- 	krfr=^R,
- pccon+sgr+acs0|sgr and simple ASCII pseudographics for OpenBSD PC console,
- 	acsc=+>\,<-\^.v0#`+a\:f\\h#i#j+k+l+m+n+o~p-q-r-s_t+u+v+w+x|y#z#{*|!}#~o,
--	sgr=\E[0%?%p1%p3%|%t;7%;m, sgr0=\E[m,
-+	sgr=\E[0%?%p1%p3%|%t;7%;%?%p6%t;1%;%?%p2%t;4%;m,
-+	sgr0=\E[m,
- pccon+sgr+acs|sgr and default ASCII pseudographics for OpenBSD PC console,
- 	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
- 	enacs=\E)0$<5>, rmacs=\E(B$<5>,
--	sgr=\E[0%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;$<5>,
-+	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;$<2>,
- 	sgr0=\E[m\E(B$<5>, smacs=\E(0$<5>,
-+# underline renders as color
- pccon+colors|ANSI colors for OpenBSD PC console,
- 	bce,
--	colors#8, pairs#64,
--	op=\E[m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
-+	colors#8, ncv#2, pairs#64,
-+	op=\E[47;30m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
- pccon+base|base capabilities for OpenBSD PC console,
- 	am, km, mc5i, msgr, npc, nxon, xenl, xon,
- 	cols#80, it#8, lines#24,
--	bel=^G, clear=\E[H\E[J, cr=^M, cub1=^H, cud1=^J, cuf1=\E[C,
--	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch=\E[%p1%dP,
--	dch1=\E[P, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
--	el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@,
-+	bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=^M, cub1=^H, cud1=^J,
-+	cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A,
-+	dch=\E[%p1%dP, dch1=\E[P, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J,
-+	el=\E[K, el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@,
- 	il1=\E[L, ind=\ED, nel=\EE, rev=\E[7m, ri=\EM, rmam=\E[?7l,
--	rmso=\E[m, rs2=\Ec$<50>, smam=\E[?7h, smso=\E[7m,
--	tbc=\E[3g, u6=\E[%i%d;%dR, u7=\E[6n,
-+	rmso=\E[27m, rmul=\E[24m, rs2=\Ec$<50>, smam=\E[?7h,
-+	smso=\E[7m, smul=\E[4m, tbc=\E[3g, u6=\E[%i%d;%dR,
-+	u7=\E[6n,
- pccon0-m|OpenBSD PC console without colors & with simple ASCII pseudographics,
--	use=pccon+base, use=pccon+sgr+acs0, use=pccon+keys,
-+	use=pccon+sgr+acs0, use=pccon+base, use=pccon+keys,
- pccon0|OpenBSD PC console with simple ASCII pseudographics,
- 	use=pccon0-m, use=pccon+colors,
- pccon-m|OpenBSD PC console without colors,
-@@ -9750,7 +9765,7 @@
- # (800)-800-WYSE (option 5 gets you a human).  There's a Web page at the
- # obvious address, .  They keep terminfo entries at
- # https://web.archive.org/web/19970712022641/http://www.wyse.co.uk/support/appnotes/idxappnt.htm
--# 
-+#
- #
- # Wyse bought out Link Technology, Inc. in 1990 and closed it down in 1995.
- # They now own the Qume and Amdek brands, too.  So these are the people to
-@@ -23767,7 +23782,14 @@
- #	+ updated minitel entries to fix kel problem with emacs, and add
- #	  minitel1b-nb (Alexandre Montaron).
- #	+ reviewed/updated nsterm entry Terminal.app in OSX -TD
--#	+ replace some dead URLs in comments with equivalents from the
-+#	+ replace some dead URLs in commands with equivalents from the
- #	  Internet Archive -TD
- #
-+# 2015-11-14
-+#	+ add bold to pccon+sgr+acs and pccon-base (Tati Chevron).
-+#	+ add keys f12-f124 to pccon+keys (Tati Chevron).
-+#
-+# 2015-11-21
-+#	+ fix some inconsistencies in the pccon* entries -TD
-+#
- ######## SHANTIH!  SHANTIH!  SHANTIH!
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20151107+/package/debian-mingw/changelog	2015-11-06 00:44:10.000000000 +0000
-+++ ncurses-6.0-20151121/package/debian-mingw/changelog	2015-11-21 15:55:51.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151107) unstable; urgency=low
-+ncurses6 (6.0+20151121) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Thu, 05 Nov 2015 19:44:10 -0500
-+ -- Thomas E. Dickey   Sat, 21 Nov 2015 10:55:51 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20151107+/package/debian-mingw64/changelog	2015-11-06 00:44:10.000000000 +0000
-+++ ncurses-6.0-20151121/package/debian-mingw64/changelog	2015-11-21 15:55:51.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151107) unstable; urgency=low
-+ncurses6 (6.0+20151121) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Thu, 05 Nov 2015 19:44:10 -0500
-+ -- Thomas E. Dickey   Sat, 21 Nov 2015 10:55:51 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.0-20151107+/package/debian/changelog	2015-11-06 00:44:10.000000000 +0000
-+++ ncurses-6.0-20151121/package/debian/changelog	2015-11-21 15:55:51.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151107) unstable; urgency=low
-+ncurses6 (6.0+20151121) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Thu, 05 Nov 2015 19:44:10 -0500
-+ -- Thomas E. Dickey   Sat, 21 Nov 2015 10:55:51 -0500
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.131 
---- ncurses-6.0-20151107+/package/mingw-ncurses.nsi	2015-11-06 00:44:10.000000000 +0000
-+++ ncurses-6.0-20151121/package/mingw-ncurses.nsi	2015-11-21 15:55:51.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.131 2015/11/06 00:44:10 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.133 2015/11/21 15:55:51 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "0"
- !define VERSION_YYYY  "2015"
--!define VERSION_MMDD  "1107"
-+!define VERSION_MMDD  "1121"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20151107+/package/mingw-ncurses.spec	2015-11-06 00:44:10.000000000 +0000
-+++ ncurses-6.0-20151121/package/mingw-ncurses.spec	2015-11-21 15:55:51.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.0
--Release: 20151107
-+Release: 20151121
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20151107+/package/ncurses.spec	2015-11-06 00:44:10.000000000 +0000
-+++ ncurses-6.0-20151121/package/ncurses.spec	2015-11-21 15:55:51.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.0
--Release: 20151107
-+Release: 20151121
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: test/modules
-Prereq:  1.52 
---- ncurses-6.0-20151107+/test/modules	2015-06-27 10:40:27.000000000 +0000
-+++ ncurses-6.0-20151121/test/modules	2015-11-21 16:05:48.000000000 +0000
-@@ -1,4 +1,4 @@
--# $Id: modules,v 1.52 2015/06/27 10:40:27 tom Exp $
-+# $Id: modules,v 1.53 2015/11/21 16:05:48 tom Exp $
- ##############################################################################
- # Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.                #
- #                                                                            #
-@@ -90,6 +90,7 @@
- test_inwstr	progs		$(srcdir)	$(HEADER_DEPS)
- test_opaque	progs		$(srcdir)	$(HEADER_DEPS)
- test_setupterm	progs		$(srcdir)	$(HEADER_DEPS)
-+test_sgr	progs		$(srcdir)	$(HEADER_DEPS)
- test_vid_puts	progs		$(srcdir)	$(HEADER_DEPS)
- test_vidputs	progs		$(srcdir)	$(HEADER_DEPS)
- testaddch	progs		$(srcdir)	$(HEADER_DEPS)
-Index: test/programs
-Prereq:  1.26 
---- ncurses-6.0-20151107+/test/programs	2015-06-27 10:40:53.000000000 +0000
-+++ ncurses-6.0-20151121/test/programs	2015-11-21 16:06:12.000000000 +0000
-@@ -1,4 +1,4 @@
--# $Id: programs,v 1.26 2015/06/27 10:40:53 tom Exp $
-+# $Id: programs,v 1.27 2015/11/21 16:06:12 tom Exp $
- ##############################################################################
- # Copyright (c) 2006-2014,2015 Free Software Foundation, Inc.                #
- #                                                                            #
-@@ -87,6 +87,7 @@
- test_inwstr	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_inwstr
- test_opaque	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_opaque
- test_setupterm	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_setupterm
-+test_sgr	$(LDFLAGS_TINFO)	$(LOCAL_LIBS)	test_sgr
- test_vid_puts	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_vid_puts
- test_vidputs	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_vidputs
- testaddch	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	testaddch
-Index: test/test_sgr.c
---- /dev/null	2015-11-21 12:05:05.835999855 +0000
-+++ ncurses-6.0-20151121/test/test_sgr.c	2015-11-21 22:43:50.000000000 +0000
-@@ -0,0 +1,363 @@
-+/****************************************************************************
-+ * Copyright (c) 2015 Free Software Foundation, Inc.                        *
-+ *                                                                          *
-+ * Permission is hereby granted, free of charge, to any person obtaining a  *
-+ * copy of this software and associated documentation files (the            *
-+ * "Software"), to deal in the Software without restriction, including      *
-+ * without limitation the rights to use, copy, modify, merge, publish,      *
-+ * distribute, distribute with modifications, sublicense, and/or sell       *
-+ * copies of the Software, and to permit persons to whom the Software is    *
-+ * furnished to do so, subject to the following conditions:                 *
-+ *                                                                          *
-+ * The above copyright notice and this permission notice shall be included  *
-+ * in all copies or substantial portions of the Software.                   *
-+ *                                                                          *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-+ *                                                                          *
-+ * Except as contained in this notice, the name(s) of the above copyright   *
-+ * holders shall not be used in advertising or otherwise to promote the     *
-+ * sale, use or other dealings in this Software without prior written       *
-+ * authorization.                                                           *
-+ ****************************************************************************/
-+
-+/*
-+ * Author: Thomas E. Dickey
-+ *
-+ * $Id: test_sgr.c,v 1.4 2015/11/21 22:43:50 tom Exp $
-+ *
-+ * A simple demo of the sgr/sgr0 terminal capabilities.
-+ */
-+#define USE_TINFO
-+#include 
-+
-+static void failed(const char *) GCC_NORETURN;
-+
-+static void
-+failed(const char *msg)
-+{
-+    fprintf(stderr, "%s\n", msg);
-+    ExitProgram(EXIT_FAILURE);
-+}
-+
-+#if HAVE_TIGETSTR
-+
-+static bool q_opt = FALSE;
-+
-+static char *d_opt;
-+static char *e_opt;
-+static char **db_list;
-+static int db_item;
-+
-+static long total_values;
-+
-+static char *
-+make_dbitem(char *p, char *q)
-+{
-+    char *result = malloc(strlen(e_opt) + 2 + (size_t) (p - q));
-+    sprintf(result, "%s=%.*s", e_opt, (int) (p - q), q);
-+    return result;
-+}
-+
-+static void
-+make_dblist(void)
-+{
-+    if (d_opt && e_opt) {
-+	int pass;
-+
-+	for (pass = 0; pass < 2; ++pass) {
-+	    char *p, *q;
-+	    size_t count = 0;
-+
-+	    for (p = q = d_opt; *p != '\0'; ++p) {
-+		if (*p == ':') {
-+		    if (p != q + 1) {
-+			if (pass) {
-+			    db_list[count] = make_dbitem(p, q);
-+			}
-+			count++;
-+		    }
-+		    q = p + 1;
-+		}
-+	    }
-+	    if (p != q + 1) {
-+		if (pass) {
-+		    db_list[count] = make_dbitem(p, q);
-+		}
-+		count++;
-+	    }
-+	    if (!pass) {
-+		db_list = typeCalloc(char *, count + 1);
-+	    }
-+	}
-+    }
-+}
-+
-+static char *
-+next_dbitem(void)
-+{
-+    char *result = 0;
-+
-+    if (db_list) {
-+	if ((result = db_list[db_item]) == 0) {
-+	    db_item = 0;
-+	    result = db_list[0];
-+	} else {
-+	    db_item++;
-+	}
-+    }
-+    printf("** %s\n", result);
-+    return result;
-+}
-+
-+#ifdef NO_LEAKS
-+static void
-+free_dblist(void)
-+{
-+    if (db_list) {
-+	int n;
-+	for (n = 0; db_list[n]; ++n)
-+	    free(db_list[n]);
-+	free(db_list);
-+	db_list = 0;
-+    }
-+}
-+#endif
-+
-+#define MAXPAR    9
-+#define MAXSGR    (1 << MAXPAR)
-+#define BITS2P(n) (count & (1 << (n - 1)))
-+#define MASK_SMSO (1 << 0)
-+#define MASK_BOLD (1 << 5)
-+#define MASK_REV  (1 << 2)
-+
-+static void
-+dumpit(unsigned bits, unsigned ignore, const char *sgr, const char *sgr0)
-+{
-+    static const char sample[] = "abcdefghijklm";
-+    static char params[] = "SURBDBIPA";
-+    unsigned n;
-+
-+    printf("%4d ", bits);
-+    bits &= ~ignore;
-+    for (n = 0; n < MAXPAR; ++n) {
-+	putchar((bits & (1 << n)) ? params[n] : '-');
-+    }
-+    putchar(' ');
-+    putp(sgr);
-+    putp(sample);
-+    putp(sgr0);
-+    putchar('\n');
-+}
-+
-+static bool
-+one_bit(unsigned a, unsigned b)
-+{
-+    unsigned c = (a ^ b);
-+    bool result = FALSE;
-+    if (c) {
-+	while (!(c & 1)) {
-+	    c >>= 1;
-+	}
-+	result = (c == 1);
-+    }
-+    return result;
-+}
-+
-+static void
-+brute_force(const char *name)
-+{
-+    unsigned count;
-+    char *my_sgr;
-+    char *my_sgr0;
-+    char *my_bold;
-+    char *my_revs;
-+    char *my_smso;
-+
-+    if (db_list) {
-+	putenv(next_dbitem());
-+    }
-+    if (!q_opt)
-+	printf("Terminal type \"%s\"\n", name);
-+    setupterm((NCURSES_CONST char *) name, 1, (int *) 0);
-+    if (!q_opt) {
-+	if (strcmp(name, ttytype))
-+	    printf("... actual \"%s\"\n", ttytype);
-+    }
-+
-+    my_sgr = tigetstr("sgr");
-+    my_sgr0 = tigetstr("sgr0");
-+    my_bold = tigetstr("bold");
-+    my_revs = tigetstr("rev");
-+    my_smso = tigetstr("smso");
-+
-+    if (!VALID_STRING(my_sgr)) {
-+	fprintf(stderr, "no \"sgr\" capability found\n");
-+    } else if (!VALID_STRING(my_sgr0)) {
-+	fprintf(stderr, "no \"sgr0\" capability found\n");
-+    } else {
-+	char *values[MAXSGR];
-+	unsigned j;
-+	unsigned ignore = 0;
-+	unsigned reason = 0;
-+	unsigned repeat = 0;
-+	for (count = 0; count < MAXSGR; ++count) {
-+	    values[count] = tparm(my_sgr,
-+				  BITS2P(1),
-+				  BITS2P(2),
-+				  BITS2P(3),
-+				  BITS2P(4),
-+				  BITS2P(5),
-+				  BITS2P(6),
-+				  BITS2P(7),
-+				  BITS2P(8),
-+				  BITS2P(9));
-+	    if (values[count] != 0) {
-+		values[count] = strdup(values[count]);
-+	    }
-+	}
-+	for (count = 0; count < MAXSGR; ++count) {
-+	    if (values[count] != 0) {
-+		for (j = count + 1; j < MAXSGR; ++j) {
-+		    if (values[j] == 0)
-+			continue;
-+		    if (strcmp(values[count], values[j]))
-+			continue;
-+		    if (one_bit(count, j)) {
-+			free(values[j]);
-+			values[j] = 0;
-+		    }
-+		}
-+	    }
-+	}
-+	for (j = 0; j < MAXPAR; ++j) {
-+	    unsigned mask = (1 << j);
-+	    for (count = 0; count < MAXSGR; ++count) {
-+		if ((count & mask) != 0)
-+		    continue;
-+		if (values[count] != 0 && values[count + mask] != 0) {
-+		    mask = 0;
-+		    break;
-+		}
-+	    }
-+	    ignore |= mask;
-+	}
-+	/* smso is tested first, but often duplicates bold or reverse. */
-+	if (VALID_STRING(my_smso)) {
-+	    if (VALID_STRING(my_bold) && !strcmp(my_bold, my_smso)) {
-+		repeat |= MASK_SMSO;
-+		reason = MASK_BOLD;
-+	    }
-+	    if (VALID_STRING(my_revs) && !strcmp(my_revs, my_smso)) {
-+		repeat |= MASK_SMSO;
-+		reason = MASK_REV;
-+	    }
-+	}
-+	for (count = 0; count < MAXSGR; ++count) {
-+	    if (values[count] != 0) {
-+		bool found = FALSE;
-+		if ((repeat & MASK_SMSO) != 0
-+		    && (count & MASK_SMSO) != 0) {
-+		    found = TRUE;
-+		} else {
-+		    for (j = 0; j < count; ++j) {
-+			if (values[j] != 0 && !strcmp(values[j], values[count])) {
-+			    if ((repeat & MASK_SMSO) != 0
-+				&& (j & MASK_SMSO) != 0
-+				&& (count & reason) != 0) {
-+				continue;
-+			    }
-+			    found = TRUE;
-+			    break;
-+			}
-+		    }
-+		}
-+		if (!found) {
-+		    dumpit(count, ignore, values[count], my_sgr0);
-+		    ++total_values;
-+		}
-+	    }
-+	}
-+    }
-+    del_curterm(cur_term);
-+}
-+
-+static void
-+usage(void)
-+{
-+    static const char *msg[] =
-+    {
-+	"Usage: test_sgr [options] [terminal]",
-+	"",
-+	"Print all distinct combinations of sgr capability.",
-+	"",
-+	"Options:",
-+	" -d LIST  colon-separated list of databases to use",
-+	" -e NAME  environment variable to set with -d option",
-+	" -q       quiet (prints only counts)",
-+    };
-+    unsigned n;
-+    for (n = 0; n < SIZEOF(msg); ++n) {
-+	fprintf(stderr, "%s\n", msg[n]);
-+    }
-+    ExitProgram(EXIT_FAILURE);
-+}
-+
-+int
-+main(int argc, char *argv[])
-+{
-+    int n;
-+    char *name;
-+
-+    while ((n = getopt(argc, argv, "d:e:q")) != -1) {
-+	switch (n) {
-+	case 'd':
-+	    d_opt = optarg;
-+	    break;
-+	case 'e':
-+	    e_opt = optarg;
-+	    break;
-+	case 'q':
-+	    q_opt = TRUE;
-+	    break;
-+	default:
-+	    usage();
-+	    break;
-+	}
-+    }
-+
-+    make_dblist();
-+
-+    if (optind < argc) {
-+	for (n = optind; n < argc; ++n) {
-+	    brute_force(argv[n]);
-+	}
-+    } else if ((name = getenv("TERM")) != 0) {
-+	brute_force(name);
-+    } else {
-+	static char dumb[] = "dumb";
-+	brute_force(dumb);
-+    }
-+
-+    printf("%ld distinct values\n", total_values);
-+
-+#ifdef NO_LEAKS
-+    free_dblist();
-+#endif
-+
-+    ExitProgram(EXIT_SUCCESS);
-+}
-+
-+#else /* !HAVE_TIGETSTR */
-+int
-+main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
-+{
-+    failed("This program requires the terminfo functions such as tigetstr");
-+    ExitProgram(EXIT_FAILURE);
-+}
-+#endif /* HAVE_TIGETSTR */
diff --git a/ncurses-6.0-20151128.patch b/ncurses-6.0-20151128.patch
deleted file mode 100644
index ca4b10d..0000000
--- a/ncurses-6.0-20151128.patch
+++ /dev/null
@@ -1,612 +0,0 @@
-# ncurses 6.0 - patch 20151128 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.0 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.0 can be found at
-# 	ftp://invisible-island.net/ncurses/6.0
-#	http://invisible-mirror.net/archives/ncurses/6.0 
-#
-# ------------------------------------------------------------------------------
-# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20151128.patch.gz
-# patch by Thomas E. Dickey 
-# created  Sun Nov 29 01:57:16 UTC 2015
-# ------------------------------------------------------------------------------
-# NEWS                             |   11 ++++++++-
-# VERSION                          |    2 -
-# dist.mk                          |    4 +--
-# form/form.h                      |    5 ++--
-# form/form.priv.h                 |    7 +++--
-# form/frm_driver.c                |   12 ++++++----
-# man/curs_inopts.3x               |   12 +++++-----
-# man/form_field_opts.3x           |    9 +++++--
-# misc/terminfo.src                |   26 ++++++++++++++++++++-
-# ncurses/base/lib_getch.c         |    4 ++-
-# package/debian-mingw/changelog   |    4 +--
-# package/debian-mingw64/changelog |    4 +--
-# package/debian/changelog         |    4 +--
-# package/mingw-ncurses.nsi        |    4 +--
-# package/mingw-ncurses.spec       |    2 -
-# package/ncurses.spec             |    2 -
-# progs/dump_entry.c               |    6 ++++-
-# test/ncurses.c                   |   44 +++++++++++++++++++++++++------------
-# 18 files changed, 112 insertions(+), 50 deletions(-)
-# ------------------------------------------------------------------------------
-Index: NEWS
-Prereq:  1.2530 
---- ncurses-6.0-20151121+/NEWS	2015-11-21 23:33:30.000000000 +0000
-+++ ncurses-6.0-20151128/NEWS	2015-11-29 01:31:02.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.2530 2015/11/21 23:33:30 tom Exp $
-+-- $Id: NEWS,v 1.2536 2015/11/29 01:31:02 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,15 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20151128
-+	+ add missing assignment in lib_getch.c to make notimeout() work
-+	  (Debian #805618).
-+	+ add 't' toggle for notimeout() function in test/ncurses.c a/A screens
-+	+ add viewdata terminal description (Alexandre Montaron).
-+	+ fix a case in tic/infocmp for formatting capabilities where a
-+	  backslash at the end of a string was mishandled.
-+	+ fix some typos in curs_inopts.3x (Benno Schulenberg).
-+
- 20151121
- 	+ fix some inconsistencies in the pccon* entries -TD
- 	+ add bold to pccon+sgr+acs and pccon-base (Tati Chevron).
-Index: VERSION
---- ncurses-6.0-20151121+/VERSION	2015-11-21 15:55:51.000000000 +0000
-+++ ncurses-6.0-20151128/VERSION	2015-11-28 16:31:05.000000000 +0000
-@@ -1 +1 @@
--5:0:9	6.0	20151121
-+5:0:9	6.0	20151128
-Index: dist.mk
-Prereq:  1.1080 
---- ncurses-6.0-20151121+/dist.mk	2015-11-21 15:55:51.000000000 +0000
-+++ ncurses-6.0-20151128/dist.mk	2015-11-28 16:31:05.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1080 2015/11/21 15:55:51 tom Exp $
-+# $Id: dist.mk,v 1.1081 2015/11/28 16:31:05 tom Exp $
- # Makefile for creating ncurses distributions.
- #
- # This only needs to be used directly as a makefile by developers, but
-@@ -37,7 +37,7 @@
- # These define the major/minor/patch versions of ncurses.
- NCURSES_MAJOR = 6
- NCURSES_MINOR = 0
--NCURSES_PATCH = 20151121
-+NCURSES_PATCH = 20151128
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: form/form.h
-Prereq:  0.24 
---- ncurses-6.0-20151121+/form/form.h	2014-07-26 20:52:28.000000000 +0000
-+++ ncurses-6.0-20151128/form/form.h	2015-11-28 20:13:39.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2013,2014 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -30,7 +30,7 @@
-  *   Author:  Juergen Pfeifer, 1995,1997                                    *
-  ****************************************************************************/
- 
--/* $Id: form.h,v 0.24 2014/07/26 20:52:28 tom Exp $ */
-+/* $Id: form.h,v 0.25 2015/11/28 20:13:39 Leon.Winter Exp $ */
- 
- #ifndef FORM_H
- #define FORM_H
-@@ -205,6 +205,7 @@
- #define O_PASSOK		(0x0100U)
- #define O_STATIC		(0x0200U)
- #define O_DYNAMIC_JUSTIFY	(0x0400U)	/* ncurses extension	*/
-+#define O_NO_LEFT_STRIP		(0x0800U)	/* ncurses extension	*/
- 
- /* form options */
- #define O_NL_OVERLOAD		(0x0001U)
-Index: form/form.priv.h
-Prereq:  0.38 
---- ncurses-6.0-20151121+/form/form.priv.h	2014-11-01 13:56:14.000000000 +0000
-+++ ncurses-6.0-20151128/form/form.priv.h	2015-11-28 20:13:39.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2012,2014 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -30,7 +30,7 @@
-  *   Author:  Juergen Pfeifer, 1995,1997                                    *
-  ****************************************************************************/
- 
--/* $Id: form.priv.h,v 0.38 2014/11/01 13:56:14 tom Exp $ */
-+/* $Id: form.priv.h,v 0.39 2015/11/28 20:13:39 Leon.Winter Exp $ */
- 
- #ifndef FORM_PRIV_H
- #define FORM_PRIV_H 1
-@@ -162,7 +162,8 @@
- 
- #define ALL_FIELD_OPTS (Field_Options)( \
- 			STD_FIELD_OPTS |\
--			O_DYNAMIC_JUSTIFY)
-+			O_DYNAMIC_JUSTIFY |\
-+			O_NO_LEFT_STRIP)
- 
- #define C_BLANK ' '
- #define is_blank(c) ((c)==C_BLANK)
-Index: form/frm_driver.c
-Prereq:  1.115 
---- ncurses-6.0-20151121+/form/frm_driver.c	2014-09-25 21:55:24.000000000 +0000
-+++ ncurses-6.0-20151128/form/frm_driver.c	2015-11-28 20:39:09.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2013,2014 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -32,7 +32,7 @@
- 
- #include "form.priv.h"
- 
--MODULE_ID("$Id: frm_driver.c,v 1.115 2014/09/25 21:55:24 tom Exp $")
-+MODULE_ID("$Id: frm_driver.c,v 1.117 2015/11/28 20:39:09 tom Exp $")
- 
- /*----------------------------------------------------------------------------
-   This is the core module of the form library. It contains the majority
-@@ -979,7 +979,9 @@
-   int len;
-   int col = 0;
- 
--  bp = Get_Start_Of_Data(field->buf, Buffer_Length(field));
-+  bp = (Field_Has_Option(field, O_NO_LEFT_STRIP)
-+	? field->buf
-+	: Get_Start_Of_Data(field->buf, Buffer_Length(field)));
-   len = (int)(After_End_Of_Data(field->buf, Buffer_Length(field)) - bp);
- 
-   if (len > 0)
-@@ -1023,7 +1025,9 @@
-   FIELD_CELL *bp;
-   int len;
- 
--  bp = Get_Start_Of_Data(field->buf, Buffer_Length(field));
-+  bp = (Field_Has_Option(field, O_NO_LEFT_STRIP)
-+	? field->buf
-+	: Get_Start_Of_Data(field->buf, Buffer_Length(field)));
-   len = (int)(After_End_Of_Data(field->buf, Buffer_Length(field)) - bp);
- 
-   if (len > 0)
-Index: man/curs_inopts.3x
-Prereq:  1.19 
---- ncurses-6.0-20151121+/man/curs_inopts.3x	2015-04-11 10:21:38.000000000 +0000
-+++ ncurses-6.0-20151128/man/curs_inopts.3x	2015-11-28 19:03:12.000000000 +0000
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_inopts.3x,v 1.19 2015/04/11 10:21:38 tom Exp $
-+.\" $Id: curs_inopts.3x,v 1.20 2015/11/28 19:03:12 Benno.Schulenberg Exp $
- .TH curs_inopts 3X ""
- .ie \n(.g .ds `` \(lq
- .el       .ds `` ``
-@@ -93,7 +93,7 @@
- .br
- .SH DESCRIPTION
- The \fBncurses\fP library provides several functions which let an application
--change way input from the terminal is handled.
-+change the way input from the terminal is handled.
- Some are global, applying to all windows.
- Others apply only to a specific window.
- Window-specific settings are not automatically applied to new or derived
-@@ -141,19 +141,19 @@
- available to the program.
- However, after blocking for \fItenths\fR tenths of
- seconds, ERR is returned if nothing has been typed.
--The value of \fBtenths\fR
-+The value of \fItenths\fR
- must be a number between 1 and 255.
- Use \fBnocbreak\fR to leave half-delay
- mode.
- .\"
- .SS intrflush
- .PP
--If the \fBintrflush\fR option is enabled, (\fIbf\fR is \fBTRUE\fR), when an
--interrupt key is pressed on the keyboard (interrupt, break, quit) all output in
-+If the \fBintrflush\fR option is enabled (\fIbf\fR is \fBTRUE\fR), and an
-+interrupt key is pressed on the keyboard (interrupt, break, quit), all output in
- the tty driver queue will be flushed, giving the effect of faster response to
- the interrupt, but causing \fBcurses\fR to have the wrong idea of what is on
- the screen.
--Disabling (\fIbf\fR is \fBFALSE\fR), the option prevents the
-+Disabling the option (\fIbf\fR is \fBFALSE\fR) prevents the
- flush.
- The default for the option is inherited from the tty driver settings.
- The window argument is ignored.
-Index: man/form_field_opts.3x
-Prereq:  1.17 
---- ncurses-6.0-20151121+/man/form_field_opts.3x	2014-07-26 21:21:57.000000000 +0000
-+++ ncurses-6.0-20151128/man/form_field_opts.3x	2015-11-28 20:40:13.000000000 +0000
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2010,2014 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,7 +27,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: form_field_opts.3x,v 1.17 2014/07/26 21:21:57 tom Exp $
-+.\" $Id: form_field_opts.3x,v 1.19 2015/11/28 20:40:13 tom Exp $
- .TH form_field_opts 3X ""
- .SH NAME
- \fBform_field_opts\fR \- set and get field options
-@@ -91,10 +91,13 @@
- Words that do not fit on a line are wrapped to the next line.  Words are
- blank-separated.
- .PP
--One extension option is defined (extensions are off by default):
-+These extension options are defined (extensions are off by default):
- .TP 5
- O_DYNAMIC_JUSTIFY
- Permit dynamic fields to be justified, like static fields.
-+.TP 5
-+O_NO_LEFT_STRIP
-+Preserve leading whitespace in the field buffer, which is normally discarded.
- .SH RETURN VALUE
- Except for \fBfield_opts\fR, each routine returns one of the following:
- .TP 5
-Index: misc/terminfo.src
---- ncurses-6.0-20151121+/misc/terminfo.src	2015-11-22 01:01:00.000000000 +0000
-+++ ncurses-6.0-20151128/misc/terminfo.src	2015-11-28 21:35:00.000000000 +0000
-@@ -6,8 +6,8 @@
- # Report bugs and new terminal descriptions to
- #	bug-ncurses@gnu.org
- #
--#	$Revision: 1.558 $
--#	$Date: 2015/11/22 01:01:00 $
-+#	$Revision: 1.559 $
-+#	$Date: 2015/11/28 21:35:00 $
- #
- # The original header is preserved below for reference.  It is noted that there
- # is a "newer" version which differs in some cosmetic details (but actually
-@@ -18753,6 +18753,25 @@
- 	sgr0=\EI\E\\\EB, smacs=^N, .invis=\E@, .rs2=^L\EB,
- 	.u8=\001Cu|\004, use=minitel1b,
- 
-+# From: Alexandre Montaron, 19 Nov 2015
-+#
-+# He comments:
-+# viewdata lacks a true cup capabilitie,
-+# so I achieved it with home and cud1/cuf1 sequences only !
-+viewdata|prestel/viewdata terminals,
-+	am, bw, eslok, hz,
-+	cols#40, lines#24,
-+	bel=^G, civis=^T, clear=^L, cnorm=^Q, cr=^M, cub1=^H, cud1=^J,
-+	cuf1=^I,
-+	cup=\036%?%p1%{07}%>%t\n\n\n\n\n\n\n\n%;%?%p1%{15}%>%t\n\n\n\n\n\n\n\n%;%?%p1%{4}%&%t\n\n\n\n%;%?%p1%{2}%&%t\n\n%;%?%p1%{1}%&%t\n%;%?%p2%{07}%>%t\011\011\011\011\011\011\011\011%;%?%p2%{15}%>%t\011\011\011\011\011\011\011\011%;%?%p2%{23}%>%t\011\011\011\011\011\011\011\011%;%?%p2%{31}%>%t\011\011\011\011\011\011\011\011%;%?%p2%{4}%&%t\011\011\011\011%;%?%p2%{2}%&%t\011\011%;%?%p2%{1}%&%t\011%;,
-+	cuu1=^K, home=^^, nel=^M^J, .el=^X, .ind=^J,
-+	.rep=%p1%c\022%p2%'?'%+%c, .ri=^K,
-+# Also:
-+# viewdata-rv works with some applications (e.g. emacs, xemacs) but fails with vim.
-+viewdata-rv|prestel/viewdata terminals with reverse capabilitie (as green),
-+	xmc#1,
-+	rmso=\EG, smso=\EB, use=viewdata,
-+
- ######## OBSOLETE VDT TYPES
- #
- # These terminals are *long* dead -- these entries are retained for
-@@ -23792,4 +23811,7 @@
- # 2015-11-21
- #	+ fix some inconsistencies in the pccon* entries -TD
- #
-+# 2015-11-28
-+#	  add viewdata (Alexandre Montaron).
-+#
- ######## SHANTIH!  SHANTIH!  SHANTIH!
-Index: ncurses/base/lib_getch.c
-Prereq:  1.132 
---- ncurses-6.0-20151121+/ncurses/base/lib_getch.c	2015-05-09 17:10:41.000000000 +0000
-+++ ncurses-6.0-20151128/ncurses/base/lib_getch.c	2015-11-29 01:28:52.000000000 +0000
-@@ -42,7 +42,7 @@
- 
- #include 
- 
--MODULE_ID("$Id: lib_getch.c,v 1.132 2015/05/09 17:10:41 tom Exp $")
-+MODULE_ID("$Id: lib_getch.c,v 1.133 2015/11/29 01:28:52 tom Exp $")
- 
- #include 
- 
-@@ -497,6 +497,8 @@
- 	    TR(TRACE_IEVENT, ("timed delay in wgetch()"));
- 	    if (sp->_cbreak > 1)
- 		delay = (sp->_cbreak - 1) * 100;
-+	    else if (win->_notimeout)
-+		delay = 0;
- 	    else
- 		delay = win->_delay;
- 
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20151121+/package/debian-mingw/changelog	2015-11-21 15:55:51.000000000 +0000
-+++ ncurses-6.0-20151128/package/debian-mingw/changelog	2015-11-28 16:31:05.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151121) unstable; urgency=low
-+ncurses6 (6.0+20151128) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 21 Nov 2015 10:55:51 -0500
-+ -- Thomas E. Dickey   Sat, 28 Nov 2015 11:31:05 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20151121+/package/debian-mingw64/changelog	2015-11-21 15:55:51.000000000 +0000
-+++ ncurses-6.0-20151128/package/debian-mingw64/changelog	2015-11-28 16:31:05.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151121) unstable; urgency=low
-+ncurses6 (6.0+20151128) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 21 Nov 2015 10:55:51 -0500
-+ -- Thomas E. Dickey   Sat, 28 Nov 2015 11:31:05 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.0-20151121+/package/debian/changelog	2015-11-21 15:55:51.000000000 +0000
-+++ ncurses-6.0-20151128/package/debian/changelog	2015-11-28 16:31:05.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151121) unstable; urgency=low
-+ncurses6 (6.0+20151128) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 21 Nov 2015 10:55:51 -0500
-+ -- Thomas E. Dickey   Sat, 28 Nov 2015 11:31:05 -0500
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.133 
---- ncurses-6.0-20151121+/package/mingw-ncurses.nsi	2015-11-21 15:55:51.000000000 +0000
-+++ ncurses-6.0-20151128/package/mingw-ncurses.nsi	2015-11-28 16:31:05.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.133 2015/11/21 15:55:51 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.134 2015/11/28 16:31:05 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "0"
- !define VERSION_YYYY  "2015"
--!define VERSION_MMDD  "1121"
-+!define VERSION_MMDD  "1128"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20151121+/package/mingw-ncurses.spec	2015-11-21 15:55:51.000000000 +0000
-+++ ncurses-6.0-20151128/package/mingw-ncurses.spec	2015-11-28 16:31:05.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.0
--Release: 20151121
-+Release: 20151128
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20151121+/package/ncurses.spec	2015-11-21 15:55:51.000000000 +0000
-+++ ncurses-6.0-20151128/package/ncurses.spec	2015-11-28 16:31:05.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.0
--Release: 20151121
-+Release: 20151128
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: progs/dump_entry.c
-Prereq:  1.123 
---- ncurses-6.0-20151121+/progs/dump_entry.c	2015-09-05 23:31:12.000000000 +0000
-+++ ncurses-6.0-20151128/progs/dump_entry.c	2015-11-28 22:54:33.000000000 +0000
-@@ -39,7 +39,7 @@
- #include "termsort.c"		/* this C file is generated */
- #include 	/* so is this */
- 
--MODULE_ID("$Id: dump_entry.c,v 1.123 2015/09/05 23:31:12 tom Exp $")
-+MODULE_ID("$Id: dump_entry.c,v 1.124 2015/11/28 22:54:33 tom Exp $")
- 
- #define DISCARD(string) string = ABSENT_STRING
- #define PRINTF (void) printf
-@@ -510,6 +510,10 @@
- 
-     while (*src != '\0') {
- 	switch (*src) {
-+	case '^':
-+	    percent = FALSE;
-+	    strncpy_DYN(&tmpbuf, src++, (size_t) 1);
-+	    break;
- 	case '\\':
- 	    percent = FALSE;
- 	    strncpy_DYN(&tmpbuf, src++, (size_t) 1);
-Index: test/ncurses.c
-Prereq:  1.423 
---- ncurses-6.0-20151121+/test/ncurses.c	2015-10-31 19:53:06.000000000 +0000
-+++ ncurses-6.0-20151128/test/ncurses.c	2015-11-29 01:26:41.000000000 +0000
-@@ -40,7 +40,7 @@
-    Author: Eric S. Raymond  1993
-            Thomas E. Dickey (beginning revision 1.27 in 1996).
- 
--$Id: ncurses.c,v 1.423 2015/10/31 19:53:06 tom Exp $
-+$Id: ncurses.c,v 1.425 2015/11/29 01:26:41 tom Exp $
- 
- ***************************************************************************/
- 
-@@ -636,15 +636,22 @@
- }
- 
- static void
--init_getch(WINDOW *win, GetchFlags flags)
-+init_getch(WINDOW *win, GetchFlags flags, int delay)
- {
-     memset(flags, FALSE, NUM_GETCH_FLAGS);
-     flags[UChar('k')] = (win == stdscr);
-     flags[UChar('m')] = TRUE;
-+    flags[UChar('t')] = (delay != 0);
- 
-     setup_getch(win, flags);
- }
- 
-+static bool
-+blocking_getch(GetchFlags flags, int delay)
-+{
-+    return ((delay < 0) && flags['t']);
-+}
-+
- static void
- wgetch_help(WINDOW *win, GetchFlags flags)
- {
-@@ -655,7 +662,8 @@
- 	,"k  -- toggle keypad/literal mode"
- 	,"m  -- toggle meta (7-bit/8-bit) mode"
- 	,"^q -- quit"
--	,"s  -- shell out\n"
-+	,"s  -- shell out"
-+	,"t  -- toggle timeout"
- 	,"w  -- create a new window"
- #ifdef SIGTSTP
- 	,"z  -- suspend this process"
-@@ -810,9 +818,9 @@
-     int c;
-     int incount = 0;
-     GetchFlags flags;
--    bool blocking = (delay < 0);
- 
--    init_getch(win, flags);
-+    init_getch(win, flags, delay);
-+    notimeout(win, FALSE);
-     wtimeout(win, delay);
-     getyx(win, first_y, first_x);
- 
-@@ -823,7 +831,7 @@
-     for (;;) {
- 	while ((c = wGetchar(win)) == ERR) {
- 	    incount++;
--	    if (blocking) {
-+	    if (blocking_getch(flags, delay)) {
- 		(void) wprintw(win, "%05d: input error", incount);
- 		break;
- 	    } else {
-@@ -831,7 +839,7 @@
- 	    }
- 	    wgetch_wrap(win, first_y);
- 	}
--	if (c == ERR && blocking) {
-+	if (c == ERR && blocking_getch(flags, delay)) {
- 	    wprintw(win, "ERR");
- 	    wgetch_wrap(win, first_y);
- 	} else if (isQuit(c)) {
-@@ -860,6 +868,10 @@
- 	    wgetch_help(win, flags);
- 	} else if (c == 's') {
- 	    ShellOut(TRUE);
-+	} else if (c == 't') {
-+	    notimeout(win, flags[UChar('t')]);
-+	    flags[UChar('t')] = !flags[UChar('t')];
-+	    wgetch_help(win, flags);
- 	} else if (c == 'w') {
- 	    int high = getmaxy(win) - 1 - first_y + 1;
- 	    int wide = getmaxx(win) - first_x;
-@@ -931,7 +943,7 @@
-     wtimeout(win, -1);
- 
-     if (!level)
--	init_getch(win, flags);
-+	init_getch(win, flags, delay);
- }
- 
- static int
-@@ -958,7 +970,7 @@
- 	delay = -1;
-     }
-     raw();
--    move(5, 0);
-+    move(6, 0);
-     return delay;
- }
- 
-@@ -1060,11 +1072,11 @@
-     wint_t c;
-     int incount = 0;
-     GetchFlags flags;
--    bool blocking = (delay < 0);
-     int code;
-     char *temp;
- 
--    init_getch(win, flags);
-+    init_getch(win, flags, delay);
-+    notimeout(win, FALSE);
-     wtimeout(win, delay);
-     getyx(win, first_y, first_x);
- 
-@@ -1075,7 +1087,7 @@
-     for (;;) {
- 	while ((code = wGet_wchar(win, &c)) == ERR) {
- 	    incount++;
--	    if (blocking) {
-+	    if (blocking_getch(flags, delay)) {
- 		(void) wprintw(win, "%05d: input error", incount);
- 		break;
- 	    } else {
-@@ -1083,7 +1095,7 @@
- 	    }
- 	    wgetch_wrap(win, first_y);
- 	}
--	if (code == ERR && blocking) {
-+	if (code == ERR && blocking_getch(flags, delay)) {
- 	    wprintw(win, "ERR");
- 	    wgetch_wrap(win, first_y);
- 	} else if (isQuit((int) c)) {
-@@ -1125,6 +1137,10 @@
- 	    wgetch_help(win, flags);
- 	} else if (c == 's') {
- 	    ShellOut(TRUE);
-+	} else if (c == 't') {
-+	    notimeout(win, flags[UChar('t')]);
-+	    flags[UChar('t')] = !flags[UChar('t')];
-+	    wgetch_help(win, flags);
- 	} else if (c == 'w') {
- 	    int high = getmaxy(win) - 1 - first_y + 1;
- 	    int wide = getmaxx(win) - first_x;
-@@ -1184,7 +1200,7 @@
-     wtimeout(win, -1);
- 
-     if (!level)
--	init_getch(win, flags);
-+	init_getch(win, flags, delay);
- }
- 
- static void
diff --git a/ncurses-6.0-20151205.patch b/ncurses-6.0-20151205.patch
deleted file mode 100644
index 9323399..0000000
--- a/ncurses-6.0-20151205.patch
+++ /dev/null
@@ -1,3819 +0,0 @@
-# ncurses 6.0 - patch 20151205 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.0 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.0 can be found at
-# 	ftp://invisible-island.net/ncurses/6.0
-#	http://invisible-mirror.net/archives/ncurses/6.0 
-#
-# ------------------------------------------------------------------------------
-# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20151205.patch.gz
-# patch by Thomas E. Dickey 
-# created  Sun Dec  6 01:07:45 UTC 2015
-# ------------------------------------------------------------------------------
-# NEWS                                    |   15 ++++++-
-# VERSION                                 |    2 
-# dist.mk                                 |    4 -
-# doc/html/man/captoinfo.1m.html          |    2 
-# doc/html/man/clear.1.html               |    2 
-# doc/html/man/curs_attr.3x.html          |    5 +-
-# doc/html/man/curs_bkgd.3x.html          |    2 
-# doc/html/man/curs_color.3x.html         |    3 -
-# doc/html/man/curs_inopts.3x.html        |   28 ++++++-------
-# doc/html/man/curs_legacy.3x.html        |    6 +-
-# doc/html/man/curs_opaque.3x.html        |   23 +++++-----
-# doc/html/man/curs_sp_funcs.3x.html      |    6 +-
-# doc/html/man/curs_threads.3x.html       |    4 -
-# doc/html/man/curs_touch.3x.html         |    4 -
-# doc/html/man/form.3x.html               |    2 
-# doc/html/man/form_cursor.3x.html        |    6 +-
-# doc/html/man/form_data.3x.html          |   17 ++++----
-# doc/html/man/form_driver.3x.html        |   63 +++++++++++++++---------------
-# doc/html/man/form_field_info.3x.html    |   29 +++++++------
-# doc/html/man/form_field_just.3x.html    |   19 ++++-----
-# doc/html/man/form_field_new.3x.html     |   41 ++++++++++---------
-# doc/html/man/form_field_opts.3x.html    |   37 ++++++++++-------
-# doc/html/man/form_field_userptr.3x.html |    8 +--
-# doc/html/man/form_new.3x.html           |    6 +-
-# doc/html/man/form_new_page.3x.html      |    6 +-
-# doc/html/man/form_opts.3x.html          |   29 +++++++------
-# doc/html/man/form_post.3x.html          |    6 +-
-# doc/html/man/form_requestname.3x.html   |   21 +++++-----
-# doc/html/man/form_userptr.3x.html       |   15 +++----
-# doc/html/man/infocmp.1m.html            |    2 
-# doc/html/man/infotocap.1m.html          |    2 
-# doc/html/man/menu.3x.html               |    2 
-# doc/html/man/menu_attributes.3x.html    |    8 ++-
-# doc/html/man/menu_cursor.3x.html        |    6 +-
-# doc/html/man/menu_format.3x.html        |    6 +-
-# doc/html/man/menu_items.3x.html         |    8 +--
-# doc/html/man/menu_mark.3x.html          |   35 ++++++++--------
-# doc/html/man/menu_new.3x.html           |    6 +-
-# doc/html/man/menu_opts.3x.html          |   25 ++++++-----
-# doc/html/man/menu_pattern.3x.html       |   29 +++++++------
-# doc/html/man/menu_post.3x.html          |    8 +--
-# doc/html/man/menu_requestname.3x.html   |   21 +++++-----
-# doc/html/man/menu_spacing.3x.html       |   39 +++++++++---------
-# doc/html/man/menu_userptr.3x.html       |   15 +++----
-# doc/html/man/mitem_name.3x.html         |   13 +++---
-# doc/html/man/mitem_new.3x.html          |    6 +-
-# doc/html/man/mitem_opts.3x.html         |   23 +++++-----
-# doc/html/man/mitem_userptr.3x.html      |    8 +--
-# doc/html/man/mitem_value.3x.html        |    6 +-
-# doc/html/man/ncurses.3x.html            |    2 
-# doc/html/man/panel.3x.html              |   34 ++++++++--------
-# doc/html/man/tabs.1.html                |    2 
-# doc/html/man/term_variables.3x.html     |    4 +
-# doc/html/man/terminfo.5.html            |    2 
-# doc/html/man/tic.1m.html                |    2 
-# doc/html/man/toe.1m.html                |    2 
-# doc/html/man/tput.1.html                |    2 
-# doc/html/man/tset.1.html                |    2 
-# man/curs_attr.3x                        |    4 +
-# man/curs_color.3x                       |    4 +
-# man/curs_legacy.3x                      |    6 +-
-# man/curs_opaque.3x                      |    7 ++-
-# man/curs_sp_funcs.3x                    |    6 +-
-# man/curs_threads.3x                     |    5 --
-# man/curs_touch.3x                       |    4 -
-# man/form_cursor.3x                      |    6 +-
-# man/form_data.3x                        |    7 +--
-# man/form_driver.3x                      |    5 +-
-# man/form_field_info.3x                  |    7 +--
-# man/form_field_just.3x                  |    7 +--
-# man/form_field_new.3x                   |    9 ++--
-# man/form_field_opts.3x                  |    7 ++-
-# man/form_field_userptr.3x               |    7 +--
-# man/form_new.3x                         |    7 +--
-# man/form_new_page.3x                    |    7 +--
-# man/form_opts.3x                        |    7 ++-
-# man/form_post.3x                        |    5 +-
-# man/form_requestname.3x                 |    7 +--
-# man/form_userptr.3x                     |    5 +-
-# man/menu_attributes.3x                  |   13 ++++--
-# man/menu_cursor.3x                      |    6 +-
-# man/menu_format.3x                      |    7 +--
-# man/menu_items.3x                       |    8 ++-
-# man/menu_mark.3x                        |    5 +-
-# man/menu_new.3x                         |    7 +--
-# man/menu_opts.3x                        |    7 ++-
-# man/menu_pattern.3x                     |    7 +--
-# man/menu_post.3x                        |    7 +--
-# man/menu_requestname.3x                 |    7 +--
-# man/menu_spacing.3x                     |    7 +--
-# man/menu_userptr.3x                     |    5 +-
-# man/mitem_name.3x                       |    7 +--
-# man/mitem_new.3x                        |    7 +--
-# man/mitem_opts.3x                       |    9 ++--
-# man/mitem_userptr.3x                    |    7 +--
-# man/mitem_value.3x                      |    7 +--
-# man/panel.3x                            |   32 +++++++--------
-# man/term_variables.3x                   |    4 +
-# package/debian-mingw/changelog          |    4 -
-# package/debian-mingw64/changelog        |    4 -
-# package/debian/changelog                |    4 -
-# package/mingw-ncurses.nsi               |    4 -
-# package/mingw-ncurses.spec              |    2 
-# package/ncurses.spec                    |    2 
-# test/README                             |   19 ++++-----
-# 105 files changed, 577 insertions(+), 481 deletions(-)
-# ------------------------------------------------------------------------------
-Index: NEWS
-Prereq:  1.2536 
---- ncurses-6.0-20151128+/NEWS	2015-11-29 01:31:02.000000000 +0000
-+++ ncurses-6.0-20151205/NEWS	2015-12-05 23:45:23.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.2536 2015/11/29 01:31:02 tom Exp $
-+-- $Id: NEWS,v 1.2540 2015/12/05 23:45:23 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,7 +45,20 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20151205
-+	+ update form_cursor.3x, form_post.3x, menu_attributes.3x to list
-+	  function names in NAME section (patch by Jason McIntyre).
-+	+ minor fixes to manpage NAME/SYNOPSIS sections to consistently use
-+	  rule that either all functions which are prototyped in SYNOPSIS are
-+	  listed in the NAME section, or the manual-page name is the sole item
-+	  listed in the NAME section.  The latter is used to reduce clutter,
-+	  e.g., for the top-level library manual pages as well as for certain
-+	  feature-pages such as SP-funcs and threading (prompted by patches by
-+	  Jason McIntyre).
-+
- 20151128
-+	+ add option to preserve leading whitespace in form fields (patch by
-+	  Leon Winter).
- 	+ add missing assignment in lib_getch.c to make notimeout() work
- 	  (Debian #805618).
- 	+ add 't' toggle for notimeout() function in test/ncurses.c a/A screens
-Index: VERSION
---- ncurses-6.0-20151128+/VERSION	2015-11-28 16:31:05.000000000 +0000
-+++ ncurses-6.0-20151205/VERSION	2015-12-05 13:22:37.000000000 +0000
-@@ -1 +1 @@
--5:0:9	6.0	20151128
-+5:0:9	6.0	20151205
-Index: dist.mk
-Prereq:  1.1081 
---- ncurses-6.0-20151128+/dist.mk	2015-11-28 16:31:05.000000000 +0000
-+++ ncurses-6.0-20151205/dist.mk	2015-12-05 13:22:37.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1081 2015/11/28 16:31:05 tom Exp $
-+# $Id: dist.mk,v 1.1082 2015/12/05 13:22:37 tom Exp $
- # Makefile for creating ncurses distributions.
- #
- # This only needs to be used directly as a makefile by developers, but
-@@ -37,7 +37,7 @@
- # These define the major/minor/patch versions of ncurses.
- NCURSES_MAJOR = 6
- NCURSES_MINOR = 0
--NCURSES_PATCH = 20151128
-+NCURSES_PATCH = 20151205
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: doc/html/man/captoinfo.1m.html
---- ncurses-6.0-20151128+/doc/html/man/captoinfo.1m.html	2015-10-25 00:21:09.000000000 +0000
-+++ ncurses-6.0-20151205/doc/html/man/captoinfo.1m.html	2015-12-06 00:26:44.000000000 +0000
-@@ -205,7 +205,7 @@
- 
    SEE ALSO
    -        infocmp(1m), curses(3x), terminfo(5)
- 
--       This describes ncurses version 6.0 (patch 20151024).
-+       This describes ncurses version 6.0 (patch 20151205).
- 
- 
- 
    
-Index: doc/html/man/clear.1.html
---- ncurses-6.0-20151128+/doc/html/man/clear.1.html	2015-10-25 00:21:09.000000000 +0000
-+++ ncurses-6.0-20151205/doc/html/man/clear.1.html	2015-12-06 00:26:44.000000000 +0000
-@@ -71,7 +71,7 @@
- 
    SEE ALSO
    -        tput(1), terminfo(5)
- 
--       This describes ncurses version 6.0 (patch 20151024).
-+       This describes ncurses version 6.0 (patch 20151205).
- 
- 
- 
-Index: doc/html/man/curs_attr.3x.html
---- ncurses-6.0-20151128+/doc/html/man/curs_attr.3x.html	2015-10-25 00:23:27.000000000 +0000
-+++ ncurses-6.0-20151205/doc/html/man/curs_attr.3x.html	2015-12-06 00:32:26.000000000 +0000
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_attr.3x,v 1.42 2015/10/24 19:10:42 Sven.Joachim Exp @
-+  * @Id: curs_attr.3x,v 1.43 2015/12/05 18:46:04 tom Exp @
- -->
- 
- 
-@@ -90,6 +90,7 @@
-              short color, const void *opts);
-        int mvwchgat(WINDOW *win, int y, int x, int n,
-              attr_t attr, short color, const void *opts);
-+       PAIR_NUMBER(attrs);
- 
- 
- 
    
-@@ -189,8 +190,8 @@
-               A_INVIS         Invisible or blank mode
-               A_ALTCHARSET    Alternate character set
-               A_ITALIC        Italics (non-X/Open extension)
--              A_CHARTEXT      Bit-mask to extract a character
- 
-+              A_CHARTEXT      Bit-mask to extract a character
-               COLOR_PAIR(n)   Color-pair number n
- 
-        These video attributes are supported by attr_on and relat-
-Index: doc/html/man/curs_bkgd.3x.html
---- ncurses-6.0-20151128+/doc/html/man/curs_bkgd.3x.html	2015-07-22 00:49:55.000000000 +0000
-+++ ncurses-6.0-20151205/doc/html/man/curs_bkgd.3x.html	2015-12-06 00:26:44.000000000 +0000
-@@ -26,7 +26,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_bkgd.3x,v 1.23 2015/07/21 00:11:05 tom Exp @
-+  * @Id: curs_bkgd.3x,v 1.24 2015/11/21 01:53:42 tom Exp @
- -->
- 
- 
-Index: doc/html/man/curs_color.3x.html
---- ncurses-6.0-20151128+/doc/html/man/curs_color.3x.html	2015-06-06 23:47:41.000000000 +0000
-+++ ncurses-6.0-20151205/doc/html/man/curs_color.3x.html	2015-12-06 00:26:44.000000000 +0000
-@@ -26,7 +26,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_color.3x,v 1.39 2015/06/06 23:29:02 tom Exp @
-+  * @Id: curs_color.3x,v 1.40 2015/12/05 20:09:42 tom Exp @
- -->
- 
- 
-@@ -64,6 +64,7 @@
-        int  color_content(short  color, short *r, short *g, short
-        *b);
-        int pair_content(short pair, short *f, short *b);
-+       int COLOR_PAIR(int n);
- 
- 
- 
    
-Index: doc/html/man/curs_inopts.3x.html
---- ncurses-6.0-20151128+/doc/html/man/curs_inopts.3x.html	2015-05-13 19:27:44.000000000 +0000
-+++ ncurses-6.0-20151205/doc/html/man/curs_inopts.3x.html	2015-12-06 00:26:45.000000000 +0000
-@@ -26,7 +26,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_inopts.3x,v 1.19 2015/04/11 10:21:38 tom Exp @
-+  * @Id: curs_inopts.3x,v 1.20 2015/11/28 19:03:12 Benno.Schulenberg Exp @
- -->
- 
- 
-@@ -79,12 +79,12 @@
- 
    
- 
    DESCRIPTION
    -        The ncurses library provides several functions  which  let
--       an  application change way input from the terminal is han-
--       dled.  Some are global, applying to all  windows.   Others
--       apply only to a specific window.  Window-specific settings
--       are not automatically applied to new or  derived  windows.
--       An  application  must  apply  these to each window, if the
--       same behavior is needed.
-+       an  application  change the way input from the terminal is
-+       handled.  Some are global, applying to all windows.   Oth-
-+       ers apply only to a specific window.  Window-specific set-
-+       tings are not automatically applied to new or derived win-
-+       dows.   An application must apply these to each window, if
-+       the same behavior is needed.
- 
- 
- 
    
-@@ -124,22 +124,22 @@
-        is similar to cbreak mode in that characters typed by  the
-        user  are  immediately available to the program.  However,
-        after blocking for tenths tenths of seconds,  ERR  is  re-
--       turned  if  nothing  has  been typed.  The value of tenths
-+       turned  if  nothing  has  been typed.  The value of tenths
-        must be a number between 1 and 255.  Use nocbreak to leave
-        half-delay mode.
- 
- 
- 
    
- 
    intrflush
    --       If  the intrflush option is enabled, (bf is TRUE), when an
-+       If  the  intrflush  option is enabled (bf is TRUE), and an
-        interrupt key  is  pressed  on  the  keyboard  (interrupt,
--       break,  quit)  all  output in the tty driver queue will be
-+       break,  quit),  all output in the tty driver queue will be
-        flushed, giving the effect of faster response to  the  in-
-        terrupt, but causing curses to have the wrong idea of what
--       is on the screen.  Disabling (bf  is  FALSE),  the  option
--       prevents  the flush.  The default for the option is inher-
--       ited from the tty driver settings.  The window argument is
--       ignored.
-+       is on the screen.  Disabling the option (bf is FALSE) pre-
-+       vents  the flush.  The default for the option is inherited
-+       from the tty driver settings.  The window argument is  ig-
-+       nored.
- 
- 
- 
    
-Index: doc/html/man/curs_legacy.3x.html
---- ncurses-6.0-20151128+/doc/html/man/curs_legacy.3x.html	2015-05-13 19:27:44.000000000 +0000
-+++ ncurses-6.0-20151205/doc/html/man/curs_legacy.3x.html	2015-12-06 00:26:46.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-@@ -47,7 +47,7 @@
- 
- 
    
- 
    NAME
    --       getattrs  -  get  curses  cursor  and  window coordinates,
-+       curs_legacy  -  get  curses cursor and window coordinates,
-        attributes
- 
- 
-Index: doc/html/man/curs_opaque.3x.html
---- ncurses-6.0-20151128+/doc/html/man/curs_opaque.3x.html	2015-05-13 19:27:45.000000000 +0000
-+++ ncurses-6.0-20151205/doc/html/man/curs_opaque.3x.html	2015-12-06 00:26:46.000000000 +0000
-@@ -26,7 +26,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_opaque.3x,v 1.12 2015/04/11 10:23:49 tom Exp @
-+  * @Id: curs_opaque.3x,v 1.13 2015/12/05 20:05:45 tom Exp @
- -->
- 
- 
-@@ -49,7 +49,8 @@
- 
    NAME
    -        is_cleared, is_idlok, is_idcok, is_immedok, is_keypad,
-        is_leaveok, is_nodelay, is_notimeout, is_pad, is_scrollok,
--       is_subwin, is_syncok - curses window properties
-+       is_subwin, is_syncok, wgetdelay, wgetparent, wgetscrreg -
-+       curses window properties
- 
- 
- 
    
-@@ -75,8 +76,8 @@
- 
- 
    
- 
    DESCRIPTION
    --       This  implementation provides functions which return prop-
--       erties set in the WINDOW  structure,  allowing  it  to  be
-+       This implementation provides functions which return  prop-
-+       erties  set  in  the  WINDOW  structure, allowing it to be
-        "opaque" if the symbol NCURSES_OPAQUE is defined:
- 
-        is_cleared
-@@ -104,7 +105,7 @@
-             returns the value set in notimeout
- 
-        is_pad
--            returns  TRUE if the window is a pad i.e., created by
-+            returns TRUE if the window is a pad i.e., created  by
-             newpad
- 
-        is_scrollok
-@@ -121,11 +122,11 @@
-             returns the delay timeout as set in wtimeout.
- 
-        wgetparent
--            returns  the parent WINDOW pointer for subwindows, or
-+            returns the parent WINDOW pointer for subwindows,  or
-             NULL for windows having no parent.
- 
-        wgetscrreg
--            returns the top and bottom  rows  for  the  scrolling
-+            returns  the  top  and  bottom rows for the scrolling
-             margin as set in wsetscrreg.
- 
- 
-@@ -141,15 +142,15 @@
- 
- 
    
- 
    PORTABILITY
    --       These  routines  are  specific  to ncurses.  They were not
--       supported on Version 7, BSD or System  V  implementations.
--       It  is  recommended that any code depending on ncurses ex-
-+       These routines are specific to  ncurses.   They  were  not
-+       supported  on  Version 7, BSD or System V implementations.
-+       It is recommended that any code depending on  ncurses  ex-
-        tensions be conditioned using NCURSES_VERSION.
- 
- 
- 
    
- 
    SEE ALSO
    --       curses(3x), curs_inopts(3x),  curs_outopts(3x),  curs_win-
-+       curses(3x),  curs_inopts(3x),  curs_outopts(3x), curs_win-
-        dow(3x)
- 
- 
-Index: doc/html/man/curs_sp_funcs.3x.html
---- ncurses-6.0-20151128+/doc/html/man/curs_sp_funcs.3x.html	2015-05-13 19:27:45.000000000 +0000
-+++ ncurses-6.0-20151205/doc/html/man/curs_sp_funcs.3x.html	2015-12-06 00:26:47.000000000 +0000
-@@ -1,6 +1,6 @@
- 
-@@ -49,7 +49,7 @@
- 
- 
    
- 
    NAME
    --       use_screen, use_window - curses thread support
-+       curs_threads - curses thread support
- 
- 
- 
    
-Index: doc/html/man/curs_touch.3x.html
---- ncurses-6.0-20151128+/doc/html/man/curs_touch.3x.html	2015-05-13 19:27:46.000000000 +0000
-+++ ncurses-6.0-20151205/doc/html/man/curs_touch.3x.html	2015-12-06 00:26:47.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-Index: doc/html/man/form.3x.html
---- ncurses-6.0-20151128+/doc/html/man/form.3x.html	2015-10-25 00:21:13.000000000 +0000
-+++ ncurses-6.0-20151205/doc/html/man/form.3x.html	2015-12-06 00:26:48.000000000 +0000
-@@ -245,7 +245,7 @@
-        curses(3x) and related pages whose names begin "form_" for
-        detailed descriptions of the entry points.
- 
--       This describes ncurses version 6.0 (patch 20151024).
-+       This describes ncurses version 6.0 (patch 20151205).
- 
- 
- 
-Index: doc/html/man/form_cursor.3x.html
---- ncurses-6.0-20151128+/doc/html/man/form_cursor.3x.html	2015-05-13 19:27:46.000000000 +0000
-+++ ncurses-6.0-20151205/doc/html/man/form_cursor.3x.html	2015-12-06 00:26:48.000000000 +0000
-@@ -1,7 +1,7 @@
- 
- 
- 
-@@ -48,7 +48,7 @@
- 
- 
    
- 
    NAME
    --       form_cursor - position a form window cursor
-+       pos_form_cursor - position a form window cursor
- 
- 
- 
    
-Index: doc/html/man/form_data.3x.html
---- ncurses-6.0-20151128+/doc/html/man/form_data.3x.html	2015-05-13 19:27:46.000000000 +0000
-+++ ncurses-6.0-20151205/doc/html/man/form_data.3x.html	2015-12-06 00:26:48.000000000 +0000
-@@ -1,7 +1,7 @@
- 
- 
- 
-@@ -48,7 +48,8 @@
- 
-
    -

    NAME

    --       form_data - test for off-screen data in given forms
-+       data_ahead,  data_behind  -  test  for  off-screen data in
-+       given forms
- 
- 
-
    -@@ -60,12 +61,12 @@ - - -

    DESCRIPTION

    --       The  function data_ahead tests whether there is off-screen
--       data ahead in the given form.   It  returns  TRUE  (1)  or
-+       The function data_ahead tests whether there is  off-screen
-+       data  ahead  in  the  given  form.  It returns TRUE (1) or
-        FALSE (0).
- 
-        The function data_behind tests whether there is off-screen
--       data behind in the given form.  It  returns  TRUE  (1)  or
-+       data  behind  in  the  given form.  It returns TRUE (1) or
-        FALSE (0).
- 
- 
-@@ -82,13 +83,13 @@
- 
-
    -

    PORTABILITY

    --       These routines emulate the System V forms  library.   They
-+       These  routines  emulate the System V forms library.  They
-        were not supported on Version 7 or BSD versions.
- 
- 
-
    -

    AUTHORS

    --       Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-+       Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
-        curses by Eric S. Raymond.
- 
- 
-Index: doc/html/man/form_driver.3x.html
---- ncurses-6.0-20151128+/doc/html/man/form_driver.3x.html	2015-08-02 18:21:57.000000000 +0000
-+++ ncurses-6.0-20151205/doc/html/man/form_driver.3x.html	2015-12-06 00:26:48.000000000 +0000
-@@ -26,7 +26,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: form_driver.3x,v 1.24 2015/08/02 18:21:11 tom Exp @
-+  * @Id: form_driver.3x,v 1.25 2015/12/05 21:06:26 tom Exp @
- -->
- 
- 
-@@ -47,7 +47,8 @@
- 
-
    -

    NAME

    --       form_driver - command-processing loop of the form system
-+       form_driver,  form_driver_w  -  command-processing loop of
-+       the form system
- 
- 
-
    -@@ -63,16 +64,16 @@ - -

    form_driver

    -        Once a form has been posted (displayed), you should funnel
--       input events to it through form_driver.  This routine  has
-+       input  events to it through form_driver.  This routine has
-        three major input cases:
- 
--       o   The  input  is  a form navigation request.  Navigation
-+       o   The input is a form  navigation  request.   Navigation
-            request codes are constants defined in <form.h>, which
--           are   distinct  from  the  key-  and  character  codes
-+           are  distinct  from  the  key-  and  character   codes
-            returned by wgetch(3x).
- 
-        o   The input is a printable character.  Printable charac-
--           ters  (which  must  be  positive,  less  than 256) are
-+           ters (which must  be  positive,  less  than  256)  are
-            checked according to the program's locale settings.
- 
-        o   The input is the KEY_MOUSE special key associated with
-@@ -81,11 +82,11 @@
- 
-
    -

    form_driver_w

    --       This  extension  simplifies  the  use of the forms library
--       using wide characters.  The input is either a key code  (a
-+       This extension simplifies the use  of  the  forms  library
-+       using  wide characters.  The input is either a key code (a
-        request) or a wide character returned by get_wch(3x).  The
--       type must be passed as well,  to  enable  the  library  to
--       determine  whether  the parameter is a wide character or a
-+       type  must  be  passed  as  well, to enable the library to
-+       determine whether the parameter is a wide character  or  a
-        request.
- 
- 
-@@ -116,8 +117,8 @@
-        REQ_LAST_FIELD     Move to the last field.
-        REQ_LAST_PAGE      Move to the last field.
-        REQ_LEFT_CHAR      Move left in the field.
--       REQ_LEFT_FIELD     Move left to a field.
- 
-+       REQ_LEFT_FIELD     Move left to a field.
-        REQ_NEW_LINE       Insert or overlay a new line.
-        REQ_NEXT_CHAR      Move to the next char.
-        REQ_NEXT_CHOICE    Display next field choice.
-@@ -155,18 +156,18 @@
-        REQ_UP_FIELD       Move up to a field.
-        REQ_VALIDATION     Validate field.
- 
--       If the second  argument  is  a  printable  character,  the
--       driver  places  it  in the current position in the current
--       field.  If it is one of the forms requests  listed  above,
-+       If  the  second  argument  is  a  printable character, the
-+       driver places it in the current position  in  the  current
-+       field.   If  it is one of the forms requests listed above,
-        that request is executed.
- 
- 
-
    -

    Mouse handling

    --       If  the  second argument is the KEY_MOUSE special key, the
-+       If the second argument is the KEY_MOUSE special  key,  the
-        associated mouse event is translated into one of the above
--       pre-defined  requests.   Currently only clicks in the user
--       window (e.g., inside the form display area or the  decora-
-+       pre-defined requests.  Currently only clicks in  the  user
-+       window  (e.g., inside the form display area or the decora-
-        tion window) are handled.
- 
-        If you click above the display region of the form:
-@@ -185,34 +186,34 @@
- 
-           a REQ_LAST_FIELD is generated for a triple-click.
- 
--       If  you  click  at an field inside the display area of the
-+       If you click at an field inside the display  area  of  the
-        form:
- 
-           o   the form cursor is positioned to that field.
- 
--          o   If you double-click a field,  the  form  cursor  is
--              positioned  to  that field and E_UNKNOWN_COMMAND is
-+          o   If  you  double-click  a  field, the form cursor is
-+              positioned to that field and  E_UNKNOWN_COMMAND  is
-               returned.  This return value makes sense, because a
--              double  click  usually means that an field-specific
--              action should be returned.  It is exactly the  pur-
--              pose  of this return value to signal that an appli-
-+              double click usually means that  an  field-specific
-+              action  should be returned.  It is exactly the pur-
-+              pose of this return value to signal that an  appli-
-               cation specific command should be executed.
- 
--          o   If  a  translation  into  a   request   was   done,
-+          o   If   a   translation   into  a  request  was  done,
-               form_driver returns the result of this request.
- 
--       If  you clicked outside the user window or the mouse event
--       could  not  be  translated  into   a   form   request   an
-+       If you clicked outside the user window or the mouse  event
-+       could   not   be   translated   into  a  form  request  an
-        E_REQUEST_DENIED is returned.
- 
- 
-
    -

    Application-defined commands

    -        If the second argument is neither printable nor one of the
--       above pre-defined form requests, the driver assumes it  is
-+       above  pre-defined form requests, the driver assumes it is
-        an application-specific command and returns E_UNKNOWN_COM-
-        MAND.  Application-defined commands should be defined rel-
--       ative  to  MAX_COMMAND,  the  maximum  value of these pre-
-+       ative to MAX_COMMAND, the  maximum  value  of  these  pre-
-        defined requests.
- 
- 
-@@ -223,7 +224,7 @@
-        E_OK The routine succeeded.
- 
-        E_BAD_ARGUMENT
--            Routine detected an incorrect or  out-of-range  argu-
-+            Routine  detected  an incorrect or out-of-range argu-
-             ment.
- 
-        E_BAD_STATE
-@@ -259,13 +260,13 @@
- 
-
    -

    PORTABILITY

    --       These  routines  emulate the System V forms library.  They
-+       These routines emulate the System V forms  library.   They
-        were not supported on Version 7 or BSD versions.
- 
- 
-
    -

    AUTHORS

    --       Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
-+       Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-        curses by Eric S. Raymond.
- 
- 
-Index: doc/html/man/form_field_info.3x.html
---- ncurses-6.0-20151128+/doc/html/man/form_field_info.3x.html	2015-05-13 19:27:46.000000000 +0000
-+++ ncurses-6.0-20151205/doc/html/man/form_field_info.3x.html	2015-12-06 00:26:48.000000000 +0000
-@@ -1,7 +1,7 @@
- 
- 
- 
-@@ -48,7 +48,8 @@
- 
-
    -

    NAME

    --       form_field_info - retrieve field characteristics
-+       dynamic_field_info, field_info - retrieve field character-
-+       istics
- 
- 
-
    -@@ -56,21 +57,21 @@ - #include <form.h> - int field_info(const FIELD *field, int *rows, int *cols, - int *frow, int *fcol, int *nrow, int *nbuf); -- int dynamic_field_info(const FIELD *field, int *rows, int -+ int dynamic_field_info(const FIELD *field, int *rows, int - *cols, int *max); - - - -

    DESCRIPTION

    -        The  function  field_info  returns  the  sizes  and  other
--       attributes  passed  in  to the field at its creation time.
--       The attributes are: height, width, row of upper-left  cor-
--       ner,  column of upper-left corner, number off-screen rows,
-+       attributes passed in to the field at  its  creation  time.
-+       The  attributes are: height, width, row of upper-left cor-
-+       ner, column of upper-left corner, number off-screen  rows,
-        and number of working buffers.
- 
-        The function dynamic_field_info returns the actual size of
--       the  field,  and  its maximum possible size.  If the field
--       has no size limit, the location  addressed  by  the  third
-+       the field, and its maximum possible size.   If  the  field
-+       has  no  size  limit,  the location addressed by the third
-        argument will be set to 0.  A field can be made dynamic by
-        turning off the O_STATIC option with field_opts_off.
- 
-@@ -85,7 +86,7 @@
-             System error occurred (see errno).
- 
-        E_BAD_ARGUMENT
--            Routine detected an incorrect or  out-of-range  argu-
-+            Routine  detected  an incorrect or out-of-range argu-
-             ment.
- 
- 
-@@ -103,17 +104,17 @@
- 
-
    -

    PORTABILITY

    --       These  routines  emulate the System V forms library.  They
-+       These routines emulate the System V forms  library.   They
-        were not supported on Version 7 or BSD versions.
- 
--       A null (zero pointer) is accepted for any  of  the  return
--       values,  to  ignore  that  value.  Not all implementations
-+       A  null  (zero  pointer) is accepted for any of the return
-+       values, to ignore that  value.   Not  all  implementations
-        allow this, e.g., Solaris 2.7 does not.
- 
- 
-
    -

    AUTHORS

    --       Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
-+       Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-        curses by Eric S. Raymond.
- 
- 
-Index: doc/html/man/form_field_just.3x.html
---- ncurses-6.0-20151128+/doc/html/man/form_field_just.3x.html	2015-05-13 19:27:47.000000000 +0000
-+++ ncurses-6.0-20151205/doc/html/man/form_field_just.3x.html	2015-12-06 00:26:48.000000000 +0000
-@@ -1,7 +1,7 @@
- 
- 
- 
-@@ -48,7 +48,8 @@
- 
-
    -

    NAME

    --       form_field_just - retrieve field characteristics
-+       set_field_just,  field_just  - retrieve field characteris-
-+       tics
- 
- 
-
    -@@ -60,15 +61,15 @@ - - -

    DESCRIPTION

    --       The   function   set_field_just   sets  the  justification
--       attribute of a field; field_just returns a field's  justi-
-+       The  function  set_field_just   sets   the   justification
-+       attribute  of a field; field_just returns a field's justi-
-        fication attribute.  The attribute may be one of NO_JUSTI-
-        FICATION, JUSTIFY_RIGHT, JUSTIFY_LEFT, or JUSTIFY_CENTER.
- 
- 
-
    -

    RETURN VALUE

    --       The function field_just returns one of:  NO_JUSTIFICATION,
-+       The  function field_just returns one of: NO_JUSTIFICATION,
-        JUSTIFY_RIGHT, JUSTIFY_LEFT, or JUSTIFY_CENTER.
- 
-        The function set_field_just returns one of the following:
-@@ -79,7 +80,7 @@
-             System error occurred (see errno).
- 
-        E_BAD_ARGUMENT
--            Routine  detected  an incorrect or out-of-range argu-
-+            Routine detected an incorrect or  out-of-range  argu-
-             ment.
- 
- 
-@@ -97,13 +98,13 @@
- 
-
    -

    PORTABILITY

    --       These routines emulate the System V forms  library.   They
-+       These  routines  emulate the System V forms library.  They
-        were not supported on Version 7 or BSD versions.
- 
- 
-
    -

    AUTHORS

    --       Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-+       Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
-        curses by Eric S. Raymond.
- 
- 
-Index: doc/html/man/form_field_new.3x.html
---- ncurses-6.0-20151128+/doc/html/man/form_field_new.3x.html	2015-05-13 19:27:47.000000000 +0000
-+++ ncurses-6.0-20151205/doc/html/man/form_field_new.3x.html	2015-12-06 00:26:48.000000000 +0000
-@@ -1,7 +1,7 @@
- 
- 
- 
-@@ -48,7 +48,8 @@
- 
-
    -

    NAME

    --       form_field_new - create and destroy form fields
-+       new_field,  dup_field, link_field, free_field - create and
-+       destroy form fields
- 
- 
-
    -@@ -64,23 +65,23 @@ - - -

    DESCRIPTION

    --       The  function new_field allocates a new field and initial-
--       izes it from the parameters given: height, width,  row  of
--       upper-left  corner,  column  of  upper-left corner, number
-+       The function new_field allocates a new field and  initial-
-+       izes  it  from the parameters given: height, width, row of
-+       upper-left corner, column  of  upper-left  corner,  number
-        off-screen rows, and number of additional working buffers.
- 
--       The function dup_field duplicates a field at a  new  loca-
--       tion.   Most attributes (including current contents, size,
--       validation type, buffer count, growth threshold,  justifi-
--       cation,  foreground,  background,  pad character, options,
--       and user pointer) are copied.  Field status and the  field
-+       The  function  dup_field duplicates a field at a new loca-
-+       tion.  Most attributes (including current contents,  size,
-+       validation  type, buffer count, growth threshold, justifi-
-+       cation, foreground, background,  pad  character,  options,
-+       and  user pointer) are copied.  Field status and the field
-        page bit are not copied.
- 
--       The  function  link_field acts like dup_field, but the new
--       field shares buffers with its parent.  Attribute  data  is
-+       The function link_field acts like dup_field, but  the  new
-+       field  shares  buffers with its parent.  Attribute data is
-        separate.
- 
--       The  function  free_field  de-allocates storage associated
-+       The function free_field  de-allocates  storage  associated
-        with a field.
- 
- 
-@@ -92,7 +93,7 @@
-        E_OK The routine succeeded.
- 
-        E_BAD_ARGUMENT
--            Routine  detected  an incorrect or out-of-range argu-
-+            Routine detected an incorrect or  out-of-range  argu-
-             ment.
- 
-        E_SYSTEM_ERROR
-@@ -103,7 +104,7 @@
-        E_OK The routine succeeded.
- 
-        E_BAD_ARGUMENT
--            Routine detected an incorrect or  out-of-range  argu-
-+            Routine  detected  an incorrect or out-of-range argu-
-             ment.
- 
-        E_CONNECTED
-@@ -123,18 +124,18 @@
- 
-
    -

    PORTABILITY

    --       These routines emulate the System V forms  library.   They
-+       These  routines  emulate the System V forms library.  They
-        were not supported on Version 7 or BSD versions.
- 
--       It  may be unwise to count on the set of attributes copied
--       by dup_field being portable; the System  V  forms  library
-+       It may be unwise to count on the set of attributes  copied
-+       by  dup_field  being  portable; the System V forms library
-        documents are not very explicit about what gets copied and
-        what does not.
- 
- 
-
    -

    AUTHORS

    --       Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
-+       Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-        curses by Eric S. Raymond.
- 
- 
-Index: doc/html/man/form_field_opts.3x.html
---- ncurses-6.0-20151128+/doc/html/man/form_field_opts.3x.html	2015-05-13 19:27:47.000000000 +0000
-+++ ncurses-6.0-20151205/doc/html/man/form_field_opts.3x.html	2015-12-06 00:26:48.000000000 +0000
-@@ -1,7 +1,7 @@
- 
- 
- 
-@@ -48,7 +48,8 @@
- 
-
    -

    NAME

    --       form_field_opts - set and get field options
-+       set_field_opts,  field_opts_on, field_opts_off, field_opts
-+       - set and get field options
- 
- 
-
    -@@ -62,33 +63,33 @@ - - -

    DESCRIPTION

    --       The  function  set_field_opts  sets  all the given field's
--       option bits (field  option  bits  may  be  logically-OR'ed
-+       The function set_field_opts sets  all  the  given  field's
-+       option  bits  (field  option  bits  may be logically-OR'ed
-        together).
- 
-        The function field_opts_on turns on the given option bits,
-        and leaves others alone.
- 
--       The function field_opts_off turns  off  the  given  option
-+       The  function  field_opts_off  turns  off the given option
-        bits, and leaves others alone.
- 
-        The function field_opts returns the field's current option
-        bits.
- 
--       The following standard options are defined (all are on  by
-+       The  following standard options are defined (all are on by
-        default):
- 
-        O_ACTIVE
--            The  field  is  visited  during  processing.  If this
--            option is off, the field will  not  be  reachable  by
--            navigation  keys.  Please  notice  that  an invisible
-+            The field is  visited  during  processing.   If  this
-+            option  is  off,  the  field will not be reachable by
-+            navigation keys.  Please  notice  that  an  invisible
-             field appears to be inactive also.
- 
-        O_AUTOSKIP
-             Skip to the next field when this one fills.
- 
-        O_BLANK
--            The field is cleared whenever a character is  entered
-+            The  field is cleared whenever a character is entered
-             at the first position.
- 
-        O_EDIT
-@@ -104,24 +105,28 @@
-             The field contents are displayed as data is entered.
- 
-        O_STATIC
--            Field  buffers  are  fixed  to field's original size.
-+            Field buffers are fixed  to  field's  original  size.
-             Turn this option off to create a dynamic field.
- 
-        O_VISIBLE
--            The field is displayed.  If this option is off,  dis-
-+            The  field is displayed.  If this option is off, dis-
-             play of the field is suppressed.
- 
-        O_WRAP
--            Words  that  do  not fit on a line are wrapped to the
-+            Words that do not fit on a line are  wrapped  to  the
-             next line.  Words are blank-separated.
- 
--       One extension option is defined  (extensions  are  off  by
-+       These extension options are defined (extensions are off by
-        default):
- 
-        O_DYNAMIC_JUSTIFY
--            Permit  dynamic  fields  to be justified, like static
-+            Permit dynamic fields to be  justified,  like  static
-             fields.
- 
-+       O_NO_LEFT_STRIP
-+            Preserve  leading  whitespace  in  the  field buffer,
-+            which is normally discarded.
-+
- 
-
    -

    RETURN VALUE

    -Index: doc/html/man/form_field_userptr.3x.html
---- ncurses-6.0-20151128+/doc/html/man/form_field_userptr.3x.html	2015-05-13 19:27:47.000000000 +0000
-+++ ncurses-6.0-20151205/doc/html/man/form_field_userptr.3x.html	2015-12-06 00:26:48.000000000 +0000
-@@ -1,7 +1,7 @@
- 
- 
- 
-@@ -48,8 +48,8 @@
- 
-
    -

    NAME

    --       form_field_userptr  -  associate  application  data with a
--       form field
-+       set_field_userptr,  field_userptr  - associate application
-+       data with a form field
- 
- 
-
    -Index: doc/html/man/form_new.3x.html ---- ncurses-6.0-20151128+/doc/html/man/form_new.3x.html 2015-05-13 19:27:47.000000000 +0000 -+++ ncurses-6.0-20151205/doc/html/man/form_new.3x.html 2015-12-06 00:26:48.000000000 +0000 -@@ -1,7 +1,7 @@ - - - -@@ -48,7 +48,7 @@ - - -

    NAME

    --       form_new - create and destroy forms
-+       new_form, free_form - create and destroy forms
- 
- 
-
    -Index: doc/html/man/form_new_page.3x.html ---- ncurses-6.0-20151128+/doc/html/man/form_new_page.3x.html 2015-05-13 19:27:47.000000000 +0000 -+++ ncurses-6.0-20151205/doc/html/man/form_new_page.3x.html 2015-12-06 00:26:49.000000000 +0000 -@@ -1,7 +1,7 @@ - - - -@@ -48,7 +48,7 @@ - - -

    NAME

    --       form_new_page - form pagination functions
-+       set_new_page, new_page - form pagination functions
- 
- 
-
    -Index: doc/html/man/form_opts.3x.html ---- ncurses-6.0-20151128+/doc/html/man/form_opts.3x.html 2015-05-13 19:27:47.000000000 +0000 -+++ ncurses-6.0-20151205/doc/html/man/form_opts.3x.html 2015-12-06 00:26:49.000000000 +0000 -@@ -1,7 +1,7 @@ - - - -@@ -48,7 +48,8 @@ - - -

    NAME

    --       form_opts - set and get form options
-+       set_form_opts,  form_opts_on,  form_opts_off,  form_opts -
-+       set and get form options
- 
- 
-
    -@@ -62,29 +63,29 @@ - - -

    DESCRIPTION

    --       The  function  set_form_opts  sets  all  the  given form's
--       option bits  (form  option  bits  may  be  logically-OR'ed
-+       The function  set_form_opts  sets  all  the  given  form's
-+       option  bits  (form  option  bits  may  be logically-OR'ed
-        together).
- 
--       The  function form_opts_on turns on the given option bits,
-+       The function form_opts_on turns on the given option  bits,
-        and leaves others alone.
- 
--       The function form_opts_off  turns  off  the  given  option
-+       The  function  form_opts_off  turns  off  the given option
-        bits, and leaves others alone.
- 
--       The  function  form_opts returns the form's current option
-+       The function form_opts returns the form's  current  option
-        bits.
- 
-        The following options are defined (all are on by default):
- 
-        O_NL_OVERLOAD
--            Overload the REQ_NEW_LINE  forms  driver  request  so
--            that  calling  it  at  the end of a field goes to the
-+            Overload  the  REQ_NEW_LINE  forms  driver request so
-+            that calling it at the end of a  field  goes  to  the
-             next field.
- 
-        O_BS_OVERLOAD
--            Overload the REQ_DEL_PREV  forms  driver  request  so
--            that  calling  it at the beginning of a field goes to
-+            Overload  the  REQ_DEL_PREV  forms  driver request so
-+            that calling it at the beginning of a field  goes  to
-             the previous field.
- 
- 
-@@ -112,13 +113,13 @@
- 
-
    -

    PORTABILITY

    --       These routines emulate the System V forms  library.   They
-+       These  routines  emulate the System V forms library.  They
-        were not supported on Version 7 or BSD versions.
- 
- 
-
    -

    AUTHORS

    --       Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-+       Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
-        curses by Eric S. Raymond.
- 
- 
-Index: doc/html/man/form_post.3x.html
---- ncurses-6.0-20151128+/doc/html/man/form_post.3x.html	2015-05-13 19:27:47.000000000 +0000
-+++ ncurses-6.0-20151205/doc/html/man/form_post.3x.html	2015-12-06 00:26:49.000000000 +0000
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: form_post.3x,v 1.9 2010/12/04 18:40:45 tom Exp @
-+  * @Id: form_post.3x,v 1.10 2015/12/05 20:41:37 jmc Exp @
- -->
- 
- 
-@@ -48,8 +48,8 @@
- 
-
    -

    NAME

    --       form_post  -  write or erase forms from associated subwin-
--       dows
-+       post_form, unpost_form - write or erase forms from associ-
-+       ated subwindows
- 
- 
-
    -Index: doc/html/man/form_requestname.3x.html ---- ncurses-6.0-20151128+/doc/html/man/form_requestname.3x.html 2015-05-13 19:27:47.000000000 +0000 -+++ ncurses-6.0-20151205/doc/html/man/form_requestname.3x.html 2015-12-06 00:26:49.000000000 +0000 -@@ -1,7 +1,7 @@ - - - -@@ -48,7 +48,8 @@ - - -

    NAME

    --       form_requestname - handle printable form request names
-+       form_request_by_name, form_request_name - handle printable
-+       form request names
- 
- 
-
    -@@ -60,16 +61,16 @@ - - -

    DESCRIPTION

    --       The  function form_request_name returns the printable name
-+       The function form_request_name returns the printable  name
-        of a form request code.
-        The function form_request_by_name searches in the name-ta-
--       ble  for  a  request  with  the given name and returns its
-+       ble for a request with the  given  name  and  returns  its
-        request code. Otherwise E_NO_MATCH is returned.
- 
- 
-
    -

    RETURN VALUE

    --       form_request_name returns NULL on error and sets errno  to
-+       form_request_name  returns NULL on error and sets errno to
-        E_BAD_ARGUMENT.
-        form_request_by_name returns E_NO_MATCH on error.  It does
-        not set errno.
-@@ -88,15 +89,15 @@
- 
-
    -

    PORTABILITY

    --       These  routines  are  specific  to ncurses.  They were not
--       supported on Version 7, BSD or System  V  implementations.
--       It  is recommended that any code depending on them be con-
-+       These routines are specific to  ncurses.   They  were  not
-+       supported  on  Version 7, BSD or System V implementations.
-+       It is recommended that any code depending on them be  con-
-        ditioned using NCURSES_VERSION.
- 
- 
-
    -

    AUTHORS

    --       Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
-+       Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-        curses by Eric S. Raymond.
- 
- 
-Index: doc/html/man/form_userptr.3x.html
---- ncurses-6.0-20151128+/doc/html/man/form_userptr.3x.html	2015-05-13 19:27:47.000000000 +0000
-+++ ncurses-6.0-20151205/doc/html/man/form_userptr.3x.html	2015-12-06 00:26:49.000000000 +0000
-@@ -1,7 +1,7 @@
- 
- 
- 
-@@ -48,7 +48,8 @@
- 
-
    -

    NAME

    --       form_userptr - associate application data with a form item
-+       set_form_userptr,  form_userptr  -  associate  application
-+       data with a form item
- 
- 
-
    -@@ -60,7 +61,7 @@ - - -

    DESCRIPTION

    --       Every  form  and  every  form item has a field that can be
-+       Every form and every form item has a  field  that  can  be
-        used to hold application-specific data (that is, the form-
-        driver code leaves it alone).  These functions get and set
-        the form user pointer field.
-@@ -68,7 +69,7 @@
- 
-
    -

    RETURN VALUE

    --       The function form_userptr returns a pointer (which may  be
-+       The  function form_userptr returns a pointer (which may be
-        NULL).  It does not set errno.
- 
-        The function set_form_userptr returns E_OK (success).
-@@ -87,7 +88,7 @@
- 
-
    -

    PORTABILITY

    --       These routines emulate the System V forms  library.   They
-+       These  routines  emulate the System V forms library.  They
-        were not supported on Version 7 or BSD versions.
- 
-        The user pointer is a void pointer.  We chose not to leave
-@@ -96,7 +97,7 @@
- 
-
    -

    AUTHORS

    --       Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
-+       Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-        curses by Eric S. Raymond.
- 
- 
-Index: doc/html/man/infocmp.1m.html
---- ncurses-6.0-20151128+/doc/html/man/infocmp.1m.html	2015-10-25 00:21:14.000000000 +0000
-+++ ncurses-6.0-20151205/doc/html/man/infocmp.1m.html	2015-12-06 00:26:49.000000000 +0000
-@@ -487,7 +487,7 @@
- 
-        http://invisible-island.net/ncurses/tctest.html
- 
--       This describes ncurses version 6.0 (patch 20151024).
-+       This describes ncurses version 6.0 (patch 20151205).
- 
- 
-
    -Index: doc/html/man/infotocap.1m.html ---- ncurses-6.0-20151128+/doc/html/man/infotocap.1m.html 2015-10-25 00:21:14.000000000 +0000 -+++ ncurses-6.0-20151205/doc/html/man/infotocap.1m.html 2015-12-06 00:26:49.000000000 +0000 -@@ -94,7 +94,7 @@ -

    SEE ALSO

    -        curses(3x), tic(1m), infocmp(1m), terminfo(5)
- 
--       This describes ncurses version 6.0 (patch 20151024).
-+       This describes ncurses version 6.0 (patch 20151205).
- 
- 
-
    -Index: doc/html/man/menu.3x.html ---- ncurses-6.0-20151128+/doc/html/man/menu.3x.html 2015-10-25 00:21:15.000000000 +0000 -+++ ncurses-6.0-20151205/doc/html/man/menu.3x.html 2015-12-06 00:26:49.000000000 +0000 -@@ -227,7 +227,7 @@ - curses(3x) and related pages whose names begin "menu_" for - detailed descriptions of the entry points. - -- This describes ncurses version 6.0 (patch 20151024). -+ This describes ncurses version 6.0 (patch 20151205). - - - -Index: doc/html/man/menu_attributes.3x.html ---- ncurses-6.0-20151128+/doc/html/man/menu_attributes.3x.html 2015-05-13 19:27:48.000000000 +0000 -+++ ncurses-6.0-20151205/doc/html/man/menu_attributes.3x.html 2015-12-06 00:26:49.000000000 +0000 -@@ -1,7 +1,7 @@ - - - -@@ -48,7 +48,9 @@ - - -

    NAME

    --       menu_attributes - color and attribute control for menus
-+       menu_back,  menu_fore, menu_grey, menu_pad, set_menu_back,
-+       set_menu_fore, set_menu_grey,  set_menu_pad  -  color  and
-+       attribute control for menus
- 
- 
-
    -Index: doc/html/man/menu_cursor.3x.html ---- ncurses-6.0-20151128+/doc/html/man/menu_cursor.3x.html 2015-05-13 19:27:48.000000000 +0000 -+++ ncurses-6.0-20151205/doc/html/man/menu_cursor.3x.html 2015-12-06 00:26:50.000000000 +0000 -@@ -1,7 +1,7 @@ - - - -@@ -48,7 +48,7 @@ - - -

    NAME

    --       menu_cursor - position a menu's cursor
-+       pos_menu_cursor - position a menu's cursor
- 
- 
-
    -Index: doc/html/man/menu_format.3x.html ---- ncurses-6.0-20151128+/doc/html/man/menu_format.3x.html 2015-05-13 19:27:48.000000000 +0000 -+++ ncurses-6.0-20151205/doc/html/man/menu_format.3x.html 2015-12-06 00:26:50.000000000 +0000 -@@ -1,7 +1,7 @@ - - - -@@ -48,7 +48,7 @@ - - -

    NAME

    --       menu_format - set and get menu sizes
-+       set_menu_format, menu_format - set and get menu sizes
- 
- 
-
    -Index: doc/html/man/menu_items.3x.html ---- ncurses-6.0-20151128+/doc/html/man/menu_items.3x.html 2015-05-13 19:27:48.000000000 +0000 -+++ ncurses-6.0-20151205/doc/html/man/menu_items.3x.html 2015-12-06 00:26:50.000000000 +0000 -@@ -1,7 +1,7 @@ - - - -@@ -48,8 +48,8 @@ - - -

    NAME

    --       menu_items  - make and break connections between items and
--       menus
-+       set_menu_items,  menu_items,  item_count  - make and break
-+       connections between items and menus
- 
- 
-
    -Index: doc/html/man/menu_mark.3x.html ---- ncurses-6.0-20151128+/doc/html/man/menu_mark.3x.html 2015-05-13 19:27:48.000000000 +0000 -+++ ncurses-6.0-20151205/doc/html/man/menu_mark.3x.html 2015-12-06 00:26:50.000000000 +0000 -@@ -1,7 +1,7 @@ - - - -@@ -48,7 +48,8 @@ - - -

    NAME

    --       menu_mark - get and set the menu mark string
-+       set_menu_mark,  menu_mark  -  get  and  set  the menu mark
-+       string
- 
- 
-
    -@@ -60,36 +61,36 @@ - - -

    DESCRIPTION

    --       In  order  to make menu selections visible on older termi-
--       nals without highlighting or color  capability,  the  menu
--       library  marks  selected  items  in  a  menu with a prefix
-+       In order to make menu selections visible on  older  termi-
-+       nals  without  highlighting  or color capability, the menu
-+       library marks selected items  in  a  menu  with  a  prefix
-        string.
- 
--       The function set_menu_mark sets the mark  string  for  the
--       given  menu.   Calling set_menu_mark with a null menu item
--       will abolish the mark  string.   Note  that  changing  the
--       length  of  the  mark  string for a menu while the menu is
-+       The  function  set_menu_mark  sets the mark string for the
-+       given menu.  Calling set_menu_mark with a null  menu  item
-+       will  abolish  the  mark  string.   Note that changing the
-+       length of the mark string for a menu  while  the  menu  is
-        posted is likely to produce unhelpful behavior.
- 
--       The default string is "-" (a dash). Calling  set_menu_mark
-+       The  default string is "-" (a dash). Calling set_menu_mark
-        with a non-NULL menu argument will change this default.
- 
--       The  function menu_mark returns the menu's mark string (or
-+       The function menu_mark returns the menu's mark string  (or
-        NULL if there is none).
- 
- 
-
    -

    RETURN VALUE

    --       The function menu_mark returns a  pointer  (which  may  be
-+       The  function  menu_mark  returns  a pointer (which may be
-        NULL).  It does not set errno.
- 
--       The  function set_menu_mark may return the following error
-+       The function set_menu_mark may return the following  error
-        codes:
- 
-        E_OK The routine succeeded.
- 
-        E_BAD_ARGUMENT
--            Routine detected an incorrect or  out-of-range  argu-
-+            Routine  detected  an incorrect or out-of-range argu-
-             ment.
- 
-        E_SYSTEM_ERROR
-@@ -109,13 +110,13 @@
- 
-
    -

    PORTABILITY

    --       These routines emulate the System V  menu  library.   They
-+       These  routines  emulate  the System V menu library.  They
-        were not supported on Version 7 or BSD versions.
- 
- 
-
    -

    AUTHORS

    --       Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-+       Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
-        curses by Eric S. Raymond.
- 
- 
-Index: doc/html/man/menu_new.3x.html
---- ncurses-6.0-20151128+/doc/html/man/menu_new.3x.html	2015-05-13 19:27:48.000000000 +0000
-+++ ncurses-6.0-20151205/doc/html/man/menu_new.3x.html	2015-12-06 00:26:50.000000000 +0000
-@@ -1,7 +1,7 @@
- 
- 
- 
-@@ -48,7 +48,7 @@
- 
-
    -

    NAME

    --       menu_new - create and destroy menus
-+       new_menu, free_menu - create and destroy menus
- 
- 
-
    -Index: doc/html/man/menu_opts.3x.html ---- ncurses-6.0-20151128+/doc/html/man/menu_opts.3x.html 2015-05-13 19:27:48.000000000 +0000 -+++ ncurses-6.0-20151205/doc/html/man/menu_opts.3x.html 2015-12-06 00:26:50.000000000 +0000 -@@ -1,7 +1,7 @@ - - - -@@ -48,7 +48,8 @@ - - -

    NAME

    --       menu_opts - set and get menu options
-+       set_menu_opts,  menu_opts_on,  menu_opts_off,  menu_opts -
-+       set and get menu options
- 
- 
-
    -@@ -62,17 +63,17 @@ - - -

    DESCRIPTION

    --       The  function  set_menu_opts  sets  all  the  given menu's
--       option bits  (menu  option  bits  may  be  logically-OR'ed
-+       The function  set_menu_opts  sets  all  the  given  menu's
-+       option  bits  (menu  option  bits  may  be logically-OR'ed
-        together).
- 
--       The  function menu_opts_on turns on the given option bits,
-+       The function menu_opts_on turns on the given option  bits,
-        and leaves others alone.
- 
--       The function menu_opts_off  turns  off  the  given  option
-+       The  function  menu_opts_off  turns  off  the given option
-        bits, and leaves others alone.
- 
--       The  function  menu_opts returns the menu's current option
-+       The function menu_opts returns the menu's  current  option
-        bits.
- 
-        The following options are defined (all are on by default):
-@@ -91,11 +92,11 @@
-             Ignore the case when pattern-matching.
- 
-        O_SHOWMATCH
--            Move  the  cursor  to within the item name while pat-
-+            Move the cursor to within the item  name  while  pat-
-             tern-matching.
- 
-        O_NONCYCLIC
--            Don't  wrap  around  next-item   and   previous-item,
-+            Don't   wrap   around  next-item  and  previous-item,
-             requests to the other end of the menu.
- 
- 
-@@ -126,13 +127,13 @@
- 
-
    -

    PORTABILITY

    --       These  routines  emulate  the System V menu library.  They
-+       These routines emulate the System V  menu  library.   They
-        were not supported on Version 7 or BSD versions.
- 
- 
-
    -

    AUTHORS

    --       Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
-+       Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-        curses by Eric S. Raymond.
- 
- 
-Index: doc/html/man/menu_pattern.3x.html
---- ncurses-6.0-20151128+/doc/html/man/menu_pattern.3x.html	2015-05-13 19:27:48.000000000 +0000
-+++ ncurses-6.0-20151205/doc/html/man/menu_pattern.3x.html	2015-12-06 00:26:50.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-@@ -47,7 +47,8 @@
- 
-
    -

    NAME

    --       menu_pattern - get and set a menu's pattern buffer
-+       set_menu_pattern, menu_pattern - set and get a menu's pat-
-+       tern buffer
- 
- 
-
    -@@ -59,17 +60,17 @@ - - -

    DESCRIPTION

    --       Every  menu  has  an  associated pattern match buffer.  As
--       input events that are printable characters come  in,  they
--       are  appended to this match buffer and tested for a match,
-+       Every menu has an associated  pattern  match  buffer.   As
-+       input  events  that are printable characters come in, they
-+       are appended to this match buffer and tested for a  match,
-        as described in menu_driver(3x).
- 
--       The function set_menu_pattern sets the pattern buffer  for
--       the  given menu and tries to find the first matching item.
--       If it succeeds, that item becomes  current;  if  not,  the
-+       The  function set_menu_pattern sets the pattern buffer for
-+       the given menu and tries to find the first matching  item.
-+       If  it  succeeds,  that  item becomes current; if not, the
-        current item does not change.
- 
--       The  function  menu_pattern  returns the pattern buffer of
-+       The function menu_pattern returns the  pattern  buffer  of
-        the given menu.
- 
- 
-@@ -80,13 +81,13 @@
-        to a string which is empty if no pattern has been set.  It
-        does not set errno.
- 
--       The  function  set_menu_pattern  may  return the following
-+       The function set_menu_pattern  may  return  the  following
-        error codes:
- 
-        E_OK The routine succeeded.
- 
-        E_BAD_ARGUMENT
--            Routine detected an incorrect or  out-of-range  argu-
-+            Routine  detected  an incorrect or out-of-range argu-
-             ment.
- 
-        E_BAD_STATE
-@@ -116,13 +117,13 @@
- 
-
    -

    PORTABILITY

    --       These  routines  emulate  the System V menu library.  They
-+       These routines emulate the System V  menu  library.   They
-        were not supported on Version 7 or BSD versions.
- 
- 
-
    -

    AUTHORS

    --       Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
-+       Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-        curses by Eric S. Raymond.
- 
- 
-Index: doc/html/man/menu_post.3x.html
---- ncurses-6.0-20151128+/doc/html/man/menu_post.3x.html	2015-05-13 19:27:48.000000000 +0000
-+++ ncurses-6.0-20151205/doc/html/man/menu_post.3x.html	2015-12-06 00:26:50.000000000 +0000
-@@ -1,7 +1,7 @@
- 
- 
- 
-@@ -48,8 +48,8 @@
- 
-
    -

    NAME

    --       menu_post  -  write or erase menus from associated subwin-
--       dows
-+       post_menu, unpost_menu - write or erase menus from associ-
-+       ated subwindows
- 
- 
-
    -Index: doc/html/man/menu_requestname.3x.html ---- ncurses-6.0-20151128+/doc/html/man/menu_requestname.3x.html 2015-05-13 19:27:48.000000000 +0000 -+++ ncurses-6.0-20151205/doc/html/man/menu_requestname.3x.html 2015-12-06 00:26:50.000000000 +0000 -@@ -1,7 +1,7 @@ - - - -@@ -48,7 +48,8 @@ - - -

    NAME

    --       menu_requestname - handle printable menu request names
-+       menu_request_by_name, menu_request_name - handle printable
-+       menu request names
- 
- 
-
    -@@ -60,16 +61,16 @@ - - -

    DESCRIPTION

    --       The  function menu_request_name returns the printable name
-+       The function menu_request_name returns the printable  name
-        of a menu request code.
-        The function menu_request_by_name searches in the name-ta-
--       ble  for  a  request  with  the given name and returns its
-+       ble for a request with the  given  name  and  returns  its
-        request code.  Otherwise E_NO_MATCH is returned.
- 
- 
-
    -

    RETURN VALUE

    --       menu_request_name returns NULL on error and sets errno  to
-+       menu_request_name  returns NULL on error and sets errno to
-        E_BAD_ARGUMENT.
-        menu_request_by_name returns E_NO_MATCH on error.  It does
-        not set errno.
-@@ -88,15 +89,15 @@
- 
-
    -

    PORTABILITY

    --       These  routines  are  specific  to ncurses.  They were not
--       supported on Version 7, BSD or System  V  implementations.
--       It  is recommended that any code depending on them be con-
-+       These routines are specific to  ncurses.   They  were  not
-+       supported  on  Version 7, BSD or System V implementations.
-+       It is recommended that any code depending on them be  con-
-        ditioned using NCURSES_VERSION.
- 
- 
-
    -

    AUTHORS

    --       Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
-+       Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-        curses by Eric S. Raymond.
- 
- 
-Index: doc/html/man/menu_spacing.3x.html
---- ncurses-6.0-20151128+/doc/html/man/menu_spacing.3x.html	2015-05-13 19:27:48.000000000 +0000
-+++ ncurses-6.0-20151205/doc/html/man/menu_spacing.3x.html	2015-12-06 00:26:50.000000000 +0000
-@@ -1,7 +1,7 @@
- 
- 
- 
-@@ -48,7 +48,8 @@
- 
-
    -

    NAME

    --       menu_spacing - Control spacing between menu items.
-+       set_menu_spacing,  menu_spacing  -  set  and  get  spacing
-+       between menu items.
- 
- 
-
    -@@ -67,28 +68,28 @@ - -

    DESCRIPTION

    -        The function set_menu_spacing sets the spacing information
--       for the menu.  Its parameter spc_description controls  the
-+       for  the menu.  Its parameter spc_description controls the
-        number of spaces between an item name and an item descrip-
--       tion.  It must not be larger than TABSIZE.  The menu  sys-
--       tem  puts in the middle of this spacing area the pad char-
--       acter.  The remaining parts are filled with  spaces.   The
--       spc_rows  parameter  controls  the number of rows that are
-+       tion.   It must not be larger than TABSIZE.  The menu sys-
-+       tem puts in the middle of this spacing area the pad  char-
-+       acter.   The  remaining parts are filled with spaces.  The
-+       spc_rows parameter controls the number of  rows  that  are
-        used for an item.  It must not be larger than 3.  The menu
--       system  inserts  the  blank lines between item rows, these
--       lines will contain the pad character  in  the  appropriate
--       positions.   The spc_columns parameter controls the number
-+       system inserts the blank lines between  item  rows,  these
-+       lines  will  contain  the pad character in the appropriate
-+       positions.  The spc_columns parameter controls the  number
-        of blanks between columns of items.  It must not be larger
--       than  TABSIZE.   A  value  of 0 for all the spacing values
-+       than TABSIZE.  A value of 0 for  all  the  spacing  values
-        resets them to the default, which is 1 for all of them.
-        The function menu_spacing passes back the spacing info for
--       the  menu.   If  a  pointer is NULL, this specific info is
-+       the menu.  If a pointer is NULL,  this  specific  info  is
-        simply not returned.
- 
- 
-
    -

    RETURN VALUE

    --       Both routines return E_OK  on  success.   set_menu_spacing
--       may  return E_POSTED if the menu is posted, or E_BAD_ARGU-
-+       Both  routines  return  E_OK on success.  set_menu_spacing
-+       may return E_POSTED if the menu is posted, or  E_BAD_ARGU-
-        MENT if one of the spacing values is out of range.
- 
- 
-@@ -105,15 +106,15 @@
- 
-
    -

    PORTABILITY

    --       These  routines  are  specific  to ncurses.  They were not
--       supported on Version 7, BSD or System  V  implementations.
--       It  is recommended that any code depending on them be con-
-+       These routines are specific to  ncurses.   They  were  not
-+       supported  on  Version 7, BSD or System V implementations.
-+       It is recommended that any code depending on them be  con-
-        ditioned using NCURSES_VERSION.
- 
- 
-
    -

    AUTHORS

    --       Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
-+       Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-        curses by Eric S. Raymond.
- 
- 
-Index: doc/html/man/menu_userptr.3x.html
---- ncurses-6.0-20151128+/doc/html/man/menu_userptr.3x.html	2015-05-13 19:27:48.000000000 +0000
-+++ ncurses-6.0-20151205/doc/html/man/menu_userptr.3x.html	2015-12-06 00:26:50.000000000 +0000
-@@ -1,7 +1,7 @@
- 
- 
- 
-@@ -48,7 +48,8 @@
- 
-
    -

    NAME

    --       menu_userptr - associate application data with a menu item
-+       set_menu_userptr,  menu_userptr  -  associate  application
-+       data with a menu item
- 
- 
-
    -@@ -60,7 +61,7 @@ - - -

    DESCRIPTION

    --       Every  menu  and  every  menu item has a field that can be
-+       Every menu and every menu item has a  field  that  can  be
-        used to hold application-specific data (that is, the menu-
-        driver code leaves it alone).  These functions get and set
-        the menu user pointer field.
-@@ -68,7 +69,7 @@
- 
-
    -

    RETURN VALUE

    --       menu_userptr returns a pointer (which may  be  NULL).   It
-+       menu_userptr  returns  a  pointer (which may be NULL).  It
-        does not set errno.
- 
-        set_menu_userptr returns E_OK (success).
-@@ -87,7 +88,7 @@
- 
-
    -

    PORTABILITY

    --       These routines emulate the System V  menu  library.   They
-+       These  routines  emulate  the System V menu library.  They
-        were not supported on Version 7 or BSD versions.
- 
-        The user pointer is a void pointer.  We chose not to leave
-@@ -96,7 +97,7 @@
- 
-
    -

    AUTHORS

    --       Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
-+       Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-        curses by Eric S. Raymond.
- 
- 
-Index: doc/html/man/mitem_name.3x.html
---- ncurses-6.0-20151128+/doc/html/man/mitem_name.3x.html	2015-05-13 19:27:49.000000000 +0000
-+++ ncurses-6.0-20151205/doc/html/man/mitem_name.3x.html	2015-12-06 00:26:50.000000000 +0000
-@@ -1,7 +1,7 @@
- 
- 
- 
-@@ -48,7 +48,8 @@
- 
-
    -

    NAME

    --       mitem_name - get menu item name and description fields
-+       item_name,  item_description  -  get  menu  item  name and
-+       description fields
- 
- 
-
    -@@ -60,7 +61,7 @@ - - -

    DESCRIPTION

    --       The  function item_name returns the name part of the given
-+       The function item_name returns the name part of the  given
-        item.
-        The function item_description returns the description part
-        of the given item.
-@@ -85,13 +86,13 @@
- 
-
    -

    PORTABILITY

    --       These  routines  emulate  the System V menu library.  They
-+       These routines emulate the System V  menu  library.   They
-        were not supported on Version 7 or BSD versions.
- 
- 
-
    -

    AUTHORS

    --       Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
-+       Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-        curses by Eric S. Raymond.
- 
- 
-Index: doc/html/man/mitem_new.3x.html
---- ncurses-6.0-20151128+/doc/html/man/mitem_new.3x.html	2015-05-13 19:27:49.000000000 +0000
-+++ ncurses-6.0-20151205/doc/html/man/mitem_new.3x.html	2015-12-06 00:26:50.000000000 +0000
-@@ -1,7 +1,7 @@
- 
- 
- 
-@@ -48,7 +48,7 @@
- 
-
    -

    NAME

    --       mitem_new - create and destroy menu items
-+       new_item, free_item - create and destroy menu items
- 
- 
-
    -Index: doc/html/man/mitem_opts.3x.html ---- ncurses-6.0-20151128+/doc/html/man/mitem_opts.3x.html 2015-05-13 19:27:49.000000000 +0000 -+++ ncurses-6.0-20151205/doc/html/man/mitem_opts.3x.html 2015-12-06 00:26:50.000000000 +0000 -@@ -1,7 +1,7 @@ - - - -@@ -48,7 +48,8 @@ - - -

    NAME

    --       mitem_opts - set and get menu item options
-+       set_item_opts,  item_opts_on,  item_opts_off,  item_opts -
-+       set and get menu item options
- 
- 
-
    -@@ -62,20 +63,20 @@ - - -

    DESCRIPTION

    --       The  function  set_item_opts  sets  all  the  given item's
--       option bits  (menu  option  bits  may  be  logically-OR'ed
-+       The function  set_item_opts  sets  all  the  given  item's
-+       option  bits  (menu  option  bits  may  be logically-OR'ed
-        together).
- 
--       The  function item_opts_on turns on the given option bits,
-+       The function item_opts_on turns on the given option  bits,
-        and leaves others alone.
- 
--       The function item_opts_off  turns  off  the  given  option
-+       The  function  item_opts_off  turns  off  the given option
-        bits, and leaves others alone.
- 
--       The  function  item_opts returns the item's current option
-+       The function item_opts returns the item's  current  option
-        bits.
- 
--       There is only one defined option bit  mask,  O_SELECTABLE.
-+       There  is  only one defined option bit mask, O_SELECTABLE.
-        When this is on, the item may be selected during menu pro-
-        cessing.  This option defaults to on.
- 
-@@ -104,13 +105,13 @@
- 
-
    -

    PORTABILITY

    --       These routines emulate the System V  menu  library.   They
-+       These  routines  emulate  the System V menu library.  They
-        were not supported on Version 7 or BSD versions.
- 
- 
-
    -

    AUTHORS

    --       Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-+       Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
-        curses by Eric S. Raymond.
- 
- 
-Index: doc/html/man/mitem_userptr.3x.html
---- ncurses-6.0-20151128+/doc/html/man/mitem_userptr.3x.html	2015-05-13 19:27:49.000000000 +0000
-+++ ncurses-6.0-20151205/doc/html/man/mitem_userptr.3x.html	2015-12-06 00:26:51.000000000 +0000
-@@ -1,7 +1,7 @@
- 
- 
- 
-@@ -48,8 +48,8 @@
- 
-
    -

    NAME

    --       mitem_userptr  -  associate  application  data with a menu
--       item
-+       set_item_userptr,  item_userptr  -  associate  application
-+       data with a menu item
- 
- 
-
    -Index: doc/html/man/mitem_value.3x.html ---- ncurses-6.0-20151128+/doc/html/man/mitem_value.3x.html 2015-05-13 19:27:49.000000000 +0000 -+++ ncurses-6.0-20151205/doc/html/man/mitem_value.3x.html 2015-12-06 00:26:51.000000000 +0000 -@@ -1,6 +1,6 @@ - - - -@@ -47,7 +47,7 @@ - - -

    NAME

    --       mitem_value - set and get menu item values
-+       set_item_value, item_value - set and get menu item values
- 
- 
-
    -Index: doc/html/man/ncurses.3x.html ---- ncurses-6.0-20151128+/doc/html/man/ncurses.3x.html 2015-10-25 00:21:16.000000000 +0000 -+++ ncurses-6.0-20151205/doc/html/man/ncurses.3x.html 2015-12-06 00:26:51.000000000 +0000 -@@ -63,7 +63,7 @@ - sonable optimization. This implementation is "new curses" - (ncurses) and is the approved replacement for 4.4BSD clas- - sic curses, which has been discontinued. This describes -- ncurses version 6.0 (patch 20151024). -+ ncurses version 6.0 (patch 20151205). - - The ncurses library emulates the curses library of System - V Release 4 UNIX, and XPG4 (X/Open Portability Guide) -Index: doc/html/man/panel.3x.html ---- ncurses-6.0-20151128+/doc/html/man/panel.3x.html 2015-10-25 00:21:16.000000000 +0000 -+++ ncurses-6.0-20151205/doc/html/man/panel.3x.html 2015-12-06 00:26:51.000000000 +0000 -@@ -1,6 +1,6 @@ - - - -@@ -56,21 +56,21 @@ - - cc [flags] sourcefiles -lpanel -lncurses - -- PANEL *new_panel(WINDOW *win) -- int bottom_panel(PANEL *pan) -- int top_panel(PANEL *pan) -- int show_panel(PANEL *pan) -+ PANEL *new_panel(WINDOW *win); -+ int bottom_panel(PANEL *pan); -+ int top_panel(PANEL *pan); -+ int show_panel(PANEL *pan); - void update_panels(); -- int hide_panel(PANEL *pan) -- WINDOW *panel_window(const PANEL *pan) -- int replace_panel(PANEL *pan, WINDOW *window) -- int move_panel(PANEL *pan, int starty, int startx) -- int panel_hidden(const PANEL *pan) -- PANEL *panel_above(const PANEL *pan) -- PANEL *panel_below(const PANEL *pan) -- int set_panel_userptr(PANEL *pan, const void *ptr) -- const void *panel_userptr(const PANEL *pan) -- int del_panel(PANEL *pan) -+ int hide_panel(PANEL *pan); -+ WINDOW *panel_window(const PANEL *pan); -+ int replace_panel(PANEL *pan, WINDOW *window); -+ int move_panel(PANEL *pan, int starty, int startx); -+ int panel_hidden(const PANEL *pan); -+ PANEL *panel_above(const PANEL *pan); -+ PANEL *panel_below(const PANEL *pan); -+ int set_panel_userptr(PANEL *pan, const void *ptr); -+ const void *panel_userptr(const PANEL *pan); -+ int del_panel(PANEL *pan); - - - -@@ -218,7 +218,7 @@ -

    SEE ALSO

    -        curses(3x), curs_variables(3x),
- 
--       This describes ncurses version 6.0 (patch 20151024).
-+       This describes ncurses version 6.0 (patch 20151205).
- 
- 
-
    -Index: doc/html/man/tabs.1.html ---- ncurses-6.0-20151128+/doc/html/man/tabs.1.html 2015-10-25 00:21:16.000000000 +0000 -+++ ncurses-6.0-20151205/doc/html/man/tabs.1.html 2015-12-06 00:26:51.000000000 +0000 -@@ -168,7 +168,7 @@ -

    SEE ALSO

    -        tset(1), infocmp(1m), curses(3x), terminfo(5).
- 
--       This describes ncurses version 6.0 (patch 20151024).
-+       This describes ncurses version 6.0 (patch 20151205).
- 
- 
- 
-Index: doc/html/man/term_variables.3x.html
---- ncurses-6.0-20151128+/doc/html/man/term_variables.3x.html	2015-05-13 19:27:50.000000000 +0000
-+++ ncurses-6.0-20151205/doc/html/man/term_variables.3x.html	2015-12-06 00:26:51.000000000 +0000
-@@ -26,7 +26,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: term_variables.3x,v 1.6 2015/04/22 00:34:49 tom Exp @
-+  * @Id: term_variables.3x,v 1.7 2015/12/05 18:43:25 tom Exp @
- -->
- 
- 
-@@ -59,6 +59,8 @@
- 
-        chtype acs_map[];
- 
-+       SCREEN * SP;
-+
-        TERMINAL * cur_term;
- 
-        char ttytype[];
-Index: doc/html/man/terminfo.5.html
---- ncurses-6.0-20151128+/doc/html/man/terminfo.5.html	2015-10-25 00:21:17.000000000 +0000
-+++ ncurses-6.0-20151205/doc/html/man/terminfo.5.html	2015-12-06 00:26:52.000000000 +0000
-@@ -78,7 +78,7 @@
-        nals by giving a set of capabilities which they  have,  by
-        specifying how to perform screen operations, and by speci-
-        fying padding requirements and  initialization  sequences.
--       This describes ncurses version 6.0 (patch 20151024).
-+       This describes ncurses version 6.0 (patch 20151205).
- 
-        Entries in terminfo consist of a sequence of `,' separated
-        fields (embedded commas may be escaped with a backslash or
-Index: doc/html/man/tic.1m.html
---- ncurses-6.0-20151128+/doc/html/man/tic.1m.html	2015-10-25 00:21:17.000000000 +0000
-+++ ncurses-6.0-20151205/doc/html/man/tic.1m.html	2015-12-06 00:26:52.000000000 +0000
-@@ -408,7 +408,7 @@
-        infocmp(1m),    captoinfo(1m),   infotocap(1m),   toe(1m),
-        curses(3x), term(5).  terminfo(5).
- 
--       This describes ncurses version 6.0 (patch 20151024).
-+       This describes ncurses version 6.0 (patch 20151205).
- 
- 
-
    -Index: doc/html/man/toe.1m.html ---- ncurses-6.0-20151128+/doc/html/man/toe.1m.html 2015-10-25 00:21:17.000000000 +0000 -+++ ncurses-6.0-20151205/doc/html/man/toe.1m.html 2015-12-06 00:26:52.000000000 +0000 -@@ -122,7 +122,7 @@ - tic(1m), infocmp(1m), captoinfo(1m), infotocap(1m), - curses(3x), terminfo(5). - -- This describes ncurses version 6.0 (patch 20151024). -+ This describes ncurses version 6.0 (patch 20151205). - - - -Index: doc/html/man/tput.1.html ---- ncurses-6.0-20151128+/doc/html/man/tput.1.html 2015-10-25 00:21:17.000000000 +0000 -+++ ncurses-6.0-20151205/doc/html/man/tput.1.html 2015-12-06 00:26:52.000000000 +0000 -@@ -338,7 +338,7 @@ -

    SEE ALSO

    -        clear(1), stty(1), tabs(1), terminfo(5), curs_termcap(3x).
- 
--       This describes ncurses version 6.0 (patch 20151024).
-+       This describes ncurses version 6.0 (patch 20151205).
- 
- 
- 
-Index: doc/html/man/tset.1.html
---- ncurses-6.0-20151128+/doc/html/man/tset.1.html	2015-10-25 00:21:17.000000000 +0000
-+++ ncurses-6.0-20151205/doc/html/man/tset.1.html	2015-12-06 00:26:52.000000000 +0000
-@@ -319,7 +319,7 @@
-        csh(1),   sh(1),   stty(1),   curs_terminfo(3x),   tty(4),
-        terminfo(5), ttys(5), environ(7)
- 
--       This describes ncurses version 6.0 (patch 20151024).
-+       This describes ncurses version 6.0 (patch 20151205).
- 
- 
- 
-Index: man/curs_attr.3x
-Prereq:  1.42 
---- ncurses-6.0-20151128+/man/curs_attr.3x	2015-10-24 19:10:42.000000000 +0000
-+++ ncurses-6.0-20151205/man/curs_attr.3x	2015-12-05 18:46:04.000000000 +0000
-@@ -27,7 +27,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_attr.3x,v 1.42 2015/10/24 19:10:42 Sven.Joachim Exp $
-+.\" $Id: curs_attr.3x,v 1.43 2015/12/05 18:46:04 tom Exp $
- .TH curs_attr 3X ""
- .na
- .hy 0
-@@ -116,6 +116,8 @@
- \fBint mvwchgat(WINDOW *\fP\fIwin, int \fP\fIy, int \fP\fIx, int \fP\fIn,\fR
-       \fBattr_t \fP\fIattr\fP\fB, short \fP\fIcolor\fP\fB, const void *\fP\fIopts\fP\fB);\fR
- .br
-+\fBPAIR_NUMBER(\fR\fIattrs\fR\fB);\fP
-+.br
- .SH DESCRIPTION
- These routines manipulate the current attributes of the named window.
- The
-Index: man/curs_color.3x
-Prereq:  1.39 
---- ncurses-6.0-20151128+/man/curs_color.3x	2015-06-06 23:29:02.000000000 +0000
-+++ ncurses-6.0-20151205/man/curs_color.3x	2015-12-05 20:09:42.000000000 +0000
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_color.3x,v 1.39 2015/06/06 23:29:02 tom Exp $
-+.\" $Id: curs_color.3x,v 1.40 2015/12/05 20:09:42 tom Exp $
- .TH curs_color 3X ""
- .ie \n(.g .ds `` \(lq
- .el       .ds `` ``
-@@ -66,6 +66,8 @@
- .br
- \fBint pair_content(short pair, short *f, short *b);\fR
- .br
-+\fBint COLOR_PAIR(int n);\fR
-+.br
- .SH DESCRIPTION
- .SS Overview
- \fBcurses\fR supports color attributes on terminals with that capability.
-Index: man/curs_legacy.3x
-Prereq:  1.5 
---- ncurses-6.0-20151128+/man/curs_legacy.3x	2010-12-04 18:38:55.000000000 +0000
-+++ ncurses-6.0-20151205/man/curs_legacy.3x	2015-12-05 20:33:14.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 2007,2010 Free Software Foundation, Inc.                   *
-+.\" Copyright (c) 2007-2010,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -26,10 +26,10 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_legacy.3x,v 1.5 2010/12/04 18:38:55 tom Exp $
-+.\" $Id: curs_legacy.3x,v 1.6 2015/12/05 20:33:14 tom Exp $
- .TH curs_legacy 3X ""
- .SH NAME
--getattrs \- get \fBcurses\fR cursor and window coordinates, attributes
-+curs_legacy \- get \fBcurses\fR cursor and window coordinates, attributes
- .SH SYNOPSIS
- \fB#include \fR
- .sp
-Index: man/curs_opaque.3x
-Prereq:  1.12 
---- ncurses-6.0-20151128+/man/curs_opaque.3x	2015-04-11 10:23:49.000000000 +0000
-+++ ncurses-6.0-20151205/man/curs_opaque.3x	2015-12-05 20:05:45.000000000 +0000
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_opaque.3x,v 1.12 2015/04/11 10:23:49 tom Exp $
-+.\" $Id: curs_opaque.3x,v 1.13 2015/12/05 20:05:45 tom Exp $
- .TH curs_opaque 3X ""
- .ie \n(.g .ds `` \(lq
- .el       .ds `` ``
-@@ -46,7 +46,10 @@
- \fBis_pad\fR,
- \fBis_scrollok\fR,
- \fBis_subwin\fR,
--\fBis_syncok\fR \- \fBcurses\fR window properties
-+\fBis_syncok\fR,
-+\fBwgetdelay\fR,
-+\fBwgetparent\fR,
-+\fBwgetscrreg\fR \- \fBcurses\fR window properties
- .ad
- .hy
- .SH SYNOPSIS
-Index: man/curs_sp_funcs.3x
-Prereq:  1.6 
---- ncurses-6.0-20151128+/man/curs_sp_funcs.3x	2013-06-22 17:53:59.000000000 +0000
-+++ ncurses-6.0-20151205/man/curs_sp_funcs.3x	2015-12-05 20:33:14.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 2010,2013 Free Software Foundation, Inc.                   *
-+.\" Copyright (c) 2010-2013,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -26,12 +26,12 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_sp_funcs.3x,v 1.6 2013/06/22 17:53:59 tom Exp $
-+.\" $Id: curs_sp_funcs.3x,v 1.7 2015/12/05 20:33:14 tom Exp $
- .TH curs_sp_funcs 3X ""
- .na
- .hy 0
- .SH NAME
--new_prescr \- \fBcurses\fR screen-pointer extension
-+curs_sp_funcs \- \fBcurses\fR screen-pointer extension
- .ad
- .hy
- .SH SYNOPSIS
-Index: man/curs_threads.3x
-Prereq:  1.22 
---- ncurses-6.0-20151128+/man/curs_threads.3x	2015-09-05 21:13:25.000000000 +0000
-+++ ncurses-6.0-20151205/man/curs_threads.3x	2015-12-05 18:47:04.000000000 +0000
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_threads.3x,v 1.22 2015/09/05 21:13:25 tom Exp $
-+.\" $Id: curs_threads.3x,v 1.23 2015/12/05 18:47:04 tom Exp $
- .TH curs_threads 3X ""
- .de bP
- .IP \(bu 4
-@@ -34,8 +34,7 @@
- .na
- .hy 0
- .SH NAME
--\fBuse_screen\fR,
--\fBuse_window\fR \- \fBcurses\fR thread support
-+\fBcurs_threads\fR \- \fBcurses\fR thread support
- .ad
- .hy
- .SH SYNOPSIS
-Index: man/curs_touch.3x
-Prereq:  1.15 
---- ncurses-6.0-20151128+/man/curs_touch.3x	2015-04-11 10:23:49.000000000 +0000
-+++ ncurses-6.0-20151205/man/curs_touch.3x	2015-12-05 23:43:00.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2020,2015 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_touch.3x,v 1.15 2015/04/11 10:23:49 tom Exp $
-+.\" $Id: curs_touch.3x,v 1.16 2015/12/05 23:43:00 tom Exp $
- .TH curs_touch 3X ""
- .na
- .hy 0
-Index: man/form_cursor.3x
-Prereq:  1.8 
---- ncurses-6.0-20151128+/man/form_cursor.3x	2010-12-04 18:40:45.000000000 +0000
-+++ ncurses-6.0-20151205/man/form_cursor.3x	2015-12-05 20:39:43.000000000 +0000
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,10 +27,10 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: form_cursor.3x,v 1.8 2010/12/04 18:40:45 tom Exp $
-+.\" $Id: form_cursor.3x,v 1.9 2015/12/05 20:39:43 jmc Exp $
- .TH form_cursor 3X ""
- .SH NAME
--\fBform_cursor\fR \- position a form window cursor
-+\fBpos_form_cursor\fR \- position a form window cursor
- .SH SYNOPSIS
- \fB#include \fR
- .br
-Index: man/form_data.3x
-Prereq:  1.10 
---- ncurses-6.0-20151128+/man/form_data.3x	2010-12-04 18:40:45.000000000 +0000
-+++ ncurses-6.0-20151205/man/form_data.3x	2015-12-05 23:01:16.000000000 +0000
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,10 +27,11 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: form_data.3x,v 1.10 2010/12/04 18:40:45 tom Exp $
-+.\" $Id: form_data.3x,v 1.11 2015/12/05 23:01:16 tom Exp $
- .TH form_data 3X ""
- .SH NAME
--\fBform_data\fR \- test for off-screen data in given forms
-+\fBdata_ahead\fP,
-+\fBdata_behind\fR \- test for off-screen data in given forms
- .SH SYNOPSIS
- \fB#include \fR
- .br
-Index: man/form_driver.3x
-Prereq:  1.24 
---- ncurses-6.0-20151128+/man/form_driver.3x	2015-08-02 18:21:11.000000000 +0000
-+++ ncurses-6.0-20151205/man/form_driver.3x	2015-12-05 21:06:26.000000000 +0000
-@@ -26,13 +26,14 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: form_driver.3x,v 1.24 2015/08/02 18:21:11 tom Exp $
-+.\" $Id: form_driver.3x,v 1.25 2015/12/05 21:06:26 tom Exp $
- .TH form_driver 3X ""
- .de bP
- .IP \(bu 4
- ..
- .SH NAME
--\fBform_driver\fR \- command-processing loop of the form system
-+\fBform_driver\fR,
-+\fBform_driver_w\fR \- command-processing loop of the form system
- .SH SYNOPSIS
- \fB#include \fR
- .br
-Index: man/form_field_info.3x
-Prereq:  1.12 
---- ncurses-6.0-20151128+/man/form_field_info.3x	2010-12-04 18:40:45.000000000 +0000
-+++ ncurses-6.0-20151205/man/form_field_info.3x	2015-12-05 23:01:16.000000000 +0000
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,10 +27,11 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: form_field_info.3x,v 1.12 2010/12/04 18:40:45 tom Exp $
-+.\" $Id: form_field_info.3x,v 1.13 2015/12/05 23:01:16 tom Exp $
- .TH form_field_info 3X ""
- .SH NAME
--\fBform_field_info\fR \- retrieve field characteristics
-+\fBdynamic_field_info\fP,
-+\fBfield_info\fR \- retrieve field characteristics
- .SH SYNOPSIS
- \fB#include \fR
- .br
-Index: man/form_field_just.3x
-Prereq:  1.11 
---- ncurses-6.0-20151128+/man/form_field_just.3x	2010-12-04 18:40:45.000000000 +0000
-+++ ncurses-6.0-20151205/man/form_field_just.3x	2015-12-05 23:02:59.000000000 +0000
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,10 +27,11 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: form_field_just.3x,v 1.11 2010/12/04 18:40:45 tom Exp $
-+.\" $Id: form_field_just.3x,v 1.12 2015/12/05 23:02:59 tom Exp $
- .TH form_field_just 3X ""
- .SH NAME
--\fBform_field_just\fR \- retrieve field characteristics
-+\fBset_field_just\fR,
-+\fBfield_just\fP \- retrieve field characteristics
- .SH SYNOPSIS
- \fB#include \fR
- .br
-Index: man/form_field_new.3x
-Prereq:  1.18 
---- ncurses-6.0-20151128+/man/form_field_new.3x	2010-12-04 18:40:45.000000000 +0000
-+++ ncurses-6.0-20151205/man/form_field_new.3x	2015-12-05 23:42:45.000000000 +0000
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2007,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,10 +27,13 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: form_field_new.3x,v 1.18 2010/12/04 18:40:45 tom Exp $
-+.\" $Id: form_field_new.3x,v 1.19 2015/12/05 23:42:45 tom Exp $
- .TH form_field_new 3X ""
- .SH NAME
--\fBform_field_new\fR \- create and destroy form fields
-+\fBnew_field\fR,
-+\fBdup_field\fR,
-+\fBlink_field\fR,
-+\fBfree_field\fR \- create and destroy form fields
- .SH SYNOPSIS
- \fB#include \fR
- .br
-Index: man/form_field_opts.3x
-Prereq:  1.19 
---- ncurses-6.0-20151128+/man/form_field_opts.3x	2015-11-28 20:40:13.000000000 +0000
-+++ ncurses-6.0-20151205/man/form_field_opts.3x	2015-12-05 23:53:43.000000000 +0000
-@@ -27,10 +27,13 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: form_field_opts.3x,v 1.19 2015/11/28 20:40:13 tom Exp $
-+.\" $Id: form_field_opts.3x,v 1.20 2015/12/05 23:53:43 tom Exp $
- .TH form_field_opts 3X ""
- .SH NAME
--\fBform_field_opts\fR \- set and get field options
-+\fBset_field_opts\fP,
-+\fBfield_opts_on\fP,
-+\fBfield_opts_off\fP,
-+\fBfield_opts\fP \- set and get field options
- .SH SYNOPSIS
- \fB#include \fR
- .br
-Index: man/form_field_userptr.3x
-Prereq:  1.10 
---- ncurses-6.0-20151128+/man/form_field_userptr.3x	2010-12-04 18:40:45.000000000 +0000
-+++ ncurses-6.0-20151205/man/form_field_userptr.3x	2015-12-05 23:01:56.000000000 +0000
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,10 +27,11 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: form_field_userptr.3x,v 1.10 2010/12/04 18:40:45 tom Exp $
-+.\" $Id: form_field_userptr.3x,v 1.11 2015/12/05 23:01:56 tom Exp $
- .TH form_field_userptr 3X ""
- .SH NAME
--\fBform_field_userptr\fR \- associate application data with a form field
-+\fBset_field_userptr\fR,
-+\fBfield_userptr\fR \- associate application data with a form field
- .SH SYNOPSIS
- \fB#include \fR
- .br
-Index: man/form_new.3x
-Prereq:  1.9 
---- ncurses-6.0-20151128+/man/form_new.3x	2010-12-04 18:40:45.000000000 +0000
-+++ ncurses-6.0-20151205/man/form_new.3x	2015-12-05 23:01:16.000000000 +0000
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,10 +27,11 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: form_new.3x,v 1.9 2010/12/04 18:40:45 tom Exp $
-+.\" $Id: form_new.3x,v 1.10 2015/12/05 23:01:16 tom Exp $
- .TH form_new 3X ""
- .SH NAME
--\fBform_new\fR \- create and destroy forms
-+\fBnew_form\fR,
-+\fBfree_form\fP \- create and destroy forms
- .SH SYNOPSIS
- \fB#include \fR
- .br
-Index: man/form_new_page.3x
-Prereq:  1.10 
---- ncurses-6.0-20151128+/man/form_new_page.3x	2010-12-04 18:40:45.000000000 +0000
-+++ ncurses-6.0-20151205/man/form_new_page.3x	2015-12-05 23:42:45.000000000 +0000
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,10 +27,11 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: form_new_page.3x,v 1.10 2010/12/04 18:40:45 tom Exp $
-+.\" $Id: form_new_page.3x,v 1.11 2015/12/05 23:42:45 tom Exp $
- .TH form_new_page 3X ""
- .SH NAME
--\fBform_new_page\fR \- form pagination functions
-+\fBset_new_page\fR,
-+\fBnew_page\fR \- form pagination functions
- .SH SYNOPSIS
- \fB#include \fR
- .br
-Index: man/form_opts.3x
-Prereq:  1.11 
---- ncurses-6.0-20151128+/man/form_opts.3x	2010-12-04 18:40:45.000000000 +0000
-+++ ncurses-6.0-20151205/man/form_opts.3x	2015-12-05 23:55:51.000000000 +0000
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2007,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,9 +27,12 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: form_opts.3x,v 1.11 2010/12/04 18:40:45 tom Exp $
-+.\" $Id: form_opts.3x,v 1.12 2015/12/05 23:55:51 tom Exp $
- .TH form_opts 3X ""
- .SH NAME
-+\fBset_form_opts\fP,
-+\fBform_opts_on\fP,
-+\fBform_opts_off\fP,
- \fBform_opts\fR \- set and get form options
- .SH SYNOPSIS
- \fB#include \fR
-Index: man/form_post.3x
-Prereq:  1.9 
---- ncurses-6.0-20151128+/man/form_post.3x	2010-12-04 18:40:45.000000000 +0000
-+++ ncurses-6.0-20151205/man/form_post.3x	2015-12-05 20:41:37.000000000 +0000
-@@ -27,10 +27,11 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: form_post.3x,v 1.9 2010/12/04 18:40:45 tom Exp $
-+.\" $Id: form_post.3x,v 1.10 2015/12/05 20:41:37 jmc Exp $
- .TH form_post 3X ""
- .SH NAME
--\fBform_post\fR \- write or erase forms from associated subwindows
-+\fBpost_form\fR,
-+\fBunpost_form\fR \- write or erase forms from associated subwindows
- .SH SYNOPSIS
- \fB#include \fR
- .br
-Index: man/form_requestname.3x
-Prereq:  1.9 
---- ncurses-6.0-20151128+/man/form_requestname.3x	2010-12-04 18:40:45.000000000 +0000
-+++ ncurses-6.0-20151205/man/form_requestname.3x	2015-12-05 23:42:45.000000000 +0000
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,10 +27,11 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: form_requestname.3x,v 1.9 2010/12/04 18:40:45 tom Exp $
-+.\" $Id: form_requestname.3x,v 1.10 2015/12/05 23:42:45 tom Exp $
- .TH form_requestname 3X ""
- .SH NAME
--\fBform_requestname\fR \- handle printable form request names
-+\fBform_request_by_name\fP,
-+\fBform_request_name\fR \- handle printable form request names
- .SH SYNOPSIS
- \fB#include \fR
- .br
-Index: man/form_userptr.3x
-Prereq:  1.13 
---- ncurses-6.0-20151128+/man/form_userptr.3x	2010-12-04 18:40:45.000000000 +0000
-+++ ncurses-6.0-20151205/man/form_userptr.3x	2015-12-05 23:42:45.000000000 +0000
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,9 +27,10 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: form_userptr.3x,v 1.13 2010/12/04 18:40:45 tom Exp $
-+.\" $Id: form_userptr.3x,v 1.14 2015/12/05 23:42:45 tom Exp $
- .TH form_userptr 3X ""
- .SH NAME
-+\fBset_form_userptr\fP,
- \fBform_userptr\fR \- associate application data with a form item
- .SH SYNOPSIS
- \fB#include \fR
-Index: man/menu_attributes.3x
-Prereq:  1.12 
---- ncurses-6.0-20151128+/man/menu_attributes.3x	2010-12-04 18:40:45.000000000 +0000
-+++ ncurses-6.0-20151205/man/menu_attributes.3x	2015-12-05 20:44:42.000000000 +0000
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2008,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,10 +27,17 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: menu_attributes.3x,v 1.12 2010/12/04 18:40:45 tom Exp $
-+.\" $Id: menu_attributes.3x,v 1.13 2015/12/05 20:44:42 jmc Exp $
- .TH menu_attributes 3X ""
- .SH NAME
--\fBmenu_attributes\fR \- color and attribute control for menus
-+\fBmenu_back\fR,
-+\fBmenu_fore\fR,
-+\fBmenu_grey\fR,
-+\fBmenu_pad\fR,
-+\fBset_menu_back\fR,
-+\fBset_menu_fore\fR,
-+\fBset_menu_grey\fR,
-+\fBset_menu_pad\fR \- color and attribute control for menus
- .SH SYNOPSIS
- \fB#include \fR
- .br
-Index: man/menu_cursor.3x
-Prereq:  1.8 
---- ncurses-6.0-20151128+/man/menu_cursor.3x	2010-12-04 18:40:45.000000000 +0000
-+++ ncurses-6.0-20151205/man/menu_cursor.3x	2015-12-05 23:42:45.000000000 +0000
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,10 +27,10 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: menu_cursor.3x,v 1.8 2010/12/04 18:40:45 tom Exp $
-+.\" $Id: menu_cursor.3x,v 1.9 2015/12/05 23:42:45 tom Exp $
- .TH menu_cursor 3X ""
- .SH NAME
--\fBmenu_cursor\fR \- position a menu's cursor
-+\fBpos_menu_cursor\fR \- position a menu's cursor
- .SH SYNOPSIS
- \fB#include \fR
- .br
-Index: man/menu_format.3x
-Prereq:  1.12 
---- ncurses-6.0-20151128+/man/menu_format.3x	2010-12-04 18:40:45.000000000 +0000
-+++ ncurses-6.0-20151205/man/menu_format.3x	2015-12-05 23:01:16.000000000 +0000
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,10 +27,11 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: menu_format.3x,v 1.12 2010/12/04 18:40:45 tom Exp $
-+.\" $Id: menu_format.3x,v 1.13 2015/12/05 23:01:16 tom Exp $
- .TH menu_format 3X ""
- .SH NAME
--\fBmenu_format\fR \- set and get menu sizes
-+\fBset_menu_format\fP,
-+\fBmenu_format\fP \- set and get menu sizes
- .SH SYNOPSIS
- \fB#include \fR
- .br
-Index: man/menu_items.3x
-Prereq:  1.10 
---- ncurses-6.0-20151128+/man/menu_items.3x	2012-11-03 23:03:59.000000000 +0000
-+++ ncurses-6.0-20151205/man/menu_items.3x	2015-12-05 23:47:32.000000000 +0000
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2012,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,10 +27,12 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: menu_items.3x,v 1.10 2012/11/03 23:03:59 tom Exp $
-+.\" $Id: menu_items.3x,v 1.11 2015/12/05 23:47:32 tom Exp $
- .TH menu_items 3X ""
- .SH NAME
--\fBmenu_items\fR \- make and break connections between items and menus
-+\fBset_menu_items\fR,
-+\fBmenu_items\fR,
-+\fBitem_count\fP \- make and break connections between items and menus
- .SH SYNOPSIS
- \fB#include \fR
- .br
-Index: man/menu_mark.3x
-Prereq:  1.11 
---- ncurses-6.0-20151128+/man/menu_mark.3x	2010-12-04 18:40:45.000000000 +0000
-+++ ncurses-6.0-20151205/man/menu_mark.3x	2015-12-05 23:42:45.000000000 +0000
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,9 +27,10 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: menu_mark.3x,v 1.11 2010/12/04 18:40:45 tom Exp $
-+.\" $Id: menu_mark.3x,v 1.12 2015/12/05 23:42:45 tom Exp $
- .TH menu_mark 3X ""
- .SH NAME
-+\fBset_menu_mark\fP,
- \fBmenu_mark\fR \- get and set the menu mark string
- .SH SYNOPSIS
- \fB#include \fR
-Index: man/menu_new.3x
-Prereq:  1.11 
---- ncurses-6.0-20151128+/man/menu_new.3x	2010-12-04 18:40:45.000000000 +0000
-+++ ncurses-6.0-20151205/man/menu_new.3x	2015-12-05 23:42:45.000000000 +0000
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,10 +27,11 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: menu_new.3x,v 1.11 2010/12/04 18:40:45 tom Exp $
-+.\" $Id: menu_new.3x,v 1.12 2015/12/05 23:42:45 tom Exp $
- .TH menu_new 3X ""
- .SH NAME
--\fBmenu_new\fR \- create and destroy menus
-+\fBnew_menu\fP,
-+\fBfree_menu\fR \- create and destroy menus
- .SH SYNOPSIS
- \fB#include \fR
- .br
-Index: man/menu_opts.3x
-Prereq:  1.12 
---- ncurses-6.0-20151128+/man/menu_opts.3x	2010-12-04 18:40:45.000000000 +0000
-+++ ncurses-6.0-20151205/man/menu_opts.3x	2015-12-05 23:42:45.000000000 +0000
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2007,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,9 +27,12 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: menu_opts.3x,v 1.12 2010/12/04 18:40:45 tom Exp $
-+.\" $Id: menu_opts.3x,v 1.13 2015/12/05 23:42:45 tom Exp $
- .TH menu_opts 3X ""
- .SH NAME
-+\fBset_menu_opts\fP,
-+\fBmenu_opts_on\fP,
-+\fBmenu_opts_off\fP,
- \fBmenu_opts\fR \- set and get menu options
- .SH SYNOPSIS
- \fB#include \fR
-Index: man/menu_pattern.3x
-Prereq:  1.13 
---- ncurses-6.0-20151128+/man/menu_pattern.3x	2010-12-04 18:40:45.000000000 +0000
-+++ ncurses-6.0-20151205/man/menu_pattern.3x	2015-12-05 23:42:45.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2008,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -26,10 +26,11 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: menu_pattern.3x,v 1.13 2010/12/04 18:40:45 tom Exp $
-+.\" $Id: menu_pattern.3x,v 1.14 2015/12/05 23:42:45 tom Exp $
- .TH menu_pattern 3X ""
- .SH NAME
--\fBmenu_pattern\fR \- get and set a menu's pattern buffer
-+\fBset_menu_pattern\fP,
-+\fBmenu_pattern\fR \- set and get a menu's pattern buffer
- .SH SYNOPSIS
- \fB#include \fR
- .br
-Index: man/menu_post.3x
-Prereq:  1.11 
---- ncurses-6.0-20151128+/man/menu_post.3x	2010-12-04 18:40:45.000000000 +0000
-+++ ncurses-6.0-20151205/man/menu_post.3x	2015-12-05 23:42:45.000000000 +0000
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,10 +27,11 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: menu_post.3x,v 1.11 2010/12/04 18:40:45 tom Exp $
-+.\" $Id: menu_post.3x,v 1.12 2015/12/05 23:42:45 tom Exp $
- .TH menu_post 3X ""
- .SH NAME
--\fBmenu_post\fR \- write or erase menus from associated subwindows
-+\fBpost_menu\fR,
-+\fBunpost_menu\fR \- write or erase menus from associated subwindows
- .SH SYNOPSIS
- \fB#include \fR
- .br
-Index: man/menu_requestname.3x
-Prereq:  1.9 
---- ncurses-6.0-20151128+/man/menu_requestname.3x	2010-12-04 18:40:45.000000000 +0000
-+++ ncurses-6.0-20151205/man/menu_requestname.3x	2015-12-05 23:42:45.000000000 +0000
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,10 +27,11 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: menu_requestname.3x,v 1.9 2010/12/04 18:40:45 tom Exp $
-+.\" $Id: menu_requestname.3x,v 1.10 2015/12/05 23:42:45 tom Exp $
- .TH menu_requestname 3X ""
- .SH NAME
--\fBmenu_requestname\fR \- handle printable menu request names
-+\fBmenu_request_by_name\fP,
-+\fBmenu_request_name\fR \- handle printable menu request names
- .SH SYNOPSIS
- \fB#include \fR
- .br
-Index: man/menu_spacing.3x
-Prereq:  1.12 
---- ncurses-6.0-20151128+/man/menu_spacing.3x	2010-12-04 18:38:55.000000000 +0000
-+++ ncurses-6.0-20151205/man/menu_spacing.3x	2015-12-05 23:42:45.000000000 +0000
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2004,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,10 +27,11 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: menu_spacing.3x,v 1.12 2010/12/04 18:38:55 tom Exp $
-+.\" $Id: menu_spacing.3x,v 1.13 2015/12/05 23:42:45 tom Exp $
- .TH menu_spacing 3X ""
- .SH NAME
--\fBmenu_spacing\fR \- Control spacing between menu items.
-+\fBset_menu_spacing\fP,
-+\fBmenu_spacing\fR \- set and get spacing between menu items.
- .SH SYNOPSIS
- \fB#include \fR
- .br
-Index: man/menu_userptr.3x
-Prereq:  1.10 
---- ncurses-6.0-20151128+/man/menu_userptr.3x	2010-12-04 18:40:45.000000000 +0000
-+++ ncurses-6.0-20151205/man/menu_userptr.3x	2015-12-05 23:42:45.000000000 +0000
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,9 +27,10 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: menu_userptr.3x,v 1.10 2010/12/04 18:40:45 tom Exp $
-+.\" $Id: menu_userptr.3x,v 1.11 2015/12/05 23:42:45 tom Exp $
- .TH menu_userptr 3X ""
- .SH NAME
-+\fBset_menu_userptr\fP,
- \fBmenu_userptr\fR \- associate application data with a menu item
- .SH SYNOPSIS
- \fB#include \fR
-Index: man/mitem_name.3x
-Prereq:  1.8 
---- ncurses-6.0-20151128+/man/mitem_name.3x	2010-12-04 18:40:45.000000000 +0000
-+++ ncurses-6.0-20151205/man/mitem_name.3x	2015-12-05 23:42:45.000000000 +0000
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,10 +27,11 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: mitem_name.3x,v 1.8 2010/12/04 18:40:45 tom Exp $
-+.\" $Id: mitem_name.3x,v 1.9 2015/12/05 23:42:45 tom Exp $
- .TH mitem_name 3X ""
- .SH NAME
--\fBmitem_name\fR \- get menu item name and description fields
-+\fBitem_name\fR,
-+\fBitem_description\fR \- get menu item name and description fields
- .SH SYNOPSIS
- \fB#include \fR
- .br
-Index: man/mitem_new.3x
-Prereq:  1.12 
---- ncurses-6.0-20151128+/man/mitem_new.3x	2010-12-04 18:40:45.000000000 +0000
-+++ ncurses-6.0-20151205/man/mitem_new.3x	2015-12-05 23:42:45.000000000 +0000
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,10 +27,11 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: mitem_new.3x,v 1.12 2010/12/04 18:40:45 tom Exp $
-+.\" $Id: mitem_new.3x,v 1.13 2015/12/05 23:42:45 tom Exp $
- .TH mitem_new 3X ""
- .SH NAME
--\fBmitem_new\fR \- create and destroy menu items
-+\fBnew_item\fP,
-+\fBfree_item\fR \- create and destroy menu items
- .SH SYNOPSIS
- \fB#include \fR
- .br
-Index: man/mitem_opts.3x
-Prereq:  1.11 
---- ncurses-6.0-20151128+/man/mitem_opts.3x	2010-12-04 18:40:45.000000000 +0000
-+++ ncurses-6.0-20151205/man/mitem_opts.3x	2015-12-05 23:42:45.000000000 +0000
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2007,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,10 +27,13 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: mitem_opts.3x,v 1.11 2010/12/04 18:40:45 tom Exp $
-+.\" $Id: mitem_opts.3x,v 1.12 2015/12/05 23:42:45 tom Exp $
- .TH mitem_opts 3X ""
- .SH NAME
--\fBmitem_opts\fR \- set and get menu item options
-+\fBset_item_opts\fP,
-+\fBitem_opts_on\fP,
-+\fBitem_opts_off\fP,
-+\fBitem_opts\fR \- set and get menu item options
- .SH SYNOPSIS
- \fB#include \fR
- .br
-Index: man/mitem_userptr.3x
-Prereq:  1.11 
---- ncurses-6.0-20151128+/man/mitem_userptr.3x	2010-12-04 18:40:45.000000000 +0000
-+++ ncurses-6.0-20151205/man/mitem_userptr.3x	2015-12-05 23:42:45.000000000 +0000
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,10 +27,11 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: mitem_userptr.3x,v 1.11 2010/12/04 18:40:45 tom Exp $
-+.\" $Id: mitem_userptr.3x,v 1.12 2015/12/05 23:42:45 tom Exp $
- .TH mitem_userptr 3X ""
- .SH NAME
--\fBmitem_userptr\fR \- associate application data with a menu item
-+\fBset_item_userptr\fP,
-+\fBitem_userptr\fR \- associate application data with a menu item
- .SH SYNOPSIS
- \fB#include \fR
- .br
-Index: man/mitem_value.3x
-Prereq:  1.10 
---- ncurses-6.0-20151128+/man/mitem_value.3x	2010-12-04 18:40:45.000000000 +0000
-+++ ncurses-6.0-20151205/man/mitem_value.3x	2015-12-05 23:01:16.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -26,10 +26,11 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: mitem_value.3x,v 1.10 2010/12/04 18:40:45 tom Exp $
-+.\" $Id: mitem_value.3x,v 1.11 2015/12/05 23:01:16 tom Exp $
- .TH mitem_value 3X ""
- .SH NAME
--\fBmitem_value\fR \- set and get menu item values
-+\fBset_item_value\fP,
-+\fBitem_value\fP \- set and get menu item values
- .SH SYNOPSIS
- \fB#include \fR
- .br
-Index: man/panel.3x
-Prereq:  1.18 
---- ncurses-6.0-20151128+/man/panel.3x	2015-04-11 10:23:49.000000000 +0000
-+++ ncurses-6.0-20151205/man/panel.3x	2015-12-05 23:42:45.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2020,2015 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: panel.3x,v 1.18 2015/04/11 10:23:49 tom Exp $
-+.\" $Id: panel.3x,v 1.19 2015/12/05 23:42:45 tom Exp $
- .TH panel 3X ""
- .ds n 5
- .ds d @TERMINFO@
-@@ -37,35 +37,35 @@
- .P
- \fBcc [flags] sourcefiles \-lpanel \-lncurses\fR
- .P
--\fBPANEL *new_panel(WINDOW *win)\fR
-+\fBPANEL *new_panel(WINDOW *win);\fR
- .br
--\fBint bottom_panel(PANEL *pan)\fR
-+\fBint bottom_panel(PANEL *pan);\fR
- .br
--\fBint top_panel(PANEL *pan)\fR
-+\fBint top_panel(PANEL *pan);\fR
- .br
--\fBint show_panel(PANEL *pan)\fR
-+\fBint show_panel(PANEL *pan);\fR
- .br
- \fBvoid update_panels();\fR
- .br
--\fBint hide_panel(PANEL *pan)\fR
-+\fBint hide_panel(PANEL *pan);\fR
- .br
--\fBWINDOW *panel_window(const PANEL *pan)\fR
-+\fBWINDOW *panel_window(const PANEL *pan);\fR
- .br
--\fBint replace_panel(PANEL *pan, WINDOW *window)\fR
-+\fBint replace_panel(PANEL *pan, WINDOW *window);\fR
- .br
--\fBint move_panel(PANEL *pan, int starty, int startx)\fR
-+\fBint move_panel(PANEL *pan, int starty, int startx);\fR
- .br
--\fBint panel_hidden(const PANEL *pan)\fR
-+\fBint panel_hidden(const PANEL *pan);\fR
- .br
--\fBPANEL *panel_above(const PANEL *pan)\fR
-+\fBPANEL *panel_above(const PANEL *pan);\fR
- .br
--\fBPANEL *panel_below(const PANEL *pan)\fR
-+\fBPANEL *panel_below(const PANEL *pan);\fR
- .br
--\fBint set_panel_userptr(PANEL *pan, const void *ptr)\fR
-+\fBint set_panel_userptr(PANEL *pan, const void *ptr);\fR
- .br
--\fBconst void *panel_userptr(const PANEL *pan)\fR
-+\fBconst void *panel_userptr(const PANEL *pan);\fR
- .br
--\fBint del_panel(PANEL *pan)\fR
-+\fBint del_panel(PANEL *pan);\fR
- .br
- .SH DESCRIPTION
- Panels are \fBcurses\fR(3X) windows with the added feature of
-Index: man/term_variables.3x
-Prereq:  1.6 
---- ncurses-6.0-20151128+/man/term_variables.3x	2015-04-22 00:34:49.000000000 +0000
-+++ ncurses-6.0-20151205/man/term_variables.3x	2015-12-05 18:43:25.000000000 +0000
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: term_variables.3x,v 1.6 2015/04/22 00:34:49 tom Exp $
-+.\" $Id: term_variables.3x,v 1.7 2015/12/05 18:43:25 tom Exp $
- .TH term_variables 3X ""
- .ds n 5
- .na
-@@ -56,6 +56,8 @@
- .PP
- \fBchtype acs_map[];\fR
- .sp
-+\fBSCREEN * SP;\fR
-+.sp
- \fBTERMINAL * cur_term;\fR
- .sp
- \fBchar ttytype[];\fR
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20151128+/package/debian-mingw/changelog	2015-11-28 16:31:05.000000000 +0000
-+++ ncurses-6.0-20151205/package/debian-mingw/changelog	2015-12-05 13:22:37.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151128) unstable; urgency=low
-+ncurses6 (6.0+20151205) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 28 Nov 2015 11:31:05 -0500
-+ -- Thomas E. Dickey   Sat, 05 Dec 2015 08:22:37 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20151128+/package/debian-mingw64/changelog	2015-11-28 16:31:05.000000000 +0000
-+++ ncurses-6.0-20151205/package/debian-mingw64/changelog	2015-12-05 13:22:37.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151128) unstable; urgency=low
-+ncurses6 (6.0+20151205) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 28 Nov 2015 11:31:05 -0500
-+ -- Thomas E. Dickey   Sat, 05 Dec 2015 08:22:37 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.0-20151128+/package/debian/changelog	2015-11-28 16:31:05.000000000 +0000
-+++ ncurses-6.0-20151205/package/debian/changelog	2015-12-05 13:22:37.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151128) unstable; urgency=low
-+ncurses6 (6.0+20151205) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 28 Nov 2015 11:31:05 -0500
-+ -- Thomas E. Dickey   Sat, 05 Dec 2015 08:22:37 -0500
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.134 
---- ncurses-6.0-20151128+/package/mingw-ncurses.nsi	2015-11-28 16:31:05.000000000 +0000
-+++ ncurses-6.0-20151205/package/mingw-ncurses.nsi	2015-12-05 13:22:37.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.134 2015/11/28 16:31:05 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.135 2015/12/05 13:22:37 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "0"
- !define VERSION_YYYY  "2015"
--!define VERSION_MMDD  "1128"
-+!define VERSION_MMDD  "1205"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20151128+/package/mingw-ncurses.spec	2015-11-28 16:31:05.000000000 +0000
-+++ ncurses-6.0-20151205/package/mingw-ncurses.spec	2015-12-05 13:22:37.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.0
--Release: 20151128
-+Release: 20151205
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20151128+/package/ncurses.spec	2015-11-28 16:31:05.000000000 +0000
-+++ ncurses-6.0-20151205/package/ncurses.spec	2015-12-05 13:22:37.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.0
--Release: 20151128
-+Release: 20151205
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: test/README
-Prereq:  1.52 
---- ncurses-6.0-20151128+/test/README	2015-07-11 14:17:01.000000000 +0000
-+++ ncurses-6.0-20151205/test/README	2015-12-06 00:38:26.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: README,v 1.52 2015/07/11 14:17:01 tom Exp $
-+-- $Id: README,v 1.53 2015/12/06 00:38:26 tom Exp $
- -------------------------------------------------------------------------------
- 
- The programs in this directory are used to test and demonstrate ncurses.
-@@ -289,7 +289,7 @@
- color_content_sp		-
- color_set			test: color_set ncurses
- copywin				test: ncurses testcurs
--cur_term			test: demo_termcap demo_terminfo dots dots_mvcur lrtest test_vid_puts test_vidputs progs: clear tabs tput tset
-+cur_term			test: demo_termcap demo_terminfo dots dots_mvcur lrtest test_sgr test_vid_puts test_vidputs progs: clear tabs tput tset
- curs_set			test: echochar firework gdc hanoi lrtest ncurses newdemo rain savescreen tclock testcurs worm xmas
- curs_set_sp			lib: ncurses
- curscr				test: demo_panels edit_field knight lrtest ncurses savescreen tclock view
-@@ -300,7 +300,7 @@
- def_shell_mode_sp		lib: ncurses
- define_key			test: demo_altkeys demo_defkey foldkeys
- define_key_sp			-
--del_curterm			test: demo_terminfo
-+del_curterm			test: demo_terminfo test_sgr
- del_curterm_sp			lib: ncurses
- delay_output			test: newdemo
- delay_output_sp			-
-@@ -427,6 +427,7 @@
- killwchar			-
- leaveok				test: hanoi test_opaque
- longname			test: testcurs progs: tput
-+longname_sp			-
- mcprint				-
- mcprint_sp			-
- meta				test: key_names keynames ncurses
-@@ -545,7 +546,7 @@
- noqiflush_sp			-
- noraw				test: demo_forms demo_menus ncurses testcurs
- noraw_sp			lib: ncurses
--notimeout			test: test_opaque
-+notimeout			test: ncurses test_opaque
- numcodes			test: demo_termcap test_arrays progs: dump_entry
- numfnames			test: demo_terminfo test_arrays progs: dump_entry
- numnames			test: demo_termcap demo_terminfo test_arrays progs: dump_entry infocmp
-@@ -559,7 +560,7 @@
- pnoutrefresh			test: edit_field ncurses
- prefresh			test: testcurs
- printw				test: background blue bs color_set demo_altkeys demo_defkey demo_keyok filter foldkeys ncurses savescreen testcurs testscanw view
--putp				progs: tput
-+putp				test: test_sgr progs: tput
- putp_sp				-
- putwin				test: ncurses
- qiflush				-
-@@ -604,7 +605,7 @@
- set_term			lib: ncurses
- setcchar			test: demo_panels ins_wide ncurses test_add_wchstr test_addwstr view
- setscrreg			test: view
--setupterm			test: demo_terminfo dots test_setupterm test_vid_puts test_vidputs progs: clear tabs tput tset
-+setupterm			test: demo_terminfo dots test_setupterm test_sgr test_vid_puts test_vidputs progs: clear tabs tput tset
- slk_attr			-
- slk_attr_off			-
- slk_attr_on			-
-@@ -666,17 +667,17 @@
- tigetflag_sp			-
- tigetnum			test: demo_terminfo ncurses progs: tput
- tigetnum_sp			-
--tigetstr			test: demo_defkey demo_terminfo foldkeys testcurs progs: clear tput
-+tigetstr			test: demo_defkey demo_terminfo foldkeys test_sgr testcurs progs: clear tput
- tigetstr_sp			-
- timeout				test: rain savescreen
- tiparm				-
- touchline			test: chgat clip_printw insdelln
- touchwin			test: chgat clip_printw demo_menus edit_field filter firstlast inch_wide inchs ins_wide insdelln inserts movewindow ncurses redraw savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque xmas
--tparm				test: dots dots_mvcur progs: tabs tic tput
-+tparm				test: dots dots_mvcur test_sgr progs: tabs tic tput
- tputs				test: dots dots_mvcur dots_termcap railroad test_vid_puts test_vidputs progs: clear tabs tset
- tputs_sp			lib: ncurses
- trace				test: demo_menus hashtest lrtest ncurses testcurs view worm
--ttytype				test: demo_terminfo
-+ttytype				test: demo_terminfo test_sgr
- typeahead			test: testcurs
- typeahead_sp			lib: ncurses
- unctrl				test: ncurses redraw test_add_wchstr test_addchstr testcurs
diff --git a/ncurses-6.0-20151212.patch b/ncurses-6.0-20151212.patch
deleted file mode 100644
index 136c0ae..0000000
--- a/ncurses-6.0-20151212.patch
+++ /dev/null
@@ -1,2912 +0,0 @@
-# ncurses 6.0 - patch 20151212 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.0 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.0 can be found at
-# 	ftp://invisible-island.net/ncurses/6.0
-#	http://invisible-mirror.net/archives/ncurses/6.0 
-#
-# ------------------------------------------------------------------------------
-# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20151212.patch.gz
-# patch by Thomas E. Dickey 
-# created  Sun Dec 13 02:17:16 UTC 2015
-# ------------------------------------------------------------------------------
-# NEWS                             |   12 
-# VERSION                          |    2 
-# dist.mk                          |    4 
-# ncurses/tty/tty_update.c         |   24 -
-# ncurses/widechar/lib_wacs.c      |   18 
-# package/debian-mingw/changelog   |    4 
-# package/debian-mingw64/changelog |    4 
-# package/debian/changelog         |    4 
-# package/mingw-ncurses.nsi        |    4 
-# package/mingw-ncurses.spec       |    2 
-# package/ncurses.spec             |    2 
-# test/aclocal.m4                  |   44 +-
-# test/configure                   |  795 ++++++++++++++++++-------------------
-# 13 files changed, 479 insertions(+), 440 deletions(-)
-# ------------------------------------------------------------------------------
-Index: NEWS
-Prereq:  1.2540 
---- ncurses-6.0-20151205+/NEWS	2015-12-05 23:45:23.000000000 +0000
-+++ ncurses-6.0-20151212/NEWS	2015-12-13 01:25:38.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.2540 2015/12/05 23:45:23 tom Exp $
-+-- $Id: NEWS,v 1.2543 2015/12/13 01:25:38 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,16 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20151212
-+	+ improve CF_XOPEN_CURSES macro used in test/configure, to define as
-+	  needed NCURSES_WIDECHAR for platforms where _XOPEN_SOURCE_EXTENDED
-+	  does not work.  Also modified the test program to ensure that if
-+	  building with ncurses, that the cchar_t type is checked, since that
-+	  normally is since 20111030 ifdef'd depending on this test.
-+	+ improve 20121222 workaround for broken acs, letting Solaris "work"
-+	  in spite of its m.isconfigured wcwidth which marks all of the line
-+	  drawing characters as double-width.
-+
- 20151205
- 	+ update form_cursor.3x, form_post.3x, menu_attributes.3x to list
- 	  function names in NAME section (patch by Jason McIntyre).
-Index: VERSION
---- ncurses-6.0-20151205+/VERSION	2015-12-05 13:22:37.000000000 +0000
-+++ ncurses-6.0-20151212/VERSION	2015-12-12 15:23:55.000000000 +0000
-@@ -1 +1 @@
--5:0:9	6.0	20151205
-+5:0:9	6.0	20151212
-Index: dist.mk
-Prereq:  1.1082 
---- ncurses-6.0-20151205+/dist.mk	2015-12-05 13:22:37.000000000 +0000
-+++ ncurses-6.0-20151212/dist.mk	2015-12-12 15:23:55.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1082 2015/12/05 13:22:37 tom Exp $
-+# $Id: dist.mk,v 1.1083 2015/12/12 15:23:55 tom Exp $
- # Makefile for creating ncurses distributions.
- #
- # This only needs to be used directly as a makefile by developers, but
-@@ -37,7 +37,7 @@
- # These define the major/minor/patch versions of ncurses.
- NCURSES_MAJOR = 6
- NCURSES_MINOR = 0
--NCURSES_PATCH = 20151205
-+NCURSES_PATCH = 20151212
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: ncurses/tty/tty_update.c
-Prereq:  1.280 
---- ncurses-6.0-20151205+/ncurses/tty/tty_update.c	2014-08-23 19:25:18.000000000 +0000
-+++ ncurses-6.0-20151212/ncurses/tty/tty_update.c	2015-12-13 00:39:28.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2013,2014 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -82,7 +82,7 @@
- 
- #include 
- 
--MODULE_ID("$Id: tty_update.c,v 1.280 2014/08/23 19:25:18 tom Exp $")
-+MODULE_ID("$Id: tty_update.c,v 1.281 2015/12/13 00:39:28 tom Exp $")
- 
- /*
-  * This define controls the line-breakout optimization.  Every once in a
-@@ -277,15 +277,17 @@
- 	 * character, and uses the wide-character mapping when we expect the
- 	 * normal one to be broken (by mis-design ;-).
- 	 */
--	if (SP_PARM->_screen_acs_fix
--	    && SP_PARM->_screen_acs_map[CharOf(my_ch)]) {
--	    RemAttr(attr, A_ALTCHARSET);
--	    my_ch = _nc_wacs[CharOf(my_ch)];
--	} else if (SP_PARM->_screen_unicode
--		   && !SP_PARM->_screen_acs_map[CharOf(my_ch)]
--		   && _nc_wacs[CharOf(my_ch)].chars[0]) {
--	    RemAttr(attr, A_ALTCHARSET);
--	    my_ch = _nc_wacs[CharOf(my_ch)];
-+	if (SP_PARM->_screen_unicode
-+	    && _nc_wacs[CharOf(my_ch)].chars[0]) {
-+	    if (SP_PARM->_screen_acs_map[CharOf(my_ch)]) {
-+		if (SP_PARM->_screen_acs_fix) {
-+		    RemAttr(attr, A_ALTCHARSET);
-+		    my_ch = _nc_wacs[CharOf(my_ch)];
-+		}
-+	    } else {
-+		RemAttr(attr, A_ALTCHARSET);
-+		my_ch = _nc_wacs[CharOf(my_ch)];
-+	    }
- 	}
- #endif
- 	/*
-Index: ncurses/widechar/lib_wacs.c
-Prereq:  1.14 
---- ncurses-6.0-20151205+/ncurses/widechar/lib_wacs.c	2014-02-23 01:21:08.000000000 +0000
-+++ ncurses-6.0-20151212/ncurses/widechar/lib_wacs.c	2015-12-13 00:56:03.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2002-2013,2014 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2002-2014,2015 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -32,7 +32,7 @@
- 
- #include 
- 
--MODULE_ID("$Id: lib_wacs.c,v 1.14 2014/02/23 01:21:08 tom Exp $")
-+MODULE_ID("$Id: lib_wacs.c,v 1.15 2015/12/13 00:56:03 tom Exp $")
- 
- NCURSES_EXPORT_VAR(cchar_t) * _nc_wacs = 0;
- 
-@@ -125,16 +125,12 @@
- 	    int wide = wcwidth((wchar_t) table[n].value[active]);
- 
- 	    m = table[n].map;
--	    if (active && (wide == 1)) {
--		SetChar(_nc_wacs[m], table[n].value[1], A_NORMAL);
--	    } else if (acs_map[m] & A_ALTCHARSET) {
--		SetChar(_nc_wacs[m], m, A_ALTCHARSET);
--	    } else {
--		SetChar(_nc_wacs[m], table[n].value[0], A_NORMAL);
--	    }
-+	    SetChar(_nc_wacs[m],
-+		    table[n].value[(active && (wide == 1)) ? 1 : 0],
-+		    A_NORMAL);
- 
--	    T(("#%d, SetChar(%c, %#04x) = %s",
--	       n, m,
-+	    T(("#%d, wide:%d SetChar(%c, %#04x) = %s",
-+	       n, wide, m,
- 	       table[n].value[active],
- 	       _tracecchar_t(&_nc_wacs[m])));
- 	}
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20151205+/package/debian-mingw/changelog	2015-12-05 13:22:37.000000000 +0000
-+++ ncurses-6.0-20151212/package/debian-mingw/changelog	2015-12-12 15:23:55.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151205) unstable; urgency=low
-+ncurses6 (6.0+20151212) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 05 Dec 2015 08:22:37 -0500
-+ -- Thomas E. Dickey   Sat, 12 Dec 2015 10:23:55 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20151205+/package/debian-mingw64/changelog	2015-12-05 13:22:37.000000000 +0000
-+++ ncurses-6.0-20151212/package/debian-mingw64/changelog	2015-12-12 15:23:55.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151205) unstable; urgency=low
-+ncurses6 (6.0+20151212) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 05 Dec 2015 08:22:37 -0500
-+ -- Thomas E. Dickey   Sat, 12 Dec 2015 10:23:55 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.0-20151205+/package/debian/changelog	2015-12-05 13:22:37.000000000 +0000
-+++ ncurses-6.0-20151212/package/debian/changelog	2015-12-12 15:23:55.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151205) unstable; urgency=low
-+ncurses6 (6.0+20151212) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 05 Dec 2015 08:22:37 -0500
-+ -- Thomas E. Dickey   Sat, 12 Dec 2015 10:23:55 -0500
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.135 
---- ncurses-6.0-20151205+/package/mingw-ncurses.nsi	2015-12-05 13:22:37.000000000 +0000
-+++ ncurses-6.0-20151212/package/mingw-ncurses.nsi	2015-12-12 15:23:55.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.135 2015/12/05 13:22:37 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.136 2015/12/12 15:23:55 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "0"
- !define VERSION_YYYY  "2015"
--!define VERSION_MMDD  "1205"
-+!define VERSION_MMDD  "1212"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20151205+/package/mingw-ncurses.spec	2015-12-05 13:22:37.000000000 +0000
-+++ ncurses-6.0-20151212/package/mingw-ncurses.spec	2015-12-12 15:23:55.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.0
--Release: 20151205
-+Release: 20151212
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20151205+/package/ncurses.spec	2015-12-05 13:22:37.000000000 +0000
-+++ ncurses-6.0-20151212/package/ncurses.spec	2015-12-12 15:23:55.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.0
--Release: 20151205
-+Release: 20151212
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: test/aclocal.m4
-Prereq:  1.122 
---- ncurses-6.0-20151205+/test/aclocal.m4	2015-10-17 23:06:10.000000000 +0000
-+++ ncurses-6.0-20151212/test/aclocal.m4	2015-12-13 02:14:52.000000000 +0000
-@@ -26,7 +26,7 @@
- dnl authorization.                                                           *
- dnl***************************************************************************
- dnl
--dnl $Id: aclocal.m4,v 1.122 2015/10/17 23:06:10 tom Exp $
-+dnl $Id: aclocal.m4,v 1.124 2015/12/13 02:14:52 tom Exp $
- dnl
- dnl Author: Thomas E. Dickey
- dnl
-@@ -3267,7 +3267,7 @@
- 	[USE_VALGRIND])
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_XOPEN_CURSES version: 11 updated: 2011/01/18 18:15:30
-+dnl CF_XOPEN_CURSES version: 13 updated: 2015/12/12 20:59:52
- dnl ---------------
- dnl Test if we should define X/Open source for curses, needed on Digital Unix
- dnl 4.x, to see the extended functions, but breaks on IRIX 6.x.
-@@ -3277,7 +3277,8 @@
- AC_DEFUN([CF_XOPEN_CURSES],
- [
- AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
--AC_CACHE_CHECK(if we must define _XOPEN_SOURCE_EXTENDED,cf_cv_need_xopen_extension,[
-+AC_CACHE_CHECK(definition to turn on extended curses functions,cf_cv_need_xopen_extension,[
-+cf_cv_need_xopen_extension=unknown
- AC_TRY_LINK([
- #include 
- #include <${cf_cv_ncurses_header:-curses.h}>],[
-@@ -3286,14 +3287,6 @@
- 	make an error
- #endif
- #endif
--	long x = winnstr(stdscr, "", 0);
--	int x1, y1;
--	getbegyx(stdscr, y1, x1)],
--	[cf_cv_need_xopen_extension=no],
--	[AC_TRY_LINK([
--#define _XOPEN_SOURCE_EXTENDED
--#include 
--#include <${cf_cv_ncurses_header:-curses.h}>],[
- #ifdef NCURSES_VERSION
- 	cchar_t check;
- 	int check2 = curs_set((int)sizeof(check));
-@@ -3301,9 +3294,32 @@
- 	long x = winnstr(stdscr, "", 0);
- 	int x1, y1;
- 	getbegyx(stdscr, y1, x1)],
--	[cf_cv_need_xopen_extension=yes],
--	[cf_cv_need_xopen_extension=unknown])])])
--test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
-+	[cf_cv_need_xopen_extension=none],
-+	[
-+	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
-+	do
-+		AC_TRY_LINK([
-+#define $cf_try_xopen_extension 1
-+#include 
-+#include <${cf_cv_ncurses_header:-curses.h}>],[
-+#ifdef NCURSES_VERSION
-+		cchar_t check;
-+		int check2 = curs_set((int)sizeof(check));
-+#endif
-+		long x = winnstr(stdscr, "", 0);
-+		int x1, y1;
-+		getbegyx(stdscr, y1, x1)],
-+		[cf_cv_need_xopen_extension=$cf_try_xopen_extension; break])
-+	done
-+	])
-+])
-+
-+case $cf_cv_need_xopen_extension in
-+(*_*)
-+	CPPFLAGS="$CPPFLAGS -D$cf_cv_need_xopen_extension"
-+	;;
-+esac
-+
- ])dnl
- dnl ---------------------------------------------------------------------------
- dnl CF_XOPEN_SOURCE version: 50 updated: 2015/10/17 19:03:33
-Index: test/configure
---- ncurses-6.0-20151205+/test/configure	2015-10-17 23:06:33.000000000 +0000
-+++ ncurses-6.0-20151212/test/configure	2015-12-13 02:15:08.000000000 +0000
-@@ -13910,14 +13910,15 @@
- 
- fi
- 
--echo "$as_me:13913: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
--echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
-+echo "$as_me:13913: 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
- else
- 
-+cf_cv_need_xopen_extension=unknown
- cat >conftest.$ac_ext <<_ACEOF
--#line 13920 "configure"
-+#line 13921 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -13931,6 +13932,10 @@
- 	make an error
- #endif
- #endif
-+#ifdef NCURSES_VERSION
-+	cchar_t check;
-+	int check2 = curs_set((int)sizeof(check));
-+#endif
- 	long x = winnstr(stdscr, "", 0);
- 	int x1, y1;
- 	getbegyx(stdscr, y1, x1)
-@@ -13939,26 +13944,29 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13942: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13947: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13945: \$? = $ac_status" >&5
-+  echo "$as_me:13950: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13948: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13953: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13951: \$? = $ac_status" >&5
-+  echo "$as_me:13956: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  cf_cv_need_xopen_extension=no
-+  cf_cv_need_xopen_extension=none
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--cat >conftest.$ac_ext <<_ACEOF
--#line 13958 "configure"
-+
-+	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
-+	do
-+		cat >conftest.$ac_ext <<_ACEOF
-+#line 13966 "configure"
- #include "confdefs.h"
- 
--#define _XOPEN_SOURCE_EXTENDED
-+#define $cf_try_xopen_extension 1
- #include 
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -13966,43 +13974,50 @@
- {
- 
- #ifdef NCURSES_VERSION
--	cchar_t check;
--	int check2 = curs_set((int)sizeof(check));
-+		cchar_t check;
-+		int check2 = curs_set((int)sizeof(check));
- #endif
--	long x = winnstr(stdscr, "", 0);
--	int x1, y1;
--	getbegyx(stdscr, y1, x1)
-+		long x = winnstr(stdscr, "", 0);
-+		int x1, y1;
-+		getbegyx(stdscr, y1, x1)
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13980: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13988: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13983: \$? = $ac_status" >&5
-+  echo "$as_me:13991: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13986: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13994: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13989: \$? = $ac_status" >&5
-+  echo "$as_me:13997: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  cf_cv_need_xopen_extension=yes
-+  cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--cf_cv_need_xopen_extension=unknown
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+	done
-+
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
- fi
--echo "$as_me:14001: result: $cf_cv_need_xopen_extension" >&5
-+echo "$as_me:14011: result: $cf_cv_need_xopen_extension" >&5
- echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
--test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
- 
--echo "$as_me:14005: checking for term.h" >&5
-+case $cf_cv_need_xopen_extension in
-+(*_*)
-+	CPPFLAGS="$CPPFLAGS -D$cf_cv_need_xopen_extension"
-+	;;
-+esac
-+
-+echo "$as_me:14020: 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
-@@ -14023,7 +14038,7 @@
- for cf_header in $cf_header_list
- do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 14026 "configure"
-+#line 14041 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -14037,16 +14052,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14040: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14055: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14043: \$? = $ac_status" >&5
-+  echo "$as_me:14058: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14046: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14061: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14049: \$? = $ac_status" >&5
-+  echo "$as_me:14064: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_term_header=$cf_header
- 	 break
-@@ -14065,7 +14080,7 @@
- 	for cf_header in ncurses/term.h ncursesw/term.h
- 	do
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 14068 "configure"
-+#line 14083 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -14083,16 +14098,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14086: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14101: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14089: \$? = $ac_status" >&5
-+  echo "$as_me:14104: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14092: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14107: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14095: \$? = $ac_status" >&5
-+  echo "$as_me:14110: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_term_header=$cf_header
- 			 break
-@@ -14107,7 +14122,7 @@
- esac
- 
- fi
--echo "$as_me:14110: result: $cf_cv_term_header" >&5
-+echo "$as_me:14125: result: $cf_cv_term_header" >&5
- echo "${ECHO_T}$cf_cv_term_header" >&6
- 
- case $cf_cv_term_header in
-@@ -14134,7 +14149,7 @@
- 	;;
- esac
- 
--echo "$as_me:14137: checking for unctrl.h" >&5
-+echo "$as_me:14152: 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
-@@ -14155,7 +14170,7 @@
- for cf_header in $cf_header_list
- do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 14158 "configure"
-+#line 14173 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -14169,16 +14184,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14172: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14187: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14175: \$? = $ac_status" >&5
-+  echo "$as_me:14190: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14178: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14193: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14181: \$? = $ac_status" >&5
-+  echo "$as_me:14196: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_unctrl_header=$cf_header
- 	 break
-@@ -14191,12 +14206,12 @@
- done
- 
- fi
--echo "$as_me:14194: result: $cf_cv_unctrl_header" >&5
-+echo "$as_me:14209: result: $cf_cv_unctrl_header" >&5
- echo "${ECHO_T}$cf_cv_unctrl_header" >&6
- 
- case $cf_cv_unctrl_header in
- (no)
--	{ echo "$as_me:14199: WARNING: unctrl.h header not found" >&5
-+	{ echo "$as_me:14214: WARNING: unctrl.h header not found" >&5
- echo "$as_me: WARNING: unctrl.h header not found" >&2;}
- 	;;
- esac
-@@ -14270,10 +14285,10 @@
- 
- cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
- 
--	echo "$as_me:14273: checking for ${cf_func}" >&5
-+	echo "$as_me:14288: checking for ${cf_func}" >&5
- echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
- 
--echo "${as_me:-configure}:14276: testing ${cf_func} ..." 1>&5
-+echo "${as_me:-configure}:14291: testing ${cf_func} ..." 1>&5
- 
- 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14282,7 +14297,7 @@
- 		eval cf_result='$ac_cv_func_'$cf_func
- 		if test ".$cf_result" != ".no"; then
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 14285 "configure"
-+#line 14300 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -14315,16 +14330,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14318: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14333: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14321: \$? = $ac_status" >&5
-+  echo "$as_me:14336: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14324: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14339: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14327: \$? = $ac_status" >&5
-+  echo "$as_me:14342: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -14340,7 +14355,7 @@
- 
- 	# use the computed/retrieved cache-value:
- 	eval 'cf_result=$cf_cv_func_'$cf_func
--	echo "$as_me:14343: result: $cf_result" >&5
-+	echo "$as_me:14358: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 	if test $cf_result != no; then
- 		cat >>confdefs.h <&5
-+	echo "$as_me:14373: checking for ${cf_func}" >&5
- echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
- 
--echo "${as_me:-configure}:14361: testing ${cf_func} ..." 1>&5
-+echo "${as_me:-configure}:14376: testing ${cf_func} ..." 1>&5
- 
- 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14367,7 +14382,7 @@
- 		eval cf_result='$ac_cv_func_'$cf_func
- 		if test ".$cf_result" != ".no"; then
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 14370 "configure"
-+#line 14385 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -14400,16 +14415,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14403: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14418: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14406: \$? = $ac_status" >&5
-+  echo "$as_me:14421: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14409: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14424: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14412: \$? = $ac_status" >&5
-+  echo "$as_me:14427: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -14425,7 +14440,7 @@
- 
- 	# use the computed/retrieved cache-value:
- 	eval 'cf_result=$cf_cv_func_'$cf_func
--	echo "$as_me:14428: result: $cf_result" >&5
-+	echo "$as_me:14443: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 	if test $cf_result != no; then
- 		cat >>confdefs.h <conftest.$ac_ext <<_ACEOF
--#line 14452 "configure"
-+#line 14467 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -14469,21 +14484,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14472: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14487: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14475: \$? = $ac_status" >&5
-+  echo "$as_me:14490: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14478: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14493: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14481: \$? = $ac_status" >&5
-+  echo "$as_me:14496: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 		test -n "$verbose" && echo "	prototype $cf_ret func($cf_arg value)" 1>&6
- 
--echo "${as_me:-configure}:14486: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
-+echo "${as_me:-configure}:14501: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
- 
- 		cat >>confdefs.h <&5
-+echo "$as_me:14521: checking for ncurses extended functions" >&5
- echo $ECHO_N "checking for ncurses extended functions... $ECHO_C" >&6
- if test "${cf_cv_ncurses_ext_funcs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 14513 "configure"
-+#line 14528 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -14525,16 +14540,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14528: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14543: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14531: \$? = $ac_status" >&5
-+  echo "$as_me:14546: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14534: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14549: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14537: \$? = $ac_status" >&5
-+  echo "$as_me:14552: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_ext_funcs=defined
- else
-@@ -14542,7 +14557,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 14545 "configure"
-+#line 14560 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -14567,16 +14582,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14570: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14585: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14573: \$? = $ac_status" >&5
-+  echo "$as_me:14588: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14576: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14591: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14579: \$? = $ac_status" >&5
-+  echo "$as_me:14594: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_ext_funcs=yes
- else
-@@ -14590,7 +14605,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:14593: result: $cf_cv_ncurses_ext_funcs" >&5
-+echo "$as_me:14608: result: $cf_cv_ncurses_ext_funcs" >&5
- echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6
- test "$cf_cv_ncurses_ext_funcs" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -14604,11 +14619,11 @@
- 	if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
- 	then
- 		cf_define_xpg5=no
--		echo "$as_me:14607: checking if _XPG5 should be defined to enable wide-characters" >&5
-+		echo "$as_me:14622: checking if _XPG5 should be defined to enable wide-characters" >&5
- echo $ECHO_N "checking if _XPG5 should be defined to enable wide-characters... $ECHO_C" >&6
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 14611 "configure"
-+#line 14626 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -14621,16 +14636,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14624: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14639: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14627: \$? = $ac_status" >&5
-+  echo "$as_me:14642: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14630: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14645: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14633: \$? = $ac_status" >&5
-+  echo "$as_me:14648: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -14639,7 +14654,7 @@
- cf_save_cppflags="$CPPFLAGS"
- 			 CPPFLAGS="$CPPFLAGS -D_XPG5"
- 			 cat >conftest.$ac_ext <<_ACEOF
--#line 14642 "configure"
-+#line 14657 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -14652,16 +14667,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14655: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14670: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14658: \$? = $ac_status" >&5
-+  echo "$as_me:14673: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14661: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14676: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14664: \$? = $ac_status" >&5
-+  echo "$as_me:14679: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_define_xpg5=yes
- else
-@@ -14672,7 +14687,7 @@
- 			 CPPFLAGS="$cf_save_cppflags"
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--		echo "$as_me:14675: result: $cf_define_xpg5" >&5
-+		echo "$as_me:14690: result: $cf_define_xpg5" >&5
- echo "${ECHO_T}$cf_define_xpg5" >&6
- 
- 		if test "$cf_define_xpg5" = yes
-@@ -14681,14 +14696,14 @@
- 		fi
- 	fi
- 
--	echo "$as_me:14684: checking for wide-character functions" >&5
-+	echo "$as_me:14699: checking for wide-character functions" >&5
- echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6
- if test "${cf_cv_widechar_funcs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 14691 "configure"
-+#line 14706 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -14705,16 +14720,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14708: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14723: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14711: \$? = $ac_status" >&5
-+  echo "$as_me:14726: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14714: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14729: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14717: \$? = $ac_status" >&5
-+  echo "$as_me:14732: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_widechar_funcs=yes
- else
-@@ -14725,7 +14740,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:14728: result: $cf_cv_widechar_funcs" >&5
-+echo "$as_me:14743: result: $cf_cv_widechar_funcs" >&5
- echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
- 	if test "$cf_cv_widechar_funcs" != no ; then
- 
-@@ -14746,14 +14761,14 @@
- 
- fi
- 
--echo "$as_me:14749: checking if $cf_cv_screen library uses pthreads" >&5
-+echo "$as_me:14764: checking if $cf_cv_screen library uses pthreads" >&5
- echo $ECHO_N "checking if $cf_cv_screen library uses pthreads... $ECHO_C" >&6
- if test "${cf_cv_use_pthreads+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 14756 "configure"
-+#line 14771 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -14771,16 +14786,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14774: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14789: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14777: \$? = $ac_status" >&5
-+  echo "$as_me:14792: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14780: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14795: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14783: \$? = $ac_status" >&5
-+  echo "$as_me:14798: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_use_pthreads=yes
- else
-@@ -14791,20 +14806,20 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:14794: result: $cf_cv_use_pthreads" >&5
-+echo "$as_me:14809: result: $cf_cv_use_pthreads" >&5
- echo "${ECHO_T}$cf_cv_use_pthreads" >&6
- test $cf_cv_use_pthreads = yes && cat >>confdefs.h <<\EOF
- #define USE_PTHREADS 1
- EOF
- 
--echo "$as_me:14800: checking if sys/time.h works with sys/select.h" >&5
-+echo "$as_me:14815: checking if sys/time.h works with sys/select.h" >&5
- echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
- if test "${cf_cv_sys_time_select+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 14807 "configure"
-+#line 14822 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -14824,16 +14839,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14827: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14842: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14830: \$? = $ac_status" >&5
-+  echo "$as_me:14845: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14833: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14848: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14836: \$? = $ac_status" >&5
-+  echo "$as_me:14851: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sys_time_select=yes
- else
-@@ -14845,7 +14860,7 @@
- 
- fi
- 
--echo "$as_me:14848: result: $cf_cv_sys_time_select" >&5
-+echo "$as_me:14863: result: $cf_cv_sys_time_select" >&5
- echo "${ECHO_T}$cf_cv_sys_time_select" >&6
- test "$cf_cv_sys_time_select" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -14854,7 +14869,7 @@
- 
- # special check for test/ditto.c
- 
--echo "$as_me:14857: checking for openpty in -lutil" >&5
-+echo "$as_me:14872: checking for openpty in -lutil" >&5
- echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
- if test "${ac_cv_lib_util_openpty+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14862,7 +14877,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lutil  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14865 "configure"
-+#line 14880 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14881,16 +14896,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14884: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14899: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14887: \$? = $ac_status" >&5
-+  echo "$as_me:14902: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14890: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14905: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14893: \$? = $ac_status" >&5
-+  echo "$as_me:14908: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_util_openpty=yes
- else
-@@ -14901,7 +14916,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:14904: result: $ac_cv_lib_util_openpty" >&5
-+echo "$as_me:14919: result: $ac_cv_lib_util_openpty" >&5
- echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
- if test $ac_cv_lib_util_openpty = yes; then
-   cf_cv_lib_util=yes
-@@ -14909,7 +14924,7 @@
-   cf_cv_lib_util=no
- fi
- 
--echo "$as_me:14912: checking for openpty header" >&5
-+echo "$as_me:14927: checking for openpty header" >&5
- echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
- if test "${cf_cv_func_openpty+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14936,7 +14951,7 @@
- 	for cf_header in pty.h libutil.h util.h
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 14939 "configure"
-+#line 14954 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -14953,16 +14968,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14956: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14971: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14959: \$? = $ac_status" >&5
-+  echo "$as_me:14974: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14962: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14977: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14965: \$? = $ac_status" >&5
-+  echo "$as_me:14980: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 		cf_cv_func_openpty=$cf_header
-@@ -14980,7 +14995,7 @@
- 	LIBS="$cf_save_LIBS"
- 
- fi
--echo "$as_me:14983: result: $cf_cv_func_openpty" >&5
-+echo "$as_me:14998: result: $cf_cv_func_openpty" >&5
- echo "${ECHO_T}$cf_cv_func_openpty" >&6
- 
- if test "$cf_cv_func_openpty" != no ; then
-@@ -15014,7 +15029,7 @@
- 	fi
- fi
- 
--echo "$as_me:15017: checking for function curses_version" >&5
-+echo "$as_me:15032: 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
-@@ -15024,7 +15039,7 @@
-   cf_cv_func_curses_version=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15027 "configure"
-+#line 15042 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -15037,15 +15052,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:15040: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15055: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15043: \$? = $ac_status" >&5
-+  echo "$as_me:15058: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:15045: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15060: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15048: \$? = $ac_status" >&5
-+  echo "$as_me:15063: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_curses_version=yes
- 
-@@ -15060,14 +15075,14 @@
- fi
- rm -f core
- fi
--echo "$as_me:15063: result: $cf_cv_func_curses_version" >&5
-+echo "$as_me:15078: result: $cf_cv_func_curses_version" >&5
- echo "${ECHO_T}$cf_cv_func_curses_version" >&6
- test "$cf_cv_func_curses_version" = yes &&
- cat >>confdefs.h <<\EOF
- #define HAVE_CURSES_VERSION 1
- EOF
- 
--echo "$as_me:15070: checking for alternate character set array" >&5
-+echo "$as_me:15085: checking for alternate character set array" >&5
- echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6
- if test "${cf_cv_curses_acs_map+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15077,7 +15092,7 @@
- for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 15080 "configure"
-+#line 15095 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -15093,16 +15108,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15096: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15111: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15099: \$? = $ac_status" >&5
-+  echo "$as_me:15114: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15102: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15117: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15105: \$? = $ac_status" >&5
-+  echo "$as_me:15120: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_curses_acs_map=$name; break
- else
-@@ -15113,7 +15128,7 @@
- done
- 
- fi
--echo "$as_me:15116: result: $cf_cv_curses_acs_map" >&5
-+echo "$as_me:15131: result: $cf_cv_curses_acs_map" >&5
- echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
- 
- test "$cf_cv_curses_acs_map" != unknown &&
-@@ -15123,7 +15138,7 @@
- 
- if test "$cf_enable_widec" = yes; then
- 
--echo "$as_me:15126: checking for wide alternate character set array" >&5
-+echo "$as_me:15141: checking for wide alternate character set array" >&5
- echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6
- if test "${cf_cv_curses_wacs_map+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15133,7 +15148,7 @@
- 	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 15136 "configure"
-+#line 15151 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -15149,16 +15164,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15152: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15167: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15155: \$? = $ac_status" >&5
-+  echo "$as_me:15170: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15158: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15173: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15161: \$? = $ac_status" >&5
-+  echo "$as_me:15176: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_curses_wacs_map=$name
- 	 break
-@@ -15169,7 +15184,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	done
- fi
--echo "$as_me:15172: result: $cf_cv_curses_wacs_map" >&5
-+echo "$as_me:15187: result: $cf_cv_curses_wacs_map" >&5
- echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
- 
- test "$cf_cv_curses_wacs_map" != unknown &&
-@@ -15177,7 +15192,7 @@
- #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
- EOF
- 
--echo "$as_me:15180: checking for wide alternate character constants" >&5
-+echo "$as_me:15195: checking for wide alternate character constants" >&5
- echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6
- if test "${cf_cv_curses_wacs_symbols+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15187,7 +15202,7 @@
- if test "$cf_cv_curses_wacs_map" != unknown
- then
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 15190 "configure"
-+#line 15205 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -15204,16 +15219,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15207: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15222: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15210: \$? = $ac_status" >&5
-+  echo "$as_me:15225: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15213: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15228: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15216: \$? = $ac_status" >&5
-+  echo "$as_me:15231: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_curses_wacs_symbols=yes
- else
-@@ -15223,7 +15238,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- else
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 15226 "configure"
-+#line 15241 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -15239,16 +15254,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15242: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15257: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15245: \$? = $ac_status" >&5
-+  echo "$as_me:15260: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15248: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15263: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15251: \$? = $ac_status" >&5
-+  echo "$as_me:15266: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_curses_wacs_symbols=yes
- else
-@@ -15259,7 +15274,7 @@
- fi
- 
- fi
--echo "$as_me:15262: result: $cf_cv_curses_wacs_symbols" >&5
-+echo "$as_me:15277: result: $cf_cv_curses_wacs_symbols" >&5
- echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
- 
- test "$cf_cv_curses_wacs_symbols" != no &&
-@@ -15269,10 +15284,10 @@
- 
- fi
- 
--echo "$as_me:15272: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:15287: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
- echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 15275 "configure"
-+#line 15290 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -15290,16 +15305,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15293: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15308: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15296: \$? = $ac_status" >&5
-+  echo "$as_me:15311: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15299: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15314: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15302: \$? = $ac_status" >&5
-+  echo "$as_me:15317: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -15308,7 +15323,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:15311: result: $cf_result" >&5
-+echo "$as_me:15326: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- if test $cf_result = yes ; then
- 
-@@ -15329,14 +15344,14 @@
- if test "$cf_enable_widec" = yes; then
- 
- # This is needed on Tru64 5.0 to declare mbstate_t
--echo "$as_me:15332: checking if we must include wchar.h to declare mbstate_t" >&5
-+echo "$as_me:15347: 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_mbstate_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 15339 "configure"
-+#line 15354 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -15354,23 +15369,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15357: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15372: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15360: \$? = $ac_status" >&5
-+  echo "$as_me:15375: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15363: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15378: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15366: \$? = $ac_status" >&5
-+  echo "$as_me:15381: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_mbstate_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 15373 "configure"
-+#line 15388 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -15389,16 +15404,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15392: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15407: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15395: \$? = $ac_status" >&5
-+  echo "$as_me:15410: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15398: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15413: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15401: \$? = $ac_status" >&5
-+  echo "$as_me:15416: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_mbstate_t=yes
- else
-@@ -15410,7 +15425,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:15413: result: $cf_cv_mbstate_t" >&5
-+echo "$as_me:15428: result: $cf_cv_mbstate_t" >&5
- echo "${ECHO_T}$cf_cv_mbstate_t" >&6
- 
- if test "$cf_cv_mbstate_t" = yes ; then
-@@ -15433,14 +15448,14 @@
- fi
- 
- # This is needed on Tru64 5.0 to declare wchar_t
--echo "$as_me:15436: checking if we must include wchar.h to declare wchar_t" >&5
-+echo "$as_me:15451: checking if we must include wchar.h to declare wchar_t" >&5
- echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
- if test "${cf_cv_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 15443 "configure"
-+#line 15458 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -15458,23 +15473,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15461: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15476: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15464: \$? = $ac_status" >&5
-+  echo "$as_me:15479: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15467: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15482: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15470: \$? = $ac_status" >&5
-+  echo "$as_me:15485: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 15477 "configure"
-+#line 15492 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -15493,16 +15508,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15496: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15511: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15499: \$? = $ac_status" >&5
-+  echo "$as_me:15514: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15502: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15517: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15505: \$? = $ac_status" >&5
-+  echo "$as_me:15520: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_t=yes
- else
-@@ -15514,7 +15529,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:15517: result: $cf_cv_wchar_t" >&5
-+echo "$as_me:15532: result: $cf_cv_wchar_t" >&5
- echo "${ECHO_T}$cf_cv_wchar_t" >&6
- 
- if test "$cf_cv_wchar_t" = yes ; then
-@@ -15537,14 +15552,14 @@
- fi
- 
- # This is needed on Tru64 5.0 to declare wint_t
--echo "$as_me:15540: checking if we must include wchar.h to declare wint_t" >&5
-+echo "$as_me:15555: checking if we must include wchar.h to declare wint_t" >&5
- echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
- if test "${cf_cv_wint_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 15547 "configure"
-+#line 15562 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -15562,23 +15577,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15565: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15580: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15568: \$? = $ac_status" >&5
-+  echo "$as_me:15583: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15571: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15586: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15574: \$? = $ac_status" >&5
-+  echo "$as_me:15589: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wint_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 15581 "configure"
-+#line 15596 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -15597,16 +15612,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15600: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15615: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15603: \$? = $ac_status" >&5
-+  echo "$as_me:15618: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15606: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15621: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15609: \$? = $ac_status" >&5
-+  echo "$as_me:15624: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wint_t=yes
- else
-@@ -15618,7 +15633,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:15621: result: $cf_cv_wint_t" >&5
-+echo "$as_me:15636: result: $cf_cv_wint_t" >&5
- echo "${ECHO_T}$cf_cv_wint_t" >&6
- 
- if test "$cf_cv_wint_t" = yes ; then
-@@ -15642,10 +15657,10 @@
- 
- 	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
- 
--echo "$as_me:15645: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:15660: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
- echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 15648 "configure"
-+#line 15663 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -15663,16 +15678,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15666: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15681: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15669: \$? = $ac_status" >&5
-+  echo "$as_me:15684: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15672: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15687: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15675: \$? = $ac_status" >&5
-+  echo "$as_me:15690: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -15681,7 +15696,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:15684: result: $cf_result" >&5
-+echo "$as_me:15699: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- if test $cf_result = yes ; then
- 
-@@ -15703,10 +15718,10 @@
- 
- 	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
- 
--echo "$as_me:15706: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:15721: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
- echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 15709 "configure"
-+#line 15724 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -15724,16 +15739,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15727: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15742: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15730: \$? = $ac_status" >&5
-+  echo "$as_me:15745: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15733: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15748: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15736: \$? = $ac_status" >&5
-+  echo "$as_me:15751: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -15742,7 +15757,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:15745: result: $cf_result" >&5
-+echo "$as_me:15760: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- if test $cf_result = yes ; then
- 
-@@ -15764,10 +15779,10 @@
- 
- 	if test "$NCURSES_OK_WINT_T" = 0 ; then
- 
--echo "$as_me:15767: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:15782: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
- echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 15770 "configure"
-+#line 15785 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -15785,16 +15800,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15788: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15803: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15791: \$? = $ac_status" >&5
-+  echo "$as_me:15806: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15794: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15809: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15797: \$? = $ac_status" >&5
-+  echo "$as_me:15812: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -15803,7 +15818,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:15806: result: $cf_result" >&5
-+echo "$as_me:15821: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- if test $cf_result = yes ; then
- 
-@@ -15824,11 +15839,11 @@
- 	fi
- fi
- 
--echo "$as_me:15827: checking for data ospeed declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:15842: checking for data ospeed declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
- echo $ECHO_N "checking for data ospeed declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 15831 "configure"
-+#line 15846 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -15856,16 +15871,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15859: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15874: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15862: \$? = $ac_status" >&5
-+  echo "$as_me:15877: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15865: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15880: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15868: \$? = $ac_status" >&5
-+  echo "$as_me:15883: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -15874,7 +15889,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:15877: result: $cf_result" >&5
-+echo "$as_me:15892: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 
- if test $cf_result = yes ; then
-@@ -15886,14 +15901,14 @@
- EOF
- 
- else
--	echo "$as_me:15889: checking for data ospeed in library" >&5
-+	echo "$as_me:15904: checking for data ospeed in library" >&5
- echo $ECHO_N "checking for data ospeed in library... $ECHO_C" >&6
- 	# BSD linkers insist on making weak linkage, but resolve at runtime.
- 	if test "$cross_compiling" = yes; then
- 
- 	# cross-compiling
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 15896 "configure"
-+#line 15911 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -15926,16 +15941,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15929: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15944: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15932: \$? = $ac_status" >&5
-+  echo "$as_me:15947: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15935: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15950: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15938: \$? = $ac_status" >&5
-+  echo "$as_me:15953: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -15947,7 +15962,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15950 "configure"
-+#line 15965 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -15973,15 +15988,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:15976: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15991: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15979: \$? = $ac_status" >&5
-+  echo "$as_me:15994: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:15981: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15996: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15984: \$? = $ac_status" >&5
-+  echo "$as_me:15999: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -15992,7 +16007,7 @@
- fi
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--	echo "$as_me:15995: result: $cf_result" >&5
-+	echo "$as_me:16010: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 	if test $cf_result = yes ; then
- 
-@@ -16005,11 +16020,11 @@
- 	fi
- fi
- 
--echo "$as_me:16008: checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:16023: checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
- echo $ECHO_N "checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16012 "configure"
-+#line 16027 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -16037,16 +16052,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16040: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16055: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16043: \$? = $ac_status" >&5
-+  echo "$as_me:16058: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16046: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16061: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16049: \$? = $ac_status" >&5
-+  echo "$as_me:16064: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -16055,7 +16070,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:16058: result: $cf_result" >&5
-+echo "$as_me:16073: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 
- if test $cf_result = yes ; then
-@@ -16067,14 +16082,14 @@
- EOF
- 
- else
--	echo "$as_me:16070: checking for data boolnames in library" >&5
-+	echo "$as_me:16085: checking for data boolnames in library" >&5
- echo $ECHO_N "checking for data boolnames in library... $ECHO_C" >&6
- 	# BSD linkers insist on making weak linkage, but resolve at runtime.
- 	if test "$cross_compiling" = yes; then
- 
- 	# cross-compiling
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16077 "configure"
-+#line 16092 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -16107,16 +16122,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16110: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16125: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16113: \$? = $ac_status" >&5
-+  echo "$as_me:16128: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16116: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16131: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16119: \$? = $ac_status" >&5
-+  echo "$as_me:16134: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -16128,7 +16143,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16131 "configure"
-+#line 16146 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -16154,15 +16169,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16157: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16172: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16160: \$? = $ac_status" >&5
-+  echo "$as_me:16175: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16162: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16177: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16165: \$? = $ac_status" >&5
-+  echo "$as_me:16180: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -16173,7 +16188,7 @@
- fi
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--	echo "$as_me:16176: result: $cf_result" >&5
-+	echo "$as_me:16191: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 	if test $cf_result = yes ; then
- 
-@@ -16186,11 +16201,11 @@
- 	fi
- fi
- 
--echo "$as_me:16189: checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:16204: checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
- echo $ECHO_N "checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16193 "configure"
-+#line 16208 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -16218,16 +16233,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16221: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16236: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16224: \$? = $ac_status" >&5
-+  echo "$as_me:16239: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16227: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16242: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16230: \$? = $ac_status" >&5
-+  echo "$as_me:16245: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -16236,7 +16251,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:16239: result: $cf_result" >&5
-+echo "$as_me:16254: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 
- if test $cf_result = yes ; then
-@@ -16248,14 +16263,14 @@
- EOF
- 
- else
--	echo "$as_me:16251: checking for data boolfnames in library" >&5
-+	echo "$as_me:16266: checking for data boolfnames in library" >&5
- echo $ECHO_N "checking for data boolfnames in library... $ECHO_C" >&6
- 	# BSD linkers insist on making weak linkage, but resolve at runtime.
- 	if test "$cross_compiling" = yes; then
- 
- 	# cross-compiling
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16258 "configure"
-+#line 16273 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -16288,16 +16303,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16291: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16306: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16294: \$? = $ac_status" >&5
-+  echo "$as_me:16309: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16297: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16312: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16300: \$? = $ac_status" >&5
-+  echo "$as_me:16315: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -16309,7 +16324,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16312 "configure"
-+#line 16327 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -16335,15 +16350,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16338: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16353: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16341: \$? = $ac_status" >&5
-+  echo "$as_me:16356: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16343: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16358: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16346: \$? = $ac_status" >&5
-+  echo "$as_me:16361: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -16354,7 +16369,7 @@
- fi
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--	echo "$as_me:16357: result: $cf_result" >&5
-+	echo "$as_me:16372: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 	if test $cf_result = yes ; then
- 
-@@ -16369,7 +16384,7 @@
- 
- if ( test "$GCC" = yes || test "$GXX" = yes )
- then
--echo "$as_me:16372: checking if you want to turn on gcc warnings" >&5
-+echo "$as_me:16387: 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.
-@@ -16386,7 +16401,7 @@
- 	with_warnings=no
- 
- fi;
--echo "$as_me:16389: result: $with_warnings" >&5
-+echo "$as_me:16404: result: $with_warnings" >&5
- echo "${ECHO_T}$with_warnings" >&6
- if test "$with_warnings" = "yes"
- then
-@@ -16409,10 +16424,10 @@
- EOF
- if test "$GCC" = yes
- then
--	{ echo "$as_me:16412: checking for $CC __attribute__ directives..." >&5
-+	{ echo "$as_me:16427: checking for $CC __attribute__ directives..." >&5
- echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
- cat > conftest.$ac_ext <&5
-+		if { (eval echo "$as_me:16479: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16467: \$? = $ac_status" >&5
-+  echo "$as_me:16482: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:16469: result: ... $cf_attribute" >&5
-+			test -n "$verbose" && echo "$as_me:16484: result: ... $cf_attribute" >&5
- echo "${ECHO_T}... $cf_attribute" >&6
- 			cat conftest.h >>confdefs.h
- 			case $cf_attribute in
-@@ -16530,12 +16545,12 @@
- if test "$GCC" = yes ; then
- 	case $host_os in
- 	(linux*|gnu*)
--		echo "$as_me:16533: checking if this is really Intel C compiler" >&5
-+		echo "$as_me:16548: 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 16538 "configure"
-+#line 16553 "configure"
- #include "confdefs.h"
- 
- int
-@@ -16552,16 +16567,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16555: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16570: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16558: \$? = $ac_status" >&5
-+  echo "$as_me:16573: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16561: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16576: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16564: \$? = $ac_status" >&5
-+  echo "$as_me:16579: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   INTEL_COMPILER=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -we147"
-@@ -16572,7 +16587,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		CFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:16575: result: $INTEL_COMPILER" >&5
-+		echo "$as_me:16590: result: $INTEL_COMPILER" >&5
- echo "${ECHO_T}$INTEL_COMPILER" >&6
- 		;;
- 	esac
-@@ -16581,12 +16596,12 @@
- CLANG_COMPILER=no
- 
- if test "$GCC" = yes ; then
--	echo "$as_me:16584: checking if this is really Clang C compiler" >&5
-+	echo "$as_me:16599: 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 16589 "configure"
-+#line 16604 "configure"
- #include "confdefs.h"
- 
- int
-@@ -16603,16 +16618,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16606: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16621: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16609: \$? = $ac_status" >&5
-+  echo "$as_me:16624: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16612: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16627: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16615: \$? = $ac_status" >&5
-+  echo "$as_me:16630: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   CLANG_COMPILER=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
-@@ -16623,12 +16638,12 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	CFLAGS="$cf_save_CFLAGS"
--	echo "$as_me:16626: result: $CLANG_COMPILER" >&5
-+	echo "$as_me:16641: result: $CLANG_COMPILER" >&5
- echo "${ECHO_T}$CLANG_COMPILER" >&6
- fi
- 
- cat > conftest.$ac_ext <&5
-+	{ echo "$as_me:16663: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS="-Wall"
-@@ -16661,12 +16676,12 @@
- 		wd981
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:16664: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:16679: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16667: \$? = $ac_status" >&5
-+  echo "$as_me:16682: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:16669: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:16684: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
- 		fi
-@@ -16675,7 +16690,7 @@
- 
- elif test "$GCC" = yes
- then
--	{ echo "$as_me:16678: checking for $CC warning options..." >&5
-+	{ echo "$as_me:16693: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS=
-@@ -16699,12 +16714,12 @@
- 		Wundef $cf_gcc_warnings $cf_warn_CONST
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:16702: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:16717: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16705: \$? = $ac_status" >&5
-+  echo "$as_me:16720: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:16707: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:16722: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			case $cf_opt in
- 			(Wcast-qual)
-@@ -16715,7 +16730,7 @@
- 				([34].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:16718: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:16733: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -16725,7 +16740,7 @@
- 				([12].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:16728: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:16743: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -16741,7 +16756,7 @@
- fi
- fi
- 
--echo "$as_me:16744: checking if you want to use dmalloc for testing" >&5
-+echo "$as_me:16759: 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.
-@@ -16758,7 +16773,7 @@
- else
-   with_dmalloc=
- fi;
--echo "$as_me:16761: result: ${with_dmalloc:-no}" >&5
-+echo "$as_me:16776: result: ${with_dmalloc:-no}" >&5
- echo "${ECHO_T}${with_dmalloc:-no}" >&6
- 
- case .$with_cflags in
-@@ -16852,23 +16867,23 @@
- esac
- 
- if test "$with_dmalloc" = yes ; then
--	echo "$as_me:16855: checking for dmalloc.h" >&5
-+	echo "$as_me:16870: 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 16861 "configure"
-+#line 16876 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:16865: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:16880: \"$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:16871: \$? = $ac_status" >&5
-+  echo "$as_me:16886: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -16887,11 +16902,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:16890: result: $ac_cv_header_dmalloc_h" >&5
-+echo "$as_me:16905: 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:16894: checking for dmalloc_debug in -ldmalloc" >&5
-+echo "$as_me:16909: 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
-@@ -16899,7 +16914,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 16902 "configure"
-+#line 16917 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -16918,16 +16933,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16921: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16936: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16924: \$? = $ac_status" >&5
-+  echo "$as_me:16939: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16927: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16942: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16930: \$? = $ac_status" >&5
-+  echo "$as_me:16945: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dmalloc_dmalloc_debug=yes
- else
-@@ -16938,7 +16953,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:16941: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
-+echo "$as_me:16956: 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 <&5
-+echo "$as_me:16971: 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.
-@@ -16970,7 +16985,7 @@
- else
-   with_dbmalloc=
- fi;
--echo "$as_me:16973: result: ${with_dbmalloc:-no}" >&5
-+echo "$as_me:16988: result: ${with_dbmalloc:-no}" >&5
- echo "${ECHO_T}${with_dbmalloc:-no}" >&6
- 
- case .$with_cflags in
-@@ -17064,23 +17079,23 @@
- esac
- 
- if test "$with_dbmalloc" = yes ; then
--	echo "$as_me:17067: checking for dbmalloc.h" >&5
-+	echo "$as_me:17082: 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 17073 "configure"
-+#line 17088 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:17077: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:17092: \"$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:17083: \$? = $ac_status" >&5
-+  echo "$as_me:17098: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -17099,11 +17114,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:17102: result: $ac_cv_header_dbmalloc_h" >&5
-+echo "$as_me:17117: 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:17106: checking for debug_malloc in -ldbmalloc" >&5
-+echo "$as_me:17121: 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
-@@ -17111,7 +17126,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldbmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 17114 "configure"
-+#line 17129 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -17130,16 +17145,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17133: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17148: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17136: \$? = $ac_status" >&5
-+  echo "$as_me:17151: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17139: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17154: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17142: \$? = $ac_status" >&5
-+  echo "$as_me:17157: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dbmalloc_debug_malloc=yes
- else
-@@ -17150,7 +17165,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:17153: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
-+echo "$as_me:17168: 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 <&5
-+echo "$as_me:17183: checking if you want to use valgrind for testing" >&5
- echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
- 
- # Check whether --with-valgrind or --without-valgrind was given.
-@@ -17182,7 +17197,7 @@
- else
-   with_valgrind=
- fi;
--echo "$as_me:17185: result: ${with_valgrind:-no}" >&5
-+echo "$as_me:17200: result: ${with_valgrind:-no}" >&5
- echo "${ECHO_T}${with_valgrind:-no}" >&6
- 
- case .$with_cflags in
-@@ -17275,7 +17290,7 @@
- 	;;
- esac
- 
--echo "$as_me:17278: checking if you want to perform memory-leak testing" >&5
-+echo "$as_me:17293: checking if you want to perform memory-leak testing" >&5
- echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
- 
- # Check whether --enable-leaks or --disable-leaks was given.
-@@ -17285,7 +17300,7 @@
- else
-   : ${with_no_leaks:=no}
- fi;
--echo "$as_me:17288: result: $with_no_leaks" >&5
-+echo "$as_me:17303: result: $with_no_leaks" >&5
- echo "${ECHO_T}$with_no_leaks" >&6
- 
- if test "$with_no_leaks" = yes ; then
-@@ -17301,7 +17316,7 @@
- fi
- 
- LD_RPATH_OPT=
--echo "$as_me:17304: checking for an rpath option" >&5
-+echo "$as_me:17319: checking for an rpath option" >&5
- echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
- case $cf_cv_system_name in
- (irix*)
-@@ -17332,12 +17347,12 @@
- (*)
- 	;;
- esac
--echo "$as_me:17335: result: $LD_RPATH_OPT" >&5
-+echo "$as_me:17350: result: $LD_RPATH_OPT" >&5
- echo "${ECHO_T}$LD_RPATH_OPT" >&6
- 
- case "x$LD_RPATH_OPT" in
- (x-R*)
--	echo "$as_me:17340: checking if we need a space after rpath option" >&5
-+	echo "$as_me:17355: 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"
- 
-@@ -17358,7 +17373,7 @@
- LIBS="$cf_add_libs"
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 17361 "configure"
-+#line 17376 "configure"
- #include "confdefs.h"
- 
- int
-@@ -17370,16 +17385,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17373: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17388: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17376: \$? = $ac_status" >&5
-+  echo "$as_me:17391: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17379: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17394: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17382: \$? = $ac_status" >&5
-+  echo "$as_me:17397: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_rpath_space=no
- else
-@@ -17389,13 +17404,13 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	LIBS="$cf_save_LIBS"
--	echo "$as_me:17392: result: $cf_rpath_space" >&5
-+	echo "$as_me:17407: 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:17398: checking if rpath-hack should be disabled" >&5
-+echo "$as_me:17413: 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.
-@@ -17412,21 +17427,21 @@
- 	cf_disable_rpath_hack=no
- 
- fi;
--echo "$as_me:17415: result: $cf_disable_rpath_hack" >&5
-+echo "$as_me:17430: 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:17419: checking for updated LDFLAGS" >&5
-+echo "$as_me:17434: 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:17422: result: maybe" >&5
-+	echo "$as_me:17437: 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:17429: checking for $ac_word" >&5
-+echo "$as_me:17444: 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
-@@ -17441,7 +17456,7 @@
-   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:17444: found $ac_dir/$ac_word" >&5
-+echo "$as_me:17459: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -17449,10 +17464,10 @@
- fi
- cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
- if test -n "$cf_ldd_prog"; then
--  echo "$as_me:17452: result: $cf_ldd_prog" >&5
-+  echo "$as_me:17467: result: $cf_ldd_prog" >&5
- echo "${ECHO_T}$cf_ldd_prog" >&6
- else
--  echo "$as_me:17455: result: no" >&5
-+  echo "$as_me:17470: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -17466,7 +17481,7 @@
- 		cf_rpath_oops=
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17469 "configure"
-+#line 17484 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -17478,16 +17493,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17481: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17496: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17484: \$? = $ac_status" >&5
-+  echo "$as_me:17499: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17487: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17502: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17490: \$? = $ac_status" >&5
-+  echo "$as_me:17505: \$? = $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`
-@@ -17515,7 +17530,7 @@
- 					then
- 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
- 
--echo "${as_me:-configure}:17518: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
-+echo "${as_me:-configure}:17533: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
- 
- 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
- 						break
-@@ -17527,11 +17542,11 @@
- 
- 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:17530: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:17545: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
- 
- test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:17534: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:17549: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
- 
- cf_rpath_dst=
- for cf_rpath_src in $LDFLAGS
-@@ -17568,7 +17583,7 @@
- 			then
- 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
- 
--echo "${as_me:-configure}:17571: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
-+echo "${as_me:-configure}:17586: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
- 
- 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
- 			fi
-@@ -17581,11 +17596,11 @@
- 
- test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:17584: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:17599: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
- 
- test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
- 
--echo "${as_me:-configure}:17588: testing ...checking LIBS $LIBS ..." 1>&5
-+echo "${as_me:-configure}:17603: testing ...checking LIBS $LIBS ..." 1>&5
- 
- cf_rpath_dst=
- for cf_rpath_src in $LIBS
-@@ -17622,7 +17637,7 @@
- 			then
- 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
- 
--echo "${as_me:-configure}:17625: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
-+echo "${as_me:-configure}:17640: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
- 
- 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
- 			fi
-@@ -17635,14 +17650,14 @@
- 
- test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
- 
--echo "${as_me:-configure}:17638: testing ...checked LIBS $LIBS ..." 1>&5
-+echo "${as_me:-configure}:17653: testing ...checked LIBS $LIBS ..." 1>&5
- 
- 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:17642: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:17657: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
- 
- else
--	echo "$as_me:17645: result: no" >&5
-+	echo "$as_me:17660: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -17732,7 +17747,7 @@
- : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ echo "$as_me:17735: creating $CONFIG_STATUS" >&5
-+{ echo "$as_me:17750: creating $CONFIG_STATUS" >&5
- echo "$as_me: creating $CONFIG_STATUS" >&6;}
- cat >$CONFIG_STATUS <<_ACEOF
- #! $SHELL
-@@ -17908,7 +17923,7 @@
-     echo "$ac_cs_version"; exit 0 ;;
-   --he | --h)
-     # Conflict between --help and --header
--    { { echo "$as_me:17911: error: ambiguous option: $1
-+    { { echo "$as_me:17926: 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;}
-@@ -17927,7 +17942,7 @@
-     ac_need_defaults=false;;
- 
-   # This is an error.
--  -*) { { echo "$as_me:17930: error: unrecognized option: $1
-+  -*) { { echo "$as_me:17945: 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;}
-@@ -17977,7 +17992,7 @@
-   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-   "ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ncurses_cfg.h:ncurses_tst.hin" ;;
--  *) { { echo "$as_me:17980: error: invalid argument: $ac_config_target" >&5
-+  *) { { echo "$as_me:17995: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
-@@ -18268,7 +18283,7 @@
-   esac
- 
-   if test x"$ac_file" != x-; then
--    { echo "$as_me:18271: creating $ac_file" >&5
-+    { echo "$as_me:18286: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
-     rm -f "$ac_file"
-   fi
-@@ -18286,7 +18301,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:18289: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:18304: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -18299,7 +18314,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:18302: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:18317: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -18315,7 +18330,7 @@
-       if test -n "$ac_seen"; then
-         ac_used=`grep '@datarootdir@' $ac_item`
-         if test -z "$ac_used"; then
--          { echo "$as_me:18318: WARNING: datarootdir was used implicitly but not set:
-+          { echo "$as_me:18333: 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;}
-@@ -18324,7 +18339,7 @@
-       fi
-       ac_seen=`grep '${datarootdir}' $ac_item`
-       if test -n "$ac_seen"; then
--        { echo "$as_me:18327: WARNING: datarootdir was used explicitly but not set:
-+        { echo "$as_me:18342: 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;}
-@@ -18361,7 +18376,7 @@
-             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:18364: WARNING: Variable $ac_name is used but was not set:
-+              { echo "$as_me:18379: 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;}
-@@ -18372,7 +18387,7 @@
-     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:18375: WARNING: Some variables may not be substituted:
-+      { echo "$as_me:18390: WARNING: Some variables may not be substituted:
- $ac_seen" >&5
- echo "$as_me: WARNING: Some variables may not be substituted:
- $ac_seen" >&2;}
-@@ -18421,7 +18436,7 @@
-   * )   ac_file_in=$ac_file.in ;;
-   esac
- 
--  test x"$ac_file" != x- && { echo "$as_me:18424: creating $ac_file" >&5
-+  test x"$ac_file" != x- && { echo "$as_me:18439: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
- 
-   # First look for the input files in the build tree, otherwise in the
-@@ -18432,7 +18447,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:18435: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:18450: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -18445,7 +18460,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:18448: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:18463: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -18503,7 +18518,7 @@
-   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:18506: $ac_file is unchanged" >&5
-+      { echo "$as_me:18521: $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/ncurses-6.0-20151219.patch b/ncurses-6.0-20151219.patch
deleted file mode 100644
index 5a2e9c0..0000000
--- a/ncurses-6.0-20151219.patch
+++ /dev/null
@@ -1,9098 +0,0 @@
-# ncurses 6.0 - patch 20151219 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.0 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.0 can be found at
-# 	ftp://invisible-island.net/ncurses/6.0
-#	http://invisible-mirror.net/archives/ncurses/6.0 
-#
-# ------------------------------------------------------------------------------
-# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20151219.patch.gz
-# patch by Thomas E. Dickey 
-# created  Sun Dec 20 02:44:39 UTC 2015
-# ------------------------------------------------------------------------------
-# NEWS                             |   12 
-# VERSION                          |    2 
-# aclocal.m4                       |  187 ++
-# configure                        | 2559 +++++++++++++++++++------------------
-# configure.in                     |   10 
-# dist.mk                          |    4 
-# doc/html/man/curs_attr.3x.html   |    4 
-# include/curses.h.in              |   11 
-# man/curs_attr.3x                 |    4 
-# man/curs_getch.3x                |   14 
-# ncurses/base/lib_screen.c        |    4 
-# ncurses/tty/tty_update.c         |   87 +
-# ncurses/widechar/lib_wacs.c      |    6 
-# package/debian-mingw/changelog   |    4 
-# package/debian-mingw64/changelog |    4 
-# package/debian/changelog         |    4 
-# package/mingw-ncurses.nsi        |    4 
-# package/mingw-ncurses.spec       |    2 
-# package/ncurses.spec             |    2 
-# 19 files changed, 1663 insertions(+), 1261 deletions(-)
-# ------------------------------------------------------------------------------
-Index: NEWS
-Prereq:  1.2543 
---- ncurses-6.0-20151212+/NEWS	2015-12-13 01:25:38.000000000 +0000
-+++ ncurses-6.0-20151219/NEWS	2015-12-20 02:03:35.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.2543 2015/12/13 01:25:38 tom Exp $
-+-- $Id: NEWS,v 1.2547 2015/12/20 02:03:35 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,14 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20151219
-+	+ add a paragraph to curs_getch.3x discussing key naming (discussion
-+	  with James Crippen).
-+	+ amend workaround for Solaris vs line-drawing to take the configure
-+	  check into account.
-+	+ add a configure check for wcwidth() versus the ncurses line-drawing
-+	  characters, to use in special-casing systems such as Solaris.
-+
- 20151212
- 	+ improve CF_XOPEN_CURSES macro used in test/configure, to define as
- 	  needed NCURSES_WIDECHAR for platforms where _XOPEN_SOURCE_EXTENDED
-@@ -52,7 +60,7 @@
- 	  building with ncurses, that the cchar_t type is checked, since that
- 	  normally is since 20111030 ifdef'd depending on this test.
- 	+ improve 20121222 workaround for broken acs, letting Solaris "work"
--	  in spite of its m.isconfigured wcwidth which marks all of the line
-+	  in spite of its misconfigured wcwidth which marks all of the line
- 	  drawing characters as double-width.
- 
- 20151205
-Index: VERSION
---- ncurses-6.0-20151212+/VERSION	2015-12-12 15:23:55.000000000 +0000
-+++ ncurses-6.0-20151219/VERSION	2015-12-13 14:53:53.000000000 +0000
-@@ -1 +1 @@
--5:0:9	6.0	20151212
-+5:0:9	6.0	20151219
-Index: aclocal.m4
-Prereq:  1.785 
---- ncurses-6.0-20151212+/aclocal.m4	2015-11-08 01:03:06.000000000 +0000
-+++ ncurses-6.0-20151219/aclocal.m4	2015-12-19 22:52:18.000000000 +0000
-@@ -28,7 +28,7 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: aclocal.m4,v 1.785 2015/11/08 01:03:06 tom Exp $
-+dnl $Id: aclocal.m4,v 1.786 2015/12/19 22:52:18 tom Exp $
- dnl Macros used in NCURSES auto-configuration script.
- dnl
- dnl These macros are maintained separately from NCURSES.  The copyright on
-@@ -1013,6 +1013,149 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
-+dnl CF_CHECK_WCWIDTH_GRAPHICS version: 1 updated: 2015/12/19 17:47:56
-+dnl -------------------------
-+dnl Most "modern" terminal emulators are based to some degree on VT100, and
-+dnl should support line-drawing.  Even with Unicode.  There is a problem.
-+dnl
-+dnl While most of the VT100 graphics characters were incorporated into Unicode,
-+dnl all of those were combined into a page of useful graphics characters.
-+dnl
-+dnl So far, so good.
-+dnl
-+dnl However, while they are useful, there are other considerations.  CJK
-+dnl is (because of poor device resolution) often rendered as double-width
-+dnl characters.  So... for these generally-useful characters, what should
-+dnl be the width (to make them consistent with adjacent characters)?
-+dnl
-+dnl The obvious choice would have been to make this locale-dependent, and use
-+dnl wcwidth() to tell applications what the actual width is.  That was too
-+dnl obvious.  Instead, we have a slew of "ambiguous-width" characters.
-+dnl See for example
-+dnl		http://www.unicode.org/reports/tr11/tr11-29.html
-+dnl		http://www.cl.cam.ac.uk/~mgk25/ucs/scw-proposal.html
-+dnl
-+dnl The EastAsianWidth-6.2.0.txt file from the Unicode organization lists
-+dnl more than 22,000 characters, with 1281 of those as ambiguous-width.  For
-+dnl instance, it lists half (44/96) of the Latin-1 characters as
-+dnl ambiguous-width.  Also, all of the box-characters at 0x2500 are ambiguous.
-+dnl
-+dnl What this means for the implementor is that on some systems wcwidth() can
-+dnl give bad advice.  On Solaris, some of the ambiguous widths are returned as
-+dnl 1 (the Latin-1 characters), while others are returned as 2 (line-drawing
-+dnl characters).  These do not necessarily match the behavior of the terminal
-+dnl emulator.  xterm, for instance, does an optional startup check to find if
-+dnl this problem (or similar) exists with the system's locale tables, rejecting
-+dnl them if they are too unreliable.
-+AC_DEFUN([CF_CHECK_WCWIDTH_GRAPHICS],[
-+AC_CACHE_CHECK(if wcwidth agrees graphics are single-width, cf_cv_wcwidth_graphics,[
-+cat >conftest.in <
-+#include 
-+#include 
-+
-+#define MY_LEN 80
-+
-+int
-+main(void)
-+{
-+	FILE *fp;
-+	int value;
-+	char buffer[MY_LEN + 1];
-+	char notes[MY_LEN + 1];
-+	int totals = 0;
-+	int passed = 0;
-+
-+	if (setlocale(LC_ALL, "en_US.UTF8") ||
-+		setlocale(LC_ALL, "en_US.UTF-8") ||
-+		setlocale(LC_ALL, "en_US.utf8") ||
-+		setlocale(LC_ALL, "en_US.utf-8")) {
-+		if ((fp = fopen("conftest.in", "r")) != 0) {
-+			while (fgets(buffer, MY_LEN, fp) != 0) {
-+				if (*buffer == '-') {
-+					fprintf(stderr, "\t%s", buffer);
-+				} else if (sscanf(buffer, "%x %s", &value, notes) == 2) {
-+					++totals;
-+					if (wcwidth(value) == 1)
-+						++passed;
-+					fprintf(stderr, "%d\t%s", wcwidth(value), buffer);
-+				} else {
-+					fprintf(stderr, "?\t%s", buffer);
-+				}
-+			}
-+		}
-+	}
-+	fprintf(stderr, "%d/%d passed wcwidth/graphics check\n", passed, totals);
-+	return (totals == passed) ? 0 : 1;
-+}
-+],
-+[cf_cv_wcwidth_graphics=yes],
-+[cf_cv_wcwidth_graphics=no],
-+[cf_cv_wcwidth_graphics=unknown])
-+])
-+])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_CLANG_COMPILER version: 2 updated: 2013/11/19 19:23:35
- dnl -----------------
- dnl Check if the given compiler is really clang.  clang's C driver defines
-@@ -4832,6 +4975,26 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
-+dnl CF_NCURSES_WITH_ABI_VERSION version: 2 updated: 2015/12/19 17:51:52
-+dnl ---------------------------
-+dnl Allow ncurses's ABI to be overridden.  Generally this happens when a
-+dnl packager has incremented the ABI past that used in the original package,
-+dnl and wishes to keep doing this.
-+dnl
-+dnl $1 is the package name, if any, to derive a corresponding {package}_ABI
-+dnl symbol.
-+AC_DEFUN([CF_NCURSES_WITH_ABI_VERSION],[
-+CF_WITH_ABI_VERSION($1)
-+if test "x$cf_cv_abi_version" != "x$with_abi_version"
-+then
-+	case $cf_cv_rel_version in
-+	(5.*)
-+		cf_cv_rel_version=$with_abi_version.0
-+		;;
-+	esac
-+fi
-+])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_NO_LEAKS_OPTION version: 6 updated: 2015/04/12 15:39:00
- dnl ------------------
- dnl see CF_WITH_NO_LEAKS
-@@ -6881,28 +7044,6 @@
- ])
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_NCURSES_WITH_ABI_VERSION version: 1 updated: 2015/06/06 13:49:58
--dnl ---------------------------
--dnl CF_WITH_ABI_VERSION version: 1 updated: 2003/09/20 18:12:49
--dnl -------------------
--dnl Allow ncurses's ABI to be overridden.  Generally this happens when a
--dnl packager has incremented the ABI past that used in the original package,
--dnl and wishes to keep doing this.
--dnl
--dnl $1 is the package name, if any, to derive a corresponding {package}_ABI
--dnl symbol.
--AC_DEFUN([CF_NCURSES_WITH_ABI_VERSION],[
--CF_WITH_ABI_VERSION($1)
--if test "x$cf_cv_abi_version" != "x$with_abi_version"
--then
--	case $cf_cv_rel_version in
--	(5.*)
--		cf_cv_rel_version=$with_abi_version.0
--		;;
--	esac
--fi
--])dnl
--dnl ---------------------------------------------------------------------------
- dnl CF_WITH_ADA_COMPILER version: 2 updated: 2010/06/26 17:35:58
- dnl --------------------
- dnl Command-line option to specify the Ada95 compiler.
-Index: configure
---- ncurses-6.0-20151212+/configure	2015-11-08 01:06:42.000000000 +0000
-+++ ncurses-6.0-20151219/configure	2015-12-20 02:07:50.000000000 +0000
-@@ -1,5 +1,5 @@
- #! /bin/sh
--# From configure.in Revision: 1.623 .
-+# From configure.in Revision: 1.625 .
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by Autoconf 2.52.20150926.
- #
-@@ -9242,6 +9242,9 @@
- fi;
- echo "$as_me:9243: result: $with_widec" >&5
- echo "${ECHO_T}$with_widec" >&6
-+
-+NCURSES_WCWIDTH_GRAPHICS=1
-+
- if test "x$with_widec" = xyes ; then
- 	if test "x$disable_lib_suffixes" = xno ; then
- 		LIB_SUFFIX="w${LIB_SUFFIX}"
-@@ -9255,14 +9258,14 @@
- #define NCURSES_WIDECHAR 1
- EOF
- 
--echo "$as_me:9258: checking if wchar.h can be used as is" >&5
-+echo "$as_me:9261: checking if wchar.h can be used as is" >&5
- echo $ECHO_N "checking if wchar.h can be used as is... $ECHO_C" >&6
- if test "${cf_cv_wchar_h_okay+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 9265 "configure"
-+#line 9268 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -9279,16 +9282,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9282: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9285: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9285: \$? = $ac_status" >&5
-+  echo "$as_me:9288: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9288: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9291: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9291: \$? = $ac_status" >&5
-+  echo "$as_me:9294: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_h_okay=yes
- else
-@@ -9298,16 +9301,16 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:9301: result: $cf_cv_wchar_h_okay" >&5
-+echo "$as_me:9304: result: $cf_cv_wchar_h_okay" >&5
- echo "${ECHO_T}$cf_cv_wchar_h_okay" >&6
- 
- if test $cf_cv_wchar_h_okay = no
- then
- 
--echo "$as_me:9307: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
-+echo "$as_me:9310: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
- echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 9310 "configure"
-+#line 9313 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -9323,16 +9326,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9326: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9329: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9329: \$? = $ac_status" >&5
-+  echo "$as_me:9332: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9332: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9335: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9335: \$? = $ac_status" >&5
-+  echo "$as_me:9338: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=no
- else
-@@ -9341,16 +9344,16 @@
- cf_result=yes
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:9344: result: $cf_result" >&5
-+echo "$as_me:9347: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 
- if test "$cf_result" = yes ; then
- 	CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
- elif test "x" != "x" ; then
--	echo "$as_me:9350: checking checking for compatible value versus " >&5
-+	echo "$as_me:9353: checking checking for compatible value versus " >&5
- echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9353 "configure"
-+#line 9356 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -9366,16 +9369,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9369: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9372: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9372: \$? = $ac_status" >&5
-+  echo "$as_me:9375: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9375: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9378: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9378: \$? = $ac_status" >&5
-+  echo "$as_me:9381: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -9384,7 +9387,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:9387: result: $cf_result" >&5
-+	echo "$as_me:9390: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 	if test "$cf_result" = no ; then
- 		# perhaps we can override it - try...
-@@ -9394,19 +9397,160 @@
- 
- fi
- 
-+echo "$as_me:9400: checking if wcwidth agrees graphics are single-width" >&5
-+echo $ECHO_N "checking if wcwidth agrees graphics are single-width... $ECHO_C" >&6
-+if test "${cf_cv_wcwidth_graphics+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+cat >conftest.in <conftest.$ac_ext <<_ACEOF
-+#line 9471 "configure"
-+#include "confdefs.h"
-+
-+#include 
-+#include 
-+#include 
-+
-+#define MY_LEN 80
-+
-+int
-+main(void)
-+{
-+	FILE *fp;
-+	int value;
-+	char buffer[MY_LEN + 1];
-+	char notes[MY_LEN + 1];
-+	int totals = 0;
-+	int passed = 0;
-+
-+	if (setlocale(LC_ALL, "en_US.UTF8") ||
-+		setlocale(LC_ALL, "en_US.UTF-8") ||
-+		setlocale(LC_ALL, "en_US.utf8") ||
-+		setlocale(LC_ALL, "en_US.utf-8")) {
-+		if ((fp = fopen("conftest.in", "r")) != 0) {
-+			while (fgets(buffer, MY_LEN, fp) != 0) {
-+				if (*buffer == '-') {
-+					fprintf(stderr, "\t%s", buffer);
-+				} else if (sscanf(buffer, "%x %s", &value, notes) == 2) {
-+					++totals;
-+					if (wcwidth(value) == 1)
-+						++passed;
-+					fprintf(stderr, "%d\t%s", wcwidth(value), buffer);
-+				} else {
-+					fprintf(stderr, "?\t%s", buffer);
-+				}
-+			}
-+		}
-+	}
-+	fprintf(stderr, "%d/%d passed wcwidth/graphics check\n", passed, totals);
-+	return (totals == passed) ? 0 : 1;
-+}
-+
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:9515: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:9518: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+  { (eval echo "$as_me:9520: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:9523: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  cf_cv_wcwidth_graphics=yes
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+cf_cv_wcwidth_graphics=no
-+fi
-+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+fi
-+echo "$as_me:9536: result: $cf_cv_wcwidth_graphics" >&5
-+echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
-+
-+	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
-+
- 	# with_overwrite=no
- 	NCURSES_CH_T=cchar_t
- 
- for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:9403: checking for $ac_func" >&5
-+echo "$as_me:9547: 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 9409 "configure"
-+#line 9553 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -9437,16 +9581,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9440: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9584: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9443: \$? = $ac_status" >&5
-+  echo "$as_me:9587: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9446: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9590: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9449: \$? = $ac_status" >&5
-+  echo "$as_me:9593: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -9456,7 +9600,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:9459: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:9603: 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 <&5
-+echo "$as_me:9615: 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
-@@ -9476,7 +9620,7 @@
- 
- 	cf_save_LIBS="$LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9479 "configure"
-+#line 9623 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -9489,16 +9633,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9492: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9636: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9495: \$? = $ac_status" >&5
-+  echo "$as_me:9639: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9498: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9642: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9501: \$? = $ac_status" >&5
-+  echo "$as_me:9645: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_utf8_lib=yes
- else
-@@ -9510,12 +9654,12 @@
- cf_cv_header_path_utf8=
- cf_cv_library_path_utf8=
- 
--echo "${as_me:-configure}:9513: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:9657: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
- 
- cf_save_LIBS="$LIBS"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 9518 "configure"
-+#line 9662 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -9528,16 +9672,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9531: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9675: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9534: \$? = $ac_status" >&5
-+  echo "$as_me:9678: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9537: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9681: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9540: \$? = $ac_status" >&5
-+  echo "$as_me:9684: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_find_linkage_utf8=yes
-@@ -9551,7 +9695,7 @@
- LIBS="-lutf8  $cf_save_LIBS"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 9554 "configure"
-+#line 9698 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -9564,16 +9708,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9567: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9711: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9570: \$? = $ac_status" >&5
-+  echo "$as_me:9714: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9573: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9717: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9576: \$? = $ac_status" >&5
-+  echo "$as_me:9720: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_find_linkage_utf8=yes
-@@ -9590,9 +9734,9 @@
- 
- 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
- 
--echo "${as_me:-configure}:9593: testing find linkage for utf8 library ..." 1>&5
-+echo "${as_me:-configure}:9737: testing find linkage for utf8 library ..." 1>&5
- 
--echo "${as_me:-configure}:9595: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:9739: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
- 
- 	cf_save_CPPFLAGS="$CPPFLAGS"
- 	cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -9683,11 +9827,11 @@
- 		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}:9686: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9830: 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 9690 "configure"
-+#line 9834 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -9700,21 +9844,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9703: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9847: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9706: \$? = $ac_status" >&5
-+  echo "$as_me:9850: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9709: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9853: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9712: \$? = $ac_status" >&5
-+  echo "$as_me:9856: \$? = $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}:9717: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9861: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
- 
- 				cf_cv_find_linkage_utf8=maybe
- 				cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -9732,7 +9876,7 @@
- 
- 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
- 
--echo "${as_me:-configure}:9735: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:9879: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
- 
- 		cf_save_LIBS="$LIBS"
- 		cf_save_LDFLAGS="$LDFLAGS"
-@@ -9807,13 +9951,13 @@
- 				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}:9810: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9954: 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 9816 "configure"
-+#line 9960 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -9826,21 +9970,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9829: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9973: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9832: \$? = $ac_status" >&5
-+  echo "$as_me:9976: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9835: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9979: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9838: \$? = $ac_status" >&5
-+  echo "$as_me:9982: \$? = $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}:9843: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9987: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
- 
- 					cf_cv_find_linkage_utf8=yes
- 					cf_cv_library_file_utf8="-lutf8"
-@@ -9882,7 +10026,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:9885: result: $cf_cv_utf8_lib" >&5
-+echo "$as_me:10029: 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
-@@ -9917,7 +10061,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 9920 "configure"
-+#line 10064 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -9929,16 +10073,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9932: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10076: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9935: \$? = $ac_status" >&5
-+  echo "$as_me:10079: \$? = $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:10082: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9941: \$? = $ac_status" >&5
-+  echo "$as_me:10085: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -9955,7 +10099,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:9958: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:10102: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -9991,7 +10135,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:9994: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:10138: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -10023,14 +10167,14 @@
- 	fi
- 
- # This is needed on Tru64 5.0 to declare mbstate_t
--echo "$as_me:10026: checking if we must include wchar.h to declare mbstate_t" >&5
-+echo "$as_me:10170: 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_mbstate_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 10033 "configure"
-+#line 10177 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10048,23 +10192,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10051: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10195: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10054: \$? = $ac_status" >&5
-+  echo "$as_me:10198: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10057: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10201: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10060: \$? = $ac_status" >&5
-+  echo "$as_me:10204: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_mbstate_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 10067 "configure"
-+#line 10211 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10083,16 +10227,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10086: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10230: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10089: \$? = $ac_status" >&5
-+  echo "$as_me:10233: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10092: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10236: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10095: \$? = $ac_status" >&5
-+  echo "$as_me:10239: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_mbstate_t=yes
- else
-@@ -10104,7 +10248,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:10107: result: $cf_cv_mbstate_t" >&5
-+echo "$as_me:10251: result: $cf_cv_mbstate_t" >&5
- echo "${ECHO_T}$cf_cv_mbstate_t" >&6
- 
- if test "$cf_cv_mbstate_t" = yes ; then
-@@ -10122,14 +10266,14 @@
- fi
- 
- # This is needed on Tru64 5.0 to declare wchar_t
--echo "$as_me:10125: checking if we must include wchar.h to declare wchar_t" >&5
-+echo "$as_me:10269: checking if we must include wchar.h to declare wchar_t" >&5
- echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
- if test "${cf_cv_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 10132 "configure"
-+#line 10276 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10147,23 +10291,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10150: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10294: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10153: \$? = $ac_status" >&5
-+  echo "$as_me:10297: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10156: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10300: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10159: \$? = $ac_status" >&5
-+  echo "$as_me:10303: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 10166 "configure"
-+#line 10310 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10182,16 +10326,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10185: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10329: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10188: \$? = $ac_status" >&5
-+  echo "$as_me:10332: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10191: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10335: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10194: \$? = $ac_status" >&5
-+  echo "$as_me:10338: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_t=yes
- else
-@@ -10203,7 +10347,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:10206: result: $cf_cv_wchar_t" >&5
-+echo "$as_me:10350: result: $cf_cv_wchar_t" >&5
- echo "${ECHO_T}$cf_cv_wchar_t" >&6
- 
- if test "$cf_cv_wchar_t" = yes ; then
-@@ -10226,14 +10370,14 @@
- fi
- 
- # This is needed on Tru64 5.0 to declare wint_t
--echo "$as_me:10229: checking if we must include wchar.h to declare wint_t" >&5
-+echo "$as_me:10373: checking if we must include wchar.h to declare wint_t" >&5
- echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
- if test "${cf_cv_wint_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 10236 "configure"
-+#line 10380 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10251,23 +10395,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10254: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10398: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10257: \$? = $ac_status" >&5
-+  echo "$as_me:10401: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10260: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10404: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10263: \$? = $ac_status" >&5
-+  echo "$as_me:10407: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wint_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 10270 "configure"
-+#line 10414 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10286,16 +10430,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10289: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10433: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10292: \$? = $ac_status" >&5
-+  echo "$as_me:10436: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10295: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10439: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10298: \$? = $ac_status" >&5
-+  echo "$as_me:10442: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wint_t=yes
- else
-@@ -10307,7 +10451,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:10310: result: $cf_cv_wint_t" >&5
-+echo "$as_me:10454: result: $cf_cv_wint_t" >&5
- echo "${ECHO_T}$cf_cv_wint_t" >&6
- 
- if test "$cf_cv_wint_t" = yes ; then
-@@ -10339,7 +10483,7 @@
- fi
- 
- ###   use option --disable-lp64 to allow long chtype
--echo "$as_me:10342: checking whether to enable _LP64 definition in curses.h" >&5
-+echo "$as_me:10486: checking whether to enable _LP64 definition in curses.h" >&5
- echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6
- 
- # Check whether --enable-lp64 or --disable-lp64 was given.
-@@ -10349,7 +10493,7 @@
- else
-   with_lp64=$cf_dft_with_lp64
- fi;
--echo "$as_me:10352: result: $with_lp64" >&5
-+echo "$as_me:10496: result: $with_lp64" >&5
- echo "${ECHO_T}$with_lp64" >&6
- 
- if test "x$with_lp64" = xyes ; then
-@@ -10365,7 +10509,7 @@
- fi;
- if test "$enable_largefile" != no; then
- 
--  echo "$as_me:10368: checking for special C compiler options needed for large files" >&5
-+  echo "$as_me:10512: 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
-@@ -10377,7 +10521,7 @@
-      	 # 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 10380 "configure"
-+#line 10524 "configure"
- #include "confdefs.h"
- #include 
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10397,16 +10541,16 @@
- }
- _ACEOF
-      	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10400: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10544: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10403: \$? = $ac_status" >&5
-+  echo "$as_me:10547: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10406: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10550: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10409: \$? = $ac_status" >&5
-+  echo "$as_me:10553: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10416,16 +10560,16 @@
- rm -f conftest.$ac_objext
-      	 CC="$CC -n32"
-      	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10419: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10563: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10422: \$? = $ac_status" >&5
-+  echo "$as_me:10566: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10425: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10569: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10428: \$? = $ac_status" >&5
-+  echo "$as_me:10572: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_largefile_CC=' -n32'; break
- else
-@@ -10439,13 +10583,13 @@
-        rm -f conftest.$ac_ext
-     fi
- fi
--echo "$as_me:10442: result: $ac_cv_sys_largefile_CC" >&5
-+echo "$as_me:10586: 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:10448: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-+  echo "$as_me:10592: 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
-@@ -10453,7 +10597,7 @@
-   while :; do
-   ac_cv_sys_file_offset_bits=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10456 "configure"
-+#line 10600 "configure"
- #include "confdefs.h"
- #include 
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10473,16 +10617,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10476: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10620: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10479: \$? = $ac_status" >&5
-+  echo "$as_me:10623: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10482: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10626: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10485: \$? = $ac_status" >&5
-+  echo "$as_me:10629: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10491,7 +10635,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10494 "configure"
-+#line 10638 "configure"
- #include "confdefs.h"
- #define _FILE_OFFSET_BITS 64
- #include 
-@@ -10512,16 +10656,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10515: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10659: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10518: \$? = $ac_status" >&5
-+  echo "$as_me:10662: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10521: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10665: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10524: \$? = $ac_status" >&5
-+  echo "$as_me:10668: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_file_offset_bits=64; break
- else
-@@ -10532,7 +10676,7 @@
-   break
- done
- fi
--echo "$as_me:10535: result: $ac_cv_sys_file_offset_bits" >&5
-+echo "$as_me:10679: 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
- 
-@@ -10542,7 +10686,7 @@
- 
- fi
- rm -rf conftest*
--  echo "$as_me:10545: checking for _LARGE_FILES value needed for large files" >&5
-+  echo "$as_me:10689: 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
-@@ -10550,7 +10694,7 @@
-   while :; do
-   ac_cv_sys_large_files=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10553 "configure"
-+#line 10697 "configure"
- #include "confdefs.h"
- #include 
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10570,16 +10714,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10573: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10717: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10576: \$? = $ac_status" >&5
-+  echo "$as_me:10720: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10579: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10723: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10582: \$? = $ac_status" >&5
-+  echo "$as_me:10726: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10588,7 +10732,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10591 "configure"
-+#line 10735 "configure"
- #include "confdefs.h"
- #define _LARGE_FILES 1
- #include 
-@@ -10609,16 +10753,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10612: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10756: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10615: \$? = $ac_status" >&5
-+  echo "$as_me:10759: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10618: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10762: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10621: \$? = $ac_status" >&5
-+  echo "$as_me:10765: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_large_files=1; break
- else
-@@ -10629,7 +10773,7 @@
-   break
- done
- fi
--echo "$as_me:10632: result: $ac_cv_sys_large_files" >&5
-+echo "$as_me:10776: 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
- 
-@@ -10642,7 +10786,7 @@
- fi
- 
- 	if test "$enable_largefile" != no ; then
--	echo "$as_me:10645: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-+	echo "$as_me:10789: 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
-@@ -10650,7 +10794,7 @@
-   while :; do
-   ac_cv_sys_largefile_source=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10653 "configure"
-+#line 10797 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -10662,16 +10806,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10665: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10809: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10668: \$? = $ac_status" >&5
-+  echo "$as_me:10812: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10671: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10815: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10674: \$? = $ac_status" >&5
-+  echo "$as_me:10818: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10680,7 +10824,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10683 "configure"
-+#line 10827 "configure"
- #include "confdefs.h"
- #define _LARGEFILE_SOURCE 1
- #include 
-@@ -10693,16 +10837,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10696: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10840: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10699: \$? = $ac_status" >&5
-+  echo "$as_me:10843: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10702: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10846: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10705: \$? = $ac_status" >&5
-+  echo "$as_me:10849: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_largefile_source=1; break
- else
-@@ -10713,7 +10857,7 @@
-   break
- done
- fi
--echo "$as_me:10716: result: $ac_cv_sys_largefile_source" >&5
-+echo "$as_me:10860: 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
- 
-@@ -10727,13 +10871,13 @@
- # 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:10730: checking for fseeko" >&5
-+echo "$as_me:10874: 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 10736 "configure"
-+#line 10880 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -10745,16 +10889,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:10748: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10892: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10751: \$? = $ac_status" >&5
-+  echo "$as_me:10895: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:10754: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10898: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10757: \$? = $ac_status" >&5
-+  echo "$as_me:10901: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_fseeko=yes
- else
-@@ -10764,7 +10908,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:10767: result: $ac_cv_func_fseeko" >&5
-+echo "$as_me:10911: result: $ac_cv_func_fseeko" >&5
- echo "${ECHO_T}$ac_cv_func_fseeko" >&6
- if test $ac_cv_func_fseeko = yes; then
- 
-@@ -10785,14 +10929,14 @@
- 	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:10788: checking whether to use struct dirent64" >&5
-+	echo "$as_me:10932: 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 10795 "configure"
-+#line 10939 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10813,16 +10957,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10816: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10960: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10819: \$? = $ac_status" >&5
-+  echo "$as_me:10963: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10822: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10966: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10825: \$? = $ac_status" >&5
-+  echo "$as_me:10969: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_struct_dirent64=yes
- else
-@@ -10833,7 +10977,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:10836: result: $cf_cv_struct_dirent64" >&5
-+echo "$as_me:10980: result: $cf_cv_struct_dirent64" >&5
- echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
- 	test "$cf_cv_struct_dirent64" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -10843,7 +10987,7 @@
- 	fi
- 
- ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
--echo "$as_me:10846: checking if you want tparm not to use X/Open fixed-parameter list" >&5
-+echo "$as_me:10990: checking if you want tparm not to use X/Open fixed-parameter list" >&5
- echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6
- 
- # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given.
-@@ -10853,14 +10997,14 @@
- else
-   with_tparm_varargs=yes
- fi;
--echo "$as_me:10856: result: $with_tparm_varargs" >&5
-+echo "$as_me:11000: result: $with_tparm_varargs" >&5
- echo "${ECHO_T}$with_tparm_varargs" >&6
- NCURSES_TPARM_VARARGS=0
- test "x$with_tparm_varargs" = xyes && NCURSES_TPARM_VARARGS=1
- 
- ###   use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw
- if test "$with_ticlib" != no ; then
--echo "$as_me:10863: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
-+echo "$as_me:11007: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
- echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6
- 
- # Check whether --enable-tic-depends or --disable-tic-depends was given.
-@@ -10870,14 +11014,14 @@
- else
-   with_tic_depends=yes
- fi;
--echo "$as_me:10873: result: $with_tic_depends" >&5
-+echo "$as_me:11017: result: $with_tic_depends" >&5
- echo "${ECHO_T}$with_tic_depends" >&6
- else
- 	with_tic_depends=no
- fi
- 
- ###   use option --with-bool to override bool's type
--echo "$as_me:10880: checking for type of bool" >&5
-+echo "$as_me:11024: checking for type of bool" >&5
- echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
- 
- # Check whether --with-bool or --without-bool was given.
-@@ -10887,10 +11031,10 @@
- else
-   NCURSES_BOOL=auto
- fi;
--echo "$as_me:10890: result: $NCURSES_BOOL" >&5
-+echo "$as_me:11034: result: $NCURSES_BOOL" >&5
- echo "${ECHO_T}$NCURSES_BOOL" >&6
- 
--echo "$as_me:10893: checking for alternate terminal capabilities file" >&5
-+echo "$as_me:11037: checking for alternate terminal capabilities file" >&5
- echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6
- 
- # Check whether --with-caps or --without-caps was given.
-@@ -10901,11 +11045,11 @@
-   TERMINFO_CAPS=Caps
- fi;
- test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
--echo "$as_me:10904: result: $TERMINFO_CAPS" >&5
-+echo "$as_me:11048: result: $TERMINFO_CAPS" >&5
- echo "${ECHO_T}$TERMINFO_CAPS" >&6
- 
- ###   use option --with-chtype to override chtype's type
--echo "$as_me:10908: checking for type of chtype" >&5
-+echo "$as_me:11052: checking for type of chtype" >&5
- echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
- 
- # Check whether --with-chtype or --without-chtype was given.
-@@ -10915,11 +11059,11 @@
- else
-   NCURSES_CHTYPE=$cf_dft_chtype
- fi;
--echo "$as_me:10918: result: $NCURSES_CHTYPE" >&5
-+echo "$as_me:11062: result: $NCURSES_CHTYPE" >&5
- echo "${ECHO_T}$NCURSES_CHTYPE" >&6
- 
- ###   use option --with-ospeed to override ospeed's type
--echo "$as_me:10922: checking for type of ospeed" >&5
-+echo "$as_me:11066: checking for type of ospeed" >&5
- echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6
- 
- # Check whether --with-ospeed or --without-ospeed was given.
-@@ -10929,11 +11073,11 @@
- else
-   NCURSES_OSPEED=short
- fi;
--echo "$as_me:10932: result: $NCURSES_OSPEED" >&5
-+echo "$as_me:11076: result: $NCURSES_OSPEED" >&5
- echo "${ECHO_T}$NCURSES_OSPEED" >&6
- 
- ###   use option --with-mmask-t to override mmask_t's type
--echo "$as_me:10936: checking for type of mmask_t" >&5
-+echo "$as_me:11080: checking for type of mmask_t" >&5
- echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6
- 
- # Check whether --with-mmask-t or --without-mmask-t was given.
-@@ -10943,11 +11087,11 @@
- else
-   NCURSES_MMASK_T=$cf_dft_mmask_t
- fi;
--echo "$as_me:10946: result: $NCURSES_MMASK_T" >&5
-+echo "$as_me:11090: result: $NCURSES_MMASK_T" >&5
- echo "${ECHO_T}$NCURSES_MMASK_T" >&6
- 
- ###   use option --with-ccharw-max to override CCHARW_MAX size
--echo "$as_me:10950: checking for size CCHARW_MAX" >&5
-+echo "$as_me:11094: checking for size CCHARW_MAX" >&5
- echo $ECHO_N "checking for size CCHARW_MAX... $ECHO_C" >&6
- 
- # Check whether --with-ccharw-max or --without-ccharw-max was given.
-@@ -10957,11 +11101,11 @@
- else
-   NCURSES_CCHARW_MAX=5
- fi;
--echo "$as_me:10960: result: $NCURSES_CCHARW_MAX" >&5
-+echo "$as_me:11104: result: $NCURSES_CCHARW_MAX" >&5
- echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
- 
- ###   use option --with-tparm-arg to override tparm's argument type
--echo "$as_me:10964: checking for type of tparm args" >&5
-+echo "$as_me:11108: checking for type of tparm args" >&5
- echo $ECHO_N "checking for type of tparm args... $ECHO_C" >&6
- 
- # Check whether --with-tparm-arg or --without-tparm-arg was given.
-@@ -10971,11 +11115,11 @@
- else
-   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
- fi;
--echo "$as_me:10974: result: $NCURSES_TPARM_ARG" >&5
-+echo "$as_me:11118: result: $NCURSES_TPARM_ARG" >&5
- echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
- 
- ### Enable compiling-in rcs id's
--echo "$as_me:10978: checking if RCS identifiers should be compiled-in" >&5
-+echo "$as_me:11122: checking if RCS identifiers should be compiled-in" >&5
- echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6
- 
- # Check whether --with-rcs-ids or --without-rcs-ids was given.
-@@ -10985,7 +11129,7 @@
- else
-   with_rcs_ids=no
- fi;
--echo "$as_me:10988: result: $with_rcs_ids" >&5
-+echo "$as_me:11132: result: $with_rcs_ids" >&5
- echo "${ECHO_T}$with_rcs_ids" >&6
- test "x$with_rcs_ids" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -10994,7 +11138,7 @@
- 
- ###############################################################################
- 
--echo "$as_me:10997: checking format of man-pages" >&5
-+echo "$as_me:11141: checking format of man-pages" >&5
- echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6
- 
- # Check whether --with-manpage-format or --without-manpage-format was given.
-@@ -11083,14 +11227,14 @@
- 	;;
- esac
- 
--echo "$as_me:11086: result: $MANPAGE_FORMAT" >&5
-+echo "$as_me:11230: result: $MANPAGE_FORMAT" >&5
- echo "${ECHO_T}$MANPAGE_FORMAT" >&6
- if test -n "$cf_unknown" ; then
--	{ echo "$as_me:11089: WARNING: Unexpected manpage-format $cf_unknown" >&5
-+	{ echo "$as_me:11233: WARNING: Unexpected manpage-format $cf_unknown" >&5
- echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
- fi
- 
--echo "$as_me:11093: checking for manpage renaming" >&5
-+echo "$as_me:11237: checking for manpage renaming" >&5
- echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6
- 
- # Check whether --with-manpage-renames or --without-manpage-renames was given.
-@@ -11118,7 +11262,7 @@
- 	if test -f $srcdir/man/$MANPAGE_RENAMES ; then
- 		MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES
- 	elif test ! -f $MANPAGE_RENAMES ; then
--		{ { echo "$as_me:11121: error: not a filename: $MANPAGE_RENAMES" >&5
-+		{ { echo "$as_me:11265: error: not a filename: $MANPAGE_RENAMES" >&5
- echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
-@@ -11132,10 +11276,10 @@
- 	fi
- fi
- 
--echo "$as_me:11135: result: $MANPAGE_RENAMES" >&5
-+echo "$as_me:11279: result: $MANPAGE_RENAMES" >&5
- echo "${ECHO_T}$MANPAGE_RENAMES" >&6
- 
--echo "$as_me:11138: checking if manpage aliases will be installed" >&5
-+echo "$as_me:11282: checking if manpage aliases will be installed" >&5
- echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6
- 
- # Check whether --with-manpage-aliases or --without-manpage-aliases was given.
-@@ -11146,7 +11290,7 @@
-   MANPAGE_ALIASES=yes
- fi;
- 
--echo "$as_me:11149: result: $MANPAGE_ALIASES" >&5
-+echo "$as_me:11293: result: $MANPAGE_ALIASES" >&5
- echo "${ECHO_T}$MANPAGE_ALIASES" >&6
- 
- case "x$LN_S" in
-@@ -11160,7 +11304,7 @@
- 
- MANPAGE_SYMLINKS=no
- if test "$MANPAGE_ALIASES" = yes ; then
--echo "$as_me:11163: checking if manpage symlinks should be used" >&5
-+echo "$as_me:11307: checking if manpage symlinks should be used" >&5
- echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6
- 
- # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given.
-@@ -11173,17 +11317,17 @@
- 
- if test "$$cf_use_symlinks" = no; then
- if test "$MANPAGE_SYMLINKS" = yes ; then
--	{ echo "$as_me:11176: WARNING: cannot make symlinks" >&5
-+	{ echo "$as_me:11320: WARNING: cannot make symlinks" >&5
- echo "$as_me: WARNING: cannot make symlinks" >&2;}
- 	MANPAGE_SYMLINKS=no
- fi
- fi
- 
--echo "$as_me:11182: result: $MANPAGE_SYMLINKS" >&5
-+echo "$as_me:11326: result: $MANPAGE_SYMLINKS" >&5
- echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
- fi
- 
--echo "$as_me:11186: checking for manpage tbl" >&5
-+echo "$as_me:11330: checking for manpage tbl" >&5
- echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6
- 
- # Check whether --with-manpage-tbl or --without-manpage-tbl was given.
-@@ -11194,7 +11338,7 @@
-   MANPAGE_TBL=no
- fi;
- 
--echo "$as_me:11197: result: $MANPAGE_TBL" >&5
-+echo "$as_me:11341: result: $MANPAGE_TBL" >&5
- echo "${ECHO_T}$MANPAGE_TBL" >&6
- 
- if test "$prefix" = "NONE" ; then
-@@ -11527,7 +11671,7 @@
- ###############################################################################
- 
- ### Note that some functions (such as const) are normally disabled anyway.
--echo "$as_me:11530: checking if you want to build with function extensions" >&5
-+echo "$as_me:11674: checking if you want to build with function extensions" >&5
- echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6
- 
- # Check whether --enable-ext-funcs or --disable-ext-funcs was given.
-@@ -11537,7 +11681,7 @@
- else
-   with_ext_funcs=yes
- fi;
--echo "$as_me:11540: result: $with_ext_funcs" >&5
-+echo "$as_me:11684: result: $with_ext_funcs" >&5
- echo "${ECHO_T}$with_ext_funcs" >&6
- if test "x$with_ext_funcs" = xyes ; then
- 	NCURSES_EXT_FUNCS=1
-@@ -11592,7 +11736,7 @@
- 	GENERATED_EXT_FUNCS=
- fi
- 
--echo "$as_me:11595: checking if you want to build with SCREEN extensions" >&5
-+echo "$as_me:11739: checking if you want to build with SCREEN extensions" >&5
- echo $ECHO_N "checking if you want to build with SCREEN extensions... $ECHO_C" >&6
- 
- # Check whether --enable-sp-funcs or --disable-sp-funcs was given.
-@@ -11602,7 +11746,7 @@
- else
-   with_sp_funcs=$cf_dft_ext_spfuncs
- fi;
--echo "$as_me:11605: result: $with_sp_funcs" >&5
-+echo "$as_me:11749: result: $with_sp_funcs" >&5
- echo "${ECHO_T}$with_sp_funcs" >&6
- if test "x$with_sp_funcs" = xyes ; then
- 	NCURSES_SP_FUNCS=1
-@@ -11617,7 +11761,7 @@
- 	GENERATED_SP_FUNCS=
- fi
- 
--echo "$as_me:11620: checking if you want to build with terminal-driver" >&5
-+echo "$as_me:11764: checking if you want to build with terminal-driver" >&5
- echo $ECHO_N "checking if you want to build with terminal-driver... $ECHO_C" >&6
- 
- # Check whether --enable-term-driver or --disable-term-driver was given.
-@@ -11627,7 +11771,7 @@
- else
-   with_term_driver=no
- fi;
--echo "$as_me:11630: result: $with_term_driver" >&5
-+echo "$as_me:11774: result: $with_term_driver" >&5
- echo "${ECHO_T}$with_term_driver" >&6
- if test "x$with_term_driver" = xyes ; then
- 
-@@ -11636,19 +11780,19 @@
- EOF
- 
- 	if test "x$with_termlib" != xno ; then
--		{ { echo "$as_me:11639: error: The term-driver option conflicts with the termlib option" >&5
-+		{ { echo "$as_me:11783: error: The term-driver option conflicts with the termlib option" >&5
- echo "$as_me: error: The term-driver option conflicts with the termlib option" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
- 	if test "x$with_sp_funcs" != xyes ; then
--		{ { echo "$as_me:11644: error: The term-driver option relies upon sp-funcs" >&5
-+		{ { echo "$as_me:11788: error: The term-driver option relies upon sp-funcs" >&5
- echo "$as_me: error: The term-driver option relies upon sp-funcs" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
- fi
- 
- ###   use option --enable-const to turn on use of const beyond that in XSI.
--echo "$as_me:11651: checking for extended use of const keyword" >&5
-+echo "$as_me:11795: checking for extended use of const keyword" >&5
- echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
- 
- # Check whether --enable-const or --disable-const was given.
-@@ -11658,7 +11802,7 @@
- else
-   with_ext_const=$cf_dft_ext_const
- fi;
--echo "$as_me:11661: result: $with_ext_const" >&5
-+echo "$as_me:11805: result: $with_ext_const" >&5
- echo "${ECHO_T}$with_ext_const" >&6
- NCURSES_CONST='/*nothing*/'
- if test "x$with_ext_const" = xyes ; then
-@@ -11666,7 +11810,7 @@
- fi
- 
- ###   use option --enable-ext-colors to turn on use of colors beyond 16.
--echo "$as_me:11669: checking if you want to use extended colors" >&5
-+echo "$as_me:11813: checking if you want to use extended colors" >&5
- echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6
- 
- # Check whether --enable-ext-colors or --disable-ext-colors was given.
-@@ -11676,12 +11820,12 @@
- else
-   with_ext_colors=$cf_dft_ext_colors
- fi;
--echo "$as_me:11679: result: $with_ext_colors" >&5
-+echo "$as_me:11823: result: $with_ext_colors" >&5
- echo "${ECHO_T}$with_ext_colors" >&6
- NCURSES_EXT_COLORS=0
- if test "x$with_ext_colors" = xyes ; then
- 	if test "x$with_widec" != xyes ; then
--		{ echo "$as_me:11684: WARNING: This option applies only to wide-character library" >&5
-+		{ echo "$as_me:11828: WARNING: This option applies only to wide-character library" >&5
- echo "$as_me: WARNING: This option applies only to wide-character library" >&2;}
- 	else
- 		# cannot be ABI 5 since it changes sizeof(cchar_t)
-@@ -11691,7 +11835,7 @@
- 	(5.*)
- 		cf_cv_rel_version=6.0
- 		cf_cv_abi_version=6
--		{ echo "$as_me:11694: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
-+		{ echo "$as_me:11838: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
- echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
- 		;;
- 	esac
-@@ -11707,7 +11851,7 @@
- fi
- 
- ###   use option --enable-ext-mouse to modify coding to support 5-button mice
--echo "$as_me:11710: checking if you want to use extended mouse encoding" >&5
-+echo "$as_me:11854: checking if you want to use extended mouse encoding" >&5
- echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6
- 
- # Check whether --enable-ext-mouse or --disable-ext-mouse was given.
-@@ -11717,7 +11861,7 @@
- else
-   with_ext_mouse=$cf_dft_ext_mouse
- fi;
--echo "$as_me:11720: result: $with_ext_mouse" >&5
-+echo "$as_me:11864: result: $with_ext_mouse" >&5
- echo "${ECHO_T}$with_ext_mouse" >&6
- NCURSES_MOUSE_VERSION=1
- if test "x$with_ext_mouse" = xyes ; then
-@@ -11728,7 +11872,7 @@
- 	(5.*)
- 		cf_cv_rel_version=6.0
- 		cf_cv_abi_version=6
--		{ echo "$as_me:11731: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
-+		{ echo "$as_me:11875: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
- echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
- 		;;
- 	esac
-@@ -11737,7 +11881,7 @@
- fi
- 
- ###   use option --enable-ext-putwin to turn on extended screendumps
--echo "$as_me:11740: checking if you want to use extended putwin/screendump" >&5
-+echo "$as_me:11884: checking if you want to use extended putwin/screendump" >&5
- echo $ECHO_N "checking if you want to use extended putwin/screendump... $ECHO_C" >&6
- 
- # Check whether --enable-ext-putwin or --disable-ext-putwin was given.
-@@ -11747,7 +11891,7 @@
- else
-   with_ext_putwin=$cf_dft_ext_putwin
- fi;
--echo "$as_me:11750: result: $with_ext_putwin" >&5
-+echo "$as_me:11894: result: $with_ext_putwin" >&5
- echo "${ECHO_T}$with_ext_putwin" >&6
- if test "x$with_ext_putwin" = xyes ; then
- 
-@@ -11757,7 +11901,7 @@
- 
- fi
- 
--echo "$as_me:11760: checking if you want \$NCURSES_NO_PADDING code" >&5
-+echo "$as_me:11904: checking if you want \$NCURSES_NO_PADDING code" >&5
- echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6
- 
- # Check whether --enable-no-padding or --disable-no-padding was given.
-@@ -11767,20 +11911,20 @@
- else
-   with_no_padding=$with_ext_funcs
- fi;
--echo "$as_me:11770: result: $with_no_padding" >&5
-+echo "$as_me:11914: result: $with_no_padding" >&5
- echo "${ECHO_T}$with_no_padding" >&6
- test "x$with_no_padding" = xyes &&
- cat >>confdefs.h <<\EOF
- #define NCURSES_NO_PADDING 1
- EOF
- 
--echo "$as_me:11777: checking for ANSI C header files" >&5
-+echo "$as_me:11921: 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 11783 "configure"
-+#line 11927 "configure"
- #include "confdefs.h"
- #include 
- #include 
-@@ -11788,13 +11932,13 @@
- #include 
- 
- _ACEOF
--if { (eval echo "$as_me:11791: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:11935: \"$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:11797: \$? = $ac_status" >&5
-+  echo "$as_me:11941: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -11816,7 +11960,7 @@
- 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 11819 "configure"
-+#line 11963 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -11834,7 +11978,7 @@
- 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 11837 "configure"
-+#line 11981 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -11855,7 +11999,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11858 "configure"
-+#line 12002 "configure"
- #include "confdefs.h"
- #include 
- #if ((' ' & 0x0FF) == 0x020)
-@@ -11881,15 +12025,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:11884: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12028: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11887: \$? = $ac_status" >&5
-+  echo "$as_me:12031: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:11889: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12033: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11892: \$? = $ac_status" >&5
-+  echo "$as_me:12036: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -11902,7 +12046,7 @@
- fi
- fi
- fi
--echo "$as_me:11905: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:12049: result: $ac_cv_header_stdc" >&5
- echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
- 
-@@ -11918,28 +12062,28 @@
-                   inttypes.h stdint.h unistd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:11921: checking for $ac_header" >&5
-+echo "$as_me:12065: 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 11927 "configure"
-+#line 12071 "configure"
- #include "confdefs.h"
- $ac_includes_default
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11933: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12077: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11936: \$? = $ac_status" >&5
-+  echo "$as_me:12080: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11939: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12083: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11942: \$? = $ac_status" >&5
-+  echo "$as_me:12086: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Header=yes"
- else
-@@ -11949,7 +12093,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:11952: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:12096: 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 <&5
-+echo "$as_me:12106: checking for signed char" >&5
- echo $ECHO_N "checking for signed char... $ECHO_C" >&6
- if test "${ac_cv_type_signed_char+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11968 "configure"
-+#line 12112 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -11980,16 +12124,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11983: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12127: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11986: \$? = $ac_status" >&5
-+  echo "$as_me:12130: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11989: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12133: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11992: \$? = $ac_status" >&5
-+  echo "$as_me:12136: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_signed_char=yes
- else
-@@ -11999,10 +12143,10 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:12002: result: $ac_cv_type_signed_char" >&5
-+echo "$as_me:12146: result: $ac_cv_type_signed_char" >&5
- echo "${ECHO_T}$ac_cv_type_signed_char" >&6
- 
--echo "$as_me:12005: checking size of signed char" >&5
-+echo "$as_me:12149: checking size of signed char" >&5
- echo $ECHO_N "checking size of signed char... $ECHO_C" >&6
- if test "${ac_cv_sizeof_signed_char+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12011,7 +12155,7 @@
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
--#line 12014 "configure"
-+#line 12158 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12023,21 +12167,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12026: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12170: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12029: \$? = $ac_status" >&5
-+  echo "$as_me:12173: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12032: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12176: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12035: \$? = $ac_status" >&5
-+  echo "$as_me:12179: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=0 ac_mid=0
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 12040 "configure"
-+#line 12184 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12049,16 +12193,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12052: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12196: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12055: \$? = $ac_status" >&5
-+  echo "$as_me:12199: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12058: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12202: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12061: \$? = $ac_status" >&5
-+  echo "$as_me:12205: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid; break
- else
-@@ -12074,7 +12218,7 @@
- ac_hi=-1 ac_mid=-1
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 12077 "configure"
-+#line 12221 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12086,16 +12230,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12089: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12233: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12092: \$? = $ac_status" >&5
-+  echo "$as_me:12236: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12095: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12239: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12098: \$? = $ac_status" >&5
-+  echo "$as_me:12242: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=$ac_mid; break
- else
-@@ -12111,7 +12255,7 @@
- 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 12114 "configure"
-+#line 12258 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12123,16 +12267,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12126: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12270: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12129: \$? = $ac_status" >&5
-+  echo "$as_me:12273: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12132: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12276: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12135: \$? = $ac_status" >&5
-+  echo "$as_me:12279: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid
- else
-@@ -12145,12 +12289,12 @@
- ac_cv_sizeof_signed_char=$ac_lo
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:12148: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:12292: 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 12153 "configure"
-+#line 12297 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12166,15 +12310,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:12169: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12313: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12172: \$? = $ac_status" >&5
-+  echo "$as_me:12316: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:12174: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12318: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12177: \$? = $ac_status" >&5
-+  echo "$as_me:12321: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_signed_char=`cat conftest.val`
- else
-@@ -12190,7 +12334,7 @@
-   ac_cv_sizeof_signed_char=0
- fi
- fi
--echo "$as_me:12193: result: $ac_cv_sizeof_signed_char" >&5
-+echo "$as_me:12337: result: $ac_cv_sizeof_signed_char" >&5
- echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
- cat >>confdefs.h <&5
-+echo "$as_me:12348: checking if you want to use signed Boolean array in term.h" >&5
- echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6
- 
- # Check whether --enable-signed-char or --disable-signed-char was given.
-@@ -12211,12 +12355,12 @@
- else
-   with_signed_char=no
- fi;
--echo "$as_me:12214: result: $with_signed_char" >&5
-+echo "$as_me:12358: result: $with_signed_char" >&5
- echo "${ECHO_T}$with_signed_char" >&6
- test "x$with_signed_char" != xyes && NCURSES_SBOOL="char"
- 
- ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
--echo "$as_me:12219: checking if you want SIGWINCH handler" >&5
-+echo "$as_me:12363: checking if you want SIGWINCH handler" >&5
- echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6
- 
- # Check whether --enable-sigwinch or --disable-sigwinch was given.
-@@ -12226,7 +12370,7 @@
- else
-   with_sigwinch=$with_ext_funcs
- fi;
--echo "$as_me:12229: result: $with_sigwinch" >&5
-+echo "$as_me:12373: result: $with_sigwinch" >&5
- echo "${ECHO_T}$with_sigwinch" >&6
- test "x$with_sigwinch" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12234,7 +12378,7 @@
- EOF
- 
- ###   use option --enable-tcap-names to allow user to define new capabilities
--echo "$as_me:12237: checking if you want user-definable terminal capabilities like termcap" >&5
-+echo "$as_me:12381: checking if you want user-definable terminal capabilities like termcap" >&5
- echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6
- 
- # Check whether --enable-tcap-names or --disable-tcap-names was given.
-@@ -12244,7 +12388,7 @@
- else
-   with_tcap_names=$with_ext_funcs
- fi;
--echo "$as_me:12247: result: $with_tcap_names" >&5
-+echo "$as_me:12391: result: $with_tcap_names" >&5
- echo "${ECHO_T}$with_tcap_names" >&6
- NCURSES_XNAMES=0
- test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1
-@@ -12252,7 +12396,7 @@
- ###############################################################################
- # These options are relatively safe to experiment with.
- 
--echo "$as_me:12255: checking if you want all development code" >&5
-+echo "$as_me:12399: checking if you want all development code" >&5
- echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
- 
- # Check whether --with-develop or --without-develop was given.
-@@ -12262,11 +12406,11 @@
- else
-   with_develop=no
- fi;
--echo "$as_me:12265: result: $with_develop" >&5
-+echo "$as_me:12409: result: $with_develop" >&5
- echo "${ECHO_T}$with_develop" >&6
- 
- ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
--echo "$as_me:12269: checking if you want hard-tabs code" >&5
-+echo "$as_me:12413: checking if you want hard-tabs code" >&5
- echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6
- 
- # Check whether --enable-hard-tabs or --disable-hard-tabs was given.
-@@ -12276,7 +12420,7 @@
- else
-   enable_hard_tabs=$with_develop
- fi;
--echo "$as_me:12279: result: $enable_hard_tabs" >&5
-+echo "$as_me:12423: result: $enable_hard_tabs" >&5
- echo "${ECHO_T}$enable_hard_tabs" >&6
- test "x$enable_hard_tabs" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12284,7 +12428,7 @@
- EOF
- 
- ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
--echo "$as_me:12287: checking if you want limited support for xmc" >&5
-+echo "$as_me:12431: checking if you want limited support for xmc" >&5
- echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6
- 
- # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given.
-@@ -12294,7 +12438,7 @@
- else
-   enable_xmc_glitch=$with_develop
- fi;
--echo "$as_me:12297: result: $enable_xmc_glitch" >&5
-+echo "$as_me:12441: result: $enable_xmc_glitch" >&5
- echo "${ECHO_T}$enable_xmc_glitch" >&6
- test "x$enable_xmc_glitch" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12304,7 +12448,7 @@
- ###############################################################################
- # These are just experimental, probably should not be in a package:
- 
--echo "$as_me:12307: checking if you do not want to assume colors are white-on-black" >&5
-+echo "$as_me:12451: checking if you do not want to assume colors are white-on-black" >&5
- echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6
- 
- # Check whether --enable-assumed-color or --disable-assumed-color was given.
-@@ -12314,7 +12458,7 @@
- else
-   with_assumed_color=yes
- fi;
--echo "$as_me:12317: result: $with_assumed_color" >&5
-+echo "$as_me:12461: result: $with_assumed_color" >&5
- echo "${ECHO_T}$with_assumed_color" >&6
- test "x$with_assumed_color" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12322,7 +12466,7 @@
- EOF
- 
- ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
--echo "$as_me:12325: checking if you want hashmap scrolling-optimization code" >&5
-+echo "$as_me:12469: checking if you want hashmap scrolling-optimization code" >&5
- echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6
- 
- # Check whether --enable-hashmap or --disable-hashmap was given.
-@@ -12332,7 +12476,7 @@
- else
-   with_hashmap=yes
- fi;
--echo "$as_me:12335: result: $with_hashmap" >&5
-+echo "$as_me:12479: result: $with_hashmap" >&5
- echo "${ECHO_T}$with_hashmap" >&6
- test "x$with_hashmap" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12340,7 +12484,7 @@
- EOF
- 
- ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
--echo "$as_me:12343: checking if you want colorfgbg code" >&5
-+echo "$as_me:12487: checking if you want colorfgbg code" >&5
- echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6
- 
- # Check whether --enable-colorfgbg or --disable-colorfgbg was given.
-@@ -12350,7 +12494,7 @@
- else
-   with_colorfgbg=no
- fi;
--echo "$as_me:12353: result: $with_colorfgbg" >&5
-+echo "$as_me:12497: result: $with_colorfgbg" >&5
- echo "${ECHO_T}$with_colorfgbg" >&6
- test "x$with_colorfgbg" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12358,7 +12502,7 @@
- EOF
- 
- ###   use option --enable-interop to turn on use of bindings used for interop
--echo "$as_me:12361: checking if you want interop bindings" >&5
-+echo "$as_me:12505: checking if you want interop bindings" >&5
- echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6
- 
- # Check whether --enable-interop or --disable-interop was given.
-@@ -12368,7 +12512,7 @@
- else
-   with_exp_interop=$cf_dft_interop
- fi;
--echo "$as_me:12371: result: $with_exp_interop" >&5
-+echo "$as_me:12515: result: $with_exp_interop" >&5
- echo "${ECHO_T}$with_exp_interop" >&6
- 
- NCURSES_INTEROP_FUNCS=0
-@@ -12377,7 +12521,7 @@
- # This is still experimental (20080329), but should ultimately be moved to
- # the script-block --with-normal, etc.
- 
--echo "$as_me:12380: checking if you want to link with the pthread library" >&5
-+echo "$as_me:12524: checking if you want to link with the pthread library" >&5
- echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6
- 
- # Check whether --with-pthread or --without-pthread was given.
-@@ -12387,27 +12531,27 @@
- else
-   with_pthread=no
- fi;
--echo "$as_me:12390: result: $with_pthread" >&5
-+echo "$as_me:12534: result: $with_pthread" >&5
- echo "${ECHO_T}$with_pthread" >&6
- 
- if test "$with_pthread" != no ; then
--	echo "$as_me:12394: checking for pthread.h" >&5
-+	echo "$as_me:12538: checking for pthread.h" >&5
- echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
- if test "${ac_cv_header_pthread_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12400 "configure"
-+#line 12544 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:12404: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:12548: \"$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:12410: \$? = $ac_status" >&5
-+  echo "$as_me:12554: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -12426,7 +12570,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:12429: result: $ac_cv_header_pthread_h" >&5
-+echo "$as_me:12573: result: $ac_cv_header_pthread_h" >&5
- echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
- if test $ac_cv_header_pthread_h = yes; then
- 
-@@ -12436,7 +12580,7 @@
- 
- 	for cf_lib_pthread in pthread c_r
- 	do
--	    echo "$as_me:12439: checking if we can link with the $cf_lib_pthread library" >&5
-+	    echo "$as_me:12583: checking if we can link with the $cf_lib_pthread library" >&5
- echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6
- 	    cf_save_LIBS="$LIBS"
- 
-@@ -12457,7 +12601,7 @@
- LIBS="$cf_add_libs"
- 
- 	    cat >conftest.$ac_ext <<_ACEOF
--#line 12460 "configure"
-+#line 12604 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -12474,16 +12618,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12477: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12621: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12480: \$? = $ac_status" >&5
-+  echo "$as_me:12624: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12483: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12627: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12486: \$? = $ac_status" >&5
-+  echo "$as_me:12630: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   with_pthread=yes
- else
-@@ -12493,7 +12637,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	    LIBS="$cf_save_LIBS"
--	    echo "$as_me:12496: result: $with_pthread" >&5
-+	    echo "$as_me:12640: result: $with_pthread" >&5
- echo "${ECHO_T}$with_pthread" >&6
- 	    test "$with_pthread" = yes && break
- 	done
-@@ -12521,7 +12665,7 @@
- EOF
- 
- 	else
--	    { { echo "$as_me:12524: error: Cannot link with pthread library" >&5
-+	    { { echo "$as_me:12668: error: Cannot link with pthread library" >&5
- echo "$as_me: error: Cannot link with pthread library" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
-@@ -12531,13 +12675,13 @@
- fi
- 
- if test "x$with_pthread" != xno; then
--	echo "$as_me:12534: checking for pthread_kill" >&5
-+	echo "$as_me:12678: checking for pthread_kill" >&5
- echo $ECHO_N "checking for pthread_kill... $ECHO_C" >&6
- if test "${ac_cv_func_pthread_kill+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12540 "configure"
-+#line 12684 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char pthread_kill (); below.  */
-@@ -12568,16 +12712,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12571: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12715: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12574: \$? = $ac_status" >&5
-+  echo "$as_me:12718: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12577: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12721: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12580: \$? = $ac_status" >&5
-+  echo "$as_me:12724: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_pthread_kill=yes
- else
-@@ -12587,11 +12731,11 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:12590: result: $ac_cv_func_pthread_kill" >&5
-+echo "$as_me:12734: result: $ac_cv_func_pthread_kill" >&5
- echo "${ECHO_T}$ac_cv_func_pthread_kill" >&6
- if test $ac_cv_func_pthread_kill = yes; then
- 
--		echo "$as_me:12594: checking if you want to allow EINTR in wgetch with pthreads" >&5
-+		echo "$as_me:12738: checking if you want to allow EINTR in wgetch with pthreads" >&5
- echo $ECHO_N "checking if you want to allow EINTR in wgetch with pthreads... $ECHO_C" >&6
- 
- # Check whether --enable-pthreads-eintr or --disable-pthreads-eintr was given.
-@@ -12601,7 +12745,7 @@
- else
-   use_pthreads_eintr=no
- fi;
--		echo "$as_me:12604: result: $use_pthreads_eintr" >&5
-+		echo "$as_me:12748: result: $use_pthreads_eintr" >&5
- echo "${ECHO_T}$use_pthreads_eintr" >&6
- 		if test "x$use_pthreads_eintr" = xyes ; then
- 
-@@ -12612,7 +12756,7 @@
- 		fi
- fi
- 
--	echo "$as_me:12615: checking if you want to use weak-symbols for pthreads" >&5
-+	echo "$as_me:12759: checking if you want to use weak-symbols for pthreads" >&5
- echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6
- 
- # Check whether --enable-weak-symbols or --disable-weak-symbols was given.
-@@ -12622,18 +12766,18 @@
- else
-   use_weak_symbols=no
- fi;
--	echo "$as_me:12625: result: $use_weak_symbols" >&5
-+	echo "$as_me:12769: result: $use_weak_symbols" >&5
- echo "${ECHO_T}$use_weak_symbols" >&6
- 	if test "x$use_weak_symbols" = xyes ; then
- 
--echo "$as_me:12629: checking if $CC supports weak symbols" >&5
-+echo "$as_me:12773: checking if $CC supports weak symbols" >&5
- echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6
- if test "${cf_cv_weak_symbols+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 12636 "configure"
-+#line 12780 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -12659,16 +12803,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12662: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12806: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12665: \$? = $ac_status" >&5
-+  echo "$as_me:12809: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12668: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12812: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12671: \$? = $ac_status" >&5
-+  echo "$as_me:12815: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_weak_symbols=yes
- else
-@@ -12679,7 +12823,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:12682: result: $cf_cv_weak_symbols" >&5
-+echo "$as_me:12826: result: $cf_cv_weak_symbols" >&5
- echo "${ECHO_T}$cf_cv_weak_symbols" >&6
- 
- 	else
-@@ -12712,7 +12856,7 @@
- # opaque outside of that, so there is no --enable-opaque option.  We can use
- # this option without --with-pthreads, but this will be always set for
- # pthreads.
--echo "$as_me:12715: checking if you want reentrant code" >&5
-+echo "$as_me:12859: checking if you want reentrant code" >&5
- echo $ECHO_N "checking if you want reentrant code... $ECHO_C" >&6
- 
- # Check whether --enable-reentrant or --disable-reentrant was given.
-@@ -12722,7 +12866,7 @@
- else
-   with_reentrant=no
- fi;
--echo "$as_me:12725: result: $with_reentrant" >&5
-+echo "$as_me:12869: result: $with_reentrant" >&5
- echo "${ECHO_T}$with_reentrant" >&6
- if test "x$with_reentrant" = xyes ; then
- 	cf_cv_enable_reentrant=1
-@@ -12795,7 +12939,7 @@
- 	(5.*)
- 		cf_cv_rel_version=6.0
- 		cf_cv_abi_version=6
--		{ echo "$as_me:12798: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
-+		{ echo "$as_me:12942: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
- echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
- 		;;
- 	esac
-@@ -12810,7 +12954,7 @@
- 
- ### Allow using a different wrap-prefix
- if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
--	echo "$as_me:12813: checking for prefix used to wrap public variables" >&5
-+	echo "$as_me:12957: checking for prefix used to wrap public variables" >&5
- echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6
- 
- # Check whether --with-wrap-prefix or --without-wrap-prefix was given.
-@@ -12820,7 +12964,7 @@
- else
-   NCURSES_WRAP_PREFIX=_nc_
- fi;
--	echo "$as_me:12823: result: $NCURSES_WRAP_PREFIX" >&5
-+	echo "$as_me:12967: result: $NCURSES_WRAP_PREFIX" >&5
- echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
- else
- 	NCURSES_WRAP_PREFIX=_nc_
-@@ -12830,7 +12974,7 @@
- #define NCURSES_WRAP_PREFIX "$NCURSES_WRAP_PREFIX"
- EOF
- 
--echo "$as_me:12833: checking if you want experimental safe-sprintf code" >&5
-+echo "$as_me:12977: checking if you want experimental safe-sprintf code" >&5
- echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6
- 
- # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given.
-@@ -12840,7 +12984,7 @@
- else
-   with_safe_sprintf=no
- fi;
--echo "$as_me:12843: result: $with_safe_sprintf" >&5
-+echo "$as_me:12987: result: $with_safe_sprintf" >&5
- echo "${ECHO_T}$with_safe_sprintf" >&6
- test "x$with_safe_sprintf" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12850,7 +12994,7 @@
- ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
- # when hashmap is used scroll hints are useless
- if test "$with_hashmap" = no ; then
--echo "$as_me:12853: checking if you want to experiment without scrolling-hints code" >&5
-+echo "$as_me:12997: checking if you want to experiment without scrolling-hints code" >&5
- echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6
- 
- # Check whether --enable-scroll-hints or --disable-scroll-hints was given.
-@@ -12860,7 +13004,7 @@
- else
-   with_scroll_hints=yes
- fi;
--echo "$as_me:12863: result: $with_scroll_hints" >&5
-+echo "$as_me:13007: result: $with_scroll_hints" >&5
- echo "${ECHO_T}$with_scroll_hints" >&6
- test "x$with_scroll_hints" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12869,7 +13013,7 @@
- 
- fi
- 
--echo "$as_me:12872: checking if you want wgetch-events code" >&5
-+echo "$as_me:13016: checking if you want wgetch-events code" >&5
- echo $ECHO_N "checking if you want wgetch-events code... $ECHO_C" >&6
- 
- # Check whether --enable-wgetch-events or --disable-wgetch-events was given.
-@@ -12879,7 +13023,7 @@
- else
-   with_wgetch_events=no
- fi;
--echo "$as_me:12882: result: $with_wgetch_events" >&5
-+echo "$as_me:13026: result: $with_wgetch_events" >&5
- echo "${ECHO_T}$with_wgetch_events" >&6
- test "x$with_wgetch_events" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12890,7 +13034,7 @@
- 
- ###	use option --disable-echo to suppress full display compiling commands
- 
--echo "$as_me:12893: checking if you want to see long compiling messages" >&5
-+echo "$as_me:13037: 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.
-@@ -12924,7 +13068,7 @@
- 	ECHO_CC=''
- 
- fi;
--echo "$as_me:12927: result: $enableval" >&5
-+echo "$as_me:13071: result: $enableval" >&5
- echo "${ECHO_T}$enableval" >&6
- 
- if test "x$enable_echo" = xyes; then
-@@ -12936,7 +13080,7 @@
- fi
- 
- ###	use option --enable-warnings to turn on all gcc warnings
--echo "$as_me:12939: checking if you want to see compiler warnings" >&5
-+echo "$as_me:13083: checking if you want to see compiler warnings" >&5
- echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
- 
- # Check whether --enable-warnings or --disable-warnings was given.
-@@ -12944,7 +13088,7 @@
-   enableval="$enable_warnings"
-   with_warnings=$enableval
- fi;
--echo "$as_me:12947: result: $with_warnings" >&5
-+echo "$as_me:13091: result: $with_warnings" >&5
- echo "${ECHO_T}$with_warnings" >&6
- 
- if test "x$with_warnings" = "xyes"; then
-@@ -12956,12 +13100,12 @@
- if test "$GCC" = yes ; then
- 	case $host_os in
- 	(linux*|gnu*)
--		echo "$as_me:12959: checking if this is really Intel C compiler" >&5
-+		echo "$as_me:13103: 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 12964 "configure"
-+#line 13108 "configure"
- #include "confdefs.h"
- 
- int
-@@ -12978,16 +13122,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12981: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13125: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12984: \$? = $ac_status" >&5
-+  echo "$as_me:13128: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12987: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13131: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12990: \$? = $ac_status" >&5
-+  echo "$as_me:13134: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   INTEL_COMPILER=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -we147"
-@@ -12998,7 +13142,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		CFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:13001: result: $INTEL_COMPILER" >&5
-+		echo "$as_me:13145: result: $INTEL_COMPILER" >&5
- echo "${ECHO_T}$INTEL_COMPILER" >&6
- 		;;
- 	esac
-@@ -13007,12 +13151,12 @@
- CLANG_COMPILER=no
- 
- if test "$GCC" = yes ; then
--	echo "$as_me:13010: checking if this is really Clang C compiler" >&5
-+	echo "$as_me:13154: 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 13015 "configure"
-+#line 13159 "configure"
- #include "confdefs.h"
- 
- int
-@@ -13029,16 +13173,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13032: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13176: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13035: \$? = $ac_status" >&5
-+  echo "$as_me:13179: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13038: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13182: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13041: \$? = $ac_status" >&5
-+  echo "$as_me:13185: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   CLANG_COMPILER=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
-@@ -13049,12 +13193,12 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	CFLAGS="$cf_save_CFLAGS"
--	echo "$as_me:13052: result: $CLANG_COMPILER" >&5
-+	echo "$as_me:13196: result: $CLANG_COMPILER" >&5
- echo "${ECHO_T}$CLANG_COMPILER" >&6
- fi
- 
- cat > conftest.$ac_ext <&5
-+	{ echo "$as_me:13218: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS="-Wall"
-@@ -13087,12 +13231,12 @@
- 		wd981
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:13090: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13234: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13093: \$? = $ac_status" >&5
-+  echo "$as_me:13237: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13095: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13239: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
- 		fi
-@@ -13101,7 +13245,7 @@
- 
- elif test "$GCC" = yes
- then
--	{ echo "$as_me:13104: checking for $CC warning options..." >&5
-+	{ echo "$as_me:13248: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS=
-@@ -13125,12 +13269,12 @@
- 		Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:13128: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13272: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13131: \$? = $ac_status" >&5
-+  echo "$as_me:13275: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13133: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13277: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			case $cf_opt in
- 			(Wcast-qual)
-@@ -13141,7 +13285,7 @@
- 				([34].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:13144: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:13288: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -13151,7 +13295,7 @@
- 				([12].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:13154: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:13298: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -13171,12 +13315,12 @@
- if test "$GCC" = yes ; then
- 	case $host_os in
- 	(linux*|gnu*)
--		echo "$as_me:13174: checking if this is really Intel C++ compiler" >&5
-+		echo "$as_me:13318: 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="$CXXFLAGS"
- 		CXXFLAGS="$CXXFLAGS -no-gcc"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 13179 "configure"
-+#line 13323 "configure"
- #include "confdefs.h"
- 
- int
-@@ -13193,16 +13337,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13196: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13340: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13199: \$? = $ac_status" >&5
-+  echo "$as_me:13343: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13202: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13346: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13205: \$? = $ac_status" >&5
-+  echo "$as_me:13349: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   INTEL_CPLUSPLUS=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -we147"
-@@ -13213,7 +13357,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		CXXFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:13216: result: $INTEL_CPLUSPLUS" >&5
-+		echo "$as_me:13360: result: $INTEL_CPLUSPLUS" >&5
- echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
- 		;;
- 	esac
-@@ -13222,12 +13366,12 @@
- CLANG_CPLUSPLUS=no
- 
- if test "$GCC" = yes ; then
--	echo "$as_me:13225: checking if this is really Clang C++ compiler" >&5
-+	echo "$as_me:13369: 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="$CXXFLAGS"
- 	CXXFLAGS="$CXXFLAGS -Qunused-arguments"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 13230 "configure"
-+#line 13374 "configure"
- #include "confdefs.h"
- 
- int
-@@ -13244,16 +13388,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13247: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13391: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13250: \$? = $ac_status" >&5
-+  echo "$as_me:13394: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13253: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13397: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13256: \$? = $ac_status" >&5
-+  echo "$as_me:13400: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   CLANG_CPLUSPLUS=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
-@@ -13264,7 +13408,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	CXXFLAGS="$cf_save_CFLAGS"
--	echo "$as_me:13267: result: $CLANG_CPLUSPLUS" >&5
-+	echo "$as_me:13411: result: $CLANG_CPLUSPLUS" >&5
- echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
- fi
- 
-@@ -13276,7 +13420,7 @@
- ac_main_return=return
- 
- cat > conftest.$ac_ext <&5
-+	{ echo "$as_me:13441: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CXXFLAGS="$CXXFLAGS"
- 	EXTRA_CXXFLAGS="-Wall"
-@@ -13311,12 +13455,12 @@
- 		wd981
- 	do
- 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
--		if { (eval echo "$as_me:13314: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13458: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13317: \$? = $ac_status" >&5
-+  echo "$as_me:13461: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13319: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13463: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
- 		fi
-@@ -13325,7 +13469,7 @@
- 
- elif test "$GXX" = yes
- then
--	{ echo "$as_me:13328: checking for $CXX warning options..." >&5
-+	{ echo "$as_me:13472: checking for $CXX warning options..." >&5
- echo "$as_me: checking for $CXX warning options..." >&6;}
- 	cf_save_CXXFLAGS="$CXXFLAGS"
- 	EXTRA_CXXFLAGS="-W -Wall"
-@@ -13355,16 +13499,16 @@
- 		Wundef $cf_gxx_extra_warnings Wno-unused
- 	do
- 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
--		if { (eval echo "$as_me:13358: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13502: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13361: \$? = $ac_status" >&5
-+  echo "$as_me:13505: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13363: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13507: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
- 		else
--			test -n "$verbose" && echo "$as_me:13367: result: ... no -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13511: result: ... no -$cf_opt" >&5
- echo "${ECHO_T}... no -$cf_opt" >&6
- 		fi
- 	done
-@@ -13400,10 +13544,10 @@
- EOF
- if test "$GCC" = yes
- then
--	{ echo "$as_me:13403: checking for $CC __attribute__ directives..." >&5
-+	{ echo "$as_me:13547: checking for $CC __attribute__ directives..." >&5
- echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
- cat > conftest.$ac_ext <&5
-+		if { (eval echo "$as_me:13599: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13458: \$? = $ac_status" >&5
-+  echo "$as_me:13602: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13460: result: ... $cf_attribute" >&5
-+			test -n "$verbose" && echo "$as_me:13604: result: ... $cf_attribute" >&5
- echo "${ECHO_T}... $cf_attribute" >&6
- 			cat conftest.h >>confdefs.h
- 			case $cf_attribute in
-@@ -13516,7 +13660,7 @@
- rm -rf conftest*
- fi
- 
--echo "$as_me:13519: checking if you want to work around bogus compiler/loader warnings" >&5
-+echo "$as_me:13663: checking if you want to work around bogus compiler/loader warnings" >&5
- echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6
- 
- # Check whether --enable-string-hacks or --disable-string-hacks was given.
-@@ -13526,7 +13670,7 @@
- else
-   with_string_hacks=no
- fi;
--echo "$as_me:13529: result: $with_string_hacks" >&5
-+echo "$as_me:13673: result: $with_string_hacks" >&5
- echo "${ECHO_T}$with_string_hacks" >&6
- 
- if test "x$with_string_hacks" = "xyes"; then
-@@ -13535,19 +13679,19 @@
- #define USE_STRING_HACKS 1
- EOF
- 
--	{ echo "$as_me:13538: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
-+	{ echo "$as_me:13682: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
- echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;}
- 
- for ac_func in strlcat strlcpy snprintf
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:13544: checking for $ac_func" >&5
-+echo "$as_me:13688: 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 13550 "configure"
-+#line 13694 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -13578,16 +13722,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13581: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13725: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13584: \$? = $ac_status" >&5
-+  echo "$as_me:13728: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13587: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13731: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13590: \$? = $ac_status" >&5
-+  echo "$as_me:13734: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -13597,7 +13741,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:13600: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:13744: 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 <&5
-+echo "$as_me:13757: checking if you want to enable runtime assertions" >&5
- echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
- 
- # Check whether --enable-assertions or --disable-assertions was given.
-@@ -13620,7 +13764,7 @@
- else
-   with_assertions=no
- fi;
--echo "$as_me:13623: result: $with_assertions" >&5
-+echo "$as_me:13767: result: $with_assertions" >&5
- echo "${ECHO_T}$with_assertions" >&6
- if test -n "$GCC"
- then
-@@ -13636,7 +13780,7 @@
- 
- ###	use option --disable-leaks to suppress "permanent" leaks, for testing
- 
--echo "$as_me:13639: checking if you want to use dmalloc for testing" >&5
-+echo "$as_me:13783: 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.
-@@ -13653,7 +13797,7 @@
- else
-   with_dmalloc=
- fi;
--echo "$as_me:13656: result: ${with_dmalloc:-no}" >&5
-+echo "$as_me:13800: result: ${with_dmalloc:-no}" >&5
- echo "${ECHO_T}${with_dmalloc:-no}" >&6
- 
- case .$with_cflags in
-@@ -13747,23 +13891,23 @@
- esac
- 
- if test "$with_dmalloc" = yes ; then
--	echo "$as_me:13750: checking for dmalloc.h" >&5
-+	echo "$as_me:13894: 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 13756 "configure"
-+#line 13900 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:13760: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:13904: \"$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:13766: \$? = $ac_status" >&5
-+  echo "$as_me:13910: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -13782,11 +13926,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:13785: result: $ac_cv_header_dmalloc_h" >&5
-+echo "$as_me:13929: 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:13789: checking for dmalloc_debug in -ldmalloc" >&5
-+echo "$as_me:13933: 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
-@@ -13794,7 +13938,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 13797 "configure"
-+#line 13941 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -13813,16 +13957,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13816: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13960: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13819: \$? = $ac_status" >&5
-+  echo "$as_me:13963: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13822: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13966: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13825: \$? = $ac_status" >&5
-+  echo "$as_me:13969: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dmalloc_dmalloc_debug=yes
- else
-@@ -13833,7 +13977,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:13836: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
-+echo "$as_me:13980: 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 <&5
-+echo "$as_me:13995: 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.
-@@ -13865,7 +14009,7 @@
- else
-   with_dbmalloc=
- fi;
--echo "$as_me:13868: result: ${with_dbmalloc:-no}" >&5
-+echo "$as_me:14012: result: ${with_dbmalloc:-no}" >&5
- echo "${ECHO_T}${with_dbmalloc:-no}" >&6
- 
- case .$with_cflags in
-@@ -13959,23 +14103,23 @@
- esac
- 
- if test "$with_dbmalloc" = yes ; then
--	echo "$as_me:13962: checking for dbmalloc.h" >&5
-+	echo "$as_me:14106: 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 13968 "configure"
-+#line 14112 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:13972: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:14116: \"$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:13978: \$? = $ac_status" >&5
-+  echo "$as_me:14122: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -13994,11 +14138,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:13997: result: $ac_cv_header_dbmalloc_h" >&5
-+echo "$as_me:14141: 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:14001: checking for debug_malloc in -ldbmalloc" >&5
-+echo "$as_me:14145: 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
-@@ -14006,7 +14150,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldbmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14009 "configure"
-+#line 14153 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14025,16 +14169,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14028: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14172: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14031: \$? = $ac_status" >&5
-+  echo "$as_me:14175: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14034: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14178: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14037: \$? = $ac_status" >&5
-+  echo "$as_me:14181: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dbmalloc_debug_malloc=yes
- else
-@@ -14045,7 +14189,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:14048: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
-+echo "$as_me:14192: 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 <&5
-+echo "$as_me:14207: checking if you want to use valgrind for testing" >&5
- echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
- 
- # Check whether --with-valgrind or --without-valgrind was given.
-@@ -14077,7 +14221,7 @@
- else
-   with_valgrind=
- fi;
--echo "$as_me:14080: result: ${with_valgrind:-no}" >&5
-+echo "$as_me:14224: result: ${with_valgrind:-no}" >&5
- echo "${ECHO_T}${with_valgrind:-no}" >&6
- 
- case .$with_cflags in
-@@ -14170,7 +14314,7 @@
- 	;;
- esac
- 
--echo "$as_me:14173: checking if you want to perform memory-leak testing" >&5
-+echo "$as_me:14317: checking if you want to perform memory-leak testing" >&5
- echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
- 
- # Check whether --enable-leaks or --disable-leaks was given.
-@@ -14180,7 +14324,7 @@
- else
-   : ${with_no_leaks:=no}
- fi;
--echo "$as_me:14183: result: $with_no_leaks" >&5
-+echo "$as_me:14327: result: $with_no_leaks" >&5
- echo "${ECHO_T}$with_no_leaks" >&6
- 
- if test "$with_no_leaks" = yes ; then
-@@ -14232,7 +14376,7 @@
- 	;;
- esac
- 
--echo "$as_me:14235: checking whether to add trace feature to all models" >&5
-+echo "$as_me:14379: checking whether to add trace feature to all models" >&5
- echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
- 
- # Check whether --with-trace or --without-trace was given.
-@@ -14242,7 +14386,7 @@
- else
-   cf_with_trace=$cf_all_traces
- fi;
--echo "$as_me:14245: result: $cf_with_trace" >&5
-+echo "$as_me:14389: result: $cf_with_trace" >&5
- echo "${ECHO_T}$cf_with_trace" >&6
- 
- if test "x$cf_with_trace" = xyes ; then
-@@ -14332,7 +14476,7 @@
- 	ADA_TRACE=FALSE
- fi
- 
--echo "$as_me:14335: checking if we want to use GNAT projects" >&5
-+echo "$as_me:14479: checking if we want to use GNAT projects" >&5
- echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6
- 
- # Check whether --enable-gnat-projects or --disable-gnat-projects was given.
-@@ -14349,7 +14493,7 @@
- 	enable_gnat_projects=yes
- 
- fi;
--echo "$as_me:14352: result: $enable_gnat_projects" >&5
-+echo "$as_me:14496: result: $enable_gnat_projects" >&5
- echo "${ECHO_T}$enable_gnat_projects" >&6
- 
- ###	Checks for libraries.
-@@ -14359,13 +14503,13 @@
- 	LIBS=" -lpsapi $LIBS"
- 	;;
- (*)
--echo "$as_me:14362: checking for gettimeofday" >&5
-+echo "$as_me:14506: checking for gettimeofday" >&5
- echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
- if test "${ac_cv_func_gettimeofday+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14368 "configure"
-+#line 14512 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char gettimeofday (); below.  */
-@@ -14396,16 +14540,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14399: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14543: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14402: \$? = $ac_status" >&5
-+  echo "$as_me:14546: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14405: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14549: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14408: \$? = $ac_status" >&5
-+  echo "$as_me:14552: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_gettimeofday=yes
- else
-@@ -14415,7 +14559,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:14418: result: $ac_cv_func_gettimeofday" >&5
-+echo "$as_me:14562: result: $ac_cv_func_gettimeofday" >&5
- echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
- if test $ac_cv_func_gettimeofday = yes; then
- 
-@@ -14425,7 +14569,7 @@
- 
- else
- 
--echo "$as_me:14428: checking for gettimeofday in -lbsd" >&5
-+echo "$as_me:14572: checking for gettimeofday in -lbsd" >&5
- echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
- if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14433,7 +14577,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbsd  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14436 "configure"
-+#line 14580 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14452,16 +14596,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14455: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14599: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14458: \$? = $ac_status" >&5
-+  echo "$as_me:14602: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14461: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14605: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14464: \$? = $ac_status" >&5
-+  echo "$as_me:14608: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_bsd_gettimeofday=yes
- else
-@@ -14472,7 +14616,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:14475: result: $ac_cv_lib_bsd_gettimeofday" >&5
-+echo "$as_me:14619: result: $ac_cv_lib_bsd_gettimeofday" >&5
- echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
- if test $ac_cv_lib_bsd_gettimeofday = yes; then
- 
-@@ -14502,14 +14646,14 @@
- 	;;
- esac
- 
--echo "$as_me:14505: checking if -lm needed for math functions" >&5
-+echo "$as_me:14649: 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 14512 "configure"
-+#line 14656 "configure"
- #include "confdefs.h"
- 
- 	#include 
-@@ -14524,16 +14668,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14527: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14671: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14530: \$? = $ac_status" >&5
-+  echo "$as_me:14674: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14533: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14677: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14536: \$? = $ac_status" >&5
-+  echo "$as_me:14680: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_need_libm=no
- else
-@@ -14543,7 +14687,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:14546: result: $cf_cv_need_libm" >&5
-+echo "$as_me:14690: result: $cf_cv_need_libm" >&5
- echo "${ECHO_T}$cf_cv_need_libm" >&6
- if test "$cf_cv_need_libm" = yes
- then
-@@ -14551,13 +14695,13 @@
- fi
- 
- ###	Checks for header files.
--echo "$as_me:14554: checking for ANSI C header files" >&5
-+echo "$as_me:14698: 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 14560 "configure"
-+#line 14704 "configure"
- #include "confdefs.h"
- #include 
- #include 
-@@ -14565,13 +14709,13 @@
- #include 
- 
- _ACEOF
--if { (eval echo "$as_me:14568: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:14712: \"$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:14574: \$? = $ac_status" >&5
-+  echo "$as_me:14718: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -14593,7 +14737,7 @@
- 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 14596 "configure"
-+#line 14740 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -14611,7 +14755,7 @@
- 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 14614 "configure"
-+#line 14758 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -14632,7 +14776,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14635 "configure"
-+#line 14779 "configure"
- #include "confdefs.h"
- #include 
- #if ((' ' & 0x0FF) == 0x020)
-@@ -14658,15 +14802,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:14661: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14805: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14664: \$? = $ac_status" >&5
-+  echo "$as_me:14808: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:14666: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14810: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14669: \$? = $ac_status" >&5
-+  echo "$as_me:14813: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -14679,7 +14823,7 @@
- fi
- fi
- fi
--echo "$as_me:14682: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:14826: result: $ac_cv_header_stdc" >&5
- echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
- 
-@@ -14692,13 +14836,13 @@
- 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:14695: checking for $ac_hdr that defines DIR" >&5
-+echo "$as_me:14839: 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 14701 "configure"
-+#line 14845 "configure"
- #include "confdefs.h"
- #include 
- #include <$ac_hdr>
-@@ -14713,16 +14857,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14716: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14860: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14719: \$? = $ac_status" >&5
-+  echo "$as_me:14863: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14722: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14866: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14725: \$? = $ac_status" >&5
-+  echo "$as_me:14869: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Header=yes"
- else
-@@ -14732,7 +14876,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:14735: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:14879: 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 <&5
-+  echo "$as_me:14892: 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
-@@ -14753,7 +14897,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldir  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14756 "configure"
-+#line 14900 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14772,16 +14916,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14775: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14919: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14778: \$? = $ac_status" >&5
-+  echo "$as_me:14922: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14781: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14925: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14784: \$? = $ac_status" >&5
-+  echo "$as_me:14928: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dir_opendir=yes
- else
-@@ -14792,14 +14936,14 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:14795: result: $ac_cv_lib_dir_opendir" >&5
-+echo "$as_me:14939: 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:14802: checking for opendir in -lx" >&5
-+  echo "$as_me:14946: 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
-@@ -14807,7 +14951,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lx  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14810 "configure"
-+#line 14954 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14826,16 +14970,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14829: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14973: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14832: \$? = $ac_status" >&5
-+  echo "$as_me:14976: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14835: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14979: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14838: \$? = $ac_status" >&5
-+  echo "$as_me:14982: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_x_opendir=yes
- else
-@@ -14846,7 +14990,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:14849: result: $ac_cv_lib_x_opendir" >&5
-+echo "$as_me:14993: 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"
-@@ -14854,13 +14998,13 @@
- 
- fi
- 
--echo "$as_me:14857: checking whether time.h and sys/time.h may both be included" >&5
-+echo "$as_me:15001: 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 14863 "configure"
-+#line 15007 "configure"
- #include "confdefs.h"
- #include 
- #include 
-@@ -14876,16 +15020,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14879: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15023: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14882: \$? = $ac_status" >&5
-+  echo "$as_me:15026: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14885: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15029: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14888: \$? = $ac_status" >&5
-+  echo "$as_me:15032: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_header_time=yes
- else
-@@ -14895,7 +15039,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:14898: result: $ac_cv_header_time" >&5
-+echo "$as_me:15042: result: $ac_cv_header_time" >&5
- echo "${ECHO_T}$ac_cv_header_time" >&6
- if test $ac_cv_header_time = yes; then
- 
-@@ -14914,13 +15058,13 @@
- 	;;
- esac
- 
--echo "$as_me:14917: checking for regcomp" >&5
-+echo "$as_me:15061: checking for regcomp" >&5
- echo $ECHO_N "checking for regcomp... $ECHO_C" >&6
- if test "${ac_cv_func_regcomp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14923 "configure"
-+#line 15067 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char regcomp (); below.  */
-@@ -14951,16 +15095,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14954: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15098: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14957: \$? = $ac_status" >&5
-+  echo "$as_me:15101: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14960: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15104: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14963: \$? = $ac_status" >&5
-+  echo "$as_me:15107: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_regcomp=yes
- else
-@@ -14970,7 +15114,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:14973: result: $ac_cv_func_regcomp" >&5
-+echo "$as_me:15117: result: $ac_cv_func_regcomp" >&5
- echo "${ECHO_T}$ac_cv_func_regcomp" >&6
- if test $ac_cv_func_regcomp = yes; then
-   cf_regex_func=regcomp
-@@ -14979,7 +15123,7 @@
- 	for cf_regex_lib in $cf_regex_libs
- 	do
- 		as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh`
--echo "$as_me:14982: checking for regcomp in -l$cf_regex_lib" >&5
-+echo "$as_me:15126: checking for regcomp in -l$cf_regex_lib" >&5
- echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14987,7 +15131,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-l$cf_regex_lib  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14990 "configure"
-+#line 15134 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -15006,16 +15150,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15009: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15153: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15012: \$? = $ac_status" >&5
-+  echo "$as_me:15156: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15015: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15159: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15018: \$? = $ac_status" >&5
-+  echo "$as_me:15162: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Lib=yes"
- else
-@@ -15026,7 +15170,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:15029: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-+echo "$as_me:15173: 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
- 
-@@ -15055,13 +15199,13 @@
- fi
- 
- if test "$cf_regex_func" = no ; then
--	echo "$as_me:15058: checking for compile" >&5
-+	echo "$as_me:15202: checking for compile" >&5
- echo $ECHO_N "checking for compile... $ECHO_C" >&6
- if test "${ac_cv_func_compile+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15064 "configure"
-+#line 15208 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char compile (); below.  */
-@@ -15092,16 +15236,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15095: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15239: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15098: \$? = $ac_status" >&5
-+  echo "$as_me:15242: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15101: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15245: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15104: \$? = $ac_status" >&5
-+  echo "$as_me:15248: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_compile=yes
- else
-@@ -15111,13 +15255,13 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:15114: result: $ac_cv_func_compile" >&5
-+echo "$as_me:15258: result: $ac_cv_func_compile" >&5
- echo "${ECHO_T}$ac_cv_func_compile" >&6
- if test $ac_cv_func_compile = yes; then
-   cf_regex_func=compile
- else
- 
--		echo "$as_me:15120: checking for compile in -lgen" >&5
-+		echo "$as_me:15264: checking for compile in -lgen" >&5
- echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6
- if test "${ac_cv_lib_gen_compile+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15125,7 +15269,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgen  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 15128 "configure"
-+#line 15272 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -15144,16 +15288,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15147: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15291: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15150: \$? = $ac_status" >&5
-+  echo "$as_me:15294: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15153: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15297: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15156: \$? = $ac_status" >&5
-+  echo "$as_me:15300: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gen_compile=yes
- else
-@@ -15164,7 +15308,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:15167: result: $ac_cv_lib_gen_compile" >&5
-+echo "$as_me:15311: result: $ac_cv_lib_gen_compile" >&5
- echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6
- if test $ac_cv_lib_gen_compile = yes; then
- 
-@@ -15192,11 +15336,11 @@
- fi
- 
- if test "$cf_regex_func" = no ; then
--	{ echo "$as_me:15195: WARNING: cannot find regular expression library" >&5
-+	{ echo "$as_me:15339: WARNING: cannot find regular expression library" >&5
- echo "$as_me: WARNING: cannot find regular expression library" >&2;}
- fi
- 
--echo "$as_me:15199: checking for regular-expression headers" >&5
-+echo "$as_me:15343: checking for regular-expression headers" >&5
- echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
- if test "${cf_cv_regex_hdrs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15208,7 +15352,7 @@
- 	for cf_regex_hdr in regexp.h regexpr.h
- 	do
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 15211 "configure"
-+#line 15355 "configure"
- #include "confdefs.h"
- #include <$cf_regex_hdr>
- int
-@@ -15223,16 +15367,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15226: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15370: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15229: \$? = $ac_status" >&5
-+  echo "$as_me:15373: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15232: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15376: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15235: \$? = $ac_status" >&5
-+  echo "$as_me:15379: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 			cf_cv_regex_hdrs=$cf_regex_hdr
-@@ -15249,7 +15393,7 @@
- 	for cf_regex_hdr in regex.h
- 	do
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 15252 "configure"
-+#line 15396 "configure"
- #include "confdefs.h"
- #include 
- #include <$cf_regex_hdr>
-@@ -15267,16 +15411,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15270: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15414: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15273: \$? = $ac_status" >&5
-+  echo "$as_me:15417: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15276: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15420: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15279: \$? = $ac_status" >&5
-+  echo "$as_me:15423: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 			cf_cv_regex_hdrs=$cf_regex_hdr
-@@ -15292,11 +15436,11 @@
- esac
- 
- fi
--echo "$as_me:15295: result: $cf_cv_regex_hdrs" >&5
-+echo "$as_me:15439: result: $cf_cv_regex_hdrs" >&5
- echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
- 
- case $cf_cv_regex_hdrs in
--	(no)		{ echo "$as_me:15299: WARNING: no regular expression header found" >&5
-+	(no)		{ echo "$as_me:15443: WARNING: no regular expression header found" >&5
- echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
- 	(regex.h)
- cat >>confdefs.h <<\EOF
-@@ -15335,23 +15479,23 @@
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:15338: checking for $ac_header" >&5
-+echo "$as_me:15482: 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 15344 "configure"
-+#line 15488 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:15348: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:15492: \"$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:15354: \$? = $ac_status" >&5
-+  echo "$as_me:15498: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -15370,7 +15514,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:15373: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:15517: 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 <&5
-+echo "$as_me:15530: 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 15392 "configure"
-+#line 15536 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:15396: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:15540: \"$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:15402: \$? = $ac_status" >&5
-+  echo "$as_me:15546: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -15418,7 +15562,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:15421: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:15565: 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 <&5
-+echo "$as_me:15575: checking for header declaring getopt variables" >&5
- echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6
- if test "${cf_cv_getopt_header+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15438,7 +15582,7 @@
- for cf_header in stdio.h stdlib.h unistd.h getopt.h
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 15441 "configure"
-+#line 15585 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -15451,16 +15595,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15454: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15598: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15457: \$? = $ac_status" >&5
-+  echo "$as_me:15601: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15460: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15604: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15463: \$? = $ac_status" >&5
-+  echo "$as_me:15607: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_getopt_header=$cf_header
-  break
-@@ -15472,7 +15616,7 @@
- done
- 
- fi
--echo "$as_me:15475: result: $cf_cv_getopt_header" >&5
-+echo "$as_me:15619: result: $cf_cv_getopt_header" >&5
- echo "${ECHO_T}$cf_cv_getopt_header" >&6
- if test $cf_cv_getopt_header != none ; then
- 
-@@ -15493,7 +15637,7 @@
- # Note: even non-Posix ISC needs  to declare fd_set
- if test "x$ISC" = xyes ; then
- 
--echo "$as_me:15496: checking for main in -lcposix" >&5
-+echo "$as_me:15640: checking for main in -lcposix" >&5
- echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6
- if test "${ac_cv_lib_cposix_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15501,7 +15645,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lcposix  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 15504 "configure"
-+#line 15648 "configure"
- #include "confdefs.h"
- 
- int
-@@ -15513,16 +15657,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15516: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15660: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15519: \$? = $ac_status" >&5
-+  echo "$as_me:15663: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15522: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15666: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15525: \$? = $ac_status" >&5
-+  echo "$as_me:15669: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_cposix_main=yes
- else
-@@ -15533,7 +15677,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:15536: result: $ac_cv_lib_cposix_main" >&5
-+echo "$as_me:15680: result: $ac_cv_lib_cposix_main" >&5
- echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6
- if test $ac_cv_lib_cposix_main = yes; then
-   cat >>confdefs.h <&5
-+	echo "$as_me:15691: checking for bzero in -linet" >&5
- echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6
- if test "${ac_cv_lib_inet_bzero+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15552,7 +15696,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-linet  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 15555 "configure"
-+#line 15699 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -15571,16 +15715,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15574: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15718: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15577: \$? = $ac_status" >&5
-+  echo "$as_me:15721: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15580: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15724: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15583: \$? = $ac_status" >&5
-+  echo "$as_me:15727: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_inet_bzero=yes
- else
-@@ -15591,7 +15735,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:15594: result: $ac_cv_lib_inet_bzero" >&5
-+echo "$as_me:15738: result: $ac_cv_lib_inet_bzero" >&5
- echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6
- if test $ac_cv_lib_inet_bzero = yes; then
- 
-@@ -15614,14 +15758,14 @@
- fi
- fi
- 
--echo "$as_me:15617: checking if sys/time.h works with sys/select.h" >&5
-+echo "$as_me:15761: checking if sys/time.h works with sys/select.h" >&5
- echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
- if test "${cf_cv_sys_time_select+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 15624 "configure"
-+#line 15768 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -15641,16 +15785,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15644: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15788: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15647: \$? = $ac_status" >&5
-+  echo "$as_me:15791: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15650: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15794: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15653: \$? = $ac_status" >&5
-+  echo "$as_me:15797: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sys_time_select=yes
- else
-@@ -15662,7 +15806,7 @@
- 
- fi
- 
--echo "$as_me:15665: result: $cf_cv_sys_time_select" >&5
-+echo "$as_me:15809: result: $cf_cv_sys_time_select" >&5
- echo "${ECHO_T}$cf_cv_sys_time_select" >&6
- test "$cf_cv_sys_time_select" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -15677,13 +15821,13 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ac_main_return=return
- 
--echo "$as_me:15680: checking for an ANSI C-conforming const" >&5
-+echo "$as_me:15824: checking for an ANSI C-conforming const" >&5
- echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
- if test "${ac_cv_c_const+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15686 "configure"
-+#line 15830 "configure"
- #include "confdefs.h"
- 
- int
-@@ -15741,16 +15885,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15744: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15888: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15747: \$? = $ac_status" >&5
-+  echo "$as_me:15891: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15750: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15894: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15753: \$? = $ac_status" >&5
-+  echo "$as_me:15897: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_const=yes
- else
-@@ -15760,7 +15904,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:15763: result: $ac_cv_c_const" >&5
-+echo "$as_me:15907: result: $ac_cv_c_const" >&5
- echo "${ECHO_T}$ac_cv_c_const" >&6
- if test $ac_cv_c_const = no; then
- 
-@@ -15770,7 +15914,7 @@
- 
- fi
- 
--echo "$as_me:15773: checking for inline" >&5
-+echo "$as_me:15917: 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
-@@ -15778,7 +15922,7 @@
-   ac_cv_c_inline=no
- for ac_kw in inline __inline__ __inline; do
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15781 "configure"
-+#line 15925 "configure"
- #include "confdefs.h"
- #ifndef __cplusplus
- static $ac_kw int static_foo () {return 0; }
-@@ -15787,16 +15931,16 @@
- 
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15790: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15934: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15793: \$? = $ac_status" >&5
-+  echo "$as_me:15937: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15796: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15940: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15799: \$? = $ac_status" >&5
-+  echo "$as_me:15943: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_inline=$ac_kw; break
- else
-@@ -15807,7 +15951,7 @@
- done
- 
- fi
--echo "$as_me:15810: result: $ac_cv_c_inline" >&5
-+echo "$as_me:15954: result: $ac_cv_c_inline" >&5
- echo "${ECHO_T}$ac_cv_c_inline" >&6
- case $ac_cv_c_inline in
-   inline | yes) ;;
-@@ -15833,7 +15977,7 @@
- 		:
- 	elif test "$GCC" = yes
- 	then
--		echo "$as_me:15836: checking if $CC supports options to tune inlining" >&5
-+		echo "$as_me:15980: checking if $CC supports options to tune inlining" >&5
- echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6
- if test "${cf_cv_gcc_inline+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15842,7 +15986,7 @@
- 		cf_save_CFLAGS=$CFLAGS
- 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 15845 "configure"
-+#line 15989 "configure"
- #include "confdefs.h"
- inline int foo(void) { return 1; }
- int
-@@ -15854,16 +15998,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15857: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16001: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15860: \$? = $ac_status" >&5
-+  echo "$as_me:16004: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15863: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16007: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15866: \$? = $ac_status" >&5
-+  echo "$as_me:16010: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gcc_inline=yes
- else
-@@ -15875,7 +16019,7 @@
- 		CFLAGS=$cf_save_CFLAGS
- 
- fi
--echo "$as_me:15878: result: $cf_cv_gcc_inline" >&5
-+echo "$as_me:16022: result: $cf_cv_gcc_inline" >&5
- echo "${ECHO_T}$cf_cv_gcc_inline" >&6
- 		if test "$cf_cv_gcc_inline" = yes ; then
- 
-@@ -15961,7 +16105,7 @@
- 	fi
- fi
- 
--echo "$as_me:15964: checking for signal global datatype" >&5
-+echo "$as_me:16108: checking for signal global datatype" >&5
- echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6
- if test "${cf_cv_sig_atomic_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15973,7 +16117,7 @@
- 		"int"
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 15976 "configure"
-+#line 16120 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -15996,16 +16140,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15999: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16143: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16002: \$? = $ac_status" >&5
-+  echo "$as_me:16146: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16005: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16149: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16008: \$? = $ac_status" >&5
-+  echo "$as_me:16152: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sig_atomic_t=$cf_type
- else
-@@ -16019,7 +16163,7 @@
- 
- fi
- 
--echo "$as_me:16022: result: $cf_cv_sig_atomic_t" >&5
-+echo "$as_me:16166: result: $cf_cv_sig_atomic_t" >&5
- echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
- test "$cf_cv_sig_atomic_t" != no &&
- cat >>confdefs.h <&5
-+echo "$as_me:16175: checking for type of chtype" >&5
- echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
- if test "${cf_cv_typeof_chtype+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16038,7 +16182,7 @@
-   cf_cv_typeof_chtype=long
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16041 "configure"
-+#line 16185 "configure"
- #include "confdefs.h"
- 
- #define WANT_BITS 31
-@@ -16073,15 +16217,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16076: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16220: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16079: \$? = $ac_status" >&5
-+  echo "$as_me:16223: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16081: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16225: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16084: \$? = $ac_status" >&5
-+  echo "$as_me:16228: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_typeof_chtype=`cat cf_test.out`
- else
-@@ -16096,7 +16240,7 @@
- 
- fi
- 
--echo "$as_me:16099: result: $cf_cv_typeof_chtype" >&5
-+echo "$as_me:16243: result: $cf_cv_typeof_chtype" >&5
- echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
- 
- cat >>confdefs.h <&5
-+echo "$as_me:16255: checking if unsigned literals are legal" >&5
- echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6
- if test "${cf_cv_unsigned_literals+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16118 "configure"
-+#line 16262 "configure"
- #include "confdefs.h"
- 
- int
-@@ -16127,16 +16271,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16130: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16274: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16133: \$? = $ac_status" >&5
-+  echo "$as_me:16277: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16136: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16280: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16139: \$? = $ac_status" >&5
-+  echo "$as_me:16283: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_unsigned_literals=yes
- else
-@@ -16148,7 +16292,7 @@
- 
- fi
- 
--echo "$as_me:16151: result: $cf_cv_unsigned_literals" >&5
-+echo "$as_me:16295: result: $cf_cv_unsigned_literals" >&5
- echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
- 
- cf_cv_1UL="1"
-@@ -16164,14 +16308,14 @@
- 
- ###	Checks for external-data
- 
--echo "$as_me:16167: checking if external errno is declared" >&5
-+echo "$as_me:16311: 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 16174 "configure"
-+#line 16318 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_STDLIB_H
-@@ -16189,16 +16333,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16192: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16336: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16195: \$? = $ac_status" >&5
-+  echo "$as_me:16339: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16198: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16342: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16201: \$? = $ac_status" >&5
-+  echo "$as_me:16345: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_dcl_errno=yes
- else
-@@ -16209,7 +16353,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:16212: result: $cf_cv_dcl_errno" >&5
-+echo "$as_me:16356: result: $cf_cv_dcl_errno" >&5
- echo "${ECHO_T}$cf_cv_dcl_errno" >&6
- 
- if test "$cf_cv_dcl_errno" = no ; then
-@@ -16224,14 +16368,14 @@
- 
- # It's possible (for near-UNIX clones) that the data doesn't exist
- 
--echo "$as_me:16227: checking if external errno exists" >&5
-+echo "$as_me:16371: 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 16234 "configure"
-+#line 16378 "configure"
- #include "confdefs.h"
- 
- #undef errno
-@@ -16246,16 +16390,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16249: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16393: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16252: \$? = $ac_status" >&5
-+  echo "$as_me:16396: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16255: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16399: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16258: \$? = $ac_status" >&5
-+  echo "$as_me:16402: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_errno=yes
- else
-@@ -16266,7 +16410,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:16269: result: $cf_cv_have_errno" >&5
-+echo "$as_me:16413: result: $cf_cv_have_errno" >&5
- echo "${ECHO_T}$cf_cv_have_errno" >&6
- 
- if test "$cf_cv_have_errno" = yes ; then
-@@ -16279,7 +16423,7 @@
- 
- fi
- 
--echo "$as_me:16282: checking if data-only library module links" >&5
-+echo "$as_me:16426: checking if data-only library module links" >&5
- echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
- if test "${cf_cv_link_dataonly+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16287,20 +16431,20 @@
- 
- 	rm -f conftest.a
- 	cat >conftest.$ac_ext <&5
-+	if { (eval echo "$as_me:16437: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16296: \$? = $ac_status" >&5
-+  echo "$as_me:16440: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 		mv conftest.o data.o && \
- 		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
- 	fi
- 	rm -f conftest.$ac_ext data.o
- 	cat >conftest.$ac_ext <&5
-+	if { (eval echo "$as_me:16460: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16319: \$? = $ac_status" >&5
-+  echo "$as_me:16463: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
- 		mv conftest.o func.o && \
- 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
-@@ -16329,7 +16473,7 @@
-   cf_cv_link_dataonly=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16332 "configure"
-+#line 16476 "configure"
- #include "confdefs.h"
- 
- 	int main()
-@@ -16340,15 +16484,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16343: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16487: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16346: \$? = $ac_status" >&5
-+  echo "$as_me:16490: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16348: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16492: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16351: \$? = $ac_status" >&5
-+  echo "$as_me:16495: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_link_dataonly=yes
- else
-@@ -16363,7 +16507,7 @@
- 
- fi
- 
--echo "$as_me:16366: result: $cf_cv_link_dataonly" >&5
-+echo "$as_me:16510: result: $cf_cv_link_dataonly" >&5
- echo "${ECHO_T}$cf_cv_link_dataonly" >&6
- 
- if test "$cf_cv_link_dataonly" = no ; then
-@@ -16402,13 +16546,13 @@
- 
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:16405: checking for $ac_func" >&5
-+echo "$as_me:16549: 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 16411 "configure"
-+#line 16555 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -16439,16 +16583,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16442: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16586: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16445: \$? = $ac_status" >&5
-+  echo "$as_me:16589: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16448: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16592: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16451: \$? = $ac_status" >&5
-+  echo "$as_me:16595: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -16458,7 +16602,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:16461: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:16605: 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 <&5
-+	{ { echo "$as_me:16617: error: getopt is required for building programs" >&5
- echo "$as_me: error: getopt is required for building programs" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- if test "x$with_getcap" = "xyes" ; then
- 
--echo "$as_me:16480: checking for terminal-capability database functions" >&5
-+echo "$as_me:16624: checking for terminal-capability database functions" >&5
- echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6
- if test "${cf_cv_cgetent+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16487 "configure"
-+#line 16631 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -16504,16 +16648,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16507: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16651: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16510: \$? = $ac_status" >&5
-+  echo "$as_me:16654: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16513: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16657: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16516: \$? = $ac_status" >&5
-+  echo "$as_me:16660: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cgetent=yes
- else
-@@ -16524,7 +16668,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:16527: result: $cf_cv_cgetent" >&5
-+echo "$as_me:16671: result: $cf_cv_cgetent" >&5
- echo "${ECHO_T}$cf_cv_cgetent" >&6
- 
- if test "$cf_cv_cgetent" = yes
-@@ -16534,14 +16678,14 @@
- #define HAVE_BSD_CGETENT 1
- EOF
- 
--echo "$as_me:16537: checking if cgetent uses const parameter" >&5
-+echo "$as_me:16681: checking if cgetent uses const parameter" >&5
- echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6
- if test "${cf_cv_cgetent_const+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16544 "configure"
-+#line 16688 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -16563,16 +16707,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16566: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16710: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16569: \$? = $ac_status" >&5
-+  echo "$as_me:16713: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16572: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16716: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16575: \$? = $ac_status" >&5
-+  echo "$as_me:16719: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cgetent_const=yes
- else
-@@ -16583,7 +16727,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:16586: result: $cf_cv_cgetent_const" >&5
-+echo "$as_me:16730: result: $cf_cv_cgetent_const" >&5
- echo "${ECHO_T}$cf_cv_cgetent_const" >&6
- 	if test "$cf_cv_cgetent_const" = yes
- 	then
-@@ -16597,14 +16741,14 @@
- 
- fi
- 
--echo "$as_me:16600: checking for isascii" >&5
-+echo "$as_me:16744: checking for isascii" >&5
- echo $ECHO_N "checking for isascii... $ECHO_C" >&6
- if test "${cf_cv_have_isascii+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16607 "configure"
-+#line 16751 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -16616,16 +16760,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16619: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16763: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16622: \$? = $ac_status" >&5
-+  echo "$as_me:16766: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16625: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16769: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16628: \$? = $ac_status" >&5
-+  echo "$as_me:16772: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_isascii=yes
- else
-@@ -16636,7 +16780,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:16639: result: $cf_cv_have_isascii" >&5
-+echo "$as_me:16783: result: $cf_cv_have_isascii" >&5
- echo "${ECHO_T}$cf_cv_have_isascii" >&6
- test "$cf_cv_have_isascii" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -16644,10 +16788,10 @@
- EOF
- 
- if test "$ac_cv_func_sigaction" = yes; then
--echo "$as_me:16647: checking whether sigaction needs _POSIX_SOURCE" >&5
-+echo "$as_me:16791: checking whether sigaction needs _POSIX_SOURCE" >&5
- echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 16650 "configure"
-+#line 16794 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -16661,16 +16805,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16664: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16808: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16667: \$? = $ac_status" >&5
-+  echo "$as_me:16811: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16670: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16814: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16673: \$? = $ac_status" >&5
-+  echo "$as_me:16817: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   sigact_bad=no
- else
-@@ -16678,7 +16822,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16681 "configure"
-+#line 16825 "configure"
- #include "confdefs.h"
- 
- #define _POSIX_SOURCE
-@@ -16693,16 +16837,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16696: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16840: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16699: \$? = $ac_status" >&5
-+  echo "$as_me:16843: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16702: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16846: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16705: \$? = $ac_status" >&5
-+  echo "$as_me:16849: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   sigact_bad=yes
- 
-@@ -16718,11 +16862,11 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:16721: result: $sigact_bad" >&5
-+echo "$as_me:16865: result: $sigact_bad" >&5
- echo "${ECHO_T}$sigact_bad" >&6
- fi
- 
--echo "$as_me:16725: checking if nanosleep really works" >&5
-+echo "$as_me:16869: checking if nanosleep really works" >&5
- echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6
- if test "${cf_cv_func_nanosleep+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16732,7 +16876,7 @@
-   cf_cv_func_nanosleep=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16735 "configure"
-+#line 16879 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -16757,15 +16901,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16760: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16904: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16763: \$? = $ac_status" >&5
-+  echo "$as_me:16907: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16765: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16909: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16768: \$? = $ac_status" >&5
-+  echo "$as_me:16912: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_nanosleep=yes
- else
-@@ -16777,7 +16921,7 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:16780: result: $cf_cv_func_nanosleep" >&5
-+echo "$as_me:16924: result: $cf_cv_func_nanosleep" >&5
- echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
- 
- test "$cf_cv_func_nanosleep" = "yes" &&
-@@ -16792,23 +16936,23 @@
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:16795: checking for $ac_header" >&5
-+echo "$as_me:16939: 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 16801 "configure"
-+#line 16945 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:16805: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:16949: \"$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:16811: \$? = $ac_status" >&5
-+  echo "$as_me:16955: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -16827,7 +16971,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:16830: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:16974: 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 <&5
-+echo "$as_me:16989: 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 16851 "configure"
-+#line 16995 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:16855: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:16999: \"$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:16861: \$? = $ac_status" >&5
-+  echo "$as_me:17005: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -16877,7 +17021,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:16880: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:17024: 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 <&5
-+	echo "$as_me:17042: 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 16901 "configure"
-+#line 17045 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -16910,16 +17054,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16913: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17057: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16916: \$? = $ac_status" >&5
-+  echo "$as_me:17060: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16919: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17063: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16922: \$? = $ac_status" >&5
-+  echo "$as_me:17066: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   termios_bad=no
- else
-@@ -16927,7 +17071,7 @@
- cat conftest.$ac_ext >&5
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 16930 "configure"
-+#line 17074 "configure"
- #include "confdefs.h"
- 
- #define _POSIX_SOURCE
-@@ -16941,16 +17085,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16944: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17088: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16947: \$? = $ac_status" >&5
-+  echo "$as_me:17091: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16950: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17094: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16953: \$? = $ac_status" >&5
-+  echo "$as_me:17097: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   termios_bad=unknown
- else
-@@ -16966,19 +17110,19 @@
- 
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:16969: result: $termios_bad" >&5
-+	echo "$as_me:17113: result: $termios_bad" >&5
- echo "${ECHO_T}$termios_bad" >&6
- 	fi
- fi
- 
--echo "$as_me:16974: checking for tcgetattr" >&5
-+echo "$as_me:17118: checking for tcgetattr" >&5
- echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6
- if test "${cf_cv_have_tcgetattr+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16981 "configure"
-+#line 17125 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -17006,16 +17150,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17009: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17153: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17012: \$? = $ac_status" >&5
-+  echo "$as_me:17156: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17015: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17159: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17018: \$? = $ac_status" >&5
-+  echo "$as_me:17162: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_tcgetattr=yes
- else
-@@ -17025,21 +17169,21 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17028: result: $cf_cv_have_tcgetattr" >&5
-+echo "$as_me:17172: result: $cf_cv_have_tcgetattr" >&5
- echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6
- test "$cf_cv_have_tcgetattr" = yes &&
- cat >>confdefs.h <<\EOF
- #define HAVE_TCGETATTR 1
- EOF
- 
--echo "$as_me:17035: checking for vsscanf function or workaround" >&5
-+echo "$as_me:17179: checking for vsscanf function or workaround" >&5
- echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6
- if test "${cf_cv_func_vsscanf+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17042 "configure"
-+#line 17186 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -17055,16 +17199,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17058: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17202: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17061: \$? = $ac_status" >&5
-+  echo "$as_me:17205: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17064: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17208: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17067: \$? = $ac_status" >&5
-+  echo "$as_me:17211: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=vsscanf
- else
-@@ -17072,7 +17216,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17075 "configure"
-+#line 17219 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -17094,16 +17238,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17097: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17241: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17100: \$? = $ac_status" >&5
-+  echo "$as_me:17244: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17103: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17247: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17106: \$? = $ac_status" >&5
-+  echo "$as_me:17250: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=vfscanf
- else
-@@ -17111,7 +17255,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17114 "configure"
-+#line 17258 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -17133,16 +17277,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17136: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17280: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17139: \$? = $ac_status" >&5
-+  echo "$as_me:17283: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17142: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17286: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17145: \$? = $ac_status" >&5
-+  echo "$as_me:17289: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=_doscan
- else
-@@ -17157,7 +17301,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17160: result: $cf_cv_func_vsscanf" >&5
-+echo "$as_me:17304: result: $cf_cv_func_vsscanf" >&5
- echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
- 
- case $cf_cv_func_vsscanf in
-@@ -17178,7 +17322,7 @@
- ;;
- esac
- 
--echo "$as_me:17181: checking for working mkstemp" >&5
-+echo "$as_me:17325: checking for working mkstemp" >&5
- echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
- if test "${cf_cv_func_mkstemp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17189,7 +17333,7 @@
-   cf_cv_func_mkstemp=maybe
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17192 "configure"
-+#line 17336 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -17227,15 +17371,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17230: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17374: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17233: \$? = $ac_status" >&5
-+  echo "$as_me:17377: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17235: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17379: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17238: \$? = $ac_status" >&5
-+  echo "$as_me:17382: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_mkstemp=yes
- 
-@@ -17250,16 +17394,16 @@
- fi
- 
- fi
--echo "$as_me:17253: result: $cf_cv_func_mkstemp" >&5
-+echo "$as_me:17397: result: $cf_cv_func_mkstemp" >&5
- echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
- if test "x$cf_cv_func_mkstemp" = xmaybe ; then
--	echo "$as_me:17256: checking for mkstemp" >&5
-+	echo "$as_me:17400: checking for mkstemp" >&5
- echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
- if test "${ac_cv_func_mkstemp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17262 "configure"
-+#line 17406 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char mkstemp (); below.  */
-@@ -17290,16 +17434,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17293: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17437: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17296: \$? = $ac_status" >&5
-+  echo "$as_me:17440: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17299: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17443: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17302: \$? = $ac_status" >&5
-+  echo "$as_me:17446: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_mkstemp=yes
- else
-@@ -17309,7 +17453,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17312: result: $ac_cv_func_mkstemp" >&5
-+echo "$as_me:17456: result: $ac_cv_func_mkstemp" >&5
- echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
- 
- fi
-@@ -17330,21 +17474,21 @@
- fi
- 
- if test "x$cross_compiling" = xyes ; then
--	{ echo "$as_me:17333: WARNING: cross compiling: assume setvbuf params not reversed" >&5
-+	{ echo "$as_me:17477: WARNING: cross compiling: assume setvbuf params not reversed" >&5
- echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;}
- else
--	echo "$as_me:17336: checking whether setvbuf arguments are reversed" >&5
-+	echo "$as_me:17480: checking whether setvbuf arguments are reversed" >&5
- echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6
- if test "${ac_cv_func_setvbuf_reversed+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:17342: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:17486: 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 17347 "configure"
-+#line 17491 "configure"
- #include "confdefs.h"
- #include 
- /* If setvbuf has the reversed format, exit 0. */
-@@ -17361,15 +17505,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17364: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17508: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17367: \$? = $ac_status" >&5
-+  echo "$as_me:17511: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17369: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17513: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17372: \$? = $ac_status" >&5
-+  echo "$as_me:17516: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_setvbuf_reversed=yes
- else
-@@ -17382,7 +17526,7 @@
- fi
- rm -f core core.* *.core
- fi
--echo "$as_me:17385: result: $ac_cv_func_setvbuf_reversed" >&5
-+echo "$as_me:17529: result: $ac_cv_func_setvbuf_reversed" >&5
- echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6
- if test $ac_cv_func_setvbuf_reversed = yes; then
- 
-@@ -17393,13 +17537,13 @@
- fi
- 
- fi
--echo "$as_me:17396: checking for intptr_t" >&5
-+echo "$as_me:17540: 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 17402 "configure"
-+#line 17546 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -17414,16 +17558,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17417: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17561: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17420: \$? = $ac_status" >&5
-+  echo "$as_me:17564: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17423: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17567: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17426: \$? = $ac_status" >&5
-+  echo "$as_me:17570: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_intptr_t=yes
- else
-@@ -17433,7 +17577,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:17436: result: $ac_cv_type_intptr_t" >&5
-+echo "$as_me:17580: 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
-   :
-@@ -17445,13 +17589,13 @@
- 
- fi
- 
--echo "$as_me:17448: checking for ssize_t" >&5
-+echo "$as_me:17592: 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 17454 "configure"
-+#line 17598 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -17466,16 +17610,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17469: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17613: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17472: \$? = $ac_status" >&5
-+  echo "$as_me:17616: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17475: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17619: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17478: \$? = $ac_status" >&5
-+  echo "$as_me:17622: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_ssize_t=yes
- else
-@@ -17485,7 +17629,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:17488: result: $ac_cv_type_ssize_t" >&5
-+echo "$as_me:17632: 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
-   :
-@@ -17497,14 +17641,14 @@
- 
- fi
- 
--echo "$as_me:17500: checking for type sigaction_t" >&5
-+echo "$as_me:17644: checking for type sigaction_t" >&5
- echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6
- if test "${cf_cv_type_sigaction+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 17507 "configure"
-+#line 17651 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -17517,16 +17661,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17520: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17664: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17523: \$? = $ac_status" >&5
-+  echo "$as_me:17667: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17526: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17670: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17529: \$? = $ac_status" >&5
-+  echo "$as_me:17673: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_sigaction=yes
- else
-@@ -17537,14 +17681,14 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- 
--echo "$as_me:17540: result: $cf_cv_type_sigaction" >&5
-+echo "$as_me:17684: result: $cf_cv_type_sigaction" >&5
- echo "${ECHO_T}$cf_cv_type_sigaction" >&6
- test "$cf_cv_type_sigaction" = yes &&
- cat >>confdefs.h <<\EOF
- #define HAVE_TYPE_SIGACTION 1
- EOF
- 
--echo "$as_me:17547: checking declaration of size-change" >&5
-+echo "$as_me:17691: 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
-@@ -17559,7 +17703,7 @@
- 	CPPFLAGS="$cf_save_CPPFLAGS"
- 	test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 17562 "configure"
-+#line 17706 "configure"
- #include "confdefs.h"
- #include 
- #ifdef HAVE_TERMIOS_H
-@@ -17603,16 +17747,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17606: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17750: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17609: \$? = $ac_status" >&5
-+  echo "$as_me:17753: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17612: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17756: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17615: \$? = $ac_status" >&5
-+  echo "$as_me:17759: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sizechange=yes
- else
-@@ -17631,7 +17775,7 @@
- done
- 
- fi
--echo "$as_me:17634: result: $cf_cv_sizechange" >&5
-+echo "$as_me:17778: result: $cf_cv_sizechange" >&5
- echo "${ECHO_T}$cf_cv_sizechange" >&6
- if test "$cf_cv_sizechange" != no ; then
- 
-@@ -17649,13 +17793,13 @@
- 	esac
- fi
- 
--echo "$as_me:17652: checking for memmove" >&5
-+echo "$as_me:17796: checking for memmove" >&5
- echo $ECHO_N "checking for memmove... $ECHO_C" >&6
- if test "${ac_cv_func_memmove+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17658 "configure"
-+#line 17802 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char memmove (); below.  */
-@@ -17686,16 +17830,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17689: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17833: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17692: \$? = $ac_status" >&5
-+  echo "$as_me:17836: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17695: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17839: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17698: \$? = $ac_status" >&5
-+  echo "$as_me:17842: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_memmove=yes
- else
-@@ -17705,19 +17849,19 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17708: result: $ac_cv_func_memmove" >&5
-+echo "$as_me:17852: result: $ac_cv_func_memmove" >&5
- echo "${ECHO_T}$ac_cv_func_memmove" >&6
- if test $ac_cv_func_memmove = yes; then
-   :
- else
- 
--echo "$as_me:17714: checking for bcopy" >&5
-+echo "$as_me:17858: checking for bcopy" >&5
- echo $ECHO_N "checking for bcopy... $ECHO_C" >&6
- if test "${ac_cv_func_bcopy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17720 "configure"
-+#line 17864 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char bcopy (); below.  */
-@@ -17748,16 +17892,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17751: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17895: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17754: \$? = $ac_status" >&5
-+  echo "$as_me:17898: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17757: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17901: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17760: \$? = $ac_status" >&5
-+  echo "$as_me:17904: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_bcopy=yes
- else
-@@ -17767,11 +17911,11 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17770: result: $ac_cv_func_bcopy" >&5
-+echo "$as_me:17914: result: $ac_cv_func_bcopy" >&5
- echo "${ECHO_T}$ac_cv_func_bcopy" >&6
- if test $ac_cv_func_bcopy = yes; then
- 
--	echo "$as_me:17774: checking if bcopy does overlapping moves" >&5
-+	echo "$as_me:17918: checking if bcopy does overlapping moves" >&5
- echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6
- if test "${cf_cv_good_bcopy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17781,7 +17925,7 @@
-   cf_cv_good_bcopy=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17784 "configure"
-+#line 17928 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -17795,15 +17939,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17798: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17942: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17801: \$? = $ac_status" >&5
-+  echo "$as_me:17945: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17803: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17947: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17806: \$? = $ac_status" >&5
-+  echo "$as_me:17950: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_good_bcopy=yes
- else
-@@ -17816,7 +17960,7 @@
- fi
- 
- fi
--echo "$as_me:17819: result: $cf_cv_good_bcopy" >&5
-+echo "$as_me:17963: result: $cf_cv_good_bcopy" >&5
- echo "${ECHO_T}$cf_cv_good_bcopy" >&6
- 
- else
-@@ -17843,13 +17987,13 @@
- for ac_func in posix_openpt
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:17846: checking for $ac_func" >&5
-+echo "$as_me:17990: 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 17852 "configure"
-+#line 17996 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -17880,16 +18024,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17883: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18027: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17886: \$? = $ac_status" >&5
-+  echo "$as_me:18030: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17889: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18033: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17892: \$? = $ac_status" >&5
-+  echo "$as_me:18036: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -17899,7 +18043,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17902: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:18046: 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 <&5
-+echo "$as_me:18056: checking if poll really works" >&5
- echo $ECHO_N "checking if poll really works... $ECHO_C" >&6
- if test "${cf_cv_working_poll+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17919,7 +18063,7 @@
-   cf_cv_working_poll=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17922 "configure"
-+#line 18066 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -17971,15 +18115,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17974: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18118: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17977: \$? = $ac_status" >&5
-+  echo "$as_me:18121: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17979: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18123: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17982: \$? = $ac_status" >&5
-+  echo "$as_me:18126: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_working_poll=yes
- else
-@@ -17991,21 +18135,21 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:17994: result: $cf_cv_working_poll" >&5
-+echo "$as_me:18138: result: $cf_cv_working_poll" >&5
- echo "${ECHO_T}$cf_cv_working_poll" >&6
- test "$cf_cv_working_poll" = "yes" &&
- cat >>confdefs.h <<\EOF
- #define HAVE_WORKING_POLL 1
- EOF
- 
--echo "$as_me:18001: checking for va_copy" >&5
-+echo "$as_me:18145: checking for va_copy" >&5
- echo $ECHO_N "checking for va_copy... $ECHO_C" >&6
- if test "${cf_cv_have_va_copy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 18008 "configure"
-+#line 18152 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -18022,16 +18166,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18025: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18169: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18028: \$? = $ac_status" >&5
-+  echo "$as_me:18172: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18031: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18175: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18034: \$? = $ac_status" >&5
-+  echo "$as_me:18178: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_va_copy=yes
- else
-@@ -18041,7 +18185,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:18044: result: $cf_cv_have_va_copy" >&5
-+echo "$as_me:18188: result: $cf_cv_have_va_copy" >&5
- echo "${ECHO_T}$cf_cv_have_va_copy" >&6
- 
- test "$cf_cv_have_va_copy" = yes &&
-@@ -18049,14 +18193,14 @@
- #define HAVE_VA_COPY 1
- EOF
- 
--echo "$as_me:18052: checking for __va_copy" >&5
-+echo "$as_me:18196: checking for __va_copy" >&5
- echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6
- if test "${cf_cv_have___va_copy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 18059 "configure"
-+#line 18203 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -18073,16 +18217,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18076: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18220: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18079: \$? = $ac_status" >&5
-+  echo "$as_me:18223: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18082: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18226: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18085: \$? = $ac_status" >&5
-+  echo "$as_me:18229: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have___va_copy=yes
- else
-@@ -18092,7 +18236,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:18095: result: $cf_cv_have___va_copy" >&5
-+echo "$as_me:18239: result: $cf_cv_have___va_copy" >&5
- echo "${ECHO_T}$cf_cv_have___va_copy" >&6
- 
- test "$cf_cv_have___va_copy" = yes &&
-@@ -18100,13 +18244,13 @@
- #define HAVE___VA_COPY 1
- EOF
- 
--echo "$as_me:18103: checking for pid_t" >&5
-+echo "$as_me:18247: 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 18109 "configure"
-+#line 18253 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -18121,16 +18265,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18124: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18268: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18127: \$? = $ac_status" >&5
-+  echo "$as_me:18271: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18130: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18274: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18133: \$? = $ac_status" >&5
-+  echo "$as_me:18277: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_pid_t=yes
- else
-@@ -18140,7 +18284,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:18143: result: $ac_cv_type_pid_t" >&5
-+echo "$as_me:18287: 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
-   :
-@@ -18155,23 +18299,23 @@
- for ac_header in unistd.h vfork.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:18158: checking for $ac_header" >&5
-+echo "$as_me:18302: 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 18164 "configure"
-+#line 18308 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:18168: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:18312: \"$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:18174: \$? = $ac_status" >&5
-+  echo "$as_me:18318: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -18190,7 +18334,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:18193: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:18337: 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 <&5
-+echo "$as_me:18350: 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 18212 "configure"
-+#line 18356 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -18240,16 +18384,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18243: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18387: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18246: \$? = $ac_status" >&5
-+  echo "$as_me:18390: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18249: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18393: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18252: \$? = $ac_status" >&5
-+  echo "$as_me:18396: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -18259,7 +18403,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:18262: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:18406: 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 <&5
-+  echo "$as_me:18418: 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
-@@ -18294,15 +18438,15 @@
-       }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:18297: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18441: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18300: \$? = $ac_status" >&5
-+  echo "$as_me:18444: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:18302: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18446: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18305: \$? = $ac_status" >&5
-+  echo "$as_me:18449: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_fork_works=yes
- else
-@@ -18314,7 +18458,7 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:18317: result: $ac_cv_func_fork_works" >&5
-+echo "$as_me:18461: result: $ac_cv_func_fork_works" >&5
- echo "${ECHO_T}$ac_cv_func_fork_works" >&6
- 
- fi
-@@ -18328,12 +18472,12 @@
-       ac_cv_func_fork_works=yes
-       ;;
-   esac
--  { echo "$as_me:18331: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
-+  { echo "$as_me:18475: 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:18336: checking for working vfork" >&5
-+  echo "$as_me:18480: 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
-@@ -18342,7 +18486,7 @@
-   ac_cv_func_vfork_works=cross
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18345 "configure"
-+#line 18489 "configure"
- #include "confdefs.h"
- /* Thanks to Paul Eggert for this test.  */
- #include 
-@@ -18439,15 +18583,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:18442: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18586: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18445: \$? = $ac_status" >&5
-+  echo "$as_me:18589: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:18447: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18591: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18450: \$? = $ac_status" >&5
-+  echo "$as_me:18594: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_vfork_works=yes
- else
-@@ -18459,13 +18603,13 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:18462: result: $ac_cv_func_vfork_works" >&5
-+echo "$as_me:18606: 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:18468: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
-+  { echo "$as_me:18612: 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
- 
-@@ -18492,7 +18636,7 @@
- 
- # special check for test/ditto.c
- 
--echo "$as_me:18495: checking for openpty in -lutil" >&5
-+echo "$as_me:18639: checking for openpty in -lutil" >&5
- echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
- if test "${ac_cv_lib_util_openpty+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18500,7 +18644,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lutil  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 18503 "configure"
-+#line 18647 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -18519,16 +18663,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18522: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18666: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18525: \$? = $ac_status" >&5
-+  echo "$as_me:18669: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18528: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18672: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18531: \$? = $ac_status" >&5
-+  echo "$as_me:18675: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_util_openpty=yes
- else
-@@ -18539,7 +18683,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:18542: result: $ac_cv_lib_util_openpty" >&5
-+echo "$as_me:18686: result: $ac_cv_lib_util_openpty" >&5
- echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
- if test $ac_cv_lib_util_openpty = yes; then
-   cf_cv_lib_util=yes
-@@ -18547,7 +18691,7 @@
-   cf_cv_lib_util=no
- fi
- 
--echo "$as_me:18550: checking for openpty header" >&5
-+echo "$as_me:18694: checking for openpty header" >&5
- echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
- if test "${cf_cv_func_openpty+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18574,7 +18718,7 @@
- 	for cf_header in pty.h libutil.h util.h
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 18577 "configure"
-+#line 18721 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -18591,16 +18735,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18594: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18738: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18597: \$? = $ac_status" >&5
-+  echo "$as_me:18741: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18600: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18744: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18603: \$? = $ac_status" >&5
-+  echo "$as_me:18747: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 		cf_cv_func_openpty=$cf_header
-@@ -18618,7 +18762,7 @@
- 	LIBS="$cf_save_LIBS"
- 
- fi
--echo "$as_me:18621: result: $cf_cv_func_openpty" >&5
-+echo "$as_me:18765: result: $cf_cv_func_openpty" >&5
- echo "${ECHO_T}$cf_cv_func_openpty" >&6
- 
- if test "$cf_cv_func_openpty" != no ; then
-@@ -18688,7 +18832,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 18691 "configure"
-+#line 18835 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -18700,16 +18844,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18703: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18847: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18706: \$? = $ac_status" >&5
-+  echo "$as_me:18850: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18709: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18853: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18712: \$? = $ac_status" >&5
-+  echo "$as_me:18856: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -18726,7 +18870,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:18729: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:18873: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -18762,7 +18906,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:18765: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:18909: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -18773,7 +18917,7 @@
- 	else
- 		case "$with_hashed_db" in
- 		(./*|../*|/*)
--			{ echo "$as_me:18776: WARNING: no such directory $with_hashed_db" >&5
-+			{ echo "$as_me:18920: WARNING: no such directory $with_hashed_db" >&5
- echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
- 			;;
- 		(*)
-@@ -18842,7 +18986,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 18845 "configure"
-+#line 18989 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -18854,16 +18998,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18857: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19001: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18860: \$? = $ac_status" >&5
-+  echo "$as_me:19004: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18863: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19007: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18866: \$? = $ac_status" >&5
-+  echo "$as_me:19010: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -18880,7 +19024,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:18883: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:19027: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -18960,7 +19104,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:18963: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:19107: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -18977,23 +19121,23 @@
- 	fi
- esac
- 
--echo "$as_me:18980: checking for db.h" >&5
-+echo "$as_me:19124: checking for db.h" >&5
- echo $ECHO_N "checking for db.h... $ECHO_C" >&6
- if test "${ac_cv_header_db_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18986 "configure"
-+#line 19130 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:18990: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19134: \"$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:18996: \$? = $ac_status" >&5
-+  echo "$as_me:19140: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -19012,11 +19156,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:19015: result: $ac_cv_header_db_h" >&5
-+echo "$as_me:19159: result: $ac_cv_header_db_h" >&5
- echo "${ECHO_T}$ac_cv_header_db_h" >&6
- if test $ac_cv_header_db_h = yes; then
- 
--echo "$as_me:19019: checking for version of db" >&5
-+echo "$as_me:19163: checking for version of db" >&5
- echo $ECHO_N "checking for version of db... $ECHO_C" >&6
- if test "${cf_cv_hashed_db_version+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19027,10 +19171,10 @@
- for cf_db_version in 1 2 3 4 5 6
- do
- 
--echo "${as_me:-configure}:19030: testing checking for db version $cf_db_version ..." 1>&5
-+echo "${as_me:-configure}:19174: testing checking for db version $cf_db_version ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19033 "configure"
-+#line 19177 "configure"
- #include "confdefs.h"
- 
- $ac_includes_default
-@@ -19060,16 +19204,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19063: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19207: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19066: \$? = $ac_status" >&5
-+  echo "$as_me:19210: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19069: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19213: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19072: \$? = $ac_status" >&5
-+  echo "$as_me:19216: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_hashed_db_version=$cf_db_version
-@@ -19083,16 +19227,16 @@
- done
- 
- fi
--echo "$as_me:19086: result: $cf_cv_hashed_db_version" >&5
-+echo "$as_me:19230: result: $cf_cv_hashed_db_version" >&5
- echo "${ECHO_T}$cf_cv_hashed_db_version" >&6
- 
- if test "$cf_cv_hashed_db_version" = unknown ; then
--	{ { echo "$as_me:19090: error: Cannot determine version of db" >&5
-+	{ { echo "$as_me:19234: error: Cannot determine version of db" >&5
- echo "$as_me: error: Cannot determine version of db" >&2;}
-    { (exit 1); exit 1; }; }
- else
- 
--echo "$as_me:19095: checking for db libraries" >&5
-+echo "$as_me:19239: checking for db libraries" >&5
- echo $ECHO_N "checking for db libraries... $ECHO_C" >&6
- if test "${cf_cv_hashed_db_libs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19122,10 +19266,10 @@
- 
- 	fi
- 
--echo "${as_me:-configure}:19125: testing checking for library "$cf_db_libs" ..." 1>&5
-+echo "${as_me:-configure}:19269: testing checking for library "$cf_db_libs" ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19128 "configure"
-+#line 19272 "configure"
- #include "confdefs.h"
- 
- $ac_includes_default
-@@ -19180,16 +19324,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19183: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19327: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19186: \$? = $ac_status" >&5
-+  echo "$as_me:19330: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19189: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19333: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19192: \$? = $ac_status" >&5
-+  echo "$as_me:19336: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	if test -n "$cf_db_libs" ; then
-@@ -19209,11 +19353,11 @@
- done
- 
- fi
--echo "$as_me:19212: result: $cf_cv_hashed_db_libs" >&5
-+echo "$as_me:19356: result: $cf_cv_hashed_db_libs" >&5
- echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6
- 
- 	if test "$cf_cv_hashed_db_libs" = unknown ; then
--		{ { echo "$as_me:19216: error: Cannot determine library for db" >&5
-+		{ { echo "$as_me:19360: error: Cannot determine library for db" >&5
- echo "$as_me: error: Cannot determine library for db" >&2;}
-    { (exit 1); exit 1; }; }
- 	elif test "$cf_cv_hashed_db_libs" != default ; then
-@@ -19239,7 +19383,7 @@
- 
- else
- 
--	{ { echo "$as_me:19242: error: Cannot find db.h" >&5
-+	{ { echo "$as_me:19386: error: Cannot find db.h" >&5
- echo "$as_me: error: Cannot find db.h" >&2;}
-    { (exit 1); exit 1; }; }
- 
-@@ -19254,7 +19398,7 @@
- 
- # Just in case, check if the C compiler has a bool type.
- 
--echo "$as_me:19257: checking if we should include stdbool.h" >&5
-+echo "$as_me:19401: checking if we should include stdbool.h" >&5
- echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
- 
- if test "${cf_cv_header_stdbool_h+set}" = set; then
-@@ -19262,7 +19406,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19265 "configure"
-+#line 19409 "configure"
- #include "confdefs.h"
- 
- int
-@@ -19274,23 +19418,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19277: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19421: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19280: \$? = $ac_status" >&5
-+  echo "$as_me:19424: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19283: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19427: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19286: \$? = $ac_status" >&5
-+  echo "$as_me:19430: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=0
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 19293 "configure"
-+#line 19437 "configure"
- #include "confdefs.h"
- 
- #ifndef __BEOS__
-@@ -19306,16 +19450,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19309: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19453: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19312: \$? = $ac_status" >&5
-+  echo "$as_me:19456: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19315: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19459: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19318: \$? = $ac_status" >&5
-+  echo "$as_me:19462: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=1
- else
-@@ -19329,13 +19473,13 @@
- fi
- 
- if test "$cf_cv_header_stdbool_h" = 1
--then	echo "$as_me:19332: result: yes" >&5
-+then	echo "$as_me:19476: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:19334: result: no" >&5
-+else	echo "$as_me:19478: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:19338: checking for builtin bool type" >&5
-+echo "$as_me:19482: checking for builtin bool type" >&5
- echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
- 
- if test "${cf_cv_cc_bool_type+set}" = set; then
-@@ -19343,7 +19487,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19346 "configure"
-+#line 19490 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -19358,16 +19502,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19361: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19505: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19364: \$? = $ac_status" >&5
-+  echo "$as_me:19508: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19367: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19511: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19370: \$? = $ac_status" >&5
-+  echo "$as_me:19514: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cc_bool_type=1
- else
-@@ -19380,9 +19524,9 @@
- fi
- 
- if test "$cf_cv_cc_bool_type" = 1
--then	echo "$as_me:19383: result: yes" >&5
-+then	echo "$as_me:19527: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:19385: result: no" >&5
-+else	echo "$as_me:19529: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -19399,10 +19543,10 @@
- 
- 	cf_save="$LIBS"
- 	LIBS="$LIBS $CXXLIBS"
--	echo "$as_me:19402: checking if we already have C++ library" >&5
-+	echo "$as_me:19546: checking if we already have C++ library" >&5
- echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19405 "configure"
-+#line 19549 "configure"
- #include "confdefs.h"
- 
- 			#include 
-@@ -19416,16 +19560,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19419: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19563: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19422: \$? = $ac_status" >&5
-+  echo "$as_me:19566: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19425: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19569: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19428: \$? = $ac_status" >&5
-+  echo "$as_me:19572: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_have_libstdcpp=yes
- else
-@@ -19434,7 +19578,7 @@
- cf_have_libstdcpp=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--	echo "$as_me:19437: result: $cf_have_libstdcpp" >&5
-+	echo "$as_me:19581: result: $cf_have_libstdcpp" >&5
- echo "${ECHO_T}$cf_have_libstdcpp" >&6
- 	LIBS="$cf_save"
- 
-@@ -19453,7 +19597,7 @@
- 			;;
- 		esac
- 
--		echo "$as_me:19456: checking for library $cf_stdcpp_libname" >&5
-+		echo "$as_me:19600: checking for library $cf_stdcpp_libname" >&5
- echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6
- if test "${cf_cv_libstdcpp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19479,7 +19623,7 @@
- LIBS="$cf_add_libs"
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 19482 "configure"
-+#line 19626 "configure"
- #include "confdefs.h"
- 
- 				#include 
-@@ -19493,16 +19637,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19496: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19640: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19499: \$? = $ac_status" >&5
-+  echo "$as_me:19643: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19502: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19646: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19505: \$? = $ac_status" >&5
-+  echo "$as_me:19649: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_libstdcpp=yes
- else
-@@ -19514,7 +19658,7 @@
- 			LIBS="$cf_save"
- 
- fi
--echo "$as_me:19517: result: $cf_cv_libstdcpp" >&5
-+echo "$as_me:19661: result: $cf_cv_libstdcpp" >&5
- echo "${ECHO_T}$cf_cv_libstdcpp" >&6
- 		test "$cf_cv_libstdcpp" = yes && {
- cf_add_libs="-l$cf_stdcpp_libname"
-@@ -19536,7 +19680,7 @@
- 	fi
- fi
- 
--	echo "$as_me:19539: checking whether $CXX understands -c and -o together" >&5
-+	echo "$as_me:19683: checking whether $CXX understands -c and -o together" >&5
- echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6
- if test "${cf_cv_prog_CXX_c_o+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19552,15 +19696,15 @@
- # We do the test twice because some compilers refuse to overwrite an
- # existing .o file with -o, though they will create one.
- ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
--if { (eval echo "$as_me:19555: \"$ac_try\"") >&5
-+if { (eval echo "$as_me:19699: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19558: \$? = $ac_status" >&5
-+  echo "$as_me:19702: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--  test -f conftest2.$ac_objext && { (eval echo "$as_me:19560: \"$ac_try\"") >&5
-+  test -f conftest2.$ac_objext && { (eval echo "$as_me:19704: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19563: \$? = $ac_status" >&5
-+  echo "$as_me:19707: \$? = $ac_status" >&5
-   (exit $ac_status); };
- then
-   eval cf_cv_prog_CXX_c_o=yes
-@@ -19571,10 +19715,10 @@
- 
- fi
- if test $cf_cv_prog_CXX_c_o = yes; then
--  echo "$as_me:19574: result: yes" >&5
-+  echo "$as_me:19718: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--  echo "$as_me:19577: result: no" >&5
-+  echo "$as_me:19721: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -19594,7 +19738,7 @@
- 	;;
- esac
- if test "$GXX" = yes; then
--	echo "$as_me:19597: checking for lib$cf_gpp_libname" >&5
-+	echo "$as_me:19741: checking for lib$cf_gpp_libname" >&5
- echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
- 	cf_save="$LIBS"
- 
-@@ -19615,7 +19759,7 @@
- LIBS="$cf_add_libs"
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19618 "configure"
-+#line 19762 "configure"
- #include "confdefs.h"
- 
- #include <$cf_gpp_libname/builtin.h>
-@@ -19629,16 +19773,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19632: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19776: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19635: \$? = $ac_status" >&5
-+  echo "$as_me:19779: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19638: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19782: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19641: \$? = $ac_status" >&5
-+  echo "$as_me:19785: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cxx_library=yes
- 
-@@ -19675,7 +19819,7 @@
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 19678 "configure"
-+#line 19822 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -19689,16 +19833,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19692: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19836: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19695: \$? = $ac_status" >&5
-+  echo "$as_me:19839: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19698: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19842: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19701: \$? = $ac_status" >&5
-+  echo "$as_me:19845: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cxx_library=yes
- 
-@@ -19731,7 +19875,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	LIBS="$cf_save"
--	echo "$as_me:19734: result: $cf_cxx_library" >&5
-+	echo "$as_me:19878: result: $cf_cxx_library" >&5
- echo "${ECHO_T}$cf_cxx_library" >&6
- fi
- 
-@@ -19747,7 +19891,7 @@
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- ac_main_return=return
--echo "$as_me:19750: checking how to run the C++ preprocessor" >&5
-+echo "$as_me:19894: checking how to run the C++ preprocessor" >&5
- echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
- if test -z "$CXXCPP"; then
-   if test "${ac_cv_prog_CXXCPP+set}" = set; then
-@@ -19764,18 +19908,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19767 "configure"
-+#line 19911 "configure"
- #include "confdefs.h"
- #include 
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:19772: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19916: \"$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:19778: \$? = $ac_status" >&5
-+  echo "$as_me:19922: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19798,17 +19942,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19801 "configure"
-+#line 19945 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:19805: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19949: \"$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:19811: \$? = $ac_status" >&5
-+  echo "$as_me:19955: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19845,7 +19989,7 @@
- else
-   ac_cv_prog_CXXCPP=$CXXCPP
- fi
--echo "$as_me:19848: result: $CXXCPP" >&5
-+echo "$as_me:19992: result: $CXXCPP" >&5
- echo "${ECHO_T}$CXXCPP" >&6
- ac_preproc_ok=false
- for ac_cxx_preproc_warn_flag in '' yes
-@@ -19855,18 +19999,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19858 "configure"
-+#line 20002 "configure"
- #include "confdefs.h"
- #include 
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:19863: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:20007: \"$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:19869: \$? = $ac_status" >&5
-+  echo "$as_me:20013: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19889,17 +20033,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19892 "configure"
-+#line 20036 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:19896: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:20040: \"$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:19902: \$? = $ac_status" >&5
-+  echo "$as_me:20046: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19927,7 +20071,7 @@
- if $ac_preproc_ok; then
-   :
- else
--  { { echo "$as_me:19930: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
-+  { { echo "$as_me:20074: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
- echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -19942,23 +20086,23 @@
- for ac_header in typeinfo
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:19945: checking for $ac_header" >&5
-+echo "$as_me:20089: 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 19951 "configure"
-+#line 20095 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:19955: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:20099: \"$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:19961: \$? = $ac_status" >&5
-+  echo "$as_me:20105: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19977,7 +20121,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:19980: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:20124: 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 <&5
-+echo "$as_me:20137: 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 19999 "configure"
-+#line 20143 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:20003: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:20147: \"$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:20009: \$? = $ac_status" >&5
-+  echo "$as_me:20153: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -20025,7 +20169,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:20028: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:20172: 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 <&5
-+	echo "$as_me:20183: checking if iostream uses std-namespace" >&5
- echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 20042 "configure"
-+#line 20186 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -20056,16 +20200,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20059: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20203: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20062: \$? = $ac_status" >&5
-+  echo "$as_me:20206: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20065: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20209: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20068: \$? = $ac_status" >&5
-+  echo "$as_me:20212: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_iostream_namespace=yes
- else
-@@ -20074,7 +20218,7 @@
- cf_iostream_namespace=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:20077: result: $cf_iostream_namespace" >&5
-+	echo "$as_me:20221: result: $cf_iostream_namespace" >&5
- echo "${ECHO_T}$cf_iostream_namespace" >&6
- 	if test "$cf_iostream_namespace" = yes ; then
- 
-@@ -20085,7 +20229,7 @@
- 	fi
- fi
- 
--echo "$as_me:20088: checking if we should include stdbool.h" >&5
-+echo "$as_me:20232: checking if we should include stdbool.h" >&5
- echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
- 
- if test "${cf_cv_header_stdbool_h+set}" = set; then
-@@ -20093,7 +20237,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 20096 "configure"
-+#line 20240 "configure"
- #include "confdefs.h"
- 
- int
-@@ -20105,23 +20249,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20108: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20252: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20111: \$? = $ac_status" >&5
-+  echo "$as_me:20255: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20114: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20258: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20117: \$? = $ac_status" >&5
-+  echo "$as_me:20261: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=0
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 20124 "configure"
-+#line 20268 "configure"
- #include "confdefs.h"
- 
- #ifndef __BEOS__
-@@ -20137,16 +20281,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20140: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20284: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20143: \$? = $ac_status" >&5
-+  echo "$as_me:20287: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20146: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20290: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20149: \$? = $ac_status" >&5
-+  echo "$as_me:20293: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=1
- else
-@@ -20160,13 +20304,13 @@
- fi
- 
- if test "$cf_cv_header_stdbool_h" = 1
--then	echo "$as_me:20163: result: yes" >&5
-+then	echo "$as_me:20307: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:20165: result: no" >&5
-+else	echo "$as_me:20309: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:20169: checking for builtin bool type" >&5
-+echo "$as_me:20313: checking for builtin bool type" >&5
- echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
- 
- if test "${cf_cv_builtin_bool+set}" = set; then
-@@ -20174,7 +20318,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 20177 "configure"
-+#line 20321 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -20189,16 +20333,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20192: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20336: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20195: \$? = $ac_status" >&5
-+  echo "$as_me:20339: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20198: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20342: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20201: \$? = $ac_status" >&5
-+  echo "$as_me:20345: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_builtin_bool=1
- else
-@@ -20211,13 +20355,13 @@
- fi
- 
- if test "$cf_cv_builtin_bool" = 1
--then	echo "$as_me:20214: result: yes" >&5
-+then	echo "$as_me:20358: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:20216: result: no" >&5
-+else	echo "$as_me:20360: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:20220: checking for size of bool" >&5
-+echo "$as_me:20364: checking for size of bool" >&5
- echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
- if test "${cf_cv_type_of_bool+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20228,7 +20372,7 @@
-   cf_cv_type_of_bool=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20231 "configure"
-+#line 20375 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -20270,15 +20414,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20273: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20417: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20276: \$? = $ac_status" >&5
-+  echo "$as_me:20420: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20278: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20422: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20281: \$? = $ac_status" >&5
-+  echo "$as_me:20425: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_of_bool=`cat cf_test.out`
- 		 if test -z "$cf_cv_type_of_bool"; then
-@@ -20296,18 +20440,18 @@
- fi
- 
- 	rm -f cf_test.out
--echo "$as_me:20299: result: $cf_cv_type_of_bool" >&5
-+echo "$as_me:20443: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- if test "$cf_cv_type_of_bool" = unknown ; then
- 	case .$NCURSES_BOOL in
- 	(.auto|.) NCURSES_BOOL=unsigned;;
- 	esac
--	{ echo "$as_me:20305: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-+	{ echo "$as_me:20449: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
- echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
- 	cf_cv_type_of_bool=$NCURSES_BOOL
- fi
- 
--echo "$as_me:20310: checking for special defines needed for etip.h" >&5
-+echo "$as_me:20454: checking for special defines needed for etip.h" >&5
- echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6
- cf_save_CXXFLAGS="$CXXFLAGS"
- cf_result="none"
-@@ -20325,7 +20469,7 @@
- 	test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}"
- 	test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
- cat >conftest.$ac_ext <<_ACEOF
--#line 20328 "configure"
-+#line 20472 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -20339,16 +20483,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20342: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20486: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20345: \$? = $ac_status" >&5
-+  echo "$as_me:20489: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20348: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20492: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20351: \$? = $ac_status" >&5
-+  echo "$as_me:20495: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	test -n "$cf_math" && cat >>confdefs.h <&5
-+echo "$as_me:20516: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- CXXFLAGS="$cf_save_CXXFLAGS"
- 
- if test -n "$CXX"; then
--echo "$as_me:20377: checking if $CXX accepts parameter initialization" >&5
-+echo "$as_me:20521: checking if $CXX accepts parameter initialization" >&5
- echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6
- if test "${cf_cv_cpp_param_init+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20391,7 +20535,7 @@
-   cf_cv_cpp_param_init=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20394 "configure"
-+#line 20538 "configure"
- #include "confdefs.h"
- 
- class TEST {
-@@ -20410,15 +20554,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20413: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20557: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20416: \$? = $ac_status" >&5
-+  echo "$as_me:20560: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20418: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20562: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20421: \$? = $ac_status" >&5
-+  echo "$as_me:20565: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cpp_param_init=yes
- else
-@@ -20437,7 +20581,7 @@
- ac_main_return=return
- 
- fi
--echo "$as_me:20440: result: $cf_cv_cpp_param_init" >&5
-+echo "$as_me:20584: result: $cf_cv_cpp_param_init" >&5
- echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
- fi
- test "$cf_cv_cpp_param_init" = yes &&
-@@ -20447,7 +20591,7 @@
- 
- if test -n "$CXX"; then
- 
--echo "$as_me:20450: checking if $CXX accepts static_cast" >&5
-+echo "$as_me:20594: checking if $CXX accepts static_cast" >&5
- echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6
- if test "${cf_cv_cpp_static_cast+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20461,7 +20605,7 @@
- ac_main_return=return
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 20464 "configure"
-+#line 20608 "configure"
- #include "confdefs.h"
- 
- class NCursesPanel
-@@ -20505,16 +20649,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20508: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20652: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20511: \$? = $ac_status" >&5
-+  echo "$as_me:20655: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20514: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20658: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20517: \$? = $ac_status" >&5
-+  echo "$as_me:20661: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cpp_static_cast=yes
- else
-@@ -20532,7 +20676,7 @@
- ac_main_return=return
- 
- fi
--echo "$as_me:20535: result: $cf_cv_cpp_static_cast" >&5
-+echo "$as_me:20679: result: $cf_cv_cpp_static_cast" >&5
- echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
- 
- fi
-@@ -20581,7 +20725,7 @@
- 	else
- 		if test "$cf_cv_header_stdbool_h" = 1 ; then
- 
--echo "$as_me:20584: checking for size of bool" >&5
-+echo "$as_me:20728: checking for size of bool" >&5
- echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
- if test "${cf_cv_type_of_bool+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20592,7 +20736,7 @@
-   cf_cv_type_of_bool=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20595 "configure"
-+#line 20739 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -20634,15 +20778,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20637: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20781: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20640: \$? = $ac_status" >&5
-+  echo "$as_me:20784: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20642: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20786: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20645: \$? = $ac_status" >&5
-+  echo "$as_me:20789: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_of_bool=`cat cf_test.out`
- 		 if test -z "$cf_cv_type_of_bool"; then
-@@ -20660,25 +20804,25 @@
- fi
- 
- 	rm -f cf_test.out
--echo "$as_me:20663: result: $cf_cv_type_of_bool" >&5
-+echo "$as_me:20807: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- if test "$cf_cv_type_of_bool" = unknown ; then
- 	case .$NCURSES_BOOL in
- 	(.auto|.) NCURSES_BOOL=unsigned;;
- 	esac
--	{ echo "$as_me:20669: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-+	{ echo "$as_me:20813: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
- echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
- 	cf_cv_type_of_bool=$NCURSES_BOOL
- fi
- 
- 		else
--			echo "$as_me:20675: checking for fallback type of bool" >&5
-+			echo "$as_me:20819: checking for fallback type of bool" >&5
- echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
- 			case "$host_cpu" in
- 			(i?86)	cf_cv_type_of_bool=char	;;
- 			(*)	cf_cv_type_of_bool=int	;;
- 			esac
--			echo "$as_me:20681: result: $cf_cv_type_of_bool" >&5
-+			echo "$as_me:20825: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- 		fi
- 	fi
-@@ -20707,7 +20851,7 @@
- 
- 	if test "$cf_with_ada" != "no" ; then
- 		if test "$with_libtool" != "no"; then
--			{ echo "$as_me:20710: WARNING: libtool does not support Ada - disabling feature" >&5
-+			{ echo "$as_me:20854: WARNING: libtool does not support Ada - disabling feature" >&5
- echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
- 			cf_with_ada=no
- 		fi
-@@ -20718,7 +20862,7 @@
- cf_ada_make=gnatmake
- # Extract the first word of "$cf_ada_make", so it can be a program name with args.
- set dummy $cf_ada_make; ac_word=$2
--echo "$as_me:20721: checking for $ac_word" >&5
-+echo "$as_me:20865: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_gnat_exists+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20733,7 +20877,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_gnat_exists="yes"
--echo "$as_me:20736: found $ac_dir/$ac_word" >&5
-+echo "$as_me:20880: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -20742,10 +20886,10 @@
- fi
- gnat_exists=$ac_cv_prog_gnat_exists
- if test -n "$gnat_exists"; then
--  echo "$as_me:20745: result: $gnat_exists" >&5
-+  echo "$as_me:20889: result: $gnat_exists" >&5
- echo "${ECHO_T}$gnat_exists" >&6
- else
--  echo "$as_me:20748: result: no" >&5
-+  echo "$as_me:20892: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -20754,12 +20898,12 @@
- 	cf_cv_prog_gnat_correct=no
- else
- 
--echo "$as_me:20757: checking for gnat version" >&5
-+echo "$as_me:20901: checking for gnat version" >&5
- echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
- cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
- 	grep '[0-9].[0-9][0-9]*' |\
- 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
--echo "$as_me:20762: result: $cf_gnat_version" >&5
-+echo "$as_me:20906: result: $cf_gnat_version" >&5
- echo "${ECHO_T}$cf_gnat_version" >&6
- 
- case $cf_gnat_version in
-@@ -20767,7 +20911,7 @@
- 	cf_cv_prog_gnat_correct=yes
- 	;;
- (*)
--	{ echo "$as_me:20770: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
-+	{ echo "$as_me:20914: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
- echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
- 	cf_cv_prog_gnat_correct=no
- 	;;
-@@ -20775,7 +20919,7 @@
- 
- 	# Extract the first word of "m4", so it can be a program name with args.
- set dummy m4; ac_word=$2
--echo "$as_me:20778: checking for $ac_word" >&5
-+echo "$as_me:20922: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_M4_exists+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20790,7 +20934,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_M4_exists="yes"
--echo "$as_me:20793: found $ac_dir/$ac_word" >&5
-+echo "$as_me:20937: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -20799,10 +20943,10 @@
- fi
- M4_exists=$ac_cv_prog_M4_exists
- if test -n "$M4_exists"; then
--  echo "$as_me:20802: result: $M4_exists" >&5
-+  echo "$as_me:20946: result: $M4_exists" >&5
- echo "${ECHO_T}$M4_exists" >&6
- else
--  echo "$as_me:20805: result: no" >&5
-+  echo "$as_me:20949: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -20811,7 +20955,7 @@
- 		echo Ada95 binding required program m4 not found. Ada95 binding disabled.
- 	fi
- 	if test "$cf_cv_prog_gnat_correct" = yes; then
--		echo "$as_me:20814: checking if GNAT works" >&5
-+		echo "$as_me:20958: checking if GNAT works" >&5
- echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
- 
- rm -rf conftest* *~conftest*
-@@ -20839,7 +20983,7 @@
- fi
- rm -rf conftest* *~conftest*
- 
--		echo "$as_me:20842: result: $cf_cv_prog_gnat_correct" >&5
-+		echo "$as_me:20986: result: $cf_cv_prog_gnat_correct" >&5
- echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
- 	fi
- fi
-@@ -20848,7 +20992,7 @@
- 
-  	ADAFLAGS="$ADAFLAGS -gnatpn"
- 
--	echo "$as_me:20851: checking optimization options for ADAFLAGS" >&5
-+	echo "$as_me:20995: checking optimization options for ADAFLAGS" >&5
- echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
- 	case "$CFLAGS" in
- 	(*-g*)
-@@ -20865,10 +21009,10 @@
- 
- 		;;
- 	esac
--	echo "$as_me:20868: result: $ADAFLAGS" >&5
-+	echo "$as_me:21012: result: $ADAFLAGS" >&5
- echo "${ECHO_T}$ADAFLAGS" >&6
- 
--echo "$as_me:20871: checking if GNATPREP supports -T option" >&5
-+echo "$as_me:21015: checking if GNATPREP supports -T option" >&5
- echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
- if test "${cf_cv_gnatprep_opt_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20878,11 +21022,11 @@
- gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
- 
- fi
--echo "$as_me:20881: result: $cf_cv_gnatprep_opt_t" >&5
-+echo "$as_me:21025: result: $cf_cv_gnatprep_opt_t" >&5
- echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
- test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
- 
--echo "$as_me:20885: checking if GNAT supports generics" >&5
-+echo "$as_me:21029: checking if GNAT supports generics" >&5
- echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
- case $cf_gnat_version in
- (3.[1-9]*|[4-9].*)
-@@ -20892,7 +21036,7 @@
- 	cf_gnat_generics=no
- 	;;
- esac
--echo "$as_me:20895: result: $cf_gnat_generics" >&5
-+echo "$as_me:21039: result: $cf_gnat_generics" >&5
- echo "${ECHO_T}$cf_gnat_generics" >&6
- 
- if test "$cf_gnat_generics" = yes
-@@ -20904,7 +21048,7 @@
- 	cf_generic_objects=
- fi
- 
--echo "$as_me:20907: checking if GNAT supports SIGINT" >&5
-+echo "$as_me:21051: checking if GNAT supports SIGINT" >&5
- echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
- if test "${cf_cv_gnat_sigint+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20952,7 +21096,7 @@
- rm -rf conftest* *~conftest*
- 
- fi
--echo "$as_me:20955: result: $cf_cv_gnat_sigint" >&5
-+echo "$as_me:21099: result: $cf_cv_gnat_sigint" >&5
- echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
- 
- if test $cf_cv_gnat_sigint = yes ; then
-@@ -20965,7 +21109,7 @@
- cf_gnat_projects=no
- 
- if test "$enable_gnat_projects" != no ; then
--echo "$as_me:20968: checking if GNAT supports project files" >&5
-+echo "$as_me:21112: checking if GNAT supports project files" >&5
- echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
- case $cf_gnat_version in
- (3.[0-9]*)
-@@ -21025,15 +21169,15 @@
- 	esac
- 	;;
- esac
--echo "$as_me:21028: result: $cf_gnat_projects" >&5
-+echo "$as_me:21172: result: $cf_gnat_projects" >&5
- echo "${ECHO_T}$cf_gnat_projects" >&6
- fi # enable_gnat_projects
- 
- if test $cf_gnat_projects = yes
- then
--	echo "$as_me:21034: checking if GNAT supports libraries" >&5
-+	echo "$as_me:21178: checking if GNAT supports libraries" >&5
- echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
--	echo "$as_me:21036: result: $cf_gnat_libraries" >&5
-+	echo "$as_me:21180: result: $cf_gnat_libraries" >&5
- echo "${ECHO_T}$cf_gnat_libraries" >&6
- fi
- 
-@@ -21053,7 +21197,7 @@
- 	USE_GNAT_LIBRARIES="#"
- fi
- 
--echo "$as_me:21056: checking for ada-compiler" >&5
-+echo "$as_me:21200: checking for ada-compiler" >&5
- echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
- 
- # Check whether --with-ada-compiler or --without-ada-compiler was given.
-@@ -21064,12 +21208,12 @@
-   cf_ada_compiler=gnatmake
- fi;
- 
--echo "$as_me:21067: result: $cf_ada_compiler" >&5
-+echo "$as_me:21211: result: $cf_ada_compiler" >&5
- echo "${ECHO_T}$cf_ada_compiler" >&6
- 
- 			cf_ada_package=terminal_interface
- 
--echo "$as_me:21072: checking for ada-include" >&5
-+echo "$as_me:21216: checking for ada-include" >&5
- echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
- 
- # Check whether --with-ada-include or --without-ada-include was given.
-@@ -21105,7 +21249,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:21108: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:21252: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -21114,10 +21258,10 @@
- fi
- eval ADA_INCLUDE="$withval"
- 
--echo "$as_me:21117: result: $ADA_INCLUDE" >&5
-+echo "$as_me:21261: result: $ADA_INCLUDE" >&5
- echo "${ECHO_T}$ADA_INCLUDE" >&6
- 
--echo "$as_me:21120: checking for ada-objects" >&5
-+echo "$as_me:21264: checking for ada-objects" >&5
- echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
- 
- # Check whether --with-ada-objects or --without-ada-objects was given.
-@@ -21153,7 +21297,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:21156: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:21300: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -21162,10 +21306,10 @@
- fi
- eval ADA_OBJECTS="$withval"
- 
--echo "$as_me:21165: result: $ADA_OBJECTS" >&5
-+echo "$as_me:21309: result: $ADA_OBJECTS" >&5
- echo "${ECHO_T}$ADA_OBJECTS" >&6
- 
--echo "$as_me:21168: checking if an Ada95 shared-library should be built" >&5
-+echo "$as_me:21312: checking if an Ada95 shared-library should be built" >&5
- echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
- 
- # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
-@@ -21175,7 +21319,7 @@
- else
-   with_ada_sharedlib=no
- fi;
--echo "$as_me:21178: result: $with_ada_sharedlib" >&5
-+echo "$as_me:21322: result: $with_ada_sharedlib" >&5
- echo "${ECHO_T}$with_ada_sharedlib" >&6
- 
- ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
-@@ -21198,13 +21342,13 @@
- 
- # do this "late" to avoid conflict with header-checks
- if test "x$with_widec" = xyes ; then
--	echo "$as_me:21201: checking for wchar_t" >&5
-+	echo "$as_me:21345: checking for wchar_t" >&5
- echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6
- if test "${ac_cv_type_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 21207 "configure"
-+#line 21351 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21219,16 +21363,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21222: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21366: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21225: \$? = $ac_status" >&5
-+  echo "$as_me:21369: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21228: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21372: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21231: \$? = $ac_status" >&5
-+  echo "$as_me:21375: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_wchar_t=yes
- else
-@@ -21238,10 +21382,10 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:21241: result: $ac_cv_type_wchar_t" >&5
-+echo "$as_me:21385: result: $ac_cv_type_wchar_t" >&5
- echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
- 
--echo "$as_me:21244: checking size of wchar_t" >&5
-+echo "$as_me:21388: checking size of wchar_t" >&5
- echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6
- if test "${ac_cv_sizeof_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -21250,7 +21394,7 @@
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
--#line 21253 "configure"
-+#line 21397 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21262,21 +21406,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21265: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21409: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21268: \$? = $ac_status" >&5
-+  echo "$as_me:21412: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21271: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21415: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21274: \$? = $ac_status" >&5
-+  echo "$as_me:21418: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=0 ac_mid=0
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 21279 "configure"
-+#line 21423 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21288,16 +21432,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21291: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21435: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21294: \$? = $ac_status" >&5
-+  echo "$as_me:21438: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21297: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21441: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21300: \$? = $ac_status" >&5
-+  echo "$as_me:21444: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid; break
- else
-@@ -21313,7 +21457,7 @@
- ac_hi=-1 ac_mid=-1
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 21316 "configure"
-+#line 21460 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21325,16 +21469,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21328: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21472: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21331: \$? = $ac_status" >&5
-+  echo "$as_me:21475: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21334: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21478: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21337: \$? = $ac_status" >&5
-+  echo "$as_me:21481: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=$ac_mid; break
- else
-@@ -21350,7 +21494,7 @@
- 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 21353 "configure"
-+#line 21497 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21362,16 +21506,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21365: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21509: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21368: \$? = $ac_status" >&5
-+  echo "$as_me:21512: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21371: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21515: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21374: \$? = $ac_status" >&5
-+  echo "$as_me:21518: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid
- else
-@@ -21384,12 +21528,12 @@
- ac_cv_sizeof_wchar_t=$ac_lo
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:21387: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:21531: 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 21392 "configure"
-+#line 21536 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21405,15 +21549,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:21408: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21552: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:21411: \$? = $ac_status" >&5
-+  echo "$as_me:21555: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:21413: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21557: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21416: \$? = $ac_status" >&5
-+  echo "$as_me:21560: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_wchar_t=`cat conftest.val`
- else
-@@ -21429,7 +21573,7 @@
-   ac_cv_sizeof_wchar_t=0
- fi
- fi
--echo "$as_me:21432: result: $ac_cv_sizeof_wchar_t" >&5
-+echo "$as_me:21576: result: $ac_cv_sizeof_wchar_t" >&5
- echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
- cat >>confdefs.h <&5
-+echo "$as_me:21594: checking for library subsets" >&5
- echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
- LIB_SUBSETS=
- 
-@@ -21489,7 +21633,7 @@
- test "x$with_widec"     = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
- test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
- 
--echo "$as_me:21492: result: $LIB_SUBSETS" >&5
-+echo "$as_me:21636: result: $LIB_SUBSETS" >&5
- echo "${ECHO_T}$LIB_SUBSETS" >&6
- 
- ### Construct the list of include-directories to be generated
-@@ -21520,7 +21664,7 @@
- fi
- 
- ### Build up pieces for makefile rules
--echo "$as_me:21523: checking default library suffix" >&5
-+echo "$as_me:21667: checking default library suffix" >&5
- echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -21531,10 +21675,10 @@
- 	(shared)  DFT_ARG_SUFFIX=''   ;;
- 	esac
- 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
--echo "$as_me:21534: result: $DFT_ARG_SUFFIX" >&5
-+echo "$as_me:21678: result: $DFT_ARG_SUFFIX" >&5
- echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
- 
--echo "$as_me:21537: checking default library-dependency suffix" >&5
-+echo "$as_me:21681: checking default library-dependency suffix" >&5
- echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
- 
- 	case X$DFT_LWR_MODEL in
-@@ -21592,10 +21736,10 @@
- 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
- 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
- 	fi
--echo "$as_me:21595: result: $DFT_DEP_SUFFIX" >&5
-+echo "$as_me:21739: result: $DFT_DEP_SUFFIX" >&5
- echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
- 
--echo "$as_me:21598: checking default object directory" >&5
-+echo "$as_me:21742: checking default object directory" >&5
- echo $ECHO_N "checking default object directory... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -21611,11 +21755,11 @@
- 			DFT_OBJ_SUBDIR='obj_s' ;;
- 		esac
- 	esac
--echo "$as_me:21614: result: $DFT_OBJ_SUBDIR" >&5
-+echo "$as_me:21758: result: $DFT_OBJ_SUBDIR" >&5
- echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
- 
- if test "x$cf_with_cxx" = xyes ; then
--echo "$as_me:21618: checking c++ library-dependency suffix" >&5
-+echo "$as_me:21762: checking c++ library-dependency suffix" >&5
- echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
- if test "$with_libtool" != "no"; then
- 	# libtool thinks it can make c++ shared libraries (perhaps only g++)
-@@ -21683,7 +21827,7 @@
- 	fi
- 
- fi
--echo "$as_me:21686: result: $CXX_LIB_SUFFIX" >&5
-+echo "$as_me:21830: result: $CXX_LIB_SUFFIX" >&5
- echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
- 
- fi
-@@ -21859,19 +22003,19 @@
- 
- if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
- then
--	echo "$as_me:21862: checking if linker supports switching between static/dynamic" >&5
-+	echo "$as_me:22006: checking if linker supports switching between static/dynamic" >&5
- echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6
- 
- 	rm -f libconftest.a
- 	cat >conftest.$ac_ext <
- int cf_ldflags_static(FILE *fp) { return fflush(fp); }
- EOF
--	if { (eval echo "$as_me:21871: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:22015: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21874: \$? = $ac_status" >&5
-+  echo "$as_me:22018: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 		( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null
- 		( eval $RANLIB libconftest.a ) 2>&5 >/dev/null
-@@ -21882,10 +22026,10 @@
- 
- 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 21885 "configure"
-+#line 22029 "configure"
- #include "confdefs.h"
- 
--#line 21888 "configure"
-+#line 22032 "configure"
- #include 
- int cf_ldflags_static(FILE *fp);
- 
-@@ -21900,16 +22044,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:21903: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:22047: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:21906: \$? = $ac_status" >&5
-+  echo "$as_me:22050: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:21909: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:22053: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21912: \$? = $ac_status" >&5
-+  echo "$as_me:22056: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	# some linkers simply ignore the -dynamic
-@@ -21932,7 +22076,7 @@
- 	rm -f libconftest.*
- 	LIBS="$cf_save_LIBS"
- 
--	echo "$as_me:21935: result: $cf_ldflags_static" >&5
-+	echo "$as_me:22079: result: $cf_ldflags_static" >&5
- echo "${ECHO_T}$cf_ldflags_static" >&6
- 
- 	if test $cf_ldflags_static != yes
-@@ -21948,7 +22092,7 @@
- 	;;
- esac
- 
--echo "$as_me:21951: checking where we will install curses.h" >&5
-+echo "$as_me:22095: checking where we will install curses.h" >&5
- echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
- 
- includesubdir=
-@@ -21958,7 +22102,7 @@
- then
- 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
- fi
--echo "$as_me:21961: result: ${includedir}${includesubdir}" >&5
-+echo "$as_me:22105: result: ${includedir}${includesubdir}" >&5
- echo "${ECHO_T}${includedir}${includesubdir}" >&6
- 
- ### Resolve a conflict between normal and wide-curses by forcing applications
-@@ -21966,7 +22110,7 @@
- if test "$with_overwrite" != no ; then
- if test "$NCURSES_LIBUTF8" = 1 ; then
- 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
--	{ echo "$as_me:21969: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
-+	{ echo "$as_me:22113: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
- echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
- fi
- fi
-@@ -21984,7 +22128,7 @@
- ### Construct the list of subdirectories for which we'll customize makefiles
- ### with the appropriate compile-rules.
- 
--echo "$as_me:21987: checking for src modules" >&5
-+echo "$as_me:22131: checking for src modules" >&5
- echo $ECHO_N "checking for src modules... $ECHO_C" >&6
- 
- # dependencies and linker-arguments for test-programs
-@@ -22049,7 +22193,7 @@
- 		fi
- 	fi
- done
--echo "$as_me:22052: result: $cf_cv_src_modules" >&5
-+echo "$as_me:22196: result: $cf_cv_src_modules" >&5
- echo "${ECHO_T}$cf_cv_src_modules" >&6
- 
- TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
-@@ -22266,7 +22410,7 @@
- 
- # Extract the first word of "tic", so it can be a program name with args.
- set dummy tic; ac_word=$2
--echo "$as_me:22269: checking for $ac_word" >&5
-+echo "$as_me:22413: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_TIC_PATH+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -22283,7 +22427,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   if $as_executable_p "$ac_dir/$ac_word"; then
-    ac_cv_path_TIC_PATH="$ac_dir/$ac_word"
--   echo "$as_me:22286: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:22430: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -22295,10 +22439,10 @@
- TIC_PATH=$ac_cv_path_TIC_PATH
- 
- if test -n "$TIC_PATH"; then
--  echo "$as_me:22298: result: $TIC_PATH" >&5
-+  echo "$as_me:22442: result: $TIC_PATH" >&5
- echo "${ECHO_T}$TIC_PATH" >&6
- else
--  echo "$as_me:22301: result: no" >&5
-+  echo "$as_me:22445: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -22306,7 +22450,7 @@
- then
- 	if test "$TIC_PATH" = unknown
- 	then
--		{ echo "$as_me:22309: WARNING: no tic program found for fallbacks" >&5
-+		{ echo "$as_me:22453: WARNING: no tic program found for fallbacks" >&5
- echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
- 	fi
- fi
-@@ -22342,7 +22486,7 @@
- 	(*-D_XOPEN_SOURCE_EXTENDED*)
- 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
- 
--echo "${as_me:-configure}:22345: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
-+echo "${as_me:-configure}:22489: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
- 
- 		CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
- 		CPPFLAGS=`echo "x$CPPFLAGS" | sed -e  's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'`
-@@ -22353,7 +22497,7 @@
- 
- # Help to automatically enable the extended curses features when using either
- # the *-config or the ".pc" files by adding defines.
--echo "$as_me:22356: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
-+echo "$as_me:22500: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
- echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6
- PKG_CFLAGS=
- for cf_loop1 in $CPPFLAGS_after_XOPEN
-@@ -22369,7 +22513,7 @@
- 	done
- 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
- done
--echo "$as_me:22372: result: $PKG_CFLAGS" >&5
-+echo "$as_me:22516: result: $PKG_CFLAGS" >&5
- echo "${ECHO_T}$PKG_CFLAGS" >&6
- 
- # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
-@@ -22426,7 +22570,7 @@
- 	cf_filter_syms=$cf_dft_filter_syms
- 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_version" 1>&6
- 
--echo "${as_me:-configure}:22429: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
-+echo "${as_me:-configure}:22573: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
- 
- fi
- 
-@@ -22528,7 +22672,7 @@
- : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ echo "$as_me:22531: creating $CONFIG_STATUS" >&5
-+{ echo "$as_me:22675: creating $CONFIG_STATUS" >&5
- echo "$as_me: creating $CONFIG_STATUS" >&6;}
- cat >$CONFIG_STATUS <<_ACEOF
- #! $SHELL
-@@ -22704,7 +22848,7 @@
-     echo "$ac_cs_version"; exit 0 ;;
-   --he | --h)
-     # Conflict between --help and --header
--    { { echo "$as_me:22707: error: ambiguous option: $1
-+    { { echo "$as_me:22851: 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;}
-@@ -22723,7 +22867,7 @@
-     ac_need_defaults=false;;
- 
-   # This is an error.
--  -*) { { echo "$as_me:22726: error: unrecognized option: $1
-+  -*) { { echo "$as_me:22870: 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;}
-@@ -22842,7 +22986,7 @@
-   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
--  *) { { echo "$as_me:22845: error: invalid argument: $ac_config_target" >&5
-+  *) { { echo "$as_me:22989: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
-@@ -23059,6 +23203,7 @@
- s,@TERMPATH@,$TERMPATH,;t t
- s,@NCURSES_USE_TERMCAP@,$NCURSES_USE_TERMCAP,;t t
- s,@BROKEN_LINKER@,$BROKEN_LINKER,;t t
-+s,@NCURSES_WCWIDTH_GRAPHICS@,$NCURSES_WCWIDTH_GRAPHICS,;t t
- s,@NCURSES_CH_T@,$NCURSES_CH_T,;t t
- s,@NCURSES_LIBUTF8@,$NCURSES_LIBUTF8,;t t
- s,@NEED_WCHAR_H@,$NEED_WCHAR_H,;t t
-@@ -23316,7 +23461,7 @@
-   esac
- 
-   if test x"$ac_file" != x-; then
--    { echo "$as_me:23319: creating $ac_file" >&5
-+    { echo "$as_me:23464: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
-     rm -f "$ac_file"
-   fi
-@@ -23334,7 +23479,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:23337: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:23482: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -23347,7 +23492,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:23350: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:23495: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -23363,7 +23508,7 @@
-       if test -n "$ac_seen"; then
-         ac_used=`grep '@datarootdir@' $ac_item`
-         if test -z "$ac_used"; then
--          { echo "$as_me:23366: WARNING: datarootdir was used implicitly but not set:
-+          { echo "$as_me:23511: 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;}
-@@ -23372,7 +23517,7 @@
-       fi
-       ac_seen=`grep '${datarootdir}' $ac_item`
-       if test -n "$ac_seen"; then
--        { echo "$as_me:23375: WARNING: datarootdir was used explicitly but not set:
-+        { echo "$as_me:23520: 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;}
-@@ -23409,7 +23554,7 @@
-             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:23412: WARNING: Variable $ac_name is used but was not set:
-+              { echo "$as_me:23557: 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;}
-@@ -23420,7 +23565,7 @@
-     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:23423: WARNING: Some variables may not be substituted:
-+      { echo "$as_me:23568: WARNING: Some variables may not be substituted:
- $ac_seen" >&5
- echo "$as_me: WARNING: Some variables may not be substituted:
- $ac_seen" >&2;}
-@@ -23469,7 +23614,7 @@
-   * )   ac_file_in=$ac_file.in ;;
-   esac
- 
--  test x"$ac_file" != x- && { echo "$as_me:23472: creating $ac_file" >&5
-+  test x"$ac_file" != x- && { echo "$as_me:23617: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
- 
-   # First look for the input files in the build tree, otherwise in the
-@@ -23480,7 +23625,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:23483: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:23628: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -23493,7 +23638,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:23496: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:23641: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -23551,7 +23696,7 @@
-   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:23554: $ac_file is unchanged" >&5
-+      { echo "$as_me:23699: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
-     else
-       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-@@ -23896,7 +24041,7 @@
- 				(cygdll|msysdll|mingw)
- 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
- 
--echo "${as_me:-configure}:23899: testing overriding CXX_MODEL to SHARED ..." 1>&5
-+echo "${as_me:-configure}:24044: testing overriding CXX_MODEL to SHARED ..." 1>&5
- 
- 					with_shared_cxx=yes
- 					;;
-Index: configure.in
-Prereq:  1.623 
---- ncurses-6.0-20151212+/configure.in	2015-11-07 22:41:37.000000000 +0000
-+++ ncurses-6.0-20151219/configure.in	2015-12-20 02:07:23.000000000 +0000
-@@ -28,14 +28,14 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: configure.in,v 1.623 2015/11/07 22:41:37 tom Exp $
-+dnl $Id: configure.in,v 1.625 2015/12/20 02:07:23 tom Exp $
- dnl Process this file with autoconf to produce a configure script.
- dnl
- dnl See http://invisible-island.net/autoconf/ for additional information.
- dnl
- dnl ---------------------------------------------------------------------------
- AC_PREREQ(2.52.20030208)
--AC_REVISION($Revision: 1.623 $)
-+AC_REVISION($Revision: 1.625 $)
- AC_INIT(ncurses/base/lib_initscr.c)
- AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
- 
-@@ -830,6 +830,10 @@
- 	[with_widec=$enableval],
- 	[with_widec=no])
- AC_MSG_RESULT($with_widec)
-+
-+NCURSES_WCWIDTH_GRAPHICS=1
-+AC_SUBST(NCURSES_WCWIDTH_GRAPHICS)
-+
- if test "x$with_widec" = xyes ; then
- 	if test "x$disable_lib_suffixes" = xno ; then
- 		LIB_SUFFIX="w${LIB_SUFFIX}"
-@@ -838,6 +842,8 @@
- 	AC_DEFINE(NCURSES_WIDECHAR,1,[Define to 1 to compile with wide-char/UTF-8 code])
- 
- 	CF_CHECK_WCHAR_H
-+	CF_CHECK_WCWIDTH_GRAPHICS
-+	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
- 
- 	# with_overwrite=no
- 	NCURSES_CH_T=cchar_t
-Index: dist.mk
-Prereq:  1.1083 
---- ncurses-6.0-20151212+/dist.mk	2015-12-12 15:23:55.000000000 +0000
-+++ ncurses-6.0-20151219/dist.mk	2015-12-13 14:53:53.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1083 2015/12/12 15:23:55 tom Exp $
-+# $Id: dist.mk,v 1.1084 2015/12/13 14:53:53 tom Exp $
- # Makefile for creating ncurses distributions.
- #
- # This only needs to be used directly as a makefile by developers, but
-@@ -37,7 +37,7 @@
- # These define the major/minor/patch versions of ncurses.
- NCURSES_MAJOR = 6
- NCURSES_MINOR = 0
--NCURSES_PATCH = 20151212
-+NCURSES_PATCH = 20151219
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: doc/html/man/curs_attr.3x.html
---- ncurses-6.0-20151212+/doc/html/man/curs_attr.3x.html	2015-12-06 00:32:26.000000000 +0000
-+++ ncurses-6.0-20151219/doc/html/man/curs_attr.3x.html	2015-12-13 22:13:22.000000000 +0000
-@@ -174,8 +174,8 @@
- 
    Attributes
    -        The following video attributes, defined in <curses.h>, can
-        be passed to the routines attron, attroff, and attrset, or
--       OR'd with the characters passed to  addch  (see  curs_add-
--       ch(3x)).
-+       OR'd with the characters passed to  addch  (see  curs_add-
-+       ch(3x)).
- 
-               Name            Description
-               ------------------------------------------------------------
-Index: include/curses.h.in
-Prereq:  1.241 
---- ncurses-6.0-20151212+/include/curses.h.in	2014-08-09 20:39:44.000000000 +0000
-+++ ncurses-6.0-20151219/include/curses.h.in	2015-12-19 23:08:31.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2013,2014 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -32,7 +32,7 @@
-  *     and: Thomas E. Dickey                        1996-on                 *
-  ****************************************************************************/
- 
--/* $Id: curses.h.in,v 1.241 2014/08/09 20:39:44 tom Exp $ */
-+/* $Id: curses.h.in,v 1.242 2015/12/19 23:08:31 tom Exp $ */
- 
- #ifndef __NCURSES_H
- #define __NCURSES_H
-@@ -143,6 +143,13 @@
- #define NCURSES_TPARM_ARG @NCURSES_TPARM_ARG@
- 
- /*
-+ * Control whether ncurses uses wcwidth() for checking width of line-drawing
-+ * characters.
-+ */
-+#undef NCURSES_WCWIDTH_GRAPHICS
-+#define NCURSES_WCWIDTH_GRAPHICS @NCURSES_WCWIDTH_GRAPHICS@
-+
-+/*
-  * NCURSES_CH_T is used in building the library, but not used otherwise in
-  * this header file, since that would make the normal/wide-character versions
-  * of the header incompatible.
-Index: man/curs_attr.3x
-Prereq:  1.43 
---- ncurses-6.0-20151212+/man/curs_attr.3x	2015-12-05 18:46:04.000000000 +0000
-+++ ncurses-6.0-20151219/man/curs_attr.3x	2015-12-13 21:54:05.000000000 +0000
-@@ -27,7 +27,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_attr.3x,v 1.43 2015/12/05 18:46:04 tom Exp $
-+.\" $Id: curs_attr.3x,v 1.44 2015/12/13 21:54:05 tom Exp $
- .TH curs_attr 3X ""
- .na
- .hy 0
-@@ -190,7 +190,7 @@
- .SS Attributes
- The following video attributes, defined in \fB\fR, can be passed to
- the routines \fBattron\fR, \fBattroff\fR, and \fBattrset\fR, or OR'd with the
--characters passed to \fBaddch\fR (see curs_addch(3X)).
-+characters passed to \fBaddch\fR (see \fBcurs_addch\fR(3X)).
- .PP
- .RS
- .TS
-Index: man/curs_getch.3x
-Prereq:  1.43 
---- ncurses-6.0-20151212+/man/curs_getch.3x	2015-09-19 22:25:05.000000000 +0000
-+++ ncurses-6.0-20151219/man/curs_getch.3x	2015-12-20 01:43:03.000000000 +0000
-@@ -27,7 +27,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_getch.3x,v 1.43 2015/09/19 22:25:05 tom Exp $
-+.\" $Id: curs_getch.3x,v 1.44 2015/12/20 01:43:03 tom Exp $
- .TH curs_getch 3X ""
- .na
- .hy 0
-@@ -118,9 +118,17 @@
- There is just one input queue for all windows.
- .PP
- .SS Predefined key-codes
--The following special keys, defined in \fB\fR, may be returned by
--\fBgetch\fR if \fBkeypad\fR has been enabled.
-+The following special keys are defined in \fB\fR.
-+.bP
-+Except for the special case \fBKEY_RESIZE\fP,
-+it is necessary to enable \fBkeypad\fR for \fBgetch\fP to return these codes.
-+.bP
- Not all of these are necessarily supported on any particular terminal.
-+.bP
-+The naming convention may seem obscure, with some apparent
-+misspellings (such as "RSUME" for "resume").
-+The names correspond to the long terminfo capability names for the keys,
-+and were defined long ago, in the 1980s.
- .PP
- .TS
- center tab(/) ;
-Index: ncurses/base/lib_screen.c
-Prereq:  1.78 
---- ncurses-6.0-20151212+/ncurses/base/lib_screen.c	2015-09-12 20:47:43.000000000 +0000
-+++ ncurses-6.0-20151219/ncurses/base/lib_screen.c	2015-12-20 01:22:59.000000000 +0000
-@@ -41,7 +41,7 @@
- #define CUR SP_TERMTYPE
- #endif
- 
--MODULE_ID("$Id: lib_screen.c,v 1.78 2015/09/12 20:47:43 tom Exp $")
-+MODULE_ID("$Id: lib_screen.c,v 1.79 2015/12/20 01:22:59 tom Exp $")
- 
- #define MAX_SIZE 0x3fff		/* 16k is big enough for a window or pad */
- 
-@@ -588,7 +588,7 @@
- 	}
- #if NCURSES_EXT_PUTWIN
- 	else {
--	    char *txt;
-+	    char *txt = 0;
- 	    bool success = TRUE;
- 	    NCURSES_CH_T prior = blank;
- 
-Index: ncurses/tty/tty_update.c
-Prereq:  1.281 
---- ncurses-6.0-20151212+/ncurses/tty/tty_update.c	2015-12-13 00:39:28.000000000 +0000
-+++ ncurses-6.0-20151219/ncurses/tty/tty_update.c	2015-12-20 00:59:09.000000000 +0000
-@@ -82,7 +82,7 @@
- 
- #include 
- 
--MODULE_ID("$Id: tty_update.c,v 1.281 2015/12/13 00:39:28 tom Exp $")
-+MODULE_ID("$Id: tty_update.c,v 1.282 2015/12/20 00:59:09 tom Exp $")
- 
- /*
-  * This define controls the line-breakout optimization.  Every once in a
-@@ -207,6 +207,75 @@
- 		   SP_PARM->_curscol, "GoTo2");
- }
- 
-+#if !NCURSES_WCWIDTH_GRAPHICS
-+static bool
-+is_wacs_value(unsigned ch)
-+{
-+    bool result;
-+    switch (ch) {
-+    case 0x00a3:		/* FALLTHRU - ncurses pound-sterling symbol */
-+    case 0x00b0:		/* FALLTHRU - VT100 degree symbol */
-+    case 0x00b1:		/* FALLTHRU - VT100 plus/minus */
-+    case 0x00b7:		/* FALLTHRU - VT100 bullet */
-+    case 0x03c0:		/* FALLTHRU - ncurses greek pi */
-+    case 0x2190:		/* FALLTHRU - Teletype arrow pointing left */
-+    case 0x2191:		/* FALLTHRU - Teletype arrow pointing up */
-+    case 0x2192:		/* FALLTHRU - Teletype arrow pointing right */
-+    case 0x2193:		/* FALLTHRU - Teletype arrow pointing down */
-+    case 0x2260:		/* FALLTHRU - ncurses not-equal */
-+    case 0x2264:		/* FALLTHRU - ncurses less-than-or-equal-to */
-+    case 0x2265:		/* FALLTHRU - ncurses greater-than-or-equal-to */
-+    case 0x23ba:		/* FALLTHRU - VT100 scan line 1 */
-+    case 0x23bb:		/* FALLTHRU - ncurses scan line 3 */
-+    case 0x23bc:		/* FALLTHRU - ncurses scan line 7 */
-+    case 0x23bd:		/* FALLTHRU - VT100 scan line 9 */
-+    case 0x2500:		/* FALLTHRU - VT100 horizontal line */
-+    case 0x2501:		/* FALLTHRU - thick horizontal line */
-+    case 0x2502:		/* FALLTHRU - VT100 vertical line */
-+    case 0x2503:		/* FALLTHRU - thick vertical line */
-+    case 0x250c:		/* FALLTHRU - VT100 upper left corner */
-+    case 0x250f:		/* FALLTHRU - thick upper left corner */
-+    case 0x2510:		/* FALLTHRU - VT100 upper right corner */
-+    case 0x2513:		/* FALLTHRU - thick upper right corner */
-+    case 0x2514:		/* FALLTHRU - VT100 lower left corner */
-+    case 0x2517:		/* FALLTHRU - thick lower left corner */
-+    case 0x2518:		/* FALLTHRU - VT100 lower right corner */
-+    case 0x251b:		/* FALLTHRU - thick lower right corner */
-+    case 0x251c:		/* FALLTHRU - VT100 tee pointing left */
-+    case 0x2523:		/* FALLTHRU - thick tee pointing left */
-+    case 0x2524:		/* FALLTHRU - VT100 tee pointing right */
-+    case 0x252b:		/* FALLTHRU - thick tee pointing right */
-+    case 0x252c:		/* FALLTHRU - VT100 tee pointing down */
-+    case 0x2533:		/* FALLTHRU - thick tee pointing down */
-+    case 0x2534:		/* FALLTHRU - VT100 tee pointing up */
-+    case 0x253b:		/* FALLTHRU - thick tee pointing up */
-+    case 0x253c:		/* FALLTHRU - VT100 large plus or crossover */
-+    case 0x254b:		/* FALLTHRU - thick large plus or crossover */
-+    case 0x2550:		/* FALLTHRU - double horizontal line */
-+    case 0x2551:		/* FALLTHRU - double vertical line */
-+    case 0x2554:		/* FALLTHRU - double upper left corner */
-+    case 0x2557:		/* FALLTHRU - double upper right corner */
-+    case 0x255a:		/* FALLTHRU - double lower left corner */
-+    case 0x255d:		/* FALLTHRU - double lower right corner */
-+    case 0x2560:		/* FALLTHRU - double tee pointing right */
-+    case 0x2563:		/* FALLTHRU - double tee pointing left */
-+    case 0x2566:		/* FALLTHRU - double tee pointing down */
-+    case 0x2569:		/* FALLTHRU - double tee pointing up */
-+    case 0x256c:		/* FALLTHRU - double large plus or crossover */
-+    case 0x2592:		/* FALLTHRU - VT100 checker board (stipple) */
-+    case 0x25ae:		/* FALLTHRU - Teletype solid square block */
-+    case 0x25c6:		/* FALLTHRU - VT100 diamond */
-+    case 0x2603:		/* FALLTHRU - Teletype lantern symbol */
-+	result = TRUE;
-+	break;
-+    default:
-+	result = FALSE;
-+	break;
-+    }
-+    return result;
-+}
-+#endif
-+
- static NCURSES_INLINE void
- PutAttrChar(NCURSES_SP_DCLx CARG_CH_T ch)
- {
-@@ -268,7 +337,11 @@
- 
-     if ((AttrOf(attr) & A_ALTCHARSET)
- 	&& SP_PARM->_acs_map != 0
--	&& CharOfD(ch) < ACS_LEN) {
-+	&& ((CharOfD(ch) < ACS_LEN)
-+#if !NCURSES_WCWIDTH_GRAPHICS
-+	    || is_wacs_value(CharOfD(ch))
-+#endif
-+	)) {
- 	my_ch = CHDEREF(ch);	/* work around const param */
- #if USE_WIDEC_SUPPORT
- 	/*
-@@ -288,6 +361,11 @@
- 		RemAttr(attr, A_ALTCHARSET);
- 		my_ch = _nc_wacs[CharOf(my_ch)];
- 	    }
-+#if !NCURSES_WCWIDTH_GRAPHICS
-+	    if (!(AttrOf(attr) & A_ALTCHARSET)) {
-+		chlen = 1;
-+	    }
-+#endif /* !NCURSES_WCWIDTH_GRAPHICS */
- 	}
- #endif
- 	/*
-@@ -309,6 +387,11 @@
- 	}
- 	ch = CHREF(my_ch);
-     }
-+#if USE_WIDEC_SUPPORT && !NCURSES_WCWIDTH_GRAPHICS
-+    else if (chlen > 1 && is_wacs_value(CharOfD(ch))) {
-+	chlen = 1;
-+    }
-+#endif
-     if (tilde_glitch && (CharOfD(ch) == L('~'))) {
- 	SetChar(tilde, L('`'), AttrOf(attr));
- 	ch = CHREF(tilde);
-Index: ncurses/widechar/lib_wacs.c
-Prereq:  1.15 
---- ncurses-6.0-20151212+/ncurses/widechar/lib_wacs.c	2015-12-13 00:56:03.000000000 +0000
-+++ ncurses-6.0-20151219/ncurses/widechar/lib_wacs.c	2015-12-19 23:29:03.000000000 +0000
-@@ -32,7 +32,7 @@
- 
- #include 
- 
--MODULE_ID("$Id: lib_wacs.c,v 1.15 2015/12/13 00:56:03 tom Exp $")
-+MODULE_ID("$Id: lib_wacs.c,v 1.16 2015/12/19 23:29:03 tom Exp $")
- 
- NCURSES_EXPORT_VAR(cchar_t) * _nc_wacs = 0;
- 
-@@ -122,7 +122,11 @@
-     if ((_nc_wacs = typeCalloc(cchar_t, ACS_LEN)) != 0) {
- 
- 	for (n = 0; n < SIZEOF(table); ++n) {
-+#if NCURSES_WCWIDTH_GRAPHICS
- 	    int wide = wcwidth((wchar_t) table[n].value[active]);
-+#else
-+	    int wide = 1;
-+#endif
- 
- 	    m = table[n].map;
- 	    SetChar(_nc_wacs[m],
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20151212+/package/debian-mingw/changelog	2015-12-12 15:23:55.000000000 +0000
-+++ ncurses-6.0-20151219/package/debian-mingw/changelog	2015-12-13 14:53:53.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151212) unstable; urgency=low
-+ncurses6 (6.0+20151219) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 12 Dec 2015 10:23:55 -0500
-+ -- Thomas E. Dickey   Sun, 13 Dec 2015 09:53:53 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20151212+/package/debian-mingw64/changelog	2015-12-12 15:23:55.000000000 +0000
-+++ ncurses-6.0-20151219/package/debian-mingw64/changelog	2015-12-13 14:53:53.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151212) unstable; urgency=low
-+ncurses6 (6.0+20151219) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 12 Dec 2015 10:23:55 -0500
-+ -- Thomas E. Dickey   Sun, 13 Dec 2015 09:53:53 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.0-20151212+/package/debian/changelog	2015-12-12 15:23:55.000000000 +0000
-+++ ncurses-6.0-20151219/package/debian/changelog	2015-12-13 14:53:53.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151212) unstable; urgency=low
-+ncurses6 (6.0+20151219) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 12 Dec 2015 10:23:55 -0500
-+ -- Thomas E. Dickey   Sun, 13 Dec 2015 09:53:53 -0500
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.136 
---- ncurses-6.0-20151212+/package/mingw-ncurses.nsi	2015-12-12 15:23:55.000000000 +0000
-+++ ncurses-6.0-20151219/package/mingw-ncurses.nsi	2015-12-13 14:53:53.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.136 2015/12/12 15:23:55 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.137 2015/12/13 14:53:53 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "0"
- !define VERSION_YYYY  "2015"
--!define VERSION_MMDD  "1212"
-+!define VERSION_MMDD  "1219"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20151212+/package/mingw-ncurses.spec	2015-12-12 15:23:55.000000000 +0000
-+++ ncurses-6.0-20151219/package/mingw-ncurses.spec	2015-12-13 14:53:53.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.0
--Release: 20151212
-+Release: 20151219
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20151212+/package/ncurses.spec	2015-12-12 15:23:55.000000000 +0000
-+++ ncurses-6.0-20151219/package/ncurses.spec	2015-12-13 14:53:53.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.0
--Release: 20151212
-+Release: 20151219
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
diff --git a/ncurses-6.0-20151226.patch b/ncurses-6.0-20151226.patch
deleted file mode 100644
index b280d6b..0000000
--- a/ncurses-6.0-20151226.patch
+++ /dev/null
@@ -1,366 +0,0 @@
-# ncurses 6.0 - patch 20151226 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.0 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.0 can be found at
-# 	ftp://invisible-island.net/ncurses/6.0
-#	http://invisible-mirror.net/archives/ncurses/6.0 
-#
-# ------------------------------------------------------------------------------
-# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20151226.patch.gz
-# patch by Thomas E. Dickey 
-# created  Sun Dec 27 01:49:34 UTC 2015
-# ------------------------------------------------------------------------------
-# NEWS                             |    7 +
-# VERSION                          |    2 
-# dist.mk                          |    4 -
-# package/debian-mingw/changelog   |    4 -
-# package/debian-mingw64/changelog |    4 -
-# package/debian/changelog         |    4 -
-# package/mingw-ncurses.nsi        |    4 -
-# package/mingw-ncurses.spec       |    2 
-# package/ncurses.spec             |    2 
-# progs/tic.c                      |  140 +++++++++++++++++++++++++++++++------
-# 10 files changed, 139 insertions(+), 34 deletions(-)
-# ------------------------------------------------------------------------------
-Index: NEWS
-Prereq:  1.2547 
---- ncurses-6.0-20151219+/NEWS	2015-12-20 02:03:35.000000000 +0000
-+++ ncurses-6.0-20151226/NEWS	2015-12-27 01:01:41.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.2547 2015/12/20 02:03:35 tom Exp $
-+-- $Id: NEWS,v 1.2550 2015/12/27 01:01:41 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,11 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20151226
-+	+ add check in tic for use of bold, etc., video attributes in the
-+	  color capabilities, accounting whether the feature is listed in ncv.
-+	+ add check in tic for conflict between ritm, rmso, rmul versus sgr0.
-+
- 20151219
- 	+ add a paragraph to curs_getch.3x discussing key naming (discussion
- 	  with James Crippen).
-Index: VERSION
---- ncurses-6.0-20151219+/VERSION	2015-12-13 14:53:53.000000000 +0000
-+++ ncurses-6.0-20151226/VERSION	2015-12-26 15:21:12.000000000 +0000
-@@ -1 +1 @@
--5:0:9	6.0	20151219
-+5:0:9	6.0	20151226
-Index: dist.mk
-Prereq:  1.1084 
---- ncurses-6.0-20151219+/dist.mk	2015-12-13 14:53:53.000000000 +0000
-+++ ncurses-6.0-20151226/dist.mk	2015-12-26 15:21:12.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1084 2015/12/13 14:53:53 tom Exp $
-+# $Id: dist.mk,v 1.1085 2015/12/26 15:21:12 tom Exp $
- # Makefile for creating ncurses distributions.
- #
- # This only needs to be used directly as a makefile by developers, but
-@@ -37,7 +37,7 @@
- # These define the major/minor/patch versions of ncurses.
- NCURSES_MAJOR = 6
- NCURSES_MINOR = 0
--NCURSES_PATCH = 20151219
-+NCURSES_PATCH = 20151226
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20151219+/package/debian-mingw/changelog	2015-12-13 14:53:53.000000000 +0000
-+++ ncurses-6.0-20151226/package/debian-mingw/changelog	2015-12-26 15:21:12.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151219) unstable; urgency=low
-+ncurses6 (6.0+20151226) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sun, 13 Dec 2015 09:53:53 -0500
-+ -- Thomas E. Dickey   Sat, 26 Dec 2015 10:21:12 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20151219+/package/debian-mingw64/changelog	2015-12-13 14:53:53.000000000 +0000
-+++ ncurses-6.0-20151226/package/debian-mingw64/changelog	2015-12-26 15:21:12.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151219) unstable; urgency=low
-+ncurses6 (6.0+20151226) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sun, 13 Dec 2015 09:53:53 -0500
-+ -- Thomas E. Dickey   Sat, 26 Dec 2015 10:21:12 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.0-20151219+/package/debian/changelog	2015-12-13 14:53:53.000000000 +0000
-+++ ncurses-6.0-20151226/package/debian/changelog	2015-12-26 15:21:12.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151219) unstable; urgency=low
-+ncurses6 (6.0+20151226) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sun, 13 Dec 2015 09:53:53 -0500
-+ -- Thomas E. Dickey   Sat, 26 Dec 2015 10:21:12 -0500
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.137 
---- ncurses-6.0-20151219+/package/mingw-ncurses.nsi	2015-12-13 14:53:53.000000000 +0000
-+++ ncurses-6.0-20151226/package/mingw-ncurses.nsi	2015-12-26 15:21:12.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.137 2015/12/13 14:53:53 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.138 2015/12/26 15:21:12 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "0"
- !define VERSION_YYYY  "2015"
--!define VERSION_MMDD  "1219"
-+!define VERSION_MMDD  "1226"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20151219+/package/mingw-ncurses.spec	2015-12-13 14:53:53.000000000 +0000
-+++ ncurses-6.0-20151226/package/mingw-ncurses.spec	2015-12-26 15:21:12.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.0
--Release: 20151219
-+Release: 20151226
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20151219+/package/ncurses.spec	2015-12-13 14:53:53.000000000 +0000
-+++ ncurses-6.0-20151226/package/ncurses.spec	2015-12-26 15:21:12.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.0
--Release: 20151219
-+Release: 20151226
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: progs/tic.c
-Prereq:  1.216 
---- ncurses-6.0-20151219+/progs/tic.c	2015-09-05 19:22:49.000000000 +0000
-+++ ncurses-6.0-20151226/progs/tic.c	2015-12-27 01:46:01.000000000 +0000
-@@ -48,7 +48,7 @@
- #include 
- #include 
- 
--MODULE_ID("$Id: tic.c,v 1.216 2015/09/05 19:22:49 tom Exp $")
-+MODULE_ID("$Id: tic.c,v 1.220 2015/12/27 01:46:01 tom Exp $")
- 
- #define STDIN_NAME ""
- 
-@@ -2028,6 +2028,23 @@
-     return s;
- }
- 
-+#define DATA(name) { #name }
-+static const char sgr_names[][11] =
-+{
-+    DATA(none),
-+    DATA(standout),
-+    DATA(underline),
-+    DATA(reverse),
-+    DATA(blink),
-+    DATA(dim),
-+    DATA(bold),
-+    DATA(invis),
-+    DATA(protect),
-+    DATA(altcharset),
-+    ""
-+};
-+#undef DATA
-+
- /*
-  * An sgr string may contain several settings other than the one we're
-  * interested in, essentially sgr0 + rmacs + whatever.  As long as the
-@@ -2037,21 +2054,6 @@
- static bool
- similar_sgr(int num, char *a, char *b)
- {
--#define DATA(name) { #name }
--    static const char names[][11] =
--    {
--	DATA(none),
--	DATA(standout),
--	DATA(underline),
--	DATA(reverse),
--	DATA(blink),
--	DATA(dim),
--	DATA(bold),
--	DATA(invis),
--	DATA(protect),
--	DATA(altcharset),
--    };
--#undef DATA
-     char *base_a = a;
-     char *base_b = b;
-     int delaying = 0;
-@@ -2059,12 +2061,14 @@
-     while (*b != 0) {
- 	while (*a != *b) {
- 	    if (*a == 0) {
--		if (b[0] == '$'
--		    && b[1] == '<') {
-+		if (num < 0) {
-+		    ;
-+		} else if (b[0] == '$'
-+			   && b[1] == '<') {
- 		    _nc_warning("Did not find delay %s", _nc_visbuf(b));
- 		} else {
- 		    _nc_warning("checking sgr(%s) %s\n\tcompare to %s\n\tunmatched %s",
--				names[num], _nc_visbuf2(1, base_a),
-+				sgr_names[num], _nc_visbuf2(1, base_a),
- 				_nc_visbuf2(2, base_b),
- 				_nc_visbuf2(3, b));
- 		}
-@@ -2264,6 +2268,92 @@
-     }
- }
- 
-+/*
-+ * Exiting a video mode should not duplicate sgr0
-+ */
-+static void
-+check_exit_attribute(const char *name, char *test, char *trimmed, char *untrimmed)
-+{
-+    if (VALID_STRING(test)) {
-+	if (similar_sgr(-1, trimmed, test) ||
-+	    similar_sgr(-1, untrimmed, test)) {
-+	    _nc_warning("%s matches exit_attribute_mode", name);
-+	}
-+    }
-+}
-+
-+/*
-+ * Returns true if the string looks like a standard SGR string.
-+ */
-+static bool
-+is_sgr_string(char *value)
-+{
-+    bool result = FALSE;
-+
-+    if (VALID_STRING(value)) {
-+	if (value[0] == '\033' && value[1] == '[') {
-+	    result = TRUE;
-+	    value += 2;
-+	} else if (UChar(value[0]) == 0x9a) {
-+	    result = TRUE;
-+	    value += 1;
-+	}
-+	if (result) {
-+	    int ch;
-+	    while ((ch = UChar(*value++)) != '\0') {
-+		if (isdigit(ch) || ch == ';') {
-+		    ;
-+		} else if (ch == 'm' && *value == '\0') {
-+		    ;
-+		} else {
-+		    result = FALSE;
-+		    break;
-+		}
-+	    }
-+	}
-+    }
-+    return result;
-+}
-+
-+/*
-+ * Check if the given capability contains a given SGR attribute.
-+ */
-+static void
-+check_sgr_param(TERMTYPE *tp, int code, const char *name, char *value)
-+{
-+    if (VALID_STRING(value)) {
-+	int ncv = ((code != 0) ? (1 << (code - 1)) : 0);
-+	char *test = tgoto(value, 0, 0);
-+	if (is_sgr_string(test)) {
-+	    int param = 0;
-+	    int count = 0;
-+	    while (*test != 0) {
-+		if (isdigit(UChar(*test))) {
-+		    param = 10 * param + (*test - '0');
-+		    ++count;
-+		} else {
-+		    if (count) {
-+			if (param == code)
-+			    break;
-+		    }
-+		    count = 0;
-+		    param = 0;
-+		}
-+		++test;
-+	    }
-+	    if (count != 0 && param == code) {
-+		if (code == 0 ||
-+		    no_color_video < 0 ||
-+		    !(no_color_video & ncv)) {
-+		    _nc_warning("\"%s\" SGR-attribute used in %s",
-+				sgr_names[code],
-+				name);
-+		}
-+	    }
-+	}
-+    }
-+}
-+
- /* other sanity-checks (things that we don't want in the normal
-  * logic that reads a terminfo entry)
-  */
-@@ -2346,7 +2436,7 @@
- 	if (_nc_syntax == SYN_TERMINFO)
- 	    _nc_warning("missing sgr string");
-     }
--
-+#define CHECK_SGR0(name) check_exit_attribute(#name, name, check_sgr0, exit_attribute_mode)
-     if (PRESENT(exit_attribute_mode)) {
- 	char *check_sgr0 = _nc_trim_sgr0(tp);
- 
-@@ -2365,10 +2455,20 @@
- 		       _nc_visbuf(exit_attribute_mode)));
- 	    }
- 	}
-+	CHECK_SGR0(exit_italics_mode);
-+	CHECK_SGR0(exit_standout_mode);
-+	CHECK_SGR0(exit_underline_mode);
- 	if (check_sgr0 != exit_attribute_mode) {
- 	    free(check_sgr0);
- 	}
-     }
-+#define CHECK_SGR_PARAM(code, name) check_sgr_param(tp, (int)code, #name, name)
-+    for (j = 0; *sgr_names[j] != '\0'; ++j) {
-+	CHECK_SGR_PARAM(j, set_a_foreground);
-+	CHECK_SGR_PARAM(j, set_a_background);
-+	CHECK_SGR_PARAM(j, set_foreground);
-+	CHECK_SGR_PARAM(j, set_background);
-+    }
- #ifdef TRACE
-     show_where(2);
-     if (!auto_right_margin) {
diff --git a/ncurses-6.0-20160102.patch b/ncurses-6.0-20160102.patch
deleted file mode 100644
index d11e77f..0000000
--- a/ncurses-6.0-20160102.patch
+++ /dev/null
@@ -1,524 +0,0 @@
-# ncurses 6.0 - patch 20160102 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.0 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.0 can be found at
-# 	ftp://invisible-island.net/ncurses/6.0
-#	http://invisible-mirror.net/archives/ncurses/6.0 
-#
-# ------------------------------------------------------------------------------
-# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20160102.patch.gz
-# patch by Thomas E. Dickey 
-# created  Sun Jan  3 01:50:40 UTC 2016
-# ------------------------------------------------------------------------------
-# Ada95/package/debian/copyright        |    4 +-
-# COPYING                               |    4 +-
-# NEWS                                  |   10 +++++-
-# VERSION                               |    2 -
-# dist.mk                               |    6 +--
-# package/debian-mingw/changelog        |    4 +-
-# package/debian-mingw/copyright        |    4 +-
-# package/debian-mingw64/changelog      |    4 +-
-# package/debian-mingw64/copyright      |    4 +-
-# package/debian/changelog              |    4 +-
-# package/debian/copyright              |    4 +-
-# package/mingw-ncurses.nsi             |    6 +--
-# package/mingw-ncurses.spec            |    2 -
-# package/ncurses.spec                  |    2 -
-# progs/tic.c                           |   16 ++++++++--
-# test/ncurses.c                        |   51 +++++++++++++++++++++++++-------
-# test/package/debian-mingw/copyright   |    4 +-
-# test/package/debian-mingw64/copyright |    4 +-
-# test/package/debian/copyright         |    4 +-
-# 19 files changed, 93 insertions(+), 46 deletions(-)
-# ------------------------------------------------------------------------------
-Index: Ada95/package/debian/copyright
---- ncurses-6.0-20151226+/Ada95/package/debian/copyright	2015-05-09 18:00:51.000000000 +0000
-+++ ncurses-6.0-20160102/Ada95/package/debian/copyright	2016-01-02 20:24:37.000000000 +0000
-@@ -4,11 +4,11 @@
- 
- -------------------------------------------------------------------------------
- Files: *
--Copyright: 1998-2014,2015 Free Software Foundation, Inc.
-+Copyright: 1998-2015,2016 Free Software Foundation, Inc.
- Licence: X11
- 
- Files: aclocal.m4 package
--Copyright: 2010-2014,2015 by Thomas E. Dickey
-+Copyright: 2010-2015,2016 by Thomas E. Dickey
- Licence: X11
- 
-     Permission is hereby granted, free of charge, to any person obtaining a
-Index: COPYING
-Prereq:  1.3 
---- ncurses-6.0-20151226+/COPYING	2015-01-03 20:12:01.000000000 +0000
-+++ ncurses-6.0-20160102/COPYING	2016-01-02 20:24:37.000000000 +0000
-@@ -1,4 +1,4 @@
--Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.
-+Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.
- 
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the
-@@ -25,4 +25,4 @@
- authorization.
- 
- -- vile:txtmode fc=72
---- $Id: COPYING,v 1.3 2015/01/03 20:12:01 tom Exp $
-+-- $Id: COPYING,v 1.4 2016/01/02 20:24:37 tom Exp $
-Index: NEWS
-Prereq:  1.2550 
---- ncurses-6.0-20151226+/NEWS	2015-12-27 01:01:41.000000000 +0000
-+++ ncurses-6.0-20160102/NEWS	2016-01-03 01:17:55.000000000 +0000
-@@ -1,5 +1,5 @@
- -------------------------------------------------------------------------------
---- Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.               --
-+-- Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.               --
- --                                                                           --
- -- Permission is hereby granted, free of charge, to any person obtaining a   --
- -- copy of this software and associated documentation files (the             --
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.2550 2015/12/27 01:01:41 tom Exp $
-+-- $Id: NEWS,v 1.2554 2016/01/03 01:17:55 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,12 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20160102
-+	+ modify ncurses c/C color test-screens to take advantage of wide
-+	  screens, reducing the number of lines used for 88- and 256-colors.
-+	+ minor refinement to check versus ncv to ignore two parameters of
-+	  SGR 38 and 48 when those come from color-capabilities.
-+
- 20151226
- 	+ add check in tic for use of bold, etc., video attributes in the
- 	  color capabilities, accounting whether the feature is listed in ncv.
-Index: VERSION
---- ncurses-6.0-20151226+/VERSION	2015-12-26 15:21:12.000000000 +0000
-+++ ncurses-6.0-20160102/VERSION	2016-01-02 18:42:09.000000000 +0000
-@@ -1 +1 @@
--5:0:9	6.0	20151226
-+5:0:9	6.0	20160102
-Index: dist.mk
-Prereq:  1.1085 
---- ncurses-6.0-20151226+/dist.mk	2015-12-26 15:21:12.000000000 +0000
-+++ ncurses-6.0-20160102/dist.mk	2016-01-02 20:24:37.000000000 +0000
-@@ -1,5 +1,5 @@
- ##############################################################################
--# Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1085 2015/12/26 15:21:12 tom Exp $
-+# $Id: dist.mk,v 1.1087 2016/01/02 20:24:37 tom Exp $
- # Makefile for creating ncurses distributions.
- #
- # This only needs to be used directly as a makefile by developers, but
-@@ -37,7 +37,7 @@
- # These define the major/minor/patch versions of ncurses.
- NCURSES_MAJOR = 6
- NCURSES_MINOR = 0
--NCURSES_PATCH = 20151226
-+NCURSES_PATCH = 20160102
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20151226+/package/debian-mingw/changelog	2015-12-26 15:21:12.000000000 +0000
-+++ ncurses-6.0-20160102/package/debian-mingw/changelog	2016-01-02 18:42:09.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151226) unstable; urgency=low
-+ncurses6 (6.0+20160102) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 26 Dec 2015 10:21:12 -0500
-+ -- Thomas E. Dickey   Sat, 02 Jan 2016 13:42:09 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw/copyright
---- ncurses-6.0-20151226+/package/debian-mingw/copyright	2015-05-09 18:11:06.000000000 +0000
-+++ ncurses-6.0-20160102/package/debian-mingw/copyright	2016-01-02 20:24:37.000000000 +0000
-@@ -5,11 +5,11 @@
- 
- -------------------------------------------------------------------------------
- Files: *
--Copyright: 1998-2014,2015 Free Software Foundation, Inc.
-+Copyright: 1998-2015,2016 Free Software Foundation, Inc.
- Licence: X11
- 
- Files: aclocal.m4 package
--Copyright: 1996-2014,2015 by Thomas E. Dickey
-+Copyright: 1996-2015,2016 by Thomas E. Dickey
- Licence: X11
- 
- Files: doc/html/NCURSES-Programming-HOWTO.html
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20151226+/package/debian-mingw64/changelog	2015-12-26 15:21:12.000000000 +0000
-+++ ncurses-6.0-20160102/package/debian-mingw64/changelog	2016-01-02 18:42:09.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151226) unstable; urgency=low
-+ncurses6 (6.0+20160102) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 26 Dec 2015 10:21:12 -0500
-+ -- Thomas E. Dickey   Sat, 02 Jan 2016 13:42:09 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/copyright
---- ncurses-6.0-20151226+/package/debian-mingw64/copyright	2015-05-09 18:11:06.000000000 +0000
-+++ ncurses-6.0-20160102/package/debian-mingw64/copyright	2016-01-02 20:24:37.000000000 +0000
-@@ -5,11 +5,11 @@
- 
- -------------------------------------------------------------------------------
- Files: *
--Copyright: 1998-2014,2015 Free Software Foundation, Inc.
-+Copyright: 1998-2015,2016 Free Software Foundation, Inc.
- Licence: X11
- 
- Files: aclocal.m4 package
--Copyright: 1996-2014,2015 by Thomas E. Dickey
-+Copyright: 1996-2015,2016 by Thomas E. Dickey
- Licence: X11
- 
- Files: doc/html/NCURSES-Programming-HOWTO.html
-Index: package/debian/changelog
---- ncurses-6.0-20151226+/package/debian/changelog	2015-12-26 15:21:12.000000000 +0000
-+++ ncurses-6.0-20160102/package/debian/changelog	2016-01-02 18:42:09.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151226) unstable; urgency=low
-+ncurses6 (6.0+20160102) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 26 Dec 2015 10:21:12 -0500
-+ -- Thomas E. Dickey   Sat, 02 Jan 2016 13:42:09 -0500
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/debian/copyright
---- ncurses-6.0-20151226+/package/debian/copyright	2015-05-09 18:11:06.000000000 +0000
-+++ ncurses-6.0-20160102/package/debian/copyright	2016-01-02 20:24:37.000000000 +0000
-@@ -5,11 +5,11 @@
- 
- -------------------------------------------------------------------------------
- Files: *
--Copyright: 1998-2014,2015 Free Software Foundation, Inc.
-+Copyright: 1998-2015,2016 Free Software Foundation, Inc.
- Licence: X11
- 
- Files: aclocal.m4 package
--Copyright: 1996-2014,2015 by Thomas E. Dickey
-+Copyright: 1996-2015,2016 by Thomas E. Dickey
- Licence: X11
- 
- Files: doc/html/NCURSES-Programming-HOWTO.html
-Index: package/mingw-ncurses.nsi
-Prereq:  1.138 
---- ncurses-6.0-20151226+/package/mingw-ncurses.nsi	2015-12-26 15:21:12.000000000 +0000
-+++ ncurses-6.0-20160102/package/mingw-ncurses.nsi	2016-01-02 18:42:09.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.138 2015/12/26 15:21:12 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.139 2016/01/02 18:42:09 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -9,8 +9,8 @@
- 
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "0"
--!define VERSION_YYYY  "2015"
--!define VERSION_MMDD  "1226"
-+!define VERSION_YYYY  "2016"
-+!define VERSION_MMDD  "0102"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20151226+/package/mingw-ncurses.spec	2015-12-26 15:21:12.000000000 +0000
-+++ ncurses-6.0-20160102/package/mingw-ncurses.spec	2016-01-02 18:42:09.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.0
--Release: 20151226
-+Release: 20160102
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20151226+/package/ncurses.spec	2015-12-26 15:21:12.000000000 +0000
-+++ ncurses-6.0-20160102/package/ncurses.spec	2016-01-02 18:42:09.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.0
--Release: 20151226
-+Release: 20160102
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: progs/tic.c
-Prereq:  1.220 
---- ncurses-6.0-20151226+/progs/tic.c	2015-12-27 01:46:01.000000000 +0000
-+++ ncurses-6.0-20160102/progs/tic.c	2016-01-02 20:04:37.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -48,7 +48,7 @@
- #include 
- #include 
- 
--MODULE_ID("$Id: tic.c,v 1.220 2015/12/27 01:46:01 tom Exp $")
-+MODULE_ID("$Id: tic.c,v 1.221 2016/01/02 20:04:37 tom Exp $")
- 
- #define STDIN_NAME ""
- 
-@@ -2327,13 +2327,23 @@
- 	if (is_sgr_string(test)) {
- 	    int param = 0;
- 	    int count = 0;
-+	    int skips = 0;
-+	    int color = (value == set_a_foreground ||
-+			 value == set_a_background ||
-+			 value == set_foreground ||
-+			 value == set_background);
- 	    while (*test != 0) {
- 		if (isdigit(UChar(*test))) {
- 		    param = 10 * param + (*test - '0');
- 		    ++count;
- 		} else {
- 		    if (count) {
--			if (param == code)
-+			/*
-+			 * Avoid unnecessary warning for xterm 256color codes.
-+			 */
-+			if (color && (param == 38 || param == 48))
-+			    skips = 3;
-+			if ((skips-- <= 0) && (param == code))
- 			    break;
- 		    }
- 		    count = 0;
-Index: test/ncurses.c
-Prereq:  1.425 
---- ncurses-6.0-20151226+/test/ncurses.c	2015-11-29 01:26:41.000000000 +0000
-+++ ncurses-6.0-20160102/test/ncurses.c	2016-01-03 01:50:10.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -40,7 +40,7 @@
-    Author: Eric S. Raymond  1993
-            Thomas E. Dickey (beginning revision 1.27 in 1996).
- 
--$Id: ncurses.c,v 1.425 2015/11/29 01:26:41 tom Exp $
-+$Id: ncurses.c,v 1.429 2016/01/03 01:50:10 tom Exp $
- 
- ***************************************************************************/
- 
-@@ -2185,9 +2185,10 @@
-     int page_size = (LINES - grid_top);
-     int pairs_max;
-     int colors_max = COLORS;
-+    int col_limit;
-     int row_limit;
-     int per_row;
--    char numbered[80];
-+    char *numbered = 0;
-     const char *hello;
-     bool done = FALSE;
-     bool opt_acsc = FALSE;
-@@ -2197,6 +2198,15 @@
-     bool opt_wide = FALSE;
-     WINDOW *helpwin;
- 
-+    numbered = (char *) calloc((size_t) (COLS + 1), sizeof(char));
-+    done = ((COLS < 16) || (numbered == 0));
-+
-+    /*
-+     * Because the number of colors is usually a power of two, we also use
-+     * a power of two for the number of colors shown per line (to be tidy).
-+     */
-+    for (col_limit = 1; col_limit * 2 < COLS; col_limit *= 2) ;
-+
-     while (!done) {
- 	int shown = 0;
- 
-@@ -2214,11 +2224,11 @@
- 	if (opt_wide) {
- 	    width = 4;
- 	    hello = "Test";
--	    per_row = (colors_max > 8) ? 16 : 8;
-+	    per_row = (col_limit / ((colors_max > 8) ? 4 : 8));
- 	} else {
- 	    width = 8;
- 	    hello = "Hello";
--	    per_row = 8;
-+	    per_row = (col_limit / 8);
- 	}
- 	per_row -= min_colors;
- 
-@@ -2249,6 +2259,9 @@
- 	    int col = (i % per_row + 1) * width;
- 	    NCURSES_PAIRS_T pair = i;
- 
-+	    if ((i / per_row) > row_limit)
-+		break;
-+
- #define InxToFG(i) (NCURSES_COLOR_T) ((i % (colors_max - min_colors)) + min_colors)
- #define InxToBG(i) (NCURSES_COLOR_T) ((i / (colors_max - min_colors)) + min_colors)
- 	    if (row >= 0 && move(row, col) != ERR) {
-@@ -2375,6 +2388,8 @@
- 
-     erase();
-     endwin();
-+
-+    free(numbered);
- }
- 
- #if USE_WIDEC_SUPPORT
-@@ -2389,9 +2404,10 @@
-     int page_size = (LINES - grid_top);
-     int pairs_max = (unsigned short) (-1);
-     int colors_max = COLORS;
-+    int col_limit;
-     int row_limit;
-     int per_row;
--    char numbered[80];
-+    char *numbered = 0;
-     const char *hello;
-     bool done = FALSE;
-     bool opt_acsc = FALSE;
-@@ -2400,9 +2416,19 @@
-     bool opt_wide = FALSE;
-     bool opt_nums = FALSE;
-     bool opt_xchr = FALSE;
--    wchar_t buffer[80];
-+    wchar_t *buffer = 0;
-     WINDOW *helpwin;
- 
-+    numbered = (char *) calloc((size_t) (COLS + 1), sizeof(char));
-+    buffer = (wchar_t *) calloc((size_t) (COLS + 1), sizeof(wchar_t));
-+    done = ((COLS < 16) || (numbered == 0) || (buffer == 0));
-+
-+    /*
-+     * Because the number of colors is usually a power of two, we also use
-+     * a power of two for the number of colors shown per line (to be tidy).
-+     */
-+    for (col_limit = 1; col_limit * 2 < COLS; col_limit *= 2) ;
-+
-     while (!done) {
- 	int shown = 0;
- 
-@@ -2416,15 +2442,14 @@
- 		pairs_max = COLOR_PAIRS;
- 	}
- 
--	/* this assumes an 80-column line */
- 	if (opt_wide) {
- 	    width = 4;
- 	    hello = "Test";
--	    per_row = (colors_max > 8) ? 16 : 8;
-+	    per_row = (col_limit / ((colors_max > 8) ? 4 : 8));
- 	} else {
- 	    width = 8;
- 	    hello = "Hello";
--	    per_row = 8;
-+	    per_row = (col_limit / 8);
- 	}
- 	per_row -= min_colors;
- 
-@@ -2463,6 +2488,9 @@
- 	    int col = (i % per_row + 1) * width;
- 	    NCURSES_PAIRS_T pair = (NCURSES_PAIRS_T) i;
- 
-+	    if ((i / per_row) > row_limit)
-+		break;
-+
- 	    if (row >= 0 && move(row, col) != ERR) {
- 		init_pair(pair, InxToFG(i), InxToBG(i));
- 		(void) color_set(pair, NULL);
-@@ -2594,6 +2622,9 @@
- 
-     erase();
-     endwin();
-+
-+    free(numbered);
-+    free(buffer);
- }
- #endif /* USE_WIDEC_SUPPORT */
- 
-Index: test/package/debian-mingw/copyright
---- ncurses-6.0-20151226+/test/package/debian-mingw/copyright	2015-05-09 17:59:53.000000000 +0000
-+++ ncurses-6.0-20160102/test/package/debian-mingw/copyright	2016-01-02 20:24:37.000000000 +0000
-@@ -4,11 +4,11 @@
- 
- -------------------------------------------------------------------------------
- Files: *
--Copyright: 1998-2014,2015 Free Software Foundation, Inc.
-+Copyright: 1998-2015,2016 Free Software Foundation, Inc.
- Licence: X11
- 
- Files: aclocal.m4 package
--Copyright: 2003-2014,2015 by Thomas E. Dickey
-+Copyright: 2003-2015,2016 by Thomas E. Dickey
- Licence: X11
- 
-     Permission is hereby granted, free of charge, to any person obtaining a
-Index: test/package/debian-mingw64/copyright
---- ncurses-6.0-20151226+/test/package/debian-mingw64/copyright	2015-05-09 17:59:53.000000000 +0000
-+++ ncurses-6.0-20160102/test/package/debian-mingw64/copyright	2016-01-02 20:24:37.000000000 +0000
-@@ -4,11 +4,11 @@
- 
- -------------------------------------------------------------------------------
- Files: *
--Copyright: 1998-2014,2015 Free Software Foundation, Inc.
-+Copyright: 1998-2015,2016 Free Software Foundation, Inc.
- Licence: X11
- 
- Files: aclocal.m4 package
--Copyright: 2003-2014,2015 by Thomas E. Dickey
-+Copyright: 2003-2015,2016 by Thomas E. Dickey
- Licence: X11
- 
-     Permission is hereby granted, free of charge, to any person obtaining a
-Index: test/package/debian/copyright
---- ncurses-6.0-20151226+/test/package/debian/copyright	2015-05-09 17:59:33.000000000 +0000
-+++ ncurses-6.0-20160102/test/package/debian/copyright	2016-01-02 20:24:37.000000000 +0000
-@@ -4,11 +4,11 @@
- 
- -------------------------------------------------------------------------------
- Files: *
--Copyright: 1998-2014,2015 Free Software Foundation, Inc.
-+Copyright: 1998-2015,2016 Free Software Foundation, Inc.
- Licence: X11
- 
- Files: aclocal.m4 package
--Copyright: 2003-2014,2015 by Thomas E. Dickey
-+Copyright: 2003-2015,2016 by Thomas E. Dickey
- Licence: X11
- 
-     Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/ncurses-6.0-20160116.patch b/ncurses-6.0-20160116.patch
deleted file mode 100644
index e8e8ce8..0000000
--- a/ncurses-6.0-20160116.patch
+++ /dev/null
@@ -1,474 +0,0 @@
-# ncurses 6.0 - patch 20160116 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.0 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.0 can be found at
-# 	ftp://invisible-island.net/ncurses/6.0
-#	http://invisible-mirror.net/archives/ncurses/6.0 
-#
-# ------------------------------------------------------------------------------
-# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20160116.patch.gz
-# patch by Thomas E. Dickey 
-# created  Sun Jan 17 02:21:18 UTC 2016
-# ------------------------------------------------------------------------------
-# NEWS                             |   15 ++++++++++++++-
-# VERSION                          |    2 +-
-# dist.mk                          |    4 ++--
-# misc/terminfo.src                |   37 +++++++++++++++++++++++--------------
-# ncurses/base/lib_addstr.c        |    6 ++++--
-# ncurses/curses.priv.h            |    6 +++---
-# ncurses/trace/lib_traceatr.c     |   13 ++++++++++---
-# ncurses/trace/visbuf.c           |   15 ++++++++++-----
-# package/debian-mingw/changelog   |    4 ++--
-# package/debian-mingw64/changelog |    4 ++--
-# package/debian/changelog         |    4 ++--
-# package/mingw-ncurses.nsi        |    4 ++--
-# package/mingw-ncurses.spec       |    2 +-
-# package/ncurses.spec             |    2 +-
-# test/test_sgr.c                  |    8 ++++----
-# 15 files changed, 81 insertions(+), 45 deletions(-)
-# ------------------------------------------------------------------------------
-Index: NEWS
-Prereq:  1.2554 
---- ncurses-6.0-20160102+/NEWS	2016-01-03 01:17:55.000000000 +0000
-+++ ncurses-6.0-20160116/NEWS	2016-01-17 00:37:27.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.2554 2016/01/03 01:17:55 tom Exp $
-+-- $Id: NEWS,v 1.2560 2016/01/17 00:37:27 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,19 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20160116
-+	+ tidy up comments about hardcoded 256color palette (report by
-+	  Leonardo Brondani Schenkel) -TD
-+	+ add putty-noapp entry, and amend putty entry to use application mode
-+	  for better consistency with xterm (report by Leonardo Brondani
-+	  Schenkel) -TD
-+	+ modify _nc_viscbuf2() and _tracecchar_t2() to trace wide-characters
-+	  as a whole rather than their multibyte equivalents.
-+	+ minor fix in wadd_wchnstr() to ensure that each cell has nonzero
-+	  width.
-+	+ move PUTC_INIT calls next to wcrtomb calls, to avoid carry-over of
-+	  error status when processing Unicode values which are not mapped.
-+
- 20160102
- 	+ modify ncurses c/C color test-screens to take advantage of wide
- 	  screens, reducing the number of lines used for 88- and 256-colors.
-Index: VERSION
---- ncurses-6.0-20160102+/VERSION	2016-01-02 18:42:09.000000000 +0000
-+++ ncurses-6.0-20160116/VERSION	2016-01-16 21:24:23.000000000 +0000
-@@ -1 +1 @@
--5:0:9	6.0	20160102
-+5:0:9	6.0	20160116
-Index: dist.mk
-Prereq:  1.1087 
---- ncurses-6.0-20160102+/dist.mk	2016-01-02 20:24:37.000000000 +0000
-+++ ncurses-6.0-20160116/dist.mk	2016-01-16 21:24:23.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1087 2016/01/02 20:24:37 tom Exp $
-+# $Id: dist.mk,v 1.1089 2016/01/16 21:24:23 tom Exp $
- # Makefile for creating ncurses distributions.
- #
- # This only needs to be used directly as a makefile by developers, but
-@@ -37,7 +37,7 @@
- # These define the major/minor/patch versions of ncurses.
- NCURSES_MAJOR = 6
- NCURSES_MINOR = 0
--NCURSES_PATCH = 20160102
-+NCURSES_PATCH = 20160116
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: misc/terminfo.src
---- ncurses-6.0-20160102+/misc/terminfo.src	2015-11-28 21:35:00.000000000 +0000
-+++ ncurses-6.0-20160116/misc/terminfo.src	2016-01-17 00:25:26.000000000 +0000
-@@ -6,8 +6,8 @@
- # Report bugs and new terminal descriptions to
- #	bug-ncurses@gnu.org
- #
--#	$Revision: 1.559 $
--#	$Date: 2015/11/28 21:35:00 $
-+#	$Revision: 1.561 $
-+#	$Date: 2016/01/17 00:25:26 $
- #
- # The original header is preserved below for reference.  It is noted that there
- # is a "newer" version which differs in some cosmetic details (but actually
-@@ -3580,28 +3580,31 @@
- 	ind=^J, indn=\E[%p1%dS,
- 	initc=\E]P%p1%x%p2%{255}%*%{1000}%/%02x%p3%{255}%*%{1000}%/%02x%p4%{255}%*%{1000}%/%02x,
- 	is2=\E7\E[r\E[m\E[?7h\E[?1;4;6l\E[4l\E8\E>\E]R,
--	kLFT=\EOD, kRIT=\EOC, kb2=\E[G, kbs=\177, kcbt=\E[Z,
--	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
-+	kLFT=\E[D, kRIT=\E[C, kb2=\E[G, kbs=\177, kcbt=\E[Z,
-+	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
- 	kdch1=\E[3~, kend=\E[4~, khome=\E[1~, kich1=\E[2~,
--	kind=\EOB, kmous=\E[M, knp=\E[6~, kpp=\E[5~, kri=\EOA,
-+	kind=\E[B, kmous=\E[M, knp=\E[6~, kpp=\E[5~, kri=\E[A,
- 	kspd=^Z, nel=^M^J, oc=\E]R, op=\E[39;49m, rc=\E8, rev=\E[7m,
- 	ri=\EM, rin=\E[%p1%dT, rmacs=^O, rmam=\E[?7l,
--	rmcup=\E[2J\E[?47l, rmir=\E[4l, rmpch=\E[10m,
--	rmso=\E[27m, rmul=\E[24m,
-+	rmcup=\E[2J\E[?47l, rmir=\E[4l, rmkx=\E[?1l\E>,
-+	rmpch=\E[10m, rmso=\E[27m, rmul=\E[24m,
- 	rs2=\E<\E["p\E[50;6"p\Ec\E[?3l\E]R\E[?1000l,
- 	s0ds=\E[10m, s1ds=\E[11m, s2ds=\E[12m, sc=\E7,
- 	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
- 	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;,
- 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smcup=\E[?47h,
--	smir=\E[4h, smpch=\E[11m, smso=\E[7m, smul=\E[4m,
--	tbc=\E[3g, vpa=\E[%i%p1%dd, E3=\E[3J, use=putty+fnkeys,
--	use=vt102+enq, use=xterm+sl,
-+	smir=\E[4h, smkx=\E[?1h\E=, smpch=\E[11m, smso=\E[7m,
-+	smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, E3=\E[3J,
-+	use=putty+fnkeys, use=vt102+enq, use=xterm+sl,
- vt100-putty|Reset PuTTY to pure vt100,
- 	rs2=\E<\E["p\Ec\E[?3l\E]R\E[40"p\E[61"p\E[50;1;2"p,
- 	use=vt100,
--# palette is hardcoded...
- putty-256color|PuTTY 0.58 with xterm 256-colors,
- 	use=xterm+256setaf, use=putty,
-+putty-noapp|putty with cursor keys in normal mode,
-+	kLFT=\EOD, kRIT=\EOC, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
-+	kcuu1=\E[A, kind=\EOB, kri=\EOA, rmkx=\E>, smkx=\E=,
-+	use=putty,
- 
- # One of the keyboard selections is "VT100+".
- # pterm (the X11 port) uses shifted F1-F10 as F11-F20
-@@ -4235,6 +4238,7 @@
- 	setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m,
- 	setb@, setf@,
- 
-+# palette is hardcoded...
- xterm+256setaf|xterm 256-color (set-only),
- 	ccc@,
- 	colors#256, pairs#32767,
-@@ -4876,7 +4880,6 @@
- vte|VTE aka GNOME Terminal,
- 	use=vte-2014,
- 
--# palette is hardcoded...
- vte-256color|VTE with xterm 256-colors,
- 	use=xterm+256color, use=vte,
- gnome-256color|GNOME Terminal with xterm 256-colors,
-@@ -4996,7 +4999,6 @@
- konsole|KDE console window,
- 	use=konsole-xf4x,
- 
--# palette is hardcoded...
- konsole-256color|KDE console window with xterm 256-colors,
- 	use=xterm+256setaf, use=konsole,
- 
-@@ -23812,6 +23814,13 @@
- #	+ fix some inconsistencies in the pccon* entries -TD
- #
- # 2015-11-28
--#	  add viewdata (Alexandre Montaron).
-+#	+ add viewdata (Alexandre Montaron).
-+#
-+# 2016-01-16
-+#	+ tidy up comments about hardcoded 256color palette (report by
-+#	  Leonardo Brondani Schenkel) -TD
-+#	+ add putty-noapp entry, and amend putty entry to use application mode
-+#	  for better consistency with xterm (report by Leonardo Brondani
-+#	  Schenkel) -TD
- #
- ######## SHANTIH!  SHANTIH!  SHANTIH!
-Index: ncurses/base/lib_addstr.c
-Prereq:  1.52 
---- ncurses-6.0-20160102+/ncurses/base/lib_addstr.c	2011-05-28 23:02:09.000000000 +0000
-+++ ncurses-6.0-20160116/ncurses/base/lib_addstr.c	2016-01-16 21:00:53.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2011,2016 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -44,7 +44,7 @@
- 
- #include 
- 
--MODULE_ID("$Id: lib_addstr.c,v 1.52 2011/05/28 23:02:09 tom Exp $")
-+MODULE_ID("$Id: lib_addstr.c,v 1.53 2016/01/16 21:00:53 tom Exp $")
- 
- NCURSES_EXPORT(int)
- waddnstr(WINDOW *win, const char *astr, int n)
-@@ -194,6 +194,8 @@
- 		    }
- 		    SetWidecExt(line->text[x + j], j);
- 		}
-+	    } else {
-+		len = 1;
- 	    }
- 	    x = (NCURSES_SIZE_T) (x + len);
- 	    end += len - 1;
-Index: ncurses/curses.priv.h
-Prereq:  1.547 
---- ncurses-6.0-20160102+/ncurses/curses.priv.h	2015-06-27 01:22:16.000000000 +0000
-+++ ncurses-6.0-20160116/ncurses/curses.priv.h	2016-01-10 22:17:19.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -34,7 +34,7 @@
-  ****************************************************************************/
- 
- /*
-- * $Id: curses.priv.h,v 1.547 2015/06/27 01:22:16 tom Exp $
-+ * $Id: curses.priv.h,v 1.548 2016/01/10 22:17:19 tom Exp $
-  *
-  *	curses.priv.h
-  *
-@@ -1428,11 +1428,11 @@
- 			    NCURSES_OUTC_FUNC (NCURSES_SP_ARGx CharOf(ch)); \
- 			    COUNT_OUTCHARS(1);					    \
- 			} else {						    \
--			    PUTC_INIT;						    \
- 			    for (PUTC_i = 0; PUTC_i < CCHARW_MAX; ++PUTC_i) {	    \
- 				PUTC_ch = (ch).chars[PUTC_i];			    \
- 				if (PUTC_ch == L'\0')				    \
- 				    break;					    \
-+				PUTC_INIT;						    \
- 				PUTC_n = (int) wcrtomb(PUTC_buf,		    \
- 						       (ch).chars[PUTC_i], &PUT_st); \
- 				if (PUTC_n <= 0) {				    \
-Index: ncurses/trace/lib_traceatr.c
-Prereq:  1.83 
---- ncurses-6.0-20160102+/ncurses/trace/lib_traceatr.c	2015-04-04 13:41:37.000000000 +0000
-+++ ncurses-6.0-20160116/ncurses/trace/lib_traceatr.c	2016-01-16 21:23:43.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2013,2014 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2014,2016 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -43,7 +43,7 @@
- #define CUR SP_TERMTYPE
- #endif
- 
--MODULE_ID("$Id: lib_traceatr.c,v 1.83 2015/04/04 13:41:37 tom Exp $")
-+MODULE_ID("$Id: lib_traceatr.c,v 1.85 2016/01/16 21:23:43 tom Exp $")
- 
- #define COLOR_OF(c) ((c < 0) ? "default" : (c > 7 ? color_of(c) : colors[c].name))
- 
-@@ -338,7 +338,6 @@
- 		PUTC_DATA;
- 		int n;
- 
--		PUTC_INIT;
- 		(void) _nc_trace_bufcat(bufnum, "{ ");
- 		for (PUTC_i = 0; PUTC_i < CCHARW_MAX; ++PUTC_i) {
- 		    PUTC_ch = ch->chars[PUTC_i];
-@@ -347,6 +346,7 @@
- 			    (void) _nc_trace_bufcat(bufnum, "\\000");
- 			break;
- 		    }
-+		    PUTC_INIT;
- 		    PUTC_n = (int) wcrtomb(PUTC_buf, ch->chars[PUTC_i], &PUT_st);
- 		    if (PUTC_n <= 0) {
- 			if (PUTC_ch != L'\0') {
-@@ -356,6 +356,13 @@
- 								  UChar(ch->chars[PUTC_i])));
- 			}
- 			break;
-+		    } else if (ch->chars[PUTC_i] > 255) {
-+			char temp[80];
-+			sprintf(temp, "{%d:\\u%x}",
-+				wcwidth(ch->chars[PUTC_i]),
-+				ch->chars[PUTC_i]);
-+			(void) _nc_trace_bufcat(bufnum, temp);
-+			break;
- 		    }
- 		    for (n = 0; n < PUTC_n; n++) {
- 			if (n)
-Index: ncurses/trace/visbuf.c
-Prereq:  1.44 
---- ncurses-6.0-20160102+/ncurses/trace/visbuf.c	2014-09-25 08:51:13.000000000 +0000
-+++ ncurses-6.0-20160116/ncurses/trace/visbuf.c	2016-01-10 23:51:56.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2001-2012,2014 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2001-2014,2016 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -42,7 +42,7 @@
- #include 
- #include 
- 
--MODULE_ID("$Id: visbuf.c,v 1.44 2014/09/25 08:51:13 tom Exp $")
-+MODULE_ID("$Id: visbuf.c,v 1.46 2016/01/10 23:51:56 tom Exp $")
- 
- #define NUM_VISBUFS 4
- 
-@@ -315,9 +315,9 @@
- 		if (!isWidecExt(buf[j])) {
- 		    PUTC_DATA;
- 
--		    PUTC_INIT;
- 		    for (PUTC_i = 0; PUTC_i < CCHARW_MAX; ++PUTC_i) {
- 			int k;
-+			char temp[80];
- 
- 			PUTC_ch = buf[j].chars[PUTC_i];
- 			if (PUTC_ch == L'\0') {
-@@ -325,12 +325,17 @@
- 				(void) _nc_trace_bufcat(bufnum, "\\000");
- 			    break;
- 			}
-+			PUTC_INIT;
- 			PUTC_n = (int) wcrtomb(PUTC_buf,
- 					       buf[j].chars[PUTC_i], &PUT_st);
--			if (PUTC_n <= 0)
-+			if (PUTC_n <= 0 || buf[j].chars[PUTC_i] > 255) {
-+			    sprintf(temp, "{%d:\\u%x}",
-+				    wcwidth(buf[j].chars[PUTC_i]),
-+				    buf[j].chars[PUTC_i]);
-+			    (void) _nc_trace_bufcat(bufnum, temp);
- 			    break;
-+			}
- 			for (k = 0; k < PUTC_n; k++) {
--			    char temp[80];
- 			    VisChar(temp, UChar(PUTC_buf[k]), sizeof(temp));
- 			    (void) _nc_trace_bufcat(bufnum, temp);
- 			}
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20160102+/package/debian-mingw/changelog	2016-01-02 18:42:09.000000000 +0000
-+++ ncurses-6.0-20160116/package/debian-mingw/changelog	2016-01-16 21:24:23.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20160102) unstable; urgency=low
-+ncurses6 (6.0+20160116) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 02 Jan 2016 13:42:09 -0500
-+ -- Thomas E. Dickey   Sat, 16 Jan 2016 16:24:23 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20160102+/package/debian-mingw64/changelog	2016-01-02 18:42:09.000000000 +0000
-+++ ncurses-6.0-20160116/package/debian-mingw64/changelog	2016-01-16 21:24:23.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20160102) unstable; urgency=low
-+ncurses6 (6.0+20160116) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 02 Jan 2016 13:42:09 -0500
-+ -- Thomas E. Dickey   Sat, 16 Jan 2016 16:24:23 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.0-20160102+/package/debian/changelog	2016-01-02 18:42:09.000000000 +0000
-+++ ncurses-6.0-20160116/package/debian/changelog	2016-01-16 21:24:23.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20160102) unstable; urgency=low
-+ncurses6 (6.0+20160116) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 02 Jan 2016 13:42:09 -0500
-+ -- Thomas E. Dickey   Sat, 16 Jan 2016 16:24:23 -0500
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.139 
---- ncurses-6.0-20160102+/package/mingw-ncurses.nsi	2016-01-02 18:42:09.000000000 +0000
-+++ ncurses-6.0-20160116/package/mingw-ncurses.nsi	2016-01-16 21:24:23.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.139 2016/01/02 18:42:09 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.141 2016/01/16 21:24:23 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "0"
- !define VERSION_YYYY  "2016"
--!define VERSION_MMDD  "0102"
-+!define VERSION_MMDD  "0116"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20160102+/package/mingw-ncurses.spec	2016-01-02 18:42:09.000000000 +0000
-+++ ncurses-6.0-20160116/package/mingw-ncurses.spec	2016-01-16 21:24:23.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.0
--Release: 20160102
-+Release: 20160116
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20160102+/package/ncurses.spec	2016-01-02 18:42:09.000000000 +0000
-+++ ncurses-6.0-20160116/package/ncurses.spec	2016-01-16 21:24:23.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.0
--Release: 20160102
-+Release: 20160116
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: test/test_sgr.c
-Prereq:  1.4 
---- ncurses-6.0-20160102+/test/test_sgr.c	2015-11-21 22:43:50.000000000 +0000
-+++ ncurses-6.0-20160116/test/test_sgr.c	2016-01-09 18:15:53.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2015 Free Software Foundation, Inc.                        *
-+ * Copyright (c) 2015,2016 Free Software Foundation, Inc.                   *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -29,7 +29,7 @@
- /*
-  * Author: Thomas E. Dickey
-  *
-- * $Id: test_sgr.c,v 1.4 2015/11/21 22:43:50 tom Exp $
-+ * $Id: test_sgr.c,v 1.5 2016/01/09 18:15:53 tom Exp $
-  *
-  * A simple demo of the sgr/sgr0 terminal capabilities.
-  */
-@@ -146,7 +146,7 @@
-     printf("%4d ", bits);
-     bits &= ~ignore;
-     for (n = 0; n < MAXPAR; ++n) {
--	putchar((bits & (1 << n)) ? params[n] : '-');
-+	putchar((int) ((bits & (unsigned) (1 << n)) ? params[n] : '-'));
-     }
-     putchar(' ');
-     putp(sgr);
-@@ -236,7 +236,7 @@
- 	    }
- 	}
- 	for (j = 0; j < MAXPAR; ++j) {
--	    unsigned mask = (1 << j);
-+	    unsigned mask = (unsigned) (1 << j);
- 	    for (count = 0; count < MAXSGR; ++count) {
- 		if ((count & mask) != 0)
- 		    continue;
diff --git a/ncurses-6.0-20160123.patch b/ncurses-6.0-20160123.patch
deleted file mode 100644
index 68c3ac4..0000000
--- a/ncurses-6.0-20160123.patch
+++ /dev/null
@@ -1,702 +0,0 @@
-# ncurses 6.0 - patch 20160123 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.0 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.0 can be found at
-# 	ftp://invisible-island.net/ncurses/6.0
-#	http://invisible-mirror.net/archives/ncurses/6.0 
-#
-# ------------------------------------------------------------------------------
-# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20160123.patch.gz
-# patch by Thomas E. Dickey 
-# created  Sun Jan 24 02:28:05 UTC 2016
-# ------------------------------------------------------------------------------
-# NEWS                             |    7 ++++++-
-# VERSION                          |    2 +-
-# dist.mk                          |    4 ++--
-# form/f_trace.c                   |    6 +++---
-# form/fld_arg.c                   |    6 +++---
-# form/fld_attr.c                  |    6 +++---
-# form/fld_ftchoice.c              |    6 +++---
-# form/fld_newftyp.c               |    6 +++---
-# form/frm_hook.c                  |    6 +++---
-# form/fty_generic.c               |   10 +++++++---
-# include/curses.h.in              |   12 ++++++------
-# include/curses.tail              |    4 +++-
-# menu/m_hook.c                    |    6 +++---
-# menu/m_trace.c                   |    6 +++---
-# ncurses/Makefile.in              |    7 ++++---
-# ncurses/base/lib_getch.c         |    6 +++---
-# ncurses/base/lib_set_term.c      |    6 +++---
-# ncurses/base/use_window.c        |    6 +++---
-# ncurses/curses.priv.h            |    7 +++++--
-# ncurses/tinfo/lib_tputs.c        |    6 +++---
-# ncurses/tinfo/use_screen.c       |    6 +++---
-# package/debian-mingw/changelog   |    4 ++--
-# package/debian-mingw64/changelog |    4 ++--
-# package/debian/changelog         |    4 ++--
-# package/mingw-ncurses.nsi        |    4 ++--
-# package/mingw-ncurses.spec       |    2 +-
-# package/ncurses.spec             |    2 +-
-# 27 files changed, 83 insertions(+), 68 deletions(-)
-# ------------------------------------------------------------------------------
-Index: NEWS
-Prereq:  1.2560 
---- ncurses-6.0-20160116+/NEWS	2016-01-17 00:37:27.000000000 +0000
-+++ ncurses-6.0-20160123/NEWS	2016-01-24 01:17:56.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.2560 2016/01/17 00:37:27 tom Exp $
-+-- $Id: NEWS,v 1.2564 2016/01/24 01:17:56 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,11 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20160123
-+	+ ifdef'd header-file definition of mouse_trafo() with NCURSES_NOMACROS
-+	  (report by Corey Minyard).
-+	+ fix some strict compiler-warnings in traces.
-+
- 20160116
- 	+ tidy up comments about hardcoded 256color palette (report by
- 	  Leonardo Brondani Schenkel) -TD
-Index: VERSION
---- ncurses-6.0-20160116+/VERSION	2016-01-16 21:24:23.000000000 +0000
-+++ ncurses-6.0-20160123/VERSION	2016-01-23 17:00:00.000000000 +0000
-@@ -1 +1 @@
--5:0:9	6.0	20160116
-+5:0:9	6.0	20160123
-Index: dist.mk
-Prereq:  1.1089 
---- ncurses-6.0-20160116+/dist.mk	2016-01-16 21:24:23.000000000 +0000
-+++ ncurses-6.0-20160123/dist.mk	2016-01-23 17:00:00.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1089 2016/01/16 21:24:23 tom Exp $
-+# $Id: dist.mk,v 1.1090 2016/01/23 17:00:00 tom Exp $
- # Makefile for creating ncurses distributions.
- #
- # This only needs to be used directly as a makefile by developers, but
-@@ -37,7 +37,7 @@
- # These define the major/minor/patch versions of ncurses.
- NCURSES_MAJOR = 6
- NCURSES_MINOR = 0
--NCURSES_PATCH = 20160116
-+NCURSES_PATCH = 20160123
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: form/f_trace.c
-Prereq:  1.2 
---- ncurses-6.0-20160116+/form/f_trace.c	2010-01-23 21:14:36.000000000 +0000
-+++ ncurses-6.0-20160123/form/f_trace.c	2016-01-23 21:32:00.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2004,2010 Free Software Foundation, Inc.                   *
-+ * Copyright (c) 2004-2010,2016 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -32,7 +32,7 @@
- 
- #include "form.priv.h"
- 
--MODULE_ID("$Id: f_trace.c,v 1.2 2010/01/23 21:14:36 tom Exp $")
-+MODULE_ID("$Id: f_trace.c,v 1.3 2016/01/23 21:32:00 tom Exp $")
- 
- NCURSES_EXPORT(FIELD **)
- _nc_retrace_field_ptr(FIELD **code)
-@@ -65,6 +65,6 @@
- NCURSES_EXPORT(Form_Hook)
- _nc_retrace_form_hook(Form_Hook code)
- {
--  T((T_RETURN("%p"), code));
-+  T((T_RETURN("%p"), TR_FUNC(code)));
-   return code;
- }
-Index: form/fld_arg.c
-Prereq:  1.13 
---- ncurses-6.0-20160116+/form/fld_arg.c	2012-06-10 00:27:49.000000000 +0000
-+++ ncurses-6.0-20160123/form/fld_arg.c	2016-01-23 21:32:00.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2012,2016 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -32,7 +32,7 @@
- 
- #include "form.priv.h"
- 
--MODULE_ID("$Id: fld_arg.c,v 1.13 2012/06/10 00:27:49 tom Exp $")
-+MODULE_ID("$Id: fld_arg.c,v 1.14 2016/01/23 21:32:00 tom Exp $")
- 
- /*---------------------------------------------------------------------------
- |   Facility      :  libnform
-@@ -67,7 +67,7 @@
- 		  void (*const free_arg) (void *))
- {
-   T((T_CALLED("set_fieldtype_arg(%p,%p,%p,%p)"),
--     (void *)typ, make_arg, copy_arg, free_arg));
-+     (void *)typ, TR_FUNC(make_arg), TR_FUNC(copy_arg), TR_FUNC(free_arg)));
- 
-   if (typ != 0 && make_arg != (void *)0)
-     {
-Index: form/fld_attr.c
-Prereq:  1.11 
---- ncurses-6.0-20160116+/form/fld_attr.c	2010-01-23 21:12:08.000000000 +0000
-+++ ncurses-6.0-20160123/form/fld_attr.c	2016-01-23 21:32:00.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2004,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2016 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -32,7 +32,7 @@
- 
- #include "form.priv.h"
- 
--MODULE_ID("$Id: fld_attr.c,v 1.11 2010/01/23 21:12:08 tom Exp $")
-+MODULE_ID("$Id: fld_attr.c,v 1.12 2016/01/23 21:32:00 tom Exp $")
- 
- /*----------------------------------------------------------------------------
-   Field-Attribute manipulation routines
-@@ -42,7 +42,7 @@
- NCURSES_IMPEXP int NCURSES_API set_field_ ## name (FIELD * field, chtype attr)\
- {\
-    int res = E_BAD_ARGUMENT;\
--   T((T_CALLED("set_field_" #name "(%p,%s)"), field, _traceattr(attr)));\
-+   T((T_CALLED("set_field_" #name "(%p,%s)"), (void *)field, _traceattr(attr)));\
-    if ( attr==A_NORMAL || ((attr & A_ATTRIBUTES)==attr) )\
-      {\
-        Normalize_Field( field );\
-Index: form/fld_ftchoice.c
-Prereq:  1.13 
---- ncurses-6.0-20160116+/form/fld_ftchoice.c	2012-06-10 00:27:49.000000000 +0000
-+++ ncurses-6.0-20160123/form/fld_ftchoice.c	2016-01-23 21:32:00.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2012,2016 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -32,7 +32,7 @@
- 
- #include "form.priv.h"
- 
--MODULE_ID("$Id: fld_ftchoice.c,v 1.13 2012/06/10 00:27:49 tom Exp $")
-+MODULE_ID("$Id: fld_ftchoice.c,v 1.14 2016/01/23 21:32:00 tom Exp $")
- 
- /*---------------------------------------------------------------------------
- |   Facility      :  libnform  
-@@ -51,7 +51,7 @@
- 		     bool (*const next_choice) (FIELD *, const void *),
- 		     bool (*const prev_choice) (FIELD *, const void *))
- {
--  T((T_CALLED("set_fieldtype_choice(%p,%p,%p)"), (void *)typ, next_choice, prev_choice));
-+  T((T_CALLED("set_fieldtype_choice(%p,%p,%p)"), (void *)typ, TR_FUNC(next_choice), TR_FUNC(prev_choice)));
- 
-   if (!typ || !next_choice || !prev_choice)
-     RETURN(E_BAD_ARGUMENT);
-Index: form/fld_newftyp.c
-Prereq:  1.19 
---- ncurses-6.0-20160116+/form/fld_newftyp.c	2010-01-23 21:14:36.000000000 +0000
-+++ ncurses-6.0-20160123/form/fld_newftyp.c	2016-01-23 21:32:00.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2016 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -32,7 +32,7 @@
- 
- #include "form.priv.h"
- 
--MODULE_ID("$Id: fld_newftyp.c,v 1.19 2010/01/23 21:14:36 tom Exp $")
-+MODULE_ID("$Id: fld_newftyp.c,v 1.20 2016/01/23 21:32:00 tom Exp $")
- 
- static FIELDTYPE default_fieldtype =
- {
-@@ -76,7 +76,7 @@
- {
-   FIELDTYPE *nftyp = (FIELDTYPE *)0;
- 
--  T((T_CALLED("new_fieldtype(%p,%p)"), field_check, char_check));
-+  T((T_CALLED("new_fieldtype(%p,%p)"), TR_FUNC(field_check), TR_FUNC(char_check)));
-   if ((field_check) || (char_check))
-     {
-       nftyp = typeMalloc(FIELDTYPE, 1);
-Index: form/frm_hook.c
-Prereq:  1.16 
---- ncurses-6.0-20160116+/form/frm_hook.c	2012-03-11 00:37:16.000000000 +0000
-+++ ncurses-6.0-20160123/form/frm_hook.c	2016-01-23 21:32:00.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2012,2016 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -32,13 +32,13 @@
- 
- #include "form.priv.h"
- 
--MODULE_ID("$Id: frm_hook.c,v 1.16 2012/03/11 00:37:16 tom Exp $")
-+MODULE_ID("$Id: frm_hook.c,v 1.17 2016/01/23 21:32:00 tom Exp $")
- 
- /* "Template" macro to generate function to set application specific hook */
- #define GEN_HOOK_SET_FUNCTION( typ, name ) \
- NCURSES_IMPEXP int NCURSES_API set_ ## typ ## _ ## name (FORM *form, Form_Hook func)\
- {\
--   T((T_CALLED("set_" #typ"_"#name"(%p,%p)"), (void *) form, func));\
-+   T((T_CALLED("set_" #typ"_"#name"(%p,%p)"), (void *) form, TR_FUNC(func)));\
-    (Normalize_Form( form ) -> typ ## name) = func ;\
-    RETURN(E_OK);\
- }
-Index: form/fty_generic.c
-Prereq:  1.6 
---- ncurses-6.0-20160116+/form/fty_generic.c	2012-06-10 00:27:49.000000000 +0000
-+++ ncurses-6.0-20160123/form/fty_generic.c	2016-01-23 21:32:00.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2008-2010,2012 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2008-2012,2016 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -34,7 +34,7 @@
- 
- #include "form.priv.h"
- 
--MODULE_ID("$Id: fty_generic.c,v 1.6 2012/06/10 00:27:49 tom Exp $")
-+MODULE_ID("$Id: fty_generic.c,v 1.7 2016/01/23 21:32:00 tom Exp $")
- 
- /*
-  * This is not a full implementation of a field type, but adds some
-@@ -110,7 +110,11 @@
-   FIELDTYPE *res = (FIELDTYPE *)0;
- 
-   T((T_CALLED("_nc_generic_fieldtype(%p,%p,%p,%p,%p)"),
--     field_check, char_check, next, prev, freecallback));
-+     TR_FUNC(field_check),
-+     TR_FUNC(char_check),
-+     TR_FUNC(next),
-+     TR_FUNC(prev),
-+     TR_FUNC(freecallback)));
- 
-   if (field_check || char_check)
-     {
-Index: include/curses.h.in
-Prereq:  1.242 
---- ncurses-6.0-20160116+/include/curses.h.in	2015-12-19 23:08:31.000000000 +0000
-+++ ncurses-6.0-20160123/include/curses.h.in	2016-01-23 22:20:31.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -32,7 +32,7 @@
-  *     and: Thomas E. Dickey                        1996-on                 *
-  ****************************************************************************/
- 
--/* $Id: curses.h.in,v 1.242 2015/12/19 23:08:31 tom Exp $ */
-+/* $Id: curses.h.in,v 1.243 2016/01/23 22:20:31 tom Exp $ */
- 
- #ifndef __NCURSES_H
- #define __NCURSES_H
-@@ -1204,13 +1204,13 @@
- #define addchstr(str)		waddchstr(stdscr,(str))
- #define addnstr(str,n)		waddnstr(stdscr,(str),(n))
- #define addstr(str)		waddnstr(stdscr,(str),-1)
--#define attroff(at)		wattroff(stdscr,(at))
--#define attron(at)		wattron(stdscr,(at))
--#define attrset(at)		wattrset(stdscr,(at))
- #define attr_get(ap,cp,o)	wattr_get(stdscr,(ap),(cp),(o))
- #define attr_off(a,o)		wattr_off(stdscr,(a),(o))
- #define attr_on(a,o)		wattr_on(stdscr,(a),(o))
- #define attr_set(a,c,o)		wattr_set(stdscr,(a),(c),(o))
-+#define attroff(at)		wattroff(stdscr,(at))
-+#define attron(at)		wattron(stdscr,(at))
-+#define attrset(at)		wattrset(stdscr,(at))
- #define bkgd(ch)		wbkgd(stdscr,(ch))
- #define bkgdset(ch)		wbkgdset(stdscr,(ch))
- #define chgat(n,a,c,o)		wchgat(stdscr,(n),(a),(c),(o))
-@@ -1253,8 +1253,8 @@
- #define mvwaddchstr(win,y,x,str)	(wmove((win),(y),(x)) == ERR ? ERR : waddchnstr((win),(str),-1))
- #define mvwaddnstr(win,y,x,str,n)	(wmove((win),(y),(x)) == ERR ? ERR : waddnstr((win),(str),(n)))
- #define mvwaddstr(win,y,x,str)		(wmove((win),(y),(x)) == ERR ? ERR : waddnstr((win),(str),-1))
--#define mvwdelch(win,y,x)		(wmove((win),(y),(x)) == ERR ? ERR : wdelch(win))
- #define mvwchgat(win,y,x,n,a,c,o)	(wmove((win),(y),(x)) == ERR ? ERR : wchgat((win),(n),(a),(c),(o)))
-+#define mvwdelch(win,y,x)		(wmove((win),(y),(x)) == ERR ? ERR : wdelch(win))
- #define mvwgetch(win,y,x)		(wmove((win),(y),(x)) == ERR ? ERR : wgetch(win))
- #define mvwgetnstr(win,y,x,str,n)	(wmove((win),(y),(x)) == ERR ? ERR : wgetnstr((win),(str),(n)))
- #define mvwgetstr(win,y,x,str)		(wmove((win),(y),(x)) == ERR ? ERR : wgetstr((win),(str)))
-Index: include/curses.tail
-Prereq:  1.21 
---- ncurses-6.0-20160116+/include/curses.tail	2011-10-29 20:03:22.000000000 +0000
-+++ ncurses-6.0-20160123/include/curses.tail	2016-01-23 22:03:27.000000000 +0000
-@@ -1,4 +1,4 @@
--/* $Id: curses.tail,v 1.21 2011/10/29 20:03:22 tom Exp $ */
-+/* $Id: curses.tail,v 1.22 2016/01/23 22:03:27 tom Exp $ */
- /*
-  * vile:cmode:
-  * This file is part of ncurses, designed to be appended after curses.h.in
-@@ -111,7 +111,9 @@
- extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(mouseinterval) (SCREEN*, int);
- #endif
- 
-+#ifndef NCURSES_NOMACROS
- #define mouse_trafo(y,x,to_screen) wmouse_trafo(stdscr,y,x,to_screen)
-+#endif
- 
- /* other non-XSI functions */
- 
-Index: menu/m_hook.c
-Prereq:  1.16 
---- ncurses-6.0-20160116+/menu/m_hook.c	2012-03-10 23:43:41.000000000 +0000
-+++ ncurses-6.0-20160123/menu/m_hook.c	2016-01-23 21:32:00.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2012,2016 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -37,13 +37,13 @@
- 
- #include "menu.priv.h"
- 
--MODULE_ID("$Id: m_hook.c,v 1.16 2012/03/10 23:43:41 tom Exp $")
-+MODULE_ID("$Id: m_hook.c,v 1.17 2016/01/23 21:32:00 tom Exp $")
- 
- /* "Template" macro to generate function to set application specific hook */
- #define GEN_HOOK_SET_FUNCTION( typ, name ) \
- NCURSES_IMPEXP int NCURSES_API set_ ## typ ## _ ## name (MENU *menu, Menu_Hook func )\
- {\
--   T((T_CALLED("set_" #typ "_" #name "(%p,%p)"), (void *) menu, func));\
-+   T((T_CALLED("set_" #typ "_" #name "(%p,%p)"), (void *) menu, TR_FUNC(func)));\
-    (Normalize_Menu(menu) -> typ ## name = func );\
-    RETURN(E_OK);\
- }
-Index: menu/m_trace.c
-Prereq:  1.4 
---- ncurses-6.0-20160116+/menu/m_trace.c	2010-01-23 21:20:10.000000000 +0000
-+++ ncurses-6.0-20160123/menu/m_trace.c	2016-01-23 21:32:00.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2004-2005,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2004-2010,2016 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -32,7 +32,7 @@
- 
- #include "menu.priv.h"
- 
--MODULE_ID("$Id: m_trace.c,v 1.4 2010/01/23 21:20:10 tom Exp $")
-+MODULE_ID("$Id: m_trace.c,v 1.5 2016/01/23 21:32:00 tom Exp $")
- 
- NCURSES_EXPORT(ITEM *)
- _nc_retrace_item(ITEM * code)
-@@ -65,7 +65,7 @@
- NCURSES_EXPORT(Menu_Hook)
- _nc_retrace_menu_hook(Menu_Hook code)
- {
--  T((T_RETURN("%p"), code));
-+  T((T_RETURN("%p"), TR_FUNC(code)));
-   return code;
- }
- 
-Index: ncurses/Makefile.in
-Prereq:  1.148 
---- ncurses-6.0-20160116+/ncurses/Makefile.in	2015-10-17 21:48:15.000000000 +0000
-+++ ncurses-6.0-20160123/ncurses/Makefile.in	2016-01-23 21:32:00.000000000 +0000
-@@ -1,6 +1,6 @@
--# $Id: Makefile.in,v 1.148 2015/10/17 21:48:15 Esa.Peuha Exp $
-+# $Id: Makefile.in,v 1.149 2016/01/23 21:32:00 tom Exp $
- ##############################################################################
--# Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -266,7 +266,8 @@
- @MAKE_UPPER_TAGS@	$(ETAGS) *.[ch] */*.[ch]
- 
- mostlyclean ::
--	-rm -f core tags TAGS *~ *.bak *.i *.ln *.atac trace
-+	-rm -f core tags TAGS *~ *.bak *.i *.ln *.atac
-+	-test -f trace || rm -f trace
- 	-rm -f $(TEST_PROGS)
- 
- clean :: mostlyclean
-Index: ncurses/base/lib_getch.c
-Prereq:  1.133 
---- ncurses-6.0-20160116+/ncurses/base/lib_getch.c	2015-11-29 01:28:52.000000000 +0000
-+++ ncurses-6.0-20160123/ncurses/base/lib_getch.c	2016-01-23 21:32:00.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -42,7 +42,7 @@
- 
- #include 
- 
--MODULE_ID("$Id: lib_getch.c,v 1.133 2015/11/29 01:28:52 tom Exp $")
-+MODULE_ID("$Id: lib_getch.c,v 1.134 2016/01/23 21:32:00 tom Exp $")
- 
- #include 
- 
-@@ -651,7 +651,7 @@
-     int code;
-     int value;
- 
--    T((T_CALLED("wgetch_events(%p,%p)"), win, evl));
-+    T((T_CALLED("wgetch_events(%p,%p)"), (void *) win, (void *)evl));
-     code = _nc_wgetch(win,
- 		      &value,
- 		      _nc_use_meta(win)
-Index: ncurses/base/lib_set_term.c
-Prereq:  1.153 
---- ncurses-6.0-20160116+/ncurses/base/lib_set_term.c	2015-08-07 23:57:58.000000000 +0000
-+++ ncurses-6.0-20160123/ncurses/base/lib_set_term.c	2016-01-23 21:32:00.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -47,7 +47,7 @@
- #define CUR SP_TERMTYPE
- #endif
- 
--MODULE_ID("$Id: lib_set_term.c,v 1.153 2015/08/07 23:57:58 tom Exp $")
-+MODULE_ID("$Id: lib_set_term.c,v 1.154 2016/01/23 21:32:00 tom Exp $")
- 
- #ifdef USE_TERM_DRIVER
- #define MaxColors      InfoOf(sp).maxcolors
-@@ -726,7 +726,7 @@
-     int code = ERR;
- 
-     START_TRACE();
--    T((T_CALLED("ripoffline(%p,%d,%p)"), (void *) SP_PARM, line, init));
-+    T((T_CALLED("ripoffline(%p,%d,%p)"), (void *) SP_PARM, line, TR_FUNC(init)));
- 
- #if NCURSES_SP_FUNCS
-     if (SP_PARM != 0 && SP_PARM->_prescreen)
-Index: ncurses/base/use_window.c
-Prereq:  1.9 
---- ncurses-6.0-20160116+/ncurses/base/use_window.c	2009-10-24 22:40:24.000000000 +0000
-+++ ncurses-6.0-20160123/ncurses/base/use_window.c	2016-01-23 21:32:00.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2007-2008,2009 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2007-2009,2016 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -32,14 +32,14 @@
- 
- #include 
- 
--MODULE_ID("$Id: use_window.c,v 1.9 2009/10/24 22:40:24 tom Exp $")
-+MODULE_ID("$Id: use_window.c,v 1.10 2016/01/23 21:32:00 tom Exp $")
- 
- NCURSES_EXPORT(int)
- use_window(WINDOW *win, NCURSES_WINDOW_CB func, void *data)
- {
-     int code = OK;
- 
--    T((T_CALLED("use_window(%p,%p,%p)"), (void *) win, func, data));
-+    T((T_CALLED("use_window(%p,%p,%p)"), (void *) win, TR_FUNC(func), data));
-     _nc_lock_global(curses);
-     code = func(win, data);
-     _nc_unlock_global(curses);
-Index: ncurses/curses.priv.h
-Prereq:  1.548 
---- ncurses-6.0-20160116+/ncurses/curses.priv.h	2016-01-10 22:17:19.000000000 +0000
-+++ ncurses-6.0-20160123/ncurses/curses.priv.h	2016-01-24 01:39:09.000000000 +0000
-@@ -34,7 +34,7 @@
-  ****************************************************************************/
- 
- /*
-- * $Id: curses.priv.h,v 1.548 2016/01/10 22:17:19 tom Exp $
-+ * $Id: curses.priv.h,v 1.551 2016/01/24 01:39:09 tom Exp $
-  *
-  *	curses.priv.h
-  *
-@@ -1630,7 +1630,10 @@
- #define TRACE_RETURN2(value,dst,src) return _nc_retrace_##dst##_##src(value)
- #define TRACE_RETURN_SP(value,type)  return _nc_retrace_##type(SP_PARM, value)
- 
--#define NonNull(s)	((s) != 0 ? s : "")
-+typedef void VoidFunc(void);
-+
-+#define TR_FUNC(value)          ((const char*) &(value))
-+#define NonNull(s)	        ((s) != 0 ? s : "")
- 
- #define returnAttr(code)	TRACE_RETURN(code,attr_t)
- #define returnBits(code)	TRACE_RETURN(code,unsigned)
-Index: ncurses/tinfo/lib_tputs.c
-Prereq:  1.96 
---- ncurses-6.0-20160116+/ncurses/tinfo/lib_tputs.c	2015-01-03 23:51:23.000000000 +0000
-+++ ncurses-6.0-20160123/ncurses/tinfo/lib_tputs.c	2016-01-23 21:32:00.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2013,2015 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -51,7 +51,7 @@
- #include 		/* ospeed */
- #include 
- 
--MODULE_ID("$Id: lib_tputs.c,v 1.96 2015/01/03 23:51:23 tom Exp $")
-+MODULE_ID("$Id: lib_tputs.c,v 1.97 2016/01/23 21:32:00 tom Exp $")
- 
- NCURSES_EXPORT_VAR(char) PC = 0;              /* used by termcap library */
- NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0;        /* used by termcap library */
-@@ -277,7 +277,7 @@
- 	if (outc == NCURSES_SP_NAME(_nc_outch))
- 	    _nc_STRCPY(addrbuf, "_nc_outch", sizeof(addrbuf));
- 	else
--	    _nc_SPRINTF(addrbuf, _nc_SLIMIT(sizeof(addrbuf)) "%p", outc);
-+	    _nc_SPRINTF(addrbuf, _nc_SLIMIT(sizeof(addrbuf)) "%p", TR_FUNC(outc));
- 	if (_nc_tputs_trace) {
- 	    _tracef("tputs(%s = %s, %d, %s) called", _nc_tputs_trace,
- 		    _nc_visbuf(string), affcnt, addrbuf);
-Index: ncurses/tinfo/use_screen.c
-Prereq:  1.8 
---- ncurses-6.0-20160116+/ncurses/tinfo/use_screen.c	2009-10-24 22:40:20.000000000 +0000
-+++ ncurses-6.0-20160123/ncurses/tinfo/use_screen.c	2016-01-23 21:32:00.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2007-2008,2009 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2007-2009,2016 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -32,7 +32,7 @@
- 
- #include 
- 
--MODULE_ID("$Id: use_screen.c,v 1.8 2009/10/24 22:40:20 tom Exp $")
-+MODULE_ID("$Id: use_screen.c,v 1.9 2016/01/23 21:32:00 tom Exp $")
- 
- NCURSES_EXPORT(int)
- use_screen(SCREEN *screen, NCURSES_SCREEN_CB func, void *data)
-@@ -40,7 +40,7 @@
-     SCREEN *save_SP;
-     int code = OK;
- 
--    T((T_CALLED("use_screen(%p,%p,%p)"), (void *) screen, func, (void *) data));
-+    T((T_CALLED("use_screen(%p,%p,%p)"), (void *) screen, TR_FUNC(func), (void *) data));
- 
-     /*
-      * FIXME - add a flag so a given thread can check if _it_ has already
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20160116+/package/debian-mingw/changelog	2016-01-16 21:24:23.000000000 +0000
-+++ ncurses-6.0-20160123/package/debian-mingw/changelog	2016-01-23 17:00:00.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20160116) unstable; urgency=low
-+ncurses6 (6.0+20160123) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 16 Jan 2016 16:24:23 -0500
-+ -- Thomas E. Dickey   Sat, 23 Jan 2016 12:00:36 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20160116+/package/debian-mingw64/changelog	2016-01-16 21:24:23.000000000 +0000
-+++ ncurses-6.0-20160123/package/debian-mingw64/changelog	2016-01-23 17:00:00.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20160116) unstable; urgency=low
-+ncurses6 (6.0+20160123) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 16 Jan 2016 16:24:23 -0500
-+ -- Thomas E. Dickey   Sat, 23 Jan 2016 12:00:36 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.0-20160116+/package/debian/changelog	2016-01-16 21:24:23.000000000 +0000
-+++ ncurses-6.0-20160123/package/debian/changelog	2016-01-23 17:00:00.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20160116) unstable; urgency=low
-+ncurses6 (6.0+20160123) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 16 Jan 2016 16:24:23 -0500
-+ -- Thomas E. Dickey   Sat, 23 Jan 2016 12:00:36 -0500
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.141 
---- ncurses-6.0-20160116+/package/mingw-ncurses.nsi	2016-01-16 21:24:23.000000000 +0000
-+++ ncurses-6.0-20160123/package/mingw-ncurses.nsi	2016-01-23 17:00:00.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.141 2016/01/16 21:24:23 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.142 2016/01/23 17:00:00 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "0"
- !define VERSION_YYYY  "2016"
--!define VERSION_MMDD  "0116"
-+!define VERSION_MMDD  "0123"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20160116+/package/mingw-ncurses.spec	2016-01-16 21:24:23.000000000 +0000
-+++ ncurses-6.0-20160123/package/mingw-ncurses.spec	2016-01-23 17:00:00.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.0
--Release: 20160116
-+Release: 20160123
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20160116+/package/ncurses.spec	2016-01-16 21:24:23.000000000 +0000
-+++ ncurses-6.0-20160123/package/ncurses.spec	2016-01-23 17:00:00.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.0
--Release: 20160116
-+Release: 20160123
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
diff --git a/ncurses-6.0-20160130.patch b/ncurses-6.0-20160130.patch
deleted file mode 100644
index 3134b8a..0000000
--- a/ncurses-6.0-20160130.patch
+++ /dev/null
@@ -1,11519 +0,0 @@
-# ncurses 6.0 - patch 20160130 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.0 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.0 can be found at
-# 	ftp://invisible-island.net/ncurses/6.0
-#	http://invisible-mirror.net/archives/ncurses/6.0 
-#
-# ------------------------------------------------------------------------------
-# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20160130.patch.gz
-# patch by Thomas E. Dickey 
-# created  Sun Jan 31 02:15:39 UTC 2016
-# ------------------------------------------------------------------------------
-# NEWS                                       |    7 -
-# VERSION                                    |    2 
-# dist.mk                                    |    4 
-# doc/html/man/captoinfo.1m.html             |   26 +---
-# doc/html/man/clear.1.html                  |   14 --
-# doc/html/man/curs_add_wch.3x.html          |   30 +---
-# doc/html/man/curs_add_wchstr.3x.html       |   21 +--
-# doc/html/man/curs_addch.3x.html            |   30 +---
-# doc/html/man/curs_addchstr.3x.html         |   21 +--
-# doc/html/man/curs_addstr.3x.html           |   21 +--
-# doc/html/man/curs_addwstr.3x.html          |   21 +--
-# doc/html/man/curs_attr.3x.html             |   41 ++----
-# doc/html/man/curs_beep.3x.html             |   21 +--
-# doc/html/man/curs_bkgd.3x.html             |   30 +---
-# doc/html/man/curs_bkgrnd.3x.html           |   27 +---
-# doc/html/man/curs_border.3x.html           |   21 +--
-# doc/html/man/curs_border_set.3x.html       |   18 --
-# doc/html/man/curs_clear.3x.html            |   21 +--
-# doc/html/man/curs_color.3x.html            |   33 +----
-# doc/html/man/curs_delch.3x.html            |   21 +--
-# doc/html/man/curs_deleteln.3x.html         |   21 +--
-# doc/html/man/curs_extend.3x.html           |   18 --
-# doc/html/man/curs_get_wch.3x.html          |   18 --
-# doc/html/man/curs_get_wstr.3x.html         |   21 +--
-# doc/html/man/curs_getcchar.3x.html         |   24 +--
-# doc/html/man/curs_getch.3x.html            |  167 +++++++++++++--------------
-# doc/html/man/curs_getstr.3x.html           |   21 +--
-# doc/html/man/curs_getyx.3x.html            |   21 +--
-# doc/html/man/curs_in_wch.3x.html           |   21 +--
-# doc/html/man/curs_in_wchstr.3x.html        |   21 +--
-# doc/html/man/curs_inch.3x.html             |   24 +--
-# doc/html/man/curs_inchstr.3x.html          |   21 +--
-# doc/html/man/curs_initscr.3x.html          |   48 ++-----
-# doc/html/man/curs_inopts.3x.html           |   54 ++------
-# doc/html/man/curs_ins_wch.3x.html          |   18 --
-# doc/html/man/curs_ins_wstr.3x.html         |   18 --
-# doc/html/man/curs_insch.3x.html            |   21 +--
-# doc/html/man/curs_insstr.3x.html           |   21 +--
-# doc/html/man/curs_instr.3x.html            |   21 +--
-# doc/html/man/curs_inwstr.3x.html           |   18 --
-# doc/html/man/curs_kernel.3x.html           |   45 ++-----
-# doc/html/man/curs_legacy.3x.html           |   21 +--
-# doc/html/man/curs_memleaks.3x.html         |   18 --
-# doc/html/man/curs_mouse.3x.html            |   48 ++-----
-# doc/html/man/curs_move.3x.html             |   21 +--
-# doc/html/man/curs_opaque.3x.html           |   21 +--
-# doc/html/man/curs_outopts.3x.html          |   45 ++-----
-# doc/html/man/curs_overlay.3x.html          |   27 +---
-# doc/html/man/curs_pad.3x.html              |   36 +----
-# doc/html/man/curs_print.3x.html            |   21 +--
-# doc/html/man/curs_printw.3x.html           |   18 --
-# doc/html/man/curs_refresh.3x.html          |   53 ++++----
-# doc/html/man/curs_scanw.3x.html            |   18 --
-# doc/html/man/curs_scr_dump.3x.html         |   21 +--
-# doc/html/man/curs_scroll.3x.html           |   21 +--
-# doc/html/man/curs_slk.3x.html              |   21 +--
-# doc/html/man/curs_sp_funcs.3x.html         |   24 +--
-# doc/html/man/curs_termattrs.3x.html        |   42 ++----
-# doc/html/man/curs_termcap.3x.html          |   33 +----
-# doc/html/man/curs_terminfo.3x.html         |   36 +----
-# doc/html/man/curs_threads.3x.html          |   24 +--
-# doc/html/man/curs_touch.3x.html            |   21 +--
-# doc/html/man/curs_trace.3x.html            |   18 --
-# doc/html/man/curs_util.3x.html             |   57 +++------
-# doc/html/man/curs_variables.3x.html        |   45 ++-----
-# doc/html/man/curs_window.3x.html           |   51 ++------
-# doc/html/man/default_colors.3x.html        |   24 +--
-# doc/html/man/define_key.3x.html            |   21 +--
-# doc/html/man/form.3x.html                  |   32 +----
-# doc/html/man/form_cursor.3x.html           |   24 +--
-# doc/html/man/form_data.3x.html             |   21 +--
-# doc/html/man/form_driver.3x.html           |   39 ++----
-# doc/html/man/form_field.3x.html            |   24 +--
-# doc/html/man/form_field_attributes.3x.html |   24 +--
-# doc/html/man/form_field_buffer.3x.html     |   24 +--
-# doc/html/man/form_field_info.3x.html       |   24 +--
-# doc/html/man/form_field_just.3x.html       |   24 +--
-# doc/html/man/form_field_new.3x.html        |   24 +--
-# doc/html/man/form_field_opts.3x.html       |   24 +--
-# doc/html/man/form_field_userptr.3x.html    |   24 +--
-# doc/html/man/form_field_validation.3x.html |   24 +--
-# doc/html/man/form_fieldtype.3x.html        |   24 +--
-# doc/html/man/form_hook.3x.html             |   24 +--
-# doc/html/man/form_new.3x.html              |   24 +--
-# doc/html/man/form_new_page.3x.html         |   24 +--
-# doc/html/man/form_opts.3x.html             |   24 +--
-# doc/html/man/form_page.3x.html             |   24 +--
-# doc/html/man/form_post.3x.html             |   24 +--
-# doc/html/man/form_requestname.3x.html      |   24 +--
-# doc/html/man/form_userptr.3x.html          |   24 +--
-# doc/html/man/form_variables.3x.html        |   36 +----
-# doc/html/man/form_win.3x.html              |   24 +--
-# doc/html/man/infocmp.1m.html               |   41 ++----
-# doc/html/man/infotocap.1m.html             |   23 +--
-# doc/html/man/key_defined.3x.html           |   21 +--
-# doc/html/man/keybound.3x.html              |   21 +--
-# doc/html/man/keyok.3x.html                 |   21 +--
-# doc/html/man/legacy_coding.3x.html         |   21 +--
-# doc/html/man/menu.3x.html                  |   32 +----
-# doc/html/man/menu_attributes.3x.html       |   24 +--
-# doc/html/man/menu_cursor.3x.html           |   24 +--
-# doc/html/man/menu_driver.3x.html           |   30 +---
-# doc/html/man/menu_format.3x.html           |   24 +--
-# doc/html/man/menu_hook.3x.html             |   24 +--
-# doc/html/man/menu_items.3x.html            |   24 +--
-# doc/html/man/menu_mark.3x.html             |   24 +--
-# doc/html/man/menu_new.3x.html              |   24 +--
-# doc/html/man/menu_opts.3x.html             |   24 +--
-# doc/html/man/menu_pattern.3x.html          |   24 +--
-# doc/html/man/menu_post.3x.html             |   24 +--
-# doc/html/man/menu_requestname.3x.html      |   24 +--
-# doc/html/man/menu_spacing.3x.html          |   24 +--
-# doc/html/man/menu_userptr.3x.html          |   24 +--
-# doc/html/man/menu_win.3x.html              |   24 +--
-# doc/html/man/mitem_current.3x.html         |   24 +--
-# doc/html/man/mitem_name.3x.html            |   24 +--
-# doc/html/man/mitem_new.3x.html             |   24 +--
-# doc/html/man/mitem_opts.3x.html            |   24 +--
-# doc/html/man/mitem_userptr.3x.html         |   24 +--
-# doc/html/man/mitem_value.3x.html           |   24 +--
-# doc/html/man/mitem_visible.3x.html         |   21 +--
-# doc/html/man/ncurses.3x.html               |  110 +++++------------
-# doc/html/man/panel.3x.html                 |   32 +----
-# doc/html/man/resizeterm.3x.html            |   33 +----
-# doc/html/man/tabs.1.html                   |   32 +----
-# doc/html/man/term.5.html                   |   36 +----
-# doc/html/man/term.7.html                   |   15 --
-# doc/html/man/term_variables.3x.html        |   33 +----
-# doc/html/man/terminfo.5.html               |   95 +++++----------
-# doc/html/man/tic.1m.html                   |   35 +----
-# doc/html/man/toe.1m.html                   |   17 --
-# doc/html/man/tput.1.html                   |   29 +---
-# doc/html/man/tset.1.html                   |   50 ++++----
-# doc/html/man/wresize.3x.html               |   24 +--
-# man/curs_refresh.3x                        |    9 -
-# man/tset.1                                 |    7 -
-# ncurses/Makefile.in                        |    4 
-# package/debian-mingw/changelog             |    4 
-# package/debian-mingw64/changelog           |    4 
-# package/debian/changelog                   |    4 
-# package/mingw-ncurses.nsi                  |    4 
-# package/mingw-ncurses.spec                 |    2 
-# package/ncurses.spec                       |    2 
-# 143 files changed, 1332 insertions(+), 2466 deletions(-)
-# ------------------------------------------------------------------------------
-Index: NEWS
-Prereq:  1.2564 
---- ncurses-6.0-20160123+/NEWS	2016-01-24 01:17:56.000000000 +0000
-+++ ncurses-6.0-20160130/NEWS	2016-01-30 19:38:41.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.2564 2016/01/24 01:17:56 tom Exp $
-+-- $Id: NEWS,v 1.2566 2016/01/30 19:38:41 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,11 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20160130
-+	+ improve formatting of man/curs_refresh.3x and man/tset.1 manpages
-+	+ regenerate HTML manpages using newer man2html to eliminate some
-+	  unwanted blank lines.
-+
- 20160123
- 	+ ifdef'd header-file definition of mouse_trafo() with NCURSES_NOMACROS
- 	  (report by Corey Minyard).
-Index: VERSION
---- ncurses-6.0-20160123+/VERSION	2016-01-23 17:00:00.000000000 +0000
-+++ ncurses-6.0-20160130/VERSION	2016-01-30 15:30:48.000000000 +0000
-@@ -1 +1 @@
--5:0:9	6.0	20160123
-+5:0:9	6.0	20160130
-Index: dist.mk
-Prereq:  1.1090 
---- ncurses-6.0-20160123+/dist.mk	2016-01-23 17:00:00.000000000 +0000
-+++ ncurses-6.0-20160130/dist.mk	2016-01-30 15:30:48.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1090 2016/01/23 17:00:00 tom Exp $
-+# $Id: dist.mk,v 1.1091 2016/01/30 15:30:48 tom Exp $
- # Makefile for creating ncurses distributions.
- #
- # This only needs to be used directly as a makefile by developers, but
-@@ -37,7 +37,7 @@
- # These define the major/minor/patch versions of ncurses.
- NCURSES_MAJOR = 6
- NCURSES_MINOR = 0
--NCURSES_PATCH = 20160123
-+NCURSES_PATCH = 20160130
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: doc/html/man/captoinfo.1m.html
---- ncurses-6.0-20160123+/doc/html/man/captoinfo.1m.html	2015-12-06 00:26:44.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/captoinfo.1m.html	2016-01-30 19:24:50.000000000 +0000
-@@ -46,19 +46,16 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        captoinfo  - convert a termcap description into a terminfo
-        description
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        captoinfo [-vn width]  [-V] [-1] [-w width] file . . .
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        captoinfo looks  in  each  given  text  file  for  termcap
-        descriptions.   For each one found, an equivalent terminfo
-        description is written to  standard  output.   Termcap  tc
-@@ -85,14 +82,12 @@
-        -w   change the output to width characters.
- 
- 
--
    
--
    FILES
    -+
    FILES
    -        /usr/share/terminfo Compiled  terminal  description  data-
-                            base.
- 
- 
--
    
--
    TRANSLATIONS FROM NONSTANDARD CAPABILITIES
    -+
    TRANSLATIONS FROM NONSTANDARD CAPABILITIES
    -        Some obsolete nonstandard capabilities will  automatically
-        be  translated  into  standard  (SVr4/XSI Curses) terminfo
-        capabilities by captoinfo.  Whenever one  of  these  auto-
-@@ -191,8 +186,7 @@
-        message.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        This  utility is actually a link to tic(1m), running in -I
-        mode.  You can use other tic options such as -f and  -x.
- 
-@@ -201,15 +195,13 @@
-        repeat it n times.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        infocmp(1m), curses(3x), terminfo(5)
- 
--       This describes ncurses version 6.0 (patch 20151205).
-+       This describes ncurses version 6.0 (patch 20160130).
- 
- 
--
    
--
    AUTHOR
    -+
    AUTHOR
    -        Eric S. Raymond <esr@snark.thyrsus.com> and
-        Thomas E. Dickey <dickey@invisible-island.net>
- 
-Index: doc/html/man/clear.1.html
---- ncurses-6.0-20160123+/doc/html/man/clear.1.html	2015-12-06 00:26:44.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/clear.1.html	2016-01-30 19:24:51.000000000 +0000
-@@ -45,18 +45,15 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        clear - clear the terminal screen
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        clear
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        clear  clears  your  screen if this is possible, including
-        its scrollback buffer (if the extended "E3" capability  is
-        defined).  clear looks in the environment for the terminal
-@@ -67,11 +64,10 @@
-        present.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        tput(1), terminfo(5)
- 
--       This describes ncurses version 6.0 (patch 20151205).
-+       This describes ncurses version 6.0 (patch 20160130).
- 
- 
- 
-Index: doc/html/man/curs_add_wch.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_add_wch.3x.html	2015-07-22 00:49:55.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_add_wch.3x.html	2016-01-30 19:24:51.000000000 +0000
-@@ -45,15 +45,13 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        add_wch,   wadd_wch,  mvadd_wch,  mvwadd_wch,  echo_wchar,
-        wecho_wchar - add a complex character and rendition  to  a
-        curses window, then advance the cursor
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int add_wch( const cchar_t *wch );
-@@ -65,11 +63,9 @@
-        int wecho_wchar( WINDOW *win, const cchar_t *wch );
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    - 
--
    
--
    add_wch
    -+
    add_wch
    -        The add_wch, wadd_wch, mvadd_wch, and mvwadd_wch functions
-        put the complex character wch into the given window at its
-        current position, which is then advanced.  These functions
-@@ -93,8 +89,7 @@
-            updated and the cursor moves as if addch were called.
- 
- 
--
    
--
    echo_wchar
    -+
    echo_wchar
    -        The echo_wchar function is functionally  equivalent  to  a
-        call to add_wch followed by a call to refresh.  Similarly,
-        the wecho_wchar is functionally equivalent to  a  call  to
-@@ -105,8 +100,7 @@
-        functions instead of their equivalents.
- 
- 
--
    
--
    Line Graphics
    -+
    Line Graphics
    -        Like  curs_addch(3x),  addch_wch  accepts symbols which make it
-        simple to draw lines and  other  frequently  used  special
-        characters.   These  symbols  correspond to the same VT100
-@@ -177,8 +171,7 @@
-        WACS_D_PLUS       0x256c    +         double large plus or crossover
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        All routines return the integer ERR upon failure and OK on
-        success.
- 
-@@ -187,14 +180,12 @@
-        outside the window, or if the window pointer is null.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        Note that add_wch, mvadd_wch, mvwadd_wch,  and  echo_wchar
-        may be macros.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        All  of  these  functions  are described in the XSI Curses
-        standard, Issue 4.  The defaults specified for  line-draw-
-        ing characters apply in the POSIX locale.
-@@ -220,8 +211,7 @@
-        definitions which are not in the SVr4 implementations.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), curs_addch(3x), curs_attr(3x), curs_clear(3x),
-        curs_outopts(3x), curs_refresh(3x), putwc(3)
- 
-Index: doc/html/man/curs_add_wchstr.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_add_wchstr.3x.html	2015-05-13 19:27:42.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_add_wchstr.3x.html	2016-01-30 19:24:51.000000000 +0000
-@@ -45,16 +45,14 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        add_wchstr, add_wchnstr, wadd_wchstr, wadd_wchnstr,
-        mvadd_wchstr, mvadd_wchnstr, mvwadd_wchstr, mvwadd_wchnstr
-        - add an array of complex characters (and attributes) to a
-        curses window
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int add_wchstr(const cchar_t *wchstr);
-@@ -67,8 +65,7 @@
-        int mvwadd_wchnstr(WINDOW *win, int y, int x, const cchar_t *wchstr, int n);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        These functions copy the (null-terminated) array  of  com-
-        plex  characters  wchstr  into  the window image structure
-        starting at the current cursor position.  The  four  func-
-@@ -98,8 +95,7 @@
-        background character and rendition.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        All functions return the integer ERR upon failure  and  OK
-        on success.
- 
-@@ -111,19 +107,16 @@
-        outside the window, or if the window pointer is null.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        All functions except wadd_wchnstr may be macros.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These entry points are described in the XSI  Curses  stan-
-        dard, Issue 4.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curs_addwstr(3x), curses(3x).
- 
-        Comparable functions in the narrow-character (ncurses) li-
-Index: doc/html/man/curs_addch.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_addch.3x.html	2015-09-19 23:18:49.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_addch.3x.html	2016-01-30 19:24:51.000000000 +0000
-@@ -46,15 +46,13 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        addch,  waddch,  mvaddch,  mvwaddch, echochar, wechochar -
-        add a character (with attributes) to a curses window, then
-        advance the cursor
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int addch(const chtype ch);
-@@ -65,11 +63,9 @@
-        int wechochar(WINDOW *win, const chtype ch);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    - 
--
    
--
    Adding characters
    -+
    Adding characters
    -        The  addch,  waddch, mvaddch and mvwaddch routines put the
-        character ch into the given window at its  current  window
-        position,  which  is then advanced.  They are analogous to
-@@ -119,8 +115,7 @@
-        into characters.
- 
- 
--
    
--
    Echoing characters
    -+
    Echoing characters
    -        The  echochar  and  wechochar routines are equivalent to a
-        call to addch followed by a call to refresh, or a call  to
-        waddch followed by a call to wrefresh.  The knowledge that
-@@ -130,8 +125,7 @@
-        equivalents.
- 
- 
--
    
--
    Line Graphics
    -+
    Line Graphics
    -        The  following  variables  may be used to add line drawing
-        characters to the screen with routines of the  addch  fam-
-        ily.   The  default  character listed below is used if the
-@@ -178,8 +172,7 @@
-        ACS_VLINE      |         vertical line
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        All routines return the integer ERR upon failure and OK on
-        success (the SVr4 manuals specify only "an  integer  value
-        other than ERR") upon successful completion, unless other-
-@@ -190,14 +183,12 @@
-        outside the window, or if the window pointer is null.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        Note that addch, mvaddch, mvwaddch, and  echochar  may  be
-        macros.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        All  these functions are described in the XSI Curses stan-
-        dard, Issue 4.  The defaults specified  for  forms-drawing
-        characters apply in the POSIX locale.
-@@ -237,8 +228,7 @@
-        of other implementations, but is not documented.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x),  curs_attr(3x), curs_clear(3x), curs_inch(3x),
-        curs_outopts(3x),  curs_refresh(3x),   curs_variables(3x),
-        putc(3).
-Index: doc/html/man/curs_addchstr.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_addchstr.3x.html	2015-05-13 19:27:42.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_addchstr.3x.html	2016-01-30 19:24:51.000000000 +0000
-@@ -45,15 +45,13 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        addchstr, addchnstr, waddchstr, waddchnstr, mvaddchstr,
-        mvaddchnstr, mvwaddchstr, mvwaddchnstr - add a string of
-        characters (and attributes) to a curses window
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int addchstr(const chtype *chstr);
-@@ -66,8 +64,7 @@
-        int mvwaddchnstr(WINDOW *win, int y, int x, const chtype *chstr, int n);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        These functions copy the (null-terminated) chstr array in-
-        to the window image structure starting at the current cur-
-        sor position.  The four functions with n as the last argu-
-@@ -90,8 +87,7 @@
-            gin, rather than wrapping it around to the new line.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        All functions return the integer ERR upon failure  and  OK
-        on success.
- 
-@@ -103,19 +99,16 @@
-        outside the window, or if the window pointer is null.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        All functions except waddchnstr may be macros.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These entry points are described in the XSI  Curses  stan-
-        dard, Issue 4.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curs_addstr(3x), curses(3x).
- 
-        Comparable  functions in the wide-character (ncursesw) li-
-Index: doc/html/man/curs_addstr.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_addstr.3x.html	2015-05-13 19:27:42.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_addstr.3x.html	2016-01-30 19:24:51.000000000 +0000
-@@ -45,15 +45,13 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        addstr, addnstr, waddstr, waddnstr, mvaddstr, mvaddnstr,
-        mvwaddstr, mvwaddnstr - add a string of characters to a
-        curses window and advance cursor
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int addstr(const char *str);
-@@ -66,8 +64,7 @@
-        int mvwaddnstr(WINDOW *win, int y, int x, const char *str, int n);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        These  functions  write  the  (null-terminated)  character
-        string str on the given window.  It is similar to  calling
-        waddch once for each character in the string.
-@@ -81,8 +78,7 @@
-        If n is -1, then the entire string will be added.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        All  functions  return the integer ERR upon failure and OK
-        on success.
- 
-@@ -100,19 +96,16 @@
-        outside the window, or if the window pointer is null.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        All of these functions except waddnstr may be macros.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  functions are described in the XSI Curses standard,
-        Issue 4.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), curs_addch(3x).
- 
- 
-Index: doc/html/man/curs_addwstr.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_addwstr.3x.html	2015-05-13 19:27:43.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_addwstr.3x.html	2016-01-30 19:24:51.000000000 +0000
-@@ -45,15 +45,13 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        addwstr, addnwstr, waddwstr, waddnwstr, mvaddwstr,
-        mvaddnwstr, mvwaddwstr, mvwaddnwstr - add a string of wide
-        characters to a curses window and advance cursor
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int addwstr(const wchar_t *wstr);
-@@ -66,8 +64,7 @@
-        int mvwaddnwstr(WINDOW *win, int y, int x, const wchar_t *wstr, int n);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        These  functions  write the characters of the (null-termi-
-        nated) wchar_t character string wstr on the given  window.
-        It  is  similar to constructing a cchar_t for each wchar_t
-@@ -84,8 +81,7 @@
-        added.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        All functions return the integer ERR upon failure  and  OK
-        on success.
- 
-@@ -104,19 +100,16 @@
-        outside the window, or if the window pointer is null.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        All of these functions except waddnwstr may be macros.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  functions are described in the XSI Curses standard,
-        Issue 4.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), curs_add_wch(3x)
- 
- 
-Index: doc/html/man/curs_attr.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_attr.3x.html	2015-12-13 22:13:22.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_attr.3x.html	2016-01-30 19:24:51.000000000 +0000
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_attr.3x,v 1.43 2015/12/05 18:46:04 tom Exp @
-+  * @Id: curs_attr.3x,v 1.44 2015/12/13 21:54:05 tom Exp @
- -->
- 
- 
-@@ -46,8 +46,7 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        attroff, wattroff, attron, wattron, attrset, wattrset,
-        color_set, wcolor_set, standend, wstandend, standout,
-        wstandout, attr_get, wattr_get, attr_off, wattr_off,
-@@ -56,8 +55,7 @@
-        window attribute control routines
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
-        int attroff(int attrs);
-        int wattroff(WINDOW *win, int attrs);
-@@ -93,8 +91,7 @@
-        PAIR_NUMBER(attrs);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        These  routines  manipulate  the current attributes of the
-        named window.  The current attributes of a window apply to
-        all characters that are written into the window with wadd-
-@@ -106,8 +103,7 @@
-        on the screen.
- 
- 
--
    
--
    attrset
    -+
    attrset
    -        The  routine  attrset  sets  the current attributes of the
-        given window to attrs.  The routine attroff turns off  the
-        named  attributes  without turning any other attributes on
-@@ -123,8 +119,7 @@
-        used for erasing and clearing.
- 
- 
--
    
--
    attr_set
    -+
    attr_set
    -        The attrset routine is actually a legacy feature predating
-        SVr4 curses but kept in X/Open Curses for the same  reason
-        that  SVr4 curses kept it: compatibility.  The routine at-
-@@ -135,16 +130,14 @@
-        ments of type attr_t rather than int.
- 
- 
--
    
--
    color_set
    -+
    color_set
    -        The routine color_set sets the current color of the  given
-        window  to the foreground/background combination described
-        by the color_pair_number.  The parameter opts is  reserved
-        for future use, applications must supply a null pointer.
- 
- 
--
    
--
    attr_get
    -+
    attr_get
    -        The  routine  wattr_get  returns the current attribute and
-        color pair for the given window; attr_get returns the cur-
-        rent attribute and color pair for stdscr.
-@@ -154,8 +147,7 @@
-        curs_legacy(3x)).
- 
- 
--
    
--
    chgat
    -+
    chgat
    -        The routine chgat changes the attributes of a given number
-        of characters starting at the current cursor  location  of
-        stdscr.   It  does not update the cursor and does not per-
-@@ -170,8 +162,7 @@
-        (leave it NULL).
- 
- 
--
    
--
    Attributes
    -+
    Attributes
    -        The following video attributes, defined in <curses.h>, can
-        be passed to the routines attron, attroff, and attrset, or
-        OR'd with the characters passed to  addch  (see  curs_add-
-@@ -220,8 +211,7 @@
-        claims (falsely) that these routines always return 1.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        Note that attroff,  wattroff,  attron,  wattron,  attrset,
-        wattrset, standend and standout may be macros.
- 
-@@ -233,8 +223,7 @@
-        support more than 256 color pairs.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These functions are supported in the XSI Curses  standard,
-        Issue  4.   The  standard  defined  the dedicated type for
-        highlights, attr_t, which is not defined in  SVr4  curses.
-@@ -289,8 +278,7 @@
-        (i.e., via the sgr1 capability).
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        All routines return the integer OK on success, or  ERR  on
-        failure.
- 
-@@ -307,8 +295,7 @@
-        outside the window, or if the window pointer is null.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), curs_addch(3x), curs_addstr(3x),
-        curs_bkgd(3x), curs_printw(3x), curs_variables(3x)
- 
-Index: doc/html/man/curs_beep.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_beep.3x.html	2015-05-13 19:27:43.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_beep.3x.html	2016-01-30 19:24:51.000000000 +0000
-@@ -45,21 +45,18 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        beep, flash - curses bell and screen flash routines
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int beep(void);
-        int flash(void);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The beep and flash routines are used to alert the terminal
-        user.  The routine beep sounds an  audible  alarm  on  the
-        terminal,  if  possible;  otherwise  it flashes the screen
-@@ -70,27 +67,23 @@
-        flash the screen.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        These routines return OK if they  succeed  in  beeping  or
-        flashing, ERR otherwise.
- 
- 
--
    
--
    EXTENSIONS
    -+
    EXTENSIONS
    -        SVr4's  beep  and flash routines always returned OK, so it
-        was not possible to tell when the beep or flash failed.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These functions are described in the XSI Curses  standard,
-        Issue  4.  Like SVr4, it specifies that they always return
-        OK.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x)
- 
- 
-Index: doc/html/man/curs_bkgd.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_bkgd.3x.html	2015-12-06 00:26:44.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_bkgd.3x.html	2016-01-30 19:24:51.000000000 +0000
-@@ -45,14 +45,12 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        bkgdset,  wbkgdset,  bkgd,  wbkgd, getbkgd - curses window
-        background manipulation routines
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        void bkgdset(chtype ch);
-@@ -62,11 +60,9 @@
-        chtype getbkgd(WINDOW *win);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    - 
--
    
--
    bkgdset
    -+
    bkgdset
    -        The bkgdset and wbkgdset  routines  manipulate  the  back-
-        ground  of  the  named window.  The window background is a
-        chtype consisting of any combination of attributes  (i.e.,
-@@ -84,8 +80,7 @@
-        graphic rendition of the character put on the screen.
- 
- 
--
    
--
    bkgd
    -+
    bkgd
    -        The bkgd and wbkgd functions set the  background  property
-        of  the  current  or  specified window and then apply this
-        setting to every character position in that window:
-@@ -97,33 +92,28 @@
-            is changed to the new background character.
- 
- 
--
    
--
    getbkgd
    -+
    getbkgd
    -        The getbkgd function returns the  given  window's  current
-        background character/attribute pair.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        The  routines  bkgd  and wbkgd return the integer OK.  The
-        SVr4.0 manual says "or a non-negative integer  if  immedok
-        is set", but this appears to be an error.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        Note that bkgdset and bkgd may be macros.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  functions are described in the XSI Curses standard,
-        Issue 4.  It specifies that bkgd and wbkgd return  ERR  on
-        failure, but gives no failure conditions.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), curs_addch(3x), curs_attr(3x), curs_out-
-        opts(3x)
- 
-Index: doc/html/man/curs_bkgrnd.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_bkgrnd.3x.html	2015-07-22 00:49:55.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_bkgrnd.3x.html	2016-01-30 19:24:51.000000000 +0000
-@@ -45,15 +45,13 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        bkgrnd,  wbkgrnd,  bkgrndset, wbkgrndset, getbkgrnd, wget-
-        bkgrnd - curses  window  complex  background  manipulation
-        routines
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int bkgrnd( const cchar_t *wch);
-@@ -64,11 +62,9 @@
-        int wgetbkgrnd(WINDOW *win, cchar_t *wch);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    - 
--
    
--
    bkgrndset
    -+
    bkgrndset
    -        The bkgrndset and wbkgrndset routines manipulate the back-
-        ground of the named window.  The window  background  is  a
-        cchar_t consisting of any combination of attributes (i.e.,
-@@ -86,8 +82,7 @@
-        graphic rendition of the character put on the screen.
- 
- 
--
    
--
    bkgrnd
    -+
    bkgrnd
    -        The  bkgrnd and wbkgrnd functions set the background prop-
-        erty of the current or specified  window  and  then  apply
-        this setting to every character position in that window:
-@@ -99,19 +94,16 @@
-            is changed to the new background character.
- 
- 
--
    
--
    getbkgrnd
    -+
    getbkgrnd
    -        The  getbkgrnd function returns the given window's current
-        background character/attribute pair via the wch pointer.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        Note that bkgrnd, bkgrndset, and getbkgrnd may be macros.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        The bkgrndset and wbkgrndset  routines  do  not  return  a
-        value.
- 
-@@ -120,8 +112,7 @@
-        treated as an error.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), curs_bkgd(3x)
- 
- 
-Index: doc/html/man/curs_border.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_border.3x.html	2015-05-13 19:27:43.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_border.3x.html	2016-01-30 19:24:51.000000000 +0000
-@@ -45,15 +45,13 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        border, wborder, box, hline, whline, vline, wvline,
-        mvhline, mvwhline, mvvline, mvwvline - create curses
-        borders, horizontal and vertical lines
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
-        int border(chtype ls, chtype rs, chtype ts, chtype bs,
-           chtype tl, chtype tr, chtype bl, chtype br);
-@@ -71,8 +69,7 @@
-        int mvwvline(WINDOW *, int y, int x, chtype ch, int n);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The border, wborder and box routines draw a box around the
-        edges of a window.  Other than the window,  each  argument
-        is a character with attributes:
-@@ -115,8 +112,7 @@
-        many as fit into the window.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        All routines return the integer  OK.   The  SVr4.0  manual
-        says  "or  a  non-negative integer if immedok is set", but
-        this appears to be an error.
-@@ -129,8 +125,7 @@
-        outside the window, or if the window pointer is null.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The  borders  generated by these functions are inside bor-
-        ders (this is also true of SVr4 curses, though the fact is
-        not documented).
-@@ -138,15 +133,13 @@
-        Note that border and box may be macros.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  functions are described in the XSI Curses standard,
-        Issue 4.  The standard specifies that they return  ERR  on
-        failure, but specifies no error conditions.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), curs_outopts(3x).
- 
- 
-Index: doc/html/man/curs_border_set.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_border_set.3x.html	2015-05-13 19:27:43.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_border_set.3x.html	2016-01-30 19:24:51.000000000 +0000
-@@ -45,16 +45,14 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        border_set, wborder_set, box_set, hline_set, whline_set,
-        mvhline_set, mvwhline_set, vline_set, wvline_set,
-        mvvline_set, mvwvline_set - create curses borders or lines
-        using complex characters and renditions
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int border_set(
-@@ -98,8 +96,7 @@
-           const cchar_t *wch, int n);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The border_set and wborder_set  functions  draw  a  border
-        around  the  edges  of  the  current  or specified window.
-        These functions do not change the cursor position, and  do
-@@ -147,14 +144,12 @@
-        the window.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        Note that border_set, hline_set, mvhline_set, mvvline_set,
-        mvwhline_set, mvwvline_set, and vline_set may be macros.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        Upon successful completion,  these  functions  return  OK.
-        Otherwise, they return ERR.
- 
-@@ -166,8 +161,7 @@
-        outside the window, or if the window pointer is null.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        ncurses(3x), curs_add_wch(3x), curs_border(3x),  curs_out-
-        opts(3x)
- 
-Index: doc/html/man/curs_clear.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_clear.3x.html	2015-05-13 19:27:43.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_clear.3x.html	2016-01-30 19:24:51.000000000 +0000
-@@ -45,14 +45,12 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        erase, werase, clear, wclear, clrtobot, wclrtobot,
-        clrtoeol, wclrtoeol - clear all or part of a curses window
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        # include <curses.h>
- 
-        int erase(void);
-@@ -65,8 +63,7 @@
-        int wclrtoeol(WINDOW *win);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The erase and werase routines copy blanks to  every  posi-
-        tion in the window, clearing the screen.
- 
-@@ -88,8 +85,7 @@
-        dition (as set by wbkgdset) merged into them.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        All routines return the integer OK on success and  ERR  on
-        failure.   The SVr4.0 manual says "or a non-negative inte-
-        ger if immedok is set", but this appears to be an error.
-@@ -99,14 +95,12 @@
-        error if it is null.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        Note that erase, werase, clear, wclear, clrtobot, and clr-
-        toeol may be macros.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  functions are described in the XSI Curses standard,
-        Issue 4.  The standard specifies that they return  ERR  on
-        failure, but specifies no error conditions.
-@@ -128,8 +122,7 @@
-        ing the next wrefresh, use werase instead.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), curs_outopts(3x), curs_refresh(3x), curs_vari-
-        ables(3x)
- 
-Index: doc/html/man/curs_color.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_color.3x.html	2015-12-06 00:26:44.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_color.3x.html	2016-01-30 19:24:51.000000000 +0000
-@@ -45,15 +45,13 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        start_color, init_pair, init_color, has_colors,
-        can_change_color, color_content, pair_content, COLOR_PAIR
-        - curses color manipulation routines
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        # include <curses.h>
- 
-        int start_color(void);
-@@ -67,11 +65,9 @@
-        int COLOR_PAIR(int n);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    - 
--
    
--
    Overview
    -+
    Overview
    -        curses supports color attributes on  terminals  with  that
-        capability.   To  use  these  routines start_color must be
-        called, usually right after initscr.   Colors  are  always
-@@ -95,8 +91,7 @@
-        how a given color-pair is currently defined.
- 
- 
--
    
--
    Color Rendering
    -+
    Color Rendering
    -        The curses library combines these inputs  to  produce  the
-        actual  foreground  and  background  colors  shown  on the
-        screen:
-@@ -141,8 +136,7 @@
-        background character.
- 
- 
--
    
--
    Routine Descriptions
    -+
    Routine Descriptions
    -        The start_color routine requires no arguments.  It must be
-        called if the programmer wants to use colors,  and  before
-        any  other  color  manipulation  routine is called.  It is
-@@ -275,8 +269,7 @@
-        through COLORS, inclusive.
- 
- 
--
    
--
    Colors
    -+
    Colors
    -        In <curses.h> the following macros are defined.  These are
-        the  standard colors (ISO-6429).  curses also assumes that
-        COLOR_BLACK is the default background color for all termi-
-@@ -292,8 +285,7 @@
-              COLOR_WHITE
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        The  routines  can_change_color()  and has_colors() return
-        TRUE or FALSE.
- 
-@@ -321,8 +313,7 @@
-                located.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        In  the  ncurses implementation, there is a separate color
-        activation flag, color palette, color pairs table, and as-
-        sociated  COLORS  and  COLOR_PAIRS counts for each screen;
-@@ -353,8 +344,7 @@
-        o   Color RGB values are not settable.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        This implementation satisfies XSI Curses's  minimum  maxi-
-        mums for COLORS and COLOR_PAIRS.
- 
-@@ -372,8 +362,7 @@
-        will treat those as optional parameters when null.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x),  curs_initscr(3x),  curs_attr(3x),  curs_vari-
-        ables(3x), default_colors(3x)
- 
-Index: doc/html/man/curs_delch.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_delch.3x.html	2015-05-13 19:27:43.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_delch.3x.html	2016-01-30 19:24:51.000000000 +0000
-@@ -45,14 +45,12 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        delch,  wdelch, mvdelch, mvwdelch - delete character under
-        the cursor in a curses window
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int delch(void);
-@@ -61,8 +59,7 @@
-        int mvwdelch(WINDOW *win, int y, int x);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        These routines delete the character under the cursor;  all
-        characters to the right of the cursor on the same line are
-        moved to the left one position and the last  character  on
-@@ -72,8 +69,7 @@
-        ture.)
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        All routines return the integer ERR upon failure and an OK
-        (SVr4  specifies  only  "an integer value other than ERR")
-        upon successful completion.
-@@ -83,20 +79,17 @@
-        outside the window, or if the window pointer is null.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        Note that delch, mvdelch, and mvwdelch may be macros.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These functions are described in the XSI Curses  standard,
-        Issue  4.   The standard specifies that they return ERR on
-        failure, but specifies no error conditions.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x)
- 
- 
-Index: doc/html/man/curs_deleteln.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_deleteln.3x.html	2015-05-13 19:27:43.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_deleteln.3x.html	2016-01-30 19:24:51.000000000 +0000
-@@ -45,14 +45,12 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        deleteln,  wdeleteln,  insdelln, winsdelln, insertln, win-
-        sertln - delete and insert lines in a curses window
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int deleteln(void);
-@@ -63,8 +61,7 @@
-        int winsertln(WINDOW *win);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The deleteln and wdeleteln routines delete the line  under
-        the cursor in the window; all lines below the current line
-        are moved up one line.  The bottom line of the  window  is
-@@ -81,8 +78,7 @@
-        above the current line and the bottom line is lost.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        All routines return the integer ERR upon failure and an OK
-        (SVr4 specifies only "an integer value  other  than  ERR")
-        upon successful completion.
-@@ -92,15 +88,13 @@
-        returned.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  functions are described in the XSI Curses standard,
-        Issue 4.  The standard specifies that they return  ERR  on
-        failure, but specifies no error conditions.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        Note that all but winsdelln may be macros.
- 
-        These  routines  do  not require a hardware line delete or
-@@ -109,8 +103,7 @@
-        has been set on the current window.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x)
- 
- 
-Index: doc/html/man/curs_extend.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_extend.3x.html	2015-05-13 19:27:43.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_extend.3x.html	2016-01-30 19:24:52.000000000 +0000
-@@ -46,22 +46,19 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        curses_version,  use_extended_names - miscellaneous curses
-        extensions
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        const char * curses_version(void);
-        int use_extended_names(bool enable);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        These functions are extensions to the curses library which
-        do not fit easily into other categories.
- 
-@@ -79,23 +76,20 @@
-        implementations of curses.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These routines are specific to  ncurses.   They  were  not
-        supported  on  Version 7, BSD or System V implementations.
-        It is recommended that any code depending on them be  con-
-        ditioned using NCURSES_VERSION.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curs_getch(3x),       curs_mouse(3x),      curs_print(3x),
-        curs_util(3x),  default_colors(3x),  define_key(3x),  key-
-        bound(3x), keyok(3x), resizeterm(3x), wresize(3x).
- 
- 
--
    
--
    AUTHOR
    -+
    AUTHOR
    -        Thomas Dickey.
- 
- 
-Index: doc/html/man/curs_get_wch.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_get_wch.3x.html	2015-05-13 19:27:43.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_get_wch.3x.html	2016-01-30 19:24:52.000000000 +0000
-@@ -45,15 +45,13 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        get_wch,  wget_wch, mvget_wch, mvwget_wch, unget_wch - get
-        (or push back) a wide character from curses terminal  key-
-        board
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int get_wch(wint_t *wch);
-@@ -63,8 +61,7 @@
-        int unget_wch(const wchar_t wch);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The get_wch, wget_wch, mvget_wch, and mvwget_wch functions
-        read a character from the  terminal  associated  with  the
-        current  or  specified  window.   In  no-delay mode, if no
-@@ -104,8 +101,7 @@
-        operation may fail.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The  header  file  <curses.h>  automatically  includes the
-        header file <stdio.h>.
- 
-@@ -121,8 +117,7 @@
-        All functions except wget_wch and unget_wch may be macros.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        When  get_wch,  wget_wch,  mvget_wch, and mvwget_wch func-
-        tions successfully report the pressing of a function  key,
-        they return KEY_CODE_YES.  When they successfully report a
-@@ -137,8 +132,7 @@
-        outside the window, or if the window pointer is null.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x),       curs_getch(3x),        curs_ins_wch(3x),
-        curs_inopts(3x), curs_move(3x), curs_refresh(3x)
- 
-Index: doc/html/man/curs_get_wstr.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_get_wstr.3x.html	2015-05-13 19:27:43.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_get_wstr.3x.html	2016-01-30 19:24:52.000000000 +0000
-@@ -45,15 +45,13 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        get_wstr, getn_wstr, wget_wstr, wgetn_wstr, mvget_wstr,
-        mvgetn_wstr, mvwget_wstr, mvwgetn_wstr - get an array of
-        wide characters from a curses terminal keyboard
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int get_wstr(wint_t *wstr);
-@@ -66,8 +64,7 @@
-        int mvwgetn_wstr(WINDOW *win, int y, int x, wint_t *wstr, int n);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The  effect  of get_wstr is as though a series of calls to
-        get_wch were made, until a newline, other end-of-line,  or
-        end-of-file condition is processed.  An end-of-file condi-
-@@ -102,8 +99,7 @@
-        the application prevent overflow of the input buffer.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        Using get_wstr, mvget_wstr, mvwget_wstr, or  wget_wstr  to
-        read  a  line  that overflows the array pointed to by wstr
-        causes  undefined  results.    The   use   of   getn_wstr,
-@@ -117,8 +113,7 @@
-        All of these routines except wgetn_wstr may be macros.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        All of these functions return OK upon  successful  comple-
-        tion.  Otherwise, they return ERR.
- 
-@@ -134,8 +129,7 @@
-        outside the window, or if the window pointer is null.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  functions are described in The Single Unix Specifi-
-        cation, Version 2.  No error conditions are defined.  This
-        implementation  returns ERR if the window pointer is null,
-@@ -149,8 +143,7 @@
-        wint_t.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        Functions: curses(3x), curs_get_wch(3x), curs_getstr(3x).
- 
- 
-Index: doc/html/man/curs_getcchar.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_getcchar.3x.html	2015-07-22 00:49:56.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_getcchar.3x.html	2016-01-30 19:24:52.000000000 +0000
-@@ -45,15 +45,13 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        getcchar,  setcchar - Get a wide character string and ren-
-        dition from a cchar_t or set a cchar_t from a wide-charac-
-        ter string
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int getcchar(
-@@ -71,11 +69,9 @@
-                void *opts );
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    - 
--
    
--
    getcchar
    -+
    getcchar
    -        The  getcchar  function  gets  a wide-character string and
-        rendition from a cchar_t argument.  When wch is not a null
-        pointer, the getcchar function does the following:
-@@ -101,8 +97,7 @@
-            color_pair
- 
- 
--
    
--
    setcchar
    -+
    setcchar
    -        The  setcchar function initializes the location pointed to
-        by wcval by using:
- 
-@@ -122,8 +117,7 @@
-            allowed.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The  opts argument is reserved for future use.  Currently,
-        an application must provide a null pointer as opts.
- 
-@@ -133,8 +127,7 @@
-        effect is unspecified.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        When wch is a null pointer, getcchar returns the number of
-        wide characters referenced by wcval, including one  for  a
-        trailing null.
-@@ -146,8 +139,7 @@
-        wise, it returns ERR.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        Functions:   curs_attr(3x),   curs_color(3x),  curses(3x),
-        wcwidth(3).
- 
-Index: doc/html/man/curs_getch.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_getch.3x.html	2015-09-19 23:18:50.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_getch.3x.html	2016-01-30 19:24:52.000000000 +0000
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_getch.3x,v 1.43 2015/09/19 22:25:05 tom Exp @
-+  * @Id: curs_getch.3x,v 1.44 2015/12/20 01:43:03 tom Exp @
- -->
- 
- 
-@@ -46,14 +46,12 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        getch, wgetch, mvgetch, mvwgetch, ungetch, has_key - get
-        (or push back) characters from curses terminal keyboard
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int getch(void);
-@@ -64,11 +62,9 @@
-        int has_key(int ch);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    - 
--
    
--
    Reading characters
    -+
    Reading characters
    -        The getch, wgetch, mvgetch and mvwgetch, routines  read  a
-        character  from the window.  In no-delay mode, if no input
-        is waiting, the value ERR is returned.  In delay mode, the
-@@ -103,8 +99,7 @@
-        called before another character is read.
- 
- 
--
    
--
    Keypad mode
    -+
    Keypad mode
    -        If  keypad is TRUE, and a function key is pressed, the to-
-        ken for that function key is returned instead of  the  raw
-        characters.   Possible function keys are defined in <curs-
-@@ -123,19 +118,26 @@
-        cape key and the escape is returned to the program.
- 
- 
--
    
--
    Ungetting characters
    -+
    Ungetting characters
    -        The ungetch routine places ch back onto the input queue to
-        be returned by the next call to wgetch.  There is just one
-        input queue for all windows.
- 
- 
--
    
--
    Predefined key-codes
    --       The following special keys, defined in <curses.h>, may  be
--       returned  by getch if keypad has been enabled.  Not all of
--       these are necessarily supported on any  particular  termi-
--       nal.
-+
    Predefined key-codes
    -+       The following special keys are defined in <curses.h>.
-+
-+       o   Except for the special case KEY_RESIZE, it  is  neces-
-+           sary to enable keypad for getch to return these codes.
-+
-+       o   Not all of these are necessarily supported on any par-
-+           ticular terminal.
-+
-+       o   The naming convention may seem obscure, with some  ap-
-+           parent  misspellings  (such  as "RSUME" for "resume").
-+           The names correspond to the long  terminfo  capability
-+           names  for the keys, and were defined long ago, in the
-+           1980s.
- 
-             Name            Key name
-             -------------------------------------------------
-@@ -177,6 +179,7 @@
-             KEY_BTAB        Back tab key
-             KEY_BEG         Beg(inning) key
-             KEY_CANCEL      Cancel key
-+
-             KEY_CLOSE       Close key
-             KEY_COMMAND     Cmd (command) key
-             KEY_COPY        Copy key
-@@ -186,7 +189,6 @@
-             KEY_FIND        Find key
-             KEY_HELP        Help key
-             KEY_MARK        Mark key
--
-             KEY_MESSAGE     Message key
-             KEY_MOUSE       Mouse event read
-             KEY_MOVE        Move key
-@@ -243,41 +245,39 @@
-                          +-----+------+-------+
-                          | C1  | down |  C3   |
-                          +-----+------+-------+
--       A few of these predefined values do not  correspond  to  a
-+       A  few  of  these predefined values do not correspond to a
-        real key:
- 
--       o   KEY_RESIZE  is  returned  when the SIGWINCH signal has
--           been detected (see  curs_initscr(3x)  and  resizeterm(3x)).
--           This  code  is returned whether or not keypad has been
-+       o   KEY_RESIZE is returned when the  SIGWINCH  signal  has
-+           been  detected  (see  curs_initscr(3x) and resizeterm(3x)).
-+           This code is returned whether or not keypad  has  been
-            enabled.
- 
--       o   KEY_MOUSE   is   returned   for   mouse-events    (see
-+       o   KEY_MOUSE    is   returned   for   mouse-events   (see
-            curs_mouse(3x)).  This code relies upon whether or not
-            keypad(3x) has been enabled, because (e.g., with xterm
--           mouse  prototocol) ncurses must read escape sequences,
-+           mouse prototocol) ncurses must read escape  sequences,
-            just like a function key.
- 
- 
--
    
--
    Testing key-codes
    --       The has_key routine takes a key-code value from the  above
--       list,  and  returns TRUE or FALSE according to whether the
-+
    Testing key-codes
    -+       The  has_key routine takes a key-code value from the above
-+       list, and returns TRUE or FALSE according to  whether  the
-        current terminal type recognizes a key with that value.
- 
-        The library also supports these extensions:
- 
-           define_key
--               defines a key-code for a  given  string  (see  de-
-+               defines  a  key-code  for  a given string (see de-
-                fine_key(3x)).
- 
-           key_defined
--               checks  if there is a key-code defined for a given
-+               checks if there is a key-code defined for a  given
-                string (see key_defined(3x)).
- 
- 
--
    
--
    RETURN VALUE
    --       All routines return the integer ERR upon  failure  and  an
-+
    RETURN VALUE
    -+       All  routines  return  the integer ERR upon failure and an
-        integer value other than ERR (OK in the case of ungetch())
-        upon successful completion.
- 
-@@ -285,112 +285,109 @@
-                returns ERR if there is no more room in the FIFO.
- 
-           wgetch
--               returns ERR if the window pointer is null,  or  if
-+               returns  ERR  if the window pointer is null, or if
-                its timeout expires without having any data.
- 
--       Functions  with a "mv" prefix first perform a cursor move-
--       ment using wmove, and return an error if the  position  is
-+       Functions with a "mv" prefix first perform a cursor  move-
-+       ment  using  wmove, and return an error if the position is
-        outside the window, or if the window pointer is null.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        Use of the escape key by a programmer for a single charac-
--       ter function is discouraged, as it will cause a  delay  of
-+       ter  function  is discouraged, as it will cause a delay of
-        up to one second while the keypad code looks for a follow-
-        ing function-key sequence.
- 
--       Some keys may be the same as commonly used  control  keys,
--       e.g.,  KEY_ENTER  versus  control/M,  KEY_BACKSPACE versus
-+       Some  keys  may be the same as commonly used control keys,
-+       e.g., KEY_ENTER  versus  control/M,  KEY_BACKSPACE  versus
-        control/H.  Some curses implementations may differ accord-
--       ing  to  whether  they  treat these control keys specially
--       (and ignore the terminfo), or  use  the  terminfo  defini-
--       tions.   Ncurses uses the terminfo definition.  If it says
--       that KEY_ENTER is control/M, getch will  return  KEY_ENTER
-+       ing to whether they treat  these  control  keys  specially
-+       (and  ignore  the  terminfo),  or use the terminfo defini-
-+       tions.  Ncurses uses the terminfo definition.  If it  says
-+       that  KEY_ENTER  is control/M, getch will return KEY_ENTER
-        when you press control/M.
- 
--       Generally,  KEY_ENTER denotes the character(s) sent by the
-+       Generally, KEY_ENTER denotes the character(s) sent by  the
-        Enter key on the numeric keypad:
- 
-        o   the terminal description lists the most useful keys,
- 
--       o   the Enter key on the regular keyboard is already  han-
-+       o   the  Enter key on the regular keyboard is already han-
-            dled by the standard ASCII characters for carriage-re-
-            turn and line-feed,
- 
--       o   depending on whether nl or nonl was  called,  pressing
--           "Enter"  on  the  regular keyboard may return either a
-+       o   depending  on  whether nl or nonl was called, pressing
-+           "Enter" on the regular keyboard may  return  either  a
-            carriage-return or line-feed, and finally
- 
--       o   "Enter or send" is the standard description  for  this
-+       o   "Enter  or  send" is the standard description for this
-            key.
- 
--       When  using  getch, wgetch, mvgetch, or mvwgetch, nocbreak
-+       When using getch, wgetch, mvgetch, or  mvwgetch,  nocbreak
-        mode (nocbreak) and echo mode (echo) should not be used at
--       the  same  time.  Depending on the state of the tty driver
--       when each character is typed, the program may produce  un-
-+       the same time.  Depending on the state of the  tty  driver
-+       when  each character is typed, the program may produce un-
-        desirable results.
- 
-        Note that getch, mvgetch, and mvwgetch may be macros.
- 
-        Historically, the set of keypad macros was largely defined
--       by the extremely function-key-rich keyboard  of  the  AT&T
--       7300,  aka  3B1,  aka Safari 4.  Modern personal computers
--       usually have only a small subset of these.   IBM  PC-style
--       consoles   typically  support  little  more  than  KEY_UP,
--       KEY_DOWN,   KEY_LEFT,   KEY_RIGHT,   KEY_HOME,    KEY_END,
-+       by  the  extremely  function-key-rich keyboard of the AT&T
-+       7300, aka 3B1, aka Safari 4.   Modern  personal  computers
-+       usually  have  only a small subset of these.  IBM PC-style
-+       consoles  typically  support  little  more  than   KEY_UP,
-+       KEY_DOWN,    KEY_LEFT,   KEY_RIGHT,   KEY_HOME,   KEY_END,
-        KEY_NPAGE, KEY_PPAGE, and function keys 1 through 12.  The
-        Ins key is usually mapped to KEY_IC.
- 
- 
--
    
--
    PORTABILITY
    --       The *get* functions are described in the XSI Curses  stan-
--       dard,  Issue  4.   They  read single-byte characters only.
--       The standard specifies that they return  ERR  on  failure,
-+
    PORTABILITY
    -+       The  *get* functions are described in the XSI Curses stan-
-+       dard, Issue 4.  They  read  single-byte  characters  only.
-+       The  standard  specifies  that they return ERR on failure,
-        but specifies no error conditions.
- 
--       The  echo  behavior of these functions on input of KEY_ or
--       backspace characters was not specified in the  SVr4  docu-
-+       The echo behavior of these functions on input of  KEY_  or
-+       backspace  characters  was not specified in the SVr4 docu-
-        mentation.  This description is adopted from the XSI Curs-
-        es standard.
- 
--       The behavior of getch and friends in the presence of  han-
--       dled  signals  is  unspecified  in the SVr4 and XSI Curses
--       documentation.  Under historical  curses  implementations,
--       it  varied depending on whether the operating system's im-
--       plementation  of  handled  signal  receipt  interrupts   a
--       read(2)  call in progress or not, and also (in some imple-
--       mentations) depending on whether an input timeout or  non-
-+       The  behavior of getch and friends in the presence of han-
-+       dled signals is unspecified in the  SVr4  and  XSI  Curses
-+       documentation.   Under  historical curses implementations,
-+       it varied depending on whether the operating system's  im-
-+       plementation   of  handled  signal  receipt  interrupts  a
-+       read(2) call in progress or not, and also (in some  imple-
-+       mentations)  depending on whether an input timeout or non-
-        blocking mode has been set.
- 
-        KEY_MOUSE is mentioned in XSI Curses, along with a few re-
-        lated terminfo capabilities, but no higher-level functions
--       use  the feature.  The implementation in ncurses is an ex-
-+       use the feature.  The implementation in ncurses is an  ex-
-        tension.
- 
--       KEY_RESIZE is an extension first implemented for  ncurses.
-+       KEY_RESIZE  is an extension first implemented for ncurses.
-        NetBSD curses later added this extension.
- 
-        Programmers concerned about portability should be prepared
--       for either of two cases: (a) signal receipt does  not  in-
--       terrupt  getch;  (b)  signal  receipt interrupts getch and
--       causes it to return ERR with errno set  to  EINTR.   Under
--       the  ncurses  implementation, handled signals never inter-
-+       for  either  of two cases: (a) signal receipt does not in-
-+       terrupt getch; (b) signal  receipt  interrupts  getch  and
-+       causes  it  to  return ERR with errno set to EINTR.  Under
-+       the ncurses implementation, handled signals  never  inter-
-        rupt getch.
- 
--       The has_key function is unique to ncurses.   We  recommend
--       that  any  code  using it be conditionalized on the NCURS-
-+       The  has_key  function is unique to ncurses.  We recommend
-+       that any code using it be conditionalized  on  the  NCURS-
-        ES_VERSION feature macro.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x),       curs_inopts(3x),       curs_outopts(3x),
-        curs_mouse(3x),   curs_move(3x),   curs_refresh(3x),   re-
-        sizeterm(3x).
- 
--       Comparable functions in the wide-character (ncursesw)  li-
-+       Comparable  functions in the wide-character (ncursesw) li-
-        brary are described in curs_get_wch(3x).
- 
- 
-Index: doc/html/man/curs_getstr.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_getstr.3x.html	2015-05-13 19:27:43.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_getstr.3x.html	2016-01-30 19:24:52.000000000 +0000
-@@ -45,15 +45,13 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        getstr, getnstr, wgetstr, wgetnstr, mvgetstr, mvgetnstr,
-        mvwgetstr, mvwgetnstr - accept character strings from
-        curses terminal keyboard
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int getstr(char *str);
-@@ -66,8 +64,7 @@
-        int mvwgetnstr(WINDOW *, int y, int x, char *str, int n);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The  function getstr is equivalent to a series of calls to
-        getch, until a newline or carriage return is received (the
-        terminating  character  is  not  included  in the returned
-@@ -91,8 +88,7 @@
-        vious character (typically a left motion).
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        All routines return the integer ERR upon failure and an OK
-        (SVr4 specifies only "an integer value  other  than  ERR")
-        upon successful completion.
-@@ -112,13 +108,11 @@
-        outside the window, or if the window pointer is null.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        Note that getstr, mvgetstr, and mvwgetstr may be macros.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  functions are described in the XSI Curses standard,
-        Issue 4.  They  read  single-byte  characters  only.   The
-        standard  does  not define any error conditions.  This im-
-@@ -138,8 +132,7 @@
-        present but not documented in SVr4.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), curs_getch(3x), curs_variables(3x).
- 
- 
-Index: doc/html/man/curs_getyx.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_getyx.3x.html	2015-05-13 19:27:44.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_getyx.3x.html	2016-01-30 19:24:52.000000000 +0000
-@@ -45,14 +45,12 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        getyx,  getparyx,  getbegyx,  getmaxyx - get curses cursor
-        and window coordinates
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        void getyx(WINDOW *win, int y, int x);
-@@ -61,8 +59,7 @@
-        void getmaxyx(WINDOW *win, int y, int x);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The getyx macro places the current cursor position of  the
-        given window in the two integer variables y and x.
- 
-@@ -76,21 +73,18 @@
-        window.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        The return values of these  macros  are  undefined  (i.e.,
-        they  should not be used as the right-hand side of assign-
-        ment statements).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        All of these interfaces are macros.  A "&" is  not  neces-
-        sary before the variables y and x.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        The  getyx,  getparyx,  getbegyx  and  getmaxyx macros are
-        described in the XSI Curses standard, Issue 4.
- 
-@@ -114,8 +108,7 @@
-        getmaxyx.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), curs_legacy(3x), curs_opaque(3x)
- 
- 
-Index: doc/html/man/curs_in_wch.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_in_wch.3x.html	2015-05-13 19:27:44.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_in_wch.3x.html	2016-01-30 19:24:52.000000000 +0000
-@@ -45,14 +45,12 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        in_wch,  mvin_wch,  mvwin_wch, win_wch - extract a complex
-        character and rendition from a window
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int in_wch(cchar_t *wcval);
-@@ -61,15 +59,13 @@
-        int win_wch(WINDOW *win, cchar_t *wcval);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        These functions extract the complex character  and  rendi-
-        tion  from  the  current position in the named window into
-        the cchar_t object referenced by wcval.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        No errors are defined in the XSI  Curses  standard.   This
-        implementation  checks  for  null pointers, returns ERR in
-        that case.  Also, the mv routines check for  error  moving
-@@ -81,19 +77,16 @@
-        outside the window, or if the window pointer is null.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        Note that all of these routines may be macros.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These functions are described in the XSI Curses  standard,
-        Issue 4.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), curs_inch(3x).
- 
- 
-Index: doc/html/man/curs_in_wchstr.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_in_wchstr.3x.html	2015-05-13 19:27:44.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_in_wchstr.3x.html	2016-01-30 19:24:52.000000000 +0000
-@@ -45,16 +45,14 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        in_wchstr, in_wchnstr, win_wchstr, win_wchnstr,
-        mvin_wchstr, mvin_wchnstr, mvwin_wchstr, mvwin_wchnstr -
-        get an array of complex characters and renditions from a
-        curses window
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int in_wchstr(cchar_t *wchstr);
-@@ -67,8 +65,7 @@
-        int mvwin_wchnstr(WINDOW *win, int y, int x, cchar_t *wchstr, int n);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        These functions return an array of complex  characters  in
-        wchstr,  starting  at  the  current cursor position in the
-        named window.  Attributes (rendition) are stored with  the
-@@ -78,8 +75,7 @@
-        str fill the array with at most n cchar_t elements.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        Note that all routines except win_wchnstr may be macros.
- 
-        Reading a line that overflows the array pointed to by wch-
-@@ -89,8 +85,7 @@
-        recommended.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        Upon successful completion,  these  functions  return  OK.
-        Otherwise, they return ERR.
- 
-@@ -99,15 +94,13 @@
-        outside the window, or if the window pointer is null.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        The  XSI  Curses defines no error conditions.  This imple-
-        mentation checks for null pointers, returning ERR in  that
-        case.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        Functions:  curses(3x),  curs_in_wch(3x),  curs_instr(3x),
-        curs_inwstr(3x) curs_inchstr(3x)
- 
-Index: doc/html/man/curs_inch.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_inch.3x.html	2015-05-13 19:27:44.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_inch.3x.html	2016-01-30 19:24:52.000000000 +0000
-@@ -46,14 +46,12 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        inch,  winch,  mvinch,  mvwinch  -  get  a  character  and
-        attributes from a curses window
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        chtype inch(void);
-@@ -62,8 +60,7 @@
-        chtype mvwinch(WINDOW *win, int y, int x);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        These routines return the character, of  type  chtype,  at
-        the   current  position  in  the  named  window.   If  any
-        attributes are set for that  position,  their  values  are
-@@ -72,8 +69,7 @@
-        to extract the character or attributes alone.
- 
- 
--
    
--
    Attributes
    -+
    Attributes
    -        The  following  bit-masks  may  be  AND-ed with characters
-        returned by winch.
- 
-@@ -82,26 +78,22 @@
-        A_COLOR        Bit-mask to extract color-pair field information
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        Functions with a "mv" prefix first perform a cursor  move-
-        ment  using  wmove, and return an error if the position is
-        outside the window, or if the window pointer is null.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        Note that all of these routines may be macros.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These functions are described in the XSI Curses  standard,
-        Issue 4.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x).
- 
-        Comparable  functions  in  the  wide-character  (ncursesw)
-Index: doc/html/man/curs_inchstr.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_inchstr.3x.html	2015-05-13 19:27:44.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_inchstr.3x.html	2016-01-30 19:24:52.000000000 +0000
-@@ -45,15 +45,13 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        inchstr, inchnstr, winchstr, winchnstr, mvinchstr,
-        mvinchnstr, mvwinchstr, mvwinchnstr - get a string of
-        characters (and attributes) from a curses window
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int inchstr(chtype *chstr);
-@@ -67,8 +65,7 @@
-        int n);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        These routines return a NULL-terminated  array  of  chtype
-        quantities, starting at the current cursor position in the
-        named window and ending at the right margin of the window.
-@@ -80,8 +77,7 @@
-        the chstr [see curs_inch(3x)].
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        All routines return the integer ERR upon  failure  and  an
-        integer  value  other  than ERR upon successful completion
-        (the number of  characters  retrieved,  exclusive  of  the
-@@ -96,8 +92,7 @@
-        outside the window, or if the window pointer is null.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        Note  that  all  routines  except winchnstr may be macros.
-        SVr4 does not document whether the result string is  zero-
-        terminated;  it  does  not document whether a length limit
-@@ -105,16 +100,14 @@
-        the meaning of the return value.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  functions are described in the XSI Curses standard,
-        Issue 4.  It is no more specific than the SVr4  documenta-
-        tion on the trailing 0.  It does specify that the success-
-        ful return of the functions is OK.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), curs_inch(3x).
- 
-        Comparable functions in the wide-character (ncursesw)  li-
-Index: doc/html/man/curs_initscr.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_initscr.3x.html	2015-07-22 00:49:57.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_initscr.3x.html	2016-01-30 19:24:52.000000000 +0000
-@@ -45,14 +45,12 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        initscr, newterm, endwin, isendwin, set_term, delscreen -
-        curses screen initialization and manipulation routines
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        WINDOW *initscr(void);
-@@ -63,11 +61,9 @@
-        void delscreen(SCREEN* sp);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    - 
--
    
--
    initscr
    -+
    initscr
    -        initscr is normally the first curses routine to call  when
-        initializing  a program.  A few special routines sometimes
-        need to be called before it; these are  slk_init,  filter,
-@@ -82,8 +78,7 @@
-        stdscr.
- 
- 
--
    
--
    newterm
    -+
    newterm
    -        A  program  that  outputs to more than one terminal should
-        use the newterm  routine  for  each  terminal  instead  of
-        initscr.  A program that needs to inspect capabilities, so
-@@ -103,8 +98,7 @@
-        If the type parameter is NULL, $TERM will be used.
- 
- 
--
    
--
    endwin
    -+
    endwin
    -        The  program must also call endwin for each terminal being
-        used before exiting from curses.   If  newterm  is  called
-        more  than  once for the same terminal, the first terminal
-@@ -125,15 +119,13 @@
-        es the program to resume visual mode.
- 
- 
--
    
--
    isendwin
    -+
    isendwin
    -        The isendwin routine  returns  TRUE  if  endwin  has  been
-        called without any subsequent calls to wrefresh, and FALSE
-        otherwise.
- 
- 
--
    
--
    set_term
    -+
    set_term
    -        The set_term routine is used to switch  between  different
-        terminals.   The screen reference new becomes the new cur-
-        rent terminal.  The previous terminal is returned  by  the
-@@ -142,16 +134,14 @@
-        rent terminal.
- 
- 
--
    
--
    delscreen
    -+
    delscreen
    -        The  delscreen  routine  frees storage associated with the
-        SCREEN data structure.  The endwin  routine  does  not  do
-        this, so delscreen should be called after endwin if a par-
-        ticular SCREEN is no longer needed.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        endwin returns the integer ERR upon failure  and  OK  upon
-        successful completion.
- 
-@@ -171,20 +161,17 @@
-        o   set_term returns no error.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        Note that initscr and newterm may be macros.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These functions were described in the XSI Curses standard,
-        Issue 4.  As of 2015, the current document is X/Open Curs-
-        es, Issue 7.
- 
- 
--
    
--
    Differences
    -+
    Differences
    -        X/Open specifies that portable applications must not  call
-        initscr more than once:
- 
-@@ -200,8 +187,7 @@
-        the return value of initscr in XSI Curses.
- 
- 
--
    
--
    Unset TERM Variable
    -+
    Unset TERM Variable
    -        If the TERM variable is missing or empty, initscr uses the
-        value  "unknown", which normally corresponds to a terminal
-        entry with the generic (gn) capability.   Generic  entries
-@@ -211,8 +197,7 @@
-        ly.
- 
- 
--
    
--
    Signal Handlers
    -+
    Signal Handlers
    -        Quoting from X/Open Curses, section 3.1.1:
- 
-             Curses implementations may provide for  special  han-
-@@ -274,8 +259,7 @@
-             stdscr, and update other data such as LINES and COLS.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x),       curs_kernel(3x),       curs_refresh(3x),
-        curs_slk(3x), curs_terminfo(3x), curs_util(3x), curs_vari-
-        ables(3x).
-Index: doc/html/man/curs_inopts.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_inopts.3x.html	2015-12-06 00:26:45.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_inopts.3x.html	2016-01-30 19:24:52.000000000 +0000
-@@ -45,16 +45,14 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        cbreak, nocbreak, echo, noecho, halfdelay, intrflush,
-        keypad, meta, nodelay, notimeout, raw, noraw, noqiflush,
-        qiflush, timeout, wtimeout, typeahead - curses input
-        options
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int cbreak(void);
-@@ -76,8 +74,7 @@
-        int typeahead(int fd);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The ncurses library provides several functions  which  let
-        an  application  change the way input from the terminal is
-        handled.  Some are global, applying to all windows.   Oth-
-@@ -87,8 +84,7 @@
-        the same behavior is needed.
- 
- 
--
    
--
    cbreak
    -+
    cbreak
    -        Normally, the tty driver buffers typed characters until  a
-        newline  or  carriage return is typed.  The cbreak routine
-        disables line buffering and erase/kill  character-process-
-@@ -105,8 +101,7 @@
-        these routines interact with echo and noecho.]
- 
- 
--
    
--
    echo/noecho
    -+
    echo/noecho
    -        The  echo  and  noecho routines control whether characters
-        typed by the user are echoed by getch as they  are  typed.
-        Echoing by the tty driver is always disabled, but initial-
-@@ -118,8 +113,7 @@
-        interact with cbreak and nocbreak.]
- 
- 
--
    
--
    halfdelay
    -+
    halfdelay
    -        The  halfdelay  routine is used for half-delay mode, which
-        is similar to cbreak mode in that characters typed by  the
-        user  are  immediately available to the program.  However,
-@@ -129,8 +123,7 @@
-        half-delay mode.
- 
- 
--
    
--
    intrflush
    -+
    intrflush
    -        If  the  intrflush  option is enabled (bf is TRUE), and an
-        interrupt key  is  pressed  on  the  keyboard  (interrupt,
-        break,  quit),  all output in the tty driver queue will be
-@@ -142,8 +135,7 @@
-        nored.
- 
- 
--
    
--
    keypad
    -+
    keypad
    -        The  keypad option enables the keypad of the user's termi-
-        nal.  If enabled (bf is TRUE), the user can press a  func-
-        tion  key (such as an arrow key) and wgetch returns a sin-
-@@ -157,8 +149,7 @@
-        keypad is FALSE.
- 
- 
--
    
--
    meta
    -+
    meta
    -        Initially, whether the terminal returns 7 or 8 significant
-        bits on input depends on the control mode of the tty driv-
-        er  [see  termio(7)].  To force 8 bits to be returned, in-
-@@ -173,8 +164,7 @@
-        FALSE) is called.
- 
- 
--
    
--
    nodelay
    -+
    nodelay
    -        The nodelay option causes getch to be a non-blocking call.
-        If  no input is ready, getch returns ERR.  If disabled (bf
-        is FALSE), getch waits until a key is pressed.
-@@ -187,8 +177,7 @@
-        typed by a user.
- 
- 
--
    
--
    raw/noraw
    -+
    raw/noraw
    -        The  raw and noraw routines place the terminal into or out
-        of raw mode.  Raw mode is similar to cbreak mode, in  that
-        characters typed are immediately passed through to the us-
-@@ -199,8 +188,7 @@
-        bits in the tty driver that are not set by curses.
- 
- 
--
    
--
    noqiflush
    -+
    noqiflush
    -        When the noqiflush routine is used, normal flush of  input
-        and  output queues associated with the INTR, QUIT and SUSP
-        characters will not be done [see termio(7)].  When qiflush
-@@ -210,8 +198,7 @@
-        the interrupt had not occurred, after the handler exits.
- 
- 
--
    
--
    timeout/wtimeout
    -+
    timeout/wtimeout
    -        The timeout and wtimeout routines  set  blocking  or  non-
-        blocking  read  for a given window.  If delay is negative,
-        blocking read is used (i.e., waits  indefinitely  for  in-
-@@ -224,8 +211,7 @@
-        lay milliseconds (where delay is positive).
- 
- 
--
    
--
    typeahead
    -+
    typeahead
    -        The  curses  library  does "line-breakout optimization" by
-        looking for  typeahead  periodically  while  updating  the
-        screen.   If  input is found, and it is coming from a tty,
-@@ -239,8 +225,7 @@
-        typeahead checking is done.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        All  routines that return an integer return ERR upon fail-
-        ure and OK (SVr4 specifies only "an  integer  value  other
-        than  ERR")  upon  successful completion, unless otherwise
-@@ -256,8 +241,7 @@
-                    the range 1..255.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These functions are described in the XSI Curses  standard,
-        Issue 4.
- 
-@@ -304,8 +288,7 @@
-        used.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        Note  that echo, noecho, halfdelay, intrflush, meta, node-
-        lay, notimeout, noqiflush, qiflush, timeout, and  wtimeout
-        may be macros.
-@@ -318,8 +301,7 @@
-        recommended.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x),       curs_getch(3x),        curs_initscr(3x),
-        curs_util(3x), define_key(3x), termio(7)
- 
-Index: doc/html/man/curs_ins_wch.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_ins_wch.3x.html	2015-05-13 19:27:44.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_ins_wch.3x.html	2016-01-30 19:24:52.000000000 +0000
-@@ -45,14 +45,12 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        ins_wch,  mvins_wch,  mvwins_wch, wins_wch - insert a com-
-        plex character and rendition into a window
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int ins_wch(const cchar_t *wch);
-@@ -62,8 +60,7 @@
-        *wch);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        These routines, insert the complex character wch with ren-
-        dition before the character under the cursor.  All charac-
-        ters to the right of the cursor are moved one space to the
-@@ -72,8 +69,7 @@
-        change the cursor position.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        If successful, these functions return OK.   If  not,  they
-        return ERR.
- 
-@@ -82,13 +78,11 @@
-        outside the window, or if the window pointer is null.
- 
- 
--
    
--
    ERRORS
    -+
    ERRORS
    -        No errors are defined.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), curs_insch(3x).
- 
- 
-Index: doc/html/man/curs_ins_wstr.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_ins_wstr.3x.html	2015-05-13 19:27:44.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_ins_wstr.3x.html	2016-01-30 19:24:52.000000000 +0000
-@@ -45,15 +45,13 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        ins_wstr, ins_nwstr, wins_wstr, wins_nwstr, mvins_wstr,
-        mvins_nwstr, mvwins_wstr, mvwins_nwstr - insert a wide-
-        character string into a curses window
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int ins_wstr(const wchar_t *wstr);
-@@ -66,8 +64,7 @@
-        int mvwins_nwstr(WINDOW *win, int y, int x, const wchar_t *wstr, int n);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        These  routines insert a wchar_t character string (as many
-        characters as will fit on the line) before  the  character
-        under the cursor.  All characters to the right of the cur-
-@@ -91,8 +88,7 @@
-        ter.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        Note that all but wins_nwstr may be macros.
- 
-        If the first character in the string is a nonspacing char-
-@@ -101,8 +97,7 @@
-        trol character.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        Upon successful completion,  these  functions  return  OK.
-        Otherwise, they return ERR.
- 
-@@ -111,8 +106,7 @@
-        outside the window, or if the window pointer is null.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x),        curs_insstr(3x),       curs_in_wch(3x),
-        curs_ins_wch(3x).
- 
-Index: doc/html/man/curs_insch.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_insch.3x.html	2015-05-13 19:27:44.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_insch.3x.html	2016-01-30 19:24:52.000000000 +0000
-@@ -45,14 +45,12 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        insch,  winsch,  mvinsch,  mvwinsch  -  insert a character
-        before cursor in a curses window
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int insch(chtype ch);
-@@ -61,8 +59,7 @@
-        int mvwinsch(WINDOW *win, int y, int x, chtype ch);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        These routines insert the character ch before the  charac-
-        ter  under the cursor.  All characters to the right of the
-        cursor are moved one space to the right, with  the  possi-
-@@ -71,8 +68,7 @@
-        tion.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        All  routines that return an integer return ERR upon fail-
-        ure and OK (SVr4 specifies only "an  integer  value  other
-        than  ERR")  upon  successful completion, unless otherwise
-@@ -83,22 +79,19 @@
-        outside the window, or if the window pointer is null.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        These routines do not necessarily imply use of a  hardware
-        insert character feature.
- 
-        Note that insch, mvinsch, and mvwinsch may be macros.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  functions are described in the XSI Curses standard,
-        Issue 4.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x).
- 
-        Comparable  functions  in  the  wide-character  (ncursesw)
-Index: doc/html/man/curs_insstr.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_insstr.3x.html	2015-05-13 19:27:44.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_insstr.3x.html	2016-01-30 19:24:53.000000000 +0000
-@@ -45,15 +45,13 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        insstr,  insnstr,  winsstr, winsnstr, mvinsstr, mvinsnstr,
-        mvwinsstr, mvwinsnstr - insert string before cursor  in  a
-        curses window
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
-        int insstr(const char *str);
-        int insnstr(const char *str, int n);
-@@ -66,8 +64,7 @@
-        int n);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        These routines insert a character string (as many  charac-
-        ters  as  will fit on the line) before the character under
-        the cursor.  All characters to the right of the cursor are
-@@ -81,8 +78,7 @@
-        Special characters are handled as in addch.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        All routines that return an integer return ERR upon  fail-
-        ure  and  OK  (SVr4 specifies only "an integer value other
-        than ERR") upon successful  completion,  unless  otherwise
-@@ -97,13 +93,11 @@
-        outside the window, or if the window pointer is null.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        Note that all but winsnstr may be macros.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  functions are described in the XSI Curses standard,
-        Issue 4, which adds const qualifiers to the arguments.
- 
-@@ -114,8 +108,7 @@
-        inconsistency.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), curs_util(3x), curs_clear(3x), curs_inch(3x).
- 
- 
-Index: doc/html/man/curs_instr.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_instr.3x.html	2015-05-13 19:27:44.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_instr.3x.html	2016-01-30 19:24:53.000000000 +0000
-@@ -45,15 +45,13 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        instr,  innstr, winstr, winnstr, mvinstr, mvinnstr, mvwin-
-        str, mvwinnstr - get a string of characters from a  curses
-        window
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int instr(char *str);
-@@ -67,8 +65,7 @@
-        n);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        These routines return  a  string  of  characters  in  str,
-        extracted  starting  at the current cursor position in the
-        named window.  Attributes are stripped  from  the  charac-
-@@ -77,8 +74,7 @@
-        (exclusive of the trailing NUL).
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        All  of the functions return ERR upon failure, or the num-
-        ber of characters actually read into the string.
- 
-@@ -91,13 +87,11 @@
-        outside the window, or if the window pointer is null.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        Note that all routines except winnstr may be macros.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        SVr4 does not document whether a length limit includes  or
-        excludes the trailing NUL.
- 
-@@ -106,8 +100,7 @@
-        return the string ending at the right margin.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x).
- 
- 
-Index: doc/html/man/curs_inwstr.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_inwstr.3x.html	2015-05-13 19:27:44.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_inwstr.3x.html	2016-01-30 19:24:53.000000000 +0000
-@@ -45,15 +45,13 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        inwstr,  innwstr,  winwstr, winnwstr, mvinwstr, mvinnwstr,
-        mvwinwstr, mvwinnwstr - get a string of wchar_t characters
-        from a curses window
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int inwstr(wchar_t *str);
-@@ -66,8 +64,7 @@
-        int mvwinnwstr(WINDOW *win, int y, int x, wchar_t *str, int n);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        These  routines  return  a string of wchar_t characters in
-        wstr, extracted starting at the current cursor position in
-        the  named window.  Attributes are stripped from the char-
-@@ -81,13 +78,11 @@
-        character, an error is generated.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        Note that all routines except winnwstr may be macros.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        All routines return ERR upon failure. Upon successful com-
-        pletion, the *inwstr routines return OK, and the  *innwstr
-        routines  return  the  number  of characters read into the
-@@ -98,8 +93,7 @@
-        outside the window, or if the window pointer is null.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), curs_instr(3x), curs_in_wchstr(3x)
- 
- 
-Index: doc/html/man/curs_kernel.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_kernel.3x.html	2015-07-22 00:49:57.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_kernel.3x.html	2016-01-30 19:24:53.000000000 +0000
-@@ -45,15 +45,13 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        def_prog_mode, def_shell_mode, reset_prog_mode,
-        reset_shell_mode, resetty, savetty, getsyx, setsyx,
-        ripoffline, curs_set, napms - low-level curses routines
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int def_prog_mode(void);
-@@ -69,15 +67,13 @@
-        int napms(int ms);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The  following  routines  give low-level access to various
-        curses capabilities.  These routines  typically  are  used
-        inside library routines.
- 
- 
--
    
--
    def_prog_mode, def_shell_mode
    -+
    def_prog_mode, def_shell_mode
    -        The  def_prog_mode  and  def_shell_mode  routines save the
-        current terminal modes as the  "program"  (in  curses)  or
-        "shell"   (not  in  curses)  state  for  use  by  the  re-
-@@ -86,8 +82,7 @@
-        each screen context allocated by newterm().
- 
- 
--
    
--
    reset_prog_mode, reset_shell_mode
    -+
    reset_prog_mode, reset_shell_mode
    -        The reset_prog_mode and reset_shell_mode routines  restore
-        the  terminal  to "program" (in curses) or "shell" (out of
-        curses) state.  These are  done  automatically  by  endwin
-@@ -95,16 +90,14 @@
-        not called.
- 
- 
--
    
--
    resetty, savetty
    -+
    resetty, savetty
    -        The resetty and savetty  routines  save  and  restore  the
-        state  of  the  terminal modes.  savetty saves the current
-        state in a buffer and resetty restores the state  to  what
-        it was at the last call to savetty.
- 
- 
--
    
--
    getsyx
    -+
    getsyx
    -        The  getsyx routine returns the current coordinates of the
-        virtual screen cursor in y and x.  If leaveok is currently
-        TRUE,  then -1,-1 is returned.  If lines have been removed
-@@ -113,8 +106,7 @@
-        as arguments for setsyx.
- 
- 
--
    
--
    setsyx
    -+
    setsyx
    -        The setsyx routine sets the virtual screen cursor to y, x.
-        If y and x are both -1, then leaveok is set.  The two rou-
-        tines getsyx and setsyx are designed to be used by  a  li-
-@@ -126,8 +118,7 @@
-        doupdate.
- 
- 
--
    
--
    ripoffline
    -+
    ripoffline
    -        The ripoffline routine provides access to the same facili-
-        ty  that  slk_init  [see  curs_slk(3x)] uses to reduce the
-        size of the screen.   ripoffline  must  be  called  before
-@@ -159,8 +150,7 @@
-        initscr or newterm.
- 
- 
--
    
--
    curs_set
    -+
    curs_set
    -        The curs_set routine sets the cursor state  to  invisible,
-        normal, or very visible for visibility equal to 0, 1, or 2
-        respectively.  If the terminal supports the visibility re-
-@@ -168,13 +158,11 @@
-        ERR is returned.
- 
- 
--
    
--
    napms
    -+
    napms
    -        The napms routine is used to sleep for ms milliseconds.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        Except for curs_set, these routines always return OK.
- 
-        curs_set returns the previous cursor state, or ERR if  the
-@@ -194,8 +182,7 @@
-             lines exceeds the maximum (NRIPS = 5).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        Note that getsyx is a macro, so & is not necessary  before
-        the variables y and x.
- 
-@@ -211,8 +198,7 @@
-        to restore that.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        The functions setsyx and getsyx are not described  in  the
-        XSI  Curses standard, Issue 4.  All other functions are as
-        described in XSI Curses.
-@@ -222,8 +208,7 @@
-        macros with no documented semantics for the return value.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), curs_initscr(3x),  curs_outopts(3x),  curs_re-
-        fresh(3x),   curs_scr_dump(3x),  curs_slk(3x),  curs_vari-
-        ables(3x).
-Index: doc/html/man/curs_legacy.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_legacy.3x.html	2015-12-06 00:26:46.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_legacy.3x.html	2016-01-30 19:24:53.000000000 +0000
-@@ -45,14 +45,12 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        curs_legacy  -  get  curses cursor and window coordinates,
-        attributes
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int getattrs(WINDOW *win);
-@@ -66,8 +64,7 @@
-        int getpary(WINDOW *win);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The getbegy and getbegx functions return the same data  as
-        getbegyx.
- 
-@@ -81,14 +78,12 @@
-        getparyx.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        These functions return an integer, or ERR  if  the  window
-        parameter is null.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        All  of  these interfaces are provided as macros and func-
-        tions.  The macros are suppressed (and only the  functions
-        provided)  when  NCURSES_OPAQUE  is defined.  The standard
-@@ -98,14 +93,12 @@
-        the WINDOW structure.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These functions were supported on Version 7, BSD or System
-        V implementations.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), curs_getyx(3x), curs_opaque(3x)
- 
- 
-Index: doc/html/man/curs_memleaks.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_memleaks.3x.html	2015-05-13 19:27:44.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_memleaks.3x.html	2016-01-30 19:24:53.000000000 +0000
-@@ -45,22 +45,19 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        _nc_freeall _nc_free_and_exit - curses memory-leak
-        checking
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        void _nc_freeall(void);
-        void _nc_free_and_exit(int);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        These functions are used to simplify  analysis  of  memory
-        leaks  in  the  ncurses  library.   They  are normally not
-        available; they must be configured  into  the  library  at
-@@ -84,18 +81,15 @@
-        code to pass to the exit routine.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        These functions do not return a value.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These functions are not part of the XSI interface.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x).
- 
- 
-Index: doc/html/man/curs_mouse.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_mouse.3x.html	2015-07-22 00:49:57.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_mouse.3x.html	2016-01-30 19:24:53.000000000 +0000
-@@ -46,15 +46,13 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        has_mouse, getmouse, ungetmouse, mousemask, wenclose,
-        mouse_trafo, wmouse_trafo, mouseinterval - mouse interface
-        through curses
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        typedef unsigned long mmask_t;
-@@ -76,15 +74,13 @@
-        int mouseinterval(int erval);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        These  functions provide an interface to mouse events from
-        ncurses(3x).  Mouse events are  represented  by  KEY_MOUSE
-        pseudo-key values in the wgetch input stream.
- 
- 
--
    
--
    mousemask
    -+
    mousemask
    -        To  make mouse events visible, use the mousemask function.
-        This will set the mouse events to  be  reported.   By  de-
-        fault,  no  mouse  events are reported.  The function will
-@@ -99,8 +95,7 @@
-        Whether this happens is device-dependent.
- 
- 
--
    
--
    Mouse events
    -+
    Mouse events
    -        Here are the mouse event type masks which may be defined:
- 
-        Name                     Description
-@@ -145,8 +140,7 @@
-        ---------------------------------------------------------------------
- 
- 
--
    
--
    getmouse
    -+
    getmouse
    -        Once a class of mouse events has been made  visible  in  a
-        window, calling the wgetch function on that window may re-
-        turn KEY_MOUSE as an indicator that a mouse event has been
-@@ -162,16 +156,14 @@
-        next older item from the queue.
- 
- 
--
    
--
    ungetmouse
    -+
    ungetmouse
    -        The ungetmouse function behaves  analogously  to  ungetch.
-        It  pushes a KEY_MOUSE event onto the input queue, and as-
-        sociates with that event the given state data and  screen-
-        relative character-cell coordinates.
- 
- 
--
    
--
    wenclose
    -+
    wenclose
    -        The  wenclose  function  tests  whether  a  given  pair of
-        screen-relative character-cell coordinates is enclosed  by
-        a  given  window, returning TRUE if it is and FALSE other-
-@@ -179,8 +171,7 @@
-        screen windows enclose the location of a mouse event.
- 
- 
--
    
--
    wmouse_trafo
    -+
    wmouse_trafo
    -        The wmouse_trafo function transforms a given pair of coor-
-        dinates from stdscr-relative  coordinates  to  coordinates
-        relative to the given window or vice versa.  The resulting
-@@ -211,14 +202,12 @@
-            nates if the transformation was successful.
- 
- 
--
    
--
    mouse_trafo
    -+
    mouse_trafo
    -        The mouse_trafo function performs the same translation  as
-        wmouse_trafo, using stdscr for win.
- 
- 
--
    
--
    mouseinterval
    -+
    mouseinterval
    -        The mouseinterval function sets the maximum time (in thou-
-        sands of a second) that can elapse between press  and  re-
-        lease  events  for  them to be recognized as a click.  Use
-@@ -228,8 +217,7 @@
-        default is one sixth of a second.
- 
- 
--
    
--
    has_mouse
    -+
    has_mouse
    -        The  has_mouse  function  returns TRUE if the mouse driver
-        has been successfully initialized.
- 
-@@ -239,8 +227,7 @@
-        str that expects a linefeed for input-loop termination.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        getmouse  and ungetmouse return the integer ERR upon fail-
-        ure or OK upon successful completion:
- 
-@@ -266,8 +253,7 @@
-        TRUE or FALSE depending on their test result.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  calls  were  designed  for ncurses(3x), and are not
-        found in SVr4 curses, 4.4BSD curses, or any other previous
-        version of curses.
-@@ -322,8 +308,7 @@
-        ton-releases.
- 
- 
--
    
--
    BUGS
    -+
    BUGS
    -        Mouse events under xterm will not in fact be ignored  dur-
-        ing  cooked  mode, if they have been enabled by mousemask.
-        Instead, the xterm mouse report sequence  will  appear  in
-@@ -345,8 +330,7 @@
-        events.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x),  curs_kernel(3x),   curs_slk(3x),   curs_vari-
-        ables(3x).
- 
-Index: doc/html/man/curs_move.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_move.3x.html	2015-05-13 19:27:45.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_move.3x.html	2016-01-30 19:24:53.000000000 +0000
-@@ -45,21 +45,18 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        move, wmove - move curses window cursor
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int move(int y, int x);
-        int wmove(WINDOW *win, int y, int x);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        These  routines move the cursor associated with the window
-        to line y and column x.  This routine does  not  move  the
-        physical  cursor  of the terminal until refresh is called.
-@@ -67,8 +64,7 @@
-        corner of the window, which is (0,0).
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        These routines return ERR upon failure and OK (SVr4 speci-
-        fies only "an integer value other than ERR") upon success-
-        ful completion.
-@@ -77,19 +73,16 @@
-        is null, or if the position is outside the window.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        Note that move may be a macro.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These functions are described in the XSI Curses  standard,
-        Issue 4.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), curs_refresh(3x)
- 
- 
-Index: doc/html/man/curs_opaque.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_opaque.3x.html	2015-12-06 00:26:46.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_opaque.3x.html	2016-01-30 19:24:53.000000000 +0000
-@@ -45,16 +45,14 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        is_cleared, is_idlok, is_idcok, is_immedok, is_keypad,
-        is_leaveok, is_nodelay, is_notimeout, is_pad, is_scrollok,
-        is_subwin, is_syncok, wgetdelay, wgetparent, wgetscrreg -
-        curses window properties
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        bool is_cleared(const WINDOW *win);
-@@ -74,8 +72,7 @@
-        int wgetscrreg(const WINDOW *win, int *top, int *bottom);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        This implementation provides functions which return  prop-
-        erties  set  in  the  WINDOW  structure, allowing it to be
-        "opaque" if the symbol NCURSES_OPAQUE is defined:
-@@ -130,26 +127,22 @@
-             margin as set in wsetscrreg.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        These functions all return TRUE or FALSE, except as noted.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        Both a macro and a function are provided for each name.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These routines are specific to  ncurses.   They  were  not
-        supported  on  Version 7, BSD or System V implementations.
-        It is recommended that any code depending on  ncurses  ex-
-        tensions be conditioned using NCURSES_VERSION.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x),  curs_inopts(3x),  curs_outopts(3x), curs_win-
-        dow(3x)
- 
-Index: doc/html/man/curs_outopts.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_outopts.3x.html	2015-07-22 00:49:57.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_outopts.3x.html	2016-01-30 19:24:53.000000000 +0000
-@@ -45,14 +45,12 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        clearok, idlok, idcok, immedok, leaveok, setscrreg,
-        wsetscrreg, scrollok, nl, nonl - curses output options
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int clearok(WINDOW *win, bool bf);
-@@ -67,16 +65,14 @@
-        int nonl(void);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        These routines set options that change the style of output
-        within  curses.   All  options are initially FALSE, unless
-        otherwise stated.  It is not necessary to turn  these  op-
-        tions off before calling endwin.
- 
- 
--
    
--
    clearok
    -+
    clearok
    -        If  clearok is called with TRUE as argument, the next call
-        to wrefresh with this window will clear  the  screen  com-
-        pletely  and  redraw the entire screen from scratch.  This
-@@ -87,8 +83,7 @@
-        screen to be cleared and repainted from scratch.
- 
- 
--
    
--
    idlok
    -+
    idlok
    -        If idlok is called with TRUE as  second  argument,  curses
-        considers using the hardware insert/delete line feature of
-        terminals so equipped.  Calling idlok with FALSE as second
-@@ -102,8 +97,7 @@
-        lines.
- 
- 
--
    
--
    idcok
    -+
    idcok
    -        If idcok is called with FALSE as second  argument,  curses
-        no longer considers using the hardware insert/delete char-
-        acter feature of terminals so equipped.  Use of  character
-@@ -112,8 +106,7 @@
-        tion and deletion.
- 
- 
--
    
--
    immedok
    -+
    immedok
    -        If  immedok is called with TRUE as argument, any change in
-        the window image, such as the ones caused by waddch, wclr-
-        tobot,  wscrl,  etc.,  automatically  cause a call to wre-
-@@ -122,8 +115,7 @@
-        fault.
- 
- 
--
    
--
    leaveok
    -+
    leaveok
    -        Normally, the hardware cursor is left at the  location  of
-        the window cursor being refreshed.  The leaveok option al-
-        lows the cursor to be left wherever the update happens  to
-@@ -131,8 +123,7 @@
-        is not used, since it reduces the need for cursor motions.
- 
- 
--
    
--
    setscrreg
    -+
    setscrreg
    -        The setscrreg and wsetscrreg routines allow  the  applica-
-        tion  programmer  to  set a software scrolling region in a
-        window.  The top and bot parameters are the  line  numbers
-@@ -149,8 +140,7 @@
-        will probably be used by the output routines.)
- 
- 
--
    
--
    scrollok
    -+
    scrollok
    -        The  scrollok option controls what happens when the cursor
-        of a window is  moved  off  the  edge  of  the  window  or
-        scrolling  region,  either as a result of a newline action
-@@ -162,8 +152,7 @@
-        call idlok).
- 
- 
--
    
--
    nl, nonl
    -+
    nl, nonl
    -        The  nl  and  nonl routines control whether the underlying
-        display device translates the return key into  newline  on
-        input,  and  whether it translates newline into return and
-@@ -176,8 +165,7 @@
-        the return key.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        The functions setscrreg and wsetscrreg return OK upon suc-
-        cess and ERR upon failure.  All other routines that return
-        an integer always return OK.
-@@ -200,8 +188,7 @@
-        mentation returns an error if the window pointer is null.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  functions are described in the XSI Curses standard,
-        Issue 4.
- 
-@@ -230,8 +217,7 @@
-        not.  Use curs_set to make the cursor invisible.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        Note that clearok, leaveok, scrollok, idcok, nl, nonl  and
-        setscrreg may be macros.
- 
-@@ -239,8 +225,7 @@
-        terminal emulators.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), curs_addch(3x), curs_clear(3x),
-        curs_initscr(3x), curs_scroll(3x), curs_refresh(3x),
-        curs_variables(3x).
-Index: doc/html/man/curs_overlay.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_overlay.3x.html	2015-07-22 00:49:57.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_overlay.3x.html	2016-01-30 19:24:53.000000000 +0000
-@@ -45,14 +45,12 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        overlay, overwrite, copywin - overlay and manipulate
-        overlapped curses windows
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int overlay(const WINDOW *srcwin, WINDOW *dstwin);
-@@ -63,11 +61,9 @@
-              int dmaxcol, int overlay);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    - 
--
    
--
    overlay, overwrite
    -+
    overlay, overwrite
    -        The  overlay  and overwrite routines overlay srcwin on top
-        of dstwin.  scrwin and dstwin are not required to  be  the
-        same  size;  only  text  where  the two windows overlap is
-@@ -75,8 +71,7 @@
-        (blanks are not copied) whereas overwrite is destructive.
- 
- 
--
    
--
    copywin
    -+
    copywin
    -        The  copywin  routine provides a finer granularity of con-
-        trol over the overlay and overwrite routines.  As  in  the
-        prefresh routine, a rectangle is specified in the destina-
-@@ -86,8 +81,7 @@
-        then copying is non-destructive, as in overlay.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        Routines  that  return an integer return ERR upon failure,
-        and OK (SVr4 only specifies "an integer value  other  than
-        ERR") upon successful completion.
-@@ -98,21 +92,18 @@
-        the window would be placed off-screen.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        Note that overlay and overwrite may be macros.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        The XSI Curses standard, Issue 4 describes these functions
-        (adding the const qualifiers).  It further specifies their
-        behavior in the presence of characters with multibyte ren-
-        ditions (not yet supported in this implementation).
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), curs_pad(3x), curs_refresh(3x)
- 
- 
-Index: doc/html/man/curs_pad.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_pad.3x.html	2015-07-22 00:49:57.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_pad.3x.html	2016-01-30 19:24:53.000000000 +0000
-@@ -45,14 +45,12 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        newpad, subpad, prefresh, pnoutrefresh, pechochar,
-        pecho_wchar - create and display curses pads
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        WINDOW *newpad(int nlines, int ncols);
-@@ -66,11 +64,9 @@
-        int pecho_wchar(WINDOW *pad, const cchar_t *wch);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    - 
--
    
--
    newpad
    -+
    newpad
    -        The newpad routine creates and returns a pointer to a  new
-        pad data structure with the given number of lines, nlines,
-        and columns, ncols.  A pad is like a window,  except  that
-@@ -87,8 +83,7 @@
-        to be used for the display.
- 
- 
--
    
--
    subpad
    -+
    subpad
    -        The subpad routine creates and returns a pointer to a sub-
-        window within a  pad  with  the  given  number  of  lines,
-        nlines,  and  columns,  ncols.   Unlike subwin, which uses
-@@ -100,8 +95,7 @@
-        fore calling prefresh.
- 
- 
--
    
--
    prefresh, pnoutrefresh
    -+
    prefresh, pnoutrefresh
    -        The  prefresh  and  pnoutrefresh routines are analogous to
-        wrefresh and wnoutrefresh except that they relate to  pads
-        instead  of windows.  The additional parameters are needed
-@@ -118,8 +112,7 @@
-        col, sminrow, or smincol are treated as if they were zero.
- 
- 
--
    
--
    pechochar
    -+
    pechochar
    -        The pechochar routine is functionally equivalent to a call
-        to  addch  followed by a call to refresh, a call to waddch
-        followed by a call to wrefresh, or a call to  waddch  fol-
-@@ -132,16 +125,14 @@
-        arguments to prefresh.
- 
- 
--
    
--
    pecho_wchar
    -+
    pecho_wchar
    -        The  pecho_wchar  function is the analogous wide-character
-        form of pechochar.  It outputs one character to a pad  and
-        immediately  refreshes the pad.  It does this by a call to
-        wadd_wch followed by a call to prefresh.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        Routines that return an integer return  ERR  upon  failure
-        and  OK  (SVr4 only specifies "an integer value other than
-        ERR") upon successful completion.
-@@ -169,19 +160,16 @@
-                turns an error.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        Note that pechochar may be a macro.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        The  XSI  Curses  standard,  Issue 4 describes these func-
-        tions.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x),  curs_refresh(3x),  curs_touch(3x),  curs_add-
-        ch(3x).
- 
-Index: doc/html/man/curs_print.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_print.3x.html	2015-05-13 19:27:45.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_print.3x.html	2016-01-30 19:24:53.000000000 +0000
-@@ -45,20 +45,17 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        mcprint - ship binary data to printer
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int mcprint(char *data, int len);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        This  function  uses the mc5p or mc4 and mc5 capabilities,
-        if they are present, to  ship  given  data  to  a  printer
-        attached to the terminal.
-@@ -73,8 +70,7 @@
-        sleep for a second after shipping each 80-character line.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        The mcprint function returns ERR if  the  write  operation
-        aborted for some reason.  In this case, errno will contain
-        either an error associated with write(2)  or  one  of  the
-@@ -91,21 +87,18 @@
-        actually sent to the printer.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        The  mcprint call was designed for ncurses(3x), and is not
-        found in SVr4 curses, 4.4BSD curses, or any other previous
-        version of curses.
- 
- 
--
    
--
    BUGS
    -+
    BUGS
    -        Padding  in the mc5p, mc4 and mc5 capabilities will not be
-        interpreted.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x)
- 
- 
-Index: doc/html/man/curs_printw.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_printw.3x.html	2015-05-13 19:27:45.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_printw.3x.html	2016-01-30 19:24:53.000000000 +0000
-@@ -45,14 +45,12 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        printw, wprintw, mvprintw, mvwprintw, vwprintw, vw_printw
-        - print formatted output in curses windows
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int printw(const char *fmt, ...);
-@@ -66,8 +64,7 @@
-        glist);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The  printw,  wprintw, mvprintw and mvwprintw routines are
-        analogous to  printf  [see  printf(3)].   In  effect,  the
-        string that would be output by printf is output instead as
-@@ -80,8 +77,7 @@
-        <stdarg.h>.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        Routines that return an integer return  ERR  upon  failure
-        and  OK  (SVr4 only specifies "an integer value other than
-        ERR") upon successful completion.
-@@ -96,8 +92,7 @@
-        outside the window, or if the window pointer is null.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        The  XSI  Curses  standard,  Issue 4 describes these func-
-        tions.  The function vwprintw is marked TO  BE  WITHDRAWN,
-        and  is  to  be replaced by a function vw_printw using the
-@@ -109,8 +104,7 @@
-        is included in <curses.h>.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), printf(3), vprintf(3)
- 
- 
-Index: doc/html/man/curs_refresh.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_refresh.3x.html	2015-05-13 19:27:45.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_refresh.3x.html	2016-01-30 19:24:53.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-@@ -45,14 +45,12 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        doupdate, redrawwin, refresh, wnoutrefresh, wredrawln,
-        wrefresh - refresh curses windows and lines
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int refresh(void);
-@@ -63,8 +61,9 @@
-        int wredrawln(WINDOW *win, int beg_line, int num_lines);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -+
-+
    refresh/wrefresh
    -        The refresh and wrefresh  routines  (or  wnoutrefresh  and
-        doupdate)  must be called to get actual output to the ter-
-        minal, as other routines  merely  manipulate  data  struc-
-@@ -76,6 +75,8 @@
-        minal is left at the location of the cursor for that  win-
-        dow.
- 
-+
-+
    wnoutrefresh/doupdate
    -        The  wnoutrefresh and doupdate routines allow multiple up-
-        dates with more efficiency than wrefresh alone.  In  addi-
-        tion  to  all the window structures, curses keeps two data
-@@ -108,6 +109,8 @@
-        see the section on PORTABILITY below for a  warning  about
-        exploiting this behavior.)
- 
-+
-+
    wredrawln/redrawwin
    -        The wredrawln routine indicates to curses that some screen
-        lines are corrupted and should be thrown away before  any-
-        thing  is  written  over  them.   It touches the indicated
-@@ -115,8 +118,7 @@
-        touches the entire window.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        Routines  that  return an integer return ERR upon failure,
-        and OK (SVr4 only specifies "an integer value  other  than
-        ERR") upon successful completion.
-@@ -124,22 +126,20 @@
-        X/Open  does not define any error conditions.  In this im-
-        plementation
- 
--              wnoutrefresh
--                   returns an error  if  the  window  pointer  is
--                   null, or if the window is really a pad.
--
--              wredrawln
--                   returns  an  error  if  the associated call to
--                   touchln returns an error.
-+          wnoutrefresh
-+               returns an error if the window pointer is null, or
-+               if the window is really a pad.
- 
-+          wredrawln
-+               returns an error if the associated call to touchln
-+               returns an error.
- 
--
    
--
    NOTES
    -+
-+
    NOTES
    -        Note that refresh and redrawwin may be macros.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        The XSI Curses standard, Issue  4  describes  these  func-
-        tions.
- 
-@@ -153,8 +153,7 @@
-        antee an entire-contents copy anywhere.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), curs_outopts(3x) curs_variables(3x).
- 
- 
-@@ -165,7 +164,13 @@
- 
    
--
    NAME
    -+
    NAME
    -        scanw, wscanw, mvscanw, mvwscanw, vwscanw, vw_scanw - con-
-        vert formatted input from a curses window
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int scanw(char *fmt, ...);
-@@ -63,8 +61,7 @@
-        int vwscanw(WINDOW *win, char *fmt, va_list varglist);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The scanw, wscanw and mvscanw routines  are  analogous  to
-        scanf  [see scanf(3)].  The effect of these routines is as
-        though wgetstr were called on the window, and the  result-
-@@ -77,8 +74,7 @@
-        ments, as defined in <stdarg.h>.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        vwscanw returns ERR on failure and an integer equal to the
-        number of fields scanned on success.
- 
-@@ -91,8 +87,7 @@
-        outside the window, or if the window pointer is null.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        The XSI Curses standard, Issue  4  describes  these  func-
-        tions.   The  function  vwscanw is marked TO BE WITHDRAWN,
-        and is to be replaced by a  function  vw_scanw  using  the
-@@ -116,8 +111,7 @@
-        something was processed.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), curs_getstr(3x), curs_printw(3x), scanf(3)
- 
- 
-Index: doc/html/man/curs_scr_dump.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_scr_dump.3x.html	2015-05-13 19:27:45.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_scr_dump.3x.html	2016-01-30 19:24:53.000000000 +0000
-@@ -45,14 +45,12 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        scr_dump, scr_restore, scr_init, scr_set - read (write) a
-        curses screen from (to) a file
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int scr_dump(const char *filename);
-@@ -61,8 +59,7 @@
-        int scr_set(const char *filename);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The scr_dump routine dumps the  current  contents  of  the
-        virtual screen to the file filename.
- 
-@@ -93,8 +90,7 @@
-        and putwin routines [see curs_util(3x)].
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        All  routines  return  the integer ERR upon failure and OK
-        upon success.
- 
-@@ -103,14 +99,12 @@
-        opened.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        Note  that  scr_init,  scr_set,  and  scr_restore  may  be
-        macros.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        The  XSI  Curses  standard, Issue 4, describes these func-
-        tions (adding the const qualifiers).
- 
-@@ -119,8 +113,7 @@
-        is old" but do not define "old".
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x),      curs_initscr(3x),       curs_refresh(3x),
-        curs_util(3x), system(3)
- 
-Index: doc/html/man/curs_scroll.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_scroll.3x.html	2015-05-13 19:27:45.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_scroll.3x.html	2016-01-30 19:24:54.000000000 +0000
-@@ -45,13 +45,11 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        scroll, scrl, wscrl - scroll a curses window
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int scroll(WINDOW *win);
-@@ -59,8 +57,7 @@
-        int wscrl(WINDOW *win, int n);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The  scroll  routine scrolls the window up one line.  This
-        involves moving the lines in the  window  data  structure.
-        As  an optimization, if the scrolling region of the window
-@@ -77,8 +74,7 @@
-        scrollok.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        These routines return ERR upon failure, and OK (SVr4  only
-        specifies "an integer value other than ERR") upon success-
-        ful completion.
-@@ -90,8 +86,7 @@
-        e.g., with scrollok.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        Note that scrl and scroll may be macros.
- 
-        The SVr4 documentation says that the optimization of phys-
-@@ -108,14 +103,12 @@
-        plementation it is.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        The  XSI  Curses  standard,  Issue 4 describes these func-
-        tions.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), curs_outopts(3x)
- 
- 
-Index: doc/html/man/curs_slk.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_slk.3x.html	2015-05-13 19:27:45.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_slk.3x.html	2016-01-30 19:24:54.000000000 +0000
-@@ -45,8 +45,7 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        slk_init, slk_set, slk_wset, slk_refresh, slk_noutrefresh,
-        slk_label, slk_clear, slk_restore, slk_touch, slk_attron,
-        slk_attrset, slk_attroff, slk_attr_on, slk_attr_set,
-@@ -54,8 +53,7 @@
-        routines
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int slk_init(int fmt);
-@@ -78,8 +76,7 @@
-        int slk_wset(int labnum, const wchar_t *label, int fmt);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The slk* functions manipulate the set of soft function-key
-        labels  that exist on many terminals.  For those terminals
-        that do not have soft labels, curses takes over the bottom
-@@ -153,8 +150,7 @@
-        line of the screen.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        These routines return ERR upon failure and OK (SVr4 speci-
-        fies only "an integer value other than ERR") upon success-
-        ful completion.
-@@ -201,14 +197,12 @@
-                    be allocated.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        Most applications would use slk_noutrefresh because a wre-
-        fresh is likely to follow soon.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        The XSI Curses standard, Issue 4,  describes  these  func-
-        tions.   It changes the argument type of the attribute-ma-
-        nipulation functions slk_attron, slk_attroff,  slk_attrset
-@@ -217,8 +211,7 @@
-        cific to ncurses.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x),   curs_attr(3x),   curs_initscr(3x),  curs_re-
-        fresh(3x), curs_variables(3x).
- 
-Index: doc/html/man/curs_sp_funcs.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_sp_funcs.3x.html	2015-12-06 00:26:47.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_sp_funcs.3x.html	2016-01-30 19:24:54.000000000 +0000
-@@ -48,13 +48,11 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        curs_sp_funcs - curses screen-pointer extension
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int assume_default_colors_sp(SCREEN*, int, int);
-@@ -187,8 +185,7 @@
-        int tputs_sp(SCREEN*, const char *, int, NCURSES_SP_OUTC);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        This  implementation can be configured to provide a set of
-        functions which improve the  ability  to  manage  multiple
-        screens.  This feature can be added to any of the configu-
-@@ -196,8 +193,7 @@
-        without changing the meaning of any of the existing ones.
- 
- 
--
    
--
    IMPROVED FUNCTIONS
    -+
    IMPROVED FUNCTIONS
    -        Most  of  the functions are new versions of existing func-
-        tions.  A parameter is added at the front of the parameter
-        list.  It is a SCREEN pointer.
-@@ -208,8 +204,7 @@
-        which must be modified to update multiple screens.
- 
- 
--
    
--
    NEW FUNCTIONS
    -+
    NEW FUNCTIONS
    -        Here are the new functions:
- 
-        ceiling_panel
-@@ -232,8 +227,7 @@
-             initialization.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        This extension introduces some new names:
- 
-        NCURSES_SP_FUNCS
-@@ -262,16 +256,14 @@
-             stream, e.g., curs_terminfo(3x).
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  routines  are  specific  to ncurses.  They were not
-        supported on Version 7, BSD or System  V  implementations.
-        It  is  recommended that any code depending on ncurses ex-
-        tensions be conditioned using NCURSES_SP_FUNCS.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), curs_opaque(3x), curs_threads(3x).
- 
- 
-Index: doc/html/man/curs_termattrs.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_termattrs.3x.html	2015-07-22 00:49:58.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_termattrs.3x.html	2016-01-30 19:24:54.000000000 +0000
-@@ -45,15 +45,13 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        baudrate, erasechar, erasewchar, has_ic, has_il, killchar,
-        killwchar, longname,  term_attrs,  termattrs,  termname  -
-        curses environment query routines
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int baudrate(void);
-@@ -69,18 +67,15 @@
-        char *termname(void);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    - 
--
    
--
    baudrate
    -+
    baudrate
    -        The  baudrate routine returns the output speed of the ter-
-        minal.  The number returned is in  bits  per  second,  for
-        example 9600, and is an integer.
- 
- 
--
    
--
    erasechar, erasewchar
    -+
    erasechar, erasewchar
    -        The  erasechar  routine  returns  the user's current erase
-        character.
- 
-@@ -90,8 +85,7 @@
-        erenced by ch is not changed.
- 
- 
--
    
--
    has_is, has_il
    -+
    has_is, has_il
    -        The has_ic routine is true if the terminal has insert- and
-        delete- character capabilities.
- 
-@@ -102,8 +96,7 @@
-        scrollok.
- 
- 
--
    
--
    killchar, killwchar
    -+
    killchar, killwchar
    -        The killchar routine returns the user's current line  kill
-        character.
- 
-@@ -113,8 +106,7 @@
-        location referenced by ch is not changed.
- 
- 
--
    
--
    longname
    -+
    longname
    -        The longname routine returns a pointer to  a  static  area
-        containing  a verbose description of the current terminal.
-        The maximum length of a verbose description is 128 charac-
-@@ -125,8 +117,7 @@
-        used with multiple terminals.
- 
- 
--
    
--
    termattrs, term_attrs
    -+
    termattrs, term_attrs
    -        If  a  given  terminal  does not support a video attribute
-        that an application program is trying to use,  curses  may
-        substitute  a  different video attribute for it.  The ter-
-@@ -137,14 +128,12 @@
-        appearance of the screen.
- 
- 
--
    
--
    termname
    -+
    termname
    -        The termname routine returns the  terminal  name  used  by
-        setupterm.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        longname and termname return NULL on error.
- 
-        Routines  that  return  an integer return ERR upon failure
-@@ -152,21 +141,18 @@
-        ERR") upon successful completion.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        Note that termattrs may be a macro.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        The  XSI  Curses  standard,  Issue 4 describes these func-
-        tions.  It changes the return type of termattrs to the new
-        type  attr_t.  Most versions of curses truncate the result
-        returned by termname to 14 characters.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), curs_initscr(3x), curs_outopts(3x)
- 
- 
-Index: doc/html/man/curs_termcap.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_termcap.3x.html	2015-05-13 19:27:45.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_termcap.3x.html	2016-01-30 19:24:54.000000000 +0000
-@@ -45,15 +45,13 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        PC, UP, BC, ospeed, tgetent, tgetflag, tgetnum, tgetstr,
-        tgoto, tputs - direct curses interface to the terminfo
-        capability database
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
-        #include <term.h>
- 
-@@ -70,8 +68,7 @@
-        int tputs(const char *str, int affcnt, int (*putc)(int));
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        These  routines  are included as a conversion aid for pro-
-        grams that use the termcap library.  Their parameters  are
-        the  same and the routines are emulated using the terminfo
-@@ -80,8 +77,7 @@
-        compiled.
- 
- 
--
    
--
    INITIALIZATION
    -+
    INITIALIZATION
    -        The tgetent routine loads the entry for name.  It returns:
- 
-           1  on success,
-@@ -107,8 +103,7 @@
-               terminal description has cursor-addressing.
- 
- 
--
    
--
    CAPABILITY VALUES
    -+
    CAPABILITY VALUES
    -        The tgetflag routine gets the boolean entry for id, or ze-
-        ro if it is not available.
- 
-@@ -139,8 +134,7 @@
-        flag, tgetnum and tgetstr are compared in lookups.
- 
- 
--
    
--
    FORMATTING CAPABILITIES
    -+
    FORMATTING CAPABILITIES
    -        The  tgoto  routine  instantiates  the parameters into the
-        given capability.  The output from this routine is  to  be
-        passed to tputs.
-@@ -150,8 +144,7 @@
-        cap or terminfo name.
- 
- 
--
    
--
    GLOBAL VARIABLES
    -+
    GLOBAL VARIABLES
    -        The variables PC, UP and BC are set by tgetent to the ter-
-        minfo   entry's   data   for   pad_char,   cursor_up   and
-        backspace_if_not_bs,  respectively.   UP  is  not  used by
-@@ -161,8 +154,7 @@
-        minal speed.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        Except where explicitly noted, routines that return an in-
-        teger return ERR upon failure and OK (SVr4 only  specifies
-        "an integer value other than ERR") upon successful comple-
-@@ -171,8 +163,7 @@
-        Routines that return pointers return NULL on error.
- 
- 
--
    
--
    BUGS
    -+
    BUGS
    -        If you call tgetstr to fetch ca or any other parameterized
-        string,  be aware that it will be returned in terminfo no-
-        tation, not the older and not-quite-compatible termcap no-
-@@ -197,8 +188,7 @@
-        modate termcap's limitation in this respect.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        The  XSI  Curses  standard,  Issue 4 describes these func-
-        tions.  However, they are marked TO BE WITHDRAWN  and  may
-        be removed in future versions.
-@@ -239,8 +229,7 @@
-            longer than two characters.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), terminfo(5), term_variables(3x), putc(3).
- 
-        http://invisible-island.net/ncurses/tctest.html
-Index: doc/html/man/curs_terminfo.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_terminfo.3x.html	2015-05-13 19:27:45.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_terminfo.3x.html	2016-01-30 19:24:54.000000000 +0000
-@@ -50,16 +50,14 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        del_curterm, mvcur, putp, restartterm, set_curterm,
-        setterm, setupterm, tigetflag, tigetnum, tigetstr, tiparm,
-        tparm, tputs, vid_attr, vid_puts, vidattr, vidputs -
-        curses interfaces to terminfo database
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
-        #include <term.h>
- 
-@@ -82,8 +80,7 @@
-        char *tiparm(const char *str, ...);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        These low-level routines must be called by  programs  that
-        have to deal directly with the terminfo database to handle
-        certain terminal capabilities, such as  programming  func-
-@@ -91,8 +88,7 @@
-        are more suitable and their use is recommended.
- 
- 
--
    
--
    Initialization
    -+
    Initialization
    -        Initially, setupterm should  be  called.   Note  that  se-
-        tupterm  is  automatically  called by initscr and newterm.
-        This  defines  the  set  of  terminal-dependent  variables
-@@ -181,8 +177,7 @@
-        not recommended for new programs.
- 
- 
--
    
--
    The Terminal State
    -+
    The Terminal State
    -        The  setupterm  routine  stores  its information about the
-        terminal in a TERMINAL structure pointed to by the  global
-        variable  cur_term.   If  it  detects an error, or decides
-@@ -219,8 +214,7 @@
-        bits.
- 
- 
--
    
--
    Formatting Output
    -+
    Formatting Output
    -        The tparm routine instantiates the string str with parame-
-        ters  pi.  A pointer is returned to the result of str with
-        the parameters applied.
-@@ -230,8 +224,7 @@
-        ters are integers (int) rather than longs.
- 
- 
--
    
--
    Output Functions
    -+
    Output Functions
    -        The tputs  routine  applies  padding  information  to  the
-        string  str  and  outputs  it.  The str must be a terminfo
-        string variable or the return value from  tparm,  tgetstr,
-@@ -266,8 +259,7 @@
-        fresh).
- 
- 
--
    
--
    Terminal Capability Functions
    -+
    Terminal Capability Functions
    -        The  tigetflag,  tigetnum and tigetstr routines return the
-        value of the capability corresponding to the terminfo cap-
-        name  passed  to them, such as xenl.  The capname for each
-@@ -299,8 +291,7 @@
-               scription.
- 
- 
--
    
--
    Terminal Capability Names
    -+
    Terminal Capability Names
    -        These null-terminated arrays contain  the  short  terminfo
-        names  ("codes"), the termcap names, and the long terminfo
-        names ("fnames") for each of the predefined terminfo vari-
-@@ -312,8 +303,7 @@
-               char *strnames[], *strcodes[], *strfnames[]
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        Routines  that  return  an integer return ERR upon failure
-        and OK (SVr4 only specifies "an integer value  other  than
-        ERR")  upon  successful completion, unless otherwise noted
-@@ -347,8 +337,7 @@
-                  the output function putc.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        X/Open notes that vidattr and vidputs may be macros.
- 
-        The  function  setterm is not described by X/Open and must
-@@ -425,8 +414,7 @@
-        tic -x, are not stored in the arrays described here.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), curs_initscr(3x), curs_kernel(3x),  curs_term-
-        cap(3x),  curs_variables(3x), term_variables(3x), putc(3),
-        terminfo(5)
-Index: doc/html/man/curs_threads.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_threads.3x.html	2015-12-06 00:26:47.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_threads.3x.html	2016-01-30 19:24:54.000000000 +0000
-@@ -47,13 +47,11 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        curs_threads - curses thread support
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        typedef int (*NCURSES_WINDOW_CB)(WINDOW *, void *);
-@@ -67,8 +65,7 @@
-        *data);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        This  implementation can be configured to provide rudimen-
-        tary support for multi-threaded applications.  This  makes
-        a  different set of libraries, e.g., libncursest since the
-@@ -109,8 +106,7 @@
-        supplied function to the application.
- 
- 
--
    
--
    USAGE
    -+
    USAGE
    -        All of the ncurses library functions assume that  the  lo-
-        cale  is  not altered during operation.  In addition, they
-        use data which is maintained within a hierarchy of scopes.
-@@ -602,26 +598,22 @@
-       wvline_set              window
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        These functions all return TRUE or FALSE, except as noted.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        Both a macro and a function are provided for each name.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  routines  are  specific  to ncurses.  They were not
-        supported on Version 7, BSD or System  V  implementations.
-        It  is  recommended that any code depending on ncurses ex-
-        tensions be conditioned using NCURSES_VERSION.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), curs_opaque(3x), curs_variables(3x).
- 
- 
-Index: doc/html/man/curs_touch.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_touch.3x.html	2015-12-06 00:26:47.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_touch.3x.html	2016-01-30 19:24:54.000000000 +0000
-@@ -45,14 +45,12 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        touchwin, touchline, untouchwin, wtouchln, is_linetouched,
-        is_wintouched - curses refresh control routines
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
-        int touchwin(WINDOW *win);
-        int touchline(WINDOW *win, int start, int count);
-@@ -62,8 +60,7 @@
-        bool is_wintouched(WINDOW *win);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The touchwin and touchline routines throw away  all  opti-
-        mization  information about which parts of the window have
-        been touched, by pretending that  the  entire  window  has
-@@ -88,8 +85,7 @@
-        the given window.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        All  routines  return  the integer ERR upon failure and an
-        integer value other than ERR upon  successful  completion,
-        unless  otherwise  noted in the preceding routine descrip-
-@@ -111,8 +107,7 @@
-                    window.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        The  XSI  Curses  standard,  Issue 4 describes these func-
-        tions.
- 
-@@ -122,13 +117,11 @@
-        scr).  This will not work under ncurses.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        Note that all routines except wtouchln may be macros.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), curs_refresh(3x), curs_variables(3x).
- 
- 
-Index: doc/html/man/curs_trace.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_trace.3x.html	2015-07-22 00:49:58.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_trace.3x.html	2016-01-30 19:24:54.000000000 +0000
-@@ -45,16 +45,14 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        _tracef, _tracedump, _traceattr, _traceattr2,
-        _nc_tracebits, _tracecchar_t, _tracecchar_t2, _tracechar,
-        _tracechtype, _tracechtype2, _tracemouse, trace - curses
-        debugging routines
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        void _tracef(const char *format, ...);
-@@ -71,8 +69,7 @@
-        void trace(const unsigned int param);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The trace routines are used for debugging the ncurses  li-
-        braries, as well as applications which use the ncurses li-
-        braries.  These functions are normally available only with
-@@ -168,22 +165,19 @@
-               tent, use_env, use_extended_names, use_tioctl
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        Routines which return a value are designed to be  used  as
-        parameters to the _tracef routine.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  functions  are not part of the XSI interface.  Some
-        other curses implementations are known  to  have  similar,
-        undocumented  features,  but  they are not compatible with
-        ncurses.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x).
- 
- 
-Index: doc/html/man/curs_util.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_util.3x.html	2015-06-06 23:47:44.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_util.3x.html	2016-01-30 19:24:54.000000000 +0000
-@@ -46,15 +46,13 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        delay_output, filter, flushinp, getwin, key_name, keyname,
-        nofilter, putwin, unctrl, use_env, use_tioctl, wunctrl -
-        miscellaneous curses utility routines
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        char *unctrl(chtype c);
-@@ -71,11 +69,9 @@
-        int flushinp(void);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    - 
--
    
--
    unctrl
    -+
    unctrl
    -        The  unctrl  routine returns a character string which is a
-        printable representation of the character c, ignoring  at-
-        tributes.   Control characters are displayed in the ^X no-
-@@ -84,8 +80,7 @@
-        of a wide character.
- 
- 
--
    
--
    keyname/key_name
    -+
    keyname/key_name
    -        The keyname routine returns a character string correspond-
-        ing to the key c:
- 
-@@ -118,8 +113,7 @@
-        ter.
- 
- 
--
    
--
    filter/nofilter
    -+
    filter/nofilter
    -        The filter routine, if used, must be called before initscr
-        or newterm are called.  The effect is that,  during  those
-        calls,  LINES  is  set  to 1; the capabilities clear, cup,
-@@ -133,8 +127,7 @@
-        modifies the in-memory copy of the terminal information.
- 
- 
--
    
--
    use_env
    -+
    use_env
    -        The  use_env  routine,  if  used,  should be called before
-        initscr or newterm are called (because those  compute  the
-        screen size).  It modifies the way ncurses treats environ-
-@@ -162,8 +155,7 @@
-            environment variables,
- 
- 
--
    
--
    use_tioctl
    -+
    use_tioctl
    -        The  use_tioctl  routine, if used, should be called before
-        initscr or newterm are called (because those  compute  the
-        screen  size).  After use_tioctl is called with TRUE as an
-@@ -202,8 +194,7 @@
-                             to determine size.
- 
- 
--
    
--
    putwin/getwin
    -+
    putwin/getwin
    -        The putwin routine writes all data associated with  window
-        (or  pad)  win  into the file to which filep points.  This
-        information can be later retrieved using the getwin  func-
-@@ -230,8 +221,7 @@
-            will not be colored when the window is refreshed.
- 
- 
--
    
--
    delay_output
    -+
    delay_output
    -        The  delay_output  routine inserts an ms millisecond pause
-        in output.  This routine should not  be  used  extensively
-        because  padding  characters  are  used  rather than a CPU
-@@ -239,15 +229,13 @@
-        napms to perform the delay.
- 
- 
--
    
--
    flushinp
    -+
    flushinp
    -        The  flushinp  routine  throws away any typeahead that has
-        been typed by the user and has not yet been  read  by  the
-        program.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        Except  for  flushinp, routines that return an integer re-
-        turn ERR upon failure and OK (SVr4 specifies only "an  in-
-        teger value other than ERR") upon successful completion.
-@@ -269,19 +257,16 @@
-                return an error.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    - 
--
    
--
    filter
    -+
    filter
    -        The SVr4 documentation describes the action of filter only
-        in the vaguest terms.  The  description  here  is  adapted
-        from  the  XSI Curses standard (which erroneously fails to
-        describe the disabling of cuu).
- 
- 
--
    
--
    keyname
    -+
    keyname
    -        The keyname function may return the names of  user-defined
-        string  capabilities which are defined in the terminfo en-
-        try via the -x option of tic.  This  implementation  auto-
-@@ -295,8 +280,7 @@
-        brary.
- 
- 
--
    
--
    nofilter/use_tioctl
    -+
    nofilter/use_tioctl
    -        The nofilter  and  use_tioctl  routines  are  specific  to
-        ncurses.   They  were  not  supported on Version 7, BSD or
-        System V implementations.  It is recommended that any code
-@@ -304,8 +288,7 @@
-        NCURSES_VERSION.
- 
- 
--
    
--
    putwin/getwin
    -+
    putwin/getwin
    -        The putwin and getwin functions have several  issues  with
-        portability:
- 
-@@ -339,8 +322,7 @@
-            may not be successful.
- 
- 
--
    
--
    unctrl/wunctrl
    -+
    unctrl/wunctrl
    -        The XSI Curses standard, Issue  4  describes  these  func-
-        tions.   It  states  that unctrl and wunctrl will return a
-        null pointer if unsuccessful, but does not define any  er-
-@@ -387,8 +369,7 @@
-        "M-^A", etc.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        legacy_coding(3x), curses(3x), curs_initscr(3x), curs_ker-
-        nel(3x),  curs_scr_dump(3x),   curs_variables(3x),   lega-
-        cy_coding(3x).
-Index: doc/html/man/curs_variables.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_variables.3x.html	2015-09-05 21:19:36.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_variables.3x.html	2016-01-30 19:24:54.000000000 +0000
-@@ -45,14 +45,12 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        COLORS, COLOR_PAIRS, COLS, ESCDELAY, LINES, TABSIZE,
-        curscr, newscr, stdscr - curses global variables
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int COLOR_PAIRS;
-@@ -66,8 +64,7 @@
-        WINDOW * stdscr;
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        This page summarizes variables provided by the curses  li-
-        brary.   A more complete description is given in the curs-
-        es(3x) manual page.
-@@ -79,8 +76,7 @@
-        them as read-only to avoid confusing the library.
- 
- 
--
    
--
    COLOR_PAIRS
    -+
    COLOR_PAIRS
    -        After initializing curses, this variable contains the num-
-        ber of color pairs which the terminal can support.  Usual-
-        ly the number of color pairs  will  be  the  product  COL-
-@@ -94,20 +90,17 @@
-            sented in a signed short value.
- 
- 
--
    
--
    COLORS
    -+
    COLORS
    -        After initializing curses, this variable contains the num-
-        ber of colors which the terminal can support.
- 
- 
--
    
--
    COLS
    -+
    COLS
    -        After  initializing  curses,  this  variable  contains the
-        width of the screen, i.e., the number of columns.
- 
- 
--
    
--
    ESCDELAY
    -+
    ESCDELAY
    -        This variable holds the number of milliseconds to wait af-
-        ter reading an escape character, to distinguish between an
-        individual escape character entered on the  keyboard  from
-@@ -115,41 +108,35 @@
-        curses(3x).
- 
- 
--
    
--
    LINES
    -+
    LINES
    -        After initializing  curses,  this  variable  contains  the
-        height of the screen, i.e., the number of lines.
- 
- 
--
    
--
    TABSIZE
    -+
    TABSIZE
    -        This  variable  holds  the  number  of columns used by the
-        curses library when converting a tab character  to  spaces
-        as it adds the tab to a window (see curs_addch(3x).
- 
- 
--
    
--
    The Current Screen
    -+
    The Current Screen
    -        This implementation of curses uses a special window curscr
-        to record its updates to the terminal screen.
- 
- 
--
    
--
    The New Screen
    -+
    The New Screen
    -        This implementation of curses uses a special window newscr
-        to  hold  updates  to  the terminal screen before applying
-        them to curscr.
- 
- 
--
    
--
    The Standard Screen
    -+
    The Standard Screen
    -        Upon initializing curses, a default window called  stdscr,
-        which  is  the  size  of  the terminal screen, is created.
-        Many curses functions use this window.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The   curses   library   is   initialized   using   either
-        curs_initscr(3x), or curs_initscr(3x).
- 
-@@ -158,8 +145,7 @@
-        library.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        ESCDELAY  and TABSIZE are extensions, not provided in most
-        other implementations of curses.
- 
-@@ -179,8 +165,7 @@
-        ed to override the value, or rely upon its default value.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x),       curs_opaque(3x),      curs_terminfo(3x),
-        curs_threads(3x), term_variables(3x), terminfo(5).
- 
-Index: doc/html/man/curs_window.3x.html
---- ncurses-6.0-20160123+/doc/html/man/curs_window.3x.html	2015-07-22 00:49:59.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/curs_window.3x.html	2016-01-30 19:24:54.000000000 +0000
-@@ -45,15 +45,13 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        newwin, delwin, mvwin, subwin, derwin, mvderwin, dupwin,
-        wsyncup, syncok, wcursyncup, wsyncdown - create curses
-        windows
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        WINDOW *newwin(
-@@ -75,11 +73,9 @@
-        void wsyncdown(WINDOW *win);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    - 
--
    
--
    newwin
    -+
    newwin
    -        Calling newwin creates and returns a pointer to a new win-
-        dow with the given number of lines and columns.  The upper
-        left-hand corner of the window is at
-@@ -94,16 +90,14 @@
-        newwin(0,0,0,0).
- 
- 
--
    
--
    delwin
    -+
    delwin
    -        Calling delwin deletes the named window, freeing all memo-
-        ry associated with it (it does not actually erase the win-
-        dow's screen image).  Subwindows must  be  deleted  before
-        the main window can be deleted.
- 
- 
--
    
--
    mvwin
    -+
    mvwin
    -        Calling mvwin moves the window so that the upper left-hand
-        corner is at position (x, y).  If the move would cause the
-        window to be off the screen, it is an error and the window
-@@ -111,8 +105,7 @@
-        avoided.
- 
- 
--
    
--
    subwin
    -+
    subwin
    -        Calling subwin creates and returns a pointer to a new win-
-        dow with the given number of lines, nlines,  and  columns,
-        ncols.   The  window  is at position (begin_y, begin_x) on
-@@ -123,8 +116,7 @@
-        the subwindow.
- 
- 
--
    
--
    derwin
    -+
    derwin
    -        Calling derwin is the same as calling subwin, except  that
-        begin_y and begin_x are relative to the origin of the win-
-        dow orig rather than the screen.  There is  no  difference
-@@ -137,37 +129,32 @@
-        physical position on the screen.
- 
- 
--
    
--
    dupwin
    -+
    dupwin
    -        Calling  dupwin  creates  an exact duplicate of the window
-        win.
- 
- 
--
    
--
    wsyncup
    -+
    wsyncup
    -        Calling wsyncup touches all locations in ancestors of  win
-        that  are changed in win.  If syncok is called with second
-        argument TRUE then wsyncup is called automatically whenev-
-        er there is a change in the window.
- 
- 
--
    
--
    wsyncdown
    -+
    wsyncdown
    -        The  wsyncdown  routine  touches each location in win that
-        has been touched in any of  its  ancestor  windows.   This
-        routine  is  called by wrefresh, so it should almost never
-        be necessary to call it manually.
- 
- 
--
    
--
    wcursyncup
    -+
    wcursyncup
    -        The routine wcursyncup updates the current cursor position
-        of  all the ancestors of the window to reflect the current
-        cursor position of the window.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        Routines that return an integer return the integer ERR up-
-        on  failure  and OK (SVr4 only specifies "an integer value
-        other than ERR") upon successful completion.
-@@ -223,16 +210,14 @@
-        been initialized, i.e., with initscr or newterm.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        If many small changes are made to the window, the  wsyncup
-        option could degrade performance.
- 
-        Note that syncok may be a macro.
- 
- 
--
    
--
    BUGS
    -+
    BUGS
    -        The  subwindow  functions (subwin, derwin, mvderwin, wsyn-
-        cup, wsyncdown, wcursyncup, syncok) are flaky, incomplete-
-        ly implemented, and not well tested.
-@@ -246,14 +231,12 @@
-        may result in slower updates.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        The  XSI  Curses  standard,  Issue 4 describes these func-
-        tions.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), curs_refresh(3x),  curs_touch(3x),  curs_vari-
-        ables(3x)
- 
-Index: doc/html/man/default_colors.3x.html
---- ncurses-6.0-20160123+/doc/html/man/default_colors.3x.html	2015-05-13 19:27:46.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/default_colors.3x.html	2016-01-30 19:24:54.000000000 +0000
-@@ -46,22 +46,19 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        use_default_colors, assume_default_colors - use terminal's
-        default colors
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int use_default_colors(void);
-        int assume_default_colors(int fg, int bg);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The use_default_colors() and assume_default_colors() func-
-        tions are extensions to the curses library.  They are used
-        with terminals that support ISO 6429 color, or equivalent.
-@@ -110,8 +107,7 @@
-        black background for color pair 0.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        These functions return the integer ERR upon failure and OK
-        on success.  They will fail if either  the  terminal  does
-        not  support  the orig_pair or orig_colors capability.  If
-@@ -119,8 +115,7 @@
-        an error as well.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        Associated  with  this  extension,  the init_pair function
-        accepts negative arguments to specify  default  foreground
-        or background colors.
-@@ -149,21 +144,18 @@
-        setting specific values.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These routines are specific to  ncurses.   They  were  not
-        supported  on  Version 7, BSD or System V implementations.
-        It is recommended that any code depending on them be  con-
-        ditioned using NCURSES_VERSION.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curs_color(3x), ded(1).
- 
- 
--
    
--
    AUTHOR
    -+
    AUTHOR
    -        Thomas  Dickey  (from  an analysis of the requirements for
-        color xterm for XFree86 3.1.2C, February 1996).
- 
-Index: doc/html/man/define_key.3x.html
---- ncurses-6.0-20160123+/doc/html/man/define_key.3x.html	2015-05-13 19:27:46.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/define_key.3x.html	2016-01-30 19:24:54.000000000 +0000
-@@ -46,20 +46,17 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        define_key - define a keycode
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int define_key(const char *definition, int keycode);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        This is an extension to the curses library.  It permits an
-        application to define keycodes  with  their  corresponding
-        control  strings,  so that the ncurses library will inter-
-@@ -72,8 +69,7 @@
-        definition is removed.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        The keycode must be greater than zero, and the string non-
-        null, otherwise ERR is returned.  ERR may also be returned
-        if there is insufficient memory to allocate  the  data  to
-@@ -81,21 +77,18 @@
-        returned.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These routines are specific to  ncurses.   They  were  not
-        supported  on  Version 7, BSD or System V implementations.
-        It is recommended that any code depending on them be  con-
-        ditioned using NCURSES_VERSION.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        keyok(3x), key_defined(3x).
- 
- 
--
    
--
    AUTHOR
    -+
    AUTHOR
    -        Thomas Dickey.
- 
- 
-Index: doc/html/man/form.3x.html
---- ncurses-6.0-20160123+/doc/html/man/form.3x.html	2015-12-06 00:26:48.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/form.3x.html	2016-01-30 19:24:55.000000000 +0000
-@@ -46,18 +46,15 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        form - curses extension for programming forms
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <form.h>
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The  form library provides terminal-independent facilities
-        for composing form screens  on  character-cell  terminals.
-        The  library  includes:  field  routines, which create and
-@@ -78,8 +75,7 @@
-        called before using any of these functions.
- 
- 
--
    
--
    Current Default Values for Field Attributes
    -+
    Current Default Values for Field Attributes
    -        The form library  maintains  a  default  value  for  field
-        attributes.   You  can  get or set this default by calling
-        the appropriate set_ or  retrieval  routine  with  a  NULL
-@@ -88,8 +84,7 @@
-        rendering of fields already created.
- 
- 
--
    
--
    Routine Name Index
    -+
    Routine Name Index
    -        The  following  table lists each form routine and the name
-        of the manual page on which it is described.
- 
-@@ -172,8 +167,7 @@
-        unpost_form            form_post(3x)
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        Routines that return pointers return NULL  on  error,  and
-        set  errno  to  the  corresponding  error-code returned by
-        functions returning an integer.  Routines that  return  an
-@@ -217,8 +211,7 @@
-             The form driver code saw an unknown request code.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <form.h> automatically includes the header
-        files <curses.h> and <eti.h>.
- 
-@@ -228,24 +221,21 @@
-        using most linkers).
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  routines  emulate the System V forms library.  They
-        were not supported on Version 7 or BSD versions.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen Pfeifer.  Manual pages and adaptation for  ncurses
-        by Eric S. Raymond.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x) and related pages whose names begin "form_" for
-        detailed descriptions of the entry points.
- 
--       This describes ncurses version 6.0 (patch 20151205).
-+       This describes ncurses version 6.0 (patch 20160130).
- 
- 
- 
-Index: doc/html/man/form_cursor.3x.html
---- ncurses-6.0-20160123+/doc/html/man/form_cursor.3x.html	2015-12-06 00:26:48.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/form_cursor.3x.html	2016-01-30 19:24:55.000000000 +0000
-@@ -46,19 +46,16 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        pos_form_cursor - position a form window cursor
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <form.h>
-        int pos_form_cursor(FORM *form);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The  function  pos_form_cursor  restores the cursor to the
-        position required for the forms driver  to  continue  pro-
-        cessing  requests.   This  is useful after curses routines
-@@ -66,8 +63,7 @@
-        form operation.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        This routine returns one of the following:
- 
-        E_OK The routine succeeded.
-@@ -83,25 +79,21 @@
-             System error occurred (see errno).
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), form(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <form.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  routines  emulate the System V forms library.  They
-        were not supported on Version 7 or BSD versions.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/form_data.3x.html
---- ncurses-6.0-20160123+/doc/html/man/form_data.3x.html	2015-12-06 00:26:48.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/form_data.3x.html	2016-01-30 19:24:55.000000000 +0000
-@@ -46,21 +46,18 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        data_ahead,  data_behind  -  test  for  off-screen data in
-        given forms
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <form.h>
-        bool data_ahead(const FORM *form);
-        bool data_behind(const FORM *form);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The function data_ahead tests whether there is  off-screen
-        data  ahead  in  the  given  form.  It returns TRUE (1) or
-        FALSE (0).
-@@ -70,25 +67,21 @@
-        FALSE (0).
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), form(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <form.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  routines  emulate the System V forms library.  They
-        were not supported on Version 7 or BSD versions.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/form_driver.3x.html
---- ncurses-6.0-20160123+/doc/html/man/form_driver.3x.html	2015-12-06 00:26:48.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/form_driver.3x.html	2016-01-30 19:24:55.000000000 +0000
-@@ -45,24 +45,20 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        form_driver,  form_driver_w  -  command-processing loop of
-        the form system
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <form.h>
-        int form_driver(FORM *form, int c);
-        int form_driver_w(FORM *form, int c, wchar_t wch);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    - 
--
    
--
    form_driver
    -+
    form_driver
    -        Once a form has been posted (displayed), you should funnel
-        input  events to it through form_driver.  This routine has
-        three major input cases:
-@@ -80,8 +76,7 @@
-            an mouse event.
- 
- 
--
    
--
    form_driver_w
    -+
    form_driver_w
    -        This extension simplifies the use  of  the  forms  library
-        using  wide characters.  The input is either a key code (a
-        request) or a wide character returned by get_wch(3x).  The
-@@ -90,8 +85,7 @@
-        request.
- 
- 
--
    
--
    Form-driver requests
    -+
    Form-driver requests
    -        The form driver requests are as follows:
- 
-        Name               Description
-@@ -162,8 +156,7 @@
-        that request is executed.
- 
- 
--
    
--
    Mouse handling
    -+
    Mouse handling
    -        If the second argument is the KEY_MOUSE special  key,  the
-        associated mouse event is translated into one of the above
-        pre-defined requests.  Currently only clicks in  the  user
-@@ -207,8 +200,7 @@
-        E_REQUEST_DENIED is returned.
- 
- 
--
    
--
    Application-defined commands
    -+
    Application-defined commands
    -        If the second argument is neither printable nor one of the
-        above  pre-defined form requests, the driver assumes it is
-        an application-specific command and returns E_UNKNOWN_COM-
-@@ -217,8 +209,7 @@
-        defined requests.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        form_driver returns one of the following error codes:
- 
-        E_OK The routine succeeded.
-@@ -247,25 +238,21 @@
-             The form driver code saw an unknown request code.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), form(3x), form_variables(3x), curs_getch(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <form.h> automatically includes the header
-        files <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These routines emulate the System V forms  library.   They
-        were not supported on Version 7 or BSD versions.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/form_field.3x.html
---- ncurses-6.0-20160123+/doc/html/man/form_field.3x.html	2015-05-13 19:27:46.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/form_field.3x.html	2016-01-30 19:24:55.000000000 +0000
-@@ -46,14 +46,12 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        form_field - make and break connections between fields and
-        forms
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <form.h>
-        int set_form_fields(FORM *form, FIELD **fields);
-        FIELD **form_fields(const FORM *form);
-@@ -61,8 +59,7 @@
-        int move_field(FIELD *field, int frow, int fcol);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The function set_form_fields  changes  the  field  pointer
-        array  of the given form.  The array must be terminated by
-        a NULL.
-@@ -77,8 +74,7 @@
-        be disconnected) to a specified location on the screen.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        The  function  form_fields returns a pointer (which may be
-        NULL).  It does not set errno.
- 
-@@ -104,19 +100,16 @@
-             System error occurred (see errno).
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), form(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <form.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These routines emulate the System V forms  library.   They
-        were not supported on Version 7 or BSD versions.
- 
-@@ -124,8 +117,7 @@
-        field_count error value as -1 (which is the value of ERR).
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/form_field_attributes.3x.html
---- ncurses-6.0-20160123+/doc/html/man/form_field_attributes.3x.html	2015-05-13 19:27:46.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/form_field_attributes.3x.html	2016-01-30 19:24:55.000000000 +0000
-@@ -46,14 +46,12 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        form_field_attributes  -  color  and attribute control for
-        form fields
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <form.h>
-        int set_field_fore(FIELD *field, chtype attr);
-        chtype field_fore(const FIELD *field);
-@@ -63,8 +61,7 @@
-        int field_pad(const FIELD *field);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The function set_field_fore sets the foreground  attribute
-        of  field. This is the highlight used to display the field
-        contents.  The function field_fore returns the  foreground
-@@ -80,8 +77,7 @@
-        form's pad character.  The default is a blank.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        These routines return one of the following:
- 
-        E_OK The routine succeeded.
-@@ -94,26 +90,22 @@
-             System error occurred (see errno).
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x) and related pages whose names begin "form_" for
-        detailed descriptions of the entry points.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <form.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  routines  emulate the System V forms library.  They
-        were not supported on Version 7 or BSD versions.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/form_field_buffer.3x.html
---- ncurses-6.0-20160123+/doc/html/man/form_field_buffer.3x.html	2015-05-13 19:27:46.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/form_field_buffer.3x.html	2016-01-30 19:24:55.000000000 +0000
-@@ -46,13 +46,11 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        form_field_buffer - field buffer control
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <form.h>
- 
-        int  set_field_buffer(FIELD  *field,  int  buf, const char
-@@ -63,8 +61,7 @@
-        int set_max_field(FIELD *field, int max);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The function set_field_buffer sets the numbered buffer  of
-        the given field to contain a given string:
- 
-@@ -112,8 +109,7 @@
-        size threshold for that field.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        The field_buffer function returns NULL on error.  It  sets
-        errno according to their success:
- 
-@@ -137,14 +133,12 @@
-             ment.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x) and related pages whose names begin "form_" for
-        detailed descriptions of the entry points.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <form.h> automatically includes the header
-        file
- 
-@@ -155,14 +149,12 @@
-        fer to return the same buffer.  <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  routines  emulate the System V forms library.  They
-        were not supported on Version 7 or BSD versions.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/form_field_info.3x.html
---- ncurses-6.0-20160123+/doc/html/man/form_field_info.3x.html	2015-12-06 00:26:48.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/form_field_info.3x.html	2016-01-30 19:24:55.000000000 +0000
-@@ -46,14 +46,12 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        dynamic_field_info, field_info - retrieve field character-
-        istics
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <form.h>
-        int field_info(const FIELD *field, int *rows, int *cols,
-                      int *frow, int *fcol, int *nrow, int *nbuf);
-@@ -61,8 +59,7 @@
-        *cols, int *max);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The  function  field_info  returns  the  sizes  and  other
-        attributes passed in to the field at  its  creation  time.
-        The  attributes are: height, width, row of upper-left cor-
-@@ -76,8 +73,7 @@
-        turning off the O_STATIC option with field_opts_off.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        These routines return one of the following:
- 
-        E_OK The routine succeeded.
-@@ -90,20 +86,17 @@
-             ment.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x) and related pages whose names begin "form_" for
-        detailed descriptions of the entry points.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <form.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These routines emulate the System V forms  library.   They
-        were not supported on Version 7 or BSD versions.
- 
-@@ -112,8 +105,7 @@
-        allow this, e.g., Solaris 2.7 does not.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/form_field_just.3x.html
---- ncurses-6.0-20160123+/doc/html/man/form_field_just.3x.html	2015-12-06 00:26:48.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/form_field_just.3x.html	2016-01-30 19:24:55.000000000 +0000
-@@ -46,29 +46,25 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        set_field_just,  field_just  - retrieve field characteris-
-        tics
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <form.h>
-        int set_field_just(FIELD *field, int justification);
-        int field_just(const FIELD *field);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The  function  set_field_just   sets   the   justification
-        attribute  of a field; field_just returns a field's justi-
-        fication attribute.  The attribute may be one of NO_JUSTI-
-        FICATION, JUSTIFY_RIGHT, JUSTIFY_LEFT, or JUSTIFY_CENTER.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        The  function field_just returns one of: NO_JUSTIFICATION,
-        JUSTIFY_RIGHT, JUSTIFY_LEFT, or JUSTIFY_CENTER.
- 
-@@ -84,26 +80,22 @@
-             ment.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x) and related pages whose names begin "form_" for
-        detailed descriptions of the entry points.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <form.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  routines  emulate the System V forms library.  They
-        were not supported on Version 7 or BSD versions.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/form_field_new.3x.html
---- ncurses-6.0-20160123+/doc/html/man/form_field_new.3x.html	2015-12-06 00:26:48.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/form_field_new.3x.html	2016-01-30 19:24:55.000000000 +0000
-@@ -46,14 +46,12 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        new_field,  dup_field, link_field, free_field - create and
-        destroy form fields
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <form.h>
-        FIELD *new_field(int height, int width,
-                         int toprow, int leftcol,
-@@ -63,8 +61,7 @@
-        int free_field(FIELD *field);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The function new_field allocates a new field and  initial-
-        izes  it  from the parameters given: height, width, row of
-        upper-left corner, column  of  upper-left  corner,  number
-@@ -85,8 +82,7 @@
-        with a field.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        The function, new_field, dup_field, link_field return NULL
-        on error.  They set errno according to their success:
- 
-@@ -111,19 +107,16 @@
-             field is connected.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), form(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <form.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  routines  emulate the System V forms library.  They
-        were not supported on Version 7 or BSD versions.
- 
-@@ -133,8 +126,7 @@
-        what does not.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/form_field_opts.3x.html
---- ncurses-6.0-20160123+/doc/html/man/form_field_opts.3x.html	2015-12-06 00:26:48.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/form_field_opts.3x.html	2016-01-30 19:24:55.000000000 +0000
-@@ -46,14 +46,12 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        set_field_opts,  field_opts_on, field_opts_off, field_opts
-        - set and get field options
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <form.h>
-        int set_field_opts(FIELD *field, Field_Options opts);
-        int field_opts_on(FIELD *field, Field_Options opts);
-@@ -61,8 +59,7 @@
-        Field_Options field_opts(const FIELD *field);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The function set_field_opts sets  all  the  given  field's
-        option  bits  (field  option  bits  may be logically-OR'ed
-        together).
-@@ -128,8 +125,7 @@
-             which is normally discarded.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        Except for field_opts, each routine  returns  one  of  the
-        following:
- 
-@@ -146,25 +142,21 @@
-             System error occurred (see errno).
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), form(3x).  form_field_just(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <form.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  routines  emulate the System V forms library.  They
-        were not supported on Version 7 or BSD versions.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/form_field_userptr.3x.html
---- ncurses-6.0-20160123+/doc/html/man/form_field_userptr.3x.html	2015-12-06 00:26:48.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/form_field_userptr.3x.html	2016-01-30 19:24:55.000000000 +0000
-@@ -46,47 +46,40 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        set_field_userptr,  field_userptr  - associate application
-        data with a form field
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <form.h>
-        int set_field_userptr(FIELD *field, void*userptr);
-        void *field_userptr(const FIELD *field);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        Every form field has a field that  can  be  used  to  hold
-        application-specific  data  (that is, the form-driver code
-        leaves it alone).  These functions get and set that field.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        The function field_userptr returns a pointer (which may be
-        NULL).  It does not set errno.
- 
-        The function set_field_userptr returns E_OK (success).
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), form(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <form.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These routines emulate the System V forms  library.   They
-        were not supported on Version 7 or BSD versions.
- 
-@@ -94,8 +87,7 @@
-        it as a char pointer for SVr4 compatibility.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/form_field_validation.3x.html
---- ncurses-6.0-20160123+/doc/html/man/form_field_validation.3x.html	2015-05-13 19:27:47.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/form_field_validation.3x.html	2016-01-30 19:24:55.000000000 +0000
-@@ -45,13 +45,11 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        form_field_validation - data type validation for fields
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <form.h>
-        int set_field_type(FIELD *field, FIELDTYPE *type, ...);
-        FIELDTYPE *field_type(const FIELD *field);
-@@ -66,8 +64,7 @@
-        FIELDTYPE *TYPE_IPV4;
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The  function  set_field_type  declares  a data type for a
-        given form field.  This is the type checked by  validation
-        functions.  The predefined types are as follows:
-@@ -148,8 +145,7 @@
-        types.  See the form_fieldtype(3x) manual page.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        The  functions  field_type  and  field_arg  return NULL on
-        error. The function set_field_type returns one of the fol-
-        lowing:
-@@ -160,25 +156,21 @@
-             System error occurred (see errno).
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), form(3x), form_variables(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <form.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These routines emulate the System V forms  library.   They
-        were not supported on Version 7 or BSD versions.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/form_fieldtype.3x.html
---- ncurses-6.0-20160123+/doc/html/man/form_fieldtype.3x.html	2015-05-13 19:27:47.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/form_fieldtype.3x.html	2016-01-30 19:24:55.000000000 +0000
-@@ -46,13 +46,11 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        form_fieldtype - define validation-field types
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <form.h>
-        FIELDTYPE *new_fieldtype(
-            bool (* const field_check)(FIELD *, const void *),
-@@ -71,8 +69,7 @@
-                                  FIELDTYPE *type2);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The function new_fieldtype creates a new field type usable
-        for data validation.  You supply it  with  field_check,  a
-        predicate  to check the validity of an entered data string
-@@ -118,8 +115,7 @@
-        arguments.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        The  pointer-valued  routines  return NULL on error.  They
-        set errno according to their success:
- 
-@@ -151,13 +147,11 @@
-             System error occurred (see errno).
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), form(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <form.h> automatically includes the header
-        file <curses.h>.
- 
-@@ -166,14 +160,12 @@
-        for strict compatibility with System V.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These routines emulate the System V forms  library.   They
-        were not supported on Version 7 or BSD versions.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/form_hook.3x.html
---- ncurses-6.0-20160123+/doc/html/man/form_hook.3x.html	2015-05-13 19:27:47.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/form_hook.3x.html	2016-01-30 19:24:55.000000000 +0000
-@@ -46,14 +46,12 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        form_hook - set hooks for automatic invocation by applica-
-        tions
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <form.h>
-        int set_field_init(FORM *form, Form_Hook func);
-        Form_Hook field_init(const FORM *form);
-@@ -65,8 +63,7 @@
-        Form_Hook form_term(const FORM *form);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        These functions make it possible to set hook functions  to
-        be called at various points in the automatic processing of
-        input event codes by form_driver.
-@@ -92,8 +89,7 @@
-        any (NULL if there is no such hook).
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        Routines that return pointers return NULL on error.  Other
-        routines return one of the following:
- 
-@@ -103,25 +99,21 @@
-             System error occurred (see errno).
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), form(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <form.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These routines emulate the System V forms  library.   They
-        were not supported on Version 7 or BSD versions.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/form_new.3x.html
---- ncurses-6.0-20160123+/doc/html/man/form_new.3x.html	2015-12-06 00:26:48.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/form_new.3x.html	2016-01-30 19:24:55.000000000 +0000
-@@ -46,20 +46,17 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        new_form, free_form - create and destroy forms
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <form.h>
-        FORM *new_form(FIELD **fields);
-        int free_form(FORM *form);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The  function  new_form  creates a new form connected to a
-        specified field pointer array (which must  be  NULL-termi-
-        nated).
-@@ -68,8 +65,7 @@
-        array and frees the storage allocated for the form.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        The function new_form returns  NULL  on  error.   It  sets
-        errno according to the function's success:
- 
-@@ -97,25 +93,21 @@
-             The form has already been posted.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), form(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <form.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These routines emulate the System V forms  library.   They
-        were not supported on Version 7 or BSD versions.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/form_new_page.3x.html
---- ncurses-6.0-20160123+/doc/html/man/form_new_page.3x.html	2015-12-06 00:26:49.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/form_new_page.3x.html	2016-01-30 19:24:55.000000000 +0000
-@@ -46,20 +46,17 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        set_new_page, new_page - form pagination functions
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <form.h>
-        int set_new_page(FIELD *field, bool new_page_flag);
-        bool new_page(const FIELD *field);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The  function  set_new_page  sets or resets a flag marking
-        the given field as the beginning of  a  new  page  on  its
-        form.
-@@ -68,8 +65,7 @@
-        given field marks a page beginning on its form.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        The function new_page returns TRUE or FALSE.
- 
-        The function set_new_page return one of the following:
-@@ -83,26 +79,22 @@
-             The given field is already connected to a form.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x) and related pages whose names begin "form_" for
-        detailed descriptions of the entry points.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <form.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These routines emulate the System V forms  library.   They
-        were not supported on Version 7 or BSD versions.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/form_opts.3x.html
---- ncurses-6.0-20160123+/doc/html/man/form_opts.3x.html	2015-12-06 00:26:49.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/form_opts.3x.html	2016-01-30 19:24:56.000000000 +0000
-@@ -46,14 +46,12 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        set_form_opts,  form_opts_on,  form_opts_off,  form_opts -
-        set and get form options
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <form.h>
-        int set_form_opts(FORM *form, Field_Options opts);
-        int form_opts_on(FORM *form, Field_Options opts);
-@@ -61,8 +59,7 @@
-        Field_Options form_opts(const FORM *form);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The function  set_form_opts  sets  all  the  given  form's
-        option  bits  (form  option  bits  may  be logically-OR'ed
-        together).
-@@ -89,8 +86,7 @@
-             the previous field.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        Except for form_opts, each routine returns one of the fol-
-        lowing:
- 
-@@ -100,25 +96,21 @@
-             System error occurred (see errno).
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), form(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <form.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  routines  emulate the System V forms library.  They
-        were not supported on Version 7 or BSD versions.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/form_page.3x.html
---- ncurses-6.0-20160123+/doc/html/man/form_page.3x.html	2015-05-13 19:27:47.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/form_page.3x.html	2016-01-30 19:24:56.000000000 +0000
-@@ -46,13 +46,11 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        form_page - set and get form page number
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <form.h>
-        int set_current_field(FORM *form, FIELD *field);
-        FIELD *current_field(const FORM *);
-@@ -61,8 +59,7 @@
-        int field_index(const FIELD *field);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The  function  set_current field sets the current field of
-        the given form; current_field returns the current field of
-        the given form.
-@@ -79,8 +76,7 @@
-        not connected.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        Except for form_page, each routine returns one of the fol-
-        lowing:
- 
-@@ -104,25 +100,21 @@
-             System error occurred (see errno).
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), form(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <form.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These routines emulate the System V forms  library.   They
-        were not supported on Version 7 or BSD versions.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/form_post.3x.html
---- ncurses-6.0-20160123+/doc/html/man/form_post.3x.html	2015-12-06 00:26:49.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/form_post.3x.html	2016-01-30 19:24:56.000000000 +0000
-@@ -46,21 +46,18 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        post_form, unpost_form - write or erase forms from associ-
-        ated subwindows
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <form.h>
-        int post_form(FORM *form);
-        int unpost_form(FORM *form);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The function post_form displays a form to  its  associated
-        subwindow.   To trigger physical display of the subwindow,
-        use  refresh  or  some  equivalent  curses  routine   (the
-@@ -71,8 +68,7 @@
-        subwindow.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        These routines return one of the following:
- 
-        E_OK The routine succeeded.
-@@ -101,25 +97,21 @@
-             System error occurred (see errno).
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), form(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <form.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These routines emulate the System V forms  library.   They
-        were not supported on Version 7 or BSD versions.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/form_requestname.3x.html
---- ncurses-6.0-20160123+/doc/html/man/form_requestname.3x.html	2015-12-06 00:26:49.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/form_requestname.3x.html	2016-01-30 19:24:56.000000000 +0000
-@@ -46,21 +46,18 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        form_request_by_name, form_request_name - handle printable
-        form request names
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <form.h>
-        const char *form_request_name(int request);
-        int form_request_by_name(const char *name);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The function form_request_name returns the printable  name
-        of a form request code.
-        The function form_request_by_name searches in the name-ta-
-@@ -68,35 +65,30 @@
-        request code. Otherwise E_NO_MATCH is returned.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        form_request_name  returns NULL on error and sets errno to
-        E_BAD_ARGUMENT.
-        form_request_by_name returns E_NO_MATCH on error.  It does
-        not set errno.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), form(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <form.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These routines are specific to  ncurses.   They  were  not
-        supported  on  Version 7, BSD or System V implementations.
-        It is recommended that any code depending on them be  con-
-        ditioned using NCURSES_VERSION.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/form_userptr.3x.html
---- ncurses-6.0-20160123+/doc/html/man/form_userptr.3x.html	2015-12-06 00:26:49.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/form_userptr.3x.html	2016-01-30 19:24:56.000000000 +0000
-@@ -46,48 +46,41 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        set_form_userptr,  form_userptr  -  associate  application
-        data with a form item
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <form.h>
-        int set_form_userptr(FORM *form, void *userptr);
-        void* form_userptr(const FORM *form);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        Every form and every form item has a  field  that  can  be
-        used to hold application-specific data (that is, the form-
-        driver code leaves it alone).  These functions get and set
-        the form user pointer field.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        The  function form_userptr returns a pointer (which may be
-        NULL).  It does not set errno.
- 
-        The function set_form_userptr returns E_OK (success).
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), form(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <form.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  routines  emulate the System V forms library.  They
-        were not supported on Version 7 or BSD versions.
- 
-@@ -95,8 +88,7 @@
-        it as a char pointer for SVr4 compatibility.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/form_variables.3x.html
---- ncurses-6.0-20160123+/doc/html/man/form_variables.3x.html	2015-05-13 19:27:47.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/form_variables.3x.html	2016-01-30 19:24:56.000000000 +0000
-@@ -45,15 +45,13 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        TYPE_ALNUM, TYPE_ALPHA, TYPE_ENUM, TYPE_INTEGER,
-        TYPE_IPV4, TYPE_NUMERIC, TYPE_REGEXP - form system global
-        variables
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <form.h>
- 
-        FIELDTYPE * TYPE_ALNUM;
-@@ -65,58 +63,48 @@
-        FIELDTYPE * TYPE_REGEXP;
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        These  are  building blocks for the form library, defining
-        fields that can be created using form_fieldtype(3x).   Each
-        provides  functions  for  field- and character-validation,
-        according to the given datatype.
- 
- 
--
    
--
    TYPE_ALNUM
    -+
    TYPE_ALNUM
    -        This holds alphanumeric data.
- 
- 
--
    
--
    TYPE_ALPHA
    -+
    TYPE_ALPHA
    -        This holds alphabetic data.
- 
- 
--
    
--
    TYPE_ENUM
    -+
    TYPE_ENUM
    -        This holds an enumerated type.
- 
- 
--
    
--
    TYPE_INTEGER
    -+
    TYPE_INTEGER
    -        This holds a decimal integer.
- 
- 
--
    
--
    TYPE_IPV4
    -+
    TYPE_IPV4
    -        This holds an IPv4 internet address, e.g., "127.0.0.1".
- 
- 
--
    
--
    TYPE_NUMERIC
    -+
    TYPE_NUMERIC
    -        This holds a decimal number, with optional sign and  deci-
-        mal point.
- 
- 
--
    
--
    TYPE_REGEXP
    -+
    TYPE_REGEXP
    -        This holds a regular expression.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        The  TYPE_IPV4  variable  is  an extension not provided by
-        older implementations of the form library.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        form(3x).
- 
- 
-Index: doc/html/man/form_win.3x.html
---- ncurses-6.0-20160123+/doc/html/man/form_win.3x.html	2015-05-13 19:27:47.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/form_win.3x.html	2016-01-30 19:24:56.000000000 +0000
-@@ -46,14 +46,12 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        form_win  - make and break form window and subwindow asso-
-        ciations
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <form.h>
-        int set_form_win(FORM *form, WINDOW *win);
-        WINDOW *form_win(const FORM *form);
-@@ -62,8 +60,7 @@
-        int scale_form(const FORM *form, int *rows, int *columns);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        Every form has an associated pair of curses windows.   The
-        form  window displays any title and border associated with
-        the window; the form subwindow displays the items  of  the
-@@ -82,8 +79,7 @@
-        for the subwindow of form.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        Routines  that return pointers return NULL on error.  Rou-
-        tines that return an integer return one of  the  following
-        error codes:
-@@ -104,25 +100,21 @@
-             No items are connected to the form.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), curs_variables(3x), form(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <form.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  routines  emulate the System V forms library.  They
-        were not supported on Version 7 or BSD versions.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/infocmp.1m.html
---- ncurses-6.0-20160123+/doc/html/man/infocmp.1m.html	2015-12-06 00:26:49.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/infocmp.1m.html	2016-01-30 19:24:56.000000000 +0000
-@@ -46,21 +46,18 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        infocmp - compare or print out terminfo descriptions
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        infocmp [-1CDEFGIKLTUVcdegilnpqrtux]
-              [-v n] [-s d| i| l| c] [-Q n] [-R subset]
-              [-w width] [-A directory] [-B directory]
-              [termname...]
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        infocmp  can  be  used  to compare a binary terminfo entry
-        with other terminfo entries, rewrite a  terminfo  descrip-
-        tion  to  take  advantage  of  the use= terminfo field, or
-@@ -70,15 +67,13 @@
-        fields, followed by the string fields.
- 
- 
--
    
--
    Default Options
    -+
    Default Options
    -        If  no options are specified and zero or one termnames are
-        specified, the -I option will be assumed.   If  more  than
-        one termname is specified, the -d option will be assumed.
- 
- 
--
    
--
    Comparison Options [-d] [-c] [-n]
    -+
    Comparison Options [-d] [-c] [-n]
    -        infocmp  compares  the  terminfo  description of the first
-        terminal termname with each of the descriptions  given  by
-        the  entries  for  the  other  terminal's termnames.  If a
-@@ -104,8 +99,7 @@
-        anything was left out of a description.
- 
- 
--
    
--
    Source Listing Options [-I] [-L] [-C] [-r]
    -+
    Source Listing Options [-I] [-L] [-C] [-r]
    -        The  -I,  -L, and -C options will produce a source listing
-        for each terminal named.
- 
-@@ -175,8 +169,7 @@
-      %p2 is printed before %p1   %r        hp
- 
- 
--
    
--
    Use= Option [-u]
    -+
    Use= Option [-u]
    -        The -u option produces a terminfo  source  description  of
-        the  first  terminal termname which is relative to the sum
-        of the descriptions given by the  entries  for  the  other
-@@ -245,8 +238,7 @@
-        ated by different people.
- 
- 
--
    
--
    Other Options
    -+
    Other Options
    -        -0   causes the fields to be printed on one line,  without
-             wrapping.
- 
-@@ -457,14 +449,12 @@
-             can be loaded using the -x option of tic.
- 
- 
--
    
--
    FILES
    -+
    FILES
    -        /usr/share/terminfo Compiled  terminal  description  data-
-                            base.
- 
- 
--
    
--
    EXTENSIONS
    -+
    EXTENSIONS
    -        The  -0,  -1,  -E, -F, -G, -R, -T, -V, -a, -e, -f, -g, -i,
-        -l, -p, -q and  -t  options  are  not  supported  in  SVr4
-        curses.
-@@ -475,23 +465,20 @@
-        -RBSD.
- 
- 
--
    
--
    BUGS
    -+
    BUGS
    -        The -F option of infocmp(1m) should be a toe(1m) mode.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        captoinfo(1m),    infotocap(1m),     tic(1m),     toe(1m),
-        curses(3x), terminfo(5).
- 
-        http://invisible-island.net/ncurses/tctest.html
- 
--       This describes ncurses version 6.0 (patch 20151205).
-+       This describes ncurses version 6.0 (patch 20160130).
- 
- 
--
    
--
    AUTHOR
    -+
    AUTHOR
    -        Eric S. Raymond <esr@snark.thyrsus.com> and
-        Thomas E. Dickey <dickey@invisible-island.net>
- 
-Index: doc/html/man/infotocap.1m.html
---- ncurses-6.0-20160123+/doc/html/man/infotocap.1m.html	2015-12-06 00:26:49.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/infotocap.1m.html	2016-01-30 19:24:56.000000000 +0000
-@@ -46,19 +46,16 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        infotocap  - convert a terminfo description into a termcap
-        description
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        infotocap [-vn width]  [-V] [-1] [-w width] file . . .
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        infotocap looks in  each  given  text  file  for  terminfo
-        descriptions.   For  each  terminfo  description found, an
-        equivalent termcap description is written to standard out-
-@@ -78,27 +75,23 @@
-        -w   change the output to width characters.
- 
- 
--
    
--
    FILES
    -+
    FILES
    -        /usr/share/terminfo Compiled  terminal  description  data-
-                            base.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        This  utility  is  actually  a  link to tic, running in -C
-        mode.  You can use other tic options such as -f and  -x.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), tic(1m), infocmp(1m), terminfo(5)
- 
--       This describes ncurses version 6.0 (patch 20151205).
-+       This describes ncurses version 6.0 (patch 20160130).
- 
- 
--
    
--
    AUTHOR
    -+
    AUTHOR
    -        Eric S. Raymond <esr@snark.thyrsus.com> and
-        Thomas E. Dickey <dickey@invisible-island.net>
- 
-Index: doc/html/man/key_defined.3x.html
---- ncurses-6.0-20160123+/doc/html/man/key_defined.3x.html	2015-05-13 19:27:48.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/key_defined.3x.html	2016-01-30 19:24:56.000000000 +0000
-@@ -46,48 +46,41 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        key_defined - check if a keycode is defined
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int key_defined(const char *definition);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        This is an extension to the curses library.  It permits an
-        application to determine if a string is currently bound to
-        any keycode.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        If  the  string  is bound to a keycode, its value (greater
-        than zero) is returned.  If no keycode is bound,  zero  is
-        returned.   If  the  string  conflicts with longer strings
-        which are bound to keys, -1 is returned.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These routines are specific to  ncurses.   They  were  not
-        supported  on  Version 7, BSD or System V implementations.
-        It is recommended that any code depending on them be  con-
-        ditioned using NCURSES_VERSION.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        define_key(3x).
- 
- 
--
    
--
    AUTHOR
    -+
    AUTHOR
    -        Thomas Dickey.
- 
- 
-Index: doc/html/man/keybound.3x.html
---- ncurses-6.0-20160123+/doc/html/man/keybound.3x.html	2015-05-13 19:27:48.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/keybound.3x.html	2016-01-30 19:24:56.000000000 +0000
-@@ -46,27 +46,23 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        keybound - return definition of keycode
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        char * keybound(int keycode, int count);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        This is an extension to the curses library.  It permits an
-        application to determine the string which  is  defined  in
-        the terminfo for specific keycodes.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        The keycode parameter must be greater than zero, else NULL
-        is returned.  If it does not correspond to a defined  key,
-        then  NULL  is  returned.   The count parameter is used to
-@@ -75,21 +71,18 @@
-        returns a string which must be freed by the caller.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These routines are specific to  ncurses.   They  were  not
-        supported  on  Version 7, BSD or System V implementations.
-        It is recommended that any code depending on them be  con-
-        ditioned using NCURSES_VERSION.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        define_key(3x), keyok(3x).
- 
- 
--
    
--
    AUTHOR
    -+
    AUTHOR
    -        Thomas Dickey.
- 
- 
-Index: doc/html/man/keyok.3x.html
---- ncurses-6.0-20160123+/doc/html/man/keyok.3x.html	2015-05-13 19:27:48.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/keyok.3x.html	2016-01-30 19:24:56.000000000 +0000
-@@ -46,28 +46,24 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        keyok - enable or disable a keycode
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int keyok(int keycode, bool enable);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        This is an extension to the curses library.  It permits an
-        application to disable specific keycodes, rather than  use
-        the  keypad  function  to disable all keycodes.  Keys that
-        have been disabled can be re-enabled.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        The keycode  must  be  greater  than  zero,  else  ERR  is
-        returned.   If  it  does  not correspond to a defined key,
-        then ERR is returned.  If the enable  parameter  is  true,
-@@ -75,21 +71,18 @@
-        Otherwise, the function returns OK.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These routines are specific to  ncurses.   They  were  not
-        supported  on  Version 7, BSD or System V implementations.
-        It is recommended that any code depending on them be  con-
-        ditioned using NCURSES_VERSION.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        define_key(3x).
- 
- 
--
    
--
    AUTHOR
    -+
    AUTHOR
    -        Thomas Dickey.
- 
- 
-Index: doc/html/man/legacy_coding.3x.html
---- ncurses-6.0-20160123+/doc/html/man/legacy_coding.3x.html	2015-05-13 19:27:48.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/legacy_coding.3x.html	2016-01-30 19:24:56.000000000 +0000
-@@ -46,20 +46,17 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        use_legacy_coding - use terminal's default colors
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int use_legacy_coding(int level);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The  use_legacy_coding()  function  is an extension to the
-        curses library.  It allows the caller to change the result
-        of  unctrl, and suppress related checks within the library
-@@ -81,28 +78,24 @@
-                    is.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        If  the  screen  has  not  been  initialized, or the level
-        parameter is out of range, the function returns ERR.  Oth-
-        erwise, it returns the previous level: 0, 1 or 2.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        This routine is specific to ncurses.  It was not supported
-        on Version 7, BSD or System V implementations.  It is rec-
-        ommended  that any code depending on ncurses extensions be
-        conditioned using NCURSES_VERSION.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        unctrl.
- 
- 
--
    
--
    AUTHOR
    -+
    AUTHOR
    -        Thomas Dickey (to support lynx's font-switching feature).
- 
- 
-Index: doc/html/man/menu.3x.html
---- ncurses-6.0-20160123+/doc/html/man/menu.3x.html	2015-12-06 00:26:49.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/menu.3x.html	2016-01-30 19:24:56.000000000 +0000
-@@ -46,18 +46,15 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        menu - curses extension for programming menus
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <menu.h>
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The  menu library provides terminal-independent facilities
-        for composing menu systems  on  character-cell  terminals.
-        The library includes: item routines, which create and mod-
-@@ -71,8 +68,7 @@
-        library, link with the options -lmenu -lcurses.
- 
- 
--
    
--
    Current Default Values for Item Attributes
    -+
    Current Default Values for Item Attributes
    -        The  menu  library  maintains  a  default  value  for item
-        attributes.  You can get or set this  default  by  calling
-        the  appropriate  get_  or  set_  routine with a NULL item
-@@ -81,8 +77,7 @@
-        rendering of items already created.
- 
- 
--
    
--
    Routine Name Index
    -+
    Routine Name Index
    -        The following table lists each menu routine and  the  name
-        of the manual page on which it is described.
- 
-@@ -155,8 +150,7 @@
-        unpost_menu            menu_post(3x)
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        Routines  that return pointers return NULL on error.  Rou-
-        tines that return an integer return one of  the  following
-        error codes:
-@@ -199,8 +193,7 @@
-             The menu driver code saw an unknown request code.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <menu.h> automatically includes the header
-        files <curses.h> and <eti.h>.
- 
-@@ -210,24 +203,21 @@
-        error).
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  routines  emulate  the System V menu library.  They
-        were not supported on Version 7 or BSD versions.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen Pfeifer.  Manual pages and adaptation for  ncurses
-        by Eric S. Raymond.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x) and related pages whose names begin "menu_" for
-        detailed descriptions of the entry points.
- 
--       This describes ncurses version 6.0 (patch 20151205).
-+       This describes ncurses version 6.0 (patch 20160130).
- 
- 
- 
-Index: doc/html/man/menu_attributes.3x.html
---- ncurses-6.0-20160123+/doc/html/man/menu_attributes.3x.html	2015-12-06 00:26:49.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/menu_attributes.3x.html	2016-01-30 19:24:56.000000000 +0000
-@@ -46,15 +46,13 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        menu_back,  menu_fore, menu_grey, menu_pad, set_menu_back,
-        set_menu_fore, set_menu_grey,  set_menu_pad  -  color  and
-        attribute control for menus
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <menu.h>
-        int set_menu_fore(MENU *menu, chtype attr);
-        chtype menu_fore(const MENU *menu);
-@@ -66,8 +64,7 @@
-        int menu_pad(const MENU *menu);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The  function  set_menu_fore sets the foreground attribute
-        of menu. This is the  highlight  used  for  selected  menu
-        items.   menu_fore  returns the foreground attribute.  The
-@@ -91,8 +88,7 @@
-        The default is a blank.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        These routines return one of the following:
- 
-        E_OK The routine succeeded.
-@@ -105,26 +101,22 @@
-             ment.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x) and related pages whose names begin "menu_" for
-        detailed descriptions of the entry points.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <menu.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These routines emulate the System V  menu  library.   They
-        were not supported on Version 7 or BSD versions.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/menu_cursor.3x.html
---- ncurses-6.0-20160123+/doc/html/man/menu_cursor.3x.html	2015-12-06 00:26:50.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/menu_cursor.3x.html	2016-01-30 19:24:56.000000000 +0000
-@@ -46,27 +46,23 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        pos_menu_cursor - position a menu's cursor
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <menu.h>
-        int pos_menu_cursor(const MENU *menu);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The  function  pos_menu_cursor  restores the cursor to the
-        current position associated with the menu's selected item.
-        This  is  useful after curses routines have been called to
-        do screen-painting in response to a menu select.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        This routine returns one of the following:
- 
-        E_OK The routine succeeded.
-@@ -82,25 +78,21 @@
-             The menu has not been posted.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), menu(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <menu.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These routines emulate the System V  menu  library.   They
-        were not supported on Version 7 or BSD versions.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/menu_driver.3x.html
---- ncurses-6.0-20160123+/doc/html/man/menu_driver.3x.html	2015-05-13 19:27:48.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/menu_driver.3x.html	2016-01-30 19:24:56.000000000 +0000
-@@ -45,19 +45,16 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        menu_driver - command-processing loop of the menu system
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <menu.h>
-        int menu_driver(MENU *menu, int c);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        Once a menu has been posted (displayed), you should funnel
-        input events to it through menu_driver.  This routine  has
-        three major input cases:
-@@ -138,8 +135,7 @@
-        requests, the corresponding action is performed.
- 
- 
--
    
--
    MOUSE HANDLING
    -+
    MOUSE HANDLING
    -        If  the  second argument is the KEY_MOUSE special key, the
-        associated mouse event is translated into one of the above
-        pre-defined  requests.   Currently only clicks in the user
-@@ -183,8 +179,7 @@
-        E_REQUEST_DENIED is returned.
- 
- 
--
    
--
    APPLICATION-DEFINED COMMANDS
    -+
    APPLICATION-DEFINED COMMANDS
    -        If the second argument is neither printable nor one of the
-        above pre-defined menu requests or  KEY_MOUSE,  the  drive
-        assumes  it is an application-specific command and returns
-@@ -193,8 +188,7 @@
-        these pre-defined requests.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        menu_driver return one of the following error codes:
- 
-        E_OK The routine succeeded.
-@@ -223,26 +217,22 @@
-             The menu driver could not process the request.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), menu(3x), curs_getch(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <menu.h> automatically includes the header
-        files <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  routines  emulate  the System V menu library.  They
-        were not supported on Version 7 or BSD versions. The  sup-
-        port for mouse events is ncurses specific.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/menu_format.3x.html
---- ncurses-6.0-20160123+/doc/html/man/menu_format.3x.html	2015-12-06 00:26:50.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/menu_format.3x.html	2016-01-30 19:24:57.000000000 +0000
-@@ -46,20 +46,17 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        set_menu_format, menu_format - set and get menu sizes
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <menu.h>
-        int set_menu_format(MENU *menu, int rows, int cols);
-        void menu_format(const MENU *menu, int *rows, int *cols);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The function set_menu_format sets the maximum display size
-        of the given menu.  If this size is too small  to  display
-        all  menu items, the menu will be made scrollable. If this
-@@ -78,8 +75,7 @@
-        rows and cols.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        These routines returns one of the following:
- 
-        E_OK The routine succeeded.
-@@ -98,25 +94,21 @@
-             No items are connected to the menu.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), menu(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <menu.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These routines emulate the System V  menu  library.   They
-        were not supported on Version 7 or BSD versions.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/menu_hook.3x.html
---- ncurses-6.0-20160123+/doc/html/man/menu_hook.3x.html	2015-05-13 19:27:48.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/menu_hook.3x.html	2016-01-30 19:24:57.000000000 +0000
-@@ -46,14 +46,12 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        menu_hook - set hooks for automatic invocation by applica-
-        tions
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <menu.h>
-        int set_item_init(MENU *menu, Menu_Hook func);
-        Menu_Hook item_init(const MENU *menu);
-@@ -65,8 +63,7 @@
-        Menu_Hook menu_term(const MENU *menu);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        These functions make it possible to set hook functions  to
-        be called at various points in the automatic processing of
-        input event codes by menu_driver.
-@@ -92,8 +89,7 @@
-        menu term hook, if any (NULL if there is no such hook).
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        Routines that return pointers return NULL on error.  Other
-        routines return one of the following:
- 
-@@ -103,25 +99,21 @@
-             System error occurred (see errno).
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), menu(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <menu.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These routines emulate the System V  menu  library.   They
-        were not supported on Version 7 or BSD versions.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/menu_items.3x.html
---- ncurses-6.0-20160123+/doc/html/man/menu_items.3x.html	2015-12-06 00:26:50.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/menu_items.3x.html	2016-01-30 19:24:57.000000000 +0000
-@@ -46,22 +46,19 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        set_menu_items,  menu_items,  item_count  - make and break
-        connections between items and menus
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <menu.h>
-        int set_menu_items(MENU *menu, ITEM **items);
-        ITEM **menu_items(const MENU *menu);
-        int item_count(const MENU *menu);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The function set_menu_items changes the item pointer array
-        of  the  given  menu.   The  array must be terminated by a
-        NULL.
-@@ -73,8 +70,7 @@
-        menu.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        The function menu_items returns a pointer  (which  may  be
-        NULL).  It does not set errno.
- 
-@@ -100,19 +96,16 @@
-             System error occurred (see errno).
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), menu(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <menu.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  routines  emulate  the System V menu library.  They
-        were not supported on Version 7 or BSD versions.
- 
-@@ -120,8 +113,7 @@
-        item_count error value as -1 (which is the value of ERR).
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/menu_mark.3x.html
---- ncurses-6.0-20160123+/doc/html/man/menu_mark.3x.html	2015-12-06 00:26:50.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/menu_mark.3x.html	2016-01-30 19:24:57.000000000 +0000
-@@ -46,21 +46,18 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        set_menu_mark,  menu_mark  -  get  and  set  the menu mark
-        string
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <menu.h>
-        int set_menu_mark(MENU *menu, const char *mark);
-        const char *menu_mark(const MENU *menu);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        In order to make menu selections visible on  older  termi-
-        nals  without  highlighting  or color capability, the menu
-        library marks selected items  in  a  menu  with  a  prefix
-@@ -79,8 +76,7 @@
-        NULL if there is none).
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        The  function  menu_mark  returns  a pointer (which may be
-        NULL).  It does not set errno.
- 
-@@ -97,25 +93,21 @@
-             System error occurred (see errno).
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), menu(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <menu.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  routines  emulate  the System V menu library.  They
-        were not supported on Version 7 or BSD versions.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/menu_new.3x.html
---- ncurses-6.0-20160123+/doc/html/man/menu_new.3x.html	2015-12-06 00:26:50.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/menu_new.3x.html	2016-01-30 19:24:57.000000000 +0000
-@@ -46,20 +46,17 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        new_menu, free_menu - create and destroy menus
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <menu.h>
-        MENU *new_menu(ITEM **items);
-        int free_menu(MENU *menu);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The  function  new_menu  creates a new menu connected to a
-        specified item pointer array (which  must  be  NULL-termi-
-        nated).
-@@ -68,8 +65,7 @@
-        array and frees the storage allocated for the menu.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        The function new_menu returns  NULL  on  error.   It  sets
-        errno according to the function's failure:
- 
-@@ -94,25 +90,21 @@
-             The menu has already been posted.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), menu(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <menu.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  routines  emulate  the System V menu library.  They
-        were not supported on Version 7 or BSD versions.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/menu_opts.3x.html
---- ncurses-6.0-20160123+/doc/html/man/menu_opts.3x.html	2015-12-06 00:26:50.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/menu_opts.3x.html	2016-01-30 19:24:57.000000000 +0000
-@@ -46,14 +46,12 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        set_menu_opts,  menu_opts_on,  menu_opts_off,  menu_opts -
-        set and get menu options
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <menu.h>
-        int set_menu_opts(MENU *menu, Menu_Options opts);
-        int menu_opts_on(MENU *menu, Menu_Options opts);
-@@ -61,8 +59,7 @@
-        Menu_Options menu_opts(const MENU *menu);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The function  set_menu_opts  sets  all  the  given  menu's
-        option  bits  (menu  option  bits  may  be logically-OR'ed
-        together).
-@@ -100,8 +97,7 @@
-             requests to the other end of the menu.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        Except for menu_opts, each routine returns one of the fol-
-        lowing:
- 
-@@ -114,25 +110,21 @@
-             The menu is already posted.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), menu(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <menu.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These routines emulate the System V  menu  library.   They
-        were not supported on Version 7 or BSD versions.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/menu_pattern.3x.html
---- ncurses-6.0-20160123+/doc/html/man/menu_pattern.3x.html	2015-12-06 00:26:50.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/menu_pattern.3x.html	2016-01-30 19:24:57.000000000 +0000
-@@ -45,21 +45,18 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        set_menu_pattern, menu_pattern - set and get a menu's pat-
-        tern buffer
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <menu.h>
-        int set_menu_pattern(MENU *menu, const char *pattern);
-        char *menu_pattern(const MENU *menu);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        Every menu has an associated  pattern  match  buffer.   As
-        input  events  that are printable characters come in, they
-        are appended to this match buffer and tested for a  match,
-@@ -74,8 +71,7 @@
-        the given menu.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        The function menu_pattern returns a pointer, which is NULL
-        if the menu parameter is NULL.  Otherwise, it is a pointer
-        to a string which is empty if no pattern has been set.  It
-@@ -104,25 +100,21 @@
-             System error occurred (see errno).
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), menu(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <menu.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These routines emulate the System V  menu  library.   They
-        were not supported on Version 7 or BSD versions.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/menu_post.3x.html
---- ncurses-6.0-20160123+/doc/html/man/menu_post.3x.html	2015-12-06 00:26:50.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/menu_post.3x.html	2016-01-30 19:24:57.000000000 +0000
-@@ -46,21 +46,18 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        post_menu, unpost_menu - write or erase menus from associ-
-        ated subwindows
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <menu.h>
-        int post_menu(MENU *menu);
-        int unpost_menu(MENU *menu);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The function post_menu displays a menu to  its  associated
-        subwindow.   To trigger physical display of the subwindow,
-        use  refresh  or  some  equivalent  curses  routine   (the
-@@ -72,8 +69,7 @@
-        subwindow.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        These routines return one of the following:
- 
-        E_OK The routine succeeded.
-@@ -103,25 +99,21 @@
-             No items are connected to the menu.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), menu(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <menu.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These routines emulate the System V  menu  library.   They
-        were not supported on Version 7 or BSD versions.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/menu_requestname.3x.html
---- ncurses-6.0-20160123+/doc/html/man/menu_requestname.3x.html	2015-12-06 00:26:50.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/menu_requestname.3x.html	2016-01-30 19:24:57.000000000 +0000
-@@ -46,21 +46,18 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        menu_request_by_name, menu_request_name - handle printable
-        menu request names
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <menu.h>
-        const char *menu_request_name(int request);
-        int menu_request_by_name(const char *name);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The function menu_request_name returns the printable  name
-        of a menu request code.
-        The function menu_request_by_name searches in the name-ta-
-@@ -68,35 +65,30 @@
-        request code.  Otherwise E_NO_MATCH is returned.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        menu_request_name  returns NULL on error and sets errno to
-        E_BAD_ARGUMENT.
-        menu_request_by_name returns E_NO_MATCH on error.  It does
-        not set errno.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), menu(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <menu.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These routines are specific to  ncurses.   They  were  not
-        supported  on  Version 7, BSD or System V implementations.
-        It is recommended that any code depending on them be  con-
-        ditioned using NCURSES_VERSION.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/menu_spacing.3x.html
---- ncurses-6.0-20160123+/doc/html/man/menu_spacing.3x.html	2015-12-06 00:26:50.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/menu_spacing.3x.html	2016-01-30 19:24:57.000000000 +0000
-@@ -46,14 +46,12 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        set_menu_spacing,  menu_spacing  -  set  and  get  spacing
-        between menu items.
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <menu.h>
-        int set_menu_spacing(MENU *menu,
-                             int spc_description,
-@@ -65,8 +63,7 @@
-                         int* spc_columns);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The function set_menu_spacing sets the spacing information
-        for  the menu.  Its parameter spc_description controls the
-        number of spaces between an item name and an item descrip-
-@@ -86,34 +83,29 @@
-        simply not returned.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        Both  routines  return  E_OK on success.  set_menu_spacing
-        may return E_POSTED if the menu is posted, or  E_BAD_ARGU-
-        MENT if one of the spacing values is out of range.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), curs_variables(3x), menu(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <menu.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These routines are specific to  ncurses.   They  were  not
-        supported  on  Version 7, BSD or System V implementations.
-        It is recommended that any code depending on them be  con-
-        ditioned using NCURSES_VERSION.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/menu_userptr.3x.html
---- ncurses-6.0-20160123+/doc/html/man/menu_userptr.3x.html	2015-12-06 00:26:50.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/menu_userptr.3x.html	2016-01-30 19:24:57.000000000 +0000
-@@ -46,48 +46,41 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        set_menu_userptr,  menu_userptr  -  associate  application
-        data with a menu item
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <menu.h>
-        int set_menu_userptr(MENU *menu, void *userptr);
-        void *menu_userptr(const MENU *menu);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        Every menu and every menu item has a  field  that  can  be
-        used to hold application-specific data (that is, the menu-
-        driver code leaves it alone).  These functions get and set
-        the menu user pointer field.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        menu_userptr  returns  a  pointer (which may be NULL).  It
-        does not set errno.
- 
-        set_menu_userptr returns E_OK (success).
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), menu(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <menu.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  routines  emulate  the System V menu library.  They
-        were not supported on Version 7 or BSD versions.
- 
-@@ -95,8 +88,7 @@
-        it as a char pointer for SVr4 compatibility.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/menu_win.3x.html
---- ncurses-6.0-20160123+/doc/html/man/menu_win.3x.html	2015-05-13 19:27:49.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/menu_win.3x.html	2016-01-30 19:24:57.000000000 +0000
-@@ -46,14 +46,12 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        menu_win  - make and break menu window and subwindow asso-
-        ciations
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <menu.h>
-        int set_menu_win(MENU *menu, WINDOW *win);
-        WINDOW *menu_win(const MENU *menu);
-@@ -62,8 +60,7 @@
-        int scale_menu(const MENU *menu, int *rows, int *columns);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        Every menu has an associated pair of curses windows.   The
-        menu  window displays any title and border associated with
-        the window; the menu subwindow displays the items  of  the
-@@ -82,8 +79,7 @@
-        for the subwindow of menu.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        Routines  that return pointers return NULL on error.  Rou-
-        tines that return an integer return one of  the  following
-        error codes:
-@@ -104,25 +100,21 @@
-             No items are connected to the menu.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), curs_variables(3x), menu(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <menu.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  routines  emulate  the System V menu library.  They
-        were not supported on Version 7 or BSD versions.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/mitem_current.3x.html
---- ncurses-6.0-20160123+/doc/html/man/mitem_current.3x.html	2015-05-13 19:27:49.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/mitem_current.3x.html	2016-01-30 19:24:57.000000000 +0000
-@@ -46,13 +46,11 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        mitem_current - set and get current_menu_item
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <menu.h>
-        int set_current_item(MENU *menu, const ITEM *item);
-        ITEM *current_item(const MENU *menu);
-@@ -61,8 +59,7 @@
-        int item_index(const ITEM *item);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The  function  set_current_item sets the current item (the
-        item on  which  the  menu  cursor  is  positioned).   cur-
-        rent_item  returns  a  pointer  to the current item in the
-@@ -79,8 +76,7 @@
-        item in the menu's item pointer list.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        current_item returns a pointer (which may  be  NULL).   It
-        does not set errno.
- 
-@@ -107,19 +103,16 @@
-             System error occurred (see errno).
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), menu(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <menu.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These routines emulate the System V  menu  library.   They
-        were not supported on Version 7 or BSD versions.
- 
-@@ -128,8 +121,7 @@
-        ERR).
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/mitem_name.3x.html
---- ncurses-6.0-20160123+/doc/html/man/mitem_name.3x.html	2015-12-06 00:26:50.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/mitem_name.3x.html	2016-01-30 19:24:57.000000000 +0000
-@@ -46,52 +46,44 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        item_name,  item_description  -  get  menu  item  name and
-        description fields
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <menu.h>
-        const char *item_name(const ITEM *item);
-        const char *item_description(const ITEM *item);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The function item_name returns the name part of the  given
-        item.
-        The function item_description returns the description part
-        of the given item.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        These routines return a pointer (which may be NULL).  They
-        do not set errno.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), menu(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <menu.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These routines emulate the System V  menu  library.   They
-        were not supported on Version 7 or BSD versions.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen  Pfeifer.   Manual  pages  and  adaptation for new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/mitem_new.3x.html
---- ncurses-6.0-20160123+/doc/html/man/mitem_new.3x.html	2015-12-06 00:26:50.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/mitem_new.3x.html	2016-01-30 19:24:57.000000000 +0000
-@@ -46,20 +46,17 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        new_item, free_item - create and destroy menu items
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <menu.h>
-        ITEM *new_item(const char *name, const char *description);
-        int free_item(ITEM *item);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The function new_item allocates a new item and initializes
-        it from the name and description pointers.  Please  notice
-        that  the  item  stores  only the pointers to the name and
-@@ -72,8 +69,7 @@
-        item.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        The  function  new_item  returns  NULL  on error.  It sets
-        errno according to the function's failure:
- 
-@@ -99,25 +95,21 @@
-             System error occurred (see errno).
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), menu(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <menu.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  routines  emulate  the System V menu library.  They
-        were not supported on Version 7 or BSD versions.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/mitem_opts.3x.html
---- ncurses-6.0-20160123+/doc/html/man/mitem_opts.3x.html	2015-12-06 00:26:50.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/mitem_opts.3x.html	2016-01-30 19:24:57.000000000 +0000
-@@ -46,14 +46,12 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        set_item_opts,  item_opts_on,  item_opts_off,  item_opts -
-        set and get menu item options
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <menu.h>
-        int set_item_opts(ITEM *item, Item_Options opts);
-        int item_opts_on(ITEM *item, Item_Options opts);
-@@ -61,8 +59,7 @@
-        Item_Options item_opts(const ITEM *item);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The function  set_item_opts  sets  all  the  given  item's
-        option  bits  (menu  option  bits  may  be logically-OR'ed
-        together).
-@@ -81,8 +78,7 @@
-        cessing.  This option defaults to on.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        Except for item_opts, each routine returns one of the fol-
-        lowing:
- 
-@@ -92,25 +88,21 @@
-             System error occurred (see errno).
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), menu(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <menu.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  routines  emulate  the System V menu library.  They
-        were not supported on Version 7 or BSD versions.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/mitem_userptr.3x.html
---- ncurses-6.0-20160123+/doc/html/man/mitem_userptr.3x.html	2015-12-06 00:26:51.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/mitem_userptr.3x.html	2016-01-30 19:24:57.000000000 +0000
-@@ -46,47 +46,40 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        set_item_userptr,  item_userptr  -  associate  application
-        data with a menu item
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <menu.h>
-        int set_item_userptr(ITEM *item, void *userptr);
-        void *item_userptr(const ITEM *item);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        Every menu item has a field  that  can  be  used  to  hold
-        application-specific  data  (that is, the menu-driver code
-        leaves it alone).  These functions get and set that field.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        The function  item_userptr  returns  a  pointer  (possibly
-        NULL).  It does not set errno.
- 
-        The set_item_userptr always returns E_OK (success).
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), menu(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <menu.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These routines emulate the System V  menu  library.   They
-        were not supported on Version 7 or BSD versions.
- 
-@@ -94,8 +87,7 @@
-        it as a char pointer for SVr4 compatibility.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/mitem_value.3x.html
---- ncurses-6.0-20160123+/doc/html/man/mitem_value.3x.html	2015-12-06 00:26:51.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/mitem_value.3x.html	2016-01-30 19:24:57.000000000 +0000
-@@ -45,20 +45,17 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        set_item_value, item_value - set and get menu item values
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <menu.h>
-        int set_item_value(ITEM *item, bool value);
-        bool item_value(const ITEM *item);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        If  you  turn  off  the menu option O_ONEVALUE (e.g., with
-        set_menu_opts or menu_opts_off;  see  menu_opts(3x)),  the
-        menu becomes multi-valued; that is, more than one item may
-@@ -69,8 +66,7 @@
-        lect it (second argument FALSE).
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        The function set_item_value returns one of the following:
- 
-        E_OK The routine succeeded.
-@@ -82,25 +78,21 @@
-             The menu driver could not process the request.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), menu(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <menu.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  routines  emulate  the System V menu library.  They
-        were not supported on Version 7 or BSD versions.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/mitem_visible.3x.html
---- ncurses-6.0-20160123+/doc/html/man/mitem_visible.3x.html	2015-05-13 19:27:49.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/mitem_visible.3x.html	2016-01-30 19:24:58.000000000 +0000
-@@ -46,44 +46,37 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        mitem_visible - check visibility of a menu item
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <menu.h>
-        bool item_visible(const ITEM *item);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        A  menu  item  is  visible  when it is in the portion of a
-        posted menu that is mapped onto the screen (if the menu is
-        scrollable,  in  particular,  this portion will be smaller
-        than the whole menu).
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), menu(3x).
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header file <menu.h> automatically includes the header
-        file <curses.h>.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        These  routines  emulate  the System V menu library.  They
-        were not supported on Version 7 or BSD versions.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
-        curses by Eric S. Raymond.
- 
-Index: doc/html/man/ncurses.3x.html
---- ncurses-6.0-20160123+/doc/html/man/ncurses.3x.html	2015-12-06 00:26:51.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/ncurses.3x.html	2016-01-30 19:24:58.000000000 +0000
-@@ -46,24 +46,21 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        ncurses - CRT screen handling and optimization package
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The  ncurses  library  routines  give the user a terminal-
-        independent method of updating character screens with rea-
-        sonable optimization.  This implementation is "new curses"
-        (ncurses) and is the approved replacement for 4.4BSD clas-
-        sic  curses,  which has been discontinued.  This describes
--       ncurses version 6.0 (patch 20151205).
-+       ncurses version 6.0 (patch 20160130).
- 
-        The ncurses library emulates the curses library of  System
-        V  Release  4  UNIX,  and  XPG4 (X/Open Portability Guide)
-@@ -97,8 +94,7 @@
-        access to low-level terminal-manipulation routines.
- 
- 
--
    
--
    Initialization
    -+
    Initialization
    -        The  library uses the locale which the calling program has
-        initialized.  That is normally done with setlocale:
- 
-@@ -135,8 +131,7 @@
-        for doing this.  [See terminfo(5) for further details.]
- 
- 
--
    
--
    Datatypes
    -+
    Datatypes
    -        The ncurses library permits manipulation  of  data  struc-
-        tures,  called  windows,  which  can be thought of as two-
-        dimensional arrays of characters representing all or  part
-@@ -182,8 +177,7 @@
-        <curses.h>, such as A_REVERSE, ACS_HLINE, and KEY_LEFT.
- 
- 
--
    
--
    Environment variables
    -+
    Environment variables
    -        If the environment variables LINES and COLUMNS are set, or
-        if  the program is executing in a window environment, line
-        and column information in the  environment  will  override
-@@ -224,8 +218,7 @@
-        curscr can be used in only a few routines.
- 
- 
--
    
--
    Routine and Argument Names
    -+
    Routine and Argument Names
    -        Many  curses routines have two or more versions.  The rou-
-        tines prefixed with w require a window argument.  The rou-
-        tines prefixed with p require a pad argument.  Those with-
-@@ -306,8 +299,7 @@
-                becomes wadd_wch.
- 
- 
--
    
--
    Routine Name Index
    -+
    Routine Name Index
    -        The following table lists each curses routine and the name
-        of the manual page on which  it  is  described.   Routines
-        flagged  with  `*'  are ncurses-specific, not described by
-@@ -766,8 +758,7 @@
-               wvline_set              curs_border_set(3x)
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        Routines that return an integer return  ERR  upon  failure
-        and  an  integer value other than ERR upon successful com-
-        pletion, unless otherwise noted in  the  routine  descrip-
-@@ -785,8 +776,7 @@
-        Routines that return pointers return NULL on error.
- 
- 
--
    
--
    ENVIRONMENT
    -+
    ENVIRONMENT
    -        The following environment symbols are useful for customiz-
-        ing the runtime behavior of the ncurses library.  The most
-        important ones have been already discussed in detail.
-@@ -802,8 +792,7 @@
-        it does not happen to be a single character.
- 
- 
--
    
--
    BAUDRATE
    -+
    BAUDRATE
    -        The  debugging  library  checks  this environment variable
-        when the application has redirected output to a file.  The
-        variable's  numeric value is used for the baudrate.  If no
-@@ -812,8 +801,7 @@
-        costs that depend on baudrate.
- 
- 
--
    
--
    COLUMNS
    -+
    COLUMNS
    -        Specify the width of the screen in  characters.   Applica-
-        tions  running in a windowing environment usually are able
-        to obtain the width of the window in which they  are  exe-
-@@ -844,8 +832,7 @@
-        system calls or the terminal database.
- 
- 
--
    
--
    ESCDELAY
    -+
    ESCDELAY
    -        Specifies  the  total  time,  in  milliseconds,  for which
-        ncurses will await a character sequence, e.g., a  function
-        key.   The default value, 1000 milliseconds, is enough for
-@@ -874,8 +861,7 @@
-        lems when compiling an application.
- 
- 
--
    
--
    HOME
    -+
    HOME
    -        Tells ncurses where your home directory is.  That is where
-        it may read and write auxiliary terminal descriptions:
- 
-@@ -883,14 +869,12 @@
-        $HOME/.terminfo
- 
- 
--
    
--
    LINES
    -+
    LINES
    -        Like  COLUMNS, specify the height of the screen in charac-
-        ters.  See COLUMNS for a detailed description.
- 
- 
--
    
--
    MOUSE_BUTTONS_123
    -+
    MOUSE_BUTTONS_123
    -        This applies only to the OS/2 EMX port.  It specifies  the
-        order  of  buttons  on the mouse.  OS/2 numbers a 3-button
-        mouse inconsistently from other platforms:
-@@ -904,8 +888,7 @@
-        or 321.  If it is not specified, ncurses uses 132.
- 
- 
--
    
--
    NCURSES_ASSUMED_COLORS
    -+
    NCURSES_ASSUMED_COLORS
    -        Override the compiled-in assumption  that  the  terminal's
-        default   colors   are  white-on-black  (see  default_col-
-        ors(3x)).  You may set the foreground and background color
-@@ -917,8 +900,7 @@
-        value is allowed.
- 
- 
--
    
--
    NCURSES_CONSOLE2
    -+
    NCURSES_CONSOLE2
    -        This applies only to the MinGW port of ncurses.
- 
-        The Console2 program's handling of the  Microsoft  Console
-@@ -930,8 +912,7 @@
-        same effect.
- 
- 
--
    
--
    NCURSES_GPM_TERMS
    -+
    NCURSES_GPM_TERMS
    -        This applies only to ncurses configured  to  use  the  GPM
-        interface.
- 
-@@ -945,8 +926,7 @@
-        attempt to open GPM if TERM contains "linux".
- 
- 
--
    
--
    NCURSES_NO_HARD_TABS
    -+
    NCURSES_NO_HARD_TABS
    -        Ncurses may use tabs as part of the cursor movement  opti-
-        mization.   In  some  cases,  your terminal driver may not
-        handle these properly.  Set this environment  variable  to
-@@ -959,8 +939,7 @@
-        environment variable.
- 
- 
--
    
--
    NCURSES_NO_PADDING
    -+
    NCURSES_NO_PADDING
    -        Most of the terminal descriptions in the terminfo database
-        are written for real "hardware"  terminals.   Many  people
-        use  terminal  emulators which run in a windowing environ-
-@@ -987,8 +966,7 @@
-        part of special control sequences such as flash.
- 
- 
--
    
--
    NCURSES_NO_SETBUF
    -+
    NCURSES_NO_SETBUF
    -        This setting is obsolete.  Before changes
- 
-           o   started with 5.9 patch 20120825 and
-@@ -1018,8 +996,7 @@
-        level curses calls do not.
- 
- 
--
    
--
    NCURSES_NO_UTF8_ACS
    -+
    NCURSES_NO_UTF8_ACS
    -        During initialization, the ncurses library checks for spe-
-        cial cases where VT100 line-drawing (and the corresponding
-        alternate character set  capabilities)  described  in  the
-@@ -1055,8 +1032,7 @@
-        interface.
- 
- 
--
    
--
    NCURSES_TRACE
    -+
    NCURSES_TRACE
    -        During   initialization,  the  ncurses  debugging  library
-        checks the NCURSES_TRACE environment variable.  If  it  is
-        defined, to a numeric value, ncurses calls the trace func-
-@@ -1070,8 +1046,7 @@
-        See curs_trace(3x) for more information.
- 
- 
--
    
--
    TERM
    -+
    TERM
    -        Denotes  your  terminal  type.  Each terminal type is dis-
-        tinct, though many are similar.
- 
-@@ -1091,8 +1066,7 @@
-        match that setting.
- 
- 
--
    
--
    TERMCAP
    -+
    TERMCAP
    -        If  the  ncurses  library has been configured with termcap
-        support, ncurses will check for a  terminal's  description
-        in  termcap  form  if  it is not available in the terminfo
-@@ -1106,8 +1080,7 @@
-        mation, e.g., /etc/termcap.
- 
- 
--
    
--
    TERMINFO
    -+
    TERMINFO
    -        Overrides the directory in which ncurses searches for your
-        terminal description.  This is the simplest, but  not  the
-        only  way to change the list of directories.  The complete
-@@ -1135,8 +1108,7 @@
-                  MINFO variable)
- 
- 
--
    
--
    TERMINFO_DIRS
    -+
    TERMINFO_DIRS
    -        Specifies  a  list  of  directories to search for terminal
-        descriptions.  The list is separated by colons (i.e., ":")
-        on Unix, semicolons on OS/2 EMX.
-@@ -1155,8 +1127,7 @@
-        of a termcap file.
- 
- 
--
    
--
    TERMPATH
    -+
    TERMPATH
    -        If TERMCAP does not hold a file name then  ncurses  checks
-        the  TERMPATH  environment  variable.   This  is a list of
-        filenames separated by spaces or  colons  (i.e.,  ":")  on
-@@ -1173,8 +1144,7 @@
-        $TERMINFO, $TERMINFO_DIRS, $TERMPATH, as well as $HOME.
- 
- 
--
    
--
    ALTERNATE CONFIGURATIONS
    -+
    ALTERNATE CONFIGURATIONS
    -        Several  different  configurations are possible, depending
-        on  the  configure  script  options  used  when   building
-        ncurses.   There  are a few main options whose effects are
-@@ -1255,23 +1225,20 @@
-             ing it is always in the debug library.
- 
- 
--
    
--
    FILES
    -+
    FILES
    -        /usr/share/tabset
-             directory  containing  initialization  files  for the
-             terminal capability database /usr/share/terminfo ter-
-             minal capability database
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        terminfo(5)  and  related  pages whose names begin "curs_"
-        for detailed routine descriptions.
-        curs_variables(3x)
- 
- 
--
    
--
    EXTENSIONS
    -+
    EXTENSIONS
    -        The  ncurses  library  can  be  compiled  with  an  option
-        (-DUSE_GETCAP) that falls back to the old-style /etc/term-
-        cap file if the terminal setup code cannot find a terminfo
-@@ -1310,8 +1277,7 @@
-        device.  See the curs_print(3x) manual page for details.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        The  ncurses  library is intended to be BASE-level confor-
-        mant with XSI Curses.  The EXTENDED XSI Curses functional-
-        ity (including color support) is supported.
-@@ -1374,8 +1340,7 @@
-        package's portability correspondingly.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The header  file  <curses.h>  automatically  includes  the
-        header files <stdio.h> and <unctrl.h>.
- 
-@@ -1385,8 +1350,7 @@
-        ture of AT&T System V Release 3 curses.
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Zeyd M. Ben-Halim, Eric  S.  Raymond,  Thomas  E.  Dickey.
-        Based on pcurses by Pavel Curtis.
- 
-Index: doc/html/man/panel.3x.html
---- ncurses-6.0-20160123+/doc/html/man/panel.3x.html	2015-12-06 00:26:51.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/panel.3x.html	2016-01-30 19:24:58.000000000 +0000
-@@ -45,13 +45,11 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        panel - panel stack extension for curses
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <panel.h>
- 
-        cc [flags] sourcefiles -lpanel -lncurses
-@@ -73,8 +71,7 @@
-        int del_panel(PANEL *pan);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        Panels  are  curses(3x)  windows with the added feature of
-        depth.  Panel functions allow the use of  stacked  windows
-        and  ensure  the  proper  portions  of each window and the
-@@ -94,8 +91,7 @@
-        minfo curses does.
- 
- 
--
    
--
    FUNCTIONS
    -+
    FUNCTIONS
    -        new_panel(win)
-               allocates   a   PANEL structure, associates it with
-               win, places the panel  on  the  top  of  the  stack
-@@ -172,15 +168,13 @@
-               returns a pointer to the window of the given panel.
- 
- 
--
    
--
    DIAGNOSTICS
    -+
    DIAGNOSTICS
    -        Each  routine  that  returns  a pointer returns NULL if an
-        error occurs. Each  routine  that  returns  an  int  value
-        returns OK if it executes successfully and ERR if not.
- 
- 
--
    
--
    COMPATIBILITY
    -+
    COMPATIBILITY
    -        Reasonable  care  has been taken to  ensure  compatibility
-        with  the  native  panel  facility  introduced  in  SVr3.2
-        (inspection of the SVr4 manual pages suggests the program-
-@@ -199,30 +193,26 @@
-        libraries.
- 
- 
--
    
--
    NOTE
    -+
    NOTE
    -        In your library list, libpanel.a should  be  before  libn-
-        curses.a;  that  is,  you want to say `-lpanel -lncurses',
-        not the other way around (which would usually give a link-
-        error).
- 
- 
--
    
--
    FILES
    -+
    FILES
    -        panel.h interface for the panels library
- 
-        libpanel.a the panels library itself
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), curs_variables(3x),
- 
--       This describes ncurses version 6.0 (patch 20151205).
-+       This describes ncurses version 6.0 (patch 20160130).
- 
- 
--
    
--
    AUTHOR
    -+
    AUTHOR
    -        Originally   written   by   Warren  Tucker  <wht@n4hgf.mt-
-        park.ga.us>, primarily to assist  in  porting  u386mon  to
-        systems  without  a native panels library.  Repackaged for
-Index: doc/html/man/resizeterm.3x.html
---- ncurses-6.0-20160123+/doc/html/man/resizeterm.3x.html	2015-09-26 22:08:52.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/resizeterm.3x.html	2016-01-30 19:24:58.000000000 +0000
-@@ -46,14 +46,12 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        is_term_resized,  resize_term,  resizeterm  -  change  the
-        curses terminal size
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        bool is_term_resized(int lines, int columns);
-@@ -61,16 +59,14 @@
-        int resizeterm(int lines, int columns);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        This is an extension to the curses library.   It  provides
-        callers  with  a hook into the ncurses data to resize win-
-        dows, primarily for use by programs running in an X Window
-        terminal (e.g., xterm).
- 
- 
--
    
--
    resizeterm
    -+
    resizeterm
    -        The  function  resizeterm resizes the standard and current
-        windows to the specified  dimensions,  and  adjusts  other
-        bookkeeping  data  used by the ncurses library that record
-@@ -78,8 +74,7 @@
-        ables.
- 
- 
--
    
--
    resize_term
    -+
    resize_term
    -        Most   of   the   work  is  done  by  the  inner  function
-        resize_term.  The outer function resizeterm adds bookkeep-
-        ing  for the SIGWINCH handler.  When resizing the windows,
-@@ -91,24 +86,21 @@
-        tional interaction with the application.
- 
- 
--
    
--
    is_term_resized
    -+
    is_term_resized
    -        A  support  function  is_term_resized  is provided so that
-        applications can check if the resize_term  function  would
-        modify the window structures.  It returns TRUE if the win-
-        dows would be modified, and FALSE otherwise.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        Except as noted, these functions return  the  integer  ERR
-        upon  failure and OK on success.  They will fail if either
-        of the dimensions are less than or equal to zero, or if an
-        error occurs while (re)allocating memory for the windows.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        While these functions are intended to be used to support a
-        signal handler (i.e., for SIGWINCH), care should be  taken
-        to  avoid invoking them in a context where malloc or real-
-@@ -143,8 +135,7 @@
-        WINCH is received, no screen size change may be recorded.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        It is possible to resize the screen with SVr4 curses, by
- 
-        o   exiting curses with endwin(3x) and
-@@ -157,13 +148,11 @@
-        was adopted in NetBSD curses (2001) and PDCurses (2003).
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curs_getch(3x), curs_variables(3x), wresize(3x).
- 
- 
--
    
--
    AUTHOR
    -+
    AUTHOR
    -        Thomas Dickey (from an equivalent function written in 1988
-        for BSD curses).
- 
-Index: doc/html/man/tabs.1.html
---- ncurses-6.0-20160123+/doc/html/man/tabs.1.html	2015-12-06 00:26:51.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/tabs.1.html	2016-01-30 19:24:58.000000000 +0000
-@@ -45,18 +45,15 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        tabs - set tabs on a terminal
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        tabs [options]] [tabstop-list]
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The  tabs  program clears and sets tab-stops on the termi-
-        nal.  This uses the terminfo  clear_all_tabs  and  set_tab
-        capabilities.   If  either  is  absent,  tabs is unable to
-@@ -66,11 +63,9 @@
-               stty tab0
- 
- 
--
    
--
    OPTIONS
    -+
    OPTIONS
    - 
--
    
--
    General Options
    -+
    General Options
    -        -Tname
-             Tell tabs which terminal type to use.  If this option
-             is not given, tabs will  use  the  $TERM  environment
-@@ -95,8 +90,7 @@
-        the one that determines the list to be processed.
- 
- 
--
    
--
    Implicit Lists
    -+
    Implicit Lists
    -        Use  a  single number as an option, e.g., "-5" to set tabs
-        at the given interval (in this case  1,  6,  11,  16,  21,
-        etc.).   Tabs  are  repeated up to the right margin of the
-@@ -107,8 +101,7 @@
-        Use "-8" to set tabs to the standard interval.
- 
- 
--
    
--
    Explicit Lists
    -+
    Explicit Lists
    -        An explicit list can be defined after  the  options  (this
-        does  not  use  a "-").  The values in the list must be in
-        increasing numeric order, and greater than zero.  They are
-@@ -124,8 +117,7 @@
-        which is equivalent to the 1,6,11,16,21 example.
- 
- 
--
    
--
    Predefined Tab-Stops
    -+
    Predefined Tab-Stops
    -        X/Open defines several predefined lists of tab stops.
- 
-        -a   Assembler, IBM S/370, first format
-@@ -147,8 +139,7 @@
-        -u   UNIVAC 1100 Assembler
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        X/Open describes a +m option, to set  a  terminal's  left-
-        margin.   Very few of the entries in the terminal database
-        provide this capability.
-@@ -164,11 +155,10 @@
-        be that long.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        tset(1), infocmp(1m), curses(3x), terminfo(5).
- 
--       This describes ncurses version 6.0 (patch 20151205).
-+       This describes ncurses version 6.0 (patch 20160130).
- 
- 
- 
-Index: doc/html/man/term.5.html
---- ncurses-6.0-20160123+/doc/html/man/term.5.html	2015-05-13 19:27:49.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/term.5.html	2016-01-30 19:24:58.000000000 +0000
-@@ -45,21 +45,17 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        term - format of compiled term file.
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        term
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    - 
--
    
--
    STORAGE LOCATION
    -+
    STORAGE LOCATION
    -        Compiled terminfo descriptions are placed under the direc-
-        tory /usr/share/terminfo.   Two  configurations  are  sup-
-        ported (when building the ncurses libraries):
-@@ -92,8 +88,7 @@
-             existing directory, and hashed database otherwise.
- 
- 
--
    
--
    STORAGE FORMAT
    -+
    STORAGE FORMAT
    -        The format has been chosen so that it will be the same  on
-        all  hardware.   An  8 or more bit byte is assumed, but no
-        assumptions about byte  ordering  or  sign  extension  are
-@@ -172,8 +167,7 @@
-        section.  Each string is null terminated.
- 
- 
--
    
--
    EXTENDED STORAGE FORMAT
    -+
    EXTENDED STORAGE FORMAT
    -        The  previous  section describes the conventional terminfo
-        binary format.  With some minor variations of the  offsets
-        (see  PORTABILITY),  the same binary format is used in all
-@@ -212,8 +206,7 @@
-        e.g., booleans, then numbers and finally strings.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        Note that it is possible for setupterm to expect a differ-
-        ent  set  of capabilities than are actually present in the
-        file.  Either the database may  have  been  updated  since
-@@ -238,8 +231,7 @@
-        sion of terminfo source compatibility issues.
- 
- 
--
    
--
    EXAMPLE
    -+
    EXAMPLE
    -        As  an  example, here is a hex dump of the description for
-        the Lear-Siegler ADM-3, a  popular  though  rather  stupid
-        early terminal:
-@@ -276,25 +268,21 @@
- 
- 
- 
--
    
--
    LIMITS
    -+
    LIMITS
    -        Some  limitations:  total  compiled  entries cannot exceed
-        4096 bytes.  The name field cannot exceed 128 bytes.
- 
- 
--
    
--
    FILES
    -+
    FILES
    -        /usr/share/terminfo/*/*  compiled terminal capability data
-        base
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), terminfo(5).
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Thomas E. Dickey
-        extended terminfo format for ncurses 5.0
-        hashed database support for ncurses 5.6
-Index: doc/html/man/term.7.html
---- ncurses-6.0-20160123+/doc/html/man/term.7.html	2015-05-13 19:27:49.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/term.7.html	2016-01-30 19:24:58.000000000 +0000
-@@ -45,13 +45,11 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        term - conventions for naming terminal types
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The  environment variable TERM should normally contain the
-        type name of the terminal, console or display-device  type
-        you  are  using.   This  information  is  critical for all
-@@ -215,15 +213,13 @@
-        environment variable when no -T option is specified.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        For  maximum  compatibility  with  older  System V UNIXes,
-        names and aliases should be unique  within  the  first  14
-        characters.
- 
- 
--
    
--
    FILES
    -+
    FILES
    -        /usr/share/terminfo/?/*
-             compiled terminal capability data base
- 
-@@ -234,8 +230,7 @@
-             tty line initialization (BSD-like UNIXes)
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x), terminfo(5), term(5).
- 
- 
-Index: doc/html/man/term_variables.3x.html
---- ncurses-6.0-20160123+/doc/html/man/term_variables.3x.html	2015-12-06 00:26:51.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/term_variables.3x.html	2016-01-30 19:24:58.000000000 +0000
-@@ -45,15 +45,13 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        SP, acs_map, boolcodes, boolfnames, boolnames, cur_term,
-        numcodes, numfnames, numnames, strcodes, strfnames,
-        strnames, ttytype - curses terminfo global variables
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
-        #include <term.h>
- 
-@@ -78,8 +76,7 @@
-        NCURSES_CONST char * const * strnames;
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        This  page summarizes variables provided by the curses li-
-        brary's low-level terminfo interface.  A more complete de-
-        scription is given in the curs_terminfo(3x) manual page.
-@@ -91,8 +88,7 @@
-        ing the library.
- 
- 
--
    
--
    Alternate Character Set Mapping
    -+
    Alternate Character Set Mapping
    -        After  initializing the curses or terminfo interfaces, the
-        acs_map array holds information used  to  translate  cells
-        with  the  A_ALTCHARSET  video attribute into line-drawing
-@@ -106,8 +102,7 @@
-        private variable.
- 
- 
--
    
--
    Current Terminal Data
    -+
    Current Terminal Data
    -        After  initializing the curses or terminfo interfaces, the
-        cur_term contains data describing  the  current  terminal.
-        This variable is also set as a side-effect of curs_initscr(3x)
-@@ -119,8 +114,7 @@
-        from newterm or setupterm to reuse in set_term.
- 
- 
--
    
--
    Terminfo Names
    -+
    Terminfo Names
    -        The  tic(1m)  and infocmp(1m) programs use lookup tables for
-        the long and short names of terminfo capabilities, as well
-        as  the  corresponding  names  for  termcap  capabilities.
-@@ -138,14 +132,12 @@
-        scriptions: boolcodes, numcodes, and strcodes.
- 
- 
--
    
--
    Terminal Type
    -+
    Terminal Type
    -        On  initialization  of  the curses or terminfo interfaces,
-        setupterm copies the terminal name to the array ttytype.
- 
- 
--
    
--
    Terminfo Names
    -+
    Terminfo Names
    -        In addition to the variables, <term.h> also defines a sym-
-        bol  for each terminfo capability long name.  These are in
-        terms of the symbol CUR, which is defined
-@@ -156,15 +148,13 @@
-        fo capabilities than using tigetstr(3x), etc.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The  low-level  terminfo  interface  is  initialized using
-        curs_terminfo(3x).  The upper-level curses interface uses  the
-        low-level terminfo interface, internally.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        X/Open  Curses  does  not describe any of these except for
-        cur_term.  (The inclusion of cur_term  appears  to  be  an
-        oversight, since other comparable low-level information is
-@@ -180,8 +170,7 @@
-        variable.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        curses(3x),      curs_terminfo(3x),      curs_threads(3x),
-        terminfo(5).
- 
-Index: doc/html/man/terminfo.5.html
---- ncurses-6.0-20160123+/doc/html/man/terminfo.5.html	2015-12-06 00:26:52.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/terminfo.5.html	2016-01-30 19:24:58.000000000 +0000
-@@ -60,25 +60,22 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        terminfo - terminal capability data base
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        /usr/share/terminfo/*/*
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        Terminfo  is  a  data  base  describing terminals, used by
-        screen-oriented programs  such  as  nvi(1),  rogue(1)  and
-        libraries  such  as curses(3x).  Terminfo describes termi-
-        nals by giving a set of capabilities which they  have,  by
-        specifying how to perform screen operations, and by speci-
-        fying padding requirements and  initialization  sequences.
--       This describes ncurses version 6.0 (patch 20151205).
-+       This describes ncurses version 6.0 (patch 20160130).
- 
-        Entries in terminfo consist of a sequence of `,' separated
-        fields (embedded commas may be escaped with a backslash or
-@@ -133,8 +130,7 @@
-        manual page.
- 
- 
--
    
--
    Predefined Capabilities
    -+
    Predefined Capabilities
    -        The  following  is  a  complete  table of the capabilities
-        included in a terminfo description block and available  to
-        terminfo-using code.  In each line of the table,
-@@ -1025,8 +1021,7 @@
-                                              termcap).
- 
- 
--
    
--
    User-Defined Capabilities
    -+
    User-Defined Capabilities
    -        The  preceding section listed the predefined capabilities.
-        They deal with some  special  features  for  terminals  no
-        longer  (or  possibly never) produced.  Occasionally there
-@@ -1069,8 +1064,7 @@
-        available using terminfo.
- 
- 
--
    
--
    A Sample Entry
    -+
    A Sample Entry
    -        The following entry, describing an ANSI-standard terminal,
-        is  representative  of  what a terminfo entry for a modern
-        terminal typically looks like.
-@@ -1121,8 +1115,7 @@
-            be used to perform particular terminal operations.
- 
- 
--
    
--
    Types of Capabilities
    -+
    Types of Capabilities
    -        All capabilities have names.  For instance, the fact  that
-        ANSI-standard  terminals  have automatic margins (i.e., an
-        automatic return and line-feed when the end of a  line  is
-@@ -1194,8 +1187,7 @@
-        example, see the second ind in the example above.
- 
- 
--
    
--
    Fetching Compiled Descriptions
    -+
    Fetching Compiled Descriptions
    -        The ncurses library searches for terminal descriptions  in
-        several places.  It uses only the first description found.
-        The library has a compiled-in list  of  places  to  search
-@@ -1232,8 +1224,7 @@
-                (the compiled-in default).
- 
- 
--
    
--
    Preparing Descriptions
    -+
    Preparing Descriptions
    -        We  now  outline how to prepare descriptions of terminals.
-        The most effective way to prepare a  terminal  description
-        is  by  imitating the description of a similar terminal in
-@@ -1253,8 +1244,7 @@
-        acter.
- 
- 
--
    
--
    Basic Capabilities
    -+
    Basic Capabilities
    -        The  number  of  columns  on each line for the terminal is
-        given by the cols numeric capability.  If the terminal  is
-        a  CRT, then the number of lines on the screen is given by
-@@ -1332,8 +1322,7 @@
-                ind=^J, lines#24,
- 
- 
--
    
--
    Parameterized Strings
    -+
    Parameterized Strings
    -        Cursor addressing and other strings  requiring  parameters
-        in  the  terminal  are described by a parameterized string
-        capability, with printf-like escapes such  as  %x  in  it.
-@@ -1463,8 +1452,7 @@
-        More complex arithmetic is possible using the stack.
- 
- 
--
    
--
    Cursor Motions
    -+
    Cursor Motions
    -        If the terminal has a fast way to home the cursor (to very
-        upper  left  corner  of  screen) then this can be given as
-        home; similarly a fast way of getting to the  lower  left-
-@@ -1504,8 +1492,7 @@
-        rmcup), specify nrrmc.
- 
- 
--
    
--
    Area Clears
    -+
    Area Clears
    -        If the terminal can clear from the current position to the
-        end  of  the  line,  leaving  the cursor where it is, this
-        should be given as el.  If the terminal can clear from the
-@@ -1518,8 +1505,7 @@
-        number of lines, if a true ed is not available.)
- 
- 
--
    
--
    Insert/delete line and vertical motions
    -+
    Insert/delete line and vertical motions
    -        If  the terminal can open a new blank line before the line
-        where the cursor is, this should be given as il1; this  is
-        done  only  from the first position of a line.  The cursor
-@@ -1582,8 +1568,7 @@
-        bring down non-blank lines.
- 
- 
--
    
--
    Insert/Delete Character
    -+
    Insert/Delete Character
    -        There are two basic kinds of  intelligent  terminals  with
-        respect  to insert/delete character which can be described
-        using terminfo.  The most common  insert/delete  character
-@@ -1672,8 +1657,7 @@
-        with one parameter.
- 
- 
--
    
--
    Highlighting, Underlining, and Visible Bells
    -+
    Highlighting, Underlining, and Visible Bells
    -        If  your  terminal  has  one  or  more  kinds  of  display
-        attributes, these can be represented in a number  of  dif-
-        ferent ways.  You should choose one display form as stand-
-@@ -1801,8 +1785,7 @@
-        giving eo.
- 
- 
--
    
--
    Keypad and Function Keys
    -+
    Keypad and Function Keys
    -        If the terminal has a keypad that transmits codes when the
-        keys  are  pressed,  this  information can be given.  Note
-        that it is not possible to handle terminals where the key-
-@@ -1883,8 +1866,7 @@
-        visible.
- 
- 
--
    
--
    Tabs and Initialization
    -+
    Tabs and Initialization
    -        If  the terminal has hardware tabs, the command to advance
-        to the next tab stop can be given as ht  (usually  control
-        I).  A "back-tab" command which moves leftward to the pre-
-@@ -1963,8 +1945,7 @@
-        if.
- 
- 
--
    
--
    Delays and Padding
    -+
    Delays and Padding
    -        Many  older  and  slower  terminals  do not support either
-        XON/XOFF or DTR handshaking, including hard copy terminals
-        and  some  very  archaic CRTs (including, for example, DEC
-@@ -1991,8 +1972,7 @@
-        first character of the pad string is used.
- 
- 
--
    
--
    Status Lines
    -+
    Status Lines
    -        Some terminals have an extra "status line"  which  is  not
-        normally  used  by  software  (and thus not counted in the
-        terminal's lines capability).
-@@ -2028,8 +2008,7 @@
-        become important.
- 
- 
--
    
--
    Line Graphics
    -+
    Line Graphics
    -        Many terminals have alternate character  sets  useful  for
-        forms-drawing.   Terminfo  and curses build in support for
-        the drawing characters supported by the VT100,  with  some
-@@ -2080,8 +2059,7 @@
-        ACSC string.
- 
- 
--
    
--
    Color Handling
    -+
    Color Handling
    -        Most color terminals are either "Tektronix-like"  or  "HP-
-        like".   Tektronix-like terminals have a predefined set of
-        N colors (where N usually 8), and can  set  character-cell
-@@ -2205,8 +2183,7 @@
-        and optimizes the output in favor of colors.
- 
- 
--
    
--
    Miscellaneous
    -+
    Miscellaneous
    -        If the terminal requires other than a null (zero)  charac-
-        ter  as  a  pad,  then this can be given as pad.  Only the
-        first character of the pad string is used.  If the  termi-
-@@ -2280,8 +2257,7 @@
-        printer while an mc5p is in effect.
- 
- 
--
    
--
    Glitches and Braindamage
    -+
    Glitches and Braindamage
    -        Hazeltine terminals, which do not allow "~" characters  to
-        be displayed should indicate hz.
- 
-@@ -2314,8 +2290,7 @@
-        adding more capabilities of the form xx.
- 
- 
--
    
--
    Similar Terminals
    -+
    Similar Terminals
    -        If there are two very similar terminals, one (the variant)
-        can be defined as being just like  the  other  (the  base)
-        with  certain  exceptions.  In the definition of the vari-
-@@ -2340,8 +2315,7 @@
-        modes for a terminal, or for different user preferences.
- 
- 
--
    
--
    Pitfalls of Long Entries
    -+
    Pitfalls of Long Entries
    -        Long terminfo entries are unlikely to  be  a  problem;  to
-        date,  no  entry  has even approached terminfo's 4096-byte
-        string-table maximum.  Unfortunately, the termcap transla-
-@@ -2427,8 +2401,7 @@
-        lengths.
- 
- 
--
    
--
    Binary Compatibility
    -+
    Binary Compatibility
    -        It is not wise to count on portability of binary  terminfo
-        entries  between commercial UNIX versions.  The problem is
-        that there are at least two versions  of  terminfo  (under
-@@ -2438,8 +2411,7 @@
-        and XSI Curses extensions.
- 
- 
--
    
--
    EXTENSIONS
    -+
    EXTENSIONS
    -        Searching for terminal descriptions in $HOME/.terminfo and
-        TERMINFO_DIRS is not supported by older implementations.
- 
-@@ -2508,20 +2480,17 @@
-        OSF -- Supports both the SVr4 set and the AIX extensions.
- 
- 
--
    
--
    FILES
    -+
    FILES
    -        /usr/share/terminfo/?/*  files     containing     terminal
-                                 descriptions
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        tic(1m),  infocmp(1m),  curses(3x),  printf(3),   term(5).
-        term_variables(3x).
- 
- 
--
    
--
    AUTHORS
    -+
    AUTHORS
    -        Zeyd  M.  Ben-Halim,  Eric  S.  Raymond, Thomas E. Dickey.
-        Based on pcurses by Pavel Curtis.
- 
-Index: doc/html/man/tic.1m.html
---- ncurses-6.0-20160123+/doc/html/man/tic.1m.html	2015-12-06 00:26:52.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/tic.1m.html	2016-01-30 19:24:58.000000000 +0000
-@@ -45,19 +45,16 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        tic - the terminfo entry-description compiler
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        tic  [-01CDGIKLNTUVacfgqrstx]  [-e names] [-o dir] [-Q[n]]
-        [-R subset] [-v[n]] [-w[n]] file
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The tic command translates a  terminfo  file  from  source
-        format  into compiled format.  The compiled format is nec-
-        essary for use with the library routines in ncurses(3x).
-@@ -118,8 +115,7 @@
-        o   the system terminfo database (/usr/share/terminfo).
- 
- 
--
    
--
    OPTIONS
    -+
    OPTIONS
    -        -0     restricts the output to a single line
- 
-        -1     restricts the output to a single column
-@@ -320,8 +316,7 @@
-             keys.
- 
- 
--
    
--
    PARAMETERS
    -+
    PARAMETERS
    -        file   contains one or more terminfo terminal descriptions
-               in  source format [see terminfo(5)].  Each descrip-
-               tion in the file describes the  capabilities  of  a
-@@ -332,8 +327,7 @@
-               path of a character-device.
- 
- 
--
    
--
    PROCESSING
    -+
    PROCESSING
    -        All but one of the capabilities recognized by tic are doc-
-        umented in terminfo(5).  The exception is the use capabil-
-        ity.
-@@ -359,8 +353,7 @@
-        printed.
- 
- 
--
    
--
    COMPATIBILITY
    -+
    COMPATIBILITY
    -        There  is  some evidence that historic tic implementations
-        treated description fields with no whitespace in  them  as
-        additional  aliases  or short names.  This tic does not do
-@@ -368,8 +361,7 @@
-        treated that way and check them for dangerous characters.
- 
- 
--
    
--
    EXTENSIONS
    -+
    EXTENSIONS
    -        Unlike the SVr4 tic command, this implementation can actu-
-        ally compile termcap sources.  In fact,  entries  in  ter-
-        minfo  and  termcap syntax can be mixed in a single source
-@@ -397,22 +389,19 @@
-        itly set to it.
- 
- 
--
    
--
    FILES
    -+
    FILES
    -        /usr/share/terminfo/?/*
-             Compiled terminal description database.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        infocmp(1m),    captoinfo(1m),   infotocap(1m),   toe(1m),
-        curses(3x), term(5).  terminfo(5).
- 
--       This describes ncurses version 6.0 (patch 20151205).
-+       This describes ncurses version 6.0 (patch 20160130).
- 
- 
--
    
--
    AUTHOR
    -+
    AUTHOR
    -        Eric S. Raymond <esr@snark.thyrsus.com> and
-        Thomas E. Dickey <dickey@invisible-island.net>
- 
-Index: doc/html/man/toe.1m.html
---- ncurses-6.0-20160123+/doc/html/man/toe.1m.html	2015-12-06 00:26:52.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/toe.1m.html	2016-01-30 19:24:59.000000000 +0000
-@@ -45,18 +45,15 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        toe - table of (terminfo) entries
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        toe [-v[n]] [-ahsuUV] file...
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        With no options, toe lists all available terminal types by
-        primary name with descriptions.   File  arguments  specify
-        the  directories  to  be scanned; if no such arguments are
-@@ -111,18 +108,16 @@
-               this program, and exits.
- 
- 
--
    
--
    FILES
    -+
    FILES
    -        /usr/share/terminfo/?/*
-             Compiled terminal description database.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        tic(1m),   infocmp(1m),   captoinfo(1m),    infotocap(1m),
-        curses(3x), terminfo(5).
- 
--       This describes ncurses version 6.0 (patch 20151205).
-+       This describes ncurses version 6.0 (patch 20160130).
- 
- 
- 
-Index: doc/html/man/tput.1.html
---- ncurses-6.0-20160123+/doc/html/man/tput.1.html	2015-12-06 00:26:52.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/tput.1.html	2016-01-30 19:24:59.000000000 +0000
-@@ -46,14 +46,12 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        tput,  reset  -  initialize  a  terminal or query terminfo
-        database
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        tput [-Ttype] capname [parms ... ]
-        tput [-Ttype] init
-        tput [-Ttype] reset
-@@ -62,8 +60,7 @@
-        tput -V
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        The tput utility uses the terminfo database  to  make  the
-        values  of terminal-dependent capabilities and information
-        available to the shell (see sh(1)), to initialize or reset
-@@ -172,8 +169,7 @@
-        has similar behavior.
- 
- 
--
    
--
    EXAMPLES
    -+
    EXAMPLES
    -        tput init
-             Initialize the terminal according to the type of ter-
-             minal  in the environmental variable TERM.  This com-
-@@ -237,8 +233,7 @@
-             exclamation mark (!) on a line by itself.
- 
- 
--
    
--
    FILES
    -+
    FILES
    -        /usr/share/terminfo
-               compiled terminal description database
- 
-@@ -250,8 +245,7 @@
-               tion of terminfo(5)
- 
- 
--
    
--
    EXIT CODES
    -+
    EXIT CODES
    -        If the -S option is used, tput checks for errors from each
-        line, and if any errors are found, will set the exit  code
-        to  4  plus the number of lines with errors.  If no errors
-@@ -288,8 +282,7 @@
-        TICS section.
- 
- 
--
    
--
    DIAGNOSTICS
    -+
    DIAGNOSTICS
    -        tput prints the following error messages and sets the cor-
-        responding exit codes.
- 
-@@ -306,8 +299,7 @@
-        ---------------------------------------------------------------------
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        The  longname  and -S options, and the parameter-substitu-
-        tion features used in the cup example, are  not  supported
-        in BSD curses or in AT&T/USL curses before SVr4.
-@@ -334,11 +326,10 @@
-        ing only digits is intended to be a number.
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        clear(1), stty(1), tabs(1), terminfo(5), curs_termcap(3x).
- 
--       This describes ncurses version 6.0 (patch 20151205).
-+       This describes ncurses version 6.0 (patch 20160130).
- 
- 
- 
-Index: doc/html/man/tset.1.html
---- ncurses-6.0-20160123+/doc/html/man/tset.1.html	2015-12-06 00:26:52.000000000 +0000
-+++ ncurses-6.0-20160130/doc/html/man/tset.1.html	2016-01-30 19:24:59.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-@@ -45,21 +45,20 @@
- 
- 
- 
--
    
--
    NAME
    -+
    NAME
    -        tset, reset - terminal initialization
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        tset  [-IQVcqrsw] [-] [-e ch] [-i ch] [-k ch] [-m mapping]
-        [terminal]
-        reset [-IQVcqrsw] [-] [-e ch] [-i ch] [-k ch] [-m mapping]
-        [terminal]
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -+
-+
    tset - initialization
    -        Tset  initializes  terminals.   Tset  first determines the
-        type of terminal that you are using.   This  determination
-        is done as follows, using the first terminal type found.
-@@ -99,6 +98,8 @@
-        versus  the  other  initialization.   If neither option is
-        given, both are assumed.
- 
-+
-+
    reset - reinitialization
    -        When invoked as reset, tset sets cooked  and  echo  modes,
-        turns  off cbreak and raw modes, turns on newline transla-
-        tion and resets any  unset  special  characters  to  their
-@@ -114,6 +115,8 @@
-        the abnormal state.  Also, the  terminal  will  often  not
-        echo the command.
- 
-+
-+
    OPTIONS
    -        The options are as follows:
- 
-        -c   Set control characters and modes.
-@@ -158,8 +161,7 @@
-        tion, i.e., control-h may be specified as "^H" or "^h".
- 
- 
--
    
--
    SETTING THE ENVIRONMENT
    -+
    SETTING THE ENVIRONMENT
    -        It is often desirable  to  enter  the  terminal  type  and
-        information  about  the  terminal's  capabilities into the
-        shell's environment.  This is done using the -s option.
-@@ -176,8 +178,7 @@
-            eval `tset -s options ... `
- 
- 
--
    
--
    TERMINAL TYPE MAPPING
    -+
    TERMINAL TYPE MAPPING
    -        When the terminal is not hardwired into the system (or the
-        current system information is incorrect) the terminal type
-        derived  from the /etc/ttys file or the TERM environmental
-@@ -236,16 +237,14 @@
-        marks ("!").
- 
- 
--
    
--
    HISTORY
    -+
    HISTORY
    -        The tset command appeared in BSD 3.0.  The ncurses  imple-
-        mentation  was lightly adapted from the 4.4BSD sources for
-        a terminfo environment by Eric S. Raymond <esr@snark.thyr-
-        sus.com>.
- 
- 
--
    
--
    COMPATIBILITY
    -+
    COMPATIBILITY
    -        The  tset  utility has been provided for backward-compati-
-        bility with BSD environments (under  most  modern  UNIXes,
-        /etc/inittab  and  getty(1) can set TERM appropriately for
-@@ -286,8 +285,7 @@
-        of tset has been removed.
- 
- 
--
    
--
    ENVIRONMENT
    -+
    ENVIRONMENT
    -        The tset command uses these environment variables:
- 
-        SHELL
-@@ -304,8 +302,7 @@
-             looking for the terminal description.
- 
- 
--
    
--
    FILES
    -+
    FILES
    -        /etc/ttys
-             system  port  name  to terminal type mapping database
-             (BSD versions only).
-@@ -314,12 +311,11 @@
-             terminal capability database
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        csh(1),   sh(1),   stty(1),   curs_terminfo(3x),   tty(4),
-        terminfo(5), ttys(5), environ(7)
- 
--       This describes ncurses version 6.0 (patch 20151205).
-+       This describes ncurses version 6.0 (patch 20160130).
- 
- 
- 
-@@ -329,7 +325,13 @@
- 
    
--
    NAME
    -+
    NAME
    -        wresize - resize a curses window
- 
- 
--
    
--
    SYNOPSIS
    -+
    SYNOPSIS
    -        #include <curses.h>
- 
-        int wresize(WINDOW *win, int lines, int columns);
- 
- 
--
    
--
    DESCRIPTION
    -+
    DESCRIPTION
    -        This  is  an  extension to the curses library.  It reallo-
-        cates storage for an ncurses window to adjust  its  dimen-
-        sions  to  the  specified  values.  If either dimension is
-@@ -68,16 +65,14 @@
-        tion (as set by wbkgdset) merged into them.
- 
- 
--
    
--
    RETURN VALUE
    -+
    RETURN VALUE
    -        The function returns the integer ERR upon failure  and  OK
-        on success.  It will fail if either of the dimensions less
-        than or equal  to  zero,  or  if  an  error  occurs  while
-        (re)allocating memory for the window.
- 
- 
--
    
--
    NOTES
    -+
    NOTES
    -        The only restriction placed on the dimensions is that they
-        be greater than zero.  The dimensions are not compared  to
-        curses   screen   dimensions  to  simplify  the  logic  of
-@@ -85,21 +80,18 @@
-        dimensions fit within the actual screen dimensions.
- 
- 
--
    
--
    PORTABILITY
    -+
    PORTABILITY
    -        It is not possible to resize windows with SVr4 curses.
- 
-        This  extension of ncurses was introduced in mid-1995.  It
-        was adopted in NetBSD curses (2001) and PDCurses (2003).
- 
- 
--
    
--
    SEE ALSO
    -+
    SEE ALSO
    -        resizeterm(3x).
- 
- 
--
    
--
    AUTHOR
    -+
    AUTHOR
    -        Thomas Dickey (from an equivalent function written in 1988
-        for BSD curses).
- 
-Index: man/curs_refresh.3x
-Prereq:  1.15 
---- ncurses-6.0-20160123+/man/curs_refresh.3x	2010-12-04 18:38:55.000000000 +0000
-+++ ncurses-6.0-20160130/man/curs_refresh.3x	2016-01-30 15:52:36.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2005,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2016 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_refresh.3x,v 1.15 2010/12/04 18:38:55 tom Exp $
-+.\" $Id: curs_refresh.3x,v 1.16 2016/01/30 15:52:36 tom Exp $
- .TH curs_refresh 3X ""
- .na
- .hy 0
-@@ -55,6 +55,7 @@
- \fBint wredrawln(WINDOW *win, int beg_line, int num_lines);\fR
- .br
- .SH DESCRIPTION
-+.SS refresh/wrefresh
- The \fBrefresh\fR and \fBwrefresh\fR routines (or \fBwnoutrefresh\fR and
- \fBdoupdate\fR) must be called to get actual output to the terminal, as other
- routines merely manipulate data structures.
-@@ -66,6 +67,7 @@
- Unless \fBleaveok\fR has been
- enabled, the physical cursor of the terminal is left at the location of the
- cursor for that window.
-+.SS wnoutrefresh/doupdate
- .PP
- The \fBwnoutrefresh\fR and \fBdoupdate\fR routines allow multiple updates with
- more efficiency than \fBwrefresh\fR alone.
-@@ -98,6 +100,7 @@
- changed.
- (But see the section on \fBPORTABILITY\fR below for a warning about
- exploiting this behavior.)
-+.SS wredrawln/redrawwin
- .PP
- The \fBwredrawln\fR routine indicates to \fBcurses\fR that some screen lines
- are corrupted and should be thrown away before anything is written over them.
-@@ -110,7 +113,7 @@
- .PP
- X/Open does not define any error conditions.
- In this implementation
--.RS
-+.RS 3
- .TP 5
- \fBwnoutrefresh\fP
- returns an error
-Index: man/tset.1
-Prereq:  1.29 
---- ncurses-6.0-20160123+/man/tset.1	2013-12-21 22:15:53.000000000 +0000
-+++ ncurses-6.0-20160130/man/tset.1	2016-01-30 15:41:41.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2011,2013 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2013,2016 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: tset.1,v 1.29 2013/12/21 22:15:53 tom Exp $
-+.\" $Id: tset.1,v 1.31 2016/01/30 15:41:41 tom Exp $
- .TH @TSET@ 1 ""
- .ie \n(.g .ds `` \(lq
- .el       .ds `` ``
-@@ -39,6 +39,7 @@
- .br
- \fBreset\fR [\fB\-IQVcqrsw\fR] [\fB\-\fR] [\fB\-e\fR \fIch\fR] [\fB\-i\fR \fIch\fR] [\fB\-k\fR \fIch\fR] [\fB\-m\fR \fImapping\fR] [\fIterminal\fR]
- .SH DESCRIPTION
-+.SS tset - initialization
- \&\fBTset\fR initializes terminals.
- \fBTset\fR first determines the type of terminal that you are using.
- This determination is done as follows, using the first terminal type found.
-@@ -75,6 +76,7 @@
- Use the \fB\-c\fP or \fB\-w\fP option to select only the window sizing
- versus the other initialization.
- If neither option is given, both are assumed.
-+.SS reset - reinitialization
- .PP
- When invoked as \fBreset\fR, \fB@TSET@\fR sets cooked and echo modes,
- turns off cbreak and raw modes, turns on newline translation and
-@@ -88,6 +90,7 @@
- (the line-feed character is normally control-J) to get the terminal
- to work, as carriage-return may no longer work in the abnormal state.
- Also, the terminal will often not echo the command.
-+.SH OPTIONS 
- .PP
- The options are as follows:
- .TP 5
-Index: ncurses/Makefile.in
-Prereq:  1.149 
---- ncurses-6.0-20160123+/ncurses/Makefile.in	2016-01-23 21:32:00.000000000 +0000
-+++ ncurses-6.0-20160130/ncurses/Makefile.in	2016-01-30 15:31:51.000000000 +0000
-@@ -1,4 +1,4 @@
--# $Id: Makefile.in,v 1.149 2016/01/23 21:32:00 tom Exp $
-+# $Id: Makefile.in,v 1.150 2016/01/30 15:31:51 tom Exp $
- ##############################################################################
- # Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.                #
- #                                                                            #
-@@ -267,7 +267,7 @@
- 
- mostlyclean ::
- 	-rm -f core tags TAGS *~ *.bak *.i *.ln *.atac
--	-test -f trace || rm -f trace
-+	-test -d trace || rm -f trace
- 	-rm -f $(TEST_PROGS)
- 
- clean :: mostlyclean
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20160123+/package/debian-mingw/changelog	2016-01-23 17:00:00.000000000 +0000
-+++ ncurses-6.0-20160130/package/debian-mingw/changelog	2016-01-30 15:30:48.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20160123) unstable; urgency=low
-+ncurses6 (6.0+20160130) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 23 Jan 2016 12:00:36 -0500
-+ -- Thomas E. Dickey   Sat, 30 Jan 2016 10:30:48 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20160123+/package/debian-mingw64/changelog	2016-01-23 17:00:00.000000000 +0000
-+++ ncurses-6.0-20160130/package/debian-mingw64/changelog	2016-01-30 15:30:48.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20160123) unstable; urgency=low
-+ncurses6 (6.0+20160130) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 23 Jan 2016 12:00:36 -0500
-+ -- Thomas E. Dickey   Sat, 30 Jan 2016 10:30:48 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.0-20160123+/package/debian/changelog	2016-01-23 17:00:00.000000000 +0000
-+++ ncurses-6.0-20160130/package/debian/changelog	2016-01-30 15:30:48.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20160123) unstable; urgency=low
-+ncurses6 (6.0+20160130) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 23 Jan 2016 12:00:36 -0500
-+ -- Thomas E. Dickey   Sat, 30 Jan 2016 10:30:48 -0500
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.142 
---- ncurses-6.0-20160123+/package/mingw-ncurses.nsi	2016-01-23 17:00:00.000000000 +0000
-+++ ncurses-6.0-20160130/package/mingw-ncurses.nsi	2016-01-30 15:30:48.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.142 2016/01/23 17:00:00 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.143 2016/01/30 15:30:48 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "0"
- !define VERSION_YYYY  "2016"
--!define VERSION_MMDD  "0123"
-+!define VERSION_MMDD  "0130"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20160123+/package/mingw-ncurses.spec	2016-01-23 17:00:00.000000000 +0000
-+++ ncurses-6.0-20160130/package/mingw-ncurses.spec	2016-01-30 15:30:48.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.0
--Release: 20160123
-+Release: 20160130
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20160123+/package/ncurses.spec	2016-01-23 17:00:00.000000000 +0000
-+++ ncurses-6.0-20160130/package/ncurses.spec	2016-01-30 15:30:48.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.0
--Release: 20160123
-+Release: 20160130
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
diff --git a/ncurses-6.0-20160206.patch b/ncurses-6.0-20160206.patch
deleted file mode 100644
index 94b01f3..0000000
--- a/ncurses-6.0-20160206.patch
+++ /dev/null
@@ -1,265 +0,0 @@
-# ncurses 6.0 - patch 20160206 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.0 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.0 can be found at
-# 	ftp://invisible-island.net/ncurses/6.0
-#	http://invisible-mirror.net/archives/ncurses/6.0 
-#
-# ------------------------------------------------------------------------------
-# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20160206.patch.gz
-# patch by Thomas E. Dickey 
-# created  Sun Feb  7 01:06:54 UTC 2016
-# ------------------------------------------------------------------------------
-# NEWS                             |    8 +++++++-
-# VERSION                          |    2 +-
-# configure                        |    4 ++--
-# configure.in                     |    8 ++++----
-# dist.mk                          |    4 ++--
-# package/debian-mingw/changelog   |    4 ++--
-# package/debian-mingw64/changelog |    4 ++--
-# package/debian/changelog         |    4 ++--
-# package/mingw-ncurses.nsi        |    4 ++--
-# package/mingw-ncurses.spec       |    2 +-
-# package/ncurses.spec             |    2 +-
-# test/ditto.c                     |   10 +++++++---
-# 12 files changed, 33 insertions(+), 23 deletions(-)
-# ------------------------------------------------------------------------------
-Index: NEWS
-Prereq:  1.2566 
---- ncurses-6.0-20160130+/NEWS	2016-01-30 19:38:41.000000000 +0000
-+++ ncurses-6.0-20160206/NEWS	2016-02-06 22:10:53.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.2566 2016/01/30 19:38:41 tom Exp $
-+-- $Id: NEWS,v 1.2568 2016/02/06 22:10:53 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,12 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20160206
-+	+ define WIN32_LEAN_AND_MEAN for MinGW port, making builds faster.
-+	+ modify test/ditto.c to allow $XTERM_PROG environment variable to
-+	  override "xterm" as the name of the program to run in the threaded
-+	  configuration.
-+
- 20160130
- 	+ improve formatting of man/curs_refresh.3x and man/tset.1 manpages
- 	+ regenerate HTML manpages using newer man2html to eliminate some
-Index: VERSION
---- ncurses-6.0-20160130+/VERSION	2016-01-30 15:30:48.000000000 +0000
-+++ ncurses-6.0-20160206/VERSION	2016-02-06 17:26:30.000000000 +0000
-@@ -1 +1 @@
--5:0:9	6.0	20160130
-+5:0:9	6.0	20160206
-Index: configure
---- ncurses-6.0-20160130+/configure	2015-12-20 02:07:50.000000000 +0000
-+++ ncurses-6.0-20160206/configure	2016-02-06 21:59:36.000000000 +0000
-@@ -1,5 +1,5 @@
- #! /bin/sh
--# From configure.in Revision: 1.625 .
-+# From configure.in Revision: 1.626 .
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by Autoconf 2.52.20150926.
- #
-@@ -14499,7 +14499,7 @@
- ###	Checks for libraries.
- case $cf_cv_system_name in
- (*mingw32*|*mingw64*)
--	CPPFLAGS="$CPPFLAGS -DWINVER=0x0501"
-+	CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
- 	LIBS=" -lpsapi $LIBS"
- 	;;
- (*)
-Index: configure.in
-Prereq:  1.625 
---- ncurses-6.0-20160130+/configure.in	2015-12-20 02:07:23.000000000 +0000
-+++ ncurses-6.0-20160206/configure.in	2016-02-06 21:59:17.000000000 +0000
-@@ -1,5 +1,5 @@
- dnl***************************************************************************
--dnl Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
-+dnl Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
- dnl                                                                          *
- dnl Permission is hereby granted, free of charge, to any person obtaining a  *
- dnl copy of this software and associated documentation files (the            *
-@@ -28,14 +28,14 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: configure.in,v 1.625 2015/12/20 02:07:23 tom Exp $
-+dnl $Id: configure.in,v 1.626 2016/02/06 21:59:17 tom Exp $
- dnl Process this file with autoconf to produce a configure script.
- dnl
- dnl See http://invisible-island.net/autoconf/ for additional information.
- dnl
- dnl ---------------------------------------------------------------------------
- AC_PREREQ(2.52.20030208)
--AC_REVISION($Revision: 1.625 $)
-+AC_REVISION($Revision: 1.626 $)
- AC_INIT(ncurses/base/lib_initscr.c)
- AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
- 
-@@ -1449,7 +1449,7 @@
- ###	Checks for libraries.
- case $cf_cv_system_name in
- (*mingw32*|*mingw64*)
--	CPPFLAGS="$CPPFLAGS -DWINVER=0x0501"
-+	CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
- 	LIBS=" -lpsapi $LIBS"
- 	;;
- (*)
-Index: dist.mk
-Prereq:  1.1091 
---- ncurses-6.0-20160130+/dist.mk	2016-01-30 15:30:48.000000000 +0000
-+++ ncurses-6.0-20160206/dist.mk	2016-02-06 17:26:30.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1091 2016/01/30 15:30:48 tom Exp $
-+# $Id: dist.mk,v 1.1092 2016/02/06 17:26:30 tom Exp $
- # Makefile for creating ncurses distributions.
- #
- # This only needs to be used directly as a makefile by developers, but
-@@ -37,7 +37,7 @@
- # These define the major/minor/patch versions of ncurses.
- NCURSES_MAJOR = 6
- NCURSES_MINOR = 0
--NCURSES_PATCH = 20160130
-+NCURSES_PATCH = 20160206
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20160130+/package/debian-mingw/changelog	2016-01-30 15:30:48.000000000 +0000
-+++ ncurses-6.0-20160206/package/debian-mingw/changelog	2016-02-06 17:26:30.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20160130) unstable; urgency=low
-+ncurses6 (6.0+20160206) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 30 Jan 2016 10:30:48 -0500
-+ -- Thomas E. Dickey   Sat, 06 Feb 2016 12:26:30 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20160130+/package/debian-mingw64/changelog	2016-01-30 15:30:48.000000000 +0000
-+++ ncurses-6.0-20160206/package/debian-mingw64/changelog	2016-02-06 17:26:30.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20160130) unstable; urgency=low
-+ncurses6 (6.0+20160206) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 30 Jan 2016 10:30:48 -0500
-+ -- Thomas E. Dickey   Sat, 06 Feb 2016 12:26:30 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.0-20160130+/package/debian/changelog	2016-01-30 15:30:48.000000000 +0000
-+++ ncurses-6.0-20160206/package/debian/changelog	2016-02-06 17:26:30.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20160130) unstable; urgency=low
-+ncurses6 (6.0+20160206) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 30 Jan 2016 10:30:48 -0500
-+ -- Thomas E. Dickey   Sat, 06 Feb 2016 12:26:30 -0500
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.143 
---- ncurses-6.0-20160130+/package/mingw-ncurses.nsi	2016-01-30 15:30:48.000000000 +0000
-+++ ncurses-6.0-20160206/package/mingw-ncurses.nsi	2016-02-06 17:26:30.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.143 2016/01/30 15:30:48 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.144 2016/02/06 17:26:30 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "0"
- !define VERSION_YYYY  "2016"
--!define VERSION_MMDD  "0130"
-+!define VERSION_MMDD  "0206"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20160130+/package/mingw-ncurses.spec	2016-01-30 15:30:48.000000000 +0000
-+++ ncurses-6.0-20160206/package/mingw-ncurses.spec	2016-02-06 17:26:30.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.0
--Release: 20160130
-+Release: 20160206
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20160130+/package/ncurses.spec	2016-01-30 15:30:48.000000000 +0000
-+++ ncurses-6.0-20160206/package/ncurses.spec	2016-02-06 17:26:30.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.0
--Release: 20160130
-+Release: 20160206
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: test/ditto.c
-Prereq:  1.42 
---- ncurses-6.0-20160130+/test/ditto.c	2012-11-24 20:16:18.000000000 +0000
-+++ ncurses-6.0-20160206/test/ditto.c	2016-02-06 21:19:28.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2012,2016 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -29,7 +29,7 @@
- /*
-  * Author: Thomas E. Dickey (1998-on)
-  *
-- * $Id: ditto.c,v 1.42 2012/11/24 20:16:18 tom Exp $
-+ * $Id: ditto.c,v 1.43 2016/02/06 21:19:28 tom Exp $
-  *
-  * The program illustrates how to set up multiple screens from a single
-  * program.
-@@ -155,6 +155,10 @@
-     int aslave;
-     char slave_name[1024];
-     char s_option[sizeof(slave_name) + 80];
-+    const char *xterm_prog = 0;
-+
-+    if ((xterm_prog = getenv("XTERM_PROG")) == 0)
-+	xterm_prog = "xterm";
- 
-     if (openpty(&amaster, &aslave, slave_name, 0, 0) != 0
- 	|| strlen(slave_name) > sizeof(slave_name) - 1)
-@@ -165,7 +169,7 @@
-     }
-     sprintf(s_option, "-S%s/%d", slave_name, aslave);
-     if (fork()) {
--	execlp("xterm", "xterm", s_option, "-title", path, (char *) 0);
-+	execlp(xterm_prog, xterm_prog, s_option, "-title", path, (char *) 0);
- 	_exit(0);
-     }
-     fp = fdopen(amaster, "r+");
diff --git a/ncurses-6.0-20160213.patch b/ncurses-6.0-20160213.patch
deleted file mode 100644
index 47954e1..0000000
--- a/ncurses-6.0-20160213.patch
+++ /dev/null
@@ -1,344 +0,0 @@
-# ncurses 6.0 - patch 20160213 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.0 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.0 can be found at
-# 	ftp://invisible-island.net/ncurses/6.0
-#	http://invisible-mirror.net/archives/ncurses/6.0 
-#
-# ------------------------------------------------------------------------------
-# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20160213.patch.gz
-# patch by Thomas E. Dickey 
-# created  Sun Feb 14 00:43:22 UTC 2016
-# ------------------------------------------------------------------------------
-# Ada95/gen/gen.c                  |    6 +++---
-# NEWS                             |    8 +++++++-
-# VERSION                          |    2 +-
-# dist.mk                          |    4 ++--
-# include/curses.tail              |    5 +----
-# ncurses/curses.priv.h            |    6 +++++-
-# ncurses/tinfo/lib_setup.c        |   32 +++++++++++++++-----------------
-# package/debian-mingw/changelog   |    4 ++--
-# package/debian-mingw64/changelog |    4 ++--
-# package/debian/changelog         |    4 ++--
-# package/mingw-ncurses.nsi        |    4 ++--
-# package/mingw-ncurses.spec       |    2 +-
-# package/ncurses.spec             |    2 +-
-# test/test_sgr.c                  |    4 +++-
-# 14 files changed, 47 insertions(+), 40 deletions(-)
-# ------------------------------------------------------------------------------
-Index: Ada95/gen/gen.c
-Prereq:  1.69 
---- ncurses-6.0-20160206+/Ada95/gen/gen.c	2014-05-31 21:00:08.000000000 +0000
-+++ ncurses-6.0-20160213/Ada95/gen/gen.c	2016-02-13 22:00:22.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2013,2014 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2014,2016 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -32,7 +32,7 @@
- 
- /*
-     Version Control
--    $Id: gen.c,v 1.69 2014/05/31 21:00:08 tom Exp $
-+    $Id: gen.c,v 1.70 2016/02/13 22:00:22 tom Exp $
-   --------------------------------------------------------------------------*/
- /*
-   This program prints on its standard output the source for the
-@@ -108,7 +108,7 @@
-   else				/* or */
-     bit = ~offset;		/* 7 - offset */
-   bit &= 7;			/* modulo 8 */
--  return byte & (UCHAR) (1 << bit);
-+  return (UCHAR) (byte & (1 << bit));
- }
- 
- /* Find lowest and highest used offset in a byte array. */
-Index: NEWS
-Prereq:  1.2568 
---- ncurses-6.0-20160206+/NEWS	2016-02-06 22:10:53.000000000 +0000
-+++ ncurses-6.0-20160213/NEWS	2016-02-13 21:16:08.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.2568 2016/02/06 22:10:53 tom Exp $
-+-- $Id: NEWS,v 1.2571 2016/02/13 21:16:08 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,12 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20160213
-+	+ amend fix for _nc_ripoffline from 20091031 to make test/ditto.c work
-+	  in threaded configuration.
-+	+ move _nc_tracebits, _tracedump and _tracemouse to curses.priv.h,
-+	  since they are not part of the suggested ABI6.
-+
- 20160206
- 	+ define WIN32_LEAN_AND_MEAN for MinGW port, making builds faster.
- 	+ modify test/ditto.c to allow $XTERM_PROG environment variable to
-Index: VERSION
---- ncurses-6.0-20160206+/VERSION	2016-02-06 17:26:30.000000000 +0000
-+++ ncurses-6.0-20160213/VERSION	2016-02-13 15:02:20.000000000 +0000
-@@ -1 +1 @@
--5:0:9	6.0	20160206
-+5:0:9	6.0	20160213
-Index: dist.mk
-Prereq:  1.1092 
---- ncurses-6.0-20160206+/dist.mk	2016-02-06 17:26:30.000000000 +0000
-+++ ncurses-6.0-20160213/dist.mk	2016-02-13 15:02:20.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1092 2016/02/06 17:26:30 tom Exp $
-+# $Id: dist.mk,v 1.1093 2016/02/13 15:02:20 tom Exp $
- # Makefile for creating ncurses distributions.
- #
- # This only needs to be used directly as a makefile by developers, but
-@@ -37,7 +37,7 @@
- # These define the major/minor/patch versions of ncurses.
- NCURSES_MAJOR = 6
- NCURSES_MINOR = 0
--NCURSES_PATCH = 20160206
-+NCURSES_PATCH = 20160213
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: include/curses.tail
-Prereq:  1.22 
---- ncurses-6.0-20160206+/include/curses.tail	2016-01-23 22:03:27.000000000 +0000
-+++ ncurses-6.0-20160213/include/curses.tail	2016-02-13 16:37:45.000000000 +0000
-@@ -1,4 +1,4 @@
--/* $Id: curses.tail,v 1.22 2016/01/23 22:03:27 tom Exp $ */
-+/* $Id: curses.tail,v 1.23 2016/02/13 16:37:45 tom Exp $ */
- /*
-  * vile:cmode:
-  * This file is part of ncurses, designed to be appended after curses.h.in
-@@ -128,10 +128,8 @@
- /* Debugging : use with libncurses_g.a */
- 
- extern NCURSES_EXPORT(void) _tracef (const char *, ...) GCC_PRINTFLIKE(1,2);
--extern NCURSES_EXPORT(void) _tracedump (const char *, WINDOW *);
- extern NCURSES_EXPORT(char *) _traceattr (attr_t);
- extern NCURSES_EXPORT(char *) _traceattr2 (int, chtype);
--extern NCURSES_EXPORT(char *) _nc_tracebits (void);
- extern NCURSES_EXPORT(char *) _tracechar (int);
- extern NCURSES_EXPORT(char *) _tracechtype (chtype);
- extern NCURSES_EXPORT(char *) _tracechtype2 (int, chtype);
-@@ -144,7 +142,6 @@
- #define _tracech_t		_tracechtype
- #define _tracech_t2		_tracechtype2
- #endif
--extern NCURSES_EXPORT(char *) _tracemouse (const MEVENT *);
- extern NCURSES_EXPORT(void) trace (const unsigned int);
- 
- /* trace masks */
-Index: ncurses/curses.priv.h
-Prereq:  1.551 
---- ncurses-6.0-20160206+/ncurses/curses.priv.h	2016-01-24 01:39:09.000000000 +0000
-+++ ncurses-6.0-20160213/ncurses/curses.priv.h	2016-02-13 16:37:24.000000000 +0000
-@@ -34,7 +34,7 @@
-  ****************************************************************************/
- 
- /*
-- * $Id: curses.priv.h,v 1.551 2016/01/24 01:39:09 tom Exp $
-+ * $Id: curses.priv.h,v 1.552 2016/02/13 16:37:24 tom Exp $
-  *
-  *	curses.priv.h
-  *
-@@ -1684,6 +1684,10 @@
- 
- extern NCURSES_EXPORT_VAR(unsigned)     _nc_tracing;
- 
-+extern NCURSES_EXPORT(char *) _nc_tracebits (void);
-+extern NCURSES_EXPORT(char *) _tracemouse (const MEVENT *);
-+extern NCURSES_EXPORT(void) _tracedump (const char *, WINDOW *);
-+
- #if USE_WIDEC_SUPPORT
- extern NCURSES_EXPORT(const char *) _nc_viswbuf2 (int, const wchar_t *);
- extern NCURSES_EXPORT(const char *) _nc_viswbufn (const wchar_t *, int);
-Index: ncurses/tinfo/lib_setup.c
-Prereq:  1.164 
---- ncurses-6.0-20160206+/ncurses/tinfo/lib_setup.c	2015-06-27 18:10:55.000000000 +0000
-+++ ncurses-6.0-20160213/ncurses/tinfo/lib_setup.c	2016-02-13 21:20:05.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -48,7 +48,7 @@
- #include 
- #endif
- 
--MODULE_ID("$Id: lib_setup.c,v 1.164 2015/06/27 18:10:55 tom Exp $")
-+MODULE_ID("$Id: lib_setup.c,v 1.165 2016/02/13 21:20:05 tom Exp $")
- 
- /****************************************************************************
-  *
-@@ -808,29 +808,27 @@
- NCURSES_EXPORT(SCREEN *)
- new_prescr(void)
- {
--    static SCREEN *sp;
-+    SCREEN *sp;
- 
-     START_TRACE();
-     T((T_CALLED("new_prescr()")));
- 
--    if (sp == 0) {
--	sp = _nc_alloc_screen_sp();
--	if (sp != 0) {
--	    sp->rsp = sp->rippedoff;
--	    sp->_filtered = _nc_prescreen.filter_mode;
--	    sp->_use_env = _nc_prescreen.use_env;
-+    sp = _nc_alloc_screen_sp();
-+    if (sp != 0) {
-+	sp->rsp = sp->rippedoff;
-+	sp->_filtered = _nc_prescreen.filter_mode;
-+	sp->_use_env = _nc_prescreen.use_env;
- #if NCURSES_NO_PADDING
--	    sp->_no_padding = _nc_prescreen._no_padding;
-+	sp->_no_padding = _nc_prescreen._no_padding;
- #endif
--	    sp->slk_format = 0;
--	    sp->_slk = 0;
--	    sp->_prescreen = TRUE;
--	    SP_PRE_INIT(sp);
-+	sp->slk_format = 0;
-+	sp->_slk = 0;
-+	sp->_prescreen = TRUE;
-+	SP_PRE_INIT(sp);
- #if USE_REENTRANT
--	    sp->_TABSIZE = _nc_prescreen._TABSIZE;
--	    sp->_ESCDELAY = _nc_prescreen._ESCDELAY;
-+	sp->_TABSIZE = _nc_prescreen._TABSIZE;
-+	sp->_ESCDELAY = _nc_prescreen._ESCDELAY;
- #endif
--	}
-     }
-     returnSP(sp);
- }
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20160206+/package/debian-mingw/changelog	2016-02-06 17:26:30.000000000 +0000
-+++ ncurses-6.0-20160213/package/debian-mingw/changelog	2016-02-13 15:02:20.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20160206) unstable; urgency=low
-+ncurses6 (6.0+20160213) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 06 Feb 2016 12:26:30 -0500
-+ -- Thomas E. Dickey   Sat, 13 Feb 2016 10:02:21 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20160206+/package/debian-mingw64/changelog	2016-02-06 17:26:30.000000000 +0000
-+++ ncurses-6.0-20160213/package/debian-mingw64/changelog	2016-02-13 15:02:20.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20160206) unstable; urgency=low
-+ncurses6 (6.0+20160213) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 06 Feb 2016 12:26:30 -0500
-+ -- Thomas E. Dickey   Sat, 13 Feb 2016 10:02:21 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.0-20160206+/package/debian/changelog	2016-02-06 17:26:30.000000000 +0000
-+++ ncurses-6.0-20160213/package/debian/changelog	2016-02-13 15:02:20.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20160206) unstable; urgency=low
-+ncurses6 (6.0+20160213) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 06 Feb 2016 12:26:30 -0500
-+ -- Thomas E. Dickey   Sat, 13 Feb 2016 10:02:21 -0500
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.144 
---- ncurses-6.0-20160206+/package/mingw-ncurses.nsi	2016-02-06 17:26:30.000000000 +0000
-+++ ncurses-6.0-20160213/package/mingw-ncurses.nsi	2016-02-13 15:02:20.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.144 2016/02/06 17:26:30 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.145 2016/02/13 15:02:20 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "0"
- !define VERSION_YYYY  "2016"
--!define VERSION_MMDD  "0206"
-+!define VERSION_MMDD  "0213"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20160206+/package/mingw-ncurses.spec	2016-02-06 17:26:30.000000000 +0000
-+++ ncurses-6.0-20160213/package/mingw-ncurses.spec	2016-02-13 15:02:20.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.0
--Release: 20160206
-+Release: 20160213
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20160206+/package/ncurses.spec	2016-02-06 17:26:30.000000000 +0000
-+++ ncurses-6.0-20160213/package/ncurses.spec	2016-02-13 15:02:20.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.0
--Release: 20160206
-+Release: 20160213
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: test/test_sgr.c
-Prereq:  1.5 
---- ncurses-6.0-20160206+/test/test_sgr.c	2016-01-09 18:15:53.000000000 +0000
-+++ ncurses-6.0-20160213/test/test_sgr.c	2016-02-13 22:08:16.000000000 +0000
-@@ -29,13 +29,14 @@
- /*
-  * Author: Thomas E. Dickey
-  *
-- * $Id: test_sgr.c,v 1.5 2016/01/09 18:15:53 tom Exp $
-+ * $Id: test_sgr.c,v 1.6 2016/02/13 22:08:16 tom Exp $
-  *
-  * A simple demo of the sgr/sgr0 terminal capabilities.
-  */
- #define USE_TINFO
- #include 
- 
-+#if !HAVE_TIGETSTR
- static void failed(const char *) GCC_NORETURN;
- 
- static void
-@@ -44,6 +45,7 @@
-     fprintf(stderr, "%s\n", msg);
-     ExitProgram(EXIT_FAILURE);
- }
-+#endif
- 
- #if HAVE_TIGETSTR
- 
diff --git a/ncurses-6.0-20160917.patch b/ncurses-6.0-20160917.patch
new file mode 100644
index 0000000..e56f0e0
--- /dev/null
+++ b/ncurses-6.0-20160917.patch
@@ -0,0 +1,481 @@
+# ncurses 6.0 - patch 20160917 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.0 is at
+# 	ftp.gnu.org:/pub/gnu
+#
+# Patches for ncurses 6.0 can be found at
+# 	ftp://invisible-island.net/ncurses/6.0
+#	http://invisible-mirror.net/archives/ncurses/6.0 
+#
+# ------------------------------------------------------------------------------
+# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20160917.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Sep 18 02:03:51 UTC 2016
+# ------------------------------------------------------------------------------
+# Ada95/src/Makefile.in                         |    8 ++-
+# Ada95/src/library.gpr                         |    7 +--
+# MANIFEST                                      |    1 
+# NEWS                                          |    6 ++
+# VERSION                                       |    2 
+# dist.mk                                       |    4 -
+# ncurses-6.0-20160917/Ada95/src/library-cfg.sh |   50 ++++++++++++++++++++++++
+# ncurses/tinfo/MKfallback.sh                   |   14 +++---
+# ncurses/tinfo/write_entry.c                   |    4 -
+# ncurses/win32con/win_driver.c                 |    6 +-
+# package/debian-mingw/changelog                |    4 -
+# package/debian-mingw64/changelog              |    4 -
+# package/debian/changelog                      |    4 -
+# package/mingw-ncurses.nsi                     |    4 -
+# package/mingw-ncurses.spec                    |    2 
+# package/ncurses.spec                          |    2 
+# test/ncurses.c                                |    9 ++--
+# test/worm.c                                   |   10 ++--
+# 18 files changed, 102 insertions(+), 39 deletions(-)
+# ------------------------------------------------------------------------------
+Index: Ada95/src/Makefile.in
+Prereq:  1.72 
+--- ncurses-6.0-20160910+/Ada95/src/Makefile.in	2016-08-13 18:04:27.000000000 +0000
++++ ncurses-6.0-20160917/Ada95/src/Makefile.in	2016-09-18 00:25:32.000000000 +0000
+@@ -28,7 +28,7 @@
+ #
+ #  Author:  Juergen Pfeifer, 1996
+ #
+-#  $Id: Makefile.in,v 1.72 2016/08/13 18:04:27 tom Exp $
++#  $Id: Makefile.in,v 1.73 2016/09/18 00:25:32 tom Exp $
+ #
+ .SUFFIXES:
+ 
+@@ -90,7 +90,7 @@
+ LIB_NAME	= AdaCurses
+ SONAME		= @ADA_SHAREDLIB@
+ 
+-GNAT_PROJECT	= $(srcdir)/library.gpr
++GNAT_PROJECT	= AdaCurses.gpr
+ 
+ # build/source are the Ada95 tree
+ BUILD_DIR	= ..
+@@ -270,8 +270,10 @@
+ @USE_GNAT_PROJECTS@		$(ABASE)-trace.adb \
+ @USE_GNAT_PROJECTS@		$(STATIC_C_OBJS) \
+ @USE_GNAT_PROJECTS@		$(STATIC_DIRS)
++@USE_GNAT_PROJECTS@	$(SHELL) $(srcdir)/library-cfg.sh $(srcdir)/library.gpr $(CFLAGS_NORMAL) >$(GNAT_PROJECT)
+ @USE_GNAT_PROJECTS@	$(ADAMAKE) $(ADAMAKEFLAGS) -XLIB_KIND=static
+ @USE_GNAT_PROJECTS@	$(AR) $(ARFLAGS) $@ $(STATIC_C_OBJS)
++@USE_GNAT_PROJECTS@	-rm -f $(GNAT_PROJECT)
+ @USE_GNAT_PROJECTS@
+ @USE_GNAT_LIBRARIES@install \
+ @USE_GNAT_LIBRARIES@install.libs :: \
+@@ -302,7 +304,9 @@
+ @MAKE_ADA_SHAREDLIB@		$(SHARED_DIRS) \
+ @MAKE_ADA_SHAREDLIB@		$(SHARED_OBJS)
+ @MAKE_ADA_SHAREDLIB@	cp $(SHARED_OBJS) $(BUILD_DIR)/dynamic-obj/
++@MAKE_ADA_SHAREDLIB@	$(SHELL) $(srcdir)/library-cfg.sh $(srcdir)/library.gpr $(CFLAGS_SHARED) >$(GNAT_PROJECT)
+ @MAKE_ADA_SHAREDLIB@	$(ADAMAKE) $(ADAMAKEFLAGS) -XLIB_KIND=dynamic
++@MAKE_ADA_SHAREDLIB@	-rm -f $(GNAT_PROJECT)
+ 
+ install \
+ install.libs :: $(ADA_INCLUDE)
+Index: Ada95/src/library-cfg.sh
+--- /dev/null	2016-09-17 11:34:54.124000970 +0000
++++ ncurses-6.0-20160917/Ada95/src/library-cfg.sh	2016-09-17 23:45:03.000000000 +0000
+@@ -0,0 +1,50 @@
++#!/bin/sh
++##############################################################################
++# Copyright (c) 2016 Free Software Foundation, Inc.                          #
++#                                                                            #
++# Permission is hereby granted, free of charge, to any person obtaining a    #
++# copy of this software and associated documentation files (the "Software"), #
++# to deal in the Software without restriction, including without limitation  #
++# the rights to use, copy, modify, merge, publish, distribute, distribute    #
++# with modifications, sublicense, and/or sell copies of the Software, and to #
++# permit persons to whom the Software is furnished to do so, subject to the  #
++# following conditions:                                                      #
++#                                                                            #
++# The above copyright notice and this permission notice shall be included in #
++# all copies or substantial portions of the Software.                        #
++#                                                                            #
++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,   #
++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL    #
++# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER      #
++# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING    #
++# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER        #
++# DEALINGS IN THE SOFTWARE.                                                  #
++#                                                                            #
++# Except as contained in this notice, the name(s) of the above copyright     #
++# holders shall not be used in advertising or otherwise to promote the sale, #
++# use or other dealings in this Software without prior written               #
++# authorization.                                                             #
++##############################################################################
++#
++# $Id: library-cfg.sh,v 1.1 2016/09/17 23:45:03 tom Exp $
++#
++# Work around incompatible behavior introduced with gnat6, which causes
++# gnatmake to attempt to compile all of the C objects which might be part of
++# the project.  This can only work if we provide the compiler flags (done here
++# by making a copy of the project file with that information filled in).
++input=$1
++shift 1
++param=
++while test $# != 0
++do
++	test -n "$param" && param="$param,"
++	param="$param\"$1\"" 
++	shift 1
++done
++
++sed \
++	-e '/for Default_Switches ("C") use/s,-- ,,' \
++	-e '/for Default_Switches ("C") use/s% use .*'%" use($param);"% \
++	$input
++exit 0
+Index: Ada95/src/library.gpr
+Prereq:  1.9 
+--- ncurses-6.0-20160910+/Ada95/src/library.gpr	2014-06-01 01:13:09.000000000 +0000
++++ ncurses-6.0-20160917/Ada95/src/library.gpr	2016-09-18 00:25:54.000000000 +0000
+@@ -25,10 +25,10 @@
+ -- sale, use or other dealings in this Software without prior written       --
+ -- authorization.                                                           --
+ ------------------------------------------------------------------------------
+--- $Id: library.gpr,v 1.9 2014/06/01 01:13:09 tom Exp $
++-- $Id: library.gpr,v 1.10 2016/09/18 00:25:54 tom Exp $
+ -- http://gcc.gnu.org/onlinedocs/gnat_ugn_unw/Library-Projects.html
+ -- http://www.adaworld.com/debian/debian-ada-policy.html
+-project Library is
++project AdaCurses is
+   Build_Dir := External ("BUILD_DIR");
+   Source_Dir := External ("SOURCE_DIR");
+   Source_Dir2 := External ("SOURCE_DIR2");
+@@ -51,6 +51,7 @@
+         "-gnatafno",
+         "-gnatVa",   -- All validity checks
+         "-gnatwa");  -- Activate all optional errors
++     -- for Default_Switches ("C") use 
+   end Compiler;
+   for Languages use ("C", "Ada");
+-end Library;
++end AdaCurses;
+Index: MANIFEST
+--- ncurses-6.0-20160910+/MANIFEST	2016-08-06 23:46:22.000000000 +0000
++++ ncurses-6.0-20160917/MANIFEST	2016-09-18 00:39:59.000000000 +0000
+@@ -132,6 +132,7 @@
+ ./Ada95/src/c_threaded_variables.h
+ ./Ada95/src/c_varargs_to_ada.c
+ ./Ada95/src/c_varargs_to_ada.h
++./Ada95/src/library-cfg.sh
+ ./Ada95/src/library.gpr
+ ./Ada95/src/modules
+ ./Ada95/src/ncurses_compat.c
+Index: NEWS
+Prereq:  1.2664 
+--- ncurses-6.0-20160910+/NEWS	2016-09-10 22:07:14.000000000 +0000
++++ ncurses-6.0-20160917/NEWS	2016-09-18 00:38:06.000000000 +0000
+@@ -25,7 +25,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.2664 2016/09/10 22:07:14 tom Exp $
++-- $Id: NEWS,v 1.2667 2016/09/18 00:38:06 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -45,6 +45,10 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20160917
++	+ build-fix for gnat6, which unhelpfully attempts to compile C files.
++	+ fix typo in 20160910 changes (Debian #837892, patch by Sven Joachim).
++
+ 20160910
+ 	+ trim dead code ifdef'd with HIDE_EINTR since 970830 (discussion with
+ 	  Leon Winter).
+Index: VERSION
+--- ncurses-6.0-20160910+/VERSION	2016-09-04 17:02:31.000000000 +0000
++++ ncurses-6.0-20160917/VERSION	2016-09-17 13:25:35.000000000 +0000
+@@ -1 +1 @@
+-5:0:9	6.0	20160910
++5:0:9	6.0	20160917
+Index: dist.mk
+Prereq:  1.1123 
+--- ncurses-6.0-20160910+/dist.mk	2016-09-04 17:02:31.000000000 +0000
++++ ncurses-6.0-20160917/dist.mk	2016-09-17 13:25:35.000000000 +0000
+@@ -25,7 +25,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1123 2016/09/04 17:02:31 tom Exp $
++# $Id: dist.mk,v 1.1124 2016/09/17 13:25:35 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -37,7 +37,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 0
+-NCURSES_PATCH = 20160910
++NCURSES_PATCH = 20160917
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: ncurses/tinfo/MKfallback.sh
+Prereq:  1.15 
+--- ncurses-6.0-20160910+/ncurses/tinfo/MKfallback.sh	2010-08-07 20:32:34.000000000 +0000
++++ ncurses-6.0-20160917/ncurses/tinfo/MKfallback.sh	2016-09-17 21:28:03.000000000 +0000
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ ##############################################################################
+-# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2010,2016 Free Software Foundation, Inc.                #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+ # copy of this software and associated documentation files (the "Software"), #
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: MKfallback.sh,v 1.15 2010/08/07 20:32:34 tom Exp $
++# $Id: MKfallback.sh,v 1.16 2016/09/17 21:28:03 tom Exp $
+ #
+ # MKfallback.sh -- create fallback table for entry reads
+ #
+@@ -119,17 +119,19 @@
+     const TERMTYPE	*tp;
+ 
+     for (tp = fallbacks;
+-	 	tp < fallbacks + sizeof(fallbacks)/sizeof(TERMTYPE);
+-	 	tp++)
+-	if (_nc_name_match(tp->term_names, name, "|"))
++	 tp < fallbacks + sizeof(fallbacks)/sizeof(TERMTYPE);
++	 tp++) {
++	if (_nc_name_match(tp->term_names, name, "|")) {
+ 	    return(tp);
++	}
++    }
+ EOF
+ else
+ 	echo "	/* the fallback list is empty */";
+ fi
+ 
+ cat < 0) {
+ 	    if (rc < 0)
+ 		rc = 0;
+-	    rc += nRead;
++	    rc = rc + (int) nRead;
+ 	    if (inp_rec.EventType == KEY_EVENT) {
+ 		if (!inp_rec.Event.KeyEvent.bKeyDown)
+ 		    continue;
+Index: package/debian-mingw/changelog
+--- ncurses-6.0-20160910+/package/debian-mingw/changelog	2016-09-04 17:02:31.000000000 +0000
++++ ncurses-6.0-20160917/package/debian-mingw/changelog	2016-09-17 13:25:35.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20160910) unstable; urgency=low
++ncurses6 (6.0+20160917) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 04 Sep 2016 13:02:31 -0400
++ -- Thomas E. Dickey   Sat, 17 Sep 2016 09:25:35 -0400
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.0-20160910+/package/debian-mingw64/changelog	2016-09-04 17:02:31.000000000 +0000
++++ ncurses-6.0-20160917/package/debian-mingw64/changelog	2016-09-17 13:25:35.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20160910) unstable; urgency=low
++ncurses6 (6.0+20160917) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 04 Sep 2016 13:02:31 -0400
++ -- Thomas E. Dickey   Sat, 17 Sep 2016 09:25:35 -0400
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.0-20160910+/package/debian/changelog	2016-09-04 17:02:31.000000000 +0000
++++ ncurses-6.0-20160917/package/debian/changelog	2016-09-17 13:25:35.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20160910) unstable; urgency=low
++ncurses6 (6.0+20160917) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 04 Sep 2016 13:02:31 -0400
++ -- Thomas E. Dickey   Sat, 17 Sep 2016 09:25:35 -0400
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.175 
+--- ncurses-6.0-20160910+/package/mingw-ncurses.nsi	2016-09-04 17:02:31.000000000 +0000
++++ ncurses-6.0-20160917/package/mingw-ncurses.nsi	2016-09-17 13:25:35.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.175 2016/09/04 17:02:31 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.176 2016/09/17 13:25:35 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "0"
+ !define VERSION_YYYY  "2016"
+-!define VERSION_MMDD  "0910"
++!define VERSION_MMDD  "0917"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.0-20160910+/package/mingw-ncurses.spec	2016-09-04 17:02:31.000000000 +0000
++++ ncurses-6.0-20160917/package/mingw-ncurses.spec	2016-09-17 13:25:35.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.0
+-Release: 20160910
++Release: 20160917
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.0-20160910+/package/ncurses.spec	2016-09-04 17:02:31.000000000 +0000
++++ ncurses-6.0-20160917/package/ncurses.spec	2016-09-17 13:25:35.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.0
+-Release: 20160910
++Release: 20160917
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: test/ncurses.c
+Prereq:  1.445 
+--- ncurses-6.0-20160910+/test/ncurses.c	2016-09-10 23:30:15.000000000 +0000
++++ ncurses-6.0-20160917/test/ncurses.c	2016-09-17 21:12:04.000000000 +0000
+@@ -40,7 +40,7 @@
+    Author: Eric S. Raymond  1993
+            Thomas E. Dickey (beginning revision 1.27 in 1996).
+ 
+-$Id: ncurses.c,v 1.445 2016/09/10 23:30:15 tom Exp $
++$Id: ncurses.c,v 1.446 2016/09/17 21:12:04 tom Exp $
+ 
+ ***************************************************************************/
+ 
+@@ -2704,7 +2704,8 @@
+ 	int n;
+ 	int got;
+ 	char result[BUFSIZ];
+-	int check_n, check_r, check_g, check_b;
++	int check_n;
++	unsigned check_r, check_g, check_b;
+ 
+ 	raw();
+ 	noecho();
+@@ -6925,11 +6926,11 @@
+     show_string_setting("longname", longname());
+     show_number_setting("baudrate", baudrate());
+     if (erasechar() > 0) {
+-	show_string_setting("unctrl(erasechar)", unctrl(erasechar()));
++	show_string_setting("unctrl(erasechar)", unctrl((chtype) erasechar()));
+ 	show_string_setting("keyname(erasechar)", keyname(erasechar()));
+     }
+     if (killchar() > 0) {
+-	show_string_setting("unctrl(killchar)", unctrl(killchar()));
++	show_string_setting("unctrl(killchar)", unctrl((chtype) killchar()));
+ 	show_string_setting("keyname(killchar)", keyname(killchar()));
+     }
+ #if USE_WIDEC_SUPPORT
+Index: test/worm.c
+Prereq:  1.65 
+--- ncurses-6.0-20160910+/test/worm.c	2013-06-22 20:01:41.000000000 +0000
++++ ncurses-6.0-20160917/test/worm.c	2016-09-17 21:12:30.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2012,2013 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2013,2016 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -61,7 +61,7 @@
+   traces will be dumped.  The program stops and waits for one character of
+   input at the beginning and end of the interval.
+ 
+-  $Id: worm.c,v 1.65 2013/06/22 20:01:41 tom Exp $
++  $Id: worm.c,v 1.66 2016/09/17 21:12:30 tom Exp $
+ */
+ 
+ #include 
+@@ -324,9 +324,9 @@
+ static bool
+ quit_worm(int bitnum)
+ {
+-    pending |= (1 << bitnum);
++    pending = (pending | (unsigned) (1 << bitnum));
+     napms(10);			/* let the other thread(s) have a chance */
+-    pending &= ~(1 << bitnum);
++    pending = (pending & (unsigned) ~(1 << bitnum));
+     return quitting;
+ }
+ 
+@@ -335,7 +335,7 @@
+ {
+     unsigned long compare = 0;
+     Trace(("start_worm"));
+-    while (!quit_worm(((struct worm *) arg) - worm)) {
++    while (!quit_worm((int) (((struct worm *) arg) - worm))) {
+ 	while (compare < sequence) {
+ 	    ++compare;
+ #if HAVE_USE_WINDOW
diff --git a/ncurses-6.0-20160924.patch b/ncurses-6.0-20160924.patch
new file mode 100644
index 0000000..725c297
--- /dev/null
+++ b/ncurses-6.0-20160924.patch
@@ -0,0 +1,478 @@
+# ncurses 6.0 - patch 20160924 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.0 is at
+# 	ftp.gnu.org:/pub/gnu
+#
+# Patches for ncurses 6.0 can be found at
+# 	ftp://invisible-island.net/ncurses/6.0
+#	http://invisible-mirror.net/archives/ncurses/6.0 
+#
+# ------------------------------------------------------------------------------
+# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20160924.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sat Sep 24 23:30:47 UTC 2016
+# ------------------------------------------------------------------------------
+# NEWS                             |    7 +
+# VERSION                          |    2 
+# dist.mk                          |    4 
+# misc/terminfo.src                |  214 +++++++++++++++++++++++++++++--------
+# ncurses/tinfo/comp_expand.c      |   10 +
+# package/debian-mingw/changelog   |    4 
+# package/debian-mingw64/changelog |    4 
+# package/debian/changelog         |    4 
+# package/mingw-ncurses.nsi        |    4 
+# package/mingw-ncurses.spec       |    2 
+# package/ncurses.spec             |    2 
+# 11 files changed, 198 insertions(+), 59 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.2667 
+--- ncurses-6.0-20160917+/NEWS	2016-09-18 00:38:06.000000000 +0000
++++ ncurses-6.0-20160924/NEWS	2016-09-24 22:47:32.000000000 +0000
+@@ -25,7 +25,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.2667 2016/09/18 00:38:06 tom Exp $
++-- $Id: NEWS,v 1.2670 2016/09/24 22:47:32 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -45,6 +45,11 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20160924
++	+ modify _nc_tic_expand to escape comma if it immediately follows a
++	  percent sign, to work with minitel change.
++	+ updated minitel and viewdata descriptions (Alexandre Montaron).
++
+ 20160917
+ 	+ build-fix for gnat6, which unhelpfully attempts to compile C files.
+ 	+ fix typo in 20160910 changes (Debian #837892, patch by Sven Joachim).
+Index: VERSION
+--- ncurses-6.0-20160917+/VERSION	2016-09-17 13:25:35.000000000 +0000
++++ ncurses-6.0-20160924/VERSION	2016-09-24 13:36:42.000000000 +0000
+@@ -1 +1 @@
+-5:0:9	6.0	20160917
++5:0:9	6.0	20160924
+Index: dist.mk
+Prereq:  1.1124 
+--- ncurses-6.0-20160917+/dist.mk	2016-09-17 13:25:35.000000000 +0000
++++ ncurses-6.0-20160924/dist.mk	2016-09-24 13:36:42.000000000 +0000
+@@ -25,7 +25,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1124 2016/09/17 13:25:35 tom Exp $
++# $Id: dist.mk,v 1.1125 2016/09/24 13:36:42 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -37,7 +37,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 0
+-NCURSES_PATCH = 20160917
++NCURSES_PATCH = 20160924
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: misc/terminfo.src
+--- ncurses-6.0-20160917+/misc/terminfo.src	2016-08-17 08:17:26.000000000 +0000
++++ ncurses-6.0-20160924/misc/terminfo.src	2016-09-24 22:01:35.000000000 +0000
+@@ -6,8 +6,8 @@
+ # Report bugs and new terminal descriptions to
+ #	bug-ncurses@gnu.org
+ #
+-#	$Revision: 1.566 $
+-#	$Date: 2016/08/17 08:17:26 $
++#	$Revision: 1.569 $
++#	$Date: 2016/09/24 22:01:35 $
+ #
+ # The original header is preserved below for reference.  It is noted that there
+ # is a "newer" version which differs in some cosmetic details (but actually
+@@ -18709,64 +18709,186 @@
+ 	smacs=^N, smir=\E[4h, smso=\E[7m, smul=\E[4m, tsl=^_@A,
+ 	u6=\E[%i%d;%dR, u7=\E[6n,
+ 
+-# From: Alexandre Montaron , 18 Jun 1998
++# From: Alexandre Montaron , 18 Jun 1998, updated 19 Sep 2016
+ #
+ minitel1|minitel 1,
+-	am, bw, eslok, hs, hz, msgr,
+-	colors#8, cols#40, lines#24, pairs#8,
+-	bel=^G, blink=\EH, civis=^T, clear=^L, cnorm=^Q, cr=^M,
+-	cub1=^H, cud1=^J, cuf1=^I,
+-	cup=\037%p1%'A'%+%c%p2%'A'%+%c, cuu1=^K, el=^X,
++	am, bw, eslok, hs, hz, .msgr, G0,
++	colors#8, cols#40, lines#24, pairs#8, .ncv#16,
++	acsc=j+k+l+m+n+o~q`s_t+u+v+w+x|, bel=^G, blink=\EH,
++	civis=^T, clear=^L, cnorm=^Q, cr=^M, cub1=^H, cud1=^J, cuf1=^I,
++	cup=\037%p1%'A'%+%c%p2%'A'%+%c, cuu1=^K,
++	dsl=\037@A\030\n, el=^X,
+ 	flash=\037@A\EW \177\022\177\022P\r\030\n, fsl=^J,
+-	home=^^, ind=^J, is2=\E;`ZQ\E\:iC\E\:iE\021, nel=^M^J,
+-	op=\EG, rep=%p1%c\022%p2%'?'%+%c, rev=\E], ri=^K,
+-	rmso=\E\\,
++	home=^^, ind=^J, is2=\E;`ZQ\E\:iC\E\:iE\021, kbs=^SG,
++	kcan=^SE, kend=^SI, kent=^SA, khlp=^SD, knp=^SH, kpp=^SB,
++	krfr=^SC, nel=^M^J, op=\EG, rep=%p1%c\022%p2%'?'%+%c,
++	rev=\E], ri=^K, rmso=\E\\,
++	rs2=\024\037XA\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\014\021,
++	setab=\0, setaf=\E%p1%'@'%+%c, setb=\0,
+ 	setf=\E%?%p1%{1}%=%tD%e%p1%{3}%=%tF%e%p1%{4}%=%tA%e%p1%{6}%=%tC%e%p1%'@'%+%c%;,
+ 	sgr=%?%p1%t\E]%;%?%p3%t\E]%;%?%p4%t\EH%;,
+-	sgr0=\EI\E\\, smso=\E], tsl=\037@%p1%'A'%+%c,
+-	u6=\037%c%'A'%-%c%'A'%-, u7=\Ea, .acsc=}#f0g1\,\,+../,
+-	.enacs=^Y, .rs2=^L, .u8=\001Br4\004, .u9=\E9{,
+-# is2=Fnct TE, Fnct ER, Fnct CM et pour finir: curseur ON.
++	sgr0=\EI\E\\\EG, smso=\E], tsl=\037@%p1%'A'%+%c,
++	u6=\037%c%'A'%-%c%'A'%-, u7=\Ea,
++	u8=\001%[BCDEFGHIJKLbcresdfg0123456789]\004, u9=\E9{,
++	.dim=\EB, .hup=\E9g, .rs2=^L, .u8=\001Br4\004,
++	C0=`>a9f!j%k4l\,\277?\,\300AA\,\301BA\,\302CA\,\303DA\,\304HA\,\305JA\,\306a\,\307KC\,\310AE\,\311BE\,\312CE\,\313HE\,\314AI\,\315BI\,\316CI\,\317HI\,\320b\,\321DN\,\322AO\,\323BO\,\324CO\,\325DO\,\326HO\,\3274\,\330i\,\331AU\,\332BU\,\333CU\,\334HU\,\335BY\,\336l\,\337{\,\340Aa\,\341Ba\,\342Ca\,\343Da\,\344Ha\,\345Ja\,\346q\,\347Kc\,\350Ae\,\351Be\,\352Ce\,\353He\,\354Ai\,\355Bi\,\356Ci\,\357Hi\,\360r\,\361Dn\,\362Ao\,\363Bo\,\364Co\,\365Do\,\366Ho\,\3678\,\370y\,\371Au\,\372Bu\,\373Cu\,\374Hu\,\375By\,\376|\,\377Hy\,\252c\,\,0\017\031%\016\,}#\,f0\,g1\,\\\,\\\,\,+.\,./\,0\177\,--,
+ minitel1b|minitel 1-bistandard (in 40cols mode),
+ 	mir,
+ 	cub=\E[%p1%dD, cud=\E[%p1%dB, cuf=\E[%p1%dC,
+ 	cuu=\E[%p1%dA, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM,
+ 	dl1=\E[M, ed=\E[J, el1=\E[1K, il=\E[%p1%dL, il1=\E[L,
+-	is1=\E;iYA\E;jYC, kclr=\E[2J, kctab=^I, kcub1=\E[D,
+-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P, kdl1=\E[M,
+-	khome=\E[H, kich1=\E[4h, kil1=\E[L, rmir=\E[4l, smir=\E[4h,
+-	.ich=\E[%p1%d@, .ich1=\E[@, .kel=^X, .rmkx=\E;jYA,
+-	.smkx=\E;iYA\E;jYC, .u8=\001Cu<\004, use=minitel1,
++	is1=\E;iYA\E;jYC, kbs@, kcan@, kclr=\E[2J, kctab=^I,
++	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P,
++	kdl1=\E[M, kent@, kf1=^SD, kf10=^Y0, kf11=^Y1, kf12=^Y/,
++	kf13=^Y{1, kf14=^Y{2, kf15=^Y{3, kf16=^Y{4, kf17=^Y{5,
++	kf18=^Y{6, kf19=^Y{7, kf2=^SC, kf20=^Y{8, kf21=^Y{9,
++	kf22=^Y{0, kf23=^Y{*, kf24=^Y{#, kf3=^SF, kf4=^SA, kf5=^SG,
++	kf6=^SE, kf7=^Y8, kf8=^Y\,, kf9=^Y., khlp@, khome=\E[H,
++	kich1=\E[4h, kil1=\E[L, krfr@, lf1=Guide, lf2=Repetition,
++	lf3=Sommaire, lf4=Envoi, lf5=Correction, lf6=Annulation,
++	rmir=\E[4l, smir=\E[4h,
++	u8=\001%[ABCPtuvwxyz0123456789\:;<=>?]\004,
++	.ich=\E[%p1%d@, .ich1=\E[@, .kLFT=\E[P, .kRIT=\E[4h,
++	.kb2=^Y{g, .kcbt=^Y{i, .kel=^X, .mc0=\E\:|k, .rmkx=\E;jYA,
++	.rs1=\E[4l\E[2l, .smkx=\E;iYA\E;jYC, .u8=\001Cu<\004,
++	use=minitel1,
+ # rmkx posait des problemes (logout en sortant de vi).
+ minitel1b-80|minitel 1-bistandard (standard teleinformatique),
+-	am@, bw@, hz@,
++	am@, bw@, eslok@, hz@, msgr, G0,
+ 	colors@, cols#80, it#8, pairs@,
+-	blink=\E[5m, bold=\E[1m, civis=\037@A\024\n,
++	acsc@, blink=\E[5m, bold=\E[1m, civis=\037@A\024\n,
+ 	clear=\E[H\E[J, cnorm=\037@A\021\n, cuf1=\E[C,
+ 	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, el=\E[K, home=\E[H,
+-	ht=^I, ind=\ED, is1@, is2@, kbs=\EOl, kcan=\EOQ, kent=\EOM,
+-	kf0=\EOp, kf1=\EOq, kf2=\EOr, kf3=\EOs, kf4=\EOt, kf5=\EOu,
++	ht=^I, ind=\ED, is1@, is2@, kbs=\EOl, kcan=\EOQ, kend=\E)4\r,
++	kent=\EOM, kf1=\EOq, kf10=\EOp, kf11=\EOP1, kf12=\EOP2,
++	kf13=\EOP3, kf14=\EOP4, kf15=\EOP5, kf16=\EOP6, kf17=\EOP7,
++	kf18=\EOP8, kf19=\EOP9, kf2=\EOr, kf20=\EOP0, kf21=\EOP*,
++	kf22=\EOP#, kf23@, kf24@, kf3=\EOs, kf4=\EOt, kf5=\EOu,
+ 	kf6=\EOv, kf7=\EOw, kf8=\EOx, kf9=\EOy, khlp=\EOm, knp=\EOn,
+-	kpp=\EOR, krfr=\EOS, nel=\EE, op@, rc=\E8, rep@, rev=\E[7m,
+-	ri=\EM, rmkx@, rmso=\E[27m, rmul=\E[24m, rs2=\E[H\E[J\E[m,
+-	sc=\E7, setf@, sgr@, sgr0=\E[m, smkx@, smso=\E[7m, smul=\E[4m,
+-	u6@, u7@, .acsc=}#f[, .enacs=^O, .mc0=\E[i, .rmacs=^O,
+-	.rs2=\Ec,
++	kpp=\EOR, krfr=\EOS, lf1@, lf2@, lf3@, lf4@, lf5@, lf6@, nel=\EE,
++	op@, rc=\E8, rep@, rev=\E[7m, ri=\EM, rmkx@, rmso=\E[27m,
++	rmul=\E[24m,
++	rs2=\036\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[J\E[m,
++	sc=\E7, setab@, setaf@, setb@, setf@, sgr@, sgr0=\E[m, smkx@,
++	smso=\E[7m, smul=\E[4m,
++	tsl=\037@%?%p1%{63}%<%t%p1%'A'%+%c%e\177%p1%{62}%-%Pa%?%ga%{1}%&%t\011%;%?%ga%{2}%&%t\011\011%;%?%ga%{4}%&%t\011\011\011\011%;%?%ga%{07}%>%t\011\011\011\011\011\011\011\011%;%?%ga%{15}%>%t\011\011\011\011\011\011\011\011%;%;,
++	u6@, u7@, u8@, u9@, .acsc=}#f[, .enacs=^O, .kb2=\EOPg,
++	.kcbt=\EOPi, .ll=\E[24H, .mc0=\E[i, .rmacs=^O, .rs2=\Ec,
+ 	.sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m,
+-	.smacs=^N, use=minitel1b,
++	.smacs=^N, C0=}#f[j+k+l+m+n+o~q=s_t+u+v+w+x!0\032,
++	E0=^O, S0=^N,
++	XC=B\016%\017\,\243#\,\247]\,\260[\,\340@\,\347\\\\\,\351{\,\350}\,\371|\,\300A\,\301A\,\302A\,\303A\,\304A\,\305A\,\306E\,\307C\,\310E\,\311E\,\312E\,\313E\,\314I\,\315I\,\316I\,\317I\,\320D\,\321N\,\322O\,\323O\,\324O\,\325O\,\326O\,\331U\,\332U\,\333U\,\334U\,\335Y\,\337s\,\341a\,\342a\,\343a\,\344a\,\345a\,\346e\,\352e\,\353e\,\354i\,\355i\,\356i\,\357i\,\360d\,\361n\,\362o\,\363o\,\364o\,\365o\,\366o\,\372u\,\373u\,\374u\,\375y\,\377y\,\267.\,\327x\,\367/\,\261\E7\E[4m+\E8\E[C\,\,0\017%\016\,x|\,y\E7\E[4m<\E8\E[C\,z\E7\E[4m>\E8\E[C\,g\E7\E[4m+\E8\E[C,
++	use=minitel1b,
++
++minitel1-nb|minitel 1 (40cols) noir & blanc sans couleurs avec bold et dim ...,
++	colors@, pairs@,
++	bold=\EG, clear=^L\EB,
++	cup=\037%p1%'A'%+%c%p2%'A'%+%c\EB, dim=\ED, home=^^\EB,
++	op@, rs2=^L\EB, setab@, setaf@, setb@, setf@,
++	sgr=%?%p1%p3%O%t\E]%;%?%p4%t\EH%;%?%p5%t\ED%;%?%p6%t\EG%;,
++	sgr0=\EI\E\\\EB, tsl=\037@%p1%'A'%+%c\EB, .invis=\E@,
++	use=minitel1,
++
+ minitel1b-nb|minitel 1b (40cols) noir & blanc sans couleurs avec bold et dim ...,
++	msgr,
+ 	colors@, pairs@,
+ 	acsc=`>a9f!j%k4l%t\n\n\n\n\n\n\n\n%;%?%p1%{15}%>%t\n\n\n\n\n\n\n\n%;%?%p1%{4}%&%t\n\n\n\n%;%?%p1%{2}%&%t\n\n%;%?%p1%{1}%&%t\n%;%?%p2%{07}%>%t\011\011\011\011\011\011\011\011%;%?%p2%{15}%>%t\011\011\011\011\011\011\011\011%;%?%p2%{23}%>%t\011\011\011\011\011\011\011\011%;%?%p2%{31}%>%t\011\011\011\011\011\011\011\011%;%?%p2%{4}%&%t\011\011\011\011%;%?%p2%{2}%&%t\011\011%;%?%p2%{1}%&%t\011%;,
+-	cuu1=^K, home=^^, nel=^M^J, .el=^X, .ind=^J,
++	cuu1=^K, home=^^, nel=^M^J, rs2=^L, .el=^X, .ind=^J,
+ 	.rep=%p1%c\022%p2%'?'%+%c, .ri=^K,
+-# Also:
+-# viewdata-rv works with some applications (e.g. emacs, xemacs) but fails with vim.
++
++viewdata-o|optimized version of viewdata prestel/viewdata terminals,
++	cup=\036%p1%?%p2%{20}%>%t%?%p1%{23}%=%t%Pa%{1}%e%{1}%+%;%;%Pa%?%ga%{13}%<%t%?%ga%{07}%>%t\n\n\n\n\n\n\n\n%;%?%ga%{4}%&%t\n\n\n\n%;%?%ga%{2}%&%t\n\n%;%?%ga%{1}%&%t\n%;%e%{24}%ga%-%Pa%?%ga%{07}%>%t\013\013\013\013\013\013\013\013%;%?%ga%{4}%&%t\013\013\013\013%;%?%ga%{2}%&%t\013\013%;%?%ga%{1}%&%t\013%;%;%?%p2%{21}%<%t%?%p2%{07}%>%t\011\011\011\011\011\011\011\011%;%?%p2%{15}%>%t\011\011\011\011\011\011\011\011%;%?%p2%{4}%&%t\011\011\011\011%;%?%p2%{2}%&%t\011\011%;%?%p2%{1}%&%t\011%;%e%{40}%p2%-%Pa%?%ga%{07}%>%t\010\010\010\010\010\010\010\010%;%?%ga%{15}%>%t\010\010\010\010\010\010\010\010%;%?%ga%{4}%&%t\010\010\010\010%;%?%ga%{2}%&%t\010\010%;%?%ga%{1}%&%t\010%;%?%p1%{23}%=%t\013%;%;,
++	.ll=^^^K, use=viewdata,
++
++# Samples with TERM=viewdata and TERM=viewdata-rv: http://canal.chez.com/blog/
++
+ viewdata-rv|prestel/viewdata terminals with reverse capabilitie (as green),
+ 	xmc#1,
+-	rmso=\EG, smso=\EB, use=viewdata,
++	rmso=\EG, smso=\EB, use=viewdata-o,
+ 
+ ######## OBSOLETE VDT TYPES
+ #
+@@ -23854,4 +23981,9 @@
+ # 20160817
+ #	+ correct a typo in interix -TD
+ #
++# 2016-09-24
++#	+ updated minitel entries to use status line with screen(1), as well as
++#	  printing special G2 videotex chars like french accentuated glyph
++#	  using special cap XC= (patch by Alexandre Montaron).
++#
+ ######## SHANTIH!  SHANTIH!  SHANTIH!
+Index: ncurses/tinfo/comp_expand.c
+Prereq:  1.25 
+--- ncurses-6.0-20160917+/ncurses/tinfo/comp_expand.c	2012-03-24 18:37:17.000000000 +0000
++++ ncurses-6.0-20160924/ncurses/tinfo/comp_expand.c	2016-09-24 21:15:51.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2012,2016 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -35,7 +35,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: comp_expand.c,v 1.25 2012/03/24 18:37:17 tom Exp $")
++MODULE_ID("$Id: comp_expand.c,v 1.26 2016/09/24 21:15:51 tom Exp $")
+ 
+ static int
+ trailing_spaces(const char *src)
+@@ -46,10 +46,10 @@
+ }
+ 
+ /* this deals with differences over whether 0x7f and 0x80..0x9f are controls */
+-#define REALCTL(s) (UChar(*(s)) < 127 && iscntrl(UChar(*(s))))
++#define REALCTL(s)   (UChar(*(s)) < 127 && iscntrl(UChar(*(s))))
+ #define REALPRINT(s) (UChar(*(s)) < 127 && isprint(UChar(*(s))))
+ 
+-#define P_LIMIT(p) (length - (size_t)(p))
++#define P_LIMIT(p)   (length - (size_t)(p))
+ 
+ NCURSES_EXPORT(char *)
+ _nc_tic_expand(const char *srcp, bool tic_format, int numbers)
+@@ -133,6 +133,8 @@
+ 		}
+ 		break;
+ 	    default:
++		if (*str == ',')	/* minitel1 uses this */
++		    buffer[bufp++] = '\\';
+ 		buffer[bufp++] = *str;
+ 		break;
+ 	    }
+Index: package/debian-mingw/changelog
+--- ncurses-6.0-20160917+/package/debian-mingw/changelog	2016-09-17 13:25:35.000000000 +0000
++++ ncurses-6.0-20160924/package/debian-mingw/changelog	2016-09-24 13:36:42.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20160917) unstable; urgency=low
++ncurses6 (6.0+20160924) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 17 Sep 2016 09:25:35 -0400
++ -- Thomas E. Dickey   Sat, 24 Sep 2016 09:36:42 -0400
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.0-20160917+/package/debian-mingw64/changelog	2016-09-17 13:25:35.000000000 +0000
++++ ncurses-6.0-20160924/package/debian-mingw64/changelog	2016-09-24 13:36:42.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20160917) unstable; urgency=low
++ncurses6 (6.0+20160924) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 17 Sep 2016 09:25:35 -0400
++ -- Thomas E. Dickey   Sat, 24 Sep 2016 09:36:42 -0400
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.0-20160917+/package/debian/changelog	2016-09-17 13:25:35.000000000 +0000
++++ ncurses-6.0-20160924/package/debian/changelog	2016-09-24 13:36:42.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20160917) unstable; urgency=low
++ncurses6 (6.0+20160924) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 17 Sep 2016 09:25:35 -0400
++ -- Thomas E. Dickey   Sat, 24 Sep 2016 09:36:42 -0400
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.176 
+--- ncurses-6.0-20160917+/package/mingw-ncurses.nsi	2016-09-17 13:25:35.000000000 +0000
++++ ncurses-6.0-20160924/package/mingw-ncurses.nsi	2016-09-24 13:36:42.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.176 2016/09/17 13:25:35 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.177 2016/09/24 13:36:42 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "0"
+ !define VERSION_YYYY  "2016"
+-!define VERSION_MMDD  "0917"
++!define VERSION_MMDD  "0924"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.0-20160917+/package/mingw-ncurses.spec	2016-09-17 13:25:35.000000000 +0000
++++ ncurses-6.0-20160924/package/mingw-ncurses.spec	2016-09-24 13:36:42.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.0
+-Release: 20160917
++Release: 20160924
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.0-20160917+/package/ncurses.spec	2016-09-17 13:25:35.000000000 +0000
++++ ncurses-6.0-20160924/package/ncurses.spec	2016-09-24 13:36:42.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.0
+-Release: 20160917
++Release: 20160924
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/ncurses-6.0-20161001.patch b/ncurses-6.0-20161001.patch
new file mode 100644
index 0000000..e2ba724
--- /dev/null
+++ b/ncurses-6.0-20161001.patch
@@ -0,0 +1,5340 @@
+# ncurses 6.0 - patch 20161001 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.0 is at
+# 	ftp.gnu.org:/pub/gnu
+#
+# Patches for ncurses 6.0 can be found at
+# 	ftp://invisible-island.net/ncurses/6.0
+#	http://invisible-mirror.net/archives/ncurses/6.0 
+#
+# ------------------------------------------------------------------------------
+# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20161001.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Oct  2 01:31:28 UTC 2016
+# ------------------------------------------------------------------------------
+# NEWS                             |    9 
+# VERSION                          |    2 
+# dist.mk                          |    4 
+# man/infocmp.1m                   |    9 
+# man/tic.1m                       |    9 
+# misc/terminfo.src                | 1964 ++++++++++++++++++++++++++-----------
+# ncurses/tty/lib_mvcur.c          |    5 
+# package/debian-mingw/changelog   |    4 
+# package/debian-mingw64/changelog |    4 
+# package/debian/changelog         |    4 
+# package/mingw-ncurses.nsi        |    4 
+# package/mingw-ncurses.spec       |    2 
+# package/ncurses.spec             |    2 
+# progs/dump_entry.c               |  205 +++
+# progs/dump_entry.h               |    9 
+# progs/infocmp.c                  |   20 
+# progs/tic.c                      |   24 
+# 17 files changed, 1653 insertions(+), 627 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.2670 
+--- ncurses-6.0-20160924+/NEWS	2016-09-24 22:47:32.000000000 +0000
++++ ncurses-6.0-20161001/NEWS	2016-10-02 01:30:44.000000000 +0000
+@@ -25,7 +25,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.2670 2016/09/24 22:47:32 tom Exp $
++-- $Id: NEWS,v 1.2673 2016/10/02 01:30:44 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -45,6 +45,13 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20161001
++	+ add -W option to tic/infocmp to force long strings to wrap.  This is
++	  in addition to the -w option which attempts to fit capabilities into
++	  a given line-length.
++	+ add linux-m1 minitel entries (patch by Alexandre Montaron).
++	+ correct rs2 string for vt100-nam -TD
++
+ 20160924
+ 	+ modify _nc_tic_expand to escape comma if it immediately follows a
+ 	  percent sign, to work with minitel change.
+Index: VERSION
+--- ncurses-6.0-20160924+/VERSION	2016-09-24 13:36:42.000000000 +0000
++++ ncurses-6.0-20161001/VERSION	2016-10-01 11:52:22.000000000 +0000
+@@ -1 +1 @@
+-5:0:9	6.0	20160924
++5:0:9	6.0	20161001
+Index: dist.mk
+Prereq:  1.1125 
+--- ncurses-6.0-20160924+/dist.mk	2016-09-24 13:36:42.000000000 +0000
++++ ncurses-6.0-20161001/dist.mk	2016-10-01 11:52:22.000000000 +0000
+@@ -25,7 +25,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1125 2016/09/24 13:36:42 tom Exp $
++# $Id: dist.mk,v 1.1126 2016/10/01 11:52:22 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -37,7 +37,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 0
+-NCURSES_PATCH = 20160924
++NCURSES_PATCH = 20161001
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: man/infocmp.1m
+Prereq:  1.57 
+--- ncurses-6.0-20160924+/man/infocmp.1m	2015-09-05 20:50:22.000000000 +0000
++++ ncurses-6.0-20161001/man/infocmp.1m	2016-10-01 17:15:45.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: infocmp.1m,v 1.57 2015/09/05 20:50:22 tom Exp $
++.\" $Id: infocmp.1m,v 1.58 2016/10/01 17:15:45 tom Exp $
+ .TH @INFOCMP@ 1M ""
+ .ds n 5
+ .de bP
+@@ -50,6 +50,7 @@
+ T\
+ U\
+ V\
++W\
+ c\
+ d\
+ e\
+@@ -476,6 +477,10 @@
+ \fB\-v\fR \fIn\fR
+ prints out tracing information on standard error as the program runs.
+ Higher values of n induce greater verbosity.
++.TP
++\fB\-W\fR
++By itself, the \fB\-w\fP option will not force long strings to be wrapped.
++Use the \fB\-W\fP option to do this.
+ .TP 5
+ \fB\-w\fR \fIwidth\fR
+ changes the output to \fIwidth\fR characters.
+Index: man/tic.1m
+Prereq:  1.61 
+--- ncurses-6.0-20160924+/man/tic.1m	2015-09-05 20:45:49.000000000 +0000
++++ ncurses-6.0-20161001/man/tic.1m	2016-10-01 17:14:50.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tic.1m,v 1.61 2015/09/05 20:45:49 tom Exp $
++.\" $Id: tic.1m,v 1.62 2016/10/01 17:14:50 tom Exp $
+ .TH @TIC@ 1M ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -54,6 +54,7 @@
+ T\
+ U\
+ V\
++W\
+ a\
+ c\
+ f\
+@@ -339,6 +340,10 @@
+ If the debug level \fIn\fR is not given, it is taken to be one.
+ .RE
+ .TP
++\fB\-W\fR
++By itself, the \fB\-w\fP option will not force long strings to be wrapped.
++Use the \fB\-W\fP option to do this.
++.TP
+ \fB\-w\fR\fIn\fR
+ specifies the width of the output.
+ The parameter is optional.
+Index: misc/terminfo.src
+--- ncurses-6.0-20160924+/misc/terminfo.src	2016-09-24 22:01:35.000000000 +0000
++++ ncurses-6.0-20161001/misc/terminfo.src	2016-10-02 01:19:07.000000000 +0000
+@@ -6,8 +6,8 @@
+ # Report bugs and new terminal descriptions to
+ #	bug-ncurses@gnu.org
+ #
+-#	$Revision: 1.569 $
+-#	$Date: 2016/09/24 22:01:35 $
++#	$Revision: 1.572 $
++#	$Date: 2016/10/02 01:19:07 $
+ #
+ # The original header is preserved below for reference.  It is noted that there
+ # is a "newer" version which differs in some cosmetic details (but actually
+@@ -370,12 +370,12 @@
+ 	rmul=\E[m, smul=\E[4m,
+ ansi+sgrbold|ansi graphic renditions; assuming terminal has bold; not dim,
+ 	bold=\E[1m,
+-	sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;%?%p7%t8;%;m,
+-	use=ansi+sgr, use=ansi+sgrso, use=ansi+sgrul,
++	sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;
++	    %;%?%p7%t8;%;m, use=ansi+sgr, use=ansi+sgrso, use=ansi+sgrul,
+ ansi+sgrdim|ansi graphic renditions; assuming terminal has dim; not bold,
+ 	dim=\E[2m,
+-	sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p5%t2;%;%?%p7%t8;%;m,
+-	use=ansi+sgr, use=ansi+sgrso, use=ansi+sgrul,
++	sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p5%t2;
++	    %;%?%p7%t8;%;m, use=ansi+sgr, use=ansi+sgrso, use=ansi+sgrul,
+ ansi+csr|ansi scroll-region plus cursor save & restore,
+ 	csr=\E[%i%p1%d;%p2%dr, rc=\E8, sc=\E7,
+ 
+@@ -396,7 +396,9 @@
+ # will work with any Intel console, they all seem to have inherited \E[11m
+ # from the ANSI.SYS de-facto standard.
+ klone+acs|alternate character set for ansi.sys displays,
+-	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
++	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j
++	     \331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v
++	     \301w\302x\263y\363z\362{\343|\330}\234~\376,
+ 	rmacs=\E[10m, smacs=\E[11m,
+ 
+ # Highlight controls corresponding to the ANSI.SYS standard.  Most
+@@ -406,15 +408,16 @@
+ klone+sgr|attribute control for ansi.sys displays,
+ 	blink=\E[5m, bold=\E[1m, rev=\E[7m, rmpch=\E[10m,
+ 	rmso=\E[m, rmul=\E[m,
+-	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p9%t;11%;m,
++	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6
++	    %t;1%;%?%p9%t;11%;m,
+ 	sgr0=\E[0;10m, smpch=\E[11m, smso=\E[7m, smul=\E[4m,
+ 	use=klone+acs,
+ 
+ # Most Intel boxes do not treat "invis" (invisible) text.
+ klone+sgr8|attribute control for ansi.sys displays,
+ 	invis=\E[8m,
+-	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
+-	use=klone+sgr,
++	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6
++	    %t;1%;%?%p7%t;8%;%?%p9%t;11%;m, use=klone+sgr,
+ 
+ # Highlight controls corresponding to the ANSI.SYS standard.  *All*
+ # console drivers for Intel boxes obey these.  Does not assume \E[11m will
+@@ -423,14 +426,18 @@
+ klone+sgr-dumb|attribute control for ansi.sys displays (no ESC [ 11 m),
+ 	blink=\E[5m, bold=\E[1m, invis=\E[8m, rev=\E[7m, rmso=\E[m,
+ 	rmul=\E[m,
+-	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;12%;m,
++	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6
++	    %t;1%;%?%p7%t;8%;%?%p9%t;12%;m,
+ 	sgr0=\E[0;10m, smacs=\E[12m, smso=\E[7m, smul=\E[4m,
+ 	use=klone+acs,
+ 
+ # KOI8-R (RFC1489) acs (alternate character set)
+ # From: Qing Long , 24 Feb 1996.
+ klone+koi8acs|alternate character set for ansi.sys displays with KOI8 charset,
+-	acsc=+\020\,\021-\036.^_0\215`\004a\237f\234g\232h\222i\220j\205k\203l\202m\204n\212o\213p\216q\0r\217s\214t\206u\207v\210w\211x\201y\230z\231{\267|\274}L~\225,
++	acsc=+\020\,\021-\036.^_0\215`\004a\237f\234g\232h\222i
++	     \220j\205k\203l\202m\204n\212o\213p\216q\0r\217s\214t
++	     \206u\207v\210w\211x\201y\230z\231{\267|\274}L
++	     ~\225,
+ 	rmacs=\E[10m, smacs=\E[11m,
+ 
+ # ANSI.SYS color control.  The setab/setaf caps depend on the coincidence
+@@ -664,8 +671,9 @@
+ 	kf42=\0m, kf43=\0n, kf44=\0o, kf45=\0p, kf46=\0q,
+ 	kf47=\0\213, kf48=\0\214, kf5=\0?, kf6=\0@, kf7=\0A, kf8=\0B,
+ 	kf9=\0C, khome=\0G, kich1=\0R, knp=\0Q, kpp=\0I,
+-	pfkey=\E[0;%?%p1%{11}%<%t%'\:'%e%p1%{13}%<%t%'z'%e%p1%{23}%<%t%'G'%e%p1%{25}%<%t%'p'%e%p1%'#'%<%t%'E'%e%p1%'%'%<%t%'f'%e%p1%'/'%<%t%'C'%e%{92}%;%p1%+%d;%p2"%s"p,
+-	use=ansi.sys-old,
++	pfkey=\E[0;%?%p1%{11}%<%t%'\:'%e%p1%{13}%<%t%'z'%e%p1%{23}%<
++	      %t%'G'%e%p1%{25}%<%t%'p'%e%p1%'#'%<%t%'E'%e%p1%'%'%<%t
++	      %'f'%e%p1%'/'%<%t%'C'%e%{92}%;%p1%+%d;%p2"%s"p, use=ansi.sys-old,
+ 
+ #
+ # Define IBM PC keypad keys for vi as per MS-Kermit while using ANSI.SYS.
+@@ -681,10 +689,12 @@
+ # Consequently the End keypad key could not be set (it is relatively safe and
+ # actually useful because it sends ^@ O, which beeps and opens a line above).
+ ansi.sysk|ansisysk|PC-DOS 3.1 ANSI.SYS with keypad redefined for vi,
+-	is2=U2 PC-DOS 3.1 ANSI.SYS with keypad redefined for vi 9-29-86\n\E[;75;8p,
+-	rmkx=\E[;71;0;71p\E[;72;0;72p\E[;73;0;73p\E[;77;0;77p\E[;80;0;80p\E[;81;0;81p\E[;82;0;82p\E[;83;0;83p,
+-	smkx=\E[;71;30p\E[;72;11p\E[;73;27;21p\E[;77;12p\E[;80;10p\E[;81;27;4p\E[;82;27;27;105p\E[;83;127p,
+-	use=ansi.sys,
++	is2=U2\sPC-DOS\s3.1\sANSI.SYS\swith\skeypad\sredefined\sfor
++	    \svi\s9-29-86\n\E[;75;8p,
++	rmkx=\E[;71;0;71p\E[;72;0;72p\E[;73;0;73p\E[;77;0;77p\E[;80;
++	     0;80p\E[;81;0;81p\E[;82;0;82p\E[;83;0;83p,
++	smkx=\E[;71;30p\E[;72;11p\E[;73;27;21p\E[;77;12p\E[;80;10p
++	     \E[;81;27;4p\E[;82;27;27;105p\E[;83;127p, use=ansi.sys,
+ #
+ # Adds ins/del line/character, hence vi reverse scrolls/inserts/deletes nicer.
+ nansi.sys|nansisys|PC-DOS Public Domain NANSI.SYS,
+@@ -695,8 +705,8 @@
+ # See ansi.sysk and nansi.sys above.
+ nansi.sysk|nansisysk|PC-DOS Public Domain NANSI.SYS with keypad redefined for vi,
+ 	dch1=\E[1P, dl1=\E[1M, ich1=\E[1@, il1=\E[1L,
+-	is2=U4 PC-DOS Public Domain NANSI.SYS with keypad redefined for vi 9-29-86\n\E[;75;8p,
+-	use=ansi.sysk,
++	is2=U4\sPC-DOS\sPublic\sDomain\sNANSI.SYS\swith\skeypad
++	    \sredefined\sfor\svi\s9-29-86\n\E[;75;8p, use=ansi.sysk,
+ 
+ #### Atari ST terminals
+ 
+@@ -706,11 +716,14 @@
+ 	bce,
+ 	colors#16, pairs#256,
+ 	oc=\Eb?\Ec0, op=\Eb?\Ec0,
+-	setab=\Ec%?%p1%{0}%=%t?%e%p1%{7}%=%t0%e%p1%{15}%=%t7%e%p1%{48}%+%c,
+-	setaf=\Eb%?%p1%{0}%=%t?%e%p1%{7}%=%t0%e%p1%{15}%=%t7%e%p1%{48}%+%c,
+-	setb=\Ec%?%p1%{0}%=%t?%e%p1%{7}%=%t0%e%p1%{15}%=%t7%e%p1%{48}%+%c,
+-	setf=\Eb%?%p1%{0}%=%t?%e%p1%{7}%=%t0%e%p1%{15}%=%t7%e%p1%{48}%+%c,
+-	use=tw52-m,
++	setab=\Ec%?%p1%{0}%=%t?%e%p1%{7}%=%t0%e%p1%{15}%=%t7%e%p1
++	      %{48}%+%c,
++	setaf=\Eb%?%p1%{0}%=%t?%e%p1%{7}%=%t0%e%p1%{15}%=%t7%e%p1
++	      %{48}%+%c,
++	setb=\Ec%?%p1%{0}%=%t?%e%p1%{7}%=%t0%e%p1%{15}%=%t7%e%p1
++	     %{48}%+%c,
++	setf=\Eb%?%p1%{0}%=%t?%e%p1%{7}%=%t0%e%p1%{15}%=%t7%e%p1
++	     %{48}%+%c, use=tw52-m,
+ tw52-m|Toswin window manager monochrome,
+ 	ul,
+ 	ma#999,
+@@ -724,11 +737,26 @@
+ 	bce,
+ 	colors#16, pairs#256,
+ 	is2=\Ev\Eq\Ee\Eb1\Ec0, rs2=\Ev\Eq\Ee\Eb1\Ec0,
+-	setab=\Ec%?%p1%{0}%=%t1%e%p1%{1}%=%t2%e%p1%{2}%=%t3%e%p1%{3}%=%t>%e%p1%{4}%=%t4%e%p1%{5}%=%t7%e%p1%{6}%=%t5%e%p1%{7}%=%t0%e%p1%{8}%=%t8%e%p1%{9}%=%t9%e%p1%{10}%=%t\:%e%p1%{11}%=%t;%e%p1%{12}%=%t<%e%p1%{13}%=%t=%e%p1%{14}%=%t6%e?,
+-	setaf=\Eb%?%p1%{0}%=%t1%e%p1%{1}%=%t2%e%p1%{2}%=%t3%e%p1%{3}%=%t>%e%p1%{4}%=%t4%e%p1%{5}%=%t7%e%p1%{6}%=%t5%e%p1%{7}%=%t0%e%p1%{8}%=%t8%e%p1%{9}%=%t9%e%p1%{10}%=%t\:%e%p1%{11}%=%t;%e%p1%{12}%=%t<%e%p1%{13}%=%t=%e%p1%{14}%=%t6%e?,
+-	setb=\Ec%?%p1%{0}%=%t1%e%p1%{1}%=%t2%e%p1%{2}%=%t3%e%p1%{3}%=%t>%e%p1%{4}%=%t4%e%p1%{5}%=%t7%e%p1%{6}%=%t5%e%p1%{7}%=%t0%e%p1%{8}%=%t8%e%p1%{9}%=%t9%e%p1%{10}%=%t\:%e%p1%{11}%=%t;%e%p1%{12}%=%t<%e%p1%{13}%=%t=%e%p1%{14}%=%t6%e?,
+-	setf=\Eb%?%p1%{0}%=%t1%e%p1%{1}%=%t2%e%p1%{2}%=%t3%e%p1%{3}%=%t>%e%p1%{4}%=%t4%e%p1%{5}%=%t7%e%p1%{6}%=%t5%e%p1%{7}%=%t0%e%p1%{8}%=%t8%e%p1%{9}%=%t9%e%p1%{10}%=%t\:%e%p1%{11}%=%t;%e%p1%{12}%=%t<%e%p1%{13}%=%t=%e%p1%{14}%=%t6%e?,
+-	use=st52,
++	setab=\Ec%?%p1%{0}%=%t1%e%p1%{1}%=%t2%e%p1%{2}%=%t3%e%p1%{3}
++	      %=%t>%e%p1%{4}%=%t4%e%p1%{5}%=%t7%e%p1%{6}%=%t5%e%p1
++	      %{7}%=%t0%e%p1%{8}%=%t8%e%p1%{9}%=%t9%e%p1%{10}%=%t\:
++	      %e%p1%{11}%=%t;%e%p1%{12}%=%t<%e%p1%{13}%=%t=%e%p1
++	      %{14}%=%t6%e?,
++	setaf=\Eb%?%p1%{0}%=%t1%e%p1%{1}%=%t2%e%p1%{2}%=%t3%e%p1%{3}
++	      %=%t>%e%p1%{4}%=%t4%e%p1%{5}%=%t7%e%p1%{6}%=%t5%e%p1
++	      %{7}%=%t0%e%p1%{8}%=%t8%e%p1%{9}%=%t9%e%p1%{10}%=%t\:
++	      %e%p1%{11}%=%t;%e%p1%{12}%=%t<%e%p1%{13}%=%t=%e%p1
++	      %{14}%=%t6%e?,
++	setb=\Ec%?%p1%{0}%=%t1%e%p1%{1}%=%t2%e%p1%{2}%=%t3%e%p1%{3}
++	     %=%t>%e%p1%{4}%=%t4%e%p1%{5}%=%t7%e%p1%{6}%=%t5%e%p1
++	     %{7}%=%t0%e%p1%{8}%=%t8%e%p1%{9}%=%t9%e%p1%{10}%=%t\:%e
++	     %p1%{11}%=%t;%e%p1%{12}%=%t<%e%p1%{13}%=%t=%e%p1%{14}%=
++	     %t6%e?,
++	setf=\Eb%?%p1%{0}%=%t1%e%p1%{1}%=%t2%e%p1%{2}%=%t3%e%p1%{3}
++	     %=%t>%e%p1%{4}%=%t4%e%p1%{5}%=%t7%e%p1%{6}%=%t5%e%p1
++	     %{7}%=%t0%e%p1%{8}%=%t8%e%p1%{9}%=%t9%e%p1%{10}%=%t\:%e
++	     %p1%{11}%=%t;%e%p1%{12}%=%t<%e%p1%{13}%=%t=%e%p1%{14}%=
++	     %t6%e?, use=st52,
+ st52|st52-m|at|at-m|atari|atari-m|atari_st|atarist-m|Atari ST,
+ 	am, eo, mir, npc,
+ 	cols#80, it#8, lines#24,
+@@ -746,7 +774,8 @@
+ tw100|toswin vt100 window mgr,
+ 	eo, mir, msgr, xon,
+ 	colors#8, cols#80, it#8, lines#24, pairs#64, vt#3,
+-	acsc=++\,\,--..00II``aaffgghhjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
++	acsc=++\,\,--..00II``aaffgghhjjkkllmmnnooppqqrrssttuuvvwwxxy
++	     yzz{{||}}~~,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, civis=\Ef,
+ 	clear=\E[2J\E[H, cnorm=\Ee, cr=^M, csr=\E[%i%p1%d;%p2%dr,
+ 	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\EB,
+@@ -765,8 +794,12 @@
+ 	rmso=\E[m, rmul=\E[m,
+ 	rs1=\E<\E[20l\E[?3;6;9l\E[r\Eq\E(B\017\E)0\E>,
+ 	sc=\E7,
+-	setb=\E[4%p1%'0'%+%Pa%?%ga%'0'%=%t0%e%ga%'1'%=%t4%e%ga%'2'%=%t2%e%ga%'3'%=%t6%e%ga%'4'%=%t1%e%ga%'5'%=%t5%e%ga%'6'%=%t3%e7%;m,
+-	setf=\E[3%p1%'0'%+%Pa%?%ga%'0'%=%t0%e%ga%'1'%=%t4%e%ga%'2'%=%t2%e%ga%'3'%=%t6%e%ga%'4'%=%t1%e%ga%'5'%=%t5%e%ga%'6'%=%t3%e7%;m,
++	setb=\E[4%p1%'0'%+%Pa%?%ga%'0'%=%t0%e%ga%'1'%=%t4%e%ga%'2'%=
++	     %t2%e%ga%'3'%=%t6%e%ga%'4'%=%t1%e%ga%'5'%=%t5%e%ga%'6'
++	     %=%t3%e7%;m,
++	setf=\E[3%p1%'0'%+%Pa%?%ga%'0'%=%t0%e%ga%'1'%=%t4%e%ga%'2'%=
++	     %t2%e%ga%'3'%=%t6%e%ga%'4'%=%t1%e%ga%'5'%=%t5%e%ga%'6'
++	     %=%t3%e7%;m,
+ 	sgr0=\E[m, smacs=^N, smcup=\E[?7l, smir=\Eh,
+ 	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+ # The entries for stv52 and stv52pc probably need a revision.
+@@ -789,7 +822,9 @@
+ stv52pc|MiNT virtual console with PC charset,
+ 	am, msgr,
+ 	cols#80, it#8, lines#30,
+-	acsc=+\257\,\256-\^.v0\333I\374`\177a\260f\370g\361h\261j\331k\277l\332m\300n\305o\377p-q\304r-s_t+u+v+w+x\263y\363z\362{\343|\366}\234~\371,
++	acsc=+\257\,\256-\^.v0\333I\374`\177a\260f\370g\361h\261j
++	     \331k\277l\332m\300n\305o\377p-q\304r-s_t+u+v+w+x\263y
++	     \363z\362{\343|\366}\234~\371,
+ 	bel=^G, blink=\Er, bold=\EyA, civis=\Ef, clear=\EE,
+ 	cnorm=\E. \Ee, cr=^M, cub1=^H, cud1=\EB, cuf1=\EC,
+ 	cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, cvvis=\E.",
+@@ -816,8 +851,7 @@
+ # From: Paul M. Aoki 
+ uniterm|uniterm49|UniTerm VT220 emulator with 49 lines,
+ 	lines#49,
+-	is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;49r\E[49;1H,
+-	use=vt220,
++	is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;49r\E[49;1H, use=vt220,
+ # MiNT VT52 emulation. 80 columns, 25 rows.
+ # MiNT is Now TOS, the operating system which comes with all Ataris now
+ # (mainly Atari Falcon). This termcap is for the VT52 emulation you get
+@@ -1058,20 +1092,25 @@
+ 	kcuf1=\EOC, kcuu1=\EOA, kent=\EOM, rc=\E8, rev=\E[7m, ri=\EM,
+ 	rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
+ 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7,
+-	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m,
++	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
++	    %p5%t;2%;%?%p7%t;8%;m,
+ 	sgr0=\E[m, smam=\E[?7h, smkx=\E[?1h\E=, smso=\E[7m,
+ 	smul=\E[4m, tbc=\E[3g, use=vt100+enq, use=vt100+pfkeys,
+ 
+ nsterm+acs|AppKit Terminal.app v41+ basic capabilities w/VT100 alternate-charset,
+ 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ 	enacs=\E(B\E)0, rmacs=^O,
+-	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
++	    %p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, use=nsterm+7,
+ 
+ nsterm+mac|AppKit Terminal.app v41+ basic capabilities w/MacRoman alternate-charset,
+-	acsc=+\335\,\334-\366.\3770#`\327a\:f\241g\261h#i\360jjkkllmmnno\370p\370q\321rrssttuuvvwwxxy\262z\263{\271|\255}\243~\245,
++	acsc=+\335\,\334-\366.\3770#`\327a\:f\241g\261h#i
++	     \360jjkkllmmnno\370p\370q\321rrssttuuvvwwxxy\262z\263{
++	     \271|\255}\243~\245,
+ 	enacs=\E(B\E)0, rmacs=^O,
+-	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
++	    %p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, use=nsterm+7,
+ 
+ # compare with xterm+sl-twm
+@@ -1303,8 +1342,8 @@
+ iTerm.app|iterm|iTerm.app terminal emulator for Mac OS X,
+ 	bce, bw@,
+ 	csr@, dim@, kend=\EOF, khome=\EOH,
+-	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+-	use=xterm+256setaf, use=nsterm-16color,
++	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
++	    %p7%t;8%;m%?%p9%t\016%e\017%;, use=xterm+256setaf, use=nsterm-16color,
+ 
+ # xnuppc - Darwin PowerPC Console (a.k.a. "darwin")
+ #
+@@ -1429,7 +1468,8 @@
+ 
+ xnuppc+f|Darwin PowerPC Console fancy color support,
+ 	ncv#35,
+-	sgr=\E[0%?%p6%t;35%;%?%p2%t;36;4%;%?%p1%t;33;44%;%?%p3%t;7%;m,
++	sgr=\E[0%?%p6%t;35%;%?%p2%t;36;4%;%?%p1%t;33;44%;%?%p3%t;7%;
++	    m,
+ 	smso=\E[33;44m, smul=\E[36;4m, use=xnuppc+b,
+ 
+ xnuppc+f2|Darwin PowerPC Console alternate fancy color support,
+@@ -1631,7 +1671,9 @@
+ linux-basic|linux console,
+ 	am, bce, eo, mir, msgr, xenl, xon,
+ 	it#8, ncv#18, U8#1,
+-	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i\316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
++	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i
++	     \316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u
++	     \264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
+ 	bel=^G, clear=\E[H\E[J, cr=^M, csr=\E[%i%p1%d;%p2%dr,
+ 	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=^J,
+ 	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
+@@ -1649,7 +1691,8 @@
+ 	khome=\E[1~, kich1=\E[2~, kmous=\E[M, knp=\E[6~, kpp=\E[5~,
+ 	kspd=^Z, nel=^M^J, rc=\E8, rev=\E[7m, ri=\EM, rmam=\E[?7l,
+ 	rmir=\E[4l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec\E]R, sc=\E7,
+-	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p9%t;11%;m,
++	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5
++	    %t;2%;%?%p6%t;1%;%?%p9%t;11%;m,
+ 	smam=\E[?7h, smir=\E[4h, smul=\E[4m, tbc=\E[3g,
+ 	vpa=\E[%i%p1%dd, use=vt102+enq, use=klone+sgr,
+ 	use=ecma+color,
+@@ -1665,12 +1708,21 @@
+ # 1.9.9.
+ linux-c-nc|linux console with color-change,
+ 	ccc,
+-	initc=\E]P%p1%x%p2%{255}%*%{1000}%/%02x%p3%{255}%*%{1000}%/%02x%p4%{255}%*%{1000}%/%02x,
++	initc=\E]P%p1%x%p2%{255}%*%{1000}%/%02x%p3%{255}%*%{1000}%/
++	      %02x%p4%{255}%*%{1000}%/%02x,
+ 	oc=\E]R, use=linux-basic,
+ # From: Dennis Henriksen , 9 July 1996
+ linux-c|linux console 1.3.6+ for older ncurses,
+ 	ccc,
+-	initc=\E]P%?%p1%{9}%>%t%p1%{10}%-%'a'%+%c%e%p1%d%;%p2%{255}%*%{1000}%/%Pr%gr%{16}%/%Px%?%gx%{9}%>%t%gx%{10}%-%'a'%+%c%e%gx%d%;%gr%{15}%&%Px%?%gx%{9}%>%t%gx%{10}%-%'a'%+%c%e%gx%d%;%p3%{255}%*%{1000}%/%Pr%gr%{16}%/%Px%?%gx%{9}%>%t%gx%{10}%-%'a'%+%c%e%gx%d%;%gr%{15}%&%Px%?%gx%{9}%>%t%gx%{10}%-%'a'%+%c%e%gx%d%;%p4%{255}%*%{1000}%/%Pr%gr%{16}%/%Px%?%gx%{9}%>%t%gx%{10}%-%'a'%+%c%e%gx%d%;%gr%{15}%&%Px%?%gx%{9}%>%t%gx%{10}%-%'a'%+%c%e%gx%d%;,
++	initc=\E]P%?%p1%{9}%>%t%p1%{10}%-%'a'%+%c%e%p1%d%;%p2%{255}
++	      %*%{1000}%/%Pr%gr%{16}%/%Px%?%gx%{9}%>%t%gx%{10}%-%'a'
++	      %+%c%e%gx%d%;%gr%{15}%&%Px%?%gx%{9}%>%t%gx%{10}%-%'a'
++	      %+%c%e%gx%d%;%p3%{255}%*%{1000}%/%Pr%gr%{16}%/%Px%?%gx
++	      %{9}%>%t%gx%{10}%-%'a'%+%c%e%gx%d%;%gr%{15}%&%Px%?%gx
++	      %{9}%>%t%gx%{10}%-%'a'%+%c%e%gx%d%;%p4%{255}%*%{1000}
++	      %/%Pr%gr%{16}%/%Px%?%gx%{9}%>%t%gx%{10}%-%'a'%+%c%e%gx
++	      %d%;%gr%{15}%&%Px%?%gx%{9}%>%t%gx%{10}%-%'a'%+%c%e
++	      %gx%d%;,
+ 	oc=\E]R, use=linux-basic,
+ 
+ # The 2.2.x kernels add a private mode that sets the cursor type; use that to
+@@ -1690,9 +1742,11 @@
+ #	'r' scan line 7
+ #	'_' scan line 9
+ linux2.6|linux 2.6.x console,
+-	acsc=++\,\,--..00__``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}c~~,
++	acsc=++\,\,--..00__``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwx
++	     xyyzz{{||}c~~,
+ 	enacs=\E(B\E)0, rmacs=^O,
+-	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;m%?%p9%t\016%e\017%;,
++	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5
++	    %t;2%;%?%p6%t;1%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, use=linux2.2,
+ 
+ # The 3.0 kernel adds support for clearing scrollback buffer (capability E3).
+@@ -1720,8 +1774,9 @@
+ # This assumes you have used setfont(8) to load one of the Linux koi8-r fonts.
+ # acsc entry from Pavel Roskin" , 29 Sep 1997.
+ linux-koi8|linux with koi8 alternate character set,
+-	acsc=+\020\,\021-\030.^Y0\215`\004a\221f\234g\237h\220i\276j\205k\203l\202m\204n\212o~p\0q\0r\0s_t\206u\207v\211w\210x\201y\230z\231{\267|\274~\224,
+-	use=linux, use=klone+koi8acs,
++	acsc=+\020\,\021-\030.^Y0\215`\004a\221f\234g\237h\220i
++	     \276j\205k\203l\202m\204n\212o~p\0q\0r\0s_t\206u\207v
++	     \211w\210x\201y\230z\231{\267|\274~\224, use=linux, use=klone+koi8acs,
+ 
+ # Another entry for KOI8-r with Qing Long's acsc.
+ # (which one better complies with the standard?)
+@@ -1730,14 +1785,16 @@
+ 
+ # Entry for the latin1 and latin2 fonts
+ linux-lat|linux with latin1 or latin2 alternate character set,
+-	acsc=+\020\,\021-\030.^Y0\333`\004a\013f\370g\361h\260i\316j\211k\214l\206m\203n\305o~p\304q\212r\304s_t\207u\215v\301w\302x\205y\363z\362{\343|\330}\234~\376,
+-	use=linux,
++	acsc=+\020\,\021-\030.^Y0\333`\004a\013f\370g\361h\260i
++	     \316j\211k\214l\206m\203n\305o~p\304q\212r\304s_t\207u
++	     \215v\301w\302x\205y\363z\362{\343|\330}\234~\376, use=linux,
+ 
+ # This uses graphics from VT codeset instead of from cp437.
+ # reason: cp437 (aka "straight to font") is not functional under luit.
+ # from: Andrey V Lukyanov .
+ linux-vt|linux console using VT codes for graphics,
+-	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz~~,
++	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
++	     yzz~~,
+ 	rmacs=\E(K, rmpch@, sgr@, sgr0=\E[0m\E(K\017, smacs=\E(0,
+ 	smpch@, use=linux,
+ 
+@@ -1823,12 +1880,14 @@
+ #
+ # Added nel, hpa, sgr and removed rmacs, smacs based on source -TD
+ mach-gnu|GNU Mach,
+-	acsc=+>\,<-\^.v0\333`+a\261f\370g\361h\260i#j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
++	acsc=+>\,<-\^.v0\333`+a\261f\370g\361h\260i#j\331k\277l
++	     \332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x
++	     \263y\363z\362{\343|\330}\234~\376,
+ 	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, ech=\E[%p1%dX,
+ 	el1=\E[1K, hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ich1=\E[@,
+ 	indn=\E[%p1%dS, invis=\E[8m, nel=\EE, rin=\E[%p1%dT,
+-	sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p7%t;8%;m,
+-	use=mach,
++	sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;
++	    2%;%?%p6%t;1%;%?%p7%t;8%;m, use=mach,
+ 
+ mach-gnu-color|Mach Console with ANSI color,
+ 	colors#8, pairs#64,
+@@ -1865,7 +1924,8 @@
+ hurd|The GNU Hurd console server,
+ 	am, bce, bw, eo, km, mir, msgr, xenl, xon,
+ 	colors#8, it#8, ncv#18, pairs#64,
+-	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
++	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
++	     yzz{{||}}~~,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
+ 	clear=\Ec, cnorm=\E[?25h, cr=^M, csr=\E[%i%p1%d;%p2%dr,
+ 	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\E[B,
+@@ -1887,7 +1947,8 @@
+ 	rin=\E[%p1%dT, ritm=\E[23m, rmacs=\E[10m, rmir=\E[4l,
+ 	rmso=\E[27m, rmul=\E[24m, rs1=\EM\E[?1000l, sc=\E7,
+ 	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+-	sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
++	sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;
++	    2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
+ 	sgr0=\E[0m, sitm=\E[3m, smacs=\E[11m, smir=\E[4h,
+ 	smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd, grbom=\E[>1l,
+ 	gsbom=\E[>1h,
+@@ -1906,7 +1967,8 @@
+ qnx|qnx4|qnx console,
+ 	daisy, km, mir, msgr, xhpa, xt,
+ 	colors#8, cols#80, it#4, lines#25, ncv#3, pairs#8,
+-	acsc=O\333a\261j\331k\277l\332m\300n\305o\337q\304s\334t\303u\264v\301w\302x\263,
++	acsc=O\333a\261j\331k\277l\332m\300n\305o\337q\304s\334t
++	     \303u\264v\301w\302x\263,
+ 	bel=^G, blink=\E{, bold=\E<, civis=\Ey0, clear=\EH\EJ,
+ 	cnorm=\Ey1, cr=^M, cub1=^H, cud1=^J, cuf1=\EC,
+ 	cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, cvvis=\Ey2,
+@@ -2032,9 +2094,12 @@
+ 	rin=\E[%p1%dT, rmacs=^O, rmam=\E[?7l, rmso=\E[27m,
+ 	rmul=\E[24m, rs1=\017\E[?7h\E[0;39;49m$<2>\E>\E[?1l,
+ 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
+-	setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
+-	setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
+-	sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%t;7%;%?%p7%t;9%;m%?%p9%t\016%e\017%;,
++	setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
++	     %=%t3%e%p1%d%;m,
++	setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
++	     %=%t3%e%p1%d%;m,
++	sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1
++	    %|%t;7%;%?%p7%t;9%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smso=\E[7m,
+ 	smul=\E[4m, tbc=\E[3g,
+ 	tsl=\E7\E1;24r\E[?6l\E[25;%i%p1%dH,
+@@ -2088,7 +2153,9 @@
+ scoansi-old|SCO Extended ANSI standard crt (5.0.5),
+ 	OTbs, am, bce, eo, xon,
+ 	colors#8, cols#80, it#8, lines#25, pairs#64,
+-	acsc=+/\,.-\230.\2310[5566778899\:\:;;<<==>>FFGGHHIIJJKKLLMMNNOOPPQQRRSSTTUUVVWWXX`\204a0fxgqh2jYk?lZm@nEqDtCu4vAwBx3yszr{c}\034~\207,
++	acsc=+/\,.-\230.\2310[5566778899\:\:;;<<==>>FFGGHHIIJJKKLLMM
++	     NNOOPPQQRRSSTTUUVVWWXX`\204a0fxgqh2jYk?lZm@nEqDtCu4vAwB
++	     x3yszr{c}\034~\207,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z,
+ 	civis=\E[=14;12C, clear=\E[H\E[2J, cnorm=\E[=10;12C,
+ 	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\E[B,
+@@ -2119,7 +2186,8 @@
+ 	civis=\E[=0c, cnorm=\E[=1c, csr=\E[%i%p1%d;%p2%dr,
+ 	cvvis=\E[=2c, mgc=\E[=r, oc=\E[51m, op=\E[50m,
+ 	rep=\E[%p1%d;%p2%db, rmm=\E[=11L,
+-	sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;12%e;10%;m,
++	sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p6%t;1%;%?
++	    %p7%t;8%;%?%p9%t;12%e;10%;m,
+ 	smgb=\E[=1;0m, smgbp=\E[=1;%i%p1%dm,
+ 	smglp=\E[=2;%i%p1%dm, smgr=\E[=3;0m,
+ 	smgrp=\E[=3;%i%p1%dm, smgt=\E[=0;0m,
+@@ -2235,13 +2303,16 @@
+ 	kf9=\E[20~, khome=\E[7~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
+ 	krfr=^R,
+ pccon+sgr+acs0|sgr and simple ASCII pseudographics for OpenBSD PC console,
+-	acsc=+>\,<-\^.v0#`+a\:f\\h#i#j+k+l+m+n+o~p-q-r-s_t+u+v+w+x|y#z#{*|!}#~o,
++	acsc=+>\,<-\^.v0#`+a\:f\\h#i#j+k+l+m+n+o~p-q-r-s_t+u+v+w+x|y
++	     #z#{*|!}#~o,
+ 	sgr=\E[0%?%p1%p3%|%t;7%;%?%p6%t;1%;%?%p2%t;4%;m,
+ 	sgr0=\E[m,
+ pccon+sgr+acs|sgr and default ASCII pseudographics for OpenBSD PC console,
+-	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
++	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
++	     yzz{{||}}~~,
+ 	enacs=\E)0$<5>, rmacs=\E(B$<5>,
+-	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;$<2>,
++	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e
++	    \E(B%;$<2>,
+ 	sgr0=\E[m\E(B$<5>, smacs=\E(0$<5>,
+ # underline renders as color
+ pccon+colors|ANSI colors for OpenBSD PC console,
+@@ -2284,7 +2355,8 @@
+ pcvtXX|pcvt vt200 emulator (DEC VT220),
+ 	am, km, mir, msgr, xenl,
+ 	it#8, vt#3,
+-	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz~~,
++	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
++	     yzz~~,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l,
+ 	clear=\E[H\E[J, cnorm=\E[?25h, cr=^M,
+ 	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
+@@ -2383,7 +2455,8 @@
+ 	rmacs=^O, rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m$<2>,
+ 	rmul=\E[m$<2>, rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
+ 	sc=\E7,
+-	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\016%e\017%;$<2>,
++	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
++	    %;%?%p7%t;8%;m%?%p9%t\016%e\017%;$<2>,
+ 	sgr0=\E[m\017$<2>, smacs=^N, smam=\E[?7h, smkx=\E[?1h\E=,
+ 	smso=\E[7m$<2>, smul=\E[4m$<2>, tbc=\E[3g, use=ecma+sgr,
+ 	use=klone+color,
+@@ -2417,7 +2490,8 @@
+ 	kf4=\2330x, kf5=\2330t, kf6=\2330u, kf7=\2330q, kf8=\2330r,
+ 	kf9=\2330p, knp=\233/, kpp=\233?, nel=^M^J, rev=\2337m,
+ 	rmso=\2330m, rmul=\2330m,
+-	sgr=\2330%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p5%t2%;%?%p7%t8%;%?%p1%p3%|%t;7%;m,
++	sgr=\2330%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p5%t2%;%?%p7%t8
++	    %;%?%p1%p3%|%t;7%;m,
+ 	sgr0=\2330m, smso=\2337m, smul=\2334m,
+ 
+ # NetBSD "wscons" emulator in vt220 mode.
+@@ -2571,11 +2645,13 @@
+ 	knp=\E[G, kpp=\E[I, nel=\E[E, op=\E[x, rc=\E8, rev=\E[7m,
+ 	ri=\E[T, rin=\E[%p1%dT, rmso=\E[m, rs2=\E[x\E[m\Ec, sc=\E7,
+ 	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+-	sgr=\E[0%?%p1%t;2;7%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;30;1%;%?%p6%t;1%;m,
++	sgr=\E[0%?%p1%t;2;7%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;30;1%;%?
++	    %p6%t;1%;m,
+ 	sgr0=\E[m, smso=\E[7m, vpa=\E[%i%p1%dd,
+ cons25|ansis|ansi80x25|freebsd console (25-line ansi mode),
+-	acsc=-\030.^Y0\333`\004a\260f\370g\361h\261i\025j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x\263y\363z\362~\371,
+-	use=cons25w,
++	acsc=-\030.^Y0\333`\004a\260f\370g\361h\261i\025j\331k\277l
++	     \332m\300n\305q\304t\303u\264v\301w\302x\263y\363z
++	     \362~\371, use=cons25w,
+ cons25-debian|freebsd console with debian backspace (25-line ansi mode),
+ 	kbs=\177, kdch1=\E[3~, use=cons25,
+ cons25-m|ansis-mono|ansi80x25-mono|freebsd console (25-line mono ansi mode),
+@@ -2600,12 +2676,14 @@
+ cons60-m|ansi80x60-mono|freebsd console (60-line mono ansi mode),
+ 	lines#60, use=cons25-m,
+ cons25r|pc3r|ibmpc3r|cons25-koi8-r|freebsd console w/koi8-r cyrillic,
+-	acsc=-\030.^Y0\215`\004a\220f\234h\221i\025j\205k\203l\202m\204n\212q\0t\206u\207v\211w\210x\201y\230z\231~\225,
+-	use=cons25w,
++	acsc=-\030.^Y0\215`\004a\220f\234h\221i\025j\205k\203l\202m
++	     \204n\212q\0t\206u\207v\211w\210x\201y\230z
++	     \231~\225, use=cons25w,
+ cons25r-m|pc3r-m|ibmpc3r-mono|cons25-koi8r-m|freebsd console w/koi8-r cyrillic (mono),
+ 	colors@, pairs@,
+ 	op@, rmul=\E[m, setab@, setaf@,
+-	sgr=\E[0%?%p1%t;2;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;30;1%;%?%p6%t;1%;m,
++	sgr=\E[0%?%p1%t;2;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5
++	    %t;30;1%;%?%p6%t;1%;m,
+ 	smul=\E[4m, use=cons25r,
+ cons50r|cons50-koi8r|freebsd console w/koi8-r cyrillic (50 lines),
+ 	lines#50, use=cons25r,
+@@ -2617,8 +2695,9 @@
+ 	lines#60, use=cons25r-m,
+ # ISO 8859-1 FreeBSD console
+ cons25l1|cons25-iso8859|freebsd console w/iso 8859-1 chars,
+-	acsc=+\253\,\273-\030.\031`\201a\202f\207g\210i\247j\213k\214l\215m\216n\217o\220p\221q\222r\223s\224t\225u\226v\227w\230x\231y\232z\233~\237,
+-	use=cons25w,
++	acsc=+\253\,\273-\030.\031`\201a\202f\207g\210i\247j\213k
++	     \214l\215m\216n\217o\220p\221q\222r\223s\224t\225u
++	     \226v\227w\230x\231y\232z\233~\237, use=cons25w,
+ cons25l1-m|cons25-iso-m|freebsd console w/iso 8859-1 chars (mono),
+ 	colors@, pairs@,
+ 	bold@, dim@, op@, rmul=\E[m, setab@, setaf@,
+@@ -2669,7 +2748,8 @@
+ # The resulting description provides correct line-drawing and function-keys -TD
+ teken|syscons with teken,
+ 	bw@, mir, xenl,
+-	acsc=0\333a\260f\370g\361h\261j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x\263y\363z\362~\371,
++	acsc=0\333a\260f\370g\361h\261j\331k\277l\332m\300n\305q
++	     \304t\303u\264v\301w\302x\263y\363z\362~\371,
+ 	civis=\E[?25l, cnorm=\E[?25h, cvvis@, hpa=\E[%i%p1%dG,
+ 	hts=\EH, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+ 	kdch1=\E[3~, kend=\E[F, kent=^M, kf1=\EOP, kf10=\E[21~,
+@@ -2688,7 +2768,8 @@
+ origpc3|origibmpc3|IBM PC 386BSD Console,
+ 	OTbs, am, bw, eo, xon,
+ 	cols#80, lines#25,
+-	acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x\263,
++	acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x
++	     \263,
+ 	bold=\E[7m, clear=\Ec, cub1=^H, cud1=\E[B, cuf1=\E[C,
+ 	cup=\E[%i%p1%2d;%p2%2dH, cuu1=\E[A, ed=\E[J, el=\E[K,
+ 	home=\E[H, ind=\E[S, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
+@@ -2714,8 +2795,8 @@
+ # (Color support from Kevin Rosenberg , 2 May 1996)
+ # Bug: The  capability resets attributes.
+ bsdos-pc|IBM PC BSD/OS Console,
+-	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;1%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
+-	use=bsdos-pc-nobold,
++	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;1%;%?%p3%t;7%;%?%p4%t;5%;%?%p6
++	    %t;1%;%?%p7%t;8%;%?%p9%t;11%;m, use=bsdos-pc-nobold,
+ 
+ bsdos-pc-nobold|BSD/OS PC console w/o bold,
+ 	use=klone+color, use=bsdos-pc-m,
+@@ -2730,8 +2811,8 @@
+ 	il=\E[%p1%dL, il1=\E[L, ind=^J, kbs=^H, kcub1=\E[D,
+ 	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, khome=\E[H, kich1=\E[L,
+ 	kll=\E[F, knp=\E[G, kpp=\E[I, nel=^M^J, rc=\E8, sc=\E7,
+-	sgr=\E[0;10%?%p1%t;7%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m%?%p5%t\E[=8F%;,
+-	use=klone+sgr8,
++	sgr=\E[0;10%?%p1%t;7%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7
++	    %t;8%;%?%p9%t;11%;m%?%p5%t\E[=8F%;, use=klone+sgr8,
+ 
+ # Old names for BSD/OS PC console used in releases before 4.1.
+ pc3|BSD/OS on the PC Console,
+@@ -2976,12 +3057,14 @@
+ 	rc=\E8, rev=\E[7m$<2>, ri=\EM$<5>, rmacs=^O, rmam=\E[?7l,
+ 	rmkx=\E[?1l\E>, rmso=\E[m$<2>, rmul=\E[m$<2>,
+ 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7,
+-	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;$<2>,
++	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
++	    %;m%?%p9%t\016%e\017%;$<2>,
+ 	sgr0=\E[m\017$<2>, smacs=^N, smam=\E[?7h, smkx=\E[?1h\E=,
+ 	smso=\E[7m$<2>, smul=\E[4m$<2>, tbc=\E[3g,
+ 	use=vt100+fnkeys,
+ vt100nam|vt100-nam|vt100 no automargins,
+-	am@, xenl@, use=vt100-am,
++	am@, xenl@,
++	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7l\E[?8h, use=vt100-am,
+ vt100-vb|dec vt100 (w/advanced video) & no beep,
+ 	bel@, flash=\E[?5h\E[?5l, use=vt100,
+ 
+@@ -3102,7 +3185,8 @@
+ 	ri=\EM$<14/>, rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l,
+ 	rmso=\E[27m, rmul=\E[24m,
+ 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7,
+-	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;$<2>,
++	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?
++	    %p9%t\E(0%e\E(B%;$<2>,
+ 	sgr0=\E[m$<2>, smacs=\E(0$<2>, smam=\E[?7h, smir=\E[4h,
+ 	smso=\E[7m, smul=\E[4m,
+ 
+@@ -3140,7 +3224,8 @@
+ 	nel=\EE, rc=\E8, rev=\E[7m, ri=\EM, rmacs=\E(B$<4>,
+ 	rmam=\E[?7l, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
+ 	rs1=\E[?3l, sc=\E7,
+-	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;$<2>,
++	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?
++	    %p9%t\E(0%e\E(B%;$<2>,
+ 	sgr0=\E[m\E(B, smacs=\E(0$<2>, smam=\E[?7h, smir=\E[4h,
+ 	smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=ansi+pp,
+ 	use=ansi+enq,
+@@ -3172,7 +3257,8 @@
+ 	mc4=\2334i, mc5=\2335i, nel=\EE, rc=\E8, rev=\2337m, ri=\EM,
+ 	rmacs=\E(B, rmam=\233?7l, rmir=\2334l, rmso=\23327m,
+ 	rmul=\23324m, rs1=\233?3l, sc=\E7,
+-	sgr=\2330%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;$<2>,
++	sgr=\2330%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m
++	    %?%p9%t\E(0%e\E(B%;$<2>,
+ 	sgr0=\2330m\E(B, smacs=\E(0, smam=\233?7h, smir=\2334h,
+ 	smso=\2337m, smul=\2334m, tbc=\2333g,
+ 
+@@ -3216,7 +3302,8 @@
+ 	cub1=^H, cud1=^J, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
+ 	cuu1=\E[A, dch1=\E[P, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H,
+ 	ht=^I, il1=\E[L, ind=\ED,
+-	is2=\E[61"p\E[H\E[?3l\E[?4l\E[?1h\E[?5l\E[?6l\E[?7h\E[?8h\E[?25h\E>\E[m,
++	is2=\E[61"p\E[H\E[?3l\E[?4l\E[?1h\E[?5l\E[?6l\E[?7h\E[?8h\E[
++	    ?25h\E>\E[m,
+ 	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+ 	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=^M\ED, rc=\E8,
+ 	rf=/usr/share/tabset/vt100, ri=\EM, rmdc=, rmir=\E[4l,
+@@ -3272,26 +3359,24 @@
+ 	rmul=\E[m,
+ 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H,
+ 	sc=\E7,
+-	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;$<2>,
++	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?
++	    %p9%t\E(0%e\E(B%;$<2>,
+ 	sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smir=\E[4h,
+ 	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+ 	use=dec+pp, use=vt220+keypad, use=dec+sl, use=ansi+enq,
+ vt320-nam|vt300-nam|dec vt320 7 bit terminal with no am to make SAS happy,
+ 	am@,
+ 	is2=\E>\E[?3l\E[?4l\E[?5l\E[?7l\E[?8h\E[1;24r\E[24;1H,
+-	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7l\E[?8h\E[1;24r\E[24;1H,
+-	use=vt320,
++	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7l\E[?8h\E[1;24r\E[24;1H, use=vt320,
+ # We have to init 132-col mode, not 80-col mode.
+ vt320-w|vt300-w|dec vt320 wide 7 bit terminal,
+ 	cols#132, wsl#132,
+ 	is2=\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H,
+-	rs2=\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H,
+-	use=vt320,
++	rs2=\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H, use=vt320,
+ vt320-w-nam|vt300-w-nam|dec vt320 wide 7 bit terminal with no am,
+ 	am@,
+ 	is2=\E>\E[?3h\E[?4l\E[?5l\E[?7l\E[?8h\E[1;24r\E[24;1H,
+-	rs2=\E>\E[?3h\E[?4l\E[?5l\E[?7l\E[?8h\E[1;24r\E[24;1H,
+-	use=vt320-w,
++	rs2=\E>\E[?3h\E[?4l\E[?5l\E[?7l\E[?8h\E[1;24r\E[24;1H, use=vt320-w,
+ 
+ # VT330 and VT340 -- These are ReGIS and SIXEL graphics terminals
+ #   which are pretty much a superset of the VT320.  They have the
+@@ -3326,7 +3411,8 @@
+ 	ed=\E[J, el=\E[K, flash=\E[?5h\E[?5l$<200/>, fsl=\E[$},
+ 	home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL,
+ 	il1=\E[L, ind=\ED,
+-	is2=\E<\E F\E>\E[?1h\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H,
++	is2=\E<\E\sF\E>\E[?1h\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r
++	    \E[24;1H,
+ 	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+ 	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf6=\E[17~,
+ 	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, lf1=pf1, lf2=pf2,
+@@ -3334,7 +3420,8 @@
+ 	rf=/usr/share/tabset/vt300, ri=\EM, rmacs=\E(B,
+ 	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m,
+ 	rmul=\E[24m, rs1=\E[?3l, sc=\E7,
+-	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;$<2>,
++	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?
++	    %p9%t\E(0%e\E(B%;$<2>,
+ 	sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smir=\E[4h,
+ 	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+ 	tsl=\E[2$~\E[1$}\E[1;%dH,
+@@ -3374,7 +3461,8 @@
+ 	el=\E[K$<4/>, flash=\E[?5h\E[?5l$<200/>, fsl=\E[$},
+ 	home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@,
+ 	il=\E[%p1%dL, il1=\E[L, ind=\ED,
+-	is2=\E<\E F\E>\E[?1h\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H,
++	is2=\E<\E\sF\E>\E[?1h\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r
++	    \E[24;1H,
+ 	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+ 	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf6=\E[17~,
+ 	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, lf1=pf1, lf2=pf2,
+@@ -3382,7 +3470,8 @@
+ 	rf=/usr/share/tabset/vt300, ri=\EM, rmacs=\E(B,
+ 	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m,
+ 	rmul=\E[24m, rs1=\E<\E[?3l\E[!p\E[?7h, sc=\E7,
+-	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;$<2>,
++	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?
++	    %p9%t\E(0%e\E(B%;$<2>,
+ 	sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smir=\E[4h,
+ 	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+ 	tsl=\E[2$~\E[1$}\E[1;%dH, use=dec+sl,
+@@ -3413,7 +3502,8 @@
+ 	ri=\EM, rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l, rmkx=\E>,
+ 	rmsc=\E[?0;0r\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
+ 	rmso=\E[27m, rmul=\E[24m, rs3=\E[?67h\E[64;1"p, sc=\E7,
+-	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;$<2>,
++	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?
++	    %p9%t\E(0%e\E(B%;$<2>,
+ 	sgr0=\E[m\E(B$<2>, smacs=\E(0$<2>, smam=\E[?7h,
+ 	smir=\E[4h, smkx=\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+ 	use=ansi+pp, use=dec+sl, use=ansi+enq,
+@@ -3450,12 +3540,14 @@
+ 	kf48=\E[36;2~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~,
+ 	kf8=\E[19~, kf9=\E[20~, khome=\E[H,
+ 	pctrm=USR_TERM\:vt420pcdos\:,
+-	pfx=\EP1;1|%?%{16}%p1%>%t%{0}%e%{21}%p1%>%t%{1}%e%{25}%p1%>%t%{2}%e%{27}%p1%>%t%{3}%e%{30}%p1%>%t%{4}%e%{5}%;%p1%+%d/%p2%s\E\\,
+-	use=vt420,
++	pfx=\EP1;1|%?%{16}%p1%>%t%{0}%e%{21}%p1%>%t%{1}%e%{25}%p1%>
++	    %t%{2}%e%{27}%p1%>%t%{3}%e%{30}%p1%>%t%{4}%e%{5}%;%p1%+
++	    %d/%p2%s\E\\, use=vt420,
+ 
+ vt420pcdos|DEC VT420 w/PC for DOS Merge,
+ 	lines#25,
+-	dispc=%?%p1%{19}%=%t\E\023\021%e%p1%{32}%<%t\E%p1%c%e%p1%{127}%=%t\E\177%e%p1%c%;,
++	dispc=%?%p1%{19}%=%t\E\023\021%e%p1%{32}%<%t\E%p1%c%e%p1
++	      %{127}%=%t\E\177%e%p1%c%;,
+ 	pctrm@,
+ 	rmsc=\E[?0;0r\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sgr@,
+ 	sgr0=\E[m, smsc=\E[?1;2r\E[34h, use=vt420pc,
+@@ -3530,13 +3622,11 @@
+ z340|zstem vt340 terminal emulator 132col 42line,
+ 	lines#42,
+ 	is2=\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h\E[1;42r\E[42;1H,
+-	rs2=\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h\E[1;42r\E[42;1H,
+-	use=vt320-w,
++	rs2=\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h\E[1;42r\E[42;1H, use=vt320-w,
+ z340-nam|zstem vt340 terminal emulator 132col 42line (no automatic margins),
+ 	am@,
+ 	is2=\E>\E[?3h\E[?4l\E[?5l\E[?7l\E[?8h\E[1;42r\E[42;1H,
+-	rs2=\E>\E[?3h\E[?4l\E[?5l\E[?7l\E[?8h\E[1;42r\E[42;1H,
+-	use=z340,
++	rs2=\E>\E[?3h\E[?4l\E[?5l\E[?7l\E[?8h\E[1;42r\E[42;1H, use=z340,
+ 
+ # CRT is shareware.  It implements some xterm features, including mouse.
+ crt|crt-vt220|CRT 2.3 emulating VT220,
+@@ -3577,12 +3667,18 @@
+ 	cud=\E[%p1%dB, cud1=\ED, cuf=\E[%p1%dC, cuf1=\E[C,
+ 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\EM,
+ 	dch=\E[%p1%dP, dch1=\E[P,
+-	dispc=%?%p1%{8}%=%t\E%%G\342\227\230\E%%@%e%p1%{10}%=%t\E%%G\342\227\231\E%%@%e%p1%{12}%=%t\E%%G\342\231\0\E%%@%e%p1%{13}%=%t\E%%G\342\231\252\E%%@%e%p1%{14}%=%t\E%%G\342\231\253\E%%@%e%p1%{15}%=%t\E%%G\342\230\274\E%%@%e%p1%{27}%=%t\E%%G\342\206\220\E%%@%e%p1%{155}%=%t\E%%G\340\202\242\E%%@%e%p1%c%;,
++	dispc=%?%p1%{8}%=%t\E%%G\342\227\230\E%%@%e%p1%{10}%=%t\E%%G
++	      \342\227\231\E%%@%e%p1%{12}%=%t\E%%G\342\231\0\E%%@%e
++	      %p1%{13}%=%t\E%%G\342\231\252\E%%@%e%p1%{14}%=%t\E%%G
++	      \342\231\253\E%%@%e%p1%{15}%=%t\E%%G\342\230\274\E%%@
++	      %e%p1%{27}%=%t\E%%G\342\206\220\E%%@%e%p1%{155}%=%t\E
++	      %%G\340\202\242\E%%@%e%p1%c%;,
+ 	dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
+ 	el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h\E[?5l, home=\E[H,
+ 	hpa=\E[%i%p1%dG, ht=^I, hts=\EH, il=\E[%p1%dL, il1=\E[L,
+ 	ind=^J, indn=\E[%p1%dS,
+-	initc=\E]P%p1%x%p2%{255}%*%{1000}%/%02x%p3%{255}%*%{1000}%/%02x%p4%{255}%*%{1000}%/%02x,
++	initc=\E]P%p1%x%p2%{255}%*%{1000}%/%02x%p3%{255}%*%{1000}%/
++	      %02x%p4%{255}%*%{1000}%/%02x,
+ 	is2=\E7\E[r\E[m\E[?7h\E[?1;4;6l\E[4l\E8\E>\E]R,
+ 	kLFT=\E[D, kRIT=\E[C, kb2=\E[G, kbs=\177, kcbt=\E[Z,
+ 	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+@@ -3595,7 +3691,8 @@
+ 	rs2=\E<\E["p\E[50;6"p\Ec\E[?3l\E]R\E[?1000l,
+ 	s0ds=\E[10m, s1ds=\E[11m, s2ds=\E[12m, sc=\E7,
+ 	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+-	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
++	    %;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smcup=\E[?47h,
+ 	smir=\E[4h, smkx=\E[?1h\E=, smpch=\E[11m, smso=\E[7m,
+ 	smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, E3=\E[3J,
+@@ -3720,7 +3817,9 @@
+ teraterm2.3|Tera Term Pro,
+ 	km, xon@,
+ 	ncv#43, vt@,
+-	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i\316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
++	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i
++	     \316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u
++	     \264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
+ 	blink=\E[5m, bold=\E[1m, civis=\E[?25l, clear=\E[H\E[J,
+ 	cnorm=\E[?25h, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
+ 	cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM,
+@@ -3770,7 +3869,9 @@
+ # c) Recognizes a subset of vt52 controls.
+ ms-vt100|MS telnet imitating dec vt100,
+ 	lines#25,
+-	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i\316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
++	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i
++	     \316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u
++	     \264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
+ 	ka1@, ka3@, kb2@, kc1@, kc3@, kent@, kf0@, kf1@, kf10@, kf2@, kf3@, kf4@,
+ 	kf5@, kf6@, kf7@, kf8@, kf9@, tbc@, use=vt102+enq, use=vt100,
+ 
+@@ -3888,7 +3989,8 @@
+ 	rmul=\E[m,
+ 	rs2=\E>\E[?1;3;4;5;6l\E[4l\E[?7h\E[m\E[r\E[2J\E[H,
+ 	sc=\E7,
+-	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m,
++	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
++	    %;m,
+ 	sgr0=\E[m, smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m,
+ 	smul=\E[4m, tbc=\E[3g, use=vt100+enq,
+ # Compatible with the R6 xterm
+@@ -3953,9 +4055,12 @@
+ 	rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E[?1l\E>,
+ 	rmso=\E[27m, rmul=\E[24m, rs1=^O,
+ 	rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;3;4;6l\E[4l\E>, sc=\E7,
+-	setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
+-	setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
+-	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;,
++	setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
++	     %=%t3%e%p1%d%;m,
++	setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
++	     %=%t3%e%p1%d%;m,
++	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
++	    %;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smcup=\E7\E[?47h,
+ 	smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
+ 	tbc=\E[3g, vpa=\E[%i%p1%dd, use=vt100+enq,
+@@ -3975,7 +4080,8 @@
+ 	is2=\E[!p\E[?3;4l\E[4l\E>, kdch1=\E[3~, kfnd@, kslt@,
+ 	rmcup=\E[?1047l\E[?1048l, rs1=\Ec,
+ 	rs2=\E[!p\E[?3;4l\E[4l\E>,
+-	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
++	    %;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 	smcup=\E[?1048h\E[?1047h, use=ansi+pp,
+ 	use=xterm-xf86-v33,
+ 
+@@ -3996,7 +4102,8 @@
+ 	kf42=\E[17;6~, kf43=\E[18;6~, kf44=\E[19;6~,
+ 	kf45=\E[20;6~, kf46=\E[21;6~, kf47=\E[23;6~,
+ 	kf48=\E[24;6~, khome=\EOH, rmcup=\E[?1049l,
+-	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?
++	    %p9%t\016%e\017%;,
+ 	smcup=\E[?1049h, use=xterm-xf86-v333,
+ 
+ # This version was released in XFree86 4.3.
+@@ -4004,8 +4111,8 @@
+ 	kDC=\E[3;2~, kEND=\E[1;2F, kHOM=\E[1;2H, kIC=\E[2;2~,
+ 	kLFT=\E[1;2D, kNXT=\E[6;2~, kPRV=\E[5;2~, kRIT=\E[1;2C,
+ 	kbeg@,
+-	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+-	use=xterm-xf86-v40,
++	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
++	    %p7%t;8%;m%?%p9%t\016%e\017%;, use=xterm-xf86-v40,
+ 
+ # This version was released in XFree86 4.4.
+ xterm-xf86-v44|xterm terminal emulator (XFree86 4.4 Window System),
+@@ -4210,9 +4317,12 @@
+ 	rmir=\E[4l, rmkx=\E[?1l\E>, rmm=\E[?1034l, rmso=\E[27m,
+ 	rmul=\E[24m, rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>, sc=\E7,
+ 	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+-	setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
+-	setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
+-	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
++	setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
++	     %=%t3%e%p1%d%;m,
++	setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
++	     %=%t3%e%p1%d%;m,
++	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;
++	    %?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
+ 	sgr0=\E(B\E[m, sitm=\E[3m, smacs=\E(0, smam=\E[?7h,
+ 	smcup=\E[?1049h, smir=\E[4h, smkx=\E[?1h\E=,
+ 	smm=\E[?1034h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+@@ -4229,7 +4339,8 @@
+ # xterm also recognizes the control sequences for initc -TD
+ xterm-16color|xterm with 16 colors like aixterm,
+ 	ccc,
+-	initc=\E]4;%p1%d;rgb\:%p2%{255}%*%{1000}%/%2.2X/%p3%{255}%*%{1000}%/%2.2X/%p4%{255}%*%{1000}%/%2.2X\E\\,
++	initc=\E]4;%p1%d;rgb\:%p2%{255}%*%{1000}%/%2.2X/%p3%{255}%*
++	      %{1000}%/%2.2X/%p4%{255}%*%{1000}%/%2.2X\E\\,
+ 	oc=\E]104\007, rs1=\Ec\E]104\007, use=ibm+16color,
+ 	use=xterm-new,
+ 
+@@ -4238,10 +4349,13 @@
+ xterm+256color|xterm 256-color feature,
+ 	ccc,
+ 	colors#256, pairs#32767,
+-	initc=\E]4;%p1%d;rgb\:%p2%{255}%*%{1000}%/%2.2X/%p3%{255}%*%{1000}%/%2.2X/%p4%{255}%*%{1000}%/%2.2X\E\\,
++	initc=\E]4;%p1%d;rgb\:%p2%{255}%*%{1000}%/%2.2X/%p3%{255}%*
++	      %{1000}%/%2.2X/%p4%{255}%*%{1000}%/%2.2X\E\\,
+ 	oc=\E]104\007,
+-	setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m,
+-	setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m,
++	setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;
++	      5;%p1%d%;m,
++	setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5
++	      ;%p1%d%;m,
+ 	setb@, setf@,
+ 
+ # palette is hardcoded...
+@@ -4249,8 +4363,10 @@
+ 	ccc@,
+ 	colors#256, pairs#32767,
+ 	initc@,
+-	setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m,
+-	setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m,
++	setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;
++	      5;%p1%d%;m,
++	setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5
++	      ;%p1%d%;m,
+ 	setb@, setf@,
+ 
+ # 88-colors is a compile-time feature of XFree86 xterm beginning with
+@@ -4325,7 +4441,8 @@
+ 	flash=\233?5h$<100/>\233?5l, home=\233H,
+ 	hpa=\233%i%p1%dG, ht=^I, hts=\210, ich=\233%p1%d@,
+ 	il=\233%p1%dL, il1=\233L, ind=^J, invis=\2338m,
+-	is2=\E[62"p\E G\233m\233?7h\E>\E7\233?1;3;4;6l\2334l\233r\E8,
++	is2=\E[62"p\E\sG\233m\233?7h\E>\E7\233?1;3;4;6l\2334l\233r
++	    \E8,
+ 	ka1=\217w, ka3=\217u, kb2=\217y, kbeg=\217E, kc1=\217q,
+ 	kc3=\217s, kcbt=\233Z, kcub1=\217D, kcud1=\217B,
+ 	kcuf1=\217C, kcuu1=\217A, kdch1=\2333~, kend=\2334~,
+@@ -4340,11 +4457,15 @@
+ 	ri=\215, rmacs=\E(B, rmam=\233?7l, rmcup=\233?1049l,
+ 	rmir=\2334l, rmkx=\233?1l\E>, rmso=\23327m, rmul=\23324m,
+ 	rs1=\Ec,
+-	rs2=\E[62"p\E G\233m\233?7h\E>\E7\233?1;3;4;6l\2334l\233r\E8,
++	rs2=\E[62"p\E\sG\233m\233?7h\E>\E7\233?1;3;4;6l\2334l\233r
++	    \E8,
+ 	sc=\E7, setab=\2334%p1%dm, setaf=\2333%p1%dm,
+-	setb=\2334%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
+-	setf=\2333%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
+-	sgr=\2330%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;,
++	setb=\2334%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1
++	     %{6}%=%t3%e%p1%d%;m,
++	setf=\2333%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1
++	     %{6}%=%t3%e%p1%d%;m,
++	sgr=\2330%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
++	    %p7%t;8%;m%?%p9%t\E(0%e\E(B%;,
+ 	sgr0=\2330m\E(B, smacs=\E(0, smam=\233?7h,
+ 	smcup=\233?1049h, smir=\2334h, smkx=\233?1h\E=,
+ 	smso=\2337m, smul=\2334m, tbc=\2333g, u6=\233[%i%d;%dR,
+@@ -4470,7 +4591,8 @@
+ #
+ # xterm with bold instead of underline
+ xterm-bold|xterm terminal emulator (X11R6 Window System) standout w/bold,
+-	sgr=%?%p9%t\016%e\017%;B\E[0%?%p6%t;1%;%?%p2%t;1%;%?%p1%p3%|%t;7%;m,
++	sgr=%?%p9%t\016%e\017%;B\E[0%?%p6%t;1%;%?%p2%t;1%;%?%p1%p3%|
++	    %t;7%;m,
+ 	smso=\E[7m, smul=\E[1m, use=xterm-old,
+ 
+ # See the note on ICH/ICH1 VERSUS RMIR/SMIR near the end of file
+@@ -4537,7 +4659,7 @@
+ # no new information.
+ xterm+x11mouse|X11 xterm mouse protocol,
+ 	kmous=\E[M, XM=\E[?1000%?%p1%{1}%=%th%el%;,
+-	xm=\E[M%?%p4%t3%e%p3%' '%+%c%;%p2%'!'%+%c%p1%'!'%+%c,
++	xm=\E[M%?%p4%t3%e%p3%'\s'%+%c%;%p2%'!'%+%c%p1%'!'%+%c,
+ xterm-x11mouse|X11 mouse,
+ 	use=xterm+x11mouse, use=xterm,
+ 
+@@ -4546,7 +4668,8 @@
+ # response.
+ xterm+x11hilite|X11 xterm mouse protocol with highlight,
+ 	kmous=\E[M, XM=\E[?1001%?%p1%{1}%=%th%el%;,
+-	xm=\E[%p7%'!'%+%p6%'!'%+%c%p9%'!'%+%c%p8%'!'%+%c%p2%'!'%+%c%p1%'!'%+%cT,
++	xm=\E[%p7%'!'%+%p6%'!'%+%c%p9%'!'%+%c%p8%'!'%+%c%p2%'!'%+%c
++	   %p1%'!'%+%cT,
+ xterm-x11hilite|X11 mouse with highlight,
+ 	use=xterm+x11mouse, use=xterm,
+ 
+@@ -4586,7 +4709,7 @@
+ # "1005" mouse mode.
+ xterm+sm+1005|xterm UTF-8 mouse,
+ 	kmous=\E[M, XM=\E[?1005;1000%?%p1%{1}%=%th%el%;,
+-	xm=\E[M%?%p4%t3%e%p3%' '%+%c%;%p2%'!'%+%u%p1%'!'%+%u,
++	xm=\E[M%?%p4%t3%e%p3%'\s'%+%c%;%p2%'!'%+%u%p1%'!'%+%u,
+ xterm-1005|xterm UTF-8 mouse,
+ 	use=xterm+sm+1005, use=xterm,
+ 
+@@ -4619,7 +4742,8 @@
+ 	acsc=``aajjkkllmmnnooppqqrrssttuuvvwwxx~~,
+ 	csr=\E[%i%p1%d;%p2%dr, dsl=\E[?H, enacs=, fsl=\E[?F,
+ 	kmous=\E[M, rc=\E8, rmacs=\E(B, rmam=\E[?7l, sc=\E7,
+-	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;,
++	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e
++	    \E(B%;,
+ 	sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h,
+ 	tsl=\E[?E\E[?%i%p1%dT, use=xterm-r6, use=ecma+color,
+ kterm-color|kterm-co|kterm with ANSI colors,
+@@ -4648,16 +4772,18 @@
+ 	rmacs=^O, rmcup=\E@0\E[?4r, rmso=\E[m,
+ 	rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H,
+ 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7,
+-	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
++	    %;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smcup=\E@0\E[?4s\E[?4h\E@1,
+ 	smso=\E[7m, tbc=\E[3g, use=vt100+fnkeys,
+ 
+ xtermc|xterm terminal emulator (color),
+ 	colors#8, ncv#7, pairs#64,
+ 	op=\E[100m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+-	setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
+-	setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
+-	use=xtermm,
++	setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
++	     %=%t3%e%p1%d%;m,
++	setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
++	     %=%t3%e%p1%d%;m, use=xtermm,
+ 
+ # From: David J. MacKenzie  20 Apr 1995
+ # Here's a termcap entry I've been using for xterm_color, which comes
+@@ -4667,7 +4793,8 @@
+ xterm-pcolor|xterm with color used for highlights and status line,
+ 	wsl#40,
+ 	bold=\E[1;43m, rev=\E[7;34m,
+-	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1;43%;%?%p2%t;4;42%;%?%p1%t;7;31%;%?%p3%t;7;34%;%?%p4%t;5%;%?%p7%t;8%;m,
++	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1;43%;%?%p2%t;4;42%;%?%p1
++	    %t;7;31%;%?%p3%t;7;34%;%?%p4%t;5%;%?%p7%t;8%;m,
+ 	smso=\E[7;31m, smul=\E[4;42m, use=xterm+sl, use=xterm-r6,
+ 
+ # This describes the capabilities of color_xterm, an xterm variant from
+@@ -4697,7 +4824,8 @@
+ 	rmso=\E[27m, rmul=\E[24m,
+ 	rs1=\E(B\017\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E<,
+ 	sc=\E7,
+-	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
++	    %;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[0m\017, smacs=^N, smam=\E[?7h,
+ 	smcup=\E[?1;41s\E[?1;41h\E=, smir=\E[4h, smso=\E[7m,
+ 	smul=\E[4m, use=ecma+color, use=vt220+keypad,
+@@ -4770,7 +4898,8 @@
+ 	bce, km@,
+ 	civis=\E[?25l, cnorm=\E[?25h, kdch1=\E[3~, kf1=\EOP,
+ 	kf2=\EOQ, kf3=\EOR, kf4=\EOS, rmam=\E[?7l,
+-	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t\016%e
++	    \017%;,
+ 	sgr0=\E[0m\017, smam=\E[?7h, tbc@, use=xterm-color,
+ 
+ # GNOME Terminal 2.0.1 (Redhat 8.0)
+@@ -4805,8 +4934,8 @@
+ # Ed Catmur notes that gnome-terminal has recognized soft-reset since May 2002.
+ gnome-fc5|GNOME Terminal,
+ 	rs1=\Ec,
+-	rs2=\E7\E[r\E8\E[m\E[?7h\E[!p\E[?1;3;4;6l\E[4l\E>\E[?1000l\E[?25h,
+-	use=ansi+enq, use=xterm+pcc0, use=gnome-rh90,
++	rs2=\E7\E[r\E8\E[m\E[?7h\E[!p\E[?1;3;4;6l\E[4l\E>\E[?1000l
++	    \E[?25h, use=ansi+enq, use=xterm+pcc0, use=gnome-rh90,
+ 
+ # GNOME Terminal 2.18.1 (2007 snapshot)
+ #
+@@ -4842,7 +4971,8 @@
+ vte-2012|VTE 0.34.1,
+ 	ncv#16,
+ 	dim=\E[2m, flash@, invis=\E[8m, ritm=\E[23m,
+-	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p5%t;2%;%?%p7%t;8%;%?%p1%p3%|%t;7%;m%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p5%t;2%;%?%p7%t;8%;%?%p1%p3
++	    %|%t;7%;m%?%p9%t\016%e\017%;,
+ 	sitm=\E[3m, use=vte-2008,
+ # Version 3.6.1 sets TERM to xterm-256color (still hardcoded), which has
+ # 61 differences from a correct entry for gnome terminal.
+@@ -4971,7 +5101,8 @@
+ 	kf9@, kfnd@, khome=\E[1~, kslt@, rin=\E[%p1%dT, ritm=\E[23m,
+ 	rmam=\E[?7l, rmso=\E[27m, rmul=\E[24m,
+ 	rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l\E[?25h,
+-	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?
++	    %p9%t\016%e\017%;,
+ 	sgr0=\E[0m\017, sitm=\E[3m, smam=\E[?7h, vpa=\E[%i%p1%dd,
+ 	use=ecma+color, use=xterm-r6,
+ konsole-linux|KDE console window with linux keyboard,
+@@ -5069,7 +5200,8 @@
+ 	rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
+ 	rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l,
+ 	sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+-	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;,
++	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e
++	    \E(B%;,
+ 	sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smcup=\E[?1049h,
+ 	smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
+ 	tbc=\E[3g, u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?1;2c, u9=\E[c,
+@@ -5132,9 +5264,11 @@
+ 	rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E>, rmso=\E[27m,
+ 	rmul=\E[24m,
+ 	rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H,
+-	rs2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l\E[?25h,
++	rs2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l\E[?
++	    25h,
+ 	s0ds=\E(B, s1ds=\E(0, sc=\E7,
+-	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?
++	    %p9%t\016%e\017%;,
+ 	sgr0=\E[0m\017, smacs=^N, smcup=\E7\E[?47h, smir=\E[4h,
+ 	smkx=\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=vt100+enq,
+ 	use=rxvt+pcfkeys, use=vt220+keypad,
+@@ -5272,11 +5406,13 @@
+ rxvt-xpm|rxvt terminal emulator (X Window System),
+ 	use=rxvt,
+ rxvt-cygwin|rxvt terminal emulator (X Window System) on cygwin,
+-	acsc=+\257\,\256-\^0\333`\004a\261f\370g\361h\260j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
+-	use=rxvt,
++	acsc=+\257\,\256-\^0\333`\004a\261f\370g\361h\260j\331k
++	     \277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w
++	     \302x\263y\363z\362{\343|\330}\234~\376, use=rxvt,
+ rxvt-cygwin-native|rxvt terminal emulator (native MS Window System port) on cygwin,
+-	acsc=+\257\,\256-\^0\333`\004a\261f\370g\361h\260j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330~\376,
+-	use=rxvt-cygwin,
++	acsc=+\257\,\256-\^0\333`\004a\261f\370g\361h\260j\331k
++	     \277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w
++	     \302x\263y\363z\362{\343|\330~\376, use=rxvt-cygwin,
+ 
+ # This variant is supposed to work with rxvt 2.7.7 when compiled with
+ # NO_BRIGHTCOLOR defined.  rxvt needs more work...
+@@ -5350,9 +5486,11 @@
+ 	rmam=\E[?7l, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=,
+ 	rmso=\E[27m, rmul=\E[24m,
+ 	rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H,
+-	rs2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l\E[?25h,
++	rs2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l\E[?
++	    25h,
+ 	sc=\E7,
+-	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
++	    %;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smcup=\E7\E[?47h,
+ 	smir=\E[4h, smkx=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+ 	vpa=\E[%i%p1%dd, use=vt100+enq, use=rxvt+pcfkeys,
+@@ -5402,7 +5540,8 @@
+ 	pln=\E&f%p1%dk%p2%l%dd0L%p2%s, rev=\E&dB, ri=\ET,
+ 	rmacs=^O, rmir=\ER, rmkx=\E&s0A, rmln=\E&j@, rmso=\E&d@,
+ 	rmul=\E&d@,
+-	sgr=\E&d%?%p7%t%{115}%c%;%p1%p3%|%p6%|%{2}%*%p2%{4}%*%+%p4%+%p5%{8}%*%+%{64}%+%c%?%p9%t%'\016'%c%e%'\017'%c%;,
++	sgr=\E&d%?%p7%t%{115}%c%;%p1%p3%|%p6%|%{2}%*%p2%{4}%*%+%p4%+
++	    %p5%{8}%*%+%{64}%+%c%?%p9%t%'\016'%c%e%'\017'%c%;,
+ 	sgr0=\E&d@, smacs=^N, smir=\EQ, smkx=\E&s1A, smln=\E&jB,
+ 	smso=\E&dJ, smul=\E&dD, tbc=\E3, vpa=\E&a%p1%dY,
+ # HPUX 11 provides a color version.
+@@ -5423,7 +5562,8 @@
+ emu|emu native mode,
+ 	am, bce, mir, msgr, xon,
+ 	colors#15, cols#80, it#8, lines#24, pairs#64, vt#200,
+-	acsc=61a\202f\260g2j\213k\214l\215m\216n\217o\220q\222s\224t\225u\226v\227w\230x\231~\244,
++	acsc=61a\202f\260g2j\213k\214l\215m\216n\217o\220q\222s
++	     \224t\225u\226v\227w\230x\231~\244,
+ 	bel=^G, blink=\EW, bold=\EU, civis=\EZ, clear=\EP\EE0;0;,
+ 	cnorm=\Ea, cr=^M, csr=\Ek%p1%d;%p2%d;, cub=\Eq-%p1%d;,
+ 	cub1=^H, cud=\Ep%p1%d;, cud1=\EB, cuf=\Eq%p1%d;, cuf1=\EC,
+@@ -5441,7 +5581,8 @@
+ 	op=\Es0;\Er0;, rev=\ET, ri=\EF, rmir=\EX, rmso=\ES, rmul=\ES,
+ 	rs2=\ES\Es0;\Er0;, setab=\Es%i%p1%d;,
+ 	setaf=\Er%i%p1%d;,
+-	sgr=\ES%?%p1%t\ET%;%?%p2%t\EV%;%?%p3%t\ET%;%?%p4%t\EW%;%?%p6%t\EU%;,
++	sgr=\ES%?%p1%t\ET%;%?%p2%t\EV%;%?%p3%t\ET%;%?%p4%t\EW%;%?%p6
++	    %t\EU%;,
+ 	sgr0=\ES, smir=\EY, smso=\ET, smul=\EV, tbc=\Ej,
+ 
+ # vt220 Terminfo entry for the Emu emulation, corresponds to
+@@ -5472,7 +5613,8 @@
+ 	knp=\E[6~, kpp=\E[5~, kslt=\E[4~, rc=\E8, rev=\E[0;7m,
+ 	ri=\EM, rmacs=^O, rmcup=\E>, rmkx=\E>, rmso=\E[m, rmul=\E[m,
+ 	rs2=\E[4l\E[34l\E[?1l\E[?3l\E[?5l\E[?7h, sc=\E7,
+-	sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;
++	    2%;%?%p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m, smacs=^N, smcup=\E[?1l\E=, smkx=\E=,
+ 	smso=\E[0;7m, smul=\E[0;4m, tbc=\E[3g,
+ 
+@@ -5506,7 +5648,8 @@
+ 	rmul=\E[m,
+ 	rs2=\E>\E[1;3;4;5;6l\E[?7h\E[100m\E[m\E[r\E[2J\E[H,
+ 	sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+-	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
++	    %;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smcup=\E7\E[?47h,
+ 	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+ 	tsl=\E[?E\E[?%i%p1%dT, use=vt100+fnkeys,
+@@ -5530,7 +5673,8 @@
+ 	invis=\E[8m, is2=\E)0\017, kbs=^H, nel=\EE, rev=\E[7m,
+ 	ri=\E[T, rin=\E[%p1%dT, rmacs=^O, rmir=\E[4l, rmso=\E[27m,
+ 	rmul=\E[24m,
+-	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
++	    %p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m, smacs=^N, smir=\E[4h, smso=\E[7m, smul=\E[4m,
+ 	vpa=\E[%i%p1%dd,
+ # mterm normally sets $TERM to "mterm"
+@@ -5568,7 +5712,8 @@
+ 	ri=\E[T, rin=\E[%p1%dT, rmacs=^O, rmam=\E[?7l, rmir=\E[4l,
+ 	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, sc=\E7,
+ 	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+-	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
++	    %p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m, smacs=^N, smam=\E[?7h, smir=\E[4h,
+ 	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, u6=\E[%i%d;%dR,
+ 	u7=\E[6n, vpa=\E[%i%p1%dd,
+@@ -5596,7 +5741,8 @@
+ 	khome=\E[1~, knp=\E[6~, kpp=\E[5~, rev=\E[7m, rmacs=\E[10m,
+ 	rmam=\E[?7l, rmcup=\E[?1049l, rs1=\E[H\E[J\E[m\Ec,
+ 	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+-	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
++	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6
++	    %t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
+ 	sgr0=\E[0;10m, smacs=\E[11m, smam=\E[?7h,
+ 	smcup=\E[?1049h, smso=\E[3m, smul=\E[4m,
+ 
+@@ -5702,9 +5848,12 @@
+ 	rmcup=\E[?1049l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m,
+ 	rmul=\E[m, rs1=\Ec, rs2=\E[4l\E>\E[?1034l, sc=\E7,
+ 	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+-	setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
+-	setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
+-	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m,
++	setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
++	     %=%t3%e%p1%d%;m,
++	setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
++	     %=%t3%e%p1%d%;m,
++	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
++	    %t;7%;%?%p4%t;5%;m,
+ 	sgr0=\E[0m, sitm=\E[3m, smacs=\E(0, smcup=\E[?1049h,
+ 	smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
+ 	tbc=\E[3g, tsl=\E]0;, u6=\E[%i%d;%dR, u7=\E[6n,
+@@ -5746,7 +5895,8 @@
+ 	khome=\E[1~, knp=\E[6~, kpp=\E[5~, op=\E[37;40m, rc=\E8,
+ 	rev=\E[7m, rmacs=\E(B, rmso=\E[m, rmul=\E[m, sc=\E7,
+ 	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+-	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m,
++	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
++	    %t;7%;m,
+ 	sgr0=\E[0m, smacs=\E(0, smso=\E[7m, smul=\E[4m,
+ st-16color|stterm-16color|simpleterm with 16-colors,
+ 	use=ibm+16color, use=st,
+@@ -5822,7 +5972,8 @@
+ 	rs2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E>,
+ 	s0ds=\E(B, s1ds=\E(0, sc=\E7, setab=\E[48;5;%p1%dm,
+ 	setaf=\E[38;5;%p1%dm,
+-	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;,
++	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t
++	    \E(0%e\E(B%;,
+ 	sgr0=\E[m\E(B, smacs=\E(0, smcup=\E7\E[?47h, smir=\E[4h,
+ 	smso=\E[7m, smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd,
+ 	use=xterm+sl-twm,
+@@ -5881,7 +6032,8 @@
+ 	kRIT=\E[1;2C, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
+ 	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+ 	kind=\E[1;2B, kri=\E[1;2A,
+-	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;$<2>,
++	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p7%t;8
++	    %;m%?%p9%t\016%e\017%;$<2>,
+ 	vpa=\E[%i%p1%dd, kDC3=\E[3;3~, kDC4=\E[3;4~,
+ 	kDC5=\E[3;5~, kDC6=\E[3;6~, kDC7=\E[3;7~, kDN=\E[1;2B,
+ 	kDN3=\E[1;3B, kDN4=\E[1;4B, kDN5=\E[1;5B, kDN6=\E[1;6B,
+@@ -5948,7 +6100,8 @@
+ 	knp=\E[6~, kpp=\E[5~, op=\E[39;49m, rc=\E8, rev=\E[7m,
+ 	ri=\EM, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
+ 	sc=\E7, setab=\E[%p1%'('%+%dm, setaf=\E[%p1%{30}%+%dm,
+-	sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;m,
++	sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p6%t;1%;%?
++	    %p7%t;8%;m,
+ 	sgr0=\E[m, smir=\E[4h, smso=\E[7m, smul=\E[4m,
+ 	u6=\E[%i%d;%dR, u7=\E[6n,
+ 
+@@ -6021,7 +6174,8 @@
+ screen|VT 100/ANSI X3.64 virtual terminal,
+ 	OTbs, OTpt, am, km, mir, msgr, xenl, G0,
+ 	colors#8, cols#80, it#8, lines#24, ncv@, pairs#64, U8#1,
+-	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
++	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
++	     yzz{{||}}~~,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
+ 	clear=\E[H\E[J, cnorm=\E[34h\E[?25h, cr=^M,
+ 	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
+@@ -6039,7 +6193,8 @@
+ 	nel=\EE, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
+ 	rmcup=\E[?1049l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[23m,
+ 	rmul=\E[24m, rs2=\Ec\E[?1000l\E[?25h, sc=\E7,
+-	sgr=\E[0%?%p6%t;1%;%?%p1%t;3%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;m%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p6%t;1%;%?%p1%t;3%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;
++	    5%;%?%p5%t;2%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smcup=\E[?1049h, smir=\E[4h,
+ 	smkx=\E[?1h\E=, smso=\E[3m, smul=\E[4m, tbc=\E[3g, E0=\E(B,
+ 	S0=\E(%p1%c, use=ecma+color,
+@@ -6143,7 +6298,8 @@
+ screen.xterm-xfree86|screen.xterm-new|screen customized for modern xterm,
+ 	bce@, bw,
+ 	invis@, kIC@, kNXT@, kPRV@, meml@, memu@,
+-	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;m,
++	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
++	    %t;7%;%?%p4%t;5%;%?%p5%t;2%;m,
+ 	E3@, use=screen+italics, use=screen+fkeys, use=xterm-new,
+ #:screen.xterm|screen for modern xterm,
+ #:	use=screen.xterm-new,
+@@ -6155,8 +6311,9 @@
+ # on Solaris because Sun's curses implementation gets confused.
+ screen.teraterm|disable ncv in teraterm,
+ 	ncv#127,
+-	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i\316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
+-	use=screen+fkeys, use=screen,
++	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i
++	     \316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u
++	     \264v\301w\302x\263y\363z\362{\343|\330}\234~\376, use=screen+fkeys, use=screen,
+ # Other terminals
+ screen.rxvt|screen in rxvt,
+ 	bw, XT,
+@@ -6319,7 +6476,8 @@
+ 	rmacs=\E(B, rmam=\E[?7l, rmcup=\E[2J\E8, rmir=\E[4l,
+ 	rmso=\E[27m, rmul=\E[24m,
+ 	rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;4;6l\E[4l\E>, sc=\E7,
+-	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;,
++	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?
++	    %p9%t\E(0%e\E(B%;,
+ 	sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smcup=\E7,
+ 	smir=\E[4h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+ 	u8=\E[?62;1;6c, use=xterm+sl, use=ansi+enq,
+@@ -6513,8 +6671,10 @@
+ 	bold=\E[1m, cub=\E[%p1%dD, cud=\E[%p1%dB, cuf=\E[%p1%dC,
+ 	cuu=\E[%p1%dA, home=\E[H, op=\E[0m, rs2=\E[s,
+ 	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+-	setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
+-	setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
++	setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
++	     %=%t3%e%p1%d%;m,
++	setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
++	     %=%t3%e%p1%d%;m,
+ 	sgr=\E[0%?%p6%t;1%;%?%p1%p3%|%t;7%;m, sgr0=\E[m,
+ 	smso=\E[7m, use=sun,
+ 
+@@ -6669,8 +6829,8 @@
+ nwp512|news|nwp514|news40|vt100-bm|old sony vt100 emulator 40 lines,
+ 	OTbs,
+ 	lines#40,
+-	is2=\E7\E[r\E8\EE\EE\EE\EM\EM\EM\E[?7h\E[?1l\E[?3l\E7\E[1;40r\E8,
+-	use=news-old-unk,
++	is2=\E7\E[r\E8\EE\EE\EE\EM\EM\EM\E[?7h\E[?1l\E[?3l\E7\E[1;40
++	    r\E8, use=news-old-unk,
+ #
+ # (nwp512-a: this had :TY=ascii: and the alias vt100-bm --esr)
+ nwp512-a|nwp514-a|news-a|news42|news40-a|sony vt100 emulator 42 line,
+@@ -6682,43 +6842,43 @@
+ nwp512-o|nwp514-o|news-o|news40-o|vt100-bm-o|sony vt100 emulator 40 lines,
+ 	OTbs,
+ 	lines#40,
+-	is2=\E7\E[r\E8\EE\EE\EE\EM\EM\EM\E[?7h\E[?1l\E[?3l\E7\E[1;40r\E8,
+-	use=news-old-unk,
++	is2=\E7\E[r\E8\EE\EE\EE\EM\EM\EM\E[?7h\E[?1l\E[?3l\E7\E[1;40
++	    r\E8, use=news-old-unk,
+ #
+ # (nwp513: this had :DE=^H: and the alias vt100-bm --esr)
+ nwp513|nwp518|nwe501|newscbm|news31|sony vt100 emulator 33 lines,
+ 	OTbs,
+ 	lines#31,
+-	is2=\E7\E[r\E8\EE\EE\EE\EM\EM\EM\E[?7h\E[?1l\E[?3l\E7\E[1;31r\E8,
+-	use=news-old-unk,
++	is2=\E7\E[r\E8\EE\EE\EE\EM\EM\EM\E[?7h\E[?1l\E[?3l\E7\E[1;31
++	    r\E8, use=news-old-unk,
+ #
+ # (nwp513-a: this had :TY=ascii: and :DE=^H:, which I interpret as ; --esr)
+ # also the alias vt100-bm.
+ nwp513-a|nwp518-a|nwe501-a|nwp251-a|newscbm-a|news31-a|newscbm33|news33|old sony vt100 emulator 33 lines,
+ 	OTbs,
+ 	lines#33,
+-	is2=\E7\E[r\E8\EE\EE\EE\EM\EM\EM\E[?7h\E[?1l\E[?3l\E7\E[1;33r\E8,
+-	use=news-old-unk,
++	is2=\E7\E[r\E8\EE\EE\EE\EM\EM\EM\E[?7h\E[?1l\E[?3l\E7\E[1;33
++	    r\E8, use=news-old-unk,
+ #
+ # (nwp513-o: had :DE=^H:, I think that's ; also the alias vt100-bm --esr)
+ nwp513-o|nwp518-o|nwe501-o|nwp251-o|newscbm-o|news31-o|old sony vt100 emulator 33 lines,
+ 	OTbs,
+ 	lines#31,
+-	is2=\E7\E[r\E8\EE\EE\EE\EM\EM\EM\E[?7h\E[?1l\E[?3l\E7\E[1;31r\E8,
+-	use=news-old-unk,
++	is2=\E7\E[r\E8\EE\EE\EE\EM\EM\EM\E[?7h\E[?1l\E[?3l\E7\E[1;31
++	    r\E8, use=news-old-unk,
+ #
+ # (news28: this had :DE=^H:, I think that's , and :KB=nws1200: --esr)
+ news28|sony vt100 emulator 28 lines,
+ 	OTbs,
+ 	lines#28,
+-	is2=\E7\E[r\E8\EE\EE\EE\EM\EM\EM\E[?7h\E[?1l\E[?3l\E7\E[1;28r\E8,
+-	use=news-old-unk,
++	is2=\E7\E[r\E8\EE\EE\EE\EM\EM\EM\E[?7h\E[?1l\E[?3l\E7\E[1;28
++	    r\E8, use=news-old-unk,
+ #
+ # (news29: this had :TY=ascii:KB=nws1200:\ --esr)
+ news29|news28-a|sony vt100 emulator 29 lines,
+ 	lines#29,
+-	is2=\E7\E[r\E8\EE\EE\EE\EM\EM\EM\E[?7h\E[?1l\E[?3l\E7\E[1;29r\E8,
+-	use=news-old-unk,
++	is2=\E7\E[r\E8\EE\EE\EE\EM\EM\EM\E[?7h\E[?1l\E[?3l\E7\E[1;29
++	    r\E8, use=news-old-unk,
+ #
+ # (news511: this had :TY=sjis: --esr)
+ nwp511|nwp-511|nwp-511 vt100,
+@@ -6779,7 +6939,8 @@
+ 	kslt=\E[4~, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
+ 	rmam=\E[?7l, rmir=\E[4l, rmso=\E[22;27m, rmul=\E[24m,
+ 	sc=\E7,
+-	sgr=\E[0%?%p1%t;2;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p1%t;2;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5
++	    %t;2%;%?%p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h,
+ 	smso=\E[2;7m, smul=\E[4m, tbc=\E[3g, use=ecma+color,
+ 
+@@ -6908,7 +7069,9 @@
+ cygwin|ansi emulation for Cygwin,
+ 	am, hs, mir, msgr, xon,
+ 	colors#8, it#8, pairs#64,
+-	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
++	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j
++	     \331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v
++	     \301w\302x\263y\363z\362{\343|\330}\234~\376,
+ 	bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=^M, cub=\E[%p1%dD,
+ 	cub1=^H, cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC,
+ 	cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA,
+@@ -6927,7 +7090,8 @@
+ 	rmacs=\E[10m, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l,
+ 	rmpch=\E[10m, rmso=\E[27m, rmul=\E[24m, rs1=\Ec\E]R,
+ 	sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+-	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
++	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p6%t;1%;%?%p7
++	    %t;8%;%?%p9%t;11%;m,
+ 	sgr0=\E[0;10m, smacs=\E[11m, smcup=\E7\E[?47h,
+ 	smir=\E[4h, smpch=\E[11m, smso=\E[7m, smul=\E[4m, tsl=\E];,
+ 	vpa=\E[%i%p1%dd, use=vt102+enq,
+@@ -6941,7 +7105,9 @@
+ cygwinDBG|Debug Version for Cygwin,
+ 	am, eo, mir, msgr, xon,
+ 	colors#8, cols#80, it#8, lines#24, ncv#3, pairs#64,
+-	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
++	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j
++	     \331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v
++	     \301w\302x\263y\363z\362{\343|\330}\234~\376,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[J,
+ 	cnorm=\E[?25h, cr=^M, cub=\E[%p1%dD, cub1=\E[D,
+ 	cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C,
+@@ -6962,7 +7128,8 @@
+ 	rc=\E8, rev=\E[7m, ri=\EM, rmacs=\E[10m, rmir=\E[4l,
+ 	rmso=\E[m, rmul=\E[m, rs1=\Ec\E]R, sc=\E7,
+ 	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+-	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;12%;m,
++	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5
++	    %t;2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;12%;m,
+ 	sgr0=\E[0;10m, smacs=\E[11m, smir=\E[4h, smso=\E[7m,
+ 	smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, use=vt102+enq,
+ 
+@@ -7089,7 +7256,9 @@
+ djgpp|ansi emulation for DJGPP alpha,
+ 	am, bce, msgr, xhp, xon, xt,
+ 	colors#8, it#8, pairs#64,
+-	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
++	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j
++	     \331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v
++	     \301w\302x\263y\363z\362{\343|\330}\234~\376,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[1v,
+ 	clear=\E[H\E[J, cnorm=\E[v, cr=^M, cub=\E[%p1%dD, cub1=^H,
+ 	cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C,
+@@ -7106,7 +7275,8 @@
+ 	khome=\E[1~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~, nel=^M^J,
+ 	op=\E[37;40m, rev=\E[7m, ri=\E[T, rin=\E[%p1%dT, rmso=\E[m,
+ 	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+-	sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%e;25%;%?%p6%t;1%;%?%p7%t;8%;m,
++	sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%e;25%;%?
++	    %p6%t;1%;%?%p7%t;8%;m,
+ 	sgr0=\E[m, smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd,
+ 
+ djgpp203|Entry for DJGPP 2.03,
+@@ -7142,7 +7312,9 @@
+ uwin|U/Win 3.2 console,
+ 	am, eo, in, msgr, xenl, xon,
+ 	colors#8, it#8, ncv#58, pairs#64,
+-	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i\316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
++	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i
++	     \316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u
++	     \264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l,
+ 	clear=\E[H\E[J, cnorm=\E[?25h, cr=^M, cub1=^H, cud1=^J,
+ 	cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A,
+@@ -7233,7 +7405,9 @@
+ interix|opennt|opennt-25|ntconsole|ntconsole-25|OpenNT-term compatible with color,
+ 	am, bw, msgr,
+ 	colors#8, cols#80, lines#25, ncv#3, pairs#64,
+-	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
++	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j
++	     \331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v
++	     \301w\302x\263y\363z\362{\343|\330}\234~\376,
+ 	bel=^G, bold=\E[1m, cbt=\E[Z, clear=\E[2J, cub=\E[%p1%dD,
+ 	cub1=\E[D, cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC,
+ 	cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA,
+@@ -7452,7 +7626,8 @@
+ 	kcuu1=\EA, kdch1=\EP, kdl1=\EM, ked=\EJ, kel=\EK, khome=\Eh,
+ 	kich1=\EQ, kil1=\EL, kind=\ES, knp=\EU, kpp=\EV, kri=\ET,
+ 	krmir=\ER, rev=\E&dB, rmkx=\E&s0A, rmso=\E&d@, rmul=\E&d@,
+-	sgr=\E&d%{64}%?%p1%t%{66}%|%;%?%p2%t%{68}%|%;%?%p3%t%{66}%|%;%?%p4%t%{65}%|%;%c,
++	sgr=\E&d%{64}%?%p1%t%{66}%|%;%?%p2%t%{68}%|%;%?%p3%t%{66}%|
++	    %;%?%p4%t%{65}%|%;%c,
+ 	sgr0=\E&d@, smkx=\E&s1A, smso=\E&dB, smul=\E&dD,
+ 
+ # Note: no  on HPs since that homes to top of memory, not screen.
+@@ -7548,8 +7723,7 @@
+ hp2624|hp2624a|hp2624b|hp2624b-4p|Hewlett Packard 2624 B,
+ 	da, db,
+ 	lm#96,
+-	flash=\E&w13F$<66/>\E&w12F$<66/>\E&w13F$<66/>\E&w12F,
+-	use=hp+labels, use=scrhp,
++	flash=\E&w13F$<66/>\E&w12F$<66/>\E&w13F$<66/>\E&w12F, use=hp+labels, use=scrhp,
+ 
+ # This hp2626 entry does not use any of the fancy windowing stuff
+ # of the 2626.
+@@ -7590,12 +7764,13 @@
+ 	eslok, hs,
+ 	lines#23,
+ 	fsl=\E&d@\E&w7f2p1I\E&w4f1I,
+-	is1=\E&q3t0{0H \E&w0f115n1I \E&w0f1n2I \E&w2f1i0d0u22l0S \E&w2f2i0d23u23l0S \E&w7f2p1I \r,
++	is1=\E&q3t0{0H\s\E&w0f115n1I\s\E&w0f1n2I\s\E&w2f1i0d0u22l0S
++	    \s\E&w2f2i0d23u23l0S\s\E&w7f2p1I\s\r,
+ 	tsl=\E&w7f2p2I\E&w4f2I\r\EK\E&a%p1%dC, use=hp2626,
+ # Force terminal back to 24 lines after being 23.
+ hp2626-ns|hp 2626 using all 24 lines,
+-	is1=\E&q3t0{0H \E&w0f118n1I \E&w0f1n2I \E&w2f1i0d0u23l0S \E&w3f2I \E&w7f2p1I \r,
+-	use=hp2626,
++	is1=\E&q3t0{0H\s\E&w0f118n1I\s\E&w0f1n2I\s\E&w2f1i0d0u23l0S
++	    \s\E&w3f2I\s\E&w7f2p1I\s\r, use=hp2626,
+ # Various entries useful for small windows on 2626.
+ hp2626-12|hewlett-packard 2626 12 lines,
+ 	lines#12, use=hp2626,
+@@ -7611,7 +7786,8 @@
+ #
+ hp2627a-rev|hp 2627 with reverse video colors,
+ 	cr=^M, cud1=^J, ht=^I, ind=^J,
+-	is2=\E&v0m1a0b0c1x1y1z1i0a0b1c1x1y1z0i0S\E&j@\r\E3\r,
++	is2=\E&v0m1a0b0c1x1y1z1i0a0b1c1x1y1z0i0S\E&j@\r\E3
++	    \r,
+ 	kbs=^H, kcub1=^H, kcud1=^J, nel=^M^J, rmul=\E&v0S\E&d@,
+ 	smul=\E&dD\E&v1S, use=hp2621-nl,
+ hp2627a|hp 2627 color terminal with no labels,
+@@ -7657,7 +7833,9 @@
+ 	ked=\EJ, kel=\EK, khome=\Eh, khts=\E1, kich1=\EQ, kil1=\EL,
+ 	kind=\ES, knp=\EU, kpp=\EV, kri=\ET, krmir=\ER, rev=\E&dB,
+ 	rmkx=\E&s0A,
+-	sgr=\E&d%{64}%?%p1%t%{66}%|%;%?%p2%t%{68}%|%;%?%p3%t%{66}%|%;%?%p4%t%{65}%|%;%?%p5%t%{72}%|%;%?%p6%t%{66}%|%;%c,
++	sgr=\E&d%{64}%?%p1%t%{66}%|%;%?%p2%t%{68}%|%;%?%p3%t%{66}%|
++	    %;%?%p4%t%{65}%|%;%?%p5%t%{72}%|%;%?%p6%t%{66}%|
++	    %;%c,
+ 	sgr0=\E&d@, smkx=\E&s1A, smul=\E&dD, use=hpgeneric,
+ # You should use this terminal at 4800 baud or less.
+ hp2648|hp2648a|HP 2648a graphics terminal,
+@@ -7677,9 +7855,13 @@
+ 	da, db,
+ 	lh#1, lm#48,
+ 	acsc@,
+-	pln=\E&f0a%p1%dk%p2%l%Pa%?%ga%t%ga%d%e1%;d0L%?%ga%!%t %;%p2%s,
++	pln=\E&f0a%p1%dk%p2%l%Pa%?%ga%t%ga%d%e1%;d0L%?%ga%!%t\s%;%p2
++	    %s,
+ 	rmacs@,
+-	sgr=\E&d%{0}%Pa%?%p4%t%{1}%ga%+%Pa%;%?%p1%p3%|%p6%|%t%{2}%ga%+%Pa%;%?%p2%p6%|%t%{4}%ga%+%Pa%;%?%p1%p5%|%t%{8}%ga%+%Pa%;%?%p7%t%?%ga%ts%ga%{64}%+%e%{83}%;%e%?%ga%t%ga%{64}%+%e%{64}%;%;%c,
++	sgr=\E&d%{0}%Pa%?%p4%t%{1}%ga%+%Pa%;%?%p1%p3%|%p6%|%t%{2}%ga
++	    %+%Pa%;%?%p2%p6%|%t%{4}%ga%+%Pa%;%?%p1%p5%|%t%{8}%ga%+
++	    %Pa%;%?%p7%t%?%ga%ts%ga%{64}%+%e%{83}%;%e%?%ga%t%ga%{64}
++	    %+%e%{64}%;%;%c,
+ 	sgr0=\E&d@, smacs@, use=hp+labels, use=scrhp,
+ 
+ hp2621-a|hp2621a-a|hp2621 with fn as arrows,
+@@ -7697,7 +7879,8 @@
+ newhp|generic entry for new hewlett packard terminals,
+ 	am, bw, mir, xhp, xon,
+ 	cols#80, lines#24, pb#4800,
+-	acsc=2[3@4>5I9(\:'JSKWLQMAO#P$Q;R!S"T1U2V4W3X\:Y+Z*dHjGkTlRmFn/q\,t5u6v8w7x.,
++	acsc=2[3@4>5I9(\:'JSKWLQMAO#P$Q;R!S"T1U2V4W3X\:Y+Z*dHjGkTlRm
++	     Fn/q\,t5u6v8w7x.,
+ 	bel=^G, blink=\E&dA, bold=\E&dF, cbt=\Ei, cr=^M, cub1=^H,
+ 	cud1=^J, cuf1=\EC, cuu1=\EA, dch1=\EP$<2>, dim=\E&dH,
+ 	dl1=\EM, ed=\EJ, el=\EK, ht=\011$<2>, hts=\E1, il1=\EL, ind=^J,
+@@ -7706,7 +7889,10 @@
+ 	pfloc=\E&f1a%p1%dk0d%p2%l%dL%p2%s,
+ 	pfx=\E&f2a%p1%dk0d%p2%l%dL%p2%s, rev=\E&dB, ri=\ET,
+ 	rmacs=^O, rmir=\ER, rmso=\E&d@, rmul=\E&d@, rs1=\Eg,
+-	sgr=\E&d%{0}%Pa%?%p4%t%{1}%ga%+%Pa%;%?%p1%p3%|%p6%|%t%{2}%ga%+%Pa%;%?%p2%p6%|%t%{4}%ga%+%Pa%;%?%p1%p5%|%t%{8}%ga%+%Pa%;%?%p7%t%?%ga%ts%ga%{64}%+%e%{83}%;%e%?%ga%t%ga%{64}%+%e%{64}%;%;%c%?%p9%t\016%e\017%;,
++	sgr=\E&d%{0}%Pa%?%p4%t%{1}%ga%+%Pa%;%?%p1%p3%|%p6%|%t%{2}%ga
++	    %+%Pa%;%?%p2%p6%|%t%{4}%ga%+%Pa%;%?%p1%p5%|%t%{8}%ga%+
++	    %Pa%;%?%p7%t%?%ga%ts%ga%{64}%+%e%{83}%;%e%?%ga%t%ga%{64}
++	    %+%e%{64}%;%;%c%?%p9%t\016%e\017%;,
+ 	sgr0=\E&d@\017, smacs=^N, smir=\EQ, smso=\E&dJ, smul=\E&dD,
+ 	tbc=\E3, use=newhpkeyboard,
+ 
+@@ -7728,7 +7914,8 @@
+ hp+labels|"standard" label info for new HP ttys,
+ 	lh#2, lw#8, nlab#8,
+ 	lf0=f1, lf1=f2, lf2=f3, lf3=f4, lf4=f5, lf5=f6, lf6=f7, lf7=f8,
+-	pln=\E&f2a%p1%dk%p2%l%Pa%?%ga%t%ga%d%e1%;d0L%?%ga%!%t %;%p2%s,
++	pln=\E&f2a%p1%dk%p2%l%Pa%?%ga%t%ga%d%e1%;d0L%?%ga%!%t\s%;%p2
++	    %s,
+ 	rmln=\E&j@, smln=\E&jB,
+ 
+ hp+printer|"standard" printer info for HP ttys,
+@@ -7743,7 +7930,8 @@
+ 	lh#1, lm#48, lw#8, nlab#8,
+ 	kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, khome=\Eh,
+ 	kind=\ET, kll=\EF, kri=\ES,
+-	pln=\E&f0a%p1%dk%p2%l%Pa%?%ga%t%ga%d%e1%;d3L%?%ga%!%t%{32}%c%;%p2%s\E%{111}%p1%+%c\r,
++	pln=\E&f0a%p1%dk%p2%l%Pa%?%ga%t%ga%d%e1%;d3L%?%ga%!%t%{32}%c
++	    %;%p2%s\E%{111}%p1%+%c\r,
+ 	smln=\E&jB, use=hp2621,
+ 
+ hp2621b-p|hp 2621b with printer,
+@@ -7793,8 +7981,12 @@
+ hp+color|hp with colors,
+ 	ccc,
+ 	colors#16, ncv#17, pairs#7,
+-	initp=\E&v%?%p2%{1000}%=%t1%e.%p2%d%;a%?%p3%{1000}%=%t1%e.%p3%d%;b%?%p4%{1000}%=%t1%e.%p4%d%;c%?%p5%{1000}%=%t1%e.%p5%d%;x%?%p6%{1000}%=%t1%e.%p6%d%;y%?%p7%{1000}%=%t1%e.%p7%d%;z%p1%dI,
+-	oc=\E&v0m1a1b1c0I\E&v1a1I\E&v1b2I\E&v1a1b3I\E&v1c4I\E&v1a1c5I\E&v1b1c6I\E&v1x1y7I,
++	initp=\E&v%?%p2%{1000}%=%t1%e.%p2%d%;a%?%p3%{1000}%=%t1%e.
++	      %p3%d%;b%?%p4%{1000}%=%t1%e.%p4%d%;c%?%p5%{1000}%=%t1
++	      %e.%p5%d%;x%?%p6%{1000}%=%t1%e.%p6%d%;y%?%p7%{1000}%=
++	      %t1%e.%p7%d%;z%p1%dI,
++	oc=\E&v0m1a1b1c0I\E&v1a1I\E&v1b2I\E&v1a1b3I\E&v1c4I\E&v1a1c5
++	   I\E&v1b1c6I\E&v1x1y7I,
+ 	op=\E&v0S, scp=\E&v%p1%dS,
+ 
+ #  sets the screen to be 80 columns wide
+@@ -7817,7 +8009,8 @@
+ hpansi|hp700|hewlett packard 700/44 in HP-PCterm mode,
+ 	am, eo, xenl, xon,
+ 	cols#80, lines#25,
+-	acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x\263,
++	acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x
++	     \263,
+ 	bel=^G, cbt=\E[Z, civis=\E[?25l, clear=\E[2J\E[H,
+ 	cnorm=\E[?25h, cr=^M, cub1=\E[D, cud1=\E[B, cuf1=\E[C,
+ 	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P, dl1=\E[M,
+@@ -7886,7 +8079,8 @@
+ 	pfx=\E&f2a%p1%dk%p2%l%dL%p2%s,
+ 	pln=\E&f%p1%dk%p2%l%dd0L%p2%s, rmir=\ER, rmkx=\E&s0A,
+ 	rmln=\E&j@, rmso=\E&d@, rmul=\E&d@,
+-	sgr=\E&d%?%p7%t%{115}%c%;%p1%p3%|%p6%|%{2}%*%p2%{4}%*%+%p4%+%p5%{8}%*%+%{64}%+%c%?%p9%t%'\016'%c%e%'\017'%c%;,
++	sgr=\E&d%?%p7%t%{115}%c%;%p1%p3%|%p6%|%{2}%*%p2%{4}%*%+%p4%+
++	    %p5%{8}%*%+%{64}%+%c%?%p9%t%'\016'%c%e%'\017'%c%;,
+ 	sgr0=\E&d@, smir=\EQ, smkx=\E&s1A, smln=\E&jB, smso=\E&dB,
+ 	smul=\E&dD, tbc=\E3, vpa=\E&a%p1%dY,
+ 
+@@ -8170,7 +8364,9 @@
+ 	bel=^G, clear=^Z, cr=^M, cub1=^H, cud1=^J, cuf1=^L,
+ 	cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, dch1=\EW,
+ 	dl1=\ER, ed=\EY, el=\ET, home=^^, hts=\E1, ich1=\EQ, il1=\EE,
+-	is2=\E0        \E1        \E1        \E1        \E1        \E1        \E1        \E1        \E1,
++	is2=\E0\s\s\s\s\s\s\s\s\E1\s\s\s\s\s\s\s\s\E1\s\s\s\s\s\s\s
++	    \s\E1\s\s\s\s\s\s\s\s\E1\s\s\s\s\s\s\s\s\E1\s\s\s\s\s\s
++	    \s\s\E1\s\s\s\s\s\s\s\s\E1\s\s\s\s\s\s\s\s\E1,
+ 	kcub1=^H, kcud1=^J, kcuf1=^L, kcuu1=^K, kf0=^A0\r, kf1=^A1\r,
+ 	kf2=^A2\r, kf3=^A3\r, kf4=^A4\r, kf5=^A5\r, kf6=^A6\r,
+ 	kf7=^A7\r, kf8=^A8\r, kf9=^A9\r, rmir=\Er, smir=\Eq, tbc=\E0,
+@@ -8199,7 +8395,8 @@
+ 	bel=^G, cbt=\EI, clear=\E+, cr=^M, cub1=^H, cud1=^J, cuf1=^L,
+ 	cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, dch1=\EW,
+ 	dl1=\ER, ed=\Ey, el=\Et, home=^^, ht=\Ei, ich1=\EQ, il1=\EE,
+-	is2=\E%\014\014\014\016\003\0\003\002\003\002\0\0\0\0\0\0\0\0\0\0\0,
++	is2=\E%\014\014\014\016\003\0\003\002\003\002\0\0\0\0\0\0\0
++	    \0\0\0\0,
+ 	kbs=^H, kcub1=^H, kcud1=^J, kcuf1=^L, kcuu1=^K, kf1=^A@\r,
+ 	kf2=^AA\r, kf3=^AB\r, kf4=^AC\r, kf5=^AD\r, kf6=^AE\r,
+ 	kf7=^AF\r, khome=^^, lf1=F1, lf2=F2, lf3=F3, lf4=F4, lf5=F5,
+@@ -8364,8 +8561,7 @@
+ 	OTbs, OTpt,
+ 	OTkn#4,
+ 	if=/usr/share/tabset/vt100,
+-	is2=\E<\E>\E[6;?2;?7;?8h\E[4;20;?1;?3;?4;?5;?6;?18;?19l,
+-	use=vt100,
++	is2=\E<\E>\E[6;?2;?7;?8h\E[4;20;?1;?3;?4;?5;?6;?18;?19l, use=vt100,
+ # (adm42: removed obsolete ":ma=^K^P:" -- esr)
+ adm42|lsi adm42,
+ 	OTbs, am,
+@@ -8424,7 +8620,8 @@
+ 	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, khome=\E$A, nel=^M^J,
+ 	rmcup=, rmir=\E[4l, rmkx=\E[>13l, rmso=\E[m, rmul=\E[m,
+ 	sgr0=\E[m,
+-	smcup=\E[>1l\E[>2l\E[>16l\E[4l\E[>9l\E[20l\E[>3l\E[>7h\E[>12l\E[1Q,
++	smcup=\E[>1l\E[>2l\E[>16l\E[4l\E[>9l\E[20l\E[>3l\E[>7h\E[>12
++	      l\E[1Q,
+ 	smir=\E[4h, smkx=\E[>13h, smso=\E[2;7m, smul=\E[4m,
+ pt100w|pt200w|wrenw|fenixw|prime pt100/pt200 in 132-column mode,
+ 	cols#132,
+@@ -8510,7 +8707,8 @@
+ 	rev=\E[7m$<2>, ri=\EM$<5>, rmam=\E[?7l, rmkx=\E[?1l\E>,
+ 	rmso=\E[m$<2>, rmul=\E[m$<2>,
+ 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7,
+-	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m$<2>,
++	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
++	    %;m$<2>,
+ 	sgr0=\E[m$<2>, smam=\E[?7h, smkx=\E[?1h\E=,
+ 	smso=\E[7m$<2>, smul=\E[4m$<2>, tbc=\E[3g,
+ qvt103-w|qume qvt103 132 cols,
+@@ -9010,7 +9208,8 @@
+ 	xmc#1,
+ 	blink=\E\^, dim=\E)\s, invis=\E_, rev=\Ej, rmso=\E(\Ek,
+ 	rmul=\Em,
+-	sgr=\E%?%p1%p5%|%t)%e(%; \010\E%?%p1%p3%|%tj%ek%;\010\E%?%p2%tl%em%;\010\E%?%p7%t_%e%?%p4%t\^%eq%;%;,
++	sgr=\E%?%p1%p5%|%t)%e(%;\s\010\E%?%p1%p3%|%tj%ek%;\010\E%?
++	    %p2%tl%em%;\010\E%?%p7%t_%e%?%p4%t\^%eq%;%;,
+ 	sgr0=\E(\Ek\010\Em\010\Eq, smso=\E)\Ej, smul=\El,
+ 
+ # This uses the second page memory option to save & restore screen
+@@ -9432,7 +9631,9 @@
+ 	dl1=\ER, dsl=\Eg\Ef\r, ed=\Ey, el=\Et, flash=\Eb$<200/>\Ed,
+ 	fsl=^M, home=^^, ht=^I, hts=\E1, ich1=\EQ, il1=\EE, ind=^J,
+ 	invis@,
+-	is2=\EDF\EC\Ed\EG0\Eg\Er\EO\E'\E(\E%\Ew\EX\Ee \017\011\El\E016\E004\Ex0\0\0\Ex1\0\0\Ex2\0\0\011\Ex3\0\0\Ex4\r\0\Ef\r,
++	is2=\EDF\EC\Ed\EG0\Eg\Er\EO\E'\E(\E%\Ew\EX\Ee\s\017\011\El
++	    \E016\E004\Ex0\0\0\Ex1\0\0\Ex2\0\0\011\Ex3\0\0\Ex4\r\0
++	    \Ef\r,
+ 	kbs=^H, kcbt=\EI, kclr=\E*, kcub1=^H, kcud1=^V, kcuf1=^L,
+ 	kcuu1=^K, kdch1=\EW, kdl1=\ER, ked=\Ey, kel=\Et, kf0=^A0\r,
+ 	kf1=^A@\r, kf2=^AA\r, kf3=^AB\r, kf4=^AC\r, kf5=^AD\r,
+@@ -9454,7 +9655,9 @@
+ #	set local (no send) edit keys (\Ek) when exiting vi
+ #
+ tvi950-2p|televideo950 w/2 pages,
+-	is2=\EDF\EC\Ed\EG0\Eg\Er\EO\E'\E(\E%\Ew\EX\Ee \017\011\Ek\E016\E004\Ex0\0\0\Ex1\0\0\Ex2\0\0\011\Ex3\0\0\Ex4\r\0\E\\2\E-07 \011,
++	is2=\EDF\EC\Ed\EG0\Eg\Er\EO\E'\E(\E%\Ew\EX\Ee\s\017\011\Ek
++	    \E016\E004\Ex0\0\0\Ex1\0\0\Ex2\0\0\011\Ex3\0\0\Ex4\r\0
++	    \E\\2\E-07\s\011,
+ 	rmcup=\E\\2\E-07\s, rmkx=\Ek, smcup=\E\\1\E-07\s,
+ 	smkx=\El, use=tvi950,
+ #
+@@ -9468,7 +9671,9 @@
+ #			 place cursor at 0,24,1 (\E-07 )
+ #
+ tvi950-4p|televideo950 w/4 pages,
+-	is2=\EDF\EC\Ed\EG0\Eg\Er\EO\E'\E(\E%\Ew\EX\Ee \017\011\Ek\E016\E004\Ex0\0\0\Ex1\0\0\Ex2\0\0\011\Ex3\0\0\Ex4\r\0\E\\3\E-07 \011,
++	is2=\EDF\EC\Ed\EG0\Eg\Er\EO\E'\E(\E%\Ew\EX\Ee\s\017\011\Ek
++	    \E016\E004\Ex0\0\0\Ex1\0\0\Ex2\0\0\011\Ex3\0\0\Ex4\r\0
++	    \E\\3\E-07\s\011,
+ 	rmcup=\E\\3\E-07\s, rmkx=\Ek, smcup=\E\\1\E-07\s,
+ 	smkx=\El, use=tvi950,
+ #
+@@ -9479,20 +9684,25 @@
+ #
+ tvi950-rv|televideo950 rev video,
+ 	flash=\Ed$<200/>\Eb,
+-	is2=\EDF\EC\Eb\EG0\Eg\Er\EO\E'\E(\E%\Ew\EX\Ee \017\011\El\E016\E004\Ex0\0\0\Ex1\0\0\Ex2\0\0\011\Ex3\0\0\Ex4\r\0,
+-	use=tvi950,
++	is2=\EDF\EC\Eb\EG0\Eg\Er\EO\E'\E(\E%\Ew\EX\Ee\s\017\011\El
++	    \E016\E004\Ex0\0\0\Ex1\0\0\Ex2\0\0\011\Ex3\0\0
++	    \Ex4\r\0, use=tvi950,
+ 
+ # tvi950-rv-2p uses the appropriate entries from 950-2p and 950-rv
+ tvi950-rv-2p|televideo950 rev video w/2 pages,
+ 	flash=\Ed$<200/>\Eb,
+-	is2=\EDF\EC\Eb\EG0\Eg\Er\EO\E'\E(\E%\Ew\EX\Ee \017\011\Ek\E016\E004\Ex0\0\0\Ex1\0\0\Ex2\0\0\011\Ex3\0\0\Ex4\r\0\E\\2\E-07\s,
++	is2=\EDF\EC\Eb\EG0\Eg\Er\EO\E'\E(\E%\Ew\EX\Ee\s\017\011\Ek
++	    \E016\E004\Ex0\0\0\Ex1\0\0\Ex2\0\0\011\Ex3\0\0\Ex4\r\0
++	    \E\\2\E-07\s,
+ 	rmcup=\E\\2\E-07\s, rmkx=\Ek, smcup=\E\\1\E-07\s,
+ 	smkx=\El, use=tvi950,
+ 
+ # tvi950-rv uses the appropriate entries from 950-4p and 950-rv
+ tvi950-rv-4p|televideo950 rev video w/4 pages,
+ 	flash=\Ed$<200/>\Eb,
+-	is2=\EDF\EC\Eb\EG0\Er\EO\E'\E(\E%\Ew\EX\Ee \017\011\Ek\E016\E004\Ex0\0\0\Ex1\0\0\Ex2\0\0\011\Ex3\0\0\Ex4\r\0\E\\3\E-07\s,
++	is2=\EDF\EC\Eb\EG0\Er\EO\E'\E(\E%\Ew\EX\Ee\s\017\011\Ek
++	    \E016\E004\Ex0\0\0\Ex1\0\0\Ex2\0\0\011\Ex3\0\0\Ex4\r\0
++	    \E\\3\E-07\s,
+ 	rmcup=\E\\3\E-07\s, rmkx=\Ek, smcup=\E\\1\E-07\s,
+ 	smkx=\El, use=tvi950,
+ # From: Andreas Stolcke 
+@@ -9514,7 +9724,8 @@
+ 	is2=\E[=3l\EF1\Ed\EG0\E[=5l\E%\El, kctab=\E2, khts=\E1,
+ 	knp=\EK, kpp=\EJ, krmir=\EQ, ktbc=\E3, mc0=\EP, rmacs=\E%%,
+ 	rmam=\E[=7l, rmxon=^N,
+-	rs1=\EDF\EC\Eg\Er\EO\E'\E(\Ew\EX\Ee \017\E0P\E6\0\E0p\E4\0\Ef\r,
++	rs1=\EDF\EC\Eg\Er\EO\E'\E(\Ew\EX\Ee\s\017\E0P\E6\0\E0p\E4\0
++	    \Ef\r,
+ 	sgr0=\EG0\E[=5l, smacs=\E$, smam=\E[=7h, smxon=^O,
+ 	use=tvi950,
+ tvi955-w|955-w|televideo955 w/132 cols,
+@@ -9602,9 +9813,15 @@
+ 	rmacs=\E%%, rmam=\E[=7l, rmcup=\E.3\Er\E[1;25r\E[25;0H,
+ 	rmdc=\0, rmir=\Er, rmln=\E[4;1v, rmso=\EG0, rmul=\EG0,
+ 	rmxon=^N, rs1=\EC\EDF\E[0;0v\E[8;1v\E[=65l,
+-	rs2=\E.b\E[10;20v\E[14;1v\E[3;0v\E[7;0v\E[=11.h\E[=12.h\E[=13.h\E[=14.h\E[=15l\E[=20h\E[=60l\E[=61h\E[=9l\E[=10l\E[=21l\E[=23l\E[=3l\E_40\E_50\En\Ew\Ee \Ex0\0\0\Ex1\0\0\Ex2\0\0\Ex3\0\0\Ex4\0\0\E1,
+-	rs3=\E[=19h\E.3\E9\E0O\0\0\0\0\0\E0o\0\0\0\0\0\E0J\177\0\0\0\0,
+-	sgr=\EG0%?%p1%t\EGt%;%?%p2%t\EG8%;%?%p3%t\EG4%;%?%p4%t\EG2%;%?%p5%t\EGp%;%?%p6%t\EG\,%;%?%p7%t\EG1%;%?%p8%t\E&%;%?%p9%t\E$%e\E%%%;,
++	rs2=\E.b\E[10;20v\E[14;1v\E[3;0v\E[7;0v\E[=11.h\E[=12.h\E[=1
++	    3.h\E[=14.h\E[=15l\E[=20h\E[=60l\E[=61h\E[=9l\E[=10l\E[=
++	    21l\E[=23l\E[=3l\E_40\E_50\En\Ew\Ee\s\Ex0\0\0\Ex1\0\0
++	    \Ex2\0\0\Ex3\0\0\Ex4\0\0\E1,
++	rs3=\E[=19h\E.3\E9\E0O\0\0\0\0\0\E0o\0\0\0\0\0\E0J\177\0\0
++	    \0\0,
++	sgr=\EG0%?%p1%t\EGt%;%?%p2%t\EG8%;%?%p3%t\EG4%;%?%p4%t\EG2%;
++	    %?%p5%t\EGp%;%?%p6%t\EG\,%;%?%p7%t\EG1%;%?%p8%t\E&%;%?
++	    %p9%t\E$%e\E%%%;,
+ 	sgr0=\EG0\E%, smacs=\E$, smam=\E=7h, smcup=\E.2, smdc=\Er,
+ 	smir=\Eq, smln=\E[4;2v, smso=\EGt, smul=\EG8, smxon=^O,
+ 	tbc=\E3, tsl=\E[4;1v\E_30, uc=\EG8\EG0,
+@@ -9721,8 +9938,7 @@
+ # some of the vi300s have older firmware that has the command
+ # sequence for setting editing extent reversed.
+ vi300-old|visual 300 with old firmware (set edit extent reversed),
+-	is2=\E[7s\E[2;3;4;20;?5;?6l\E[12;?7h\E[2Q\E[0;1(D\E[8s,
+-	use=vi300,
++	is2=\E[7s\E[2;3;4;20;?5;?6l\E[12;?7h\E[2Q\E[0;1(D\E[8s, use=vi300,
+ 
+ # Visual 500 prototype entry from University of Wisconsin.
+ # The best place to look for the escape sequences is page A1-1 of the
+@@ -9830,7 +10046,9 @@
+ 	ma@, xmc#1,
+ 	blink=\EG2, dim=\EGp, prot=\EG0\E), rmacs=\EG0\EH\003,
+ 	rmcup=\EG0, rmso=\EG0,
+-	sgr=\EG%{48}%?%p2%p6%|%t%{8}%|%;%?%p1%p3%|%p6%|%t%{4}%|%;%?%p4%t%{2}%|%;%?%p1%p5%|%t%{64}%|%;%?%p7%t%{1}%|%;%c%?%p8%t\E)%e\E(%;%?%p9%t\EH\002%e\EH\003%;,
++	sgr=\EG%{48}%?%p2%p6%|%t%{8}%|%;%?%p1%p3%|%p6%|%t%{4}%|%;%?
++	    %p4%t%{2}%|%;%?%p1%p5%|%t%{64}%|%;%?%p7%t%{1}%|%;%c%?%p8
++	    %t\E)%e\E(%;%?%p9%t\EH\002%e\EH\003%;,
+ 	sgr0=\EG0\E(\EH\003, smacs=\EG0\EH\002, smcup=,
+ 	smso=\EG4, use=wy30, use=adm+sgr,
+ #	The mandatory pause used by  does not work with
+@@ -9869,7 +10087,8 @@
+ 	pfx=\Ez%p1%{63}%+%c%p2%s\177,
+ 	pln=\Ez%p1%{47}%+%c%p2%s\r, prot=\E`7\E), rev=\E`6\E),
+ 	ri=\Ej, rmacs=\EH^C, rmir=\Er, rmln=\EA11, rmso=\E(,
+-	sgr=%?%p1%p3%|%t\E`6\E)%e%p5%p8%|%t\E`7\E)%e\E(%;%?%p9%t\EH\002%e\EH\003%;,
++	sgr=%?%p1%p3%|%t\E`6\E)%e%p5%p8%|%t\E`7\E)%e\E(%;%?%p9%t\EH
++	    \002%e\EH\003%;,
+ 	sgr0=\E(\EH\003, smacs=\EH^B, smir=\Eq, smln=\EA10,
+ 	smso=\E`6\E), tbc=\E0, tsl=\EF,
+ #
+@@ -9886,7 +10105,9 @@
+ 	ma@, xmc#1,
+ 	blink=\EG2, dim=\EGp, prot=\EG0\E), rev=\EG4,
+ 	rmacs=\EG0\EH\003, rmcup=\EG0, rmso=\EG0,
+-	sgr=\EG%{48}%?%p2%p6%|%t%{8}%|%;%?%p1%p3%|%p6%|%t%{4}%|%;%?%p4%t%{2}%|%;%?%p1%p5%|%t%{64}%|%;%?%p7%t%{1}%|%;%c%?%p8%t\E)%e\E(%;%?%p9%t\EH\002%e\EH\003%;,
++	sgr=\EG%{48}%?%p2%p6%|%t%{8}%|%;%?%p1%p3%|%p6%|%t%{4}%|%;%?
++	    %p4%t%{2}%|%;%?%p1%p5%|%t%{64}%|%;%?%p7%t%{1}%|%;%c%?%p8
++	    %t\E)%e\E(%;%?%p9%t\EH\002%e\EH\003%;,
+ 	sgr0=\EG0\E(\EH\003, smacs=\EG0\EH\002, smcup=,
+ 	smso=\EGt, use=wy50, use=adm+sgr,
+ wy50-vb|wyse50-vb|wyse 50 visible bell,
+@@ -9943,8 +10164,14 @@
+ 	pfx=\Ez%p1%{63}%+%c%p2%s\177,
+ 	pln=\Ez%p1%{47}%+%c%p2%s\r, prot=\EG0\E), ri=\Ej,
+ 	rmacs=\EG0\EH\003, rmir=\Er, rmln=\EA11, setb=,
+-	setf=%?%p1%{0}%=%t%{76}%e%p1%{1}%=%t%{64}%e%p1%{2}%=%t%{8}%e%p1%{3}%=%t%{72}%e%p1%{4}%=%t%{4}%e%p1%{5}%=%t%{68}%e%p1%{6}%=%t%{12}%e%p1%{7}%=%t%{0}%;%PC\EG%gC%gA%+%{48}%+%c,
+-	sgr=%{0}%?%p4%t%{2}%|%;%?%p7%t%{1}%|%;%PA\EG%?%gC%t%gC%e%{0}%?%p1%t%{4}%|%;%?%p2%t%{8}%|%;%?%p3%t%{4}%|%;%?%p5%t%{64}%|%;%;%gA%+%{48}%+%c%?%p8%t\E)%e\E(%;%?%p9%t\EH\002%e\EH\003%;,
++	setf=%?%p1%{0}%=%t%{76}%e%p1%{1}%=%t%{64}%e%p1%{2}%=%t%{8}%e
++	     %p1%{3}%=%t%{72}%e%p1%{4}%=%t%{4}%e%p1%{5}%=%t%{68}%e
++	     %p1%{6}%=%t%{12}%e%p1%{7}%=%t%{0}%;%PC\EG%gC%gA%+
++	     %{48}%+%c,
++	sgr=%{0}%?%p4%t%{2}%|%;%?%p7%t%{1}%|%;%PA\EG%?%gC%t%gC%e%{0}
++	    %?%p1%t%{4}%|%;%?%p2%t%{8}%|%;%?%p3%t%{4}%|%;%?%p5%t
++	    %{64}%|%;%;%gA%+%{48}%+%c%?%p8%t\E)%e\E(%;%?%p9%t\EH
++	    \002%e\EH\003%;,
+ 	sgr0=\EG0\E(\EH\003%{0}%PA%{0}%PC, smacs=\EG0\EH\002,
+ 	smir=\Eq, smln=\EA10, tbc=\E0, tsl=\EF, use=adm+sgr,
+ wy350-vb|wyse350-vb|wyse 350 visible bell,
+@@ -9986,7 +10213,8 @@
+ 	dim=\EGp, dl1=\ER$<3>, dsl=\EF\r, ed=\EY$<50>, el=\ET$<4>,
+ 	flash=\E`8$<100/>\E`9, fsl=^M, home=^^, ht=\011$<1>,
+ 	hts=\E1, il1=\EE$<3>, ind=\n$<3>, ip=$<2>, is1=\EcB0\EcC1,
+-	is2=\Ed$\EcD\E'\Er\EH\003\Ed/\EO\Ee1\Ed*\E`@\E`9\E`1\016\024\El,
++	is2=\Ed$\EcD\E'\Er\EH\003\Ed/\EO\Ee1\Ed*\E`@\E`9\E`1\016
++	    \024\El,
+ 	is3=\EwJ\Ew1$<150>, kHOM=\E{, kbs=^H, kcbt=\EI, kcub1=^H,
+ 	kcud1=^J, kcuf1=^L, kcuu1=^K, kdch1=\EW, kdl1=\ER, ked=\EY,
+ 	kel=\ET, kent=\E7, kf1=^A@\r, kf10=^AI\r, kf11=^AJ\r,
+@@ -10001,7 +10229,9 @@
+ 	rmacs=\EcD, rmam=\Ed., rmcup=\Ew1, rmir=\Er, rmln=\EA11,
+ 	rmxon=\Ec20, rs1=\E~!\E~4$<30>, rs2=\EeF\E`\:$<70>,
+ 	rs3=\EwG\Ee($<100>,
+-	sgr=%?%p8%t\E)%e\E(%;%?%p9%t\EcE%e\EcD%;\EG%{48}%?%p2%t%{8}%|%;%?%p1%p3%|%p6%|%t%{4}%|%;%?%p4%t%{2}%|%;%?%p1%p5%|%t%{64}%|%;%?%p7%t%{1}%|%;%c,
++	sgr=%?%p8%t\E)%e\E(%;%?%p9%t\EcE%e\EcD%;\EG%{48}%?%p2%t%{8}
++	    %|%;%?%p1%p3%|%p6%|%t%{4}%|%;%?%p4%t%{2}%|%;%?%p1%p5%|%t
++	    %{64}%|%;%?%p7%t%{1}%|%;%c,
+ 	sgr0=\E(\EH\003\EG0\EcD, smacs=\EcE, smam=\Ed/,
+ 	smcup=\Ew0, smir=\Eq, smln=\EA10, smso=\EGt, smxon=\Ec21,
+ 	tbc=\E0, tsl=\EF, use=adm+sgr,
+@@ -10066,7 +10296,8 @@
+ 	ed=\EY$<100>, el=\ET, flash=\E`8$<100/>\E`9, fsl=^M,
+ 	home=\E{, ht=\011$<1>, hts=\E1, il1=\EE$<4>, ind=\n$<5>,
+ 	ip=$<3>, is1=\EcB0\EcC1,
+-	is2=\Ed$\EcD\E'\Er\EH\003\Ed/\EO\Ee1\Ed*\E`@\E`9\E`1\016\024\El,
++	is2=\Ed$\EcD\E'\Er\EH\003\Ed/\EO\Ee1\Ed*\E`@\E`9\E`1\016
++	    \024\El,
+ 	is3=\EwJ\Ew1$<150>, kHOM=\E{, kbs=^H, kcbt=\EI, kcub1=^H,
+ 	kcud1=^J, kcuf1=^L, kcuu1=^K, kdch1=\EW, kdl1=\ER, ked=\EY,
+ 	kel=\ET, kent=\E7, kf1=^A@\r, kf10=^AI\r, kf11=^AJ\r,
+@@ -10081,7 +10312,9 @@
+ 	rmacs=\EcD, rmam=\Ed., rmclk=\E`c, rmcup=\Ew1, rmir=\Er,
+ 	rmln=\EA11, rmxon=\Ec20, rs1=\E~!\E~4$<150>,
+ 	rs2=\EeG$<150>, rs3=\EwG\Ee($<200>,
+-	sgr=%?%p8%t\E)%e\E(%;%?%p9%t\EcE%e\EcD%;\EG%{48}%?%p2%t%{8}%|%;%?%p1%p3%|%p6%|%t%{4}%|%;%?%p4%t%{2}%|%;%?%p1%p5%|%t%{64}%|%;%?%p7%t%{1}%|%;%c,
++	sgr=%?%p8%t\E)%e\E(%;%?%p9%t\EcE%e\EcD%;\EG%{48}%?%p2%t%{8}
++	    %|%;%?%p1%p3%|%p6%|%t%{4}%|%;%?%p4%t%{2}%|%;%?%p1%p5%|%t
++	    %{64}%|%;%?%p7%t%{1}%|%;%c,
+ 	sgr0=\E(\EH\003\EG0\EcD, smacs=\EcE, smam=\Ed/,
+ 	smcup=\Ew0, smir=\Eq, smln=\EA10, smso=\EGt, smxon=\Ec21,
+ 	tbc=\E0, tsl=\EF, use=adm+sgr,
+@@ -10194,7 +10427,8 @@
+ 	enacs=\E)0, flash=\E[?5h$<30/>\E[?5l, home=\E[H,
+ 	hpa=\E[%i%p1%dG, ht=^I, ich=\E[%p1%d@, il=\E[%p1%dL,
+ 	il1=\E[L, ind=\n$<1>, invis=\E[8m,
+-	is2=\E7\E[1r\E8\E[2;3;4;13;20;34;39;36l\E[12;16;34h\E[?1;3;4;5;10;18l\E[?7;8;25h\E>\E[?5W\E(B\017\E[4i,
++	is2=\E7\E[1r\E8\E[2;3;4;13;20;34;39;36l\E[12;16;34h\E[?1;3;4
++	    ;5;10;18l\E[?7;8;25h\E>\E[?5W\E(B\017\E[4i,
+ 	kbs=^H, kcbt=\E[z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
+ 	kcuu1=\EOA, kf1=\EOP, kf10=\E[21~, kf11=\E[23~,
+ 	kf12=\E[24~, kf17=\E[K, kf18=\E[31~, kf19=\E[32~, kf2=\EOQ,
+@@ -10204,9 +10438,13 @@
+ 	mc4=\E[4i, mc5=\E[5i, nel=\EE, prot=\E[1"q, rc=\E8,
+ 	rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l, rmir=\E[4l,
+ 	rmkx=\E[?1l, rmso=\E[27m, rmul=\E[24m,
+-	rs2=\E[61"p\E[40h\E[?6l\E[1r\E[2;3;4;13;20;34;39;36l\E[12;16;34h\E[?1;3;4;5;10;18l\E[?7;8;25h\E>\E[?5W\E(B\017\E[24E\E[4i,
++	rs2=\E[61"p\E[40h\E[?6l\E[1r\E[2;3;4;13;20;34;39;36l\E[12;16
++	    ;34h\E[?1;3;4;5;10;18l\E[?7;8;25h\E>\E[?5W\E(B\017\E[24E
++	    \E[4i,
+ 	sc=\E7,
+-	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%O%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m\E[%?%p8%t1%;"q%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%O%t;7%;%?%p4%t;5%;%?
++	    %p5%t;2%;%?%p7%t;8%;m\E[%?%p8%t1%;"q%?%p9%t\016%e
++	    \017%;,
+ 	sgr0=\E[m\017\E["q, smacs=^N, smam=\E[?7h, smir=\E[4h,
+ 	smkx=\E[?1h, smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd,
+ 
+@@ -10235,7 +10473,9 @@
+ 	ed=\EY$<8*>, el=\ET$<8>, enacs=\Ec@1J$<2000>,
+ 	flash=\E\^1$<30/>\E\^0, fsl=^M, home=^^, ht=^I, il1=\EE,
+ 	ind=^J, invis=\EG3,
+-	is2=\Eu\Ee6\EC\EDF\Ec21\Ec31\Ec62\Ec72\Ee;\016\E'\EeL\E`9\E\^0\E`1\E`4\Ee.\E`\:\Ee1\EG0\E(\Ed/\Ee4\Ed*\EO\E`I\Er\Ee"\EcD\024,
++	is2=\Eu\Ee6\EC\EDF\Ec21\Ec31\Ec62\Ec72\Ee;\016\E'\EeL\E`9\E
++	    \^0\E`1\E`4\Ee.\E`\:\Ee1\EG0\E(\Ed/\Ee4\Ed*\EO\E`I\Er
++	    \Ee"\EcD\024,
+ 	ka1=^^, ka3=\EJ, kbs=^H, kc1=\ET, kc3=\EK, kcbt=\EI, kcub1=^H,
+ 	kcud1=^J, kcuf1=^L, kcuu1=^K, kf1=^A@\r, kf10=^AI\r,
+ 	kf11=^AJ\r, kf12=^AK\r, kf13=^A`\r, kf14=^Aa\r, kf15=^Ab\r,
+@@ -10245,8 +10485,12 @@
+ 	kf8=^AG\r, kf9=^AH\r, kprt=\EP, mc0=\EP, mc4=^T, mc5=\Ed#,
+ 	nel=^_, prot=\E), rev=\EG4, ri=\Ej, rmacs=\EcD, rmam=\Ed.,
+ 	rmcup=\Ec21\Ec31, rmir=\Er, rmso=\EG0, rmxon=\Ec20\Ec30,
+-	rs2=\Eu\E~4\Ee6\EC\EDF\Ec21\Ec31\Ec62\Ec72\Ee;\016\E'\EeL\E`9\E\^0\E`1\E`4\Ee.\E`\:\Ee)\Ew\EwG\Ew0\Ee1\EG0\E(\Ed/\Ee4\Ed*\EO\E`I\Er\Ee"\Ec@0B\EcD\024,
+-	sgr=\E(\EG%{48}%?%p1%p3%O%t%{4}%+%;%?%p2%t%{8}%+%;%?%p4%t%{2}%+%;%?%p5%t%{64}%+%;%?%p7%t%{1}%+%;%c%?%p8%t\E)%;%?%p9%t\EcE%e\EcD%;,
++	rs2=\Eu\E~4\Ee6\EC\EDF\Ec21\Ec31\Ec62\Ec72\Ee;\016\E'\EeL\E`
++	    9\E\^0\E`1\E`4\Ee.\E`\:\Ee)\Ew\EwG\Ew0\Ee1\EG0\E(\Ed/
++	    \Ee4\Ed*\EO\E`I\Er\Ee"\Ec@0B\EcD\024,
++	sgr=\E(\EG%{48}%?%p1%p3%O%t%{4}%+%;%?%p2%t%{8}%+%;%?%p4%t
++	    %{2}%+%;%?%p5%t%{64}%+%;%?%p7%t%{1}%+%;%c%?%p8%t\E)%;%?
++	    %p9%t\EcE%e\EcD%;,
+ 	sgr0=\E(\EG0, smacs=\EcE, smam=\Ed/, smcup=\Ec20\Ec30,
+ 	smir=\Eq, smso=\EG4, smxon=\Ec21\Ec31, tsl=\EF,
+ 
+@@ -10286,7 +10530,8 @@
+ 	dclk=\E`b, dim=\EGp, dl1=\ER$<1>, dsl=\EF\r, ed=\EY$<30>,
+ 	el=\ET$<5>, flash=\E`8$<100/>\E`9, fsl=^M, home=\E{, ht=^I,
+ 	hts=\E1, il1=\EE$<1>, ind=\n$<1>, ip=$<2>, is1=\EcB0\EcC1,
+-	is2=\Ed$\EcD\E'\Er\EH\003\Ed/\EO\Ee1\Ed*\E`@\E`9\E`1\016\024\El,
++	is2=\Ed$\EcD\E'\Er\EH\003\Ed/\EO\Ee1\Ed*\E`@\E`9\E`1\016
++	    \024\El,
+ 	is3=\Ew0$<100>, kHOM=\E{, kbs=^H, kcbt=\EI, kcub1=^H,
+ 	kcud1=^J, kcuf1=^L, kcuu1=^K, kdch1=\EW, kdl1=\ER, ked=\EY,
+ 	kel=\ET, kent=\E7, kf1=^A@\r, kf10=^AI\r, kf11=^AJ\r,
+@@ -10301,7 +10546,9 @@
+ 	rmacs=\EcD, rmam=\Ed., rmclk=\E`c, rmcup=\Ew0, rmir=\Er,
+ 	rmln=\EA11, rmxon=\Ec20, rs1=\E~!\E~4$<70>,
+ 	rs2=\E`\:$<100>, rs3=\EwG\Ee($<140>,
+-	sgr=%?%p8%t\E)%e\E(%;%?%p9%t\EcE%e\EcD%;\EG%{48}%?%p2%t%{8}%|%;%?%p1%p3%|%p6%|%t%{4}%|%;%?%p4%t%{2}%|%;%?%p1%p5%|%t%{64}%|%;%?%p7%t%{1}%|%;%c,
++	sgr=%?%p8%t\E)%e\E(%;%?%p9%t\EcE%e\EcD%;\EG%{48}%?%p2%t%{8}
++	    %|%;%?%p1%p3%|%p6%|%t%{4}%|%;%?%p4%t%{2}%|%;%?%p1%p5%|%t
++	    %{64}%|%;%?%p7%t%{1}%|%;%c,
+ 	sgr0=\E(\EH\003\EG0\EcD, smacs=\EcE, smam=\Ed/,
+ 	smcup=\Ew1, smir=\Eq, smln=\EA10, smso=\EGt, smxon=\Ec21,
+ 	tbc=\E0, tsl=\EF, use=adm+sgr,
+@@ -10381,7 +10628,9 @@
+ 	rmam=\E[?7l, rmir=\E[4l, rmkx=\E>, rmso=\E[m, rmul=\E[m,
+ 	rs1=\E[13l\E[3l\E!p, rs2=\E[35h\E[?3l$<80>, rs3=\E[?5l,
+ 	sc=\E7,
+-	sgr=%?%p5%t\E[0t%;%?%p3%p1%|%t\E[1t%;%?%p2%t\E[2t%;%?%p4%t\E[3t%;%?%p1%p2%p3%p4%p5%|%|%|%|%t\E[7m%e\E[m%;%?%p9%t\016%e\017%;,
++	sgr=%?%p5%t\E[0t%;%?%p3%p1%|%t\E[1t%;%?%p2%t\E[2t%;%?%p4%t
++	    \E[3t%;%?%p1%p2%p3%p4%p5%|%|%|%|%t\E[7m%e\E[m%;%?%p9%t
++	    \016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h,
+ 	smkx=\E[?1l\E[?7h\E=, smso=\E[1t\E[7m, smul=\E[2t\E[4m,
+ 	tbc=\E[3g, tsl=\E[>\,\001, use=vt220+keypad,
+@@ -10394,7 +10643,9 @@
+ 	ma@, xmc#1,
+ 	blink=\E[2p, dim=\E[1p, invis=\E[4p, is3=\E[m\E[p,
+ 	rev=\E[16p, rmacs=\E[0p\017, rmso=\E[0p, rmul=\E[0p,
+-	sgr=\E[%{0}%?%p2%p6%|%t%{8}%|%;%?%p1%p3%|%p6%|%t%{16}%|%;%?%p4%t%{2}%|%;%?%p1%p5%|%t%{1}%|%;%?%p7%t%{4}%|%;%dp%?%p9%t\016%e\017%;,
++	sgr=\E[%{0}%?%p2%p6%|%t%{8}%|%;%?%p1%p3%|%p6%|%t%{16}%|%;%?
++	    %p4%t%{2}%|%;%?%p1%p5%|%t%{1}%|%;%?%p7%t%{4}%|%;%dp%?%p9
++	    %t\016%e\017%;,
+ 	sgr0=\E[0p\017, smacs=\E[0p\016, smso=\E[17p, smul=\E[8p,
+ 	use=wy75,
+ wy75-vb|wyse75-vb|wyse 75 with visible bell,
+@@ -10448,7 +10699,8 @@
+ 	rmacs=^O, rmam=\E[?7l, rmir=\E[4l, rmkx=\E>, rmso=\E[m,
+ 	rmul=\E[m, rs1=\E[13l\E[3l\E!p, rs2=\E[35h\E[?3l$<70>,
+ 	rs3=\E[?5l, sc=\E7,
+-	sgr=\E[0%?%p2%t;4%;%?%p3%p1%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p2%t;4%;%?%p3%p1%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?
++	    %p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h,
+ 	smkx=\E[?1l\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+ 	tsl=\E[40h\E7\E[25;%i%p1%dH, use=vt220+keypad,
+@@ -10507,7 +10759,8 @@
+ 	rmacs=^O, rmam=\E[?7l, rmir=\E[4l, rmkx=\E>, rmso=\E[m,
+ 	rmul=\E[m, rs1=\E[13l\E[3l\E!p, rs2=\E[35h\E[?3l$<70>,
+ 	rs3=\E[?5l, sc=\E7,
+-	sgr=\E[0%?%p2%t;4%;%?%p3%p1%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p7%t;8%;+m%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p2%t;4%;%?%p3%p1%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?
++	    %p6%t;1%;%?%p7%t;8%;+m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h,
+ 	smkx=\E[?1l\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+ 	tsl=\E[40h\E7\E[25;%i%p1%dH,
+@@ -10553,7 +10806,8 @@
+ 	rmkx=\E>, rmso=\E[27m, rmul=\E[24m,
+ 	rs1=\E[13l\E[3l\E\\\E[63;1"p\E[!p, rs2=\E[35h\E[?3l,
+ 	rs3=\E[?5l\E[47h\E[40l\E[r, sc=\E7,
+-	sgr=\E[0%?%p2%t;4%;%?%p3%p1%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p2%t;4%;%?%p3%p1%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?
++	    %p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smcup=\E[ Q,
+ 	smir=\E[4h, smkx=\E[?1l\E=, smso=\E[7m, smul=\E[4m,
+ 	tbc=\E[3g, tsl=\E7\E[99;%i%p1%dH, vpa=\E[%i%p1%dd,
+@@ -10594,7 +10848,8 @@
+ 	dim=\EGp, dl1=\ER$<3>, dsl=\EF\r, ed=\EY$<50>, el=\ET$<4>,
+ 	flash=\E`8$<100/>\E`9, fsl=^M, home=^^, ht=^I, hts=\E1,
+ 	il1=\EE$<3>, ind=\n$<3>, ip=$<2>, is1=\EcB0\EcC1,
+-	is2=\EcD\E'\Er\EH\003\Ed/\EO\Ee1\Ed*\E`@\E`9\E`1\016\024\El,
++	is2=\EcD\E'\Er\EH\003\Ed/\EO\Ee1\Ed*\E`@\E`9\E`1\016\024
++	    \El,
+ 	is3=\Ew0$<16>, kHOM=\E{, kbs=^H, kcbt=\EI, kcub1=^H,
+ 	kcud1=^J, kcuf1=^L, kcuu1=^K, kdch1=\EW, kdl1=\ER, ked=\EY,
+ 	kel=\ET, kent=\E7, kf1=^A@\r, kf10=^AI\r, kf11=^AJ\r,
+@@ -10609,7 +10864,9 @@
+ 	rmacs=\EcD, rmam=\Ed., rmcup=\Ew0, rmir=\Er, rmln=\EA11,
+ 	rs1=\E~!\E~4$<30>, rs2=\EeF\E`\:$<70>,
+ 	rs3=\EwG\Ee($<100>,
+-	sgr=%?%p8%t\E)%e\E(%;%?%p9%t\EcE%e\EcD%;\EG%{48}%?%p2%t%{8}%|%;%?%p1%p3%|%p6%|%t%{4}%|%;%?%p4%t%{2}%|%;%?%p1%p5%|%t%{64}%|%;%?%p7%t%{1}%|%;%c,
++	sgr=%?%p8%t\E)%e\E(%;%?%p9%t\EcE%e\EcD%;\EG%{48}%?%p2%t%{8}
++	    %|%;%?%p1%p3%|%p6%|%t%{4}%|%;%?%p4%t%{2}%|%;%?%p1%p5%|%t
++	    %{64}%|%;%?%p7%t%{1}%|%;%c,
+ 	sgr0=\E(\EH\003\EG0\EcD, smacs=\EcE, smam=\Ed/,
+ 	smcup=\Ew1, smir=\Eq, smln=\EA10, smso=\EGt, tbc=\E0,
+ 	tsl=\EF, use=adm+sgr,
+@@ -10715,18 +10972,24 @@
+ 	home=\E[H, hpa=\E[%i%p1%d`, ht=\011$<1>, hts=\EH,
+ 	ich=\E[%p1%d@$<1*>, il=\E[%p1%dL$<2*>, il1=\E[L$<2>,
+ 	ind=\n$<2>,
+-	initc=\E[66;%p1%d;%?%p2%{250}%<%t%{0}%e%p2%{500}%<%t%{16}%e%p2%{750}%<%t%{32}%e%{48}%;%?%p3%{250}%<%t%{0}%e%p3%{500}%<%t%{4}%e%p3%{750}%<%t%{8}%e%{12}%;%?%p4%{250}%<%t%{0}%e%p4%{500}%<%t%{1}%e%p4%{750}%<%t%{2}%e%{3}%;%{1}%+%+%+%dw,
++	initc=\E[66;%p1%d;%?%p2%{250}%<%t%{0}%e%p2%{500}%<%t%{16}%e
++	      %p2%{750}%<%t%{32}%e%{48}%;%?%p3%{250}%<%t%{0}%e%p3
++	      %{500}%<%t%{4}%e%p3%{750}%<%t%{8}%e%{12}%;%?%p4%{250}
++	      %<%t%{0}%e%p4%{500}%<%t%{1}%e%p4%{750}%<%t%{2}%e%{3}%;
++	      %{1}%+%+%+%dw,
+ 	invis=\E[8m, ip=$<1>, is1=\E[90;1"p\E[?5W$<6>,
+ 	is2=\E[2;4;20;30;40l\E[?1;10;16l\E[12h\E[?7;8;25h,
+ 	is3=\E>\017\E)0\E(B\E[63;0w\E[m, mc0=\E[0i, mc4=\E[4i,
+ 	mc5=\E[5i,
+-	oc=\E[60w\E[63;0w\E[66;1;4w\E[66;2;13w\E[66;3;16w\E[66;4;49w\E[66;5;51w\E[66;6;61w\E[66;7;64w,
++	oc=\E[60w\E[63;0w\E[66;1;4w\E[66;2;13w\E[66;3;16w\E[66;4;49w
++	   \E[66;5;51w\E[66;6;61w\E[66;7;64w,
+ 	op=\E[m, rc=\E8, rev=\E[7m, ri=\EM$<2>, rmacs=^O,
+ 	rmam=\E[?7l, rmclk=\E[31l, rmcup=\E[ R, rmir=\E[4l,
+ 	rmkx=\E>, rmso=\E[27m, rmul=\E[24m,
+ 	rs1=\E[13l\E[3l\E!p\E[?4i, rs2=\E[35h\E[?3l$<8>,
+ 	rs3=\E[?5l, sc=\E7, setb=\E[62;%p1%dw, setf=\E[61;%p1%dw,
+-	sgr=\E[0%?%p2%t;4%;%?%p3%p1%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p2%t;4%;%?%p3%p1%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?
++	    %p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smcup=\E[ Q,
+ 	smir=\E[4h, smkx=\E[?1l\E=, smso=\E[7m, smul=\E[4m,
+ 	tbc=\E[3g, tsl=\E[40l\E[40h\E7\E[99;%i%p1%dH,
+@@ -10787,17 +11050,25 @@
+ 	am, os,
+ 	cols#74, lines#35,
+ 	bel=^G, clear=\E^L, cr=^M, cub1=^H, cud1=^J, cuf1=\s,
+-	cup=\035%{3040}%{89}%p1%*%-%Py%p2%{55}%*%Px%gy%{128}%/%{31}%&%{32}%+%c%gy%{3}%&%{4}%*%gx%{3}%&%+%{96}%+%c%gy%{004}%/%{31}%&%{96}%+%c%gx%{128}%/%{31}%&%{32}%+%c%gx%{004}%/%{31}%&%{64}%+%c\037,
++	cup=\035%{3040}%{89}%p1%*%-%Py%p2%{55}%*%Px%gy%{128}%/%{31}
++	    %&%{32}%+%c%gy%{3}%&%{4}%*%gx%{3}%&%+%{96}%+%c%gy%{004}
++	    %/%{31}%&%{96}%+%c%gx%{128}%/%{31}%&%{32}%+%c%gx%{004}%/
++	    %{31}%&%{64}%+%c\037,
+ 	cuu1=^K, ff=^L,
+-	hd=\036HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH\037,
++	hd=\036HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH
++	   \037,
+ 	home=^]7`x @\037,
+-	hu=\036DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD\037,
++	hu=\036DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
++	   \037,
+ 	is2=\E8, nel=^M^J, u0=\E~>\E8, u1=\E[42h,
+ #
+ #	Wyse 160 Tektronix 4010/4014 emulator,
+ #
+ wy160-tek|Wyse 160 Tektronix 4010/4014 emulator,
+-	cup=\035%{3103}%{91}%p1%*%-%Py%p2%{55}%*%Px%gy%{128}%/%{31}%&%{32}%+%c%gy%{3}%&%{4}%*%gx%{3}%&%+%{96}%+%c%gy%{004}%/%{31}%&%{96}%+%c%gx%{128}%/%{31}%&%{32}%+%c%gx%{004}%/%{31}%&%{64}%+%c\037,
++	cup=\035%{3103}%{91}%p1%*%-%Py%p2%{55}%*%Px%gy%{128}%/%{31}
++	    %&%{32}%+%c%gy%{3}%&%{4}%*%gx%{3}%&%+%{96}%+%c%gy%{004}
++	    %/%{31}%&%{96}%+%c%gx%{128}%/%{31}%&%{32}%+%c%gx%{004}%/
++	    %{31}%&%{64}%+%c\037,
+ 	home=^]8`g @\037, use=wy99gt-tek,
+ #
+ #	Wyse 370 Tektronix 4010/4014 emulator,
+@@ -10806,11 +11077,15 @@
+ 	am, os,
+ 	cols#80, lines#36,
+ 	bel=^G, clear=\E^L, cr=^M, cub1=^H, cud1=^J, cuf1=\s,
+-	cup=\035%{775}%{108}%p1%*%{5}%/%-%Py%p2%{64}%*%{4}%+%{5}%/%Px%gy%{32}%/%{31}%&%{32}%+%c%gy%{31}%&%{96}%+%c%gx%{32}%/%{31}%&%{32}%+%c%gx%{31}%&%{64}%+%c\037,
++	cup=\035%{775}%{108}%p1%*%{5}%/%-%Py%p2%{64}%*%{4}%+%{5}%/
++	    %Px%gy%{32}%/%{31}%&%{32}%+%c%gy%{31}%&%{96}%+%c%gx%{32}
++	    %/%{31}%&%{32}%+%c%gx%{31}%&%{64}%+%c\037,
+ 	cuu1=^K, ff=^L,
+-	hd=\036HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH\037,
++	hd=\036HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH
++	   \037,
+ 	home=^]8g @\037,
+-	hu=\036DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD\037,
++	hu=\036DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
++	   \037,
+ 	is2=\E8, kbs=^H, kcub1=^H, kcud1=^J, kcuf1=^I, kcuu1=^K,
+ 	nel=^M^J, u0=\E[?38h\E8, u1=\E[?38l\E)0,
+ 
+@@ -10872,7 +11147,8 @@
+ 	rmcup=\E[ R, rmir=\E[4l, rmso=\E[m, rmul=\E[24m,
+ 	rs1=\E[13l\E[3l\E\\\E[63;1"p\E[!p, rs2=\E[35h\E[?3l,
+ 	rs3=\E[?5l\E[47h\E[40l\E[r, sc=\E7,
+-	sgr=\E[0%?%p2%t;4%;%?%p3%p1%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p2%t;4%;%?%p3%p1%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?
++	    %p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h,
+ 	smcup=\E[ Q\E[?67;8h, smir=\E[4h, smso=\E[7m, smul=\E[4m,
+ 	tbc=\E[3g, tsl=\E[2$~\E[1$}\E[%i%p1%d`,
+@@ -11062,7 +11338,8 @@
+ 	it#8, lines#24,
+ 	cud1=\EB, cvvis=\EO\Eq\EEK3, dch1=\EN, dl1=\EM, ht=^I,
+ 	il1=\EL,
+-	is2=\EO\Eq\EJ\EY7 K3 UCB IBMPC Kermit 1.20  12-19-84\n,
++	is2=\EO\Eq\EJ\EY7\sK3\sUCB\sIBMPC\sKermit\s1.20\s\s12-19-84
++	    \n,
+ 	rmir@, rmso=\Eq, smir@, smso=\Ep, use=kermit,
+ # MS-DOS Kermit 2.27 for the IBMPC
+ # Straight ascii keyboard. :sr=\EI: not avail. many versions + bug prone in vi.
+@@ -11079,7 +11356,8 @@
+ 	cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA,
+ 	cvvis=\EO\Eq\EG\EwK4, dch1=\EN, dl1=\EM, ed=\EJ, el=\EK,
+ 	home=\EH, ht=^I, il1=\EL,
+-	is2=\EO\Eq\EG\Ew\EJ\EY7 K4 MS Kermit 2.27 for the IBMPC 3-17-85\n,
++	is2=\EO\Eq\EG\Ew\EJ\EY7\sK4\sMS\sKermit\s2.27\sfor\sthe
++	    \sIBMPC\s3-17-85\n,
+ 	kcub1=^H, kcud1=^J, kcuf1=^L, kcuu1=^K, khome=^^, rc=\Ek,
+ 	rmir=\EO, rmso=\Eq, sc=\Ej, smir=\E@, smso=\Ep,
+ # MS-DOS Kermit 2.27 with automatic margins
+@@ -11087,8 +11365,8 @@
+ msk227am|mskermit227am|UCB MS-DOS Kermit 2.27 with automatic margins,
+ 	am,
+ 	cvvis=\EO\Eq\EG\EvK5,
+-	is2=\EO\Eq\EG\Ev\EJ\EY7 K5 MS Kermit 2.27 +automatic margins 3-17-85\n,
+-	use=msk227,
++	is2=\EO\Eq\EG\Ev\EJ\EY7\sK5\sMS\sKermit\s2.27\s+automatic
++	    \smargins\s3-17-85\n, use=msk227,
+ # MS-DOS Kermit 2.27 UCB 227.14 for the IBM PC
+ # Automatic margins now default.  Use ansi  for highlights.
+ # Define function keys.
+@@ -11097,7 +11375,8 @@
+ msk22714|mskermit22714|UCB MS-DOS Kermit 2.27 UCB 227.14 IBM PC,
+ 	am,
+ 	bold=\E[1m, cvvis=\EO\Eq\EG\EvK6,
+-	is2=\EO\Eq\EG\Ev\EJ\EY7 K6 MS Kermit 2.27 UCB 227.14 IBM PC 3-17-85\n,
++	is2=\EO\Eq\EG\Ev\EJ\EY7\sK6\sMS\sKermit\s2.27\sUCB\s227.14
++	    \sIBM\sPC\s3-17-85\n,
+ 	kf0=\E0, kf1=\E1, kf2=\E2, kf3=\E3, kf4=\E4, kf5=\E5, kf6=\E6,
+ 	kf7=\E7, kf8=\E8, kf9=\E9, rev=\E[7m, rmso=\E[m, rmul=\E[m,
+ 	sgr0=\E[m, smso=\E[1m, smul=\E[4m, use=mskermit227,
+@@ -11126,7 +11405,8 @@
+ 	kpp=\E[5~, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, nel=^M^J, rc=\E8,
+ 	rev=\E[7m, ri=\EM, rin=\E[%p1%dL, rmacs=\E(B, rmam=\E[?7l,
+ 	rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
+-	rs1=\E(B\E)B\E>\E F\E[4;20l\E[12h\E[?1;5;6;38;42l\E[?7;25h\E[4i\E[?4i\E[m\E[r\E[2$~,
++	rs1=\E(B\E)B\E>\E\sF\E[4;20l\E[12h\E[?1;5;6;38;42l\E[?7;25h
++	    \E[4i\E[?4i\E[m\E[r\E[2$~,
+ 	sc=\E7, sgr0=\E[m, smacs=\E(0, smam=\E[?7h, smir=\E[4h,
+ 	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+ 	tsl=\E[1$}\r\E[K, vpa=\E[%i%p1%dd,
+@@ -11227,7 +11507,9 @@
+ 	cuf1=^V^F, cup=\026\010%p1%c%p2%c, cuu1=^V^C, el=^V^G,
+ 	ind=^J, invis=^V^A\0, rep=\031%p1%c%p2%c, rev=^V^Ap,
+ 	rmacs@, rs2=^L,
+-	sgr=%?%p1%p2%|%p3%|%p6%|%p7%|%t\026\001%?%p7%t%{128}%e%{0}%?%p1%t%{112}%|%;%?%p2%t%{1}%|%;%?%p3%t%{112}%|%;%?%p6%t%{16}%|%;%;%c%;%?%p4%t\026\002%;,
++	sgr=%?%p1%p2%|%p3%|%p6%|%p7%|%t\026\001%?%p7%t%{128}%e%{0}%?
++	    %p1%t%{112}%|%;%?%p2%t%{1}%|%;%?%p3%t%{112}%|%;%?%p6%t
++	    %{16}%|%;%;%c%;%?%p4%t\026\002%;,
+ 	sgr0=^V^A^G, smacs@, smso=^V^Ap, smul=^V^A^A,
+ 	use=klone+acs,
+ # From: Eric S. Raymond  1 Nov 1995
+@@ -11358,22 +11640,31 @@
+ att5410v1|att4410v1|tty5410v1|AT&T 4410/5410 80 columns - version 1,
+ 	am, hs, mir, msgr, xon,
+ 	cols#80, it#8, lh#2, lines#24, lw#8, nlab#8, wsl#80,
+-	acsc=++\,\,--..00``aaffgghhjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
++	acsc=++\,\,--..00``aaffgghhjjkkllmmnnooppqqrrssttuuvvwwxxyyz
++	     z{{||}}~~,
+ 	bel=^G, blink=\E[5m, bold=\E[2;7m, clear=\E[H\E[J, cr=^M,
+ 	csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\E[B, cuf1=\E[C,
+ 	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P, dim=\E[2m,
+ 	dl1=\E[M, ed=\E[J, el=\E[K, fsl=\E8, home=\E[H, ht=^I,
+ 	ich1=\E[@, il1=\E[L, ind=^J, invis=\E[8m, is1=\E[?3l\E)0,
+-	is3=\E[1;03q   f1           \EOP\E[2;03q   f2           \EOQ\E[3;03q   f3           \EOR\E[4;03q   f4           \EOS\E[5;03q   f5           \EOT\E[6;03q   f6           \EOU\E[7;03q   f7           \EOV\E[8;03q   f8           \EOW,
++	is3=\E[1;03q\s\s\sf1\s\s\s\s\s\s\s\s\s\s\s\EOP\E[2;03q\s\s
++	    \sf2\s\s\s\s\s\s\s\s\s\s\s\EOQ\E[3;03q\s\s\sf3\s\s\s\s
++	    \s\s\s\s\s\s\s\EOR\E[4;03q\s\s\sf4\s\s\s\s\s\s\s\s\s\s
++	    \s\EOS\E[5;03q\s\s\sf5\s\s\s\s\s\s\s\s\s\s\s\EOT\E[6;03q
++	    \s\s\sf6\s\s\s\s\s\s\s\s\s\s\s\EOU\E[7;03q\s\s\sf7\s\s
++	    \s\s\s\s\s\s\s\s\s\EOV\E[8;03q\s\s\sf8\s\s\s\s\s\s\s\s
++	    \s\s\s\EOW,
+ 	kbs=^H, kclr=\E[2J, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
+ 	kcuu1=\E[A, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOT,
+ 	kf6=\EOU, kf7=\EOV, kf8=\EOW, khome=\E[H, kll=\E[24;1H,
+ 	ll=\E[24H, nel=^M^J,
+-	pfx=\E[%p1%1d;%p2%l%2.2dq   f%p1%1d           %p2%s,
++	pfx=\E[%p1%1d;%p2%l%2.2dq\s\s\sf%p1%1d\s\s\s\s\s\s\s\s\s\s
++	    \s%p2%s,
+ 	pln=\E[%p1%d;00q%p2%:-16s, rc=\E8, rev=\E[7m, ri=\EM,
+ 	rmacs=^O, rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l\E[2;0y,
+ 	sc=\E7,
+-	sgr=\E[0%?%p1%p5%|%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p1%p5%|%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1
++	    %|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smso=\E[7m, smul=\E[4m,
+ 	tsl=\E7\E[25;%p1%{1}%+%dH,
+ 
+@@ -11407,7 +11698,8 @@
+ 	rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m$<2>,
+ 	rmul=\E[m$<2>, rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
+ 	sc=\E7,
+-	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;$<2>,
++	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
++	    %;m%?%p9%t\016%e\017%;$<2>,
+ 	sgr0=\E[m\017$<2>, smacs=^N, smam=\E[?7h, smkx=\E[?1h\E=,
+ 	smso=\E[1;7m$<2>, smul=\E[4m$<2>, tbc=\E[3g,
+ 	use=vt100+fnkeys,
+@@ -11459,7 +11751,8 @@
+ 	flash=\E[?5h$<200>\E[?5l, home=\E[x,
+ 	hpa=\E[%p1%{1}%+%dG, hts=\EH, ich=\E[%p1%d@, ich1@,
+ 	il=\E[%p1%dL, indn=\E[%p1%dE, is1=\E[?3l$<100>,
+-	is2=\E[m\017\E[1;2;3;4;6l\E[12;13;14;20l\E[?6;97;99l\E[?7h\E[4i\Ex\E[21;1j\212,
++	is2=\E[m\017\E[1;2;3;4;6l\E[12;13;14;20l\E[?6;97;99l\E[?7h
++	    \E[4i\Ex\E[21;1j\212,
+ 	is3=\E[?5l, kbeg=\Et, kcbt=\E[Z, kdch1=\E[P, kdl1=\E[M,
+ 	kel=\E[2K, kend=\Ez, kent=\Eent, kf1=\EOc, kf2=\EOd,
+ 	kf3=\EOe, kf4=\EOf, kf5=\EOg, kf6=\EOh, kf7=\EOi, kf8=\EOj,
+@@ -11471,7 +11764,9 @@
+ 	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, prot=\EV,
+ 	rin=\E[%p1%dF, rmam=\E[?7l, rmir=\E[4l,
+ 	rmkx=\E[19;0j\E[21;1j\212, rmln=\E|,
+-	sgr=\E[0%?%p1%p5%|%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6%|%t;7%;%?%p7%t;8%;m%?%p8%t\EV%;%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p1%p5%|%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1
++	    %|%p6%|%t;7%;%?%p7%t;8%;m%?%p8%t\EV%;%?%p9%t\016%e
++	    \017%;,
+ 	sgr0=\E[m\017, smam=\E[?7h, smir=\E[4h,
+ 	smkx=\E[19;1j\E[21;4j\Eent, smln=\E~, tbc=\E[3g,
+ 	tsl=\E7\E[25;%p1%{8}%+%dH, vpa=\E[%p1%{1}%+%dd,
+@@ -11494,7 +11789,8 @@
+ # user pf keys to make them appear!
+ att4415+nl|tty5420+nl|att5420+nl|generic AT&T 4415/5420 changes for not changing labels,
+ 	kf1@, kf2@, kf3@, kf4@, kf5@, kf6@, kf7@, kf8@,
+-	pfx=\E[%p1%d;%p2%l%02d;0;1q   F%p1%d           %p2%s,
++	pfx=\E[%p1%d;%p2%l%02d;0;1q\s\s\sF%p1%d\s\s\s\s\s\s\s\s\s\s
++	    \s%p2%s,
+ 	pln=\E[%p1%d;0;0;1q%p2%:-16.16s,
+ 
+ att4415-nl|tty5420-nl|att5420-nl|AT&T 4415/5420 without changing labels,
+@@ -11527,7 +11823,9 @@
+ 	home=\E[H, hpa=\E[%p1%{1}%+%dG, ht=^I, hts=\EH,
+ 	ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=^J,
+ 	indn=\E[%p1%dE, invis=\E[8m,
+-	is1=\E[0;23r\Ex\Ey\E[2;0j\E[3;3j\E[4;0j\E[5;0j\E[6;0j\E[7;0j\E[8;0j\E[9;1j\E[10;0j\E[15;0j\E[16;1j\E[19;0j\E[20;1j\E[29;0j\E[1;24r,
++	is1=\E[0;23r\Ex\Ey\E[2;0j\E[3;3j\E[4;0j\E[5;0j\E[6;0j\E[7;0j
++	    \E[8;0j\E[9;1j\E[10;0j\E[15;0j\E[16;1j\E[19;0j\E[20;1j
++	    \E[29;0j\E[1;24r,
+ 	kbeg=\Et, kbs=^H, kcbt=\E[Z, kclr=\E[2J, kcub1=\E[D,
+ 	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P, kdl1=\E[M,
+ 	kel=\E[2K, kend=\Ez, kent=^J, kf1=\EOc, kf2=\EOd, kf3=\EOe,
+@@ -11536,19 +11834,22 @@
+ 	kpp=\E[V, kri=\E[S, lf1=F1, lf2=F2, lf3=F3, lf4=F4, lf5=F5,
+ 	lf6=F6, lf7=F7, lf8=F8, ll=\Ew, mc0=\E[?;2i, mc4=\E[4i,
+ 	mc5=\E[5i, mrcup=\E[%i%p1%d;%p2%dt, nel=^M^J,
+-	pfx=\E[%p1%d;%p2%l%02dq   F%p1%d           %p2%s\E~,
++	pfx=\E[%p1%d;%p2%l%02dq\s\s\sF%p1%d\s\s\s\s\s\s\s\s\s\s\s%p2
++	    %s\E~,
+ 	pln=\E[%p1%d;0;0;0q%p2%:-16.16s\E~, prot=\EV, rc=\E8,
+ 	rev=\E[7m, ri=\EM, rin=\E[%p1%dF, rmacs=^O, rmkx=\E[19;0j,
+ 	rmln=\E|, rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l\E[2;0y,
+ 	sc=\E7,
+-	sgr=\E[0%?%p1%p5%|%t;2%;%?%p2%p6%|%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p1%p5%|%t;2%;%?%p2%p6%|%t;4%;%?%p4%t;5%;%?%p3%p1
++	    %|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smkx=\E[19;1j, smln=\E~,
+ 	smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+ 	tsl=\E7\E[25;%p1%{8}%+%dH, vpa=\E[%p1%{1}%+%dd,
+ att5420_2-w|AT&T 5420 model 2 in 132 column mode,
+ 	cols#132,
+-	is1=\E[0;23r\Ex\Ey\E[2;0j\E[3;3j\E[4;0j\E[5;1j\E[6;0j\E[7;0j\E[8;0j\E[9;1j\E[10;0j\E[15;0j\E[16;1j\E[19;0j\E[20;1j\E[29;0j\E[1;24r,
+-	use=att5420_2,
++	is1=\E[0;23r\Ex\Ey\E[2;0j\E[3;3j\E[4;0j\E[5;1j\E[6;0j\E[7;0j
++	    \E[8;0j\E[9;1j\E[10;0j\E[15;0j\E[16;1j\E[19;0j\E[20;1j
++	    \E[29;0j\E[1;24r, use=att5420_2,
+ 
+ att4418|att5418|AT&T 5418 80 cols,
+ 	am, xon,
+@@ -11614,7 +11915,8 @@
+ 	kcuu1=\E[A, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
+ 	khome=\E[H, nel=\EE, rev=\E}, ri=\ET, rmacs=\E(B, rmso=\E~,
+ 	rmul=\EZ,
+-	sgr=\E[%?%p1%t7%;%?%p2%t;4%;%?%p3%t;7%;%?%p6%t;1%;%?%p6%p4%|%t;5%;%?%p5%t;0%;m,
++	sgr=\E[%?%p1%t7%;%?%p2%t;4%;%?%p3%t;7%;%?%p6%t;1%;%?%p6%p4%|
++	    %t;5%;%?%p5%t;0%;m,
+ 	sgr0=\EX\E~\EZ\E4\E(B, smacs=\E(0, smso=\E}, smul=\E\\,
+ 	tbc=\EF,
+ 
+@@ -11664,7 +11966,8 @@
+ 	hpa=\E[%p1%{1}%+%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
+ 	il=\E[%p1%dL, il1=\E[L, ind=^J, indn=\E[%p1%dE,
+ 	invis=\E[8m, is1=\E<\E[?3l$<100>,
+-	is2=\E[m\017\E[1;2;3;4;6l\E[12;13;14;20l\E[?6;97;99l\E[?7h\E[4i\Ex\E[25;1j\212,
++	is2=\E[m\017\E[1;2;3;4;6l\E[12;13;14;20l\E[?6;97;99l\E[?7h
++	    \E[4i\Ex\E[25;1j\212,
+ 	is3=\E[?5l, kbeg=\Et, kbs=^H, kcbt=\E[Z, kclr=\E[J,
+ 	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P,
+ 	kdl1=\E[M, kel=\E[2K, kend=\Ez, kent=\Eent, kf1=\EOc,
+@@ -11677,7 +11980,9 @@
+ 	rev=\E[7m, ri=\EM, rin=\E[%p1%dF, rmacs=^O, rmam=\E[?7l,
+ 	rmir=\E[4l, rmkx=\E[21;0j\E[25;1j\212, rmln=\E|,
+ 	rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l\E[2;0y, sc=\E7,
+-	sgr=\E[0%?%p5%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6%|%t;7%;%?%p7%t;8%;m%?%p8%t\EV%;%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p5%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6
++	    %|%t;7%;%?%p7%t;8%;m%?%p8%t\EV%;%?%p9%t\016%e
++	    \017%;,
+ 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h,
+ 	smkx=\E[21;1j\E[25;4j\Eent\E~, smln=\E~, smso=\E[7m,
+ 	smul=\E[4m, tbc=\E[3g, tsl=\E7\E[25;%p1%{8}%+%dH,
+@@ -11741,7 +12046,8 @@
+ 	mc0=\E[0i, mc4=\E[?8i, mc5=\E[?4i, nel=\EE,
+ 	pln=\E[%p1%dp%p2%:-16s, rc=\E8, rev=\E[7m, ri=\EM,
+ 	rmacs=^O, rmkx=\E[19;0|, rmso=\E[m, rmul=\E[m, sc=\E7,
+-	sgr=\E[0%?%p5%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6%|%t;7%;m%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p5%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6
++	    %|%t;7%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smkx=\E[19;1|, smso=\E[7m,
+ 	smul=\E[4m, tbc=\E[3g,
+ 
+@@ -11779,7 +12085,8 @@
+ 	rin=\E[%p1%dT, rmacs=^O, rmir=\E[4l, rmkx=\E[19;0|,
+ 	rmln=\E<, rmso=\E[m, rmul=\E[m, rmxon=\E[29;1|,
+ 	rs2=\E[5;0|, sc=\E7,
+-	sgr=\E[0%?%p5%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p5%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6
++	    %|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smgl=\E4, smgr=\E5, smir=\E[4h,
+ 	smkx=\E[19;1|, smln=\E?, smso=\E[7m, smul=\E[4m,
+ 	smxon=\E[29;0|, tbc=\E[3g, vpa=\E[%p1%{1}%+%dd,
+@@ -11818,17 +12125,21 @@
+ 	ksav=\EOo, kslt=\ENI, kspd=\EOp, kund=\EOs, ll=\E#2,
+ 	mc0=\E[?98l\E[0i, mc4=\E[?98l\E[?8i, mc5=\E[?98l\E[?4i,
+ 	nel=\EE,
+-	pfkey=\E[%p1%d;%p2%l%d;3;0p   F%p1%d           %p2%s,
+-	pfloc=\E[%p1%d;%p2%l%d;2;0p   F%p1%d           %p2%s,
++	pfkey=\E[%p1%d;%p2%l%d;3;0p\s\s\sF%p1%d\s\s\s\s\s\s\s\s\s\s
++	      \s%p2%s,
++	pfloc=\E[%p1%d;%p2%l%d;2;0p\s\s\sF%p1%d\s\s\s\s\s\s\s\s\s\s
++	      \s%p2%s,
+ 	pfx=\E[%p1%d;%p2%l%d;1;0p   F%p1%d           %p2%s,
+ 	pln=\E[%p1%dp%p2%:-16s, rc=\E8,
+ 	rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, ri=\EM,
+ 	rin=\E[%p1%dF, rmacs=^O, rmir=\E[4l,
+ 	rmkx=\E[19;0|\E[21;1|\212, rmln=\E<, rmso=\E[m,
+ 	rmul=\E[m,
+-	rs1=\E?\E[3;3|\E[10;0|\E[21;1|\212\E[6;1|\E[1{\E[?99l\E[2;0|\E[6;1|\E[8;0|\E[19;0|\E[1{\E[?99l,
++	rs1=\E?\E[3;3|\E[10;0|\E[21;1|\212\E[6;1|\E[1{\E[?99l\E[2;0|
++	    \E[6;1|\E[8;0|\E[19;0|\E[1{\E[?99l,
+ 	rs2=\E[5;0|, sc=\E7,
+-	sgr=\E[0%?%p1%p5%|%t;2%;%?%p2%p6%|%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p1%p5%|%t;2%;%?%p2%p6%|%t;4%;%?%p4%t;5%;%?%p3%p1
++	    %|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smir=\E[4h,
+ 	smkx=\E[19;1|\E[21;4|\Eent, smln=\E?, smso=\E[7m,
+ 	smul=\E[4m, tbc=\E[3g, vpa=\E[%p1%{1}%+%dd,
+@@ -11844,14 +12155,30 @@
+ 	xhpa, xvpa,
+ 	bufsz#8192, cols#132, cps#120, it#8, lines#66, orc#10,
+ 	orhi#100, orl#12, orvi#72,
+-	cpi=%?%p1%{10}%=%t\E[w%e%p1%{12}%=%t\E[2w%e%p1%{5}%=%t\E[5w%e%p1%{13}%=%p1%{14}%=%O%t\E[3w%e%p1%{16}%=%p1%{17}%=%O%t\E[4w%e%p1%{6}%=%t\E[6w%e%p1%{7}%=%t\E[7w%e%p1%{8}%=%t\E[8w%;,
++	cpi=%?%p1%{10}%=%t\E[w%e%p1%{12}%=%t\E[2w%e%p1%{5}%=%t\E[5w
++	    %e%p1%{13}%=%p1%{14}%=%O%t\E[3w%e%p1%{16}%=%p1%{17}%=%O
++	    %t\E[4w%e%p1%{6}%=%t\E[6w%e%p1%{7}%=%t\E[7w%e%p1%{8}%=%t
++	    \E[8w%;,
+ 	cr=^M,
+-	csnm=%?%p1%{0}%=%tusascii%e%p1%{1}%=%tenglish%e%p1%{2}%=%tfinnish%e%p1%{3}%=%tjapanese%e%p1%{4}%=%tnorwegian%e%p1%{5}%=%tswedish%e%p1%{6}%=%tgermanic%e%p1%{7}%=%tfrench%e%p1%{8}%=%tcanadian_french%e%p1%{9}%=%titalian%e%p1%{10}%=%tspanish%e%p1%{11}%=%tline%e%p1%{12}%=%tsecurity%e%p1%{13}%=%tebcdic%e%p1%{14}%=%tapl%e%p1%{15}%=%tmosaic%;,
++	csnm=%?%p1%{0}%=%tusascii%e%p1%{1}%=%tenglish%e%p1%{2}%=%tfi
++	     nnish%e%p1%{3}%=%tjapanese%e%p1%{4}%=%tnorwegian%e%p1
++	     %{5}%=%tswedish%e%p1%{6}%=%tgermanic%e%p1%{7}%=%tfrench
++	     %e%p1%{8}%=%tcanadian_french%e%p1%{9}%=%titalian%e%p1
++	     %{10}%=%tspanish%e%p1%{11}%=%tline%e%p1%{12}%=%tsecurit
++	     y%e%p1%{13}%=%tebcdic%e%p1%{14}%=%tapl%e%p1%{15}%=%tmos
++	     aic%;,
+ 	cud=\E[%p1%de, cud1=^J, cuf=\E[%p1%da, cuf1=\s, cuu1=\EM,
+ 	ff=^L, hpa=\E[%p1%d`, ht=^I, is1=\Ec, is2=\E[20l\r,
+-	lpi=%?%p1%{2}%=%t\E[4z%e%p1%{3}%=%t\E[5z%e%p1%{4}%=%t\E[6z%e%p1%{6}%=%t\E[z%e%p1%{8}%=%t\E[2z%e%p1%{12}%=%t\E[3z%;,
++	lpi=%?%p1%{2}%=%t\E[4z%e%p1%{3}%=%t\E[5z%e%p1%{4}%=%t\E[6z%e
++	    %p1%{6}%=%t\E[z%e%p1%{8}%=%t\E[2z%e%p1%{12}%=%t\E[
++	    3z%;,
+ 	rshm=\E[m,
+-	scs=%?%p1%{0}%=%t\E(B%e%p1%{1}%=%t\E(A%e%p1%{2}%=%t\E(C%e%p1%{3}%=%t\E(D%e%p1%{4}%=%t\E(E%e%p1%{5}%=%t\E(H%e%p1%{6}%=%t\E(K%e%p1%{7}%=%t\E(R%e%p1%{8}%=%t\E(Q%e%p1%{9}%=%t\E(Y%e%p1%{10}%=%t\E(Z%e%p1%{11}%=%t\E(0%e%p1%{12}%=%t\E(1%e%p1%{13}%=%t\E(3%e%p1%{14}%=%t\E(8%e%p1%{15}%=%t\E(}%;,
++	scs=%?%p1%{0}%=%t\E(B%e%p1%{1}%=%t\E(A%e%p1%{2}%=%t\E(C%e%p1
++	    %{3}%=%t\E(D%e%p1%{4}%=%t\E(E%e%p1%{5}%=%t\E(H%e%p1%{6}
++	    %=%t\E(K%e%p1%{7}%=%t\E(R%e%p1%{8}%=%t\E(Q%e%p1%{9}%=%t
++	    \E(Y%e%p1%{10}%=%t\E(Z%e%p1%{11}%=%t\E(0%e%p1%{12}%=%t
++	    \E(1%e%p1%{13}%=%t\E(3%e%p1%{14}%=%t\E(8%e%p1%{15}%=%t
++	    \E(}%;,
+ 	smgbp=\E[;%p1%dr, smglp=\E[%{1}%p1%+%ds,
+ 	smgrp=\E[;%{1}%p1%+%ds, smgtp=\E[%p1%dr, sshm=\E[5m,
+ 	u0=\E[%p1%dt, vpa=\E[%p1%dd,
+@@ -11950,7 +12277,8 @@
+ 	smir=\E[4h, smln=\E[p, smso=\E[7m, smul=\E[4m,
+ 	tsl=\E7\E[25;%i%p1%dx,
+ att605-pc|ATT 605 in pc term mode,
+-	acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x\263,
++	acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x
++	     \263,
+ 	cbt=\E[Z, cub1=\E[D, cud1=\E[B, cuf1=\E[C, cuu1=\E[A,
+ 	dch1=\E[P, dl1=\E[M, ich1=\E[@, il1=\E[L, kcbt=\E[Z,
+ 	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P,
+@@ -11961,8 +12289,7 @@
+ 	xoffc=g, xonc=e, use=att605,
+ att605-w|AT&T 605-w 132 column 102 key keyboard,
+ 	cols#132, wsl#132,
+-	is1=\E[8;0|\E[?4;5;13;15l\E[13;20l\E[?3;7h\E[12h\E(B\E)0,
+-	use=att605,
++	is1=\E[8;0|\E[?4;5;13;15l\E[13;20l\E[?3;7h\E[12h\E(B\E)0, use=att605,
+ # (att610: I added / based on the init string.  I also
+ # added  and  because the BSD file says the att615s have them,
+ # and the 615 is like a 610 with a big keyboard, and most of their other
+@@ -11993,7 +12320,8 @@
+ 	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, rc=\E8, rev=\E[7m,
+ 	ri=\EM, rin=\E[%p1%dT, rmacs=^O, rmam=\E[?7l, rmir=\E[4l,
+ 	rmln=\E[2p, rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l, sc=\E7,
+-	sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1
++	    %|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h,
+ 	smln=\E[p, smso=\E[7m, smul=\E[4m, tsl=\E7\E[25;%i%p1%dx,
+ att610-w|AT&T 610; 132 column; 98key keyboard,
+@@ -12074,7 +12402,8 @@
+ 	ri=\EM, rin=\E[%p1%dT, rmacs=\E(B\017, rmam=\E[?7l,
+ 	rmir=\E[4l, rmln=\E[2p, rmso=\E[m, rmul=\E[m,
+ 	rs2=\Ec\E[?3l, sc=\E7,
+-	sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%t;7%;%?%p7%t;8%;m%?%p9%t\E)0\016%e\E(B\017%;,
++	sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1
++	    %|%t;7%;%?%p7%t;8%;m%?%p9%t\E)0\016%e\E(B\017%;,
+ 	sgr0=\E[m\E(B\017, smacs=\E)0\016, smam=\E[?7h,
+ 	smir=\E[4h, smln=\E[p, smso=\E[7m, smul=\E[4m,
+ 	tsl=\E7\E[25;%i%p1%dx,
+@@ -12134,7 +12463,8 @@
+ 	mc5=\E[?5i, nel=^M^J, pfx=\E[%p1%d;%p2%l%dq%p2%s, rc=\E8,
+ 	rev=\E[7m, ri=\EM, rin=\E[%p1%dT, rmir=\E[4l, rmso=\E[m,
+ 	rmul=\E[m, rs2=\Ec, sc=\E7,
+-	sgr=\E[0%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%p4%|%t;7%;m,
++	sgr=\E[0%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%p4%|%t;7
++	    %;m,
+ 	sgr0=\E[m, smir=\E[4h, smso=\E[7m, smul=\E[4m,
+ att630-24|5630-24|5630DMD-24|630MTG-24|AT&T 630 windowing terminal 24 lines,
+ 	lines#24, use=att630,
+@@ -12230,7 +12560,8 @@
+ 	enacs=\E(B\E)0, flash=\E[?5h$<200>\E[?5l, fln=4\,4,
+ 	fsl=\E8, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@,
+ 	il=\E[%p1%dL, il1=\E[L, ind=\ED, invis=\E[8m,
+-	is2=\E[50;4|\E[53;0|\E[8;0|\E[?4;13;15l\E[13;20l\E[?7h\E[12h\E(B\E)0\E[?31l\E[0m\017,
++	is2=\E[50;4|\E[53;0|\E[8;0|\E[?4;13;15l\E[13;20l\E[?7h\E[12h
++	    \E(B\E)0\E[?31l\E[0m\017,
+ 	is3=\E(B\E)0, kLFT=\E[ A, kRIT=\E[ @, kbs=^H, kcbt=\E[Z,
+ 	kclr=\E[2J, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+ 	kdch1=\E[P, kdl1=\E[M, kend=\E[24;1H, kf1=\EOc, kf10=\ENp,
+@@ -12245,12 +12576,14 @@
+ 	kf6=\EOh, kf7=\EOi, kf8=\EOj, kf9=\ENo, khome=\E[H,
+ 	kich1=\E[@, kil1=\E[L, knp=\E[U, kpp=\E[V, ll=\E[24H,
+ 	mc0=\E[i, mc4=\E[?4i, mc5=\E[?5i, nel=\EE,
+-	pfx=\E[%p1%d;%p2%l%02dq%?%p1%{9}%<%t   F%p1%1d           %;%p2%s,
++	pfx=\E[%p1%d;%p2%l%02dq%?%p1%{9}%<%t\s\s\sF%p1%1d\s\s\s\s\s
++	    \s\s\s\s\s\s%;%p2%s,
+ 	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, rc=\E8,
+ 	rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, ri=\EM, rmacs=^O,
+ 	rmir=\E[4l, rmln=\E[2p, rmso=\E[27m, rmul=\E[24m,
+ 	rmxon=\E[53;3|, rs1=\Ec\E[?3;5l\E[56;0|, sc=\E7,
+-	sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1
++	    %|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smir=\E[4h, smln=\E[p, smso=\E[7m,
+ 	smul=\E[4m, smxon=\E[53;0|, tbc=\E[3g,
+ 	tsl=\E7\E[99;%i%p1%dx,
+@@ -12297,13 +12630,16 @@
+ 	kf6=\EOh, kf7=\EOi, kf8=\EOj, kf9=\ENo, khome=\E[H,
+ 	kich1=\E[@, kil1=\E[L, kind=\E[S, kri=\E[T,
+ 	mc0=\E[?19h\E[0i, mc4=\E[?4i, mc5=\E[?5i, nel=\EE,
+-	pfx=\E[%?%p1%{25}%<%t%p1%e%p1%{24}%-%;%d;%p2%l%02d%?%p1%{25}%<%tq   SYS     F%p1%:-2d  %e;0;3q%;%p2%s,
++	pfx=\E[%?%p1%{25}%<%t%p1%e%p1%{24}%-%;%d;%p2%l%02d%?%p1%{25}
++	    %<%tq\s\s\sSYS\s\s\s\s\sF%p1%:-2d\s\s%e;0;3q%;
++	    %p2%s,
+ 	pfxl=\E[%p1%d;%p2%l%02d;0;0q%p3%:-16.16s%p2%s,
+ 	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, rc=\E8,
+ 	rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, ri=\EM, rmacs=^O,
+ 	rmam=\E[?7l, rmir=\E[4l, rmln=\E[?13h, rmso=\E[27m,
+ 	rmul=\E[24m, rmxon=\E[?21l, rs2=\Ec\E[?3l, sc=\E7,
+-	sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1
++	    %|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h,
+ 	smln=\E[?13l, smso=\E[7m, smul=\E[4m, smxon=\E[?21h,
+ 	swidm=\E#6, tsl=\E7\E[;%i%p1%dx,
+@@ -12313,8 +12649,7 @@
+ 	lines#24, use=att730,
+ att730r|730MTGr|AT&T 730 rev video windowing terminal Version,
+ 	flash=\E[?5l$<200>\E[?5h,
+-	is1=\E[8;0|\E[?3;4;13;15l\E[?5h\E[13;20l\E[?7h\E[12h\E(B\E)B,
+-	use=att730,
++	is1=\E[8;0|\E[?3;4;13;15l\E[?5h\E[13;20l\E[?7h\E[12h\E(B\E)B, use=att730,
+ att730r-41|730MTG-41r|AT&T 730r-41 rev video windowing terminal Version,
+ 	lines#41, use=att730r,
+ att730r-24|730MTGr-24|AT&T 730r-24 rev video windowing terminal Version,
+@@ -12740,7 +13075,8 @@
+ 	OTbs, am,
+ 	cols#80, lines#40,
+ 	bel=^G, clear=\014$<2>, cr=^M, cub1=^H, cud1=^J, cuf1=^_,
+-	cup=\017%p2%{10}%/%{16}%*%p2%{10}%m%+%c%p1%?%p1%{19}%>%t%{12}%+%;%{64}%+%c,
++	cup=\017%p2%{10}%/%{16}%*%p2%{10}%m%+%c%p1%?%p1%{19}%>%t
++	    %{12}%+%;%{64}%+%c,
+ 	cuu1=^N, home=^K, ht=^I, hts=^]^P1, ind=^J, kbs=^^, kcub1=^H,
+ 	kcud1=^J, kcuf1=^_, kcuu1=^N, khome=^K, tbc=^\^P^P,
+ 
+@@ -12782,11 +13118,14 @@
+ 	khome=\E[H, kich1=\E[@, kil1=\E[L, krmir=\E6, mc0=\E[0i,
+ 	mc4=^C, mc5=\E[v, mc5p=\E[%p1%dv, rc=\E8,
+ 	rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m,
+-	rmkx=\EP`>y~[[J`8xy~[[A`4xy~[[D`6xy~[[C`2xy~[[B\E\\,
++	rmkx=\EP`>y~[[J`8xy~[[A`4xy~[[D`6xy~[[C`2xy~[[B\E
++	     \\,
+ 	rmm=\E[>52l, rmso=\E[m, rmul=\E[m, sc=\E7,
+-	sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;%?%p7%t8;%;m,
++	sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;
++	    %;%?%p7%t8;%;m,
+ 	sgr0=\E[m,
+-	smkx=\EP`>z~[[J`8xz~[[A`4xz~[[D`6xz~[[C`2xz~[[B\E\\,
++	smkx=\EP`>z~[[J`8xz~[[A`4xz~[[D`6xz~[[C`2xz~[[B\E
++	     \\,
+ 	smm=\E[>52h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+ 	vpa=\E[%p1%{1}%+%dd,
+ 
+@@ -12794,13 +13133,15 @@
+ 	blink=\E[5;7m, bold=\E[1;7m, invis=\E[7;8m,
+ 	is1=\E[7m\E7\E[H\E9\E8, rev=\E[m, rmso=\E[7m, rmul=\E[7m,
+ 	rs1=\E[H\E[7m\E[J$<156>,
+-	sgr=\E[%?%p2%t4;%;%?%p4%t5;%;%?%p6%t1;%;%?%p1%p2%|%p3%!%t7;%;%?%p7%t8;%;m\016,
++	sgr=\E[%?%p2%t4;%;%?%p4%t5;%;%?%p6%t1;%;%?%p1%p2%|%p3%!%t7;
++	    %;%?%p7%t8;%;m\016,
+ 	sgr0=\E[7m\016, smso=\E[m, smul=\E[4;7m,
+ # Ambassador with the DEC option, for partial vt100 compatibility.
+ aaa+dec|ann arbor ambassador in dec vt100 mode,
+ 	acsc=aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}},
+ 	csr=\E[%i%p1%d;%p2%dr, enacs=\E(0, rmacs=^N,
+-	sgr=\E[%?%p2%t4;%;%?%p4%t5;%;%?%p6%t1;%;%?%p1%p3%|%!%t7;%;%?%p7%t8;%;m%?%p9%t\017%e\016%;,
++	sgr=\E[%?%p2%t4;%;%?%p4%t5;%;%?%p6%t1;%;%?%p1%p3%|%!%t7;%;%?
++	    %p7%t8;%;m%?%p9%t\017%e\016%;,
+ 	smacs=^O,
+ aaa-18|ann arbor ambassador/18 lines,
+ 	lines#18,
+@@ -12967,7 +13308,8 @@
+ 	blink=\E[5;7m, bold=\E[1;7m, home=\E[H, invis=\E[7;8m,
+ 	is1=\E[7m\E7\E[H\E9\E8, rev=\E[m, rmso=\E[7m, rmul=\E[7m,
+ 	rs1=\E[H\E[7m\E[J,
+-	sgr=\E[%?%p6%t1;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p1%!%t7;%;%?%p7%t8;%;m,
++	sgr=\E[%?%p6%t1;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p1%!%t
++	    7;%;%?%p7%t8;%;m,
+ 	sgr0=\E[7m, smso=\E[m, smul=\E[4;7m,
+ 
+ #### Applied Digital Data Systems (adds)
+@@ -13002,7 +13344,7 @@
+ regent100|Adds Regent 100,
+ 	xmc#1,
+ 	bel=^G,
+-	cup=\013%p1%' '%+%c\020%p2%{10}%/%{16}%*%p2%{10}%m%+%c,
++	cup=\013%p1%'\s'%+%c\020%p2%{10}%/%{16}%*%p2%{10}%m%+%c,
+ 	kf0=^B1\r, kf1=^B2\r, kf2=^B3\r, kf3=^B4\r, kf4=^B5\r,
+ 	kf5=^B6\r, kf6=^B7\r, kf7=^B8\r, lf0=F1, lf1=F2, lf2=F3,
+ 	lf3=F4, lf4=F5, lf5=F6, lf6=F7, lf7=F8, rmso=\E0@, rmul=\E0@,
+@@ -13105,7 +13447,9 @@
+ 	ed=\EY$<80>, el=\ET, home=^^, ht=^I, ind=^J, invis=\E0D\E),
+ 	kbs=^H, kcub1=^H, kcud1=^J, kcuf1=^L, kcuu1=^K, khome=^^,
+ 	nel=^M^J, rev=\E0P\E), rmso=\E(,
+-	sgr=%?%p1%p2%|%p3%|%p4%|%p5%|%p7%|%t\E0%{64}%?%p1%t%{17}%|%;%?%p2%t%{32}%|%;%?%p3%t%{16}%|%;%?%p4%t%{2}%|%;%?%p5%t%{1}%|%;%c%?%p7%tD%;\E)%e\E(%;,
++	sgr=%?%p1%p2%|%p3%|%p4%|%p5%|%p7%|%t\E0%{64}%?%p1%t%{17}%|%;
++	    %?%p2%t%{32}%|%;%?%p3%t%{16}%|%;%?%p4%t%{2}%|%;%?%p5%t
++	    %{1}%|%;%c%?%p7%tD%;\E)%e\E(%;,
+ 	sgr0=\E(, smso=\E0Q\E), smul=\E0`\E),
+ vp60|viewpoint60|addsvp60|adds viewpoint60,
+ 	use=regent40,
+@@ -13223,7 +13567,8 @@
+ 	dl1=\E[M, ed=\E[J, el=\E[K, flash=\E[?5l\E[?5h$<200/>,
+ 	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
+ 	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=^J, indn=\E[%p1%dS,
+-	is2=\E<\E>\E[?1l\E[?3l\E[?4l\E[?5h\E[?7h\E[?8h\E[3g\E[>5g\E(B\E[m\E[20l\E[1;24r\E[24;1H,
++	is2=\E<\E>\E[?1l\E[?3l\E[?4l\E[?5h\E[?7h\E[?8h\E[3g\E[>5g\E(
++	    B\E[m\E[20l\E[1;24r\E[24;1H,
+ 	kbs=\177, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+ 	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=\EE, rc=\E8,
+ 	rev=\E[7m, ri=\EM, rin=\E[%p1%dT, rmcup=, rmir=\E[4l,
+@@ -13288,13 +13633,13 @@
+ citoh-elite|citoh in elite,
+ 	cols#96,
+ 	is1=\EE,
+-	is2=\E(009\,017\,025\,033\,041\,049\,057\,065\,073\,081\,089.,
+-	use=citoh,
++	is2=\E(009\,017\,025\,033\,041\,049\,057\,065\,073\,081\,089
++	    ., use=citoh,
+ citoh-comp|citoh in compressed,
+ 	cols#136,
+ 	is1=\EQ,
+-	is2=\E(009\,017\,025\,033\,041\,049\,057\,065\,073\,081\,089\,097\,105\,113\,121\,129.,
+-	use=citoh,
++	is2=\E(009\,017\,025\,033\,041\,049\,057\,065\,073\,081\,089
++	    \,097\,105\,113\,121\,129., use=citoh,
+ # citoh has infinite cols because we don't want lp ever inserting \n\t**.
+ citoh-prop|citoh-ps|ips|citoh in proportional spacing mode,
+ 	cols#32767,
+@@ -13372,7 +13717,10 @@
+ 	cuf1=^X, cup=\002%p2%{32}%+%c%p1%{32}%+%c, cuu1=^W,
+ 	dch1=^^N, dim=^\, dl1=^^Q, ed=^^P, el=^K, home=^Y, hts=^^^RW,
+ 	ich1=^^O, il1=^^R, ind=\036W =\036U, invis=^^^R[,
+-	is2=\036\022B\003\036\035\017\022\025\035\036E\036\022H\036\022J\036\022L\036\022N\036\022P\036\022Q\036\022\036\022\^\036\022b\036\022i\036W =\036\022Z\036\011C1-` `!k/o,
++	is2=\036\022B\003\036\035\017\022\025\035\036E\036\022H\036
++	    \022J\036\022L\036\022N\036\022P\036\022Q\036\022\036
++	    \022\^\036\022b\036\022i\036W\s=\036\022Z\036\011C1-`\s`
++	    !k/o,
+ 	kbs=^H, kcub1=^H, kcud1=^Z, kcuf1=^X, kcuu1=^W, kf0=^^q,
+ 	kf1=^^r, kf2=^^s, kf3=^^t, kf4=^^u, kf5=^^v, kf6=^^w, kf7=^^x,
+ 	kf8=^^y, kf9=^^z, khome=^Y, ll=^B =, rev=^^D,
+@@ -13477,13 +13825,15 @@
+ # No delays needed on c108 because of ^S/^Q handshaking
+ #
+ c108|concept108|c108-8p|concept108-8p|concept 108 w/8 pages,
+-	is3=\EU\E z"\Ev\001\177 !p\E ;"\E z \Ev  \001\177p\Ep\n,
++	is3=\EU\E\sz"\Ev\001\177\s!p\E\s;"\E\sz\s\Ev\s\s\001\177p
++	    \Ep\n,
+ 	rmcup=\Ev  \001\177p\Ep\r\n, use=c108-4p,
+ c108-4p|concept108-4p|concept 108 w/4 pages,
+ 	OTbs, eslok, hs, xon,
+ 	pb@,
+ 	acsc=jEkTl\\mMqLxU, cnorm=\Ew, cr=^M,
+-	cup=\Ea%p1%?%p1%{95}%>%t\001%{96}%-%;%{32}%+%c%p2%?%p2%{95}%>%t\001%{96}%-%;%{32}%+%c,
++	cup=\Ea%p1%?%p1%{95}%>%t\001%{96}%-%;%{32}%+%c%p2%?%p2%{95}
++	    %>%t\001%{96}%-%;%{32}%+%c,
+ 	cvvis=\EW, dch1=\E 1$<16*>, dsl=\E ;\177, fsl=\Ee\E z\s,
+ 	ind=^J, is1=\EK\E!\E F,
+ 	is3=\EU\E z"\Ev\177 !p\E ;"\E z \Ev  \001 p\Ep\n,
+@@ -13549,7 +13899,8 @@
+ 	ed=\E\005$<16*>, el=\E\025$<16>, flash=\Ek$<200>\EK,
+ 	ht=\011$<8>, il1=\E\022$<3*>, ind=^J, invis=\EH, ip=$<16*>,
+ 	is1=\EK,
+-	is2=\EU\Ef\E7\E5\E8\El\ENH\E\0\Eo&\0\Eo'\E\Eo!\0\E\007!\E\010A@ \E4#\:"\E\:a\E4#;"\E\:b\E4#<"\E\:c,
++	is2=\EU\Ef\E7\E5\E8\El\ENH\E\0\Eo&\0\Eo'\E\Eo!\0\E\007!\E
++	    \010A@\s\E4#\:"\E\:a\E4#;"\E\:b\E4#<"\E\:c,
+ 	is3=\Ev    $<6>\Ep\n, kbs=^H, kcbt=\E', kctab=\E_,
+ 	kcub1=\E>, kcud1=\E<, kcuf1=\E=, kcuu1=\E;, kdch1=\E^Q,
+ 	kdl1=\E^B, ked=\E^C, kel=\E^S, kf1=\E5, kf2=\E6, kf3=\E7,
+@@ -13822,7 +14173,13 @@
+ 	fsl=\E[!w, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH,
+ 	ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\ED,
+ 	invis=\E[0;8m,
+-	is2=\E)0\017\E[m\E[=107;207h\E[90;3u\E[92;3u\E[43;1u\177\E$P\177\E[44;1u\177\E$Q\177\E[45;1u\177\E$R\177\E[46;1u\177\E$S\177\E[200;1u\177\E$A\177\E[201;1u\177\E$B\177\E[202;1u\177\E$C\177\E[203;1u\177\E$D\177\E[204;1u\177\E$H\177\E[212;1u\177\E$I\177\E[213;1u\177\E$\010\177\E[214;1u"\E$\177"\E[2!w\E[25;25w\E[!w\E[2*w\E[2+x\E[;3+},
++	is2=\E)0\017\E[m\E[=107;207h\E[90;3u\E[92;3u\E[43;1u\177\E$P
++	    \177\E[44;1u\177\E$Q\177\E[45;1u\177\E$R\177\E[46;1u
++	    \177\E$S\177\E[200;1u\177\E$A\177\E[201;1u\177\E$B\177
++	    \E[202;1u\177\E$C\177\E[203;1u\177\E$D\177\E[204;1u\177
++	    \E$H\177\E[212;1u\177\E$I\177\E[213;1u\177\E$\010\177\E[
++	    214;1u"\E$\177"\E[2!w\E[25;25w\E[!w\E[2*w\E[2+x\E[
++	    ;3+},
+ 	kDC=\E$\177, kHOM=\E$H, kLFT=\E$D, kRIT=\E$C, kbs=^H,
+ 	kcbt=\E$I, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+ 	kdch1=\177, kent=^M, kf1=^\001\r, kf10=^\010\r,
+@@ -13840,7 +14197,8 @@
+ 	kind=\E[T, knp=\E[U, kpp=\E[V, kri=\E[S, ll=\E[H\E[A,
+ 	nel=\E[E, rc=\E8, rev=\E[0;7m, ri=\EM, rmacs=^O, rmir=\E[4l,
+ 	rmso=\E[m\017, rmul=\E[m\017, sc=\E7,
+-	sgr=\E[0%?%p1%p6%O%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%O%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p1%p6%O%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%O%t;7
++	    %;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smir=\E[4h, smso=\E[0;1;7m,
+ 	smul=\E[0;4m, tbc=\E[3g, tsl=\E[2!w\E[%i%p1%dG,
+ 	vpa=\E[%i%p1%dd, use=ansi+pp,
+@@ -13860,7 +14218,9 @@
+ 	hpa=\E[%p1%{1}%+%dG, ht=\011$<4>, hts=\EH, ich=\E[%p1%d@,
+ 	ich1=\E[@, il=\E[%p1%dL$<4*>, il1=\E[L$<4>, ind=\n$<8>,
+ 	invis=\E[8m, ip=$<4>, is1=\E[=103l\E[=205l,
+-	is2=\E[1*q\E[2!t\E[7!t\E[=4;101;119;122l\E[=107;118;207h\E)1\E[1Q\EW\E[!y\E[!z\E>\E[0\:0\:32!r\E[0*w\E[w\E2\r\n\E[2;27!t,
++	is2=\E[1*q\E[2!t\E[7!t\E[=4;101;119;122l\E[=107;118;207h\E)1
++	    \E[1Q\EW\E[!y\E[!z\E>\E[0\:0\:32!r\E[0*w\E[w\E2\r\n\E[2;
++	    27!t,
+ 	kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+ 	kdch1=\E^B\r, ked=\E^D\r, kf1=\EOP, kf2=\EOQ, kf3=\EOR,
+ 	kf4=\EOS, khome=\E[H, kich1=\E^A\r, kil1=\E^C\r, ll=\E[24H,
+@@ -13870,7 +14230,9 @@
+ 	ri=\EM$<4>, rmacs=\016$<1>, rmcup=\E[w\E2\r\n,
+ 	rmir=\E[4l, rmkx=\E[!z\E[0;2u, rmso=\E[7!{, rmul=\E[4!{,
+ 	sc=\E7,
+-	sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;%?%p7%t8;%;%?%p8%t99;%;m%?%p5%t\E[1!{%;%?%p9%t\017%e\016%;$<1>,
++	sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;
++	    %;%?%p7%t8;%;%?%p8%t99;%;m%?%p5%t\E[1!{%;%?%p9%t\017%e
++	    \016%;$<1>,
+ 	sgr0=\E[m\016$<1>, smacs=\017$<1>,
+ 	smcup=\E[=4l\E[1;24w\E2\r, smir=\E[4h,
+ 	smkx=\E[1!z\E[0;3u, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+@@ -14040,8 +14402,10 @@
+ 	bce,
+ 	colors#16, ncv#53, pairs#256,
+ 	op=\036Ad\036Bd,
+-	setab=\036B%p1%?%p1%{8}%<%t%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1%{4}%&%t%{1}%|%;%;%{48}%+%c,
+-	setaf=\036A%p1%?%p1%{8}%<%t%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1%{4}%&%t%{1}%|%;%;%{48}%+%c,
++	setab=\036B%p1%?%p1%{8}%<%t%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1
++	      %{4}%&%t%{1}%|%;%;%{48}%+%c,
++	setaf=\036A%p1%?%p1%{8}%<%t%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1
++	      %{4}%&%t%{1}%|%;%;%{48}%+%c,
+ 	setb=\036B%p1%{48}%+%c, setf=\036A%p1%{48}%+%c,
+ 
+ dg+fixed|Fixed color info for DG D430C terminals in DG mode,
+@@ -14056,36 +14420,52 @@
+ 	op=\E[%?%gD%t2;%;%?%gU%t4;%;%?%gB%t5;%;%?%gR%t7;%;m,
+ 	setab=\E[4%p1%d%?%gD%t;2%;%?%gU%t;4%;%?%gB%t;5%;%?%gR%t;7%;m,
+ 	setaf=\E[3%p1%d%?%gD%t;2%;%?%gU%t;4%;%?%gB%t;5%;%?%gR%t;7%;m,
+-	setb=\E[4%p1%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1%{4}%&%t%{1}%|%;%d%?%gD%t;2%;%?%gU%t;4%;%?%gB%t;5%;%?%gR%t;7%;m,
+-	setf=\E[3%p1%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1%{4}%&%t%{1}%|%;%d%?%gD%t;2%;%?%gU%t;4%;%?%gB%t;5%;%?%gR%t;7%;m,
++	setb=\E[4%p1%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1%{4}%&%t%{1}%|%;
++	     %d%?%gD%t;2%;%?%gU%t;4%;%?%gB%t;5%;%?%gR%t;7%;m,
++	setf=\E[3%p1%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1%{4}%&%t%{1}%|%;
++	     %d%?%gD%t;2%;%?%gU%t;4%;%?%gB%t;5%;%?%gR%t;7%;m,
+ 
+ dg+color|Color info for Data General D470C terminals in ANSI mode,
+ 	colors#16, ncv#53, pairs#256,
+-	setab=\E[%?%p1%{8}%<%t4%p1%e=%p1%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1%{4}%&%t%{1}%|%;%;%d%?%gD%t;2%;%?%gU%t;4%;%?%gB%t;5%;%?%gR%t;7%;m,
+-	setaf=\E[%?%p1%{8}%<%t3%p1%e<%p1%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1%{4}%&%t%{1}%|%;%;%d%?%gD%t;2%;%?%gU%t;4%;%?%gB%t;5%;%?%gR%t;7%;m,
+-	setb=\E[%?%p1%{8}%<%t4%e=%;%p1%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1%{4}%&%t%{1}%|%;%d%?%gD%t;2%;%?%gU%t;4%;%?%gB%t;5%;%?%gR%t;7%;m,
+-	setf=\E[%?%p1%{8}%<%t3%e<%;%p1%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1%{4}%&%t%{1}%|%;%d%?%gD%t;2%;%?%gU%t;4%;%?%gB%t;5%;%?%gR%t;7%;m,
+-	use=dg+color8,
++	setab=\E[%?%p1%{8}%<%t4%p1%e=%p1%{2}%&%?%p1%{1}%&%t%{4}%|%;
++	      %?%p1%{4}%&%t%{1}%|%;%;%d%?%gD%t;2%;%?%gU%t;4%;%?%gB%t
++	      ;5%;%?%gR%t;7%;m,
++	setaf=\E[%?%p1%{8}%<%t3%p1%e<%p1%{2}%&%?%p1%{1}%&%t%{4}%|%;
++	      %?%p1%{4}%&%t%{1}%|%;%;%d%?%gD%t;2%;%?%gU%t;4%;%?%gB%t
++	      ;5%;%?%gR%t;7%;m,
++	setb=\E[%?%p1%{8}%<%t4%e=%;%p1%{2}%&%?%p1%{1}%&%t%{4}%|%;%?
++	     %p1%{4}%&%t%{1}%|%;%d%?%gD%t;2%;%?%gU%t;4%;%?%gB%t;5%;
++	     %?%gR%t;7%;m,
++	setf=\E[%?%p1%{8}%<%t3%e<%;%p1%{2}%&%?%p1%{1}%&%t%{4}%|%;%?
++	     %p1%{4}%&%t%{1}%|%;%d%?%gD%t;2%;%?%gU%t;4%;%?%gB%t;5%;
++	     %?%gR%t;7%;m, use=dg+color8,
+ 
+ dgmode+color8|Color info for Data General D220/D230C terminals in DG mode,
+ 	bce,
+ 	colors#8, ncv#16, pairs#64,
+ 	op=\036Ad\036Bd,
+-	setab=\036B%p1%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1%{4}%&%t%{1}%|%;%{48}%+%c,
+-	setaf=\036A%p1%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1%{4}%&%t%{1}%|%;%{48}%+%c,
++	setab=\036B%p1%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1%{4}%&%t%{1}%|
++	      %;%{48}%+%c,
++	setaf=\036A%p1%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1%{4}%&%t%{1}%|
++	      %;%{48}%+%c,
+ 	setb=\036B%p1%{48}%+%c, setf=\036A%p1%{48}%+%c,
+ 
+ dgmode+color|Color info for Data General D470C terminals in DG mode,
+ 	colors#16, pairs#256,
+-	setab=\036B%p1%?%p1%{8}%<%t%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1%{4}%&%t%{1}%|%;%;%{48}%+%c,
+-	setaf=\036A%p1%?%p1%{8}%<%t%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1%{4}%&%t%{1}%|%;%;%{48}%+%c,
+-	use=dgmode+color8,
++	setab=\036B%p1%?%p1%{8}%<%t%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1
++	      %{4}%&%t%{1}%|%;%;%{48}%+%c,
++	setaf=\036A%p1%?%p1%{8}%<%t%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1
++	      %{4}%&%t%{1}%|%;%;%{48}%+%c, use=dgmode+color8,
+ 
+ dgunix+ccc|Configurable color info for DG D430C terminals in DG-UNIX mode,
+ 	bce, ccc,
+ 	colors#52, ncv#53, pairs#26,
+-	initp=\036RG0%p1%02X%p2%{255}%*%{1000}%/%02X%p3%{255}%*%{1000}%/%02X%p4%{255}%*%{1000}%/%02X%p5%{255}%*%{1000}%/%02X%p6%{255}%*%{1000}%/%02X%p7%{255}%*%{1000}%/%02X,
+-	oc=\036RG01A00FF00000000\036RG01B00000000FF00\036RG01C007F00000000\036RG01D000000007F00,
++	initp=\036RG0%p1%02X%p2%{255}%*%{1000}%/%02X%p3%{255}%*
++	      %{1000}%/%02X%p4%{255}%*%{1000}%/%02X%p5%{255}%*
++	      %{1000}%/%02X%p6%{255}%*%{1000}%/%02X%p7%{255}%*
++	      %{1000}%/%02X,
++	oc=\036RG01A00FF00000000\036RG01B00000000FF00
++	   \036RG01C007F00000000\036RG01D000000007F00,
+ 	op=\036RF4831A\036RF2E31B\036RF1D31C\036RF3F31D,
+ 	scp=\036RG2%p1%02X,
+ 
+@@ -14093,8 +14473,16 @@
+ dg+ccc|Configurable color info for DG D430C terminals in DG mode,
+ 	bce, ccc,
+ 	colors#52, ncv#53, pairs#26,
+-	initp=\036RG0%p1%{16}%/%{48}%+%c%p1%{16}%m%{48}%+%c%p2%{255}%*%{1000}%/%Pa%ga%{16}%/%{48}%+%c%ga%{16}%m%{48}%+%c%p3%{255}%*%{1000}%/%Pa%ga%{16}%/%{48}%+%c%ga%{16}%m%{48}%+%c%p4%{255}%*%{1000}%/%Pa%ga%{16}%/%{48}%+%c%ga%{16}%m%{48}%+%c%p5%{255}%*%{1000}%/%Pa%ga%{16}%/%{48}%+%c%ga%{16}%m%{48}%+%c%p6%{255}%*%{1000}%/%Pa%ga%{16}%/%{48}%+%c%ga%{16}%m%{48}%+%c%p7%{255}%*%{1000}%/%Pa%ga%{16}%/%{48}%+%c%ga%{16}%m%{48}%+%c,
+-	oc=\036RG01\:00??00000000\036RG01;00000000??00\036RG01<007?00000000\036RG01=000000007?00,
++	initp=\036RG0%p1%{16}%/%{48}%+%c%p1%{16}%m%{48}%+%c%p2%{255}
++	      %*%{1000}%/%Pa%ga%{16}%/%{48}%+%c%ga%{16}%m%{48}%+%c
++	      %p3%{255}%*%{1000}%/%Pa%ga%{16}%/%{48}%+%c%ga%{16}%m
++	      %{48}%+%c%p4%{255}%*%{1000}%/%Pa%ga%{16}%/%{48}%+%c%ga
++	      %{16}%m%{48}%+%c%p5%{255}%*%{1000}%/%Pa%ga%{16}%/%{48}
++	      %+%c%ga%{16}%m%{48}%+%c%p6%{255}%*%{1000}%/%Pa%ga%{16}
++	      %/%{48}%+%c%ga%{16}%m%{48}%+%c%p7%{255}%*%{1000}%/%Pa
++	      %ga%{16}%/%{48}%+%c%ga%{16}%m%{48}%+%c,
++	oc=\036RG01\:00??00000000\036RG01;00000000??00\036RG01<007?0
++	   0000000\036RG01=000000007?00,
+ 	op=\036RF4831\:\036RF2>31;\036RF1=31<\036RF3?31=,
+ 	scp=\036RG2%p1%{16}%/%{48}%+%c%p1%{16}%m%{48}%+%c,
+ 
+@@ -14169,7 +14557,8 @@
+ 	kf8=\E[009z, kf9=\E[00\:z, khome=\E[H, lf0=f1, lf1=f2,
+ 	lf2=f3, lf3=f4, lf4=f5, lf5=f6, lf6=f7, lf7=f8, lf9=f10,
+ 	mc0=\E[i, rev=\E[7m, ri=\E[T, rmso=\E[m, rmul=\E[05,
+-	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m,
++	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;
++	    %?%p1%p3%|%t;7%;m,
+ 	sgr0=\E(B\E[m, smso=\E[7m, smul=\E[4m, u6=\E[%d;%dR,
+ 	u7=\E[6n, u8=\E[5n, u9=\E[0n,
+ # From: Wayne Throop  (not official)
+@@ -14198,7 +14587,8 @@
+ # Like 6053, but adds reverse video and more keypad and function keys.
+ d200|d200-dg|Data General DASHER D200,
+ 	bold=^^D^T, home@, ll@, rev=^^D, rmso=^^E^],
+-	sgr=\036%?%p1%p3%|%p6%|%tD%eE%;%?%p2%p6%|%t\024%e\025%;%?%p4%t\016%e\017%;%?%p1%p5%|%t\034%e\035%;,
++	sgr=\036%?%p1%p3%|%p6%|%tD%eE%;%?%p2%p6%|%t\024%e\025%;%?%p4
++	    %t\016%e\017%;%?%p1%p5%|%t\034%e\035%;,
+ 	sgr0=\017\025\035\036E, smso=^^D^\, use=dgkeys+15,
+ 	use=dg6053,
+ 
+@@ -14218,7 +14608,8 @@
+ 	cuu=\E[%p1%dA, cuu1=\E[A, dim=\E[2m, ed=\E[J, el=\E[K,
+ 	el1=\E[1K, home=\E[H, ind=^J, is1=\E[<0;<1;<4l,
+ 	ll=\E[H\E[A, nel=^J, rev=\E[7m, rmso=\E[m, rmul=\E[m,
+-	sgr=\E[%?%p4%t5;%;%?%p2%p6%|%t4;%;%?%p1%p5%|%t2;%;%?%p1%p3%|%p6%|%t7;%;m,
++	sgr=\E[%?%p4%t5;%;%?%p2%p6%|%t4;%;%?%p1%p5%|%t2;%;%?%p1%p3%|
++	    %p6%|%t7;%;m,
+ 	sgr0=\E[m, smso=\E[2;7m, smul=\E[4m, use=dgkeys+7b,
+ 
+ # DASHER D210 series terminals in DG mode.
+@@ -14280,7 +14671,9 @@
+ 	kcuf1=^^PC, kcuu1=^^PA, kel=^^PE, khome=^^PF, kprt=^^P0,
+ 	mc0=\036F?9, mc4=^^Fa, mc5=^^F`, rmacs=\036FS00,
+ 	rs2=\036N\036FS0E\036O\036FS00,
+-	sgr=\036%?%p1%p3%|%p6%|%tD%eE%;%?%p2%p6%|%t\024%e\025%;\036P%?%p4%tI%eJ%;%?%p1%p5%|%t\034%e\035%;\036FS%?%p9%t11%e00%;,
++	sgr=\036%?%p1%p3%|%p6%|%tD%eE%;%?%p2%p6%|%t\024%e\025%;
++	    \036P%?%p4%tI%eJ%;%?%p1%p5%|%t\034%e\035%;\036FS%?%p9%t1
++	    1%e00%;,
+ 	sgr0=\036PJ\025\035\036E\036FS00, smacs=\036FS11,
+ 	vpa=\020\177%p1%c, use=dgkeys+15, use=d216-dg,
+ d216-unix-25|d216+25|Data General DASHER D216+ in DG-UNIX mode with 25 lines,
+@@ -14334,7 +14727,9 @@
+ d230c|d230|Data General DASHER D230C,
+ 	blink=\E[5;50m, bold=\E[4;7;50m, dim=\E[2;50m, nel=^M^J,
+ 	rev=\E[7;50m, rmkx=\E[2;1v, rmso=\E[50m, rmul=\E[50m,
+-	sgr=\E[50%?%p1%p3%|%p6%|%t;7%{1}%e%{0}%;%PR%?%p4%t;5%{1}%e%{0}%;%PB%?%p2%p6%|%t;4%{1}%e%{0}%;%PU%?%p1%p5%|%t;2%{1}%e%{0}%;%PDm\E)%?%p9%t6\016%e4\017%;,
++	sgr=\E[50%?%p1%p3%|%p6%|%t;7%{1}%e%{0}%;%PR%?%p4%t;5%{1}%e
++	    %{0}%;%PB%?%p2%p6%|%t;4%{1}%e%{0}%;%PU%?%p1%p5%|%t;2%{1}
++	    %e%{0}%;%PDm\E)%?%p9%t6\016%e4\017%;,
+ 	sgr0=\E[50m\E)4\017, smkx=\E[2;0v, smso=\E[2;7;50m,
+ 	smul=\E[4;50m, use=dgkeys+7b, use=d220,
+ 
+@@ -14366,10 +14761,13 @@
+ 	cnorm=\036FQ2, dch1=^^K, dl1=^^FI,
+ 	enacs=\036N\036FS11\036O, home=^^FG, hpa=\020%p1%c\177,
+ 	ich1=^^J, il1=^^FH,
+-	is2=\036FQ2\036FW\036FJ\036F\^\036FX004?\036F]\036O\036FS00,
++	is2=\036FQ2\036FW\036FJ\036F\^\036FX004?\036F]\036O
++	    \036FS00,
+ 	ll=\036FG\027, mc4=^^Fa, mc5=^^F`, ri=^^I, rmacs=^^O,
+ 	rs1=^^FA, rs2=\036F]\036FT0,
+-	sgr=\036%?%p1%p3%|%p6%|%tD%eE%;%?%p2%p6%|%t\024%e\025%;%?%p4%t\016%e\017%;%?%p1%p5%|%t\034%e\035%;\036%?%p9%tN%eO%;,
++	sgr=\036%?%p1%p3%|%p6%|%tD%eE%;%?%p2%p6%|%t\024%e\025%;%?%p4
++	    %t\016%e\017%;%?%p1%p5%|%t\034%e\035%;\036%?%p9%tN
++	    %eO%;,
+ 	sgr0=\017\025\035\036E\036O, smacs=^^N,
+ 	vpa=\020\177%p1%c, use=d210-dg,
+ 
+@@ -14420,7 +14818,8 @@
+ 	is2=\E[3;2;2;1;1;1v\E(B\E)4\017, mc4=\E[4i, mc5=\E[5i,
+ 	ri=\EM, rmacs=\E)4\017, rs1=\Ec\E[<2h,
+ 	rs2=\E[4;0;2;1;1;1v\E(B\E)4,
+-	sgr=\E[%?%p1%t2;7%;%?%p3%t7;%;%?%p4%t5;%;%?%p2%t4;%;%?%p1%p5%|%t2;%;%?%p6%t4;7;%;m\E)%?%p9%t6\016%e4\017%;,
++	sgr=\E[%?%p1%t2;7%;%?%p3%t7;%;%?%p4%t5;%;%?%p2%t4;%;%?%p1%p5
++	    %|%t2;%;%?%p6%t4;7;%;m\E)%?%p9%t6\016%e4\017%;,
+ 	sgr0=\E[m\E)4\017, smacs=\E)6\016, use=d211,
+ 
+ # Initialization string 2 sets:
+@@ -14442,13 +14841,16 @@
+ 	km@,
+ 	enacs=\E)6, is2=\E[3;2;2;0;1;0v\E(0\017, rmacs=^O,
+ 	rs2=\E[4;0;2;0;1;0v\E(0,
+-	sgr=\E[%?%p1%p3%|%p6%|%t7;%;%?%p4%t5;%;%?%p2%p6%|%t4;%;%?%p1%p5%|%t2;%;m%?%p9%t\016%e\017%;,
++	sgr=\E[%?%p1%p3%|%p6%|%t7;%;%?%p4%t5;%;%?%p2%p6%|%t4;%;%?%p1
++	    %p5%|%t2;%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, use=dgkeys+7b, use=d410,
+ 
+ d410-dg|d460-dg|d411-dg|d461-dg|Data General DASHER D410/D460 series in DG mode,
+ 	km,
+ 	enacs@, rmacs=\036FS00,
+-	sgr=\036%?%p1%p3%|%p6%|%tD%eE%;%?%p2%p6%|%t\024%e\025%;%?%p4%t\016%e\017%;%?%p1%p5%|%t\034%e\035%;\036FS%?%p9%t11%e00%;,
++	sgr=\036%?%p1%p3%|%p6%|%tD%eE%;%?%p2%p6%|%t\024%e\025%;%?%p4
++	    %t\016%e\017%;%?%p1%p5%|%t\034%e\035%;\036FS%?%p9%t11%e
++	    00%;,
+ 	sgr0=\017\025\035\036E\036FS00, smacs=\036FS11,
+ 	use=d400-dg,
+ 
+@@ -14492,36 +14894,39 @@
+ 	civis=\036FQ0, clear=^^FE, cnorm=\036FQ5,
+ 	cup=\036FP%p2%2.2X%p1%2.2X, dch1=^^K, dl1=^^FI,
+ 	home=^^FG, hpa=\036FP%p1%2.2XFF, ich1=^^J, il1=^^FH,
+-	is2=\036FQ5\036FW\036FJ\036F\^\036FX004F\036O\036FS00,
++	is2=\036FQ5\036FW\036FJ\036F\^\036FX004F\036O
++	    \036FS00,
+ 	ll=\036FG\036PA, mc0=^A, rc=\036F}11, ri=^^I,
+ 	rs1=\036FA\036FT0, rs2=\036P@1, sc=\036F}10,
+ 	vpa=\036FPFF%p1%2.2X,
+-	wind=\036FB%?%p1%t%p1%2.2X0%;%p2%p1%-%{1}%+%2.2X0%?%{23}%p2%>%t000%;\036FX%p3%2.2X%p4%2.2X,
+-	use=d216+,
++	wind=\036FB%?%p1%t%p1%2.2X0%;%p2%p1%-%{1}%+%2.2X0%?%{23}%p2
++	     %>%t000%;\036FX%p3%2.2X%p4%2.2X, use=d216+,
+ d412-unix-w|d462-unix-w|d412+w|d462+w|Data General DASHER D412+/D462+ series in wide Unix mode,
+ 	cols#132,
+-	is2=\036FQ5\036FW\036FK\036F\^\036FX0083\036O\036FS00,
++	is2=\036FQ5\036FW\036FK\036F\^\036FX0083\036O
++	    \036FS00,
+ 	rs2=\036P@1\036FK\036FX0083,
+-	wind=\036FB%?%p1%t%p1%2.2X1%;%p2%p1%-%{1}%+%2.2X1%?%{23}%p2%>%t001%;\036FX%p3%2.2X%p4%2.2X,
+-	use=d412-unix,
++	wind=\036FB%?%p1%t%p1%2.2X1%;%p2%p1%-%{1}%+%2.2X1%?%{23}%p2
++	     %>%t001%;\036FX%p3%2.2X%p4%2.2X, use=d412-unix,
+ d412-unix-25|d462-unix-25|d412+25|d462+25|Data General DASHER D412+/D462+ series in Unix mode with 25 lines,
+ 	lines#25,
+ 	is3=\036Fz2,
+-	wind=\036FB%?%p1%t%p1%2.2X0%;%p2%p1%-%{1}%+%2.2X0%?%{24}%p2%>%t000%;\036FX%p3%2.2X%p4%2.2X,
+-	use=d462+,
++	wind=\036FB%?%p1%t%p1%2.2X0%;%p2%p1%-%{1}%+%2.2X0%?%{24}%p2
++	     %>%t000%;\036FX%p3%2.2X%p4%2.2X, use=d462+,
+ d412-unix-s|d462-unix-s|d412+s|d462+s|Data General DASHER D412+/D462+ in Unix mode with status line,
+ 	eslok, hs,
+ 	clear=\036FG\036PH, fsl=\036F}01\022,
+ 	is3=\036Fz2\036F}00\036FB180000\036F}01, ll@,
+ 	tsl=\036F}00\036FP%p1%2.2X18\036PG,
+-	wind=\036FB%?%p1%t%p1%2.2X0%;%p2%p1%-%{1}%+%2.2X0%?%{23}%p2%>%t%{23}%p2%-%2.2X0%;000\036FX%p3%2.2X%p4%2.2X,
+-	use=d462+,
++	wind=\036FB%?%p1%t%p1%2.2X0%;%p2%p1%-%{1}%+%2.2X0%?%{23}%p2
++	     %>%t%{23}%p2%-%2.2X0%;000\036FX%p3%2.2X%p4%2.2X, use=d462+,
+ 
+ #	Relative cursor motions are confined to the current window,
+ #	which is not what the scrolling region specification expects.
+ #	Thus, relative vertical cursor positioning must be deleted.
+ d412-unix-sr|d462-unix-sr|d412+sr|d462+sr|Data General DASHER D412+/D462+ in Unix mode with scrolling region,
+-	csr=\036FB%?%p1%t%p1%2.2X0%;%p2%p1%-%{1}%+%2.2X0%?%{23}%p2%>%t000%;,
++	csr=\036FB%?%p1%t%p1%2.2X0%;%p2%p1%-%{1}%+%2.2X0%?%{23}%p2%>
++	    %t000%;,
+ 	cud1@, cuu1@, ll@, use=d462+,
+ 
+ d413-unix|d463-unix|Data General DASHER D413/D463 series in DG-UNIX mode,
+@@ -14590,13 +14995,13 @@
+ #
+ d470c|d470|Data General DASHER D470C,
+ 	is1=\E[<0;<1;<2;<4l\E[1;1;80w\E[1;6;<2h,
+-	sgr=\E[%?%p3%t7;%;%?%p4%t5;%;%?%p2%t4;%;%?%p6%t4;7;%;%?%p1%t2;7;%;%?%p5%t2;%;m\E)%?%p9%t6\016%e4\017%;,
+-	use=dg+color, use=d460,
++	sgr=\E[%?%p3%t7;%;%?%p4%t5;%;%?%p2%t4;%;%?%p6%t4;7;%;%?%p1%t
++	    2;7;%;%?%p5%t2;%;m\E)%?%p9%t6\016%e4\017%;, use=dg+color, use=d460,
+ 
+ d470c-7b|d470-7b|Data General DASHER D470C in 7 bit mode,
+ 	is1=\E[<0;<1;<2;<4l\E[1;1;80w\E[1;6;<2h,
+-	sgr=\E[%?%p3%t7;%;%?%p4%t5;%;%?%p2%t4;%;%?%p6%t4;7;%;%?%p1%t2;7;%;%?%p5%t2;%;m%?%p9%t\016%e\017%;,
+-	use=dg+color, use=d460-7b,
++	sgr=\E[%?%p3%t7;%;%?%p4%t5;%;%?%p2%t4;%;%?%p6%t4;7;%;%?%p1%t
++	    2;7;%;%?%p5%t2;%;m%?%p9%t\016%e\017%;, use=dg+color, use=d460-7b,
+ 
+ # Initialization string 2 sets:
+ #	^^FQ2		- default cursor (solid rectangle)
+@@ -14609,8 +15014,8 @@
+ #	- (should reset scrolling regions, but that glitches the screen)
+ #
+ d470c-dg|d470-dg|Data General DASHER D470C in DG mode,
+-	is2=\036FQ2\036FW\036F\^\036FX004?\036F]\036O\036FS00,
+-	use=dgmode+color, use=d460-dg,
++	is2=\036FQ2\036FW\036F\^\036FX004?\036F]\036O
++	    \036FS00, use=dgmode+color, use=d460-dg,
+ 
+ # DASHER D555 terminal in ANSI mode.
+ # Like a D411, but has an integrated phone.
+@@ -14860,7 +15265,8 @@
+ 	rc=\E8, rev=\E[7m$<2>, ri=\EM$<5>, rmacs=^O, rmam=\E[?7l,
+ 	rmkx=\E[?1l\E>, rmso=\E[m$<2>, rmul=\E[m$<2>,
+ 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7,
+-	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;$<2>,
++	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
++	    %;m%?%p9%t\016%e\017%;$<2>,
+ 	sgr0=\E[m\017$<2>, smacs=^N, smam=\E[?7h, smkx=\E[?1h\E=,
+ 	smso=\E[1;7m$<2>, smul=\E[4m$<2>, tbc=\E[3g,
+ 	use=vt100+fnkeys,
+@@ -15112,7 +15518,10 @@
+ 	cub1=^H, cud1=^J, cuf1=\EC$<3>, cup=\EF%p2%03d%p1%03d,
+ 	cuu1=\EA$<3>, dch1=\EP$<3>, dl1=\EM$<100>, ed=\EJ$<3>,
+ 	el=\EK$<3>, home=\EH$<1>, ht=^I, hts=\E1,
+-	il1=\EN\EL$<3>\EQ                                                                                \EP$<3> \EO\ER\EA$<3>,
++	il1=\EN\EL$<3>\EQ\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s
++	    \s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s
++	    \s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s
++	    \s\s\s\s\s\EP$<3>\s\EO\ER\EA$<3>,
+ 	ind=^J, is2=\EE$<3>\EX\EZ\EO\Eb\Eg\ER, kbs=^_, kcub1=\ED,
+ 	kcud1=\EB, kcuf1=\EC, kcuu1=\EA, kdl1=\EM, ked=\EJ, kel=\EK,
+ 	kf0=\E2, kf1=\Ep, kf2=\Eq, kf3=\Er, kf4=\Es, kf5=\Et, kf6=\Eu,
+@@ -15214,7 +15623,10 @@
+ # (8686: changed k10, k11...k16 to k;, F1...F6; fixed broken continuation
+ # in :is: -- esr)
+ ha8686|harris 8686,
+-	is2=\ES\E#\E*\Eh\Em\E?\E1\E9\E@\EX\EU\E"*Z01\E"8F35021B7C83#\E"8F45021B7D83#\E"8F55021B7E83#\E"8F65021B7F83#\E"8F75021B7383#\E"8F851BD7#\E"8F95021B7083#\E"8FA5021B7183#\E"8FB5021B7283#,
++	is2=\ES\E#\E*\Eh\Em\E?\E1\E9\E@\EX\EU\E"*Z01\E"8F35021B7C83#
++	    \E"8F45021B7D83#\E"8F55021B7E83#\E"8F65021B7F83#\E"8F750
++	    21B7383#\E"8F851BD7#\E"8F95021B7083#\E"8FA5021B7183#\E"8
++	    FB5021B7283#,
+ 	kf1=\002\Ep\003, kf10=\Ej, kf11=\EW, kf12=\002\E{\003,
+ 	kf13=\002\E|\003, kf14=\002\E}\003, kf15=\002\E~\003,
+ 	kf16=\002\E\177\003, kf2=\002\Eq\003, kf3=\002\Er\003,
+@@ -15392,7 +15804,9 @@
+ 	kcuf1=\EC, kcuu1=\EA, nel=^M^J, tbc=\EH,
+ ibm3151|IBM 3151 display,
+ 	is2=\E S, rmacs=\E>B, rmcup=\E>B, rs2=\E S, s0ds=\E>B,
+-	sgr=\E4%{64}%?%p1%t%{65}%|%;%?%p2%t%{66}%|%;%?%p3%t%{65}%|%;%?%p4%t%{68}%|%;%?%p5%t%{64}%|%;%?%p6%t%{72}%|%;%?%p7%t%{80}%|%;%c%?%p9%t\E>A%e\E>B%;,
++	sgr=\E4%{64}%?%p1%t%{65}%|%;%?%p2%t%{66}%|%;%?%p3%t%{65}%|%;
++	    %?%p4%t%{68}%|%;%?%p5%t%{64}%|%;%?%p6%t%{72}%|%;%?%p7%t
++	    %{80}%|%;%c%?%p9%t\E>A%e\E>B%;,
+ 	sgr0=\E4@\E>B, smacs=\E>A, smcup=\E>B, use=ibm3162,
+ # From: Mark Easter  29 Oct 1992
+ # removed kend, knp, kpp -TD
+@@ -15405,7 +15819,8 @@
+ ibm3161|ibm3163|wy60-316X|wyse60-316X|IBM 3161/3163 display,
+ 	OTbs, am, mir, msgr, xon,
+ 	cols#80, it#8, lines#24,
+-	acsc=j\352k\353l\354m\355n\356q\361t\364u\365v\366w\367x\370,
++	acsc=j\352k\353l\354m\355n\356q\361t\364u\365v\366w\367x
++	     \370,
+ 	bel=^G, blink=\E4D, bold=\E4H, clear=\EH\EJ, cr=^M, cub1=\ED,
+ 	cud1=\EB, cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c,
+ 	cuu1=\EA, dch1=\EQ, dl1=\EO, ed=\EJ, el=\EI, home=\EH,
+@@ -15420,7 +15835,9 @@
+ 	kf8=\Eh\r, kf9=\Ei\r, khome=\EH, khts=\E0, kich1=\EP \010,
+ 	kil1=\EN, ktbc=\E 1, mc4=^P^T, mc5=^P^R, rev=\E4A,
+ 	rmcup=\E>A, rmso=\E4@, rmul=\E4@,
+-	sgr=\E4%{64}%?%p1%t%{65}%|%;%?%p2%t%{66}%|%;%?%p3%t%{65}%|%;%?%p4%t%{68}%|%;%?%p5%t%{64}%|%;%?%p6%t%{72}%|%;%?%p7%t%{80}%|%;%c%?%p9%t\E>A%e\E<@%;,
++	sgr=\E4%{64}%?%p1%t%{65}%|%;%?%p2%t%{66}%|%;%?%p3%t%{65}%|%;
++	    %?%p4%t%{68}%|%;%?%p5%t%{64}%|%;%?%p6%t%{72}%|%;%?%p7%t
++	    %{80}%|%;%c%?%p9%t\E>A%e\E<@%;,
+ 	sgr0=\E4@\E<@, smcup=\E>A, smso=\E4A, smul=\E4B,
+ 
+ ibm3161-C|IBM 3161-C NLS terminal using cartridge,
+@@ -15448,7 +15865,8 @@
+ ibm5151|wy60-AT|wyse60-AT|IBM 5151 Monochrome display,
+ 	am, bw, msgr, xon,
+ 	cols#80, it#8, lines#25,
+-	acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x\263,
++	acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x
++	     \263,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=^M,
+ 	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=^J,
+ 	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
+@@ -15471,7 +15889,8 @@
+ 	kind=\E[151q, knp=\E[154q, kpp=\E[150q, kri=\E[155q,
+ 	krmir=\E[4l, rev=\E[7m, ri=\E[T, rin=\E[%p1%dT, rmir=\E[4l,
+ 	rmso=\E[m, rmul=\E[m, rs2=\Ec,
+-	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;m,
++	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
++	    %;%?%p7%t;8%;m,
+ 	sgr0=\E[0m, smir=\E[4h, smso=\E[7m, smul=\E[4m,
+ 
+ ibmaed|IBM Experimental display,
+@@ -15503,14 +15922,20 @@
+ ibm+color|IBM color definitions,
+ 	colors#8, ncv#3, pairs#64,
+ 	op=\E[32m\E[40m,
+-	setb=\E[%?%p1%{0}%=%t40m%e%p1%{1}%=%t41m%e%p1%{2}%=%t42m%e%p1%{3}%=%t43m%e%p1%{4}%=%t44m%e%p1%{5}%=%t45m%e%p1%{6}%=%t46m%e%p1%{7}%=%t107m%;,
+-	setf=\E[%?%p1%{0}%=%t30m%e%p1%{1}%=%t31m%e%p1%{2}%=%t32m%e%p1%{3}%=%t33m%e%p1%{4}%=%t34m%e%p1%{5}%=%t35m%e%p1%{6}%=%t36m%e%p1%{7}%=%t97m%;,
++	setb=\E[%?%p1%{0}%=%t40m%e%p1%{1}%=%t41m%e%p1%{2}%=%t42m%e
++	     %p1%{3}%=%t43m%e%p1%{4}%=%t44m%e%p1%{5}%=%t45m%e%p1%{6}
++	     %=%t46m%e%p1%{7}%=%t107m%;,
++	setf=\E[%?%p1%{0}%=%t30m%e%p1%{1}%=%t31m%e%p1%{2}%=%t32m%e
++	     %p1%{3}%=%t33m%e%p1%{4}%=%t34m%e%p1%{5}%=%t35m%e%p1%{6}
++	     %=%t36m%e%p1%{7}%=%t97m%;,
+ ibm+16color|IBM aixterm color definitions,
+ 	colors#16, pairs#256,
+ 	setab=\E[%?%p1%{8}%<%t%p1%{40}%+%e%p1%{92}%+%;%dm,
+ 	setaf=\E[%?%p1%{8}%<%t%p1%{30}%+%e%p1%{82}%+%;%dm,
+-	setb=%p1%{8}%/%{6}%*%{4}%+\E[%d%p1%{8}%m%Pa%?%ga%{1}%=%t4%e%ga%{3}%=%t6%e%ga%{4}%=%t1%e%ga%{6}%=%t3%e%ga%d%;m,
+-	setf=%p1%{8}%/%{6}%*%{3}%+\E[%d%p1%{8}%m%Pa%?%ga%{1}%=%t4%e%ga%{3}%=%t6%e%ga%{4}%=%t1%e%ga%{6}%=%t3%e%ga%d%;m,
++	setb=%p1%{8}%/%{6}%*%{4}%+\E[%d%p1%{8}%m%Pa%?%ga%{1}%=%t4%e
++	     %ga%{3}%=%t6%e%ga%{4}%=%t1%e%ga%{6}%=%t3%e%ga%d%;m,
++	setf=%p1%{8}%/%{6}%*%{3}%+\E[%d%p1%{8}%m%Pa%?%ga%{1}%=%t4%e
++	     %ga%{3}%=%t6%e%ga%{4}%=%t1%e%ga%{6}%=%t3%e%ga%d%;m,
+ ibm5154|IBM 5154 Color display,
+ 	colors#8, ncv@, pairs#64,
+ 	bold@, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, use=ibm5151,
+@@ -15540,11 +15965,13 @@
+ 	use=ibmega-c,
+ ibm6154|IBM 6154 Color displays,
+ 	blink@, bold=\E[12m, s0ds=\E[10m, s1ds=\E[11m, s2ds=\E[12m,
+-	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;12%;m,
++	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
++	    2%;m,
+ 	sgr0=\E[0;10m, use=ibm5154,
+ ibm6153|IBM 6153 Black & White display,
+ 	blink@, bold=\E[12m, s0ds=\E[10m, s1ds=\E[11m, s2ds=\E[12m,
+-	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;12%;m,
++	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
++	    2%;m,
+ 	sgr0=\E[0;10m, use=ibm5151,
+ ibm6153-90|IBM 6153 Black & White display,
+ 	cols#90, lines#36,
+@@ -15603,7 +16030,8 @@
+ lft|lft-pc850|LFT-PC850|IBM LFT PC850 Device,
+ 	am, bw, msgr, xon,
+ 	cols#80, it#8, lines#25,
+-	acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x\263,
++	acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x
++	     \263,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[J,
+ 	cr=^M, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=^J,
+ 	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
+@@ -15626,7 +16054,8 @@
+ 	kil1=\E[140q, kind=\E[151q, knp=\E[154q, kpp=\E[150q,
+ 	kri=\E[155q, krmir=\E[4l, rev=\E[7m, ri=\EL, rin=\E[%p1%dT,
+ 	rmacs=\E(B, rmir=\E[4l, rmso=\E[0m, rmul=\E[0m, rs2=\Ec,
+-	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;,
++	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
++	    %;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;,
+ 	sgr0=\E[0m, smacs=\E(0, smir=\E[4h, smso=\E[7m, smul=\E[4m,
+ 	tbc=\E[3g,
+ # "Megapel" refers to the display adapter, which was used with the IBM RT
+@@ -15659,18 +16088,21 @@
+ 	eslok, hs,
+ 	acsc=jjkkllmmnnqqttuuvvwwxx, bold=\E[1m, dsl=\E[?E,
+ 	fsl=\E[?F, rc=\E8, ri@, s0ds=\E(B, s1ds=\E(0, sc=\E7,
+-	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;,
++	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
++	    %;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;,
+ 	sgr0=\E[0;10m\E(B, tsl=\E[?%p1%dT, use=ibm6154,
+ aixterm-m|IBM AIXterm Monochrome Terminal Emulator,
+ 	eslok, hs,
+ 	acsc=jjkkllmmnnqqttuuvvwwxx, bold=\E[1m, dsl=\E[?E,
+ 	fsl=\E[?F, ri@, s0ds=\E(B, s1ds=\E(0,
+-	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m,
++	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
++	    %;m,
+ 	sgr0=\E[0;10m\E(B, tsl=\E[?%p1%dT, use=ibm6153,
+ aixterm-m-old|old IBM AIXterm Monochrome Terminal Emulator,
+ 	eslok, hs,
+ 	bold=\E[1m, dsl=\E[?E, fsl=\E[?F, ri@,
+-	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m,
++	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
++	    %;m,
+ 	tsl=\E[?%p1%dT, use=ibm6153,
+ jaixterm|IBM Kanji Aixterm Terminal Eemulator,
+ 	acsc@, use=aixterm,
+@@ -15985,7 +16417,8 @@
+ 	is1=\EC\E.3\EDF\EV1\Eg\E[0ZZ, nel=^_, rev=\E[4ZZ,
+ 	rmir=\Er, rmso=\E[%gh%{4}%^%Ph%gh%dZZ,
+ 	rmul=\E[%gh%{8}%^%Ph%gh%dZZ, rs2=\Eo1,
+-	sgr=\E[%'0'%?%p1%t%'8'%|%;%?%p2%t%'8'%|%;%?%p3%t%'4'%|%;%?%p4%t%'2'%|%;%?%p7%t%'1'%|%;%cZZ,
++	sgr=\E[%'0'%?%p1%t%'8'%|%;%?%p2%t%'8'%|%;%?%p3%t%'4'%|%;%?
++	    %p4%t%'2'%|%;%?%p7%t%'1'%|%;%cZZ,
+ 	sgr0=\E[0ZZ, smir=\Eq, smso=\E[8ZZ, smul=\E[8ZZ, tbc=\E3,
+ icl6404-w|kds7372-w|ICL 6404 aka Kokusai Display Systems 7372 132 cols,
+ 	rs2=\Eo1, use=icl6404,
+@@ -16086,18 +16519,21 @@
+ 	xmc@,
+ 	bel=^G, cnorm=\E.4, cvvis=\E.2, dim=\E), dsl=\Ee, flash@,
+ 	fsl=^M, invis@,
+-	is2=\EC\EN\EX\024\016\EA\Ea\E%\E9\Ee\Er\En\E"\E}\E'\E(\Ef\r\EG0\Ed\E.4\El,
++	is2=\EC\EN\EX\024\016\EA\Ea\E%\E9\Ee\Er\En\E"\E}\E'\E(\Ef\r
++	    \EG0\Ed\E.4\El,
+ 	kcud1=^V, sgr0=\E(\EG0, smir=\EZ, tsl=\Eg\Ef, use=adm+sgr,
+ 	use=abm85,
+ abm85e|Kimtron ABM 85H in 920E mode,
+ 	xmc@,
+ 	bel=^G, dim=\E), flash@,
+-	is2=\EC\EX\EA\E%\E9\Ee\Er\En\E"\E}\E'\E(\Ef\r\Ek\Eq\Em,
++	is2=\EC\EX\EA\E%\E9\Ee\Er\En\E"\E}\E'\E(\Ef\r\Ek\Eq
++	    \Em,
+ 	rev=\Ej, sgr0=\E(\Ek, smir=\EZ, use=abm85,
+ abm85h-old|oabm85h|o85h|Kimtron ABM 85H with old firmware rev.,
+ 	xmc@,
+ 	bel=^G, dim=\E),
+-	is2=\E}\EC\EX\Ee\En\E%\Er\E(\Ek\Em\Eq\Ed\ET\EC\E9\EF,
++	is2=\E}\EC\EX\Ee\En\E%\Er\E(\Ek\Em\Eq\Ed\ET\EC\E9
++	    \EF,
+ 	rev=\Ej, sgr0=\E(\Ek, smir=\EZ, use=abm85,
+ # From: 
+ # (kt7: removed obsolete :ma=^V^J^L :" -- esr)
+@@ -16207,9 +16643,12 @@
+ 	am, bw, msgr,
+ 	cols#80, lines#24,
+ 	bel=^G, clear=\014$<20>, cr=^M, cub1=^H, cud1=^J, cuf1=^F,
+-	cup=\013%p1%{32}%+%c\020%p2%{10}%/%{16}%*%p2%{10}%m%+%Pc%?%{17}%gc%=%{19}%gc%=%|%gc%!%|%t%{1}%gc%+%c%{8}%e%gc%;%c,
++	cup=\013%p1%{32}%+%c\020%p2%{10}%/%{16}%*%p2%{10}%m%+%Pc%?
++	    %{17}%gc%=%{19}%gc%=%|%gc%!%|%t%{1}%gc%+%c%{8}%e%gc
++	    %;%c,
+ 	cuu1=^Z, ed=\EJ, el=\EK, home=^A,
+-	hpa=\020%p1%{10}%/%{16}%*%p1%{10}%m%+%Pc%?%{17}%gc%=%{19}%gc%=%|%gc%!%|%t%{1}%gc%+%c%{8}%e%gc%;%c,
++	hpa=\020%p1%{10}%/%{16}%*%p1%{10}%m%+%Pc%?%{17}%gc%=%{19}%gc
++	    %=%|%gc%!%|%t%{1}%gc%+%c%{8}%e%gc%;%c,
+ 	ind=^J, kbs=^H, khome=^A, vpa=\013%p1%{32}%+%c,
+ 
+ # p4: Prism-4
+@@ -16227,13 +16666,18 @@
+ 	cols#80, lines#24, wsl#72, xmc#1,
+ 	bel=^G, blink=^CB, civis=^]\344, clear=\014$<20>,
+ 	cnorm=^]\342, cr=^M, cub1=^H, cud1=^J, cuf1=^F,
+-	cup=\013%p1%{32}%+%c\020%p2%{10}%/%{16}%*%p2%{10}%m%+%Pc%?%{17}%gc%=%{19}%gc%=%|%gc%!%|%t%{1}%gc%+%c%{8}%e%gc%;%c,
++	cup=\013%p1%{32}%+%c\020%p2%{10}%/%{16}%*%p2%{10}%m%+%Pc%?
++	    %{17}%gc%=%{19}%gc%=%|%gc%!%|%t%{1}%gc%+%c%{8}%e%gc
++	    %;%c,
+ 	cuu1=^Z, dim=^CA, dsl=\035\343\035\345, ed=\EJ, el=\EK,
+ 	fsl=^]\345, home=^A,
+-	hpa=\020%p1%{10}%/%{16}%*%p1%{10}%m%+%Pc%?%{17}%gc%=%{19}%gc%=%|%gc%!%|%t%{1}%gc%+%c%{8}%e%gc%;%c,
++	hpa=\020%p1%{10}%/%{16}%*%p1%{10}%m%+%Pc%?%{17}%gc%=%{19}%gc
++	    %=%|%gc%!%|%t%{1}%gc%+%c%{8}%e%gc%;%c,
+ 	ind=^J, invis=^CH, kbs=^H, khome=^A, mc0=\EU, mc4=\ET, mc5=\ER,
+ 	rev=^CD, rmso=^C\s, rmul=^C\s,
+-	sgr=\003%{64}%?%p1%p3%|%t%{4}%+%;%?%p2%t%{16}%+%;%?%p4%t%{2}%+%;%?%p5%t%{1}%+%;%?%p7%t%{8}%+%;%c%?%p9%t\016%e\017%;,
++	sgr=\003%{64}%?%p1%p3%|%t%{4}%+%;%?%p2%t%{16}%+%;%?%p4%t%{2}
++	    %+%;%?%p5%t%{1}%+%;%?%p7%t%{8}%+%;%c%?%p9%t\016%e
++	    \017%;,
+ 	sgr0=^C\s, smso=^CD, smul=^CP, tsl=^]\343,
+ 	vpa=\013%p1%{32}%+%c,
+ 
+@@ -16321,9 +16765,11 @@
+ 	khome=\E[H, nel=^M^J, prot=\E[32%{, rc=\E[%z,
+ 	rep=\E[%p2%db%p1%c, rev=\E[7m, ri=\E[L, rmir=\E[4l,
+ 	rmso=\E[27m, rmul=\E[24m,
+-	rs2=\E[&p\E[<12l\E F\E[3g\E[9;17;25;33;41;49;57;65;73 N,
++	rs2=\E[&p\E[<12l\E\sF\E[3g\E[9;17;25;33;41;49;57;65;73
++	    \sN,
+ 	sc=\E[%y,
+-	sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p6%t;1%;m%?%p8%t\E[32%%{%;%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p6%t;1%;m%?
++	    %p8%t\E[32%%{%;%?%p9%t\016%e\017%;,
+ 	sgr0=\E[0m\017, smir=\E[4h, smso=\E[7m, smul=\E[4m,
+ 	tbc=\E[3g, tsl=\E[%i%p1%d%%}, vpa=\E[%i%p1%dd,
+ 	use=ansi+pp,
+@@ -16553,7 +16999,8 @@
+ 	dl1=\E[M, ed=\E[J, el=\E[K, flash=\E[?5l$<200/>\E[?5h,
+ 	fsl=\E[?5l\E[?5h, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@,
+ 	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\ED,
+-	is2=\E(B\E[2l\E>\E[20l\E[?3l\E[?5h\E[?7h\E[1;24r\E[24;1H\E[H\E[J,
++	is2=\E(B\E[2l\E>\E[20l\E[?3l\E[?5h\E[?7h\E[1;24r\E[24;1H\E[H
++	    \E[J,
+ 	kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+ 	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, khome=\E[H,
+ 	ll=\E[24;1H, nel=\EE, rc=\E8, rf=/usr/share/tabset/vt100,
+@@ -16641,7 +17088,8 @@
+ 	dch1=\EW$<2>, dim=\EGp, dl1=\El$<2>, dsl=\E`c, ed=\Ek$<2>,
+ 	el=\EK$<2>, fsl=^M, home=\036$<2>, ht=^I, hts=\E1,
+ 	il1=\EM$<2>, ind=\n$<2>, invis=\EG1,
+-	is2=\Ee6\E~%$<100>\E+\E`\:\Ed/\E`1\EO\Ee4\Ec@0@\Ec@1A\EcB0\EcC1\Ee7$<100>,
++	is2=\Ee6\E~%$<100>\E+\E`\:\Ed/\E`1\EO\Ee4\Ec@0@\Ec@1A\EcB0
++	    \EcC1\Ee7$<100>,
+ 	kDC=\El, kEND=\Ek, kHOM=^A, kPRT=\E7, kRIT=^F, ka1=^A, ka3=\EJ,
+ 	kbs=^H, kc1=\ET, kc3=\EJ, kcub1=^U, kcud1=^J, kcuf1=^F,
+ 	kcuu1=^Z, kdch1=\EW, kend=\EK, kf1=^B1\r, kf10=^B\:\r,
+@@ -16656,15 +17104,17 @@
+ 	mrcup=\Ew@%p1%{48}%+%c%p2%{32}%+%c%p3%{32}%+%c$<5>,
+ 	nel=\037$<2>, rev=\EG4, ri=\Ej$<2>, rmacs=\EcB0\EH\003,
+ 	rmir=\Er, rmso=\EG0, rmul=\EG0, rmxon=\Ec20,
+-	rs2=\Ee6\E~%$<100>\E+\E`\:\Ed/\E`1\EO\Ee4\Ec@0@\Ec@1A\EcB0\EcC1\Ee7$<100>,
++	rs2=\Ee6\E~%$<100>\E+\E`\:\Ed/\E`1\EO\Ee4\Ec@0@\Ec@1A\EcB0
++	    \EcC1\Ee7$<100>,
+ 	sgr0=\EG0\EH\003, smacs=\EcB1\EH\002, smir=\Eq,
+ 	smso=\EG4, smul=\EG8, smxon=\Ec21, tsl=\EF,
+ ncr260vpwpp|NCR 2900_260 viewpoint wide mode,
+ 	cols#132,
+ 	cup=\Ea%i%p1%dR%p2%dC$<30>,
+-	is2=\Ee6\E~%$<100>\E+\E`;\Ed/\E`1\EO\Ee4\Ec@0@\Ec@1A\EcB0\EcC1\Ee7$<100>,
+-	rs2=\Ee6\E~%$<100>\E+\E`;\Ed/\E`1\EO\Ee4\Ec@0@\Ec@1A\EcB0\EcC1\Ee7$<100>,
+-	use=ncr260vppp,
++	is2=\Ee6\E~%$<100>\E+\E`;\Ed/\E`1\EO\Ee4\Ec@0@\Ec@1A\EcB0
++	    \EcC1\Ee7$<100>,
++	rs2=\Ee6\E~%$<100>\E+\E`;\Ed/\E`1\EO\Ee4\Ec@0@\Ec@1A\EcB0
++	    \EcC1\Ee7$<100>, use=ncr260vppp,
+ ncr260vt100an|NCR 2900_260 vt100 with ansi kybd,
+ 	am, hs, mir, msgr, xenl, xon,
+ 	cols#80, lines#24, nlab#32,
+@@ -16682,38 +17132,45 @@
+ 	hts=\EH, ich=\E[%p1%d@$<5>, il=\E[%p1%dL$<5>,
+ 	il1=\E[L$<5>, ind=\ED$<5>, indn=\E[%p1%dE$<5>,
+ 	invis=\E[8m,
+-	is2=\E[!p\E[?7;19;67h\E[?1;3;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<200>,
++	is2=\E[!p\E[?7;19;67h\E[?1;3;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<
++	    200>,
+ 	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+ 	kdch1=\E[3~, kfnd=\E[1~, khlp=\E[28~, kich1=\E[2~,
+ 	knp=\E[6~, kpp=\E[5~, krdo=\E[29~, kslt=\E[4~, nel=\EE$<5>,
+ 	rc=\E8, rev=\E[7m, ri=\EM$<5>, rmacs=^O, rmir=\E[4l,
+ 	rmkx=\E[?1l\E>, rmso=\E[0m, rmul=\E[0m,
+-	rs2=\E[!p\E[?7;19;67h\E[?1;3;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<200>,
++	rs2=\E[!p\E[?7;19;67h\E[?1;3;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<
++	    200>,
+ 	sc=\E7,
+-	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\016%e\017%;$<20>,
++	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
++	    %;%?%p7%t;8%;m%?%p9%t\016%e\017%;$<20>,
+ 	sgr0=\E[0m\017$<20>, smacs=^N, smir=\E[4h,
+ 	smkx=\E[?1h\E=, smso=\E[1;7m, smul=\E[4m, tbc=\E[3g,
+ 	tsl=\E[2$~\E[1$}, vpa=\E[%p1%dd$<40>, use=vt220+keypad,
+ ncr260vt100wan|NCR 2900_260 vt100 wide mode ansi kybd,
+ 	cols#132,
+ 	cup=\E[%i%p1%d;%p2%dH$<30>,
+-	is2=\E[!p\E[?3;7;19;67h\E[?1;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<200>,
+-	rs2=\E[!p\E[?3;7;19;67h\E[?1;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<200>,
+-	use=ncr260vt100an,
++	is2=\E[!p\E[?3;7;19;67h\E[?1;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<
++	    200>,
++	rs2=\E[!p\E[?3;7;19;67h\E[?1;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<
++	    200>, use=ncr260vt100an,
+ ncr260vt100pp|NCR 2900_260 vt100 with PC+ kybd,
+-	is2=\E[!p\E[?7;19;67h\E[?1;3;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<200>,
++	is2=\E[!p\E[?7;19;67h\E[?1;3;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<
++	    200>,
+ 	ka1=\E[H, ka3=\EOu, kb2=\E[V, kc3=\E[U, kcub1=\E[D,
+ 	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[4~,
+ 	kend=\E[5~, khome=\E[2~, kich1=\E[1~, knp=\E[6~, kpp=\E[3~,
+ 	lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, rmkx=\E>,
+-	rs2=\E[!p\E[?7;19;67h\E[?1;3;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<200>,
++	rs2=\E[!p\E[?7;19;67h\E[?1;3;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<
++	    200>,
+ 	smkx=\E=, use=ncr260vt100an,
+ ncr260vt100wpp|NCR 2900_260 vt100 wide mode pc+  kybd,
+ 	cols#132,
+ 	cup=\E[%i%p1%d;%p2%dH$<30>,
+-	is2=\E[!p\E[?3;7;19;67h\E[?1;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<200>,
+-	rs2=\E[!p\E[?3;7;19;67h\E[?1;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<200>,
+-	use=ncr260vt100pp,
++	is2=\E[!p\E[?3;7;19;67h\E[?1;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<
++	    200>,
++	rs2=\E[!p\E[?3;7;19;67h\E[?1;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<
++	    200>, use=ncr260vt100pp,
+ ncr260vt200an|NCR 2900_260 vt200 with ansi kybd,
+ 	am, hs, mir, msgr, xenl, xon,
+ 	cols#80, lines#24, nlab#32,
+@@ -16730,7 +17187,8 @@
+ 	fsl=\E[0$}, home=\E[H, hpa=\E[%p1%dG$<40>, ht=^I, hts=\EH,
+ 	ich=\E[%p1%d@$<5>, il=\E[%p1%dL$<5>, il1=\E[L$<5>,
+ 	ind=\ED$<5>, indn=\E[%p1%dE$<5>, invis=\E[8m,
+-	is2=\E[!p\E[?7;19;67h\E[?1;3;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<200>,
++	is2=\E[!p\E[?7;19;67h\E[?1;3;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<
++	    200>,
+ 	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+ 	kdch1=\E[3~, kf0=\EOy, kf10=\E[21~, kf11=\E[23~,
+ 	kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~,
+@@ -16745,9 +17203,11 @@
+ 	mc0=\E[i, mc4=\E[4i, mc5=\E[5i, nel=\EE, rc=\E8, rev=\E[7m,
+ 	ri=\EM$<5>, rmacs=\017$<20>, rmam=\E[?7l, rmir=\E[4l,
+ 	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
+-	rs2=\E[!p\E[?7;19;67h\E[?1;3;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<200>,
++	rs2=\E[!p\E[?7;19;67h\E[?1;3;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<
++	    200>,
+ 	sc=\E7,
+-	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\016%e\017%;$<20>,
++	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
++	    %;%?%p7%t;8%;m%?%p9%t\016%e\017%;$<20>,
+ 	sgr0=\E[0m\017$<20>, smacs=\016$<20>, smam=\E[?7h,
+ 	smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
+ 	tbc=\E[3g, tsl=\E[2$~\E[1$}, vpa=\E[%p1%dd$<40>,
+@@ -16756,8 +17216,7 @@
+ 	cols#132,
+ 	cup=\E[%i%p1%d;%p2%dH$<30>,
+ 	is2=\E[!p\E[?3;7;19;67h\E[?4l\E(B\E)0\017\E[2J\E[1;1H$<200>,
+-	rs2=\E[!p\E[?3;7;19;67h\E[?4l\E(B\E)0\017\E[2J\E[1;1H$<200>,
+-	use=ncr260vt200an,
++	rs2=\E[!p\E[?3;7;19;67h\E[?4l\E(B\E)0\017\E[2J\E[1;1H$<200>, use=ncr260vt200an,
+ ncr260vt200pp|NCR 2900_260 vt200 with pc+ kybd,
+ 	ka1=\E[H, ka3=\EOu, kb2=\E[V, kc3=\E[U, kcub1=\E[D,
+ 	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[4~,
+@@ -16767,9 +17226,10 @@
+ ncr260vt200wpp|NCR 2900_260 vt200 wide mode pc+  kybd,
+ 	cols#132,
+ 	cup=\E[%i%p1%d;%p2%dH$<30>,
+-	is2=\E[!p\E[?3;7;19;67h\E[?1;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<200>,
+-	rs2=\E[!p\E[?3;7;19;67h\E[?1;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<200>,
+-	use=ncr260vt200pp,
++	is2=\E[!p\E[?3;7;19;67h\E[?1;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<
++	    200>,
++	rs2=\E[!p\E[?3;7;19;67h\E[?1;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<
++	    200>, use=ncr260vt200pp,
+ ncr260vt300an|NCR 2900_260 vt300 with ansi kybd,
+ 	am, hs, mir, msgr, xenl, xon,
+ 	cols#80, lines#24, nlab#32,
+@@ -16786,7 +17246,8 @@
+ 	fsl=\E[0$}, home=\E[H, hpa=\E[%p1%dG$<40>, ht=^I, hts=\EH,
+ 	ich=\E[%p1%d@$<5>, il=\E[%p1%dL$<5>, il1=\E[L$<5>,
+ 	ind=\ED$<5>, indn=\E[%p1%dE$<5>, invis=\E[8m,
+-	is2=\E[!p\E[?7;19;67h\E[?1;3;4l\E[1;0%w\E(B\E)0\017\E[2J\E[1;1H\E>$<200>,
++	is2=\E[!p\E[?7;19;67h\E[?1;3;4l\E[1;0%w\E(B\E)0\017\E[2J\E[1
++	    ;1H\E>$<200>,
+ 	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+ 	kdch1=\E[3~, kf0=\EOy, kf10=\E[21~, kf11=\E[23~,
+ 	kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~,
+@@ -16801,9 +17262,11 @@
+ 	nel=\EE, rc=\E8, rev=\E[7m, ri=\EM$<5>, rmacs=\017$<20>,
+ 	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m,
+ 	rmul=\E[24m,
+-	rs2=\E[!p\E[?7;19;67h\E[?1;3;4l\E[1;0%w\E(B\E)0\017\E[2J\E[1;1H\E>$<200>,
++	rs2=\E[!p\E[?7;19;67h\E[?1;3;4l\E[1;0%w\E(B\E)0\017\E[2J\E[1
++	    ;1H\E>$<200>,
+ 	sc=\E7,
+-	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\016%e\017%;$<20>,
++	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
++	    %;%?%p7%t;8%;m%?%p9%t\016%e\017%;$<20>,
+ 	sgr0=\E[0m\017$<20>, smacs=\016$<20>, smam=\E[?7h,
+ 	smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
+ 	tbc=\E[3g, tsl=\E[2$~\E[1$}, vpa=\E[%p1%dd$<40>,
+@@ -16811,9 +17274,10 @@
+ ncr260vt300wan|NCR 2900_260 vt300 wide mode ansi kybd,
+ 	cols#132,
+ 	cup=\E[%i%p1%d;%p2%dH$<30>,
+-	is2=\E[!p\E[?3;7;19;67h\E[?4l\E[1;0%w\E(B\E)0\017\E[2J\E[1;1H$<200>,
+-	rs2=\E[!p\E[?3;7;19;67h\E[?4l\E[1;0%w\E(B\E)0\017\E[2J\E[1;1H$<200>,
+-	use=ncr260vt300an,
++	is2=\E[!p\E[?3;7;19;67h\E[?4l\E[1;0%w\E(B\E)0\017\E[2J\E[1;1
++	    H$<200>,
++	rs2=\E[!p\E[?3;7;19;67h\E[?4l\E[1;0%w\E(B\E)0\017\E[2J\E[1;1
++	    H$<200>, use=ncr260vt300an,
+ ncr260vt300pp|NCR 2900_260 vt300 with pc+ kybd,
+ 	ka1=\E[H, ka3=\EOu, kb2=\E[V, kc3=\E[U, kcub1=\E[D,
+ 	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[4~,
+@@ -16823,9 +17287,10 @@
+ NCR260VT300WPP|ncr260vt300wpp|NCR 2900_260 vt300 wide mode pc+  kybd,
+ 	cols#132,
+ 	cup=\E[%i%p1%d;%p2%dH$<30>,
+-	is2=\E[!p\E[?3;7;19;67h\E[?1;4l\E[1;0%w\E(B\E)0\017\E[2J\E[1;1H\E>$<200>,
+-	rs2=\E[!p\E[?3;7;19;67h\E[?1;4l\E[1;0%w\E(B\E)0\017\E[2J\E[1;1H\E>$<200>,
+-	use=ncr260vt300pp,
++	is2=\E[!p\E[?3;7;19;67h\E[?1;4l\E[1;0%w\E(B\E)0\017\E[2J\E[1
++	    ;1H\E>$<200>,
++	rs2=\E[!p\E[?3;7;19;67h\E[?1;4l\E[1;0%w\E(B\E)0\017\E[2J\E[1
++	    ;1H\E>$<200>, use=ncr260vt300pp,
+ # This terminfo file contains color capabilities for the Wyse325 emulation of
+ # the NCR 2900/260C color terminal.  Because of the structure of the command
+ # (escape sequence) used to set color attributes, one of the fore/background
+@@ -16850,7 +17315,8 @@
+ 	cvvis=\E`5, dch1=\EW$<50>, dl1=\ER$<5>, dsl=\E`c,
+ 	ed=\Ey$<5>, el=\Et$<5>, fsl=^M, home=\036$<5>, ht=^I,
+ 	hts=\E1, il1=\EE$<5>, ind=\n$<5>, invis=\EG1,
+-	is2=\Ee6\Ed/\Ee1\Ed*\Er\EO\E`1\E`\:\E`@\E~!\E"\Ee4\Ex@\E`9\Ee7$<100>,
++	is2=\Ee6\Ed/\Ee1\Ed*\Er\EO\E`1\E`\:\E`@\E~!\E"\Ee4\Ex@\E`9
++	    \Ee7$<100>,
+ 	kDC=\ER, kEND=\EY, kHOM=\E{, kNXT=\EK, kPRT=\E7, kPRV=\EJ,
+ 	kRIT=^L, ka1=^^, kb2=\EJ, kbs=^H, kc1=\ET, kc3=\EK, kcbt=\EI,
+ 	kcub1=^H, kcud1=^J, kcuf1=^L, kcuu1=^K, kdch1=\EW, kend=\ET,
+@@ -16865,18 +17331,25 @@
+ 	mrcup=\Ew@%p1%{48}%+%c%p2%{32}%+%c%p3%{32}%+%c$<10>,
+ 	nel=\037$<5>, rev=\EG4, ri=\Ej$<5>, rmacs=\EH\003\EcB0,
+ 	rmam=\Ed., rmir=\Er, rmso=\EG0, rmul=\EG0, rmxon=\Ec20,
+-	rs2=\Ee6\Ed/\Ee1\Ed*\Er\EO\E`1\E`\:\E`@\E~!\E"\Ee4\Ex@\E`9\Ee7$<100>,
++	rs2=\Ee6\Ed/\Ee1\Ed*\Er\EO\E`1\E`\:\E`@\E~!\E"\Ee4\Ex@\E`9
++	    \Ee7$<100>,
+ 	setb=\s,
+-	setf=%?%p1%{0}%=%t%{49}%e%p1%{1}%=%t%{50}%e%p1%{2}%=%t%{51}%e%p1%{3}%=%t%{52}%e%p1%{4}%=%t%{53}%e%p1%{5}%=%t%{54}%e%p1%{6}%=%t%{55}%e%p1%{7}%=%t%{64}%e%p1%{8}%=%t%{57}%e%p1%{9}%=%t%{58}%e%p1%{10}%=%t%{59}%e%p1%{11}%=%t%{60}%e%p1%{12}%=%t%{61}%e%p1%{13}%=%t%{62}%e%p1%{14}%=%t%{63}%e%p1%{15}%=%t%{56}%;\Edy%c11$<100>,
++	setf=%?%p1%{0}%=%t%{49}%e%p1%{1}%=%t%{50}%e%p1%{2}%=%t%{51}
++	     %e%p1%{3}%=%t%{52}%e%p1%{4}%=%t%{53}%e%p1%{5}%=%t%{54}
++	     %e%p1%{6}%=%t%{55}%e%p1%{7}%=%t%{64}%e%p1%{8}%=%t%{57}
++	     %e%p1%{9}%=%t%{58}%e%p1%{10}%=%t%{59}%e%p1%{11}%=%t
++	     %{60}%e%p1%{12}%=%t%{61}%e%p1%{13}%=%t%{62}%e%p1%{14}%=
++	     %t%{63}%e%p1%{15}%=%t%{56}%;\Edy%c11$<100>,
+ 	sgr0=\EG0\EcB0\EcD$<15>, smacs=\EH\002\EcB1, smam=\Ed/,
+ 	smir=\Eq, smso=\EGt, smul=\EG8, smxon=\Ec21, tbc=\E0,
+ 	tsl=\EF,
+ ncr260wy325wpp|NCR 2900_260 wyse 325 wide mode,
+ 	cols#132,
+ 	cup=\Ea%i%p1%dR%p2%dC$<30>,
+-	is2=\Ee6\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~!\E"\Ee4\Ex@\E`9\Ee7$<100>,
+-	rs2=\Ee6\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~!\E"\Ee4\Ex@\E`9\Ee7$<100>,
+-	use=ncr260wy325pp,
++	is2=\Ee6\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~!\E"\Ee4\Ex@\E`9
++	    \Ee7$<100>,
++	rs2=\Ee6\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~!\E"\Ee4\Ex@\E`9
++	    \Ee7$<100>, use=ncr260wy325pp,
+ # This definition for Wyse 350 supports several attributes.  This means
+ # that it has magic cookies (extra spaces where the attributes begin).
+ # Some applications do not function well with magic cookies.  The System
+@@ -16903,7 +17376,8 @@
+ 	cvvis=\E`5, dch1=\EW$<50>, dim=\EGp, dl1=\ER$<5>, dsl=\E`c,
+ 	ed=\Ey$<5>, el=\Et$<5>, fsl=^M, home=\036$<10>, ht=^I,
+ 	hts=\E1, il1=\EE$<5>, ind=\n$<5>, invis=\EG1,
+-	is2=\Ee6\Ed/\Ee1\Ed*\Er\EO\E`1\E`\:\E`@\E~!\E"\Ee4\Ex@\E`9\Ee7$<100>,
++	is2=\Ee6\Ed/\Ee1\Ed*\Er\EO\E`1\E`\:\E`@\E~!\E"\Ee4\Ex@\E`9
++	    \Ee7$<100>,
+ 	kDC=\ER, kEND=\EY, kHOM=\E{, kPRT=\E7, kRIT=^L, ka1=^^, kbs=^H,
+ 	kc1=\ET, kc3=\EK, kcbt=\EI, kcub1=^H, kcud1=^J, kcuf1=^L,
+ 	kcuu1=^K, kdch1=\EW, kend=\ET, kf1=^A@\r, kf10=^AI\r,
+@@ -16918,18 +17392,25 @@
+ 	mrcup=\Ew@%p1%{48}%+%c%p2%{32}%+%c%p3%{32}%+%c$<20>,
+ 	nel=\037$<5>, rev=\EG4, ri=\Ej$<5>, rmacs=\EH\003\EcB0,
+ 	rmam=\Ed., rmir=\Er, rmso=\EG0, rmul=\EG0, rmxon=\Ec20,
+-	rs2=\Ee6\Ed/\Ee1\Ed*\Er\EO\E`1\E`\:\E`@\E~!\E"\Ee4\Ex@\E`9\Ee7$<100>,
++	rs2=\Ee6\Ed/\Ee1\Ed*\Er\EO\E`1\E`\:\E`@\E~!\E"\Ee4\Ex@\E`9
++	    \Ee7$<100>,
+ 	setb=\s,
+-	setf=%?%p1%{0}%=%t%{49}%e%p1%{1}%=%t%{50}%e%p1%{2}%=%t%{51}%e%p1%{3}%=%t%{52}%e%p1%{4}%=%t%{53}%e%p1%{5}%=%t%{54}%e%p1%{6}%=%t%{55}%e%p1%{7}%=%t%{102}%e%p1%{8}%=%t%{97}%e%p1%{9}%=%t%{98}%e%p1%{10}%=%t%{99}%e%p1%{11}%=%t%{101}%e%p1%{12}%=%t%{106}%e%p1%{13}%=%t%{110}%e%p1%{14}%=%t%{111}%e%p1%{15}%=%t%{56}%;\Em0%c$<100>,
++	setf=%?%p1%{0}%=%t%{49}%e%p1%{1}%=%t%{50}%e%p1%{2}%=%t%{51}
++	     %e%p1%{3}%=%t%{52}%e%p1%{4}%=%t%{53}%e%p1%{5}%=%t%{54}
++	     %e%p1%{6}%=%t%{55}%e%p1%{7}%=%t%{102}%e%p1%{8}%=%t%{97}
++	     %e%p1%{9}%=%t%{98}%e%p1%{10}%=%t%{99}%e%p1%{11}%=%t
++	     %{101}%e%p1%{12}%=%t%{106}%e%p1%{13}%=%t%{110}%e%p1
++	     %{14}%=%t%{111}%e%p1%{15}%=%t%{56}%;\Em0%c$<100>,
+ 	sgr0=\EG0\EH\003\EcD, smacs=\EH\002\EcB1, smam=\Ed/,
+ 	smir=\Eq, smso=\EGt, smul=\EG8, smxon=\Ec21, tbc=\E0,
+ 	tsl=\EF,
+ ncr260wy350wpp|NCR 2900_260 wyse 350 wide mode,
+ 	cols#132,
+ 	cup=\Ea%i%p1%dR%p2%dC$<30>,
+-	is2=\Ee6\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~!\E"\Ee4\Ex@\E`9\Ee7$<200>,
+-	rs2=\Ee6\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~!\E"\Ee4\Ex@\E`9\Ee7$<200>,
+-	use=ncr260wy350pp,
++	is2=\Ee6\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~!\E"\Ee4\Ex@\E`9
++	    \Ee7$<200>,
++	rs2=\Ee6\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~!\E"\Ee4\Ex@\E`9
++	    \Ee7$<200>, use=ncr260wy350pp,
+ # This definition for Wyse 50+ supports several attributes.  This means
+ # that it has magic cookies (extra spaces where the attributes begin).
+ # Some applications do not function well with magic cookies.  The System
+@@ -16951,7 +17432,8 @@
+ 	ed=\EY$<5>, el=\ET$<5>, fsl=^M, home=\036$<10>,
+ 	ht=\011$<5>, hts=\E1$<5>, il1=\EE$<5>, ind=\n$<5>,
+ 	invis=\EG1,
+-	is2=\Ee6\E~"$<100>\E+\Ed/\Ee1\Ed*\Er\EO\E`1\E`\:\E`@\E~!\E"\Ee4\Ex@\E`9\Ee7$<100>,
++	is2=\Ee6\E~"$<100>\E+\Ed/\Ee1\Ed*\Er\EO\E`1\E`\:\E`@\E~!\E"
++	    \Ee4\Ex@\E`9\Ee7$<100>,
+ 	kDC=\ER, kEND=\EY, kHOM=\E{, kPRT=\E7, kRIT=^L, ka1=^^, kbs=^H,
+ 	kc1=\ET, kc3=\EK, kcbt=\EI, kcub1=^H, kcud1=^J, kcuf1=^L,
+ 	kcuu1=^K, kdch1=\EW, kend=\ET, kf1=^A@\r, kf10=^AI\r,
+@@ -16966,15 +17448,17 @@
+ 	mrcup=\Ew@%p1%{48}%+%c%p2%{32}%+%c%p3%{32}%+%c$<10>,
+ 	nel=\037$<5>, rev=\EG4, ri=\Ej$<5>, rmacs=\EH^C, rmam=\Ed.,
+ 	rmir=\Er, rmso=\EG0, rmul=\EG0, rmxon=\Ec20,
+-	rs2=\Ee6\E~"$<100>\E+\Ed/\Ee1\Ed*\Er\EO\E`1\E`\:\E`@\E~!\E"\Ee4\Ex@\E`9\Ee7$<100>,
++	rs2=\Ee6\E~"$<100>\E+\Ed/\Ee1\Ed*\Er\EO\E`1\E`\:\E`@\E~!\E"
++	    \Ee4\Ex@\E`9\Ee7$<100>,
+ 	sgr0=\EG0\EH\003$<15>, smacs=\EH^B, smam=\Ed/, smir=\Eq,
+ 	smso=\EGt, smul=\EG8, smxon=\Ec21, tbc=\E0$<5>, tsl=\EF,
+ ncr260wy50+wpp|NCR 2900_260 wyse 50+ wide mode,
+ 	cols#132,
+ 	cup=\Ea%i%p1%dR%p2%dC$<30>,
+-	is2=\Ee6\E~"$<100>\E+\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~!\E"\Ee4\Ex@\E`9\Ee7$<200>,
+-	rs2=\Ee6\E~"$<100>\E+\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~!\E"\Ee4\Ex@\E`9\Ee7$<200>,
+-	use=ncr260wy50+pp,
++	is2=\Ee6\E~"$<100>\E+\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~!\E"
++	    \Ee4\Ex@\E`9\Ee7$<200>,
++	rs2=\Ee6\E~"$<100>\E+\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~!\E"
++	    \Ee4\Ex@\E`9\Ee7$<200>, use=ncr260wy50+pp,
+ ncr260wy60pp|NCR 2900_260 wyse 60,
+ 	am, bw, hs, km, mc5i, mir, msgr, xon,
+ 	cols#80, lines#24, nlab#32,
+@@ -16986,7 +17470,8 @@
+ 	ed=\Ey$<5>, el=\Et$<5>, fsl=^M, home=\036$<25>,
+ 	ht=\011$<15>, hts=\E1$<15>, il1=\EE$<5>, ind=\n$<5>,
+ 	invis=\EG1,
+-	is2=\Ee6\E~4$<100>\E+\Ed/\Ee1\Ed*\Er\EO\E`1\E`\:\E`@\E~!\E"\Ee4\Ex@\E`9\Ee7$<100>,
++	is2=\Ee6\E~4$<100>\E+\Ed/\Ee1\Ed*\Er\EO\E`1\E`\:\E`@\E~!\E"
++	    \Ee4\Ex@\E`9\Ee7$<100>,
+ 	kDC=\ER, kEND=\EY, kHOM=\E{, kNXT=\EK, kPRT=\E7, kPRV=\EJ,
+ 	kRIT=^L, ka1=^^, kb2=\EJ, kbs=^H, kc1=\ET, kc3=\EK,
+ 	kcbt=\EI$<15>, kcub1=^H, kcud1=^J, kcuf1=^L, kcuu1=^K,
+@@ -17001,16 +17486,18 @@
+ 	mrcup=\Ew@%p1%{48}%+%c%p2%{32}%+%c%p3%{32}%+%c$<30>,
+ 	nel=\037$<5>, rev=\EG4, ri=\Ej$<5>, rmacs=\EH^C, rmam=\Ed.,
+ 	rmir=\Er, rmso=\EG0, rmul=\EG0, rmxon=\Ec20,
+-	rs2=\Ee6\E~4$<100>\E+\Ed/\Ee1\Ed*\Er\EO\E`1\E`\:\E`@\E~!\E"\Ee4\Ex@\E`9\Ee7$<100>,
++	rs2=\Ee6\E~4$<100>\E+\Ed/\Ee1\Ed*\Er\EO\E`1\E`\:\E`@\E~!\E"
++	    \Ee4\Ex@\E`9\Ee7$<100>,
+ 	sgr0=\EG0\EcB0\EcD$<15>, smacs=\EH^B, smam=\Ed/,
+ 	smir=\Eq, smso=\EGt, smul=\EG8, smxon=\Ec21, tbc=\E0$<15>,
+ 	tsl=\EF,
+ ncr260wy60wpp|NCR 2900_260 wyse 60 wide mode,
+ 	cols#132,
+ 	cup=\Ea%i%p1%dR%p2%dC$<30>,
+-	is2=\Ee6\E~4$<100>\E+\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~!\E"\Ee4\Ex@\E`9\Ee7$<100>,
+-	rs2=\Ee6\E~4$<100>\E+\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~!\E"\Ee4\Ex@\E`9\Ee7$<100>,
+-	use=ncr260wy60pp,
++	is2=\Ee6\E~4$<100>\E+\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~!\E"
++	    \Ee4\Ex@\E`9\Ee7$<100>,
++	rs2=\Ee6\E~4$<100>\E+\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~!\E"
++	    \Ee4\Ex@\E`9\Ee7$<100>, use=ncr260wy60pp,
+ ncr160vppp|NCR 2900_160 viewpoint,
+ 	use=ncr260vppp,
+ ncr160vpwpp|NCR 2900_160 viewpoint wide mode,
+@@ -17069,17 +17556,19 @@
+ 	kf2=\EOQ, kf3=\EOR, kf4=\EOS, mc0=\E[i$<100>, nel=\EE,
+ 	rc=\E8, rev=\E[7m$<30>, ri=\EM$<50>, rmacs=\017$<90>,
+ 	rmir=\E[4l$<80>, rmso=\E[0m$<30>, rmul=\E[0m$<30>,
+-	rs2=\Ec\E[12;31h\E[?3;4;5;10l\E[?6;7;19;25h\E[33;34l\E[0m\E(B\E)0\E%/0n\E[P\031$<200>,
++	rs2=\Ec\E[12;31h\E[?3;4;5;10l\E[?6;7;19;25h\E[33;34l\E[0m\E(
++	    B\E)0\E%/0n\E[P\031$<200>,
+ 	sc=\E7,
+-	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;$<100>,
++	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
++	    %;m%?%p9%t\016%e\017%;$<100>,
+ 	sgr0=\017\E[0m$<120>, smacs=\016$<90>, smir=\E[4h$<80>,
+ 	smso=\E[7m$<30>, smul=\E[4m$<30>, tbc=\E[3g$<40>,
+ 	tsl=\E[>+1$<70>,
+ ncrvt100wan|NCRVT100WPP|ncrvt100wpp|NCR VT100 emulation of the 2900 terminal,
+ 	cols#132,
+ 	is2=\E[12h\E[?10l\E%/0n\E[P\031\E[?3h\E(B\E)0$<200>,
+-	rs2=\Ec\E[12;31h\E[?4;5;10l\E?3;6;7;19;25h\E[33;34l\E[0m\E(B\E)0\E%/0n\E[P\031$<200>,
+-	use=ncrvt100an,
++	rs2=\Ec\E[12;31h\E[?4;5;10l\E?3;6;7;19;25h\E[33;34l\E[0m\E(B
++	    \E)0\E%/0n\E[P\031$<200>, use=ncrvt100an,
+ #
+ # Vendor-supplied NCR termcaps end here
+ 
+@@ -17144,7 +17633,8 @@
+ 	is2=\E0@\010\E3\E4\E7, kcub1=^U, kcud1=^J, kcuf1=^F,
+ 	kcuu1=^Z, khome=^A, ll=^A, mc4=^T, mc5=^R, rev=\E0P, rmso=\E0@,
+ 	rmul=\E0@,
+-	sgr=\E0%p5%{64}%+%p4%{2}%*%+%p3%{16}%*%+%p2%{32}%*%+%p1%{17}%*%+%c,
++	sgr=\E0%p5%{64}%+%p4%{2}%*%+%p3%{16}%*%+%p2%{32}%*%+%p1%{17}
++	    %*%+%c,
+ 	sgr0=\E0@, smso=\E0Q, smul=\E0`,
+ ncr7900iv|ncr 7900 model 4,
+ 	am, bw, eslok, hs,
+@@ -17170,7 +17660,8 @@
+ 	hpa=\020%p1%{10}%/%{16}%*%p1%{10}%m%+%c, ind=^J,
+ 	is2=\E4^O, kclr=^L, kcub1=^U, kcud1=^J, kcuf1=^F, kcuu1=^Z,
+ 	khome=^H, ll=^A, mc4=^T, mc5=^R, rev=\E0P, rmso=^O, rmul=^O,
+-	sgr=\E0%p5%{64}%+%p4%{2}%*%+%p3%{16}%*%+%p2%{32}%*%+%p1%{17}%*%+%c\016,
++	sgr=\E0%p5%{64}%+%p4%{2}%*%+%p3%{16}%*%+%p2%{32}%*%+%p1%{17}
++	    %*%+%c\016,
+ 	sgr0=^O, smso=\E0Q\016, smul=\E0`\016,
+ 	vpa=\013%p1%{64}%+%c,
+ 
+@@ -17236,7 +17727,9 @@
+ 	msgr@,
+ 	xmc#1,
+ 	blink=\EG2, invis=\EG1, rev=\EG4, rmso=\EG0, rmul=\EG0,
+-	sgr=\E%%\E(%?%p5%p8%|%t\E)%;%?%p9%t\E$%;\EG%{48}%?%p7%t%{1}%+%;%?%p4%t%{2}%+%;%?%p3%p1%|%t%{4}%+%;%?%p2%t%{8}%+%;%c,
++	sgr=\E%%\E(%?%p5%p8%|%t\E)%;%?%p9%t\E$%;\EG%{48}%?%p7%t%{1}
++	    %+%;%?%p4%t%{2}%+%;%?%p3%p1%|%t%{4}%+%;%?%p2%t%{8}%+
++	    %;%c,
+ 	sgr0=\EG0\E%%\E(, smso=\EG4, smul=\EG8, use=ndr9500,
+ 
+ ndr9500-25-mc|NDR 500 with 25 lines and magic cookies,
+@@ -17482,12 +17975,15 @@
+ 	il=\037up\r\037ili %p1%d\r, il1=\037up\r\037ili\r,
+ 	ind=^F^J,
+ 	is2=!com 31\r\n\037sto 9 17 25 33 41 49 57 65 73\r,
+-	rmkx=\037lea p2\r\037lea p4\r\037lea p6\r\037lea p8\r\037lea f5\r,
+-	smkx=\037lea p4 /h/\r\037lea p8 /k/\r\037lea p6 / /\r\037lea p2 /j/\r\037lea f5 /H/\r,
++	rmkx=\037lea\sp2\r\037lea\sp4\r\037lea\sp6\r\037lea\sp8\r
++	     \037lea\sf5\r,
++	smkx=\037lea\sp4\s/h/\r\037lea\sp8\s/k/\r\037lea\sp6\s/\s/
++	     \r\037lea\sp2\s/j/\r\037lea\sf5\s/H/\r,
+ tek4025-17|tek 4025 17 line window,
+ 	lines#17, use=tek4025,
+ tek4025-17-ws|tek 4025 17 line window in workspace,
+-	is2=!com 31\r\n\037sto 9 17 25 33 41 49 57 65 73\r\037wor 17\r\037mon 17\r,
++	is2=!com\s31\r\n\037sto\s9\s17\s25\s33\s41\s49\s57\s65\s73
++	    \r\037wor\s17\r\037mon\s17\r,
+ 	rmcup=\037mon h\r, rmso=\037att s\r, smcup=\037wor h\r,
+ 	smso=\037att e\r, use=tek4025-17,
+ tek4025-ex|tek4027-ex|tek 4025/4027 w/!,
+@@ -17523,7 +18019,10 @@
+ 	dch1=\035dch;, dl=\035dli %p1%d;, dl1=\035dli;,
+ 	el=\035dch 80;, hpa=\r\035rig %p1%d;, ht=^I,
+ 	il1=\013\035ili;, ind=^J, indn=\035dow %p1%d;,
+-	rs2=!com 29\035del 0\035rss t\035buf\035buf n\035cle\035dis\035dup\035ech r\035eol\035era g\035for n\035pad 203\035pad 209\035sno n\035sto 9 17 25 33 41 49 57 65 73\035wor 0;,
++	rs2=!com\s29\035del\s0\035rss\st\035buf\035buf\sn\035cle
++	    \035dis\035dup\035ech\sr\035eol\035era\sg\035for\sn
++	    \035pad\s203\035pad\s209\035sno\sn\035sto\s9\s17\s25
++	    \s33\s41\s49\s57\s65\s73\035wor\s0;,
+ 	tbc=\035sto;,
+ # From: cbosg!teklabs!davem Wed Sep 16 21:11:41 1981
+ # Here's the command file that I use to get rogue to work on the 4025.
+@@ -17542,7 +18041,8 @@
+ #	:ti=\037lea p1/b/\037lea p2/j/\037lea p3/n/\037lea p4/h/\037lea p5/ /\037lea p6/l/\037lea p7/y/\037lea p8/k/\037lea p9/u/\037lea p./f/\037lea pt/`era w/13\037lea p0/s/\037wor 33h:\
+ #	:te=\037lea p1\037lea p2\037lea p3\037lea p4\037lea pt\037lea p5\037lea p6\037lea p7\037lea p8\037lea p9/la/13\037lea p.\037lea p0\037wor 0:
+ tek4025ex|4025ex|4027ex|tek 4025 w/!,
+-	is2=\037com 33\r\n!sto 9\,17\,25\,33\,41\,49\,57\,65\,73\r,
++	is2=\037com\s33\r\n!sto\s9\,17\,25\,33\,41\,49\,57\,65\,73
++	    \r,
+ 	rmcup=\037com 33\r, smcup=!com 31\r, use=tek4025,
+ tek4105|tektronix 4105,
+ 	OTbs, am, mir, msgr, ul, xenl, xt,
+@@ -17575,7 +18075,8 @@
+ 	rev=\E[7m$<2>, ri=\EM$<5>, rmacs=^O, rmam=\E[?7l,
+ 	rmkx=\E[?1l\E>, rmso=\E[m$<2>, rmul=\E[m$<2>,
+ 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7,
+-	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;$<2>,
++	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
++	    %;m%?%p9%t\016%e\017%;$<2>,
+ 	sgr0=\E[m\017$<2>, smacs=^N, smam=\E[?7h, smkx=\E[?1h\E=,
+ 	smso=\E[1;7m$<2>, smul=\E[4m$<2>, tbc=\E[3g,
+ 	use=vt100+fnkeys,
+@@ -17619,7 +18120,9 @@
+ 	lf5=F6, lf6=F8, ll=\E[30;H, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM,
+ 	rin=\E[%p1%dT, rmacs=^O, rmcup=\E%!0\ELBH=\E%!1,
+ 	rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
+-	rs2=\030\E%!0\EKC\E\014\EKR0\EKF0\ENM0\ELBH=\ETF8000010F40\ELI100\ELLA>\ELM0\EKE0\ENF1\EKS0\END0\E%!1\Ec\E[?3;5l\E[?7;8h\E[r\E[m\E>,
++	rs2=\030\E%!0\EKC\E\014\EKR0\EKF0\ENM0\ELBH=\ETF8000010F40
++	    \ELI100\ELLA>\ELM0\EKE0\ENF1\EKS0\END0\E%!1\Ec\E[?3;5l
++	    \E[?7;8h\E[r\E[m\E>,
+ 	sc=\E7, sgr0=\E[m, smacs=^N, smcup=\E[?6l, smir=\E[4h,
+ 	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+ 
+@@ -17663,7 +18166,9 @@
+ 	lf5=F6, lf6=F8, ll=\E[32;H, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM,
+ 	rin=\E[%p1%dT, rmacs=^O, rmcup=\E%!0\ELBH=\E%!1,
+ 	rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
+-	rs1=\030\E%!0\EKC\E\014\EKR0\EKF0\ENM0\ELBH=\ETF8000010F40\ELI100\ELLB0\ELM0\EKE0\ENF1\EKS0\END0\ERE0\E%!1\Ec\E[?3;5l\E[?7;8h\E[r\E[m\E>,
++	rs1=\030\E%!0\EKC\E\014\EKR0\EKF0\ENM0\ELBH=\ETF8000010F40
++	    \ELI100\ELLB0\ELM0\EKE0\ENF1\EKS0\END0\ERE0\E%!1\Ec\E[?3
++	    ;5l\E[?7;8h\E[r\E[m\E>,
+ 	sc=\E7, sgr0=\E[m, smacs=^N, smcup=\E[?6l, smir=\E[4h,
+ 	smkx=\E[?1h\E=, smso=\E[7;42m, smul=\E[4m, tbc=\E[3g,
+ 
+@@ -17687,7 +18192,8 @@
+ 	kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA,
+ 	rev=\E%!1\E[7m$<2>\E%!0, ri=\EI,
+ 	rmso=\E%!1\E[m$<2>\E%!0, rmul=\E%!1\E[m$<2>\E%!0,
+-	sgr=\E%%!1\E[%?%p1%t;7;5%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t<0%;%?%p6%t;1%;m$<2>\E%%!0,
++	sgr=\E%%!1\E[%?%p1%t;7;5%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;
++	    %?%p5%t<0%;%?%p6%t;1%;m$<2>\E%%!0,
+ 	sgr0=\E%!1\E[m$<2>\E%!0, smso=\E%!1\E[7;5m$<2>\E%!0,
+ 	smul=\E%!1\E[4m$<2>\E%!0,
+ # Tektronix 4207 with sysline.  In the ancestral termcap file this was 4107-s;
+@@ -17695,7 +18201,8 @@
+ tek4207-s|Tektronix 4207 with sysline but no memory,
+ 	eslok, hs,
+ 	dsl=\E7\E[?6l\E[2K\E[?6h\E8, fsl=\E[?6h\E8,
+-	is1=\E%!1\E[2;32r\E[132D\E[2g\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[J,
++	is1=\E%!1\E[2;32r\E[132D\E[2g\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8
++	    C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[J,
+ 	is2=\E7\E[?6l\E[2K\E[?6h\E8,
+ 	tsl=\E7\E[?6l\E[2K\E[;%i%df, use=tek4107,
+ 
+@@ -17741,7 +18248,8 @@
+ 	OTbs, am, da, eo,
+ 	cols#80, lines#5,
+ 	clear=\ELZ, cub1=^H, cud1=^J, cuf1=\ELM1 \ELM0,
+-	flash=\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERB0,
++	flash=\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4
++	      \ERBA4\ERBA4\ERB0,
+ 	is2=\EKA1\ELL5\ELV0\ELV1, uc=\010\ELM1_\ELM0,
+ tek4113-34|tektronix 4113 color graphics with 34 line dialog area,
+ 	lines#34,
+@@ -17754,7 +18262,8 @@
+ 	cols#80, it#8, lines#34,
+ 	clear=\E^L, cub1=^H, cud1=^J, cuf1=^I, cuu1=^K,
+ 	cvvis=\ELZ\EKA0,
+-	flash=\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERB0,
++	flash=\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4
++	      \ERBA4\ERBA4\ERB0,
+ 	home=\ELF7l\177 @, ht=^I, is2=\ELZ\EKA0\ELF7l\177 @,
+ 	ll=\ELF hl @, rmso=\EMT1, smso=\EMT2, uc=\010\EMG1_\EMG0,
+ # This entry is from Tek. Inc.  (Brian Biehl)
+@@ -17768,7 +18277,8 @@
+ 	cvvis=\E%!0\ELBB2\E%!1, dch1=\E[P, dl1=\E[M, ed=\E[J,
+ 	el=\E[K, home=\E[H, ht=^I, if=/usr/share/tabset/vt100,
+ 	il1=\E[L,
+-	is2=\E%!0\E%\014\ELV0\EKA1\ELBB2\ENU@=\ELLB2\ELM0\ELV1\EKYA?\E%!1\E[<1l\E[?7h\E[?8h\E[34;1H\E[34B\E[m,
++	is2=\E%!0\E%\014\ELV0\EKA1\ELBB2\ENU@=\ELLB2\ELM0\ELV1\EKYA?
++	    \E%!1\E[<1l\E[?7h\E[?8h\E[34;1H\E[34B\E[m,
+ 	kbs=^H, ri=\EM, rmam=\E[?7l,
+ 	rmcup=\E%!0\ELBG8\E%!1\E[34;1H\E[J, rmir=\E[4l,
+ 	rmkx=\E>, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smam=\E[?7h,
+@@ -17787,7 +18297,8 @@
+ 	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, khome=\E[H,
+ 	rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, rmam=\E[?7l,
+ 	rmso=\E[m, rmul=\E[m,
+-	sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;%?%p7%t8;%;m,
++	sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;
++	    %;%?%p7%t8;%;m,
+ 	sgr0=\E[m, smam=\E[?7h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+ 	vpa=\E[%p1%{1}%+%dd,
+ # The tek4125 emulates a vt100 incorrectly - the scrolling region
+@@ -17801,7 +18312,9 @@
+ tek4125|tektronix 4125,
+ 	lines#34,
+ 	csr@, dl1=\E[1M, il1=\E[1L,
+-	is2=\E%\E!0\EQD1\EUX03\EKA\ELBB2\ELCE0\ELI100\ELJ2\ELLB2\ELM0\ELS1\ELX00\ELV1\E%\E!1\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
++	is2=\E%\E!0\EQD1\EUX03\EKA\ELBB2\ELCE0\ELI100\ELJ2\ELLB2
++	    \ELM0\ELS1\ELX00\ELV1\E%\E!1\E>\E[?3l\E[?4l\E[?5l\E[?7h
++	    \E[?8h,
+ 	rc@, sc@, smkx=\E=, use=vt100,
+ 
+ # From: 
+@@ -17817,7 +18330,8 @@
+ 	cuu1=\EM, dch1=\E[P$<4/>, dl1=\E[M$<3/>, ed=\E[J,
+ 	el=\E[K$<5/>, home=\E[H, ht=^I, ich1=\E[@$<4/>,
+ 	il1=\E[L$<3/>, ind=\E[S, invis=\E[=6;<5,
+-	is2=\E%!0\ELBP0\E%!1\E[H\E[2g\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[J,
++	is2=\E%!0\ELBP0\E%!1\E[H\E[2g\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8
++	    C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[J,
+ 	kcub1=\E[D, kcud1=\ED, kcuf1=\E[C, kcuu1=\EM, khome=\E[H,
+ 	rev=\E[7m, ri=\E[T,
+ 	rmcup=\E[?6h\E%!0\ELBP0\E%!1\E[32;1f, rmso=\E[m,
+@@ -17878,16 +18392,30 @@
+ 	ech=\E%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0,
+ 	home=\E[H, ht=^I, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[1L,
+ 	ind=\ED,
+-	initc=\E%%!0\ETF4%?%p1%{0}%=%t0%e%p1%{1}%=%t4%e%p1%{2}%=%t3%e%p1%{3}%=%t5%e%p1%{4}%=%t2%e%p1%{5}%=%t6%e%p1%{6}%=%t7%e1%;%?%p2%{125}%<%t0%e%p2%{250}%<%tA2%e%p2%{375}%<%tA?%e%p2%{500}%<%tC8%e%p2%{625}%<%tD4%e%p2%{750}%<%tE1%e%p2%{875}%<%tE\:%eF4%;%?%p3%{125}%<%t0%e%p3%{250}%<%tA2%e%p3%{375}%<%tA?%e%p3%{500}%<%tC8%e%p3%{625}%<%tD4%e%p3%{750}%<%tE1%e%p3%{875}%<%tE\:%eF4%;%?%p4%{125}%<%t0%e%p4%{250}%<%tA2%e%p4%{375}%<%tA?%e%p4%{500}%<%tC8%e%p4%{625}%<%tD4%e%p4%{750}%<%tE1%e%p4%{875}%<%tE\:%eF4%;\E%%!1,
++	initc=\E%%!0\ETF4%?%p1%{0}%=%t0%e%p1%{1}%=%t4%e%p1%{2}%=%t3
++	      %e%p1%{3}%=%t5%e%p1%{4}%=%t2%e%p1%{5}%=%t6%e%p1%{6}%=
++	      %t7%e1%;%?%p2%{125}%<%t0%e%p2%{250}%<%tA2%e%p2%{375}%<
++	      %tA?%e%p2%{500}%<%tC8%e%p2%{625}%<%tD4%e%p2%{750}%<%tE
++	      1%e%p2%{875}%<%tE\:%eF4%;%?%p3%{125}%<%t0%e%p3%{250}%<
++	      %tA2%e%p3%{375}%<%tA?%e%p3%{500}%<%tC8%e%p3%{625}%<%tD
++	      4%e%p3%{750}%<%tE1%e%p3%{875}%<%tE\:%eF4%;%?%p4%{125}
++	      %<%t0%e%p4%{250}%<%tA2%e%p4%{375}%<%tA?%e%p4%{500}%<%t
++	      C8%e%p4%{625}%<%tD4%e%p4%{750}%<%tE1%e%p4%{875}%<%tE\:
++	      %eF4%;\E%%!1,
+ 	invis=\E[=6;<5, is1=\E%!0\ETM1\E%!1\E[m, kbs=^H,
+ 	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf0=\EOA,
+ 	kf1=\EOB, kf2=\EOC, kf3=\EOD, kf4=\EP, kf5=\EQ, kf6=\ER,
+ 	kf7=\ES,
+-	oc=\E%!0\ETFB000001F4F4F42F40030F404A4Ca9f!j%k4l\,\277?\,\300AA\,\301BA\,\302CA\,\303DA\,\304HA\,\305JA\,\306a\,\307KC\,\310AE\,\311BE\,\312CE\,\313HE\,\314AI\,\315BI\,\316CI\,\317HI\,\320b\,\321DN\,\322AO\,\323BO\,\324CO\,\325DO\,\326HO\,\3274\,\330i\,\331AU\,\332BU\,\333CU\,\334HU\,\335BY\,\336l\,\337{\,\340Aa\,\341Ba\,\342Ca\,\343Da\,\344Ha\,\345Ja\,\346q\,\347Kc\,\350Ae\,\351Be\,\352Ce\,\353He\,\354Ai\,\355Bi\,\356Ci\,\357Hi\,\360r\,\361Dn\,\362Ao\,\363Bo\,\364Co\,\365Do\,\366Ho\,\3678\,\370y\,\371Au\,\372Bu\,\373Cu\,\374Hu\,\375By\,\376|\,\377Hy\,\252c\,\,0\017\031%\016\,}#\,f0\,g1\,\\\,\\\,\,+.\,./\,0\177\,--,
++	XC=B\031%\,\241!\,\242"\,\243#\,\244$\,\245%\,\246&\,\247'\,
++	   \250(\,\253+\,\257P\,\2600\,\2611\,\2622\,\2633\,\2655\,
++	   \2677\,\272k\,\273;\,\274<\,\275=\,\276>\,\277?\,\300AA\,
++	   \301BA\,\302CA\,\303DA\,\304HA\,\305JA\,\306a\,\307KC\,
++	   \310AE\,\311BE\,\312CE\,\313HE\,\314AI\,\315BI\,\316CI\,
++	   \317HI\,\320b\,\321DN\,\322AO\,\323BO\,\324CO\,\325DO\,
++	   \326HO\,\3274\,\330i\,\331AU\,\332BU\,\333CU\,\334HU\,
++	   \335BY\,\336l\,\337{\,\340Aa\,\341Ba\,\342Ca\,\343Da\,
++	   \344Ha\,\345Ja\,\346q\,\347Kc\,\350Ae\,\351Be\,\352Ce\,
++	   \353He\,\354Ai\,\355Bi\,\356Ci\,\357Hi\,\360r\,\361Dn\,
++	   \362Ao\,\363Bo\,\364Co\,\365Do\,\366Ho\,\3678\,\370y\,
++	   \371Au\,\372Bu\,\373Cu\,\374Hu\,\375By\,\376|\,\377Hy\,
++	   \252c\,\,0\017\031%\016\,}#\,f0\,g1\,\\\,\\\,\,+.\,./\,0
++	   \177\,--,
+ minitel1b|minitel 1-bistandard (in 40cols mode),
+ 	mir,
+ 	cub=\E[%p1%dD, cud=\E[%p1%dB, cuf=\E[%p1%dC,
+@@ -18770,17 +19319,35 @@
+ 	kpp=\EOR, krfr=\EOS, lf1@, lf2@, lf3@, lf4@, lf5@, lf6@, nel=\EE,
+ 	op@, rc=\E8, rep@, rev=\E[7m, ri=\EM, rmkx@, rmso=\E[27m,
+ 	rmul=\E[24m,
+-	rs2=\036\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[J\E[m,
++	rs2=\036\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[
++	    H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M
++	    \E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2
++	    M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[
++	    2M\E[H\E[J\E[m,
+ 	sc=\E7, setab@, setaf@, setb@, setf@, sgr@, sgr0=\E[m, smkx@,
+ 	smso=\E[7m, smul=\E[4m,
+-	tsl=\037@%?%p1%{63}%<%t%p1%'A'%+%c%e\177%p1%{62}%-%Pa%?%ga%{1}%&%t\011%;%?%ga%{2}%&%t\011\011%;%?%ga%{4}%&%t\011\011\011\011%;%?%ga%{07}%>%t\011\011\011\011\011\011\011\011%;%?%ga%{15}%>%t\011\011\011\011\011\011\011\011%;%;,
++	tsl=\037@%?%p1%{63}%<%t%p1%'A'%+%c%e\177%p1%{62}%-%Pa%?%ga
++	    %{1}%&%t\011%;%?%ga%{2}%&%t\011\011%;%?%ga%{4}%&%t\011
++	    \011\011\011%;%?%ga%{07}%>%t\011\011\011\011\011\011
++	    \011\011%;%?%ga%{15}%>%t\011\011\011\011\011\011\011
++	    \011%;%;,
+ 	u6@, u7@, u8@, u9@, .acsc=}#f[, .enacs=^O, .kb2=\EOPg,
+ 	.kcbt=\EOPi, .ll=\E[24H, .mc0=\E[i, .rmacs=^O, .rs2=\Ec,
+-	.sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m,
++	.sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1
++	     ;%;m,
+ 	.smacs=^N, C0=}#f[j+k+l+m+n+o~q=s_t+u+v+w+x!0\032,
+ 	E0=^O, S0=^N,
+-	XC=B\016%\017\,\243#\,\247]\,\260[\,\340@\,\347\\\\\,\351{\,\350}\,\371|\,\300A\,\301A\,\302A\,\303A\,\304A\,\305A\,\306E\,\307C\,\310E\,\311E\,\312E\,\313E\,\314I\,\315I\,\316I\,\317I\,\320D\,\321N\,\322O\,\323O\,\324O\,\325O\,\326O\,\331U\,\332U\,\333U\,\334U\,\335Y\,\337s\,\341a\,\342a\,\343a\,\344a\,\345a\,\346e\,\352e\,\353e\,\354i\,\355i\,\356i\,\357i\,\360d\,\361n\,\362o\,\363o\,\364o\,\365o\,\366o\,\372u\,\373u\,\374u\,\375y\,\377y\,\267.\,\327x\,\367/\,\261\E7\E[4m+\E8\E[C\,\,0\017%\016\,x|\,y\E7\E[4m<\E8\E[C\,z\E7\E[4m>\E8\E[C\,g\E7\E[4m+\E8\E[C,
+-	use=minitel1b,
++	XC=B\016%\017\,\243#\,\247]\,\260[\,\340@\,\347\\\\\,\351{\,
++	   \350}\,\371|\,\300A\,\301A\,\302A\,\303A\,\304A\,\305A\,
++	   \306E\,\307C\,\310E\,\311E\,\312E\,\313E\,\314I\,\315I\,
++	   \316I\,\317I\,\320D\,\321N\,\322O\,\323O\,\324O\,\325O\,
++	   \326O\,\331U\,\332U\,\333U\,\334U\,\335Y\,\337s\,\341a\,
++	   \342a\,\343a\,\344a\,\345a\,\346e\,\352e\,\353e\,\354i\,
++	   \355i\,\356i\,\357i\,\360d\,\361n\,\362o\,\363o\,\364o\,
++	   \365o\,\366o\,\372u\,\373u\,\374u\,\375y\,\377y\,\267.\,
++	   \327x\,\367/\,\261\E7\E[4m+\E8\E[C\,\,0\017%\016\,x|\,y
++	   \E7\E[4m<\E8\E[C\,z\E7\E[4m>\E8\E[C\,g\E7\E[4m+\E8
++	   \E[C, use=minitel1b,
+ 
+ minitel1-nb|minitel 1 (40cols) noir & blanc sans couleurs avec bold et dim ...,
+ 	colors@, pairs@,
+@@ -18826,20 +19393,42 @@
+ 	enacs=\E)0, rmacs=^O, smacs=^N, u6=\E[%i%d;%dR,
+ 	C0=ffggjjkkllmmnnooqqssttuuvvwwxxyyzz||}}, E0=^O,
+ 	S0=\E)0\016,
+-	XC=B%\E(B\,\243\E(3}\,\247\E(R[\,\257\E(3v\,\260\E(3f\,\261\E(3g\,\265\E(3Y\,\267\E(3~\,\274\E(3O\,\275\E(3P\,\276\E(3Q\,\277\E(3Z\,\300A\,\301A\,\302A\,\303A\,\304\E(3R\,\305A\,\306E\,\307C\,\310E\,\311\E(3S\,\312E\,\313E\,\314\E(3T\,\315I\,\316I\,\317I\,\320D\,\321\E(3W\,\322\E(3U\,\323O\,\324O\,\325O\,\326O\,\327x\,\331U\,\332U\,\333U\,\334\E(3V\,\335Y\,\337\E(3{\,\340\E(3A\,\341a\,\342\E(3B\,\343a\,\344\E(3C\,\345a\,\346e\,\347\E(R\\\\\,\350\E(3E\,\351\E(3D\,\352\E(3F\,\353\E(3G\,\354i\,\355i\,\356\E(3H\,\357\E(3I\,\360d\,\361\E(3X\,\362o\,\363o\,\364\E(3J\,\365o\,\366\E(3K\,\367\E(3h\,\371\E(3L\,\372u\,\373\E(3M\,\374\E(3N\,\375y\,\377y\,\,0\E)3%\E)0\,\\\,m\,+k\,.l\,0\177\,-j,
+-	use=minitel12-80,
++	XC=B%\E(B\,\243\E(3}\,\247\E(R[\,\257\E(3v\,\260\E(3f\,\261
++	   \E(3g\,\265\E(3Y\,\267\E(3~\,\274\E(3O\,\275\E(3P\,\276
++	   \E(3Q\,\277\E(3Z\,\300A\,\301A\,\302A\,\303A\,\304\E(3R\,
++	   \305A\,\306E\,\307C\,\310E\,\311\E(3S\,\312E\,\313E\,
++	   \314\E(3T\,\315I\,\316I\,\317I\,\320D\,\321\E(3W\,\322\E(
++	   3U\,\323O\,\324O\,\325O\,\326O\,\327x\,\331U\,\332U\,
++	   \333U\,\334\E(3V\,\335Y\,\337\E(3{\,\340\E(3A\,\341a\,
++	   \342\E(3B\,\343a\,\344\E(3C\,\345a\,\346e\,\347\E(R\\\\\,
++	   \350\E(3E\,\351\E(3D\,\352\E(3F\,\353\E(3G\,\354i\,\355i
++	   \,\356\E(3H\,\357\E(3I\,\360d\,\361\E(3X\,\362o\,\363o\,
++	   \364\E(3J\,\365o\,\366\E(3K\,\367\E(3h\,\371\E(3L\,\372u
++	   \,\373\E(3M\,\374\E(3N\,\375y\,\377y\,\,0\E)3%\E)0\,\\\,m
++	   \,+k\,.l\,0\177\,-j, use=minitel12-80,
+ 
+ minitel12-80|minitel 12 (80cols),
+ 	G0,
+ 	civis=\E[<1h, cnorm=\E[<1l, is2=\E[12h, u6=\E[%i%d;%dH,
+ 	u7=\E[6n,
+-	.acsc=ffggj+k+l+m+n+ovq-swt+u+v+w+xx}}\,m+k.l-j0\177,
++	.acsc=ffggj+k+l+m+n+ovq-swt+u+v+w+xx}}\,m+k.l-j0
++	      \177,
+ 	.enacs=\E)3, .rmacs=^O, .rs3=\E[?4l, .scs=\E(%p1%c,
+ 	.smacs=^N,
+ 	C0=ffggj+k+l+m+n+ovq-swt+u+v+w+xx}}\,m+k.l-j0\177,
+ 	E0=^O, S0=\E)3\016,
+-	XC=B%\E(B\,\243\E(3}\,\247\E(R[\,\257\E(3v\,\260\E(3f\,\261\E(3g\,\267\E(3~\,\274\E(3O\,\275\E(3P\,\276\E(3Q\,\300A\,\301A\,\302A\,\303A\,\304A\,\305A\,\306E\,\307C\,\310E\,\311E\,\312E\,\313E\,\314I\,\315I\,\316I\,\317I\,\320D\,\321N\,\322O\,\323O\,\324O\,\325O\,\326O\,\327x\,\331U\,\332U\,\333U\,\334U\,\335Y\,\337\E(3{\,\340\E(3A\,\341a\,\342\E(3B\,\343a\,\344\E(3C\,\345a\,\346e\,\347\E(R\\\\\,\350\E(3E\,\351\E(3D\,\352\E(3F\,\353\E(3G\,\354i\,\355i\,\356\E(3H\,\357\E(3I\,\360d\,\361n\,\362o\,\363o\,\364\E(3J\,\365o\,\366\E(3K\,\367\E(3h\,\371\E(3L\,\372u\,\373\E(3M\,\374\E(3N\,\375y\,\377y\,\,0\E)3%\E)0\,\\\,m\,+k\,.l\,0\177\,-j,
+-	use=minitel1b-80,
++	XC=B%\E(B\,\243\E(3}\,\247\E(R[\,\257\E(3v\,\260\E(3f\,\261
++	   \E(3g\,\267\E(3~\,\274\E(3O\,\275\E(3P\,\276\E(3Q\,\300A
++	   \,\301A\,\302A\,\303A\,\304A\,\305A\,\306E\,\307C\,\310E
++	   \,\311E\,\312E\,\313E\,\314I\,\315I\,\316I\,\317I\,\320D
++	   \,\321N\,\322O\,\323O\,\324O\,\325O\,\326O\,\327x\,\331U
++	   \,\332U\,\333U\,\334U\,\335Y\,\337\E(3{\,\340\E(3A\,
++	   \341a\,\342\E(3B\,\343a\,\344\E(3C\,\345a\,\346e\,\347\E(
++	   R\\\\\,\350\E(3E\,\351\E(3D\,\352\E(3F\,\353\E(3G\,\354i
++	   \,\355i\,\356\E(3H\,\357\E(3I\,\360d\,\361n\,\362o\,
++	   \363o\,\364\E(3J\,\365o\,\366\E(3K\,\367\E(3h\,\371\E(3L
++	   \,\372u\,\373\E(3M\,\374\E(3N\,\375y\,\377y\,\,0\E)3%\E)0
++	   \,\\\,m\,+k\,.l\,0\177\,-j, use=minitel1b-80,
+ 
+ #
+ # Add these in your ~/.screenrc for inputting some special glyphs like french
+@@ -18859,7 +19448,8 @@
+ 
+ screen.minitel1|Screen specific for minitel1,
+ 	ncv@,
+-	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz||}}~~,
++	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
++	     yzz||}}~~,
+ 	bel=\007\E\^ \E\\, bold@, csr@, flash=\Eg\E\^ \E\\, kmous@,
+ 	rmul@, smul@, u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?1;2c, u9=\EZ,
+ 	use=screen,
+@@ -18887,7 +19477,155 @@
+ 	bold=\E[1m, dim=\E[2m, op@, setab@, setaf@, setb@, setf@,
+ 	use=screen.minitel1b,
+ 
++# From: Alexandre Montaron, 29 Sep 2016
++
++linux-m1|Linux Minitel 1 "like" Couleurs,
++	am, bw@, ccc, mir, msgr, xenl,
++	colors#8, it#8, ncv#16, pairs#64,
++	acsc=a\261f\370g\361h\260j\274k\273l\311m\310n\316q\315t
++	     \314u\271v\312w\313x\272y\363z\362{\343|\252~\372,
++	bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l,
++	clear=\E[H\E[J, cnorm=\E[?25h, cr=^M,
++	csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=^J, cuf1=\E[C,
++	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch=\E[%p1%dP,
++	dch1=\E[P, dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M,
++	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)U,
++	flash=\E[?5h\E[?5l, home=\E[H, hpa=\E[%i%p1%d`, ht=^I,
++	hts=\EH, il=\E[%p1%dL, il1=\E[L, ind=^J,
++	initc=\E]P%p1%{15}%&%X%p2%{255}%&%02X%p3%{255}%&%02X%p4
++	      %{255}%&%02X,
++	is2=\E]R\E]P3FFFF80\E[?8c, ka1=\EOw, ka3=\EOy, kb2=\E[G,
++	kbs=\177, kc1=\EOq, kc3=\EOs, kcbt=\E^I, kclr=\E^M,
++	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
++	kdch1=\E[3~, kdl1=\E\E[A, kend=\E[4~, kent=\EOM, kf1=\E[[A,
++	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~,
++	kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~,
++	kf18=\E[32~, kf19=\E[33~, kf2=\E[[B, kf20=\E[34~,
++	kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, kf6=\E[17~, kf7=\E[18~,
++	kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kich1=\E[2~,
++	kil1=\E\E[B, kmous=\E[M, knp=\E[6~, kpp=\E[5~, nel=\EE,
++	oc=\E]R\E]P3FFFF80, op=\E[39;49m, rc=\E8, rev=\E[7m,
++	ri=\EM, rmacs=^O, rmam=\E[?7l, rmir=\E[4l, rmpch=\E[10m,
++	rmso=\E[27m, rs1=\Ec, rs3=\E[37;40m\E[8], sc=\E7,
++	setab=\E[4%p1%dm, setaf=\E[3%p1%dm, sgr0=\E[m, smacs=^N,
++	smam=\E[?7h, smir=\E[4h, smpch=\E[11m, smso=\E[7m,
++	tbc=\E[3g, u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?6c, u9=\EZ,
++	vpa=\E[%i%p1%dd, .VN=\E[?5l, .VR=\E[?5h, .am@,
++	.ich=\E[%p1%d@, .ich1=\E[@, .ll=\E[99H, .rmcup=,
++	.rmul=\E[24m, .smcup=\E]R\E]P3FFFF80\E[?8c,
++	.smul=\E[4m,
++	E3=\E[99H\E[2J\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
++	   \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
++	   \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
++	   \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
++	   \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
++	   \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
++	   \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
++	   \n\n\n\n\n\n\n\n\n\n,
++
++# 1. Using double-shapes for vt100 graphical chars (eg: mc).
++# 2. Native brown color corrected to good yellow color.
++# 3. Adding "Insert" and "Delete Line" keys as ESC Up and ESC Down arrow keys.
++# 4. Suppressed inexistant underlined mode (normally as bright).
++# 5. ich/ich1 not filled because of non-curses programs.
++#--
++# 6. Suppressed inexistant invisible mode.
++#(7.)Adding forgotten "cub/cud/cuf/cuu" sequences deplacement.
++
++linux-m1b|Linux Minitel 1B "like" Monochrome (Gris/Blanc/Noir+Dim),
++	ccc@,
++	colors@, ncv@, pairs@,
++	acsc@, bold=\E[33m, enacs@, initc@,
++	is2=\E]R\E]P1A9A9A9\E]P2A9A9A9\E]P3FFFFFF\E]P4A9A9A9\E]P5A9A
++	    9A9\E]P6A9A9A9\E]P9FFFFFF\E]PAFFFFFF\E]PBFFFFFF\E]PCFFFF
++	    FF\E]PDFFFFFF\E]PEFFFFFF\E[?2c,
++	oc@, op@, rmacs@, setab=^A, setaf=^A, smacs@, .setab@, .setaf@,
++	.smcup=\E]R\E]P1A9A9A9\E]P2A9A9A9\E]P3FFFFFF\E]P4A9A9A9\E]P5
++	       A9A9A9\E]P6A9A9A9\E]P9FFFFFF\E]PAFFFFFF\E]PBFFFFFF\E]
++	       PCFFFFFF\E]PDFFFFFF\E]PEFFFFFF\E[?2c, use=linux-m1,
++
++linux-m2|Linux Minitel 2 "like" Couleurs (Vert/Blanc/Noir+Bleu),
++	ccc@,
++	colors@, ncv@, pairs@,
++	acsc=++\,\,--..00``aabbccddeeffgghhiijjkkllmmnnooppqqrrssttu
++	     uvvwwxxyyzz{{||}}~~,
++	bold=\E[33m, cnorm=\E[?2c\E[?25h, cvvis=\E[?8c\E[?25h,
++	enacs=\E)0, initc@,
++	is2=\E]R\E]P100A900\E]P200A900\E]P3FFFFFF\E]P400A900\E]P500A
++	    900\E]P600A900\E]P700A900\E]P80000FF\E]P9FFFFFF\E]PAFFFF
++	    FF\E]PBFFFFFF\E]PCFFFFFF\E]PDFFFFFF\E]PEFFFFFF\E]PFFFFFF
++	    F\E[;37m,
++	oc@, op@, rmacs=^O, setab=^A, setaf=^A, sgr0=\E[;37m, smacs=^N,
++	.setab@, .setaf@,
++	.smcup=\E]R\E]P100A900\E]P200A900\E]P3FFFFFF\E]P400A900\E]P5
++	       00A900\E]P600A900\E]P700A900\E]P80000FF\E]P9FFFFFF\E]
++	       PAFFFFFF\E]PBFFFFFF\E]PCFFFFFF\E]PDFFFFFF\E]PEFFFFFF
++	       \E]PFFFFFFF\E[;37m, use=linux-m1,
++
++# Screen entries counterpart :
++
++screen.linux-m1|Linux m1 specific for screen,
++	ncv@,
++	dim=\E[2m, kbs=\177, kclr=\E^M, kdl1=\E\E[A, kf13=\E[25~,
++	kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~,
++	kf18=\E[32~, kf19=\E[33~, kf20=\E[34~, kil1=\E\E[B, rmul@,
++	smul@, u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?1;2c, u9=\EZ,
++	E3=\E[99H\E[2J\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
++	   \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
++	   \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
++	   \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
++	   \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
++	   \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
++	   \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
++	   \n\n\n\n\n\n\n\n\n\n, use=screen,
++
++screen.linux-m1b|Linux m1b specific for screen,
++	colors@, pairs@,
++	op@, setab@, setaf@, setb@, setf@, use=screen.linux-m1,
++
++screen.linux-m2|Linux m2 specific for screen,
++	acsc=++\,\,--..00``aabbccddeeffgghhiijjkkllmmnnooppqqrrssttu
++	     uvvwwxxyyzz{{||}}~~, use=screen.linux-m1b,
++
++# Putty :
++
++putty-m1|Putty Minitel 1 "like" Couleurs,
++	hs,
++	dim@, dsl=\E]2;\007, fsl=^G, indn=\E[%p1%dS, kf1=\E[11~,
++	kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
++	rin=\E[%p1%dT, rmcup=\E[2J\E[?47l\E8, rmul=\E[24m,
++	smcup=\E7\E[?47h, smul=\E[4m, tsl=\E]2;, .E3=\E[300S,
++	.WS=\E[8;%d;%dt, Z0=\E[?3h, Z1=\E[?3l, use=linux-m1,
++
++putty-m1b|Putty Minitel 1B "like" Monochrome (Gris/Blanc/Noir),
++	hs,
++	dim@, dsl=\E]2;\007, fsl=^G, indn=\E[%p1%dS, kf1=\E[11~,
++	kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
++	rin=\E[%p1%dT, rmcup=\E[2J\E[?47l\E8, rmul=\E[24m,
++	smcup=\E7\E[?47h, smul=\E[4m, tsl=\E]2;, .E3=\E[300S,
++	.WS=\E[8;%d;%dt, Z0=\E[?3h, Z1=\E[?3l, use=linux-m1b,
++
++putty-m2|Putty Minitel 2 "like" Couleurs (Vert/Blanc/Noir),
++	hs,
++	acsc=``aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{
++	     {||}}~~,
++	dim@, dsl=\E]2;\007, fsl=^G, indn=\E[%p1%dS, kf1=\E[11~,
++	kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
++	rin=\E[%p1%dT, rmcup=\E[2J\E[?47l\E8, rmul=\E[24m,
++	smcup=\E7\E[?47h, smul=\E[4m, tsl=\E]2;, .E3=\E[300S,
++	.WS=\E[8;%d;%dt, Z0=\E[?3h, Z1=\E[?3l, use=linux-m2,
++
+ 
++screen.putty-m1|Putty m1 specific for screen,
++	dim@, rmul=\E[24m, smul=\E[4m, E3@, use=screen.linux-m1,
++
++screen.putty-m1b|Putty m1b specific for screen,
++	colors@, pairs@,
++	op@, setab@, setaf@, setb@, setf@, use=screen.putty-m1,
++
++screen.putty-m2|Putty m2 specific for screen,
++	acsc=++\,\,--..00``aabbccddeeffgghhiijjkkllmmnnooppqqrrssttu
++	     uvvwwxxyyzz{{||}}~~, use=screen.putty-m1b,
+ # From: Alexandre Montaron, 19 Nov 2015, updated 19 Sep 2016
+ #
+ # He comments:
+@@ -18898,12 +19636,31 @@
+ 	cols#40, lines#24,
+ 	bel=^G, civis=^T, clear=^L, cnorm=^Q, cr=^M, cub1=^H, cud1=^J,
+ 	cuf1=^I,
+-	cup=\036%?%p1%{07}%>%t\n\n\n\n\n\n\n\n%;%?%p1%{15}%>%t\n\n\n\n\n\n\n\n%;%?%p1%{4}%&%t\n\n\n\n%;%?%p1%{2}%&%t\n\n%;%?%p1%{1}%&%t\n%;%?%p2%{07}%>%t\011\011\011\011\011\011\011\011%;%?%p2%{15}%>%t\011\011\011\011\011\011\011\011%;%?%p2%{23}%>%t\011\011\011\011\011\011\011\011%;%?%p2%{31}%>%t\011\011\011\011\011\011\011\011%;%?%p2%{4}%&%t\011\011\011\011%;%?%p2%{2}%&%t\011\011%;%?%p2%{1}%&%t\011%;,
++	cup=\036%?%p1%{07}%>%t\n\n\n\n\n\n\n\n%;%?%p1%{15}%>%t\n\n
++	    \n\n\n\n\n\n%;%?%p1%{4}%&%t\n\n\n\n%;%?%p1%{2}%&%t\n\n%;
++	    %?%p1%{1}%&%t\n%;%?%p2%{07}%>%t\011\011\011\011\011\011
++	    \011\011%;%?%p2%{15}%>%t\011\011\011\011\011\011\011
++	    \011%;%?%p2%{23}%>%t\011\011\011\011\011\011\011\011%;%?
++	    %p2%{31}%>%t\011\011\011\011\011\011\011\011%;%?%p2%{4}
++	    %&%t\011\011\011\011%;%?%p2%{2}%&%t\011\011%;%?%p2%{1}%&
++	    %t\011%;,
+ 	cuu1=^K, home=^^, nel=^M^J, rs2=^L, .el=^X, .ind=^J,
+ 	.rep=%p1%c\022%p2%'?'%+%c, .ri=^K,
+ 
+ viewdata-o|optimized version of viewdata prestel/viewdata terminals,
+-	cup=\036%p1%?%p2%{20}%>%t%?%p1%{23}%=%t%Pa%{1}%e%{1}%+%;%;%Pa%?%ga%{13}%<%t%?%ga%{07}%>%t\n\n\n\n\n\n\n\n%;%?%ga%{4}%&%t\n\n\n\n%;%?%ga%{2}%&%t\n\n%;%?%ga%{1}%&%t\n%;%e%{24}%ga%-%Pa%?%ga%{07}%>%t\013\013\013\013\013\013\013\013%;%?%ga%{4}%&%t\013\013\013\013%;%?%ga%{2}%&%t\013\013%;%?%ga%{1}%&%t\013%;%;%?%p2%{21}%<%t%?%p2%{07}%>%t\011\011\011\011\011\011\011\011%;%?%p2%{15}%>%t\011\011\011\011\011\011\011\011%;%?%p2%{4}%&%t\011\011\011\011%;%?%p2%{2}%&%t\011\011%;%?%p2%{1}%&%t\011%;%e%{40}%p2%-%Pa%?%ga%{07}%>%t\010\010\010\010\010\010\010\010%;%?%ga%{15}%>%t\010\010\010\010\010\010\010\010%;%?%ga%{4}%&%t\010\010\010\010%;%?%ga%{2}%&%t\010\010%;%?%ga%{1}%&%t\010%;%?%p1%{23}%=%t\013%;%;,
++	cup=\036%p1%?%p2%{20}%>%t%?%p1%{23}%=%t%Pa%{1}%e%{1}%+%;%;
++	    %Pa%?%ga%{13}%<%t%?%ga%{07}%>%t\n\n\n\n\n\n\n\n%;%?%ga
++	    %{4}%&%t\n\n\n\n%;%?%ga%{2}%&%t\n\n%;%?%ga%{1}%&%t\n%;%e
++	    %{24}%ga%-%Pa%?%ga%{07}%>%t\013\013\013\013\013\013\013
++	    \013%;%?%ga%{4}%&%t\013\013\013\013%;%?%ga%{2}%&%t\013
++	    \013%;%?%ga%{1}%&%t\013%;%;%?%p2%{21}%<%t%?%p2%{07}%>%t
++	    \011\011\011\011\011\011\011\011%;%?%p2%{15}%>%t\011
++	    \011\011\011\011\011\011\011%;%?%p2%{4}%&%t\011\011\011
++	    \011%;%?%p2%{2}%&%t\011\011%;%?%p2%{1}%&%t\011%;%e%{40}
++	    %p2%-%Pa%?%ga%{07}%>%t\010\010\010\010\010\010\010\010%;
++	    %?%ga%{15}%>%t\010\010\010\010\010\010\010\010%;%?%ga
++	    %{4}%&%t\010\010\010\010%;%?%ga%{2}%&%t\010\010%;%?%ga
++	    %{1}%&%t\010%;%?%p1%{23}%=%t\013%;%;,
+ 	.ll=^^^K, use=viewdata,
+ 
+ # Samples with TERM=viewdata and TERM=viewdata-rv: http://canal.chez.com/blog/
+@@ -19135,7 +19892,8 @@
+ 	mc4=\r\E[4i, mc5=\E[5i, rev=\E[0;7m, rmacs=^O,
+ 	rmcup=\E[0;98v\E[2J\E[v, rmir=\E[4l, rmso=\E[m,
+ 	rmul=\E[m, rs2=\E[?=h\Ec, s0ds=^O, s1ds=^N,
+-	sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p5%t;2%;%?
++	    %p7%t;8%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smcup=\E[?>h\EPY99\:98\E\\,
+ 	smir=\E[4h, smso=\E[0;7m, smul=\E[0;4m, tbc=\E[3g,
+ 	tsl=\EPY99\:98\E\\\E[0;98v\E[2;7m,
+@@ -19153,7 +19911,8 @@
+ 	use=tws-generic,
+ dku7202|BULL Questar 200 DKU7202 (colour/character attributes),
+ 	blink=\E[0;2;4m, dim=\E[0;5m, ht=^I, is3=\E[?3h\Eb,
+-	sgr=\E[0%?%p1%t;2;4;5;7%;%?%p3%t;7%;%?%p2%t;2%;%?%p4%t;2;4%;%?%p5%t;5%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
++	sgr=\E[0%?%p1%t;2;4;5;7%;%?%p3%t;7%;%?%p2%t;2%;%?%p4%t;2;4%;
++	    %?%p5%t;5%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 	smso=\E[0;4;5;7m, smul=\E[0;2m, use=tws-generic,
+ 
+ #=========================================================#
+@@ -19247,7 +20006,8 @@
+ 	flash=\E[?5h$<50>\E[?5l, fsl=\E[0$}, home=\E[H, ht=^I,
+ 	hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\ED,
+ 	is1=\E[63;1"p\E[2h,
+-	is2=\E[?2h\E[?3l\E[?5l\E[?7h\E[?8h\E>\E[?1l\E F\E[?42l\E[?4l,
++	is2=\E[?2h\E[?3l\E[?5l\E[?7h\E[?8h\E>\E[?1l\E\sF\E[?42l\E[?4
++	    l,
+ 	is3=\E[0$}\E[?25h\E[2l\E[H\E[J, ka1=\EOw, ka3=\EOy,
+ 	kb2=\EOu, kbs=^H, kc1=\EOq, kc3=\EOs, kcub1=\E[D, kcud1=\E[B,
+ 	kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~, kf1=\EOP, kf10=\E[21~,
+@@ -19261,22 +20021,25 @@
+ 	rmcup=\E[?7h, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m,
+ 	rmul=\E[24m, rs1=\E[!p, rs2=\E[?3l, s0ds=\E(B, s1ds=\E(0,
+ 	sc=\E7,
+-	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m%?%p9%t\E(0%e\E(B%;,
++	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
++	    %;m%?%p9%t\E(0%e\E(B%;,
+ 	sgr0=\E[0m\E(B, smacs=\E(0, smam=\E[?7h,
+ 	smcup=\E[?7l\E[?1l\E(B, smir=\E[4h, smso=\E[7m,
+ 	smul=\E[4m, tbc=\E[3g, tsl=\E[1$}\E[2$~, use=ansi+pp,
+ bq300-rv|Bull vt320 reverse 80 columns,
+ 	flash=\E[?5l$<50>\E[?5h,
+-	is2=\E[?2h\E[?3l\E[?5h\E[?7h\E[?8h\E>\E[?1l\E F\E[?42l\E[?4l,
+-	use=bq300,
++	is2=\E[?2h\E[?3l\E[?5h\E[?7h\E[?8h\E>\E[?1l\E\sF\E[?42l\E[?4
++	    l, use=bq300,
+ bq300-w|Bull vt320 132 columns,
+ 	cols#132, wsl#132,
+-	is2=\E[?2h\E[?3h\E[?5l\E[?7h\E[?8h\E>\E[?1l\E F\E[?42l\E[?4l,
++	is2=\E[?2h\E[?3h\E[?5l\E[?7h\E[?8h\E>\E[?1l\E\sF\E[?42l\E[?4
++	    l,
+ 	rs2=\E[?3h, use=bq300,
+ bq300-w-rv|Bull vt320 reverse mode 132 columns,
+ 	cols#132, wsl#132,
+ 	flash=\E[?5l$<50>\E[?5h,
+-	is2=\E[?2h\E[?3h\E[?5h\E[?7h\E[?8h\E>\E[?1l\E F\E[?42l\E[?4l,
++	is2=\E[?2h\E[?3h\E[?5h\E[?7h\E[?8h\E>\E[?1l\E\sF\E[?42l\E[?4
++	    l,
+ 	rs2=\E[?3h, use=bq300,
+ 
+ #  This entry is used for terminals with vt320 emulation mode
+@@ -19348,7 +20111,8 @@
+ 	flash=\233?5h$<50>\233?5l, fsl=\2330$}, home=\233H,
+ 	ht=^I, hts=\EH, ich=\233%p1%d@, il=\233%p1%dL, il1=\233L,
+ 	ind=\ED, is1=\E[63;2"p\E[2h,
+-	is2=\E[?2h\E[?3l\E[?5l\E[?7h\E[?8h\E>\E[?1l\E G\E[?42l\E[?4l,
++	is2=\E[?2h\E[?3l\E[?5l\E[?7h\E[?8h\E>\E[?1l\E\sG\E[?42l\E[?4
++	    l,
+ 	is3=\2330$}\233?25h\2332l\233H\233J, ka1=\217w,
+ 	ka3=\217y, kb2=\217u, kbs=^H, kc1=\217q, kc3=\217s,
+ 	kcub1=\233D, kcud1=\233B, kcuf1=\233C, kcuu1=\233A,
+@@ -19364,22 +20128,25 @@
+ 	rmcup=\233?7h, rmir=\2334l, rmkx=\233?1l\E>,
+ 	rmso=\23327m, rmul=\23324m, rs1=\E[!p, rs2=\E[?3l,
+ 	s0ds=\E(B, s1ds=\E(0, sc=\E7,
+-	sgr=\233%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m%?%p9%t\E(0%e\E(B%;,
++	sgr=\233%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;
++	    1%;m%?%p9%t\E(0%e\E(B%;,
+ 	sgr0=\2330m\E(B, smacs=\E(0, smam=\233?7h,
+ 	smcup=\233?7l\233?1l\E(B, smir=\2334h, smso=\2337m,
+ 	smul=\2334m, tbc=\2333g, tsl=\2331$}\2332$~,
+ bq300-8rv|Bull vt320 8-bit reverse mode 80 columns,
+ 	flash=\233?5l$<50>\233?5h,
+-	is2=\E[?2h\E[?3l\E[?5h\E[?7h\E[?8h\E>\E[?1l\E G\E[?42l\E[?4l,
+-	use=bq300-8,
++	is2=\E[?2h\E[?3l\E[?5h\E[?7h\E[?8h\E>\E[?1l\E\sG\E[?42l\E[?4
++	    l, use=bq300-8,
+ bq300-8w|Bull vt320 8-bit 132 columns,
+ 	cols#132, wsl#132,
+-	is2=\E[?2h\E[?3h\E[?5l\E[?7h\E[?8h\E>\E[?1l\E G\E[?42l\E[?4l,
++	is2=\E[?2h\E[?3h\E[?5l\E[?7h\E[?8h\E>\E[?1l\E\sG\E[?42l\E[?4
++	    l,
+ 	rs2=\233?3h, use=bq300-8,
+ bq300-w-8rv|Bull vt320 8-bit reverse mode 132 columns,
+ 	cols#132, wsl#132,
+ 	flash=\233?5l$<50>\233?5h,
+-	is2=\E[?2h\E[?3h\E[?5h\E[?7h\E[?8h\E>\E[?1l\E G\E[?42l\E[?4l,
++	is2=\E[?2h\E[?3h\E[?5h\E[?7h\E[?8h\E>\E[?1l\E\sG\E[?42l\E[?4
++	    l,
+ 	rs2=\233?3h, use=bq300-8,
+ 
+ #  This entry is used for terminals with vt320 emulation mode
+@@ -19396,16 +20163,18 @@
+ 	krdo@, kslt@, lf1@, lf2@, lf3@, lf4@, use=bq300,
+ bq300-pc-rv|Questar 303 with PC keyboard reverse mode 80 columns,
+ 	flash=\E[?5l$<50>\E[?5h,
+-	is2=\E[?2h\E[?3l\E[?5h\E[?7h\E[?8h\E>\E[?1l\E F\E[?42l\E[?4l,
+-	use=bq300-pc,
++	is2=\E[?2h\E[?3l\E[?5h\E[?7h\E[?8h\E>\E[?1l\E\sF\E[?42l\E[?4
++	    l, use=bq300-pc,
+ bq300-pc-w|Questar 303 with PC keyboard 132 columns terminal,
+ 	cols#132, wsl#132,
+-	is2=\E[?2h\E[?3h\E[?5l\E[?7h\E[?8h\E>\E[?1l\E F\E[?42l\E[?4l,
++	is2=\E[?2h\E[?3h\E[?5l\E[?7h\E[?8h\E>\E[?1l\E\sF\E[?42l\E[?4
++	    l,
+ 	rs2=\E[?3h, use=bq300-pc,
+ bq300-pc-w-rv|Questar 303 with PC keyboard reverse mode 132 columns,
+ 	cols#132, wsl#132,
+ 	flash=\E[?5l$<50>\E[?5h,
+-	is2=\E[?2h\E[?3h\E[?5h\E[?7h\E[?8h\E>\E[?1l\E F\E[?42l\E[?4l,
++	is2=\E[?2h\E[?3h\E[?5h\E[?7h\E[?8h\E>\E[?1l\E\sF\E[?42l\E[?4
++	    l,
+ 	rs2=\E[?3h, use=bq300-pc,
+ #    8 bit ISO Latin Character Set (ISO 8859-1),
+ #    8 bit Control Characters,
+@@ -19420,16 +20189,18 @@
+ 	kslt@, lf1@, lf2@, lf3@, lf4@, use=bq300-8,
+ bq300-8-pc-rv|Questar 303 with PC keyboard full 8 bits reverse mode 80 columns,
+ 	flash=\E[?5l$<50>\E[?5h,
+-	is2=\E[?2h\E[?3l\E[?5h\E[?7h\E[?8h\E>\E[?1l\E G\E[?42l\E[?4l,
+-	use=bq300-8-pc,
++	is2=\E[?2h\E[?3l\E[?5h\E[?7h\E[?8h\E>\E[?1l\E\sG\E[?42l\E[?4
++	    l, use=bq300-8-pc,
+ bq300-8-pc-w|Questar 303 with PC keyboard full 8 bits 132 columns,
+ 	cols#132, wsl#132,
+-	is2=\E[?2h\E[?3h\E[?5l\E[?7h\E[?8h\E>\E[?1l\E G\E[?42l\E[?4l,
++	is2=\E[?2h\E[?3h\E[?5l\E[?7h\E[?8h\E>\E[?1l\E\sG\E[?42l\E[?4
++	    l,
+ 	rs2=\E[?3h, use=bq300-8-pc,
+ bq300-8-pc-w-rv|Questar 303 with PC keyboard full 8 bits reverse 132 columns,
+ 	cols#132, wsl#132,
+ 	flash=\E[?5l$<50>\E[?5h,
+-	is2=\E[?2h\E[?3h\E[?5h\E[?7h\E[?8h\E>\E[?1l\E G\E[?42l\E[?4l,
++	is2=\E[?2h\E[?3h\E[?5h\E[?7h\E[?8h\E>\E[?1l\E\sG\E[?42l\E[?4
++	    l,
+ 	rs2=\E[?3h, use=bq300-8-pc,
+ 
+ #======================================================#
+@@ -19538,9 +20309,12 @@
+ 	bel=^G, clear=^L, cr=^M, cub1=^H, cud1=^J, cuf1=^],
+ 	cup=\001M%p2%d\,%p1%d\,, cuu1=^K, dch1=^A<1, dl1=^A<2,
+ 	ed=^Al, el=^A`, home=^\, ich1=^A>1, il1=^A>2, ind=^J, ll=^A|,
+-	rmcup=\001W0\,40\,85\,48\,\014\001W0\,0\,85\,48\,\001M0\,40\,,
++	rmcup=\001W0\,40\,85\,48\,\014\001W0\,0\,85\,48\,\001M0\,40
++	      \,,
+ 	rmso=\001C1\,\001c2\,,
+-	smcup=\001P0\001O1\001R1\001C4\,\001c0\,\014\001M0\,42\,WARNING DOUBLE ENTER ESCAPE and \025\001C1\,\001c2\,\001W0\,0\,79\,39\,,
++	smcup=\001P0\001O1\001R1\001C4\,\001c0\,\014\001M0\,42\,WARN
++	      ING\sDOUBLE\sENTER\sESCAPE\sand\s\025\001C1\,\001c2\,
++	      \001W0\,0\,79\,39\,,
+ 	smso=\001C4\,\001c7\,, uc=\001\001_\001\0,
+ 
+ #### Computer Automation
+@@ -19630,7 +20404,8 @@
+ 	rep=\E\023%p1%c%p2%c, ri=^K, rmso=\E^D, rmul=\E^D,
+ 	rs1=\E\014\E\016\0\230\0\317\025\027\030\E\004,
+ 	smso=\E^E, smul=\E^F,
+-	wind=\E\014\E\016%p1%'\0'%+%c%p2%'\0'%+%c%p3%'\0'%+%c%p4%'\0'%+%c\025,
++	wind=\E\014\E\016%p1%'\0'%+%c%p2%'\0'%+%c%p3%'\0'%+%c%p4%'
++	     \0'%+%c\025,
+ 
+ #### DEC terminals (Obsolete types: DECwriter and vt40/42/50)
+ #
+@@ -19729,7 +20504,8 @@
+ 	cols#132,
+ 	bel=^G, cr=^M, cub1=^H, cud1=^J, ht=^I, ind=^J,
+ 	is1=\E(B\E[20l\E[w\E[0;132s\E[2g\E[z\E[66t\E[1;66r\E[4g\E>,
+-	is2=\E[9;17;25;33;41;49;57;65;73;81;89;97;105;113;121;129u\r,
++	is2=\E[9;17;25;33;41;49;57;65;73;81;89;97;105;113;121;129u
++	    \r,
+ 	kbs=^H, rmso=\E[w, sgr0=\E[w, smso=\E[6w,
+ dw4|decwriter IV,
+ 	OTbs, am, hc, os,
+@@ -19760,7 +20536,8 @@
+ 	OTbs, am,
+ 	cols#80, lines#27,
+ 	bel=^G, clear=^NR, cub1=^H, cud1=^J, cuf1=^Y,
+-	cup=\017%p1%p1%{16}%m%{2}%*%-%{57}%+%c%p2%p2%{16}%m%{2}%*%-%{57}%+%c,
++	cup=\017%p1%p1%{16}%m%{2}%*%-%{57}%+%c%p2%p2%{16}%m%{2}%*%-
++	    %{57}%+%c,
+ 	cuu1=^Z, dch1=^NV, el=^NU, home=^NQ, ind=^J,
+ 
+ #### Digital Data Research (ddr)
+@@ -19978,18 +20755,19 @@
+ 	kf6=\EOP, kf7=\EOQ, kf8=\EOR, kf9=\EOX, khome=\E[H, lf0=help,
+ 	mc0=\E#7, nel=^M\ED, rc=\E[r, rev=\E[7m, ri=\EM,
+ 	rmcup=\E[?7h, rmso=\E[m, rmul=\E[m,
+-	rs1=\E<\E[1;24r\E[24;1H\E[?7h\E[>4h\E[>1;2;3;5;6;7;8;9l\E[m\E[11m,
++	rs1=\E<\E[1;24r\E[24;1H\E[?7h\E[>4h\E[>1;2;3;5;6;7;8;9l\E[m
++	    \E[11m,
+ 	sc=\E[s, sgr0=\E[m, smcup=\E[?7l, smso=\E[7;2m, smul=\E[4m,
+ 	tbc=\E[3g, tsl=\E[s\E[>5;1h\E[25;%i%dH\E[1K,
+ z29a-kc-uc|h29a-kc-uc|z29 ansi mode with keyckick and underscore cursor,
+-	rs1=\E<\E[1;24r\E[24;1H\E[?7h\E[>1;2;3;4;5;6;7;8;9l\E[m\E[11m,
+-	use=z29a,
++	rs1=\E<\E[1;24r\E[24;1H\E[?7h\E[>1;2;3;4;5;6;7;8;9l\E[m\E[11
++	    m, use=z29a,
+ z29a-nkc-bc|h29a-nkc-bc|z29 ansi mode with block cursor and no keyclick,
+-	rs1=\E<\E[1;24r\E[24;1H\E[?7h\E[>2;4h\E[>1;3;5;6;7;8;9l\E[m\E[11m,
+-	use=z29a,
++	rs1=\E<\E[1;24r\E[24;1H\E[?7h\E[>2;4h\E[>1;3;5;6;7;8;9l\E[m
++	    \E[11m, use=z29a,
+ z29a-nkc-uc|h29a-nkc-uc|z29 ansi mode with underscore cursor and no keyclick,
+-	rs1=\E<\E[1;24r\E[24;1H\E[?7h\E[>2h\E[>1;3;4;5;6;7;8;9l\E[m\E[11m,
+-	use=z29a,
++	rs1=\E<\E[1;24r\E[24;1H\E[?7h\E[>2h\E[>1;3;4;5;6;7;8;9l\E[m
++	    \E[11m, use=z29a,
+ # From: Jeff Bartig  31 Mar 1995
+ z39-a|z39a|zenith39-a|zenith39-ansi|Zenith 39 in ANSI mode,
+ 	am, eslok, hs, mc5i, mir, msgr, xon,
+@@ -20174,7 +20952,9 @@
+ 	xenl@,
+ 	cols#80, lines#24,
+ 	cvvis=\E\^9;0s\E\^7;1s,
+-	is2=\E\^9;0s\E\^7;1s\E[3g\E\^11;9s\E\^11;17s\E\^11;25s\E\^11;33s\E\^11;41s\E\^11;49s\E\^11;57s\E\^11;65s\E\^11;73s\E\^11;81s\E\^11;89s,
++	is2=\E\^9;0s\E\^7;1s\E[3g\E\^11;9s\E\^11;17s\E\^11;25s\E\^11
++	    ;33s\E\^11;41s\E\^11;49s\E\^11;57s\E\^11;65s\E\^11;73s
++	    \E\^11;81s\E\^11;89s,
+ 	rf@, ri=\EM\E[K$<5/>, use=vt100,
+ # The GX-1000 manual is dated 1984.  This looks rather like a VT-52.
+ modgraph2|modgraph gx-1000 80x24 with keypad not enabled,
+@@ -20183,7 +20963,10 @@
+ 	clear=\EH\EJ$<50/>, cub1=^H, cud1=\EB$<2/>,
+ 	cuf1=\EC$<2/>, cup=\EY%p1%{32}%+%c%p2%{32}%+%c$<5/>,
+ 	cuu1=\EA$<2/>, ed=\EJ$<50/>, el=\EK$<3/>, ht=^I,
+-	is2=\E<\E\^5;2s\E\^7;1s\E[3g\E\^11;9s\E\^11;17s\E\^11;25s\E\^11;33s\E\^11;41s\E\^11;49s\E\^11;57s\E\^11;65s\E\^11;73s\E\^11;81s\E\^11;89s\E\^12;0s\E\^14;2s\E\^15;9s\E\^25;1s\E\^9;1s\E\^27;1,
++	is2=\E<\E\^5;2s\E\^7;1s\E[3g\E\^11;9s\E\^11;17s\E\^11;25s\E
++	    \^11;33s\E\^11;41s\E\^11;49s\E\^11;57s\E\^11;65s\E\^11;7
++	    3s\E\^11;81s\E\^11;89s\E\^12;0s\E\^14;2s\E\^15;9s\E\^25;
++	    1s\E\^9;1s\E\^27;1,
+ 	ri=\EI$<5/>,
+ #
+ # Modgraph from Nancy L. Cider 
+@@ -20301,7 +21084,9 @@
+ 	kf3=\EOS, lf0=PF1, lf1=PF2, lf2=PF3, lf3=PF4, ll=\E[24;1H,
+ 	nel=\EE, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, rmkx=\E>,
+ 	rmso=\E[m, rmul=\E[m,
+-	rs1=\E[1w\E[>37m\E[>39m\E[1v\E[20l\E[?3l\E[?6l\E[>5h\E[>6h\E[>7h\E[>8l\E[>9h\E[>10l\E[1;24r\E[m\E[q\E(B\017\E)0\E#5\E>,
++	rs1=\E[1w\E[>37m\E[>39m\E[1v\E[20l\E[?3l\E[?6l\E[>5h\E[>6h
++	    \E[>7h\E[>8l\E[>9h\E[>10l\E[1;24r\E[m\E[q\E(B\017\E)0\E#
++	    5\E>,
+ 	sc=\E7, sgr0=\E[m, smacs=^N, smkx=\E=, smso=\E[7m,
+ 	smul=\E[4m, tbc=\E[3g,
+ # [TO DO: Check out: short forms of ho/cl and ll; reset (\Ec)].
+@@ -20349,7 +21134,8 @@
+ 	lf3=PF4, ll=\E[48H, mc0=\E[i, mc4=\E[4i\E[?4i,
+ 	mc5=\E[?5i\E[5i, nel=\EE, rc=\E8, rev=\E[7m, rmacs=^O,
+ 	rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
+-	rs1=\030\E2\E<\E[4i\E[?4i\E[12h\E[2;4;20l\E[?0;7h\E[?1;3;6;19l\E[r\E[m\E(B\017\E)0\E>,
++	rs1=\030\E2\E<\E[4i\E[?4i\E[12h\E[2;4;20l\E[?0;7h\E[?1;3;6;1
++	    9l\E[r\E[m\E(B\017\E)0\E>,
+ 	sc=\E7, sgr0=\E[m, smacs=^N, smkx=\E[?1h\E=, smso=\E[7m,
+ 	smul=\E[4m, tbc=\E[3g,
+ hirez100-w|Selanar HiREZ-100 in 132-column mode,
+@@ -20416,7 +21202,8 @@
+ 	bel=^G, clear=^L, cr=^M, cub1=^D, cud1=^J, cuf1=^S,
+ 	cup=\013%p2%c%p1%c, cuu1=^A, dch1=^\^H, dl1=^Z, ed=^V, el=^F,
+ 	home=^P, ich1=^\^X, il1=^\^Y, ind=^N,
+-	is2=\034\022\036\023\036\004\035\027\011\023\036\035\036\017\035\027\022\011,
++	is2=\034\022\036\023\036\004\035\027\011\023\036\035\036
++	    \017\035\027\022\011,
+ 	ll=^C, ri=^O, rmso=^^^F, smso=^^^V,
+ 
+ #### Synertek
+@@ -20532,7 +21319,8 @@
+ 	cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, dch1=\EQ,
+ 	dl1=\EM$<2*>, ed=\EJ$<1>, el=\EK, home=\EH, ht=^I, hts=\EF,
+ 	ich1=\EP, il1=\EL$<2*>, ind=^J, ip=$<0.4*>,
+-	is2=\Ee\EU01^Z1\EV\EU02^Z2\EV\EU03^Z3\EV\EU04^Z4\EV\EU05^Z5\EV\EU06^Z6\EV\EU07^Z7\EV\EU08^Z8\EV\Ef,
++	is2=\Ee\EU01^Z1\EV\EU02^Z2\EV\EU03^Z3\EV\EU04^Z4\EV\EU05^Z5
++	    \EV\EU06^Z6\EV\EU07^Z7\EV\EU08^Z8\EV\Ef,
+ 	kf1=^Z1, kf2=^Z2, kf3=^Z3, kf4=^Z4, kf5=^Z5, kf6=^Z6, kf7=^Z7,
+ 	kf8=^Z8, rmso=\ER@, rmul=\ER@, smso=\s\ERD, smul=\ERH,
+ 	tbc=\EG,
+@@ -20802,7 +21590,8 @@
+ 	knp=\E[U, kpp=\E[V, krmir=\E0, nel=\r\E[S, rc=\E8, rev=\E[7m,
+ 	ri=\E[T, rin=\E[%p1%dT, rmacs=\E[10m, rmso=\E[m, rmul=\E[m,
+ 	sc=\E7,
+-	sgr=\E[10m\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p9%t;12%e;10%;%?%p7%t;9%;m,
++	sgr=\E[10m\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p5%t;
++	    2%;%?%p6%t;1%;%?%p9%t;12%e;10%;%?%p7%t;9%;m,
+ 	sgr0=\E[0;10m, smacs=\E[12m, smso=\E[7m, smul=\E[4m,
+ 	tbc=\E[3g, vpa=\E[%i%p1%dd, use=klone+color,
+ # (pc6300plus: removed ":KM=/usr/lib/ua/kmap.s5:"; renamed BO/EE/CI/CV -- esr)
+@@ -21166,11 +21955,20 @@
+ 	kcud1=\Ew\r, kcuf1=\Ev\r, kcuu1=\Et\r, kf1=\Ep\r,
+ 	kf2=\Eq\r, kf3=\Er\r, kf4=\Es\r, kf5=\Et\r, kf6=\Eu\r,
+ 	kf7=\Ev\r, kf8=\Ew\r, khome=\Ep\r,
+-	op=\E&bn\E&bB\E&bG\E&bR%{0}%PX%{0}%PY%{0}%PZ%{1}%PW%{1}%PV%{1}%PU,
++	op=\E&bn\E&bB\E&bG\E&bR%{0}%PX%{0}%PY%{0}%PZ%{1}%PW%{1}%PV
++	   %{1}%PU,
+ 	rev=%?%gB%{0}%=%t\E&dB%{1}%PB%;, rmir=\ER, rmkx=\E&jA,
+-	setb=\E&bn%?%gA%t\E&dA%;%?%gB%t\E&dB%;%?%gH%t\E&dH%;%?%gU%t\E&bR%;%?%gV%t\E&bG%;%?%gW%t\E&bB%;%?%p1%{1}%&%t\E&bb%{1}%e%{0}%;%PZ%?%p1%{2}%&%t\E&bg%{1}%e%{0}%;%PY%?%p1%{4}%&%t\E&br%{1}%e%{0}%;%PX,
+-	setf=\E&bn%?%gA%t\E&dA%;%?%gB%t\E&dB%;%?%gH%t\E&dH%;%?%gX%t\E&br%;%?%gY%t\E&bg%;%?%gZ%t\E&bb%;%?%p1%{1}%&%t\E&bB%{1}%e%{0}%;%PW%?%p1%{2}%&%t\E&bG%{1}%e%{0}%;%PV%?%p1%{4}%&%t\E&bR%{1}%e%{0}%;%PU,
+-	sgr=\E&d@%{0}%PA%{0}%PB%{0}%PD%{0}%PH%?%p1%p3%p5%|%|%t\E&dB%{1}%PB%;%?%p4%t\E&dA%{1}%PA%;%?%p6%t\E&dH%{1}%PH%;%?%p2%t\E&dD%;,
++	setb=\E&bn%?%gA%t\E&dA%;%?%gB%t\E&dB%;%?%gH%t\E&dH%;%?%gU%t
++	     \E&bR%;%?%gV%t\E&bG%;%?%gW%t\E&bB%;%?%p1%{1}%&%t\E&bb
++	     %{1}%e%{0}%;%PZ%?%p1%{2}%&%t\E&bg%{1}%e%{0}%;%PY%?%p1
++	     %{4}%&%t\E&br%{1}%e%{0}%;%PX,
++	setf=\E&bn%?%gA%t\E&dA%;%?%gB%t\E&dB%;%?%gH%t\E&dH%;%?%gX%t
++	     \E&br%;%?%gY%t\E&bg%;%?%gZ%t\E&bb%;%?%p1%{1}%&%t\E&bB
++	     %{1}%e%{0}%;%PW%?%p1%{2}%&%t\E&bG%{1}%e%{0}%;%PV%?%p1
++	     %{4}%&%t\E&bR%{1}%e%{0}%;%PU,
++	sgr=\E&d@%{0}%PA%{0}%PB%{0}%PD%{0}%PH%?%p1%p3%p5%|%|%t\E&dB
++	    %{1}%PB%;%?%p4%t\E&dA%{1}%PA%;%?%p6%t\E&dH%{1}%PH%;%?%p2
++	    %t\E&dD%;,
+ 	sgr0=\E&d@%{0}%PA%{0}%PB%{0}%PH, smir=\EQ, smkx=\E&jB,
+ 	smso=\E&dD, smul=\E&dD, tbc=\E3, vpa=\E&a%p1%dY,
+ 
+@@ -21181,7 +21979,8 @@
+ gs6300|emots|AT&T PC6300 with EMOTS terminal emulator,
+ 	am, bce, msgr, xon,
+ 	colors#8, cols#80, it#8, lines#24, pairs#63,
+-	acsc=++\,\,--..``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
++	acsc=++\,\,--..``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyz
++	     z{{||}}~~,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=^M,
+ 	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=^J,
+ 	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
+@@ -21400,7 +22199,8 @@
+ dwk|dwk-vt|dwk terminal,
+ 	am,
+ 	cols#80, it#8, lines#24,
+-	acsc=+\^\,Q-S.M0\177`+a\:f'g#h#i#jXkClJmFnNo~qUs_tEuPv\\wKxW~_,
++	acsc=+\^\,Q-S.M0\177`+a\:f'g#h#i#jXkClJmFnNo~qUs_tEuPv
++	     \\wKxW~_,
+ 	bel=^G, clear=\EH\EJ, cr=^M, cub1=^H, cud1=^J, cuf1=\EC,
+ 	cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, dch1=\EP,
+ 	ed=\EJ, el=\EK, home=\EH, ht=^I, ich1=\EQ, ind=^J, kbs=\177,
+@@ -21412,7 +22212,8 @@
+ env230|envision230|envision 230 graphics terminal,
+ 	xenl@,
+ 	enacs@, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, rmacs@,
+-	sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m$<2>,
++	sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;
++	    1%;m$<2>,
+ 	sgr0=\E[0m$<2>, smacs@, use=vt100,
+ # These execuports were impact-printer ttys with a 30- or maybe 15-cps acoustic
+ # coupler attached, the whole rig fitting in a suitcase and more or less
+@@ -21453,7 +22254,9 @@
+ 	ed=\EY$<100>, el=\ET, fsl=^M, home=\036$<2>, ht=\011$<5>,
+ 	hts=\E1, if=/usr/share/tabset/std, il1=\EE$<4>, ind=^J,
+ 	ip=$<3>,
+-	is2=\E`\:\Ee(\EO\Ee6\Ec41\E~4\Ec21\Ed/\Ezz&\E[A\177\Ezz'\E[B\177\Ezz(\E[D\177\Ezz)\E[C\177\Ezz<\E[Q\177\Ezz`\E[F\177\EA1*\EZH12,
++	is2=\E`\:\Ee(\EO\Ee6\Ec41\E~4\Ec21\Ed/\Ezz&\E[A\177\Ezz'\E[B
++	    \177\Ezz(\E[D\177\Ezz)\E[C\177\Ezz<\E[Q\177\Ezz`\E[F
++	    \177\EA1*\EZH12,
+ 	kHOM=\E{, kbs=^H, kcbt=\EI, kcub1=\E[D, kcud1=\E[B,
+ 	kcuf1=\E[C, kcuu1=\E[A, kdch1=\EW, kdl1=\ER, ked=\EY,
+ 	kel=\ET, kend=\E[F, kent=\E7, kf1=^A@\r, kf10=^AI\r,
+@@ -21468,9 +22271,12 @@
+ 	rmacs=\EH^C, rmam=\Ed., rmcup=, rmir=\Er, rmln=\EA11,
+ 	rmxon=\Ec20, rs1=\E~!\E~4$<150>, rs2=\EeF$<150>,
+ 	rs3=\EwG\Ee($<150>,
+-	sgr=%?%p8%t\E)%e\E(%;%?%p9%t\EH\002%e\EH\003%;\EG%{48}%?%p2%t%{8}%|%;%?%p1%p3%|%t%{4}%|%;%?%p4%t%{2}%|%;%?%p1%p5%|%t%{64}%|%;%?%p7%t%{1}%|%;%c,
++	sgr=%?%p8%t\E)%e\E(%;%?%p9%t\EH\002%e\EH\003%;\EG%{48}%?%p2
++	    %t%{8}%|%;%?%p1%p3%|%t%{4}%|%;%?%p4%t%{2}%|%;%?%p1%p5%|
++	    %t%{64}%|%;%?%p7%t%{1}%|%;%c,
+ 	sgr0=\E(\EH\003\EG0\EcD, smacs=\EH^B, smam=\Ed/,
+-	smcup=\Ezz&\E[A\177\Ezz'\E[B\177\Ezz(\E[D\177\Ezz)\E[C\177\Ezz<\E[Q\177,
++	smcup=\Ezz&\E[A\177\Ezz'\E[B\177\Ezz(\E[D\177\Ezz)\E[C\177
++	      \Ezz<\E[Q\177,
+ 	smir=\Eq, smln=\EA10, smxon=\Ec21, tbc=\E0, tsl=\Ez(,
+ 	uc=\EG8\EG0, use=adm+sgr,
+ teletec|Teletec Datascreen,
+@@ -23986,4 +24792,8 @@
+ #	  printing special G2 videotex chars like french accentuated glyph
+ #	  using special cap XC= (patch by Alexandre Montaron).
+ #
++# 2016-10-01
++#	+ add linux-m1 minitel entries (patch by Alexandre Montaron).
++#	+ correct rs2 string for vt100-nam -TD
++#
+ ######## SHANTIH!  SHANTIH!  SHANTIH!
+Index: ncurses/tty/lib_mvcur.c
+Prereq:  1.139 
+--- ncurses-6.0-20160924+/ncurses/tty/lib_mvcur.c	2016-09-10 18:41:32.000000000 +0000
++++ ncurses-6.0-20161001/ncurses/tty/lib_mvcur.c	2016-10-01 17:37:33.000000000 +0000
+@@ -159,7 +159,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_mvcur.c,v 1.139 2016/09/10 18:41:32 tom Exp $")
++MODULE_ID("$Id: lib_mvcur.c,v 1.140 2016/10/01 17:37:33 tom Exp $")
+ 
+ #define WANT_CHAR(sp, y, x) NewScreen(sp)->_line[y].text[x]	/* desired state */
+ 
+@@ -1278,7 +1278,8 @@
+ 		}
+ 	    }
+ 	} else if (buf[0] == 'i') {
+-	    dump_init(NULL, F_TERMINFO, S_TERMINFO, 70, 0, 0, FALSE, FALSE, 0);
++	    dump_init(NULL, F_TERMINFO, S_TERMINFO,
++		      FALSE, 70, 0, 0, FALSE, FALSE, 0);
+ 	    dump_entry(&cur_term->type, FALSE, TRUE, 0, 0);
+ 	    putchar('\n');
+ 	} else if (buf[0] == 'o') {
+Index: package/debian-mingw/changelog
+--- ncurses-6.0-20160924+/package/debian-mingw/changelog	2016-09-24 13:36:42.000000000 +0000
++++ ncurses-6.0-20161001/package/debian-mingw/changelog	2016-10-01 11:52:22.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20160924) unstable; urgency=low
++ncurses6 (6.0+20161001) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 24 Sep 2016 09:36:42 -0400
++ -- Thomas E. Dickey   Sat, 01 Oct 2016 07:52:23 -0400
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.0-20160924+/package/debian-mingw64/changelog	2016-09-24 13:36:42.000000000 +0000
++++ ncurses-6.0-20161001/package/debian-mingw64/changelog	2016-10-01 11:52:22.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20160924) unstable; urgency=low
++ncurses6 (6.0+20161001) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 24 Sep 2016 09:36:42 -0400
++ -- Thomas E. Dickey   Sat, 01 Oct 2016 07:52:23 -0400
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.0-20160924+/package/debian/changelog	2016-09-24 13:36:42.000000000 +0000
++++ ncurses-6.0-20161001/package/debian/changelog	2016-10-01 11:52:22.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20160924) unstable; urgency=low
++ncurses6 (6.0+20161001) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 24 Sep 2016 09:36:42 -0400
++ -- Thomas E. Dickey   Sat, 01 Oct 2016 07:52:23 -0400
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.177 
+--- ncurses-6.0-20160924+/package/mingw-ncurses.nsi	2016-09-24 13:36:42.000000000 +0000
++++ ncurses-6.0-20161001/package/mingw-ncurses.nsi	2016-10-01 11:52:22.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.177 2016/09/24 13:36:42 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.178 2016/10/01 11:52:22 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "0"
+ !define VERSION_YYYY  "2016"
+-!define VERSION_MMDD  "0924"
++!define VERSION_MMDD  "1001"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.0-20160924+/package/mingw-ncurses.spec	2016-09-24 13:36:42.000000000 +0000
++++ ncurses-6.0-20161001/package/mingw-ncurses.spec	2016-10-01 11:52:22.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.0
+-Release: 20160924
++Release: 20161001
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.0-20160924+/package/ncurses.spec	2016-09-24 13:36:42.000000000 +0000
++++ ncurses-6.0-20161001/package/ncurses.spec	2016-10-01 11:52:22.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.0
+-Release: 20160924
++Release: 20161001
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: progs/dump_entry.c
+Prereq:  1.126 
+--- ncurses-6.0-20160924+/progs/dump_entry.c	2016-09-10 20:41:23.000000000 +0000
++++ ncurses-6.0-20161001/progs/dump_entry.c	2016-10-02 01:28:04.000000000 +0000
+@@ -39,12 +39,13 @@
+ #include "termsort.c"		/* this C file is generated */
+ #include 	/* so is this */
+ 
+-MODULE_ID("$Id: dump_entry.c,v 1.126 2016/09/10 20:41:23 tom Exp $")
++MODULE_ID("$Id: dump_entry.c,v 1.141 2016/10/02 01:28:04 tom Exp $")
+ 
+ #define DISCARD(string) string = ABSENT_STRING
+ #define PRINTF (void) printf
+ 
+ #define OkIndex(index,array) ((int)(index) >= 0 && (int)(index) < (int) SIZEOF(array))
++#define TcOutput() (outform == F_TERMCAP || outform == F_TCONVERR)
+ 
+ typedef struct {
+     char *text;
+@@ -60,6 +61,7 @@
+ static int column;		/* current column, limited by 'width' */
+ static int oldcol;		/* last value of column before wrap */
+ static bool pretty;		/* true if we format if-then-else strings */
++static bool wrapped;		/* true if we wrap too-long strings */
+ static bool checking;		/* true if we are checking for tic */
+ static int quickdump;		/* true if we are dumping compiled data */
+ 
+@@ -190,6 +192,7 @@
+ dump_init(const char *version,
+ 	  int mode,
+ 	  int sort,
++	  bool wrap_strings,
+ 	  int twidth,
+ 	  int theight,
+ 	  unsigned traceval,
+@@ -201,6 +204,7 @@
+     width = twidth;
+     height = theight;
+     pretty = formatted;
++    wrapped = wrap_strings;
+     checking = check;
+     quickdump = (quick & 3);
+ 
+@@ -420,19 +424,198 @@
+     column = indent;
+ }
+ 
++static int
++op_length(const char *src, int offset)
++{
++    int result = 0;
++    int ch;
++    if (offset > 0 && src[offset - 1] == '\\') {
++	result = 0;
++    } else {
++	result++;		/* for '%' mark */
++	ch = src[offset + result];
++	if (TcOutput()) {
++	    if (ch == '>') {
++		result += 3;
++	    } else if (ch == '+') {
++		result += 2;
++	    } else {
++		result++;
++	    }
++	} else if (ch == '\'') {
++	    result += 3;
++	} else if (ch == L_CURL[0]) {
++	    int n = result;
++	    while ((ch = src[offset + n]) != '\0') {
++		if (ch == R_CURL[0]) {
++		    result = ++n;
++		    break;
++		}
++		n++;
++	    }
++	} else if (strchr("pPg", ch) != 0) {
++	    result += 2;
++	} else {
++	    result++;		/* ordinary operator */
++	}
++    }
++    return result;
++}
++
++/*
++ * When wrapping too-long strings, avoid splitting a backslash sequence, or
++ * a terminfo '%' operator.  That will leave things a little ragged, but avoids
++ * a stray backslash at the end of the line, as well as making the result a
++ * little more readable.
++ */
++static int
++find_split(const char *src, int step, int size)
++{
++    int result = size;
++    int n;
++    if (size > 0) {
++	/* check if that would split a backslash-sequence */
++	int mark = size;
++	for (n = size - 1; n > 0; --n) {
++	    int ch = UChar(src[step + n]);
++	    if (ch == '\\') {
++		if (n > 0 && src[step + n - 1] == ch)
++		    --n;
++		mark = n;
++		break;
++	    } else if (!isalnum(ch)) {
++		break;
++	    }
++	}
++	if (mark < size) {
++	    result = mark;
++	} else {
++	    /* check if that would split a backslash-sequence */
++	    for (n = size - 1; n > 0; --n) {
++		int ch = UChar(src[step + n]);
++		if (ch == '%') {
++		    int need = op_length(src, step + n);
++		    if ((n + need) > size)
++			mark = n;
++		    break;
++		}
++	    }
++	    if (mark < size) {
++		result = mark;
++	    }
++	}
++    }
++    return result;
++}
++
++/*
++ * If we are going to wrap lines, we cannot leave literal spaces because that
++ * would be ambiguous if we split on that space.
++ */
++static char *
++fill_spaces(const char *src)
++{
++    const char *fill = "\\s";
++    size_t need = strlen(src);
++    size_t size = strlen(fill);
++    char *result = 0;
++    int pass;
++    int s, d;
++    for (pass = 0; pass < 2; ++pass) {
++	for (s = d = 0; src[s] != '\0'; ++s) {
++	    if (src[s] == ' ') {
++		if (pass) {
++		    strcpy(&result[d], fill);
++		    d += (int) size;
++		} else {
++		    need += size;
++		}
++	    } else {
++		if (pass) {
++		    result[d++] = src[s];
++		} else {
++		    ++d;
++		}
++	    }
++	}
++	if (pass) {
++	    result[d] = '\0';
++	} else {
++	    result = malloc(need + 1);
++	    if (result == 0)
++		failed("fill_spaces");
++	}
++    }
++    return result;
++}
++
+ static void
+ wrap_concat(const char *src)
+ {
+-    size_t need = strlen(src);
+-    size_t want = strlen(separator) + need;
++    int need = (int) strlen(src);
++    int gaps = (int) strlen(separator);
++    int want = gaps + need;
+ 
+     if (column > indent
+-	&& column + (int) want > width) {
++	&& column + want > width) {
++	force_wrap();
++    }
++    if (wrapped &&
++	(width >= 0) &&
++	(column + want) > width &&
++	(!TcOutput() || strncmp(src, "..", 2))) {
++	int step = 0;
++	int used = width > 32 ? width : 32;
++	int size = used;
++	int base = 0;
++	char *p, align[9];
++	const char *my_t = trailer;
++	char *fill = fill_spaces(src);
++
++	need = (int) strlen(fill);
++
++	if (TcOutput())
++	    trailer = "\\\n\t ";
++
++	if ((p = strchr(fill, '=')) != 0) {
++	    base = (int) (p + 1 - fill);
++	    if (base > 8)
++		base = 8;
++	    sprintf(align, "%*s", base, " ");
++	} else {
++	    align[base] = '\0';
++	}
++	while ((column + (need + gaps)) > used) {
++	    size = used;
++	    if (size > ((int) strlen(fill) - step)) {
++		size = ((int) strlen(fill) - step);
++	    }
++	    if (step) {
++		strcpy_DYN(&outbuf, align);
++		size -= base;
++	    }
++	    size = find_split(fill, step, size);
++	    strncpy_DYN(&outbuf, fill + step, (size_t) size);
++	    step += size;
++	    need -= size;
++	    if (need > 0)
++		force_wrap();
++	}
++	if (need > 0) {
++	    if (step)
++		strcpy_DYN(&outbuf, align);
++	    strcpy_DYN(&outbuf, fill + step);
++	}
++	strcpy_DYN(&outbuf, separator);
++	trailer = my_t;
+ 	force_wrap();
++
++	free(fill);
++    } else {
++	strcpy_DYN(&outbuf, src);
++	strcpy_DYN(&outbuf, separator);
++	column += need;
+     }
+-    strcpy_DYN(&outbuf, src);
+-    strcpy_DYN(&outbuf, separator);
+-    column += (int) need;
+ }
+ 
+ #define IGNORE_SEP_TRAIL(first,last,sep_trail) \
+@@ -808,7 +991,7 @@
+ 		_nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer))
+ 			    "%s@", name);
+ 		WRAP_CONCAT;
+-	    } else if (outform == F_TERMCAP || outform == F_TCONVERR) {
++	    } else if (TcOutput()) {
+ 		char *srccap = _nc_tic_expand(capability, TRUE, numbers);
+ 		int params = (((i < (int) SIZEOF(parametrized)) &&
+ 			       (i < STRCOUNT))
+@@ -1206,7 +1389,7 @@
+ 	return;
+     }
+ 
+-    if (outform == F_TERMCAP || outform == F_TCONVERR) {
++    if (TcOutput()) {
+ 	critlen = MAX_TERMCAP_LENGTH;
+ 	legend = "older termcap";
+ 	infodump = FALSE;
+@@ -1321,7 +1504,7 @@
+ {
+     char buffer[MAX_TERMINFO_LENGTH];
+ 
+-    if (outform == F_TERMCAP || outform == F_TCONVERR)
++    if (TcOutput())
+ 	trim_trailing();
+     _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer))
+ 		"%s%s", infodump ? "use=" : "tc=", name);
+@@ -1335,7 +1518,7 @@
+      * Trim any remaining whitespace.
+      */
+     if (outbuf.used != 0) {
+-	bool infodump = (outform != F_TERMCAP && outform != F_TCONVERR);
++	bool infodump = !TcOutput();
+ 	char delim = (char) (infodump ? ',' : ':');
+ 	int j;
+ 
+Index: progs/dump_entry.h
+Prereq:  1.37 
+--- ncurses-6.0-20160924+/progs/dump_entry.h	2015-09-05 15:49:58.000000000 +0000
++++ ncurses-6.0-20161001/progs/dump_entry.h	2016-10-01 15:24:26.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -33,7 +33,7 @@
+  ****************************************************************************/
+ 
+ /*
+- * $Id: dump_entry.h,v 1.37 2015/09/05 15:49:58 tom Exp $
++ * $Id: dump_entry.h,v 1.39 2016/10/01 15:24:26 tom Exp $
+  *
+  * Dump control definitions and variables
+  */
+@@ -72,11 +72,14 @@
+ extern int show_entry(void);
+ extern void compare_entry(PredHook, TERMTYPE *, bool);
+ extern void dump_entry(TERMTYPE *, int, int, int, PredFunc);
+-extern void dump_init(const char *, int, int, int, int, unsigned, bool,
++extern void dump_init(const char *, int, int, bool, int, int, unsigned, bool,
+ 		      bool, int);
+ extern void dump_uses(const char *, bool);
+ extern void repair_acsc(TERMTYPE *tp);
+ 
++#define L_CURL "{"
++#define R_CURL "}"
++
+ #define FAIL	-1
+ 
+ #endif /* DUMP_ENTRY_H */
+Index: progs/infocmp.c
+Prereq:  1.137 
+--- ncurses-6.0-20160924+/progs/infocmp.c	2016-09-10 20:44:35.000000000 +0000
++++ ncurses-6.0-20161001/progs/infocmp.c	2016-10-01 19:09:22.000000000 +0000
+@@ -42,10 +42,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: infocmp.c,v 1.137 2016/09/10 20:44:35 tom Exp $")
+-
+-#define L_CURL "{"
+-#define R_CURL "}"
++MODULE_ID("$Id: infocmp.c,v 1.140 2016/10/01 19:09:22 tom Exp $")
+ 
+ #define MAX_STRING	1024	/* maximum formatted string */
+ 
+@@ -989,8 +986,8 @@
+     int i, n;
+ 
+     memset(heads, 0, sizeof(heads));
+-    dump_init((char *) 0, F_LITERAL, S_TERMINFO, 0, 65535, itrace, FALSE,
+-	      FALSE, FALSE);
++    dump_init((char *) 0, F_LITERAL, S_TERMINFO,
++	      FALSE, 0, 65535, itrace, FALSE, FALSE, FALSE);
+ 
+     for (n = 0; n < argc && n < MAXCOMPARE; n++) {
+ 	if (freopen(argv[n], "r", stdin) == 0)
+@@ -1186,6 +1183,7 @@
+ 	,"  -T    eliminate size limits (test)"
+ 	,"  -U    do not post-process entries"
+ 	,"  -V    print version"
++	,"  -W    wrap long strings per -w[n]"
+ #if NCURSES_XNAMES
+ 	,"  -a    with -F, list commented-out caps"
+ #endif
+@@ -1509,6 +1507,7 @@
+     bool init_analyze = FALSE;
+     bool suppress_untranslatable = FALSE;
+     int quickdump = 0;
++    bool wrap_strings = FALSE;
+ 
+     /* where is the terminfo database location going to default to? */
+     restdir = firstdir = 0;
+@@ -1530,7 +1529,7 @@
+ 
+     while ((c = getopt(argc,
+ 		       argv,
+-		       "01A:aB:CcDdEeFfGgIiKLlnpQ:qR:rs:TtUuVv:w:x")) != -1) {
++		       "01A:aB:CcDdEeFfGgIiKLlnpQ:qR:rs:TtUuVv:Ww:x")) != -1) {
+ 	switch (c) {
+ 	case '0':
+ 	    mwidth = 65535;
+@@ -1695,6 +1694,10 @@
+ 	    set_trace_level(itrace);
+ 	    break;
+ 
++	case 'W':
++	    wrap_strings = TRUE;
++	    break;
++
+ 	case 'w':
+ 	    mwidth = optarg_to_number();
+ 	    break;
+@@ -1757,7 +1760,8 @@
+     }
+ 
+     /* set up for display */
+-    dump_init(tversion, outform, sortmode, mwidth, mheight, itrace,
++    dump_init(tversion, outform, sortmode,
++	      wrap_strings, mwidth, mheight, itrace,
+ 	      formatted, FALSE, quickdump);
+ 
+     if (!filecompare) {
+Index: progs/tic.c
+Prereq:  1.223 
+--- ncurses-6.0-20160924+/progs/tic.c	2016-09-05 00:27:13.000000000 +0000
++++ ncurses-6.0-20161001/progs/tic.c	2016-10-01 12:46:54.000000000 +0000
+@@ -48,7 +48,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: tic.c,v 1.223 2016/09/05 00:27:13 tom Exp $")
++MODULE_ID("$Id: tic.c,v 1.224 2016/10/01 12:46:54 tom Exp $")
+ 
+ #define STDIN_NAME ""
+ 
+@@ -170,6 +170,7 @@
+ #endif
+ 	DATA("  -U         suppress post-processing of entries")
+ 	DATA("  -V         print version")
++	DATA("  -W         wrap long strings according to -w[n] option")
+ 	DATA("  -v[n]      set verbosity level")
+ 	DATA("  -w[n]      set format width for translation output")
+ #if NCURSES_XNAMES
+@@ -700,6 +701,7 @@
+     bool suppress_untranslatable = FALSE;
+     int quickdump = 0;
+     bool quiet = FALSE;
++    bool wrap_strings = FALSE;
+ 
+     log_fp = stderr;
+ 
+@@ -725,7 +727,7 @@
+      * be optional.
+      */
+     while ((this_opt = getopt(argc, argv,
+-			      "0123456789CDIKLNQR:TUVace:fGgo:qrstvwx")) != -1) {
++			      "0123456789CDIKLNQR:TUVWace:fGgo:qrstvwx")) != -1) {
+ 	if (isdigit(this_opt)) {
+ 	    switch (last_opt) {
+ 	    case 'Q':
+@@ -801,6 +803,9 @@
+ 	case 'V':
+ 	    puts(curses_version());
+ 	    ExitProgram(EXIT_SUCCESS);
++	case 'W':
++	    wrap_strings = TRUE;
++	    break;
+ 	case 'c':
+ 	    check_only = TRUE;
+ 	    break;
+@@ -929,15 +934,18 @@
+ 
+     if (infodump || check_only) {
+ 	dump_init(tversion,
+-		  smart_defaults
+-		  ? outform
+-		  : F_LITERAL,
+-		  sortmode, width, height, debug_level, formatted ||
+-		  check_only, check_only, quickdump);
++		  (smart_defaults
++		   ? outform
++		   : F_LITERAL),
++		  sortmode,
++		  wrap_strings, width, height,
++		  debug_level, formatted || check_only, check_only, quickdump);
+     } else if (capdump) {
+ 	dump_init(tversion,
+ 		  outform,
+-		  sortmode, width, height, debug_level, FALSE, FALSE, FALSE);
++		  sortmode,
++		  wrap_strings, width, height,
++		  debug_level, FALSE, FALSE, FALSE);
+     }
+ 
+     /* parse entries out of the source file */
diff --git a/ncurses-6.0-20161008.patch b/ncurses-6.0-20161008.patch
new file mode 100644
index 0000000..dade22b
--- /dev/null
+++ b/ncurses-6.0-20161008.patch
@@ -0,0 +1,15174 @@
+# ncurses 6.0 - patch 20161008 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.0 is at
+# 	ftp.gnu.org:/pub/gnu
+#
+# Patches for ncurses 6.0 can be found at
+# 	ftp://invisible-island.net/ncurses/6.0
+#	http://invisible-mirror.net/archives/ncurses/6.0 
+#
+# ------------------------------------------------------------------------------
+# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20161008.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Oct  9 01:54:00 UTC 2016
+# ------------------------------------------------------------------------------
+# NEWS                             |    7 
+# VERSION                          |    2 
+# aclocal.m4                       |    8 
+# configure                        | 1638 ++++++++++-----------
+# dist.mk                          |    4 
+# ncurses/tinfo/lib_baudrate.c     |   10 
+# package/debian-mingw/changelog   |    4 
+# package/debian-mingw64/changelog |    4 
+# package/debian/changelog         |    4 
+# package/mingw-ncurses.nsi        |    4 
+# package/mingw-ncurses.spec       |    2 
+# package/ncurses.spec             |    2 
+# progs/dump_entry.c               |    6 
+# test/aclocal.m4                  |    8 
+# test/configure                   | 2808 ++++++++++++++++++-------------------
+# 15 files changed, 2266 insertions(+), 2245 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.2673 
+--- ncurses-6.0-20161001+/NEWS	2016-10-02 01:30:44.000000000 +0000
++++ ncurses-6.0-20161008/NEWS	2016-10-09 01:52:39.000000000 +0000
+@@ -25,7 +25,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.2673 2016/10/02 01:30:44 tom Exp $
++-- $Id: NEWS,v 1.2677 2016/10/09 01:52:39 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -45,6 +45,11 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20161008
++	+ adjust size in infocmp/tic to work with strlcpy.
++	+ fix configure script to record when strlcat is found on OpenBSD.
++	+ build-fix for "recent" OpenBSD vs baudrate.
++
+ 20161001
+ 	+ add -W option to tic/infocmp to force long strings to wrap.  This is
+ 	  in addition to the -w option which attempts to fit capabilities into
+Index: VERSION
+--- ncurses-6.0-20161001+/VERSION	2016-10-01 11:52:22.000000000 +0000
++++ ncurses-6.0-20161008/VERSION	2016-10-03 00:57:15.000000000 +0000
+@@ -1 +1 @@
+-5:0:9	6.0	20161001
++5:0:9	6.0	20161008
+Index: aclocal.m4
+Prereq:  1.800 
+--- ncurses-6.0-20161001+/aclocal.m4	2016-09-10 19:33:21.000000000 +0000
++++ ncurses-6.0-20161008/aclocal.m4	2016-10-08 21:35:33.000000000 +0000
+@@ -28,7 +28,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.800 2016/09/10 19:33:21 tom Exp $
++dnl $Id: aclocal.m4,v 1.801 2016/10/08 21:35:33 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -1592,7 +1592,7 @@
+ AC_MSG_RESULT($cf_cv_enable_rpath)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_ENABLE_STRING_HACKS version: 4 updated: 2016/09/10 15:33:21
++dnl CF_ENABLE_STRING_HACKS version: 5 updated: 2016/10/08 17:34:11
+ dnl ----------------------
+ dnl On a few platforms, the compiler and/or loader nags with untruthful
+ dnl comments stating that "most" uses of strcat/strcpy/sprintf are incorrect,
+@@ -1619,7 +1619,9 @@
+ if test "x$with_string_hacks" = "xyes"; then
+  	AC_DEFINE(USE_STRING_HACKS,1,[Define to 1 to work around bogus compiler/loader warnings])
+ 	AC_MSG_WARN(enabling string-hacks to work around bogus compiler/loader warnings)
+-	AC_CHECK_FUNC(strlcat,,[
++	AC_CHECK_FUNC(strlcat,[
++		AC_DEFINE(HAVE_STRLCAT,1,[Define to 1 if we have strlcat function])
++		],[
+ 		AC_CHECK_LIB(bsd,strlcat,[
+ 			CF_ADD_LIB(bsd)
+ 			AC_CHECK_HEADERS(bsd/string.h)
+Index: configure
+--- ncurses-6.0-20161001+/configure	2016-09-10 21:48:23.000000000 +0000
++++ ncurses-6.0-20161008/configure	2016-10-08 21:36:01.000000000 +0000
+@@ -13862,10 +13862,14 @@
+ echo "$as_me:13862: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test $ac_cv_func_strlcat = yes; then
+-  :
++
++cat >>confdefs.h <<\EOF
++#define HAVE_STRLCAT 1
++EOF
++
+ else
+ 
+-		echo "$as_me:13868: checking for strlcat in -lbsd" >&5
++		echo "$as_me:13872: checking for strlcat in -lbsd" >&5
+ echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_strlcat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13873,7 +13877,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13876 "configure"
++#line 13880 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13892,16 +13896,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13895: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13899: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13898: \$? = $ac_status" >&5
++  echo "$as_me:13902: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13901: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13905: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13904: \$? = $ac_status" >&5
++  echo "$as_me:13908: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -13912,7 +13916,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13915: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:13919: result: $ac_cv_lib_bsd_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6
+ if test $ac_cv_lib_bsd_strlcat = yes; then
+ 
+@@ -13935,23 +13939,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:13938: checking for $ac_header" >&5
++echo "$as_me:13942: 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 13944 "configure"
++#line 13948 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:13948: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:13952: \"$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:13954: \$? = $ac_status" >&5
++  echo "$as_me:13958: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -13970,7 +13974,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:13973: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:13977: 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 <&5
++echo "$as_me:13998: 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 14000 "configure"
++#line 14004 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -14028,16 +14032,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14031: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14035: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14034: \$? = $ac_status" >&5
++  echo "$as_me:14038: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14037: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14041: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14040: \$? = $ac_status" >&5
++  echo "$as_me:14044: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -14047,7 +14051,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:14050: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:14054: 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 <&5
++echo "$as_me:14067: checking if you want to enable runtime assertions" >&5
+ echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
+ 
+ # Check whether --enable-assertions or --disable-assertions was given.
+@@ -14070,7 +14074,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:14073: result: $with_assertions" >&5
++echo "$as_me:14077: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -14086,7 +14090,7 @@
+ 
+ ###	use option --disable-leaks to suppress "permanent" leaks, for testing
+ 
+-echo "$as_me:14089: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:14093: 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.
+@@ -14103,7 +14107,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:14106: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:14110: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case .$with_cflags in
+@@ -14197,23 +14201,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:14200: checking for dmalloc.h" >&5
++	echo "$as_me:14204: 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 14206 "configure"
++#line 14210 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:14210: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:14214: \"$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:14216: \$? = $ac_status" >&5
++  echo "$as_me:14220: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -14232,11 +14236,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:14235: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:14239: 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:14239: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:14243: 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
+@@ -14244,7 +14248,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14247 "configure"
++#line 14251 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -14263,16 +14267,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14266: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14270: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14269: \$? = $ac_status" >&5
++  echo "$as_me:14273: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14272: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14276: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14275: \$? = $ac_status" >&5
++  echo "$as_me:14279: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -14283,7 +14287,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:14286: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:14290: 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 <&5
++echo "$as_me:14305: 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.
+@@ -14315,7 +14319,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:14318: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:14322: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case .$with_cflags in
+@@ -14409,23 +14413,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:14412: checking for dbmalloc.h" >&5
++	echo "$as_me:14416: 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 14418 "configure"
++#line 14422 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:14422: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:14426: \"$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:14428: \$? = $ac_status" >&5
++  echo "$as_me:14432: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -14444,11 +14448,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:14447: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:14451: 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:14451: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:14455: 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
+@@ -14456,7 +14460,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14459 "configure"
++#line 14463 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -14475,16 +14479,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14478: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14482: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14481: \$? = $ac_status" >&5
++  echo "$as_me:14485: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14484: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14488: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14487: \$? = $ac_status" >&5
++  echo "$as_me:14491: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -14495,7 +14499,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:14498: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:14502: 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 <&5
++echo "$as_me:14517: checking if you want to use valgrind for testing" >&5
+ echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
+ 
+ # Check whether --with-valgrind or --without-valgrind was given.
+@@ -14527,7 +14531,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:14530: result: ${with_valgrind:-no}" >&5
++echo "$as_me:14534: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case .$with_cflags in
+@@ -14620,7 +14624,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:14623: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:14627: checking if you want to perform memory-leak testing" >&5
+ echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
+ 
+ # Check whether --enable-leaks or --disable-leaks was given.
+@@ -14630,7 +14634,7 @@
+ else
+   : ${with_no_leaks:=no}
+ fi;
+-echo "$as_me:14633: result: $with_no_leaks" >&5
++echo "$as_me:14637: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$with_no_leaks" = yes ; then
+@@ -14682,7 +14686,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:14685: checking whether to add trace feature to all models" >&5
++echo "$as_me:14689: checking whether to add trace feature to all models" >&5
+ echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
+ 
+ # Check whether --with-trace or --without-trace was given.
+@@ -14692,7 +14696,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:14695: result: $cf_with_trace" >&5
++echo "$as_me:14699: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "x$cf_with_trace" = xyes ; then
+@@ -14782,7 +14786,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:14785: checking if we want to use GNAT projects" >&5
++echo "$as_me:14789: checking if we want to use GNAT projects" >&5
+ echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6
+ 
+ # Check whether --enable-gnat-projects or --disable-gnat-projects was given.
+@@ -14799,7 +14803,7 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:14802: result: $enable_gnat_projects" >&5
++echo "$as_me:14806: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+ 
+ ###	Checks for libraries.
+@@ -14809,13 +14813,13 @@
+ 	LIBS=" -lpsapi $LIBS"
+ 	;;
+ (*)
+-echo "$as_me:14812: checking for gettimeofday" >&5
++echo "$as_me:14816: checking for gettimeofday" >&5
+ echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
+ if test "${ac_cv_func_gettimeofday+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 14818 "configure"
++#line 14822 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char gettimeofday (); below.  */
+@@ -14846,16 +14850,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14849: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14853: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14852: \$? = $ac_status" >&5
++  echo "$as_me:14856: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14855: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14859: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14858: \$? = $ac_status" >&5
++  echo "$as_me:14862: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -14865,7 +14869,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:14868: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:14872: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test $ac_cv_func_gettimeofday = yes; then
+ 
+@@ -14875,7 +14879,7 @@
+ 
+ else
+ 
+-echo "$as_me:14878: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:14882: checking for gettimeofday in -lbsd" >&5
+ echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14883,7 +14887,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14886 "configure"
++#line 14890 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -14902,16 +14906,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14905: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14909: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14908: \$? = $ac_status" >&5
++  echo "$as_me:14912: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14911: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14915: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14914: \$? = $ac_status" >&5
++  echo "$as_me:14918: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -14922,7 +14926,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:14925: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:14929: result: $ac_cv_lib_bsd_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
+ if test $ac_cv_lib_bsd_gettimeofday = yes; then
+ 
+@@ -14952,14 +14956,14 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:14955: checking if -lm needed for math functions" >&5
++echo "$as_me:14959: 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 14962 "configure"
++#line 14966 "configure"
+ #include "confdefs.h"
+ 
+ 	#include 
+@@ -14974,16 +14978,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14977: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14981: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14980: \$? = $ac_status" >&5
++  echo "$as_me:14984: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14983: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14987: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14986: \$? = $ac_status" >&5
++  echo "$as_me:14990: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_need_libm=no
+ else
+@@ -14993,7 +14997,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:14996: result: $cf_cv_need_libm" >&5
++echo "$as_me:15000: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+ if test "$cf_cv_need_libm" = yes
+ then
+@@ -15001,13 +15005,13 @@
+ fi
+ 
+ ###	Checks for header files.
+-echo "$as_me:15004: checking for ANSI C header files" >&5
++echo "$as_me:15008: 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 15010 "configure"
++#line 15014 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -15015,13 +15019,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:15018: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:15022: \"$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:15024: \$? = $ac_status" >&5
++  echo "$as_me:15028: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -15043,7 +15047,7 @@
+ 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 15046 "configure"
++#line 15050 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -15061,7 +15065,7 @@
+ 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 15064 "configure"
++#line 15068 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -15082,7 +15086,7 @@
+   :
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15085 "configure"
++#line 15089 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -15108,15 +15112,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:15111: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15115: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15114: \$? = $ac_status" >&5
++  echo "$as_me:15118: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:15116: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15120: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15119: \$? = $ac_status" >&5
++  echo "$as_me:15123: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -15129,7 +15133,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:15132: result: $ac_cv_header_stdc" >&5
++echo "$as_me:15136: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -15142,13 +15146,13 @@
+ 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:15145: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:15149: 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 15151 "configure"
++#line 15155 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$ac_hdr>
+@@ -15163,16 +15167,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15166: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15170: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15169: \$? = $ac_status" >&5
++  echo "$as_me:15173: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15172: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15176: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15175: \$? = $ac_status" >&5
++  echo "$as_me:15179: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -15182,7 +15186,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:15185: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:15189: 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 <&5
++  echo "$as_me:15202: 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
+@@ -15203,7 +15207,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15206 "configure"
++#line 15210 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -15222,16 +15226,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15225: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15229: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15228: \$? = $ac_status" >&5
++  echo "$as_me:15232: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15231: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15235: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15234: \$? = $ac_status" >&5
++  echo "$as_me:15238: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -15242,14 +15246,14 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:15245: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:15249: 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:15252: checking for opendir in -lx" >&5
++  echo "$as_me:15256: 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
+@@ -15257,7 +15261,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15260 "configure"
++#line 15264 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -15276,16 +15280,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15279: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15283: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15282: \$? = $ac_status" >&5
++  echo "$as_me:15286: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15285: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15289: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15288: \$? = $ac_status" >&5
++  echo "$as_me:15292: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -15296,7 +15300,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:15299: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:15303: 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"
+@@ -15304,13 +15308,13 @@
+ 
+ fi
+ 
+-echo "$as_me:15307: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:15311: 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 15313 "configure"
++#line 15317 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -15326,16 +15330,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15329: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15333: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15332: \$? = $ac_status" >&5
++  echo "$as_me:15336: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15335: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15339: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15338: \$? = $ac_status" >&5
++  echo "$as_me:15342: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -15345,7 +15349,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:15348: result: $ac_cv_header_time" >&5
++echo "$as_me:15352: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -15364,13 +15368,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:15367: checking for regcomp" >&5
++echo "$as_me:15371: checking for regcomp" >&5
+ echo $ECHO_N "checking for regcomp... $ECHO_C" >&6
+ if test "${ac_cv_func_regcomp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15373 "configure"
++#line 15377 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char regcomp (); below.  */
+@@ -15401,16 +15405,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15404: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15408: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15407: \$? = $ac_status" >&5
++  echo "$as_me:15411: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15410: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15414: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15413: \$? = $ac_status" >&5
++  echo "$as_me:15417: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_regcomp=yes
+ else
+@@ -15420,7 +15424,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:15423: result: $ac_cv_func_regcomp" >&5
++echo "$as_me:15427: result: $ac_cv_func_regcomp" >&5
+ echo "${ECHO_T}$ac_cv_func_regcomp" >&6
+ if test $ac_cv_func_regcomp = yes; then
+   cf_regex_func=regcomp
+@@ -15429,7 +15433,7 @@
+ 	for cf_regex_lib in $cf_regex_libs
+ 	do
+ 		as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh`
+-echo "$as_me:15432: checking for regcomp in -l$cf_regex_lib" >&5
++echo "$as_me:15436: checking for regcomp in -l$cf_regex_lib" >&5
+ echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15437,7 +15441,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_regex_lib  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15440 "configure"
++#line 15444 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -15456,16 +15460,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15459: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15463: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15462: \$? = $ac_status" >&5
++  echo "$as_me:15466: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15465: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15469: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15468: \$? = $ac_status" >&5
++  echo "$as_me:15472: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -15476,7 +15480,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:15479: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:15483: 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
+ 
+@@ -15505,13 +15509,13 @@
+ fi
+ 
+ if test "$cf_regex_func" = no ; then
+-	echo "$as_me:15508: checking for compile" >&5
++	echo "$as_me:15512: checking for compile" >&5
+ echo $ECHO_N "checking for compile... $ECHO_C" >&6
+ if test "${ac_cv_func_compile+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15514 "configure"
++#line 15518 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char compile (); below.  */
+@@ -15542,16 +15546,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15545: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15549: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15548: \$? = $ac_status" >&5
++  echo "$as_me:15552: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15551: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15555: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15554: \$? = $ac_status" >&5
++  echo "$as_me:15558: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_compile=yes
+ else
+@@ -15561,13 +15565,13 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:15564: result: $ac_cv_func_compile" >&5
++echo "$as_me:15568: result: $ac_cv_func_compile" >&5
+ echo "${ECHO_T}$ac_cv_func_compile" >&6
+ if test $ac_cv_func_compile = yes; then
+   cf_regex_func=compile
+ else
+ 
+-		echo "$as_me:15570: checking for compile in -lgen" >&5
++		echo "$as_me:15574: checking for compile in -lgen" >&5
+ echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6
+ if test "${ac_cv_lib_gen_compile+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15575,7 +15579,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgen  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15578 "configure"
++#line 15582 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -15594,16 +15598,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15597: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15601: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15600: \$? = $ac_status" >&5
++  echo "$as_me:15604: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15603: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15607: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15606: \$? = $ac_status" >&5
++  echo "$as_me:15610: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gen_compile=yes
+ else
+@@ -15614,7 +15618,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:15617: result: $ac_cv_lib_gen_compile" >&5
++echo "$as_me:15621: result: $ac_cv_lib_gen_compile" >&5
+ echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6
+ if test $ac_cv_lib_gen_compile = yes; then
+ 
+@@ -15642,11 +15646,11 @@
+ fi
+ 
+ if test "$cf_regex_func" = no ; then
+-	{ echo "$as_me:15645: WARNING: cannot find regular expression library" >&5
++	{ echo "$as_me:15649: WARNING: cannot find regular expression library" >&5
+ echo "$as_me: WARNING: cannot find regular expression library" >&2;}
+ fi
+ 
+-echo "$as_me:15649: checking for regular-expression headers" >&5
++echo "$as_me:15653: checking for regular-expression headers" >&5
+ echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
+ if test "${cf_cv_regex_hdrs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15658,7 +15662,7 @@
+ 	for cf_regex_hdr in regexp.h regexpr.h
+ 	do
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 15661 "configure"
++#line 15665 "configure"
+ #include "confdefs.h"
+ #include <$cf_regex_hdr>
+ int
+@@ -15673,16 +15677,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15676: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15680: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15679: \$? = $ac_status" >&5
++  echo "$as_me:15683: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15682: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15686: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15685: \$? = $ac_status" >&5
++  echo "$as_me:15689: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -15699,7 +15703,7 @@
+ 	for cf_regex_hdr in regex.h
+ 	do
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 15702 "configure"
++#line 15706 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$cf_regex_hdr>
+@@ -15717,16 +15721,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15720: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15724: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15723: \$? = $ac_status" >&5
++  echo "$as_me:15727: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15726: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15730: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15729: \$? = $ac_status" >&5
++  echo "$as_me:15733: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -15742,11 +15746,11 @@
+ esac
+ 
+ fi
+-echo "$as_me:15745: result: $cf_cv_regex_hdrs" >&5
++echo "$as_me:15749: result: $cf_cv_regex_hdrs" >&5
+ echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
+ 
+ case $cf_cv_regex_hdrs in
+-	(no)		{ echo "$as_me:15749: WARNING: no regular expression header found" >&5
++	(no)		{ echo "$as_me:15753: WARNING: no regular expression header found" >&5
+ echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
+ 	(regex.h)
+ cat >>confdefs.h <<\EOF
+@@ -15785,23 +15789,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:15788: checking for $ac_header" >&5
++echo "$as_me:15792: 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 15794 "configure"
++#line 15798 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:15798: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:15802: \"$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:15804: \$? = $ac_status" >&5
++  echo "$as_me:15808: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -15820,7 +15824,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:15823: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:15827: 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 <&5
++echo "$as_me:15840: 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 15842 "configure"
++#line 15846 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:15846: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:15850: \"$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:15852: \$? = $ac_status" >&5
++  echo "$as_me:15856: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -15868,7 +15872,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:15871: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:15875: 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 <&5
++echo "$as_me:15885: checking for header declaring getopt variables" >&5
+ echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6
+ if test "${cf_cv_getopt_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15888,7 +15892,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15891 "configure"
++#line 15895 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -15901,16 +15905,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15904: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15908: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15907: \$? = $ac_status" >&5
++  echo "$as_me:15911: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15910: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15914: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15913: \$? = $ac_status" >&5
++  echo "$as_me:15917: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -15922,7 +15926,7 @@
+ done
+ 
+ fi
+-echo "$as_me:15925: result: $cf_cv_getopt_header" >&5
++echo "$as_me:15929: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test $cf_cv_getopt_header != none ; then
+ 
+@@ -15943,7 +15947,7 @@
+ # Note: even non-Posix ISC needs  to declare fd_set
+ if test "x$ISC" = xyes ; then
+ 
+-echo "$as_me:15946: checking for main in -lcposix" >&5
++echo "$as_me:15950: checking for main in -lcposix" >&5
+ echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6
+ if test "${ac_cv_lib_cposix_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15951,7 +15955,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lcposix  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15954 "configure"
++#line 15958 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -15963,16 +15967,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15966: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15970: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15969: \$? = $ac_status" >&5
++  echo "$as_me:15973: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15972: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15976: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15975: \$? = $ac_status" >&5
++  echo "$as_me:15979: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_cposix_main=yes
+ else
+@@ -15983,7 +15987,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:15986: result: $ac_cv_lib_cposix_main" >&5
++echo "$as_me:15990: result: $ac_cv_lib_cposix_main" >&5
+ echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6
+ if test $ac_cv_lib_cposix_main = yes; then
+   cat >>confdefs.h <&5
++	echo "$as_me:16001: checking for bzero in -linet" >&5
+ echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6
+ if test "${ac_cv_lib_inet_bzero+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16002,7 +16006,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-linet  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16005 "configure"
++#line 16009 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16021,16 +16025,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16024: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16028: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16027: \$? = $ac_status" >&5
++  echo "$as_me:16031: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16030: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16034: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16033: \$? = $ac_status" >&5
++  echo "$as_me:16037: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_inet_bzero=yes
+ else
+@@ -16041,7 +16045,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16044: result: $ac_cv_lib_inet_bzero" >&5
++echo "$as_me:16048: result: $ac_cv_lib_inet_bzero" >&5
+ echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6
+ if test $ac_cv_lib_inet_bzero = yes; then
+ 
+@@ -16064,14 +16068,14 @@
+ fi
+ fi
+ 
+-echo "$as_me:16067: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:16071: checking if sys/time.h works with sys/select.h" >&5
+ echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
+ if test "${cf_cv_sys_time_select+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16074 "configure"
++#line 16078 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16091,16 +16095,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16094: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16098: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16097: \$? = $ac_status" >&5
++  echo "$as_me:16101: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:16100: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16104: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16103: \$? = $ac_status" >&5
++  echo "$as_me:16107: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -16112,7 +16116,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16115: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:16119: result: $cf_cv_sys_time_select" >&5
+ echo "${ECHO_T}$cf_cv_sys_time_select" >&6
+ test "$cf_cv_sys_time_select" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -16127,13 +16131,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return=return
+ 
+-echo "$as_me:16130: checking for an ANSI C-conforming const" >&5
++echo "$as_me:16134: checking for an ANSI C-conforming const" >&5
+ echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
+ if test "${ac_cv_c_const+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 16136 "configure"
++#line 16140 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -16191,16 +16195,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16194: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16198: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16197: \$? = $ac_status" >&5
++  echo "$as_me:16201: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:16200: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16204: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16203: \$? = $ac_status" >&5
++  echo "$as_me:16207: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -16210,7 +16214,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:16213: result: $ac_cv_c_const" >&5
++echo "$as_me:16217: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -16220,7 +16224,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16223: checking for inline" >&5
++echo "$as_me:16227: 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
+@@ -16228,7 +16232,7 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 16231 "configure"
++#line 16235 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo () {return 0; }
+@@ -16237,16 +16241,16 @@
+ 
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16240: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16244: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16243: \$? = $ac_status" >&5
++  echo "$as_me:16247: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:16246: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16250: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16249: \$? = $ac_status" >&5
++  echo "$as_me:16253: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -16257,7 +16261,7 @@
+ done
+ 
+ fi
+-echo "$as_me:16260: result: $ac_cv_c_inline" >&5
++echo "$as_me:16264: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -16283,7 +16287,7 @@
+ 		:
+ 	elif test "$GCC" = yes
+ 	then
+-		echo "$as_me:16286: checking if $CC supports options to tune inlining" >&5
++		echo "$as_me:16290: checking if $CC supports options to tune inlining" >&5
+ echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6
+ if test "${cf_cv_gcc_inline+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16292,7 +16296,7 @@
+ 		cf_save_CFLAGS=$CFLAGS
+ 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 16295 "configure"
++#line 16299 "configure"
+ #include "confdefs.h"
+ inline int foo(void) { return 1; }
+ int
+@@ -16304,16 +16308,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16307: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16311: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16310: \$? = $ac_status" >&5
++  echo "$as_me:16314: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:16313: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16317: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16316: \$? = $ac_status" >&5
++  echo "$as_me:16320: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gcc_inline=yes
+ else
+@@ -16325,7 +16329,7 @@
+ 		CFLAGS=$cf_save_CFLAGS
+ 
+ fi
+-echo "$as_me:16328: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:16332: result: $cf_cv_gcc_inline" >&5
+ echo "${ECHO_T}$cf_cv_gcc_inline" >&6
+ 		if test "$cf_cv_gcc_inline" = yes ; then
+ 
+@@ -16411,7 +16415,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:16414: checking for signal global datatype" >&5
++echo "$as_me:16418: checking for signal global datatype" >&5
+ echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6
+ if test "${cf_cv_sig_atomic_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16423,7 +16427,7 @@
+ 		"int"
+ 	do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 16426 "configure"
++#line 16430 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16446,16 +16450,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16449: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16453: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16452: \$? = $ac_status" >&5
++  echo "$as_me:16456: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:16455: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16459: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16458: \$? = $ac_status" >&5
++  echo "$as_me:16462: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -16469,7 +16473,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16472: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:16476: result: $cf_cv_sig_atomic_t" >&5
+ echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
+ test "$cf_cv_sig_atomic_t" != no &&
+ cat >>confdefs.h <&5
++echo "$as_me:16485: checking for type of chtype" >&5
+ echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
+ if test "${cf_cv_typeof_chtype+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16488,7 +16492,7 @@
+   cf_cv_typeof_chtype=long
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 16491 "configure"
++#line 16495 "configure"
+ #include "confdefs.h"
+ 
+ #define WANT_BITS 31
+@@ -16523,15 +16527,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:16526: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16530: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16529: \$? = $ac_status" >&5
++  echo "$as_me:16533: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:16531: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16535: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16534: \$? = $ac_status" >&5
++  echo "$as_me:16538: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_typeof_chtype=`cat cf_test.out`
+ else
+@@ -16546,7 +16550,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16549: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:16553: result: $cf_cv_typeof_chtype" >&5
+ echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:16565: checking if unsigned literals are legal" >&5
+ echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6
+ if test "${cf_cv_unsigned_literals+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 16568 "configure"
++#line 16572 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -16577,16 +16581,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16580: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16584: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16583: \$? = $ac_status" >&5
++  echo "$as_me:16587: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:16586: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16590: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16589: \$? = $ac_status" >&5
++  echo "$as_me:16593: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_unsigned_literals=yes
+ else
+@@ -16598,7 +16602,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16601: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:16605: result: $cf_cv_unsigned_literals" >&5
+ echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
+ 
+ cf_cv_1UL="1"
+@@ -16614,14 +16618,14 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:16617: checking if external errno is declared" >&5
++echo "$as_me:16621: 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 16624 "configure"
++#line 16628 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_STDLIB_H
+@@ -16639,16 +16643,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16642: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16646: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16645: \$? = $ac_status" >&5
++  echo "$as_me:16649: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:16648: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16652: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16651: \$? = $ac_status" >&5
++  echo "$as_me:16655: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_dcl_errno=yes
+ else
+@@ -16659,7 +16663,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:16662: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:16666: result: $cf_cv_dcl_errno" >&5
+ echo "${ECHO_T}$cf_cv_dcl_errno" >&6
+ 
+ if test "$cf_cv_dcl_errno" = no ; then
+@@ -16674,14 +16678,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:16677: checking if external errno exists" >&5
++echo "$as_me:16681: 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 16684 "configure"
++#line 16688 "configure"
+ #include "confdefs.h"
+ 
+ #undef errno
+@@ -16696,16 +16700,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16699: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16703: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16702: \$? = $ac_status" >&5
++  echo "$as_me:16706: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16705: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16709: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16708: \$? = $ac_status" >&5
++  echo "$as_me:16712: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_errno=yes
+ else
+@@ -16716,7 +16720,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:16719: result: $cf_cv_have_errno" >&5
++echo "$as_me:16723: result: $cf_cv_have_errno" >&5
+ echo "${ECHO_T}$cf_cv_have_errno" >&6
+ 
+ if test "$cf_cv_have_errno" = yes ; then
+@@ -16729,7 +16733,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16732: checking if data-only library module links" >&5
++echo "$as_me:16736: checking if data-only library module links" >&5
+ echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
+ if test "${cf_cv_link_dataonly+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16737,20 +16741,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:16747: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16746: \$? = $ac_status" >&5
++  echo "$as_me:16750: \$? = $ac_status" >&5
+   (exit $ac_status); } ; then
+ 		mv conftest.o data.o && \
+ 		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
+ 	fi
+ 	rm -f conftest.$ac_ext data.o
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:16770: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16769: \$? = $ac_status" >&5
++  echo "$as_me:16773: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -16779,7 +16783,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 16782 "configure"
++#line 16786 "configure"
+ #include "confdefs.h"
+ 
+ 	int main()
+@@ -16790,15 +16794,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:16793: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16797: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16796: \$? = $ac_status" >&5
++  echo "$as_me:16800: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:16798: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16802: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16801: \$? = $ac_status" >&5
++  echo "$as_me:16805: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -16813,7 +16817,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16816: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:16820: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -16852,13 +16856,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:16855: checking for $ac_func" >&5
++echo "$as_me:16859: 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 16861 "configure"
++#line 16865 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -16889,16 +16893,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16892: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16896: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16895: \$? = $ac_status" >&5
++  echo "$as_me:16899: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16898: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16902: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16901: \$? = $ac_status" >&5
++  echo "$as_me:16905: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -16908,7 +16912,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:16911: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:16915: 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 <&5
++	{ { echo "$as_me:16927: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ if test "x$with_getcap" = "xyes" ; then
+ 
+-echo "$as_me:16930: checking for terminal-capability database functions" >&5
++echo "$as_me:16934: checking for terminal-capability database functions" >&5
+ echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6
+ if test "${cf_cv_cgetent+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16937 "configure"
++#line 16941 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16954,16 +16958,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16957: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16961: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16960: \$? = $ac_status" >&5
++  echo "$as_me:16964: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16963: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16967: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16966: \$? = $ac_status" >&5
++  echo "$as_me:16970: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cgetent=yes
+ else
+@@ -16974,7 +16978,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:16977: result: $cf_cv_cgetent" >&5
++echo "$as_me:16981: result: $cf_cv_cgetent" >&5
+ echo "${ECHO_T}$cf_cv_cgetent" >&6
+ 
+ if test "$cf_cv_cgetent" = yes
+@@ -16984,14 +16988,14 @@
+ #define HAVE_BSD_CGETENT 1
+ EOF
+ 
+-echo "$as_me:16987: checking if cgetent uses const parameter" >&5
++echo "$as_me:16991: checking if cgetent uses const parameter" >&5
+ echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6
+ if test "${cf_cv_cgetent_const+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16994 "configure"
++#line 16998 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17013,16 +17017,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17016: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17020: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17019: \$? = $ac_status" >&5
++  echo "$as_me:17023: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17022: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17026: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17025: \$? = $ac_status" >&5
++  echo "$as_me:17029: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cgetent_const=yes
+ else
+@@ -17033,7 +17037,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:17036: result: $cf_cv_cgetent_const" >&5
++echo "$as_me:17040: result: $cf_cv_cgetent_const" >&5
+ echo "${ECHO_T}$cf_cv_cgetent_const" >&6
+ 	if test "$cf_cv_cgetent_const" = yes
+ 	then
+@@ -17047,14 +17051,14 @@
+ 
+ fi
+ 
+-echo "$as_me:17050: checking for isascii" >&5
++echo "$as_me:17054: checking for isascii" >&5
+ echo $ECHO_N "checking for isascii... $ECHO_C" >&6
+ if test "${cf_cv_have_isascii+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 17057 "configure"
++#line 17061 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -17066,16 +17070,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17069: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17073: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17072: \$? = $ac_status" >&5
++  echo "$as_me:17076: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17075: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17079: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17078: \$? = $ac_status" >&5
++  echo "$as_me:17082: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_isascii=yes
+ else
+@@ -17086,7 +17090,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:17089: result: $cf_cv_have_isascii" >&5
++echo "$as_me:17093: result: $cf_cv_have_isascii" >&5
+ echo "${ECHO_T}$cf_cv_have_isascii" >&6
+ test "$cf_cv_have_isascii" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -17094,10 +17098,10 @@
+ EOF
+ 
+ if test "$ac_cv_func_sigaction" = yes; then
+-echo "$as_me:17097: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:17101: checking whether sigaction needs _POSIX_SOURCE" >&5
+ echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17100 "configure"
++#line 17104 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17111,16 +17115,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17114: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17118: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17117: \$? = $ac_status" >&5
++  echo "$as_me:17121: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17120: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17124: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17123: \$? = $ac_status" >&5
++  echo "$as_me:17127: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   sigact_bad=no
+ else
+@@ -17128,7 +17132,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17131 "configure"
++#line 17135 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -17143,16 +17147,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17146: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17150: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17149: \$? = $ac_status" >&5
++  echo "$as_me:17153: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17152: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17156: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17155: \$? = $ac_status" >&5
++  echo "$as_me:17159: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   sigact_bad=yes
+ 
+@@ -17168,11 +17172,11 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:17171: result: $sigact_bad" >&5
++echo "$as_me:17175: result: $sigact_bad" >&5
+ echo "${ECHO_T}$sigact_bad" >&6
+ fi
+ 
+-echo "$as_me:17175: checking if nanosleep really works" >&5
++echo "$as_me:17179: checking if nanosleep really works" >&5
+ echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6
+ if test "${cf_cv_func_nanosleep+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17182,7 +17186,7 @@
+   cf_cv_func_nanosleep=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 17185 "configure"
++#line 17189 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17207,15 +17211,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:17210: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17214: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17213: \$? = $ac_status" >&5
++  echo "$as_me:17217: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:17215: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17219: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17218: \$? = $ac_status" >&5
++  echo "$as_me:17222: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_nanosleep=yes
+ else
+@@ -17227,7 +17231,7 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:17230: result: $cf_cv_func_nanosleep" >&5
++echo "$as_me:17234: result: $cf_cv_func_nanosleep" >&5
+ echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
+ 
+ test "$cf_cv_func_nanosleep" = "yes" &&
+@@ -17242,23 +17246,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:17245: checking for $ac_header" >&5
++echo "$as_me:17249: 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 17251 "configure"
++#line 17255 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:17255: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17259: \"$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:17261: \$? = $ac_status" >&5
++  echo "$as_me:17265: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17277,7 +17281,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:17280: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:17284: 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 <&5
++echo "$as_me:17299: 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 17301 "configure"
++#line 17305 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:17305: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17309: \"$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:17311: \$? = $ac_status" >&5
++  echo "$as_me:17315: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17327,7 +17331,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:17330: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:17334: 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 <&5
++	echo "$as_me:17352: 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 17351 "configure"
++#line 17355 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -17360,16 +17364,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17363: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17367: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17366: \$? = $ac_status" >&5
++  echo "$as_me:17370: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17369: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17373: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17372: \$? = $ac_status" >&5
++  echo "$as_me:17376: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   termios_bad=no
+ else
+@@ -17377,7 +17381,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 17380 "configure"
++#line 17384 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -17391,16 +17395,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17394: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17398: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17397: \$? = $ac_status" >&5
++  echo "$as_me:17401: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17400: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17404: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17403: \$? = $ac_status" >&5
++  echo "$as_me:17407: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   termios_bad=unknown
+ else
+@@ -17416,19 +17420,19 @@
+ 
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-	echo "$as_me:17419: result: $termios_bad" >&5
++	echo "$as_me:17423: result: $termios_bad" >&5
+ echo "${ECHO_T}$termios_bad" >&6
+ 	fi
+ fi
+ 
+-echo "$as_me:17424: checking for tcgetattr" >&5
++echo "$as_me:17428: checking for tcgetattr" >&5
+ echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6
+ if test "${cf_cv_have_tcgetattr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17431 "configure"
++#line 17435 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17456,16 +17460,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17459: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17463: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17462: \$? = $ac_status" >&5
++  echo "$as_me:17466: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17465: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17469: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17468: \$? = $ac_status" >&5
++  echo "$as_me:17472: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_tcgetattr=yes
+ else
+@@ -17475,21 +17479,21 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:17478: result: $cf_cv_have_tcgetattr" >&5
++echo "$as_me:17482: result: $cf_cv_have_tcgetattr" >&5
+ echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6
+ test "$cf_cv_have_tcgetattr" = yes &&
+ cat >>confdefs.h <<\EOF
+ #define HAVE_TCGETATTR 1
+ EOF
+ 
+-echo "$as_me:17485: checking for vsscanf function or workaround" >&5
++echo "$as_me:17489: checking for vsscanf function or workaround" >&5
+ echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6
+ if test "${cf_cv_func_vsscanf+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17492 "configure"
++#line 17496 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17505,16 +17509,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17508: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17512: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17511: \$? = $ac_status" >&5
++  echo "$as_me:17515: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17514: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17518: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17517: \$? = $ac_status" >&5
++  echo "$as_me:17521: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_vsscanf=vsscanf
+ else
+@@ -17522,7 +17526,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17525 "configure"
++#line 17529 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17544,16 +17548,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17547: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17551: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17550: \$? = $ac_status" >&5
++  echo "$as_me:17554: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17553: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17557: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17556: \$? = $ac_status" >&5
++  echo "$as_me:17560: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_vsscanf=vfscanf
+ else
+@@ -17561,7 +17565,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17564 "configure"
++#line 17568 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17583,16 +17587,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17586: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17590: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17589: \$? = $ac_status" >&5
++  echo "$as_me:17593: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17592: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17596: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17595: \$? = $ac_status" >&5
++  echo "$as_me:17599: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_vsscanf=_doscan
+ else
+@@ -17607,7 +17611,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:17610: result: $cf_cv_func_vsscanf" >&5
++echo "$as_me:17614: result: $cf_cv_func_vsscanf" >&5
+ echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
+ 
+ case $cf_cv_func_vsscanf in
+@@ -17628,7 +17632,7 @@
+ ;;
+ esac
+ 
+-echo "$as_me:17631: checking for working mkstemp" >&5
++echo "$as_me:17635: checking for working mkstemp" >&5
+ echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
+ if test "${cf_cv_func_mkstemp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17639,7 +17643,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 17642 "configure"
++#line 17646 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17677,15 +17681,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:17680: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17684: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17683: \$? = $ac_status" >&5
++  echo "$as_me:17687: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:17685: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17689: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17688: \$? = $ac_status" >&5
++  echo "$as_me:17692: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -17700,16 +17704,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:17703: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:17707: result: $cf_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
+ if test "x$cf_cv_func_mkstemp" = xmaybe ; then
+-	echo "$as_me:17706: checking for mkstemp" >&5
++	echo "$as_me:17710: checking for mkstemp" >&5
+ echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
+ if test "${ac_cv_func_mkstemp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 17712 "configure"
++#line 17716 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char mkstemp (); below.  */
+@@ -17740,16 +17744,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17743: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17747: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17746: \$? = $ac_status" >&5
++  echo "$as_me:17750: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17749: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17753: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17752: \$? = $ac_status" >&5
++  echo "$as_me:17756: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -17759,7 +17763,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:17762: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:17766: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -17780,21 +17784,21 @@
+ fi
+ 
+ if test "x$cross_compiling" = xyes ; then
+-	{ echo "$as_me:17783: WARNING: cross compiling: assume setvbuf params not reversed" >&5
++	{ echo "$as_me:17787: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+ echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;}
+ else
+-	echo "$as_me:17786: checking whether setvbuf arguments are reversed" >&5
++	echo "$as_me:17790: checking whether setvbuf arguments are reversed" >&5
+ echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6
+ if test "${ac_cv_func_setvbuf_reversed+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:17792: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:17796: 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 17797 "configure"
++#line 17801 "configure"
+ #include "confdefs.h"
+ #include 
+ /* If setvbuf has the reversed format, exit 0. */
+@@ -17811,15 +17815,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:17814: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17818: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17817: \$? = $ac_status" >&5
++  echo "$as_me:17821: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:17819: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17823: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17822: \$? = $ac_status" >&5
++  echo "$as_me:17826: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_setvbuf_reversed=yes
+ else
+@@ -17832,7 +17836,7 @@
+ fi
+ rm -f core core.* *.core
+ fi
+-echo "$as_me:17835: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:17839: result: $ac_cv_func_setvbuf_reversed" >&5
+ echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6
+ if test $ac_cv_func_setvbuf_reversed = yes; then
+ 
+@@ -17843,13 +17847,13 @@
+ fi
+ 
+ fi
+-echo "$as_me:17846: checking for intptr_t" >&5
++echo "$as_me:17850: 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 17852 "configure"
++#line 17856 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17864,16 +17868,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17867: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17871: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17870: \$? = $ac_status" >&5
++  echo "$as_me:17874: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17873: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17877: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17876: \$? = $ac_status" >&5
++  echo "$as_me:17880: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_intptr_t=yes
+ else
+@@ -17883,7 +17887,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:17886: result: $ac_cv_type_intptr_t" >&5
++echo "$as_me:17890: 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
+   :
+@@ -17895,13 +17899,13 @@
+ 
+ fi
+ 
+-echo "$as_me:17898: checking for ssize_t" >&5
++echo "$as_me:17902: 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 17904 "configure"
++#line 17908 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17916,16 +17920,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17919: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17923: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17922: \$? = $ac_status" >&5
++  echo "$as_me:17926: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17925: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17929: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17928: \$? = $ac_status" >&5
++  echo "$as_me:17932: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_ssize_t=yes
+ else
+@@ -17935,7 +17939,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:17938: result: $ac_cv_type_ssize_t" >&5
++echo "$as_me:17942: 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
+   :
+@@ -17947,14 +17951,14 @@
+ 
+ fi
+ 
+-echo "$as_me:17950: checking for type sigaction_t" >&5
++echo "$as_me:17954: checking for type sigaction_t" >&5
+ echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6
+ if test "${cf_cv_type_sigaction+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 17957 "configure"
++#line 17961 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17967,16 +17971,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17970: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17974: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17973: \$? = $ac_status" >&5
++  echo "$as_me:17977: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17976: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17980: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17979: \$? = $ac_status" >&5
++  echo "$as_me:17983: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_type_sigaction=yes
+ else
+@@ -17987,14 +17991,14 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+-echo "$as_me:17990: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:17994: result: $cf_cv_type_sigaction" >&5
+ echo "${ECHO_T}$cf_cv_type_sigaction" >&6
+ test "$cf_cv_type_sigaction" = yes &&
+ cat >>confdefs.h <<\EOF
+ #define HAVE_TYPE_SIGACTION 1
+ EOF
+ 
+-echo "$as_me:17997: checking declaration of size-change" >&5
++echo "$as_me:18001: 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
+@@ -18009,7 +18013,7 @@
+ 	CPPFLAGS="$cf_save_CPPFLAGS"
+ 	test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 18012 "configure"
++#line 18016 "configure"
+ #include "confdefs.h"
+ #include 
+ #ifdef HAVE_TERMIOS_H
+@@ -18053,16 +18057,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18056: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18060: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18059: \$? = $ac_status" >&5
++  echo "$as_me:18063: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18062: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18066: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18065: \$? = $ac_status" >&5
++  echo "$as_me:18069: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_sizechange=yes
+ else
+@@ -18081,7 +18085,7 @@
+ done
+ 
+ fi
+-echo "$as_me:18084: result: $cf_cv_sizechange" >&5
++echo "$as_me:18088: result: $cf_cv_sizechange" >&5
+ echo "${ECHO_T}$cf_cv_sizechange" >&6
+ if test "$cf_cv_sizechange" != no ; then
+ 
+@@ -18099,13 +18103,13 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:18102: checking for memmove" >&5
++echo "$as_me:18106: checking for memmove" >&5
+ echo $ECHO_N "checking for memmove... $ECHO_C" >&6
+ if test "${ac_cv_func_memmove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 18108 "configure"
++#line 18112 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char memmove (); below.  */
+@@ -18136,16 +18140,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18139: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18143: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18142: \$? = $ac_status" >&5
++  echo "$as_me:18146: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18145: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18149: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18148: \$? = $ac_status" >&5
++  echo "$as_me:18152: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_memmove=yes
+ else
+@@ -18155,19 +18159,19 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:18158: result: $ac_cv_func_memmove" >&5
++echo "$as_me:18162: result: $ac_cv_func_memmove" >&5
+ echo "${ECHO_T}$ac_cv_func_memmove" >&6
+ if test $ac_cv_func_memmove = yes; then
+   :
+ else
+ 
+-echo "$as_me:18164: checking for bcopy" >&5
++echo "$as_me:18168: checking for bcopy" >&5
+ echo $ECHO_N "checking for bcopy... $ECHO_C" >&6
+ if test "${ac_cv_func_bcopy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 18170 "configure"
++#line 18174 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char bcopy (); below.  */
+@@ -18198,16 +18202,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18201: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18205: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18204: \$? = $ac_status" >&5
++  echo "$as_me:18208: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18207: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18211: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18210: \$? = $ac_status" >&5
++  echo "$as_me:18214: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_bcopy=yes
+ else
+@@ -18217,11 +18221,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:18220: result: $ac_cv_func_bcopy" >&5
++echo "$as_me:18224: result: $ac_cv_func_bcopy" >&5
+ echo "${ECHO_T}$ac_cv_func_bcopy" >&6
+ if test $ac_cv_func_bcopy = yes; then
+ 
+-	echo "$as_me:18224: checking if bcopy does overlapping moves" >&5
++	echo "$as_me:18228: checking if bcopy does overlapping moves" >&5
+ echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6
+ if test "${cf_cv_good_bcopy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18231,7 +18235,7 @@
+   cf_cv_good_bcopy=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 18234 "configure"
++#line 18238 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -18245,15 +18249,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:18248: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18252: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18251: \$? = $ac_status" >&5
++  echo "$as_me:18255: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:18253: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18257: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18256: \$? = $ac_status" >&5
++  echo "$as_me:18260: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_good_bcopy=yes
+ else
+@@ -18266,7 +18270,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:18269: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:18273: result: $cf_cv_good_bcopy" >&5
+ echo "${ECHO_T}$cf_cv_good_bcopy" >&6
+ 
+ else
+@@ -18293,13 +18297,13 @@
+ for ac_func in posix_openpt
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:18296: checking for $ac_func" >&5
++echo "$as_me:18300: 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 18302 "configure"
++#line 18306 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -18330,16 +18334,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18333: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18337: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18336: \$? = $ac_status" >&5
++  echo "$as_me:18340: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18339: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18343: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18342: \$? = $ac_status" >&5
++  echo "$as_me:18346: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -18349,7 +18353,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:18352: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:18356: 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 <&5
++echo "$as_me:18366: checking if poll really works" >&5
+ echo $ECHO_N "checking if poll really works... $ECHO_C" >&6
+ if test "${cf_cv_working_poll+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18369,7 +18373,7 @@
+   cf_cv_working_poll=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 18372 "configure"
++#line 18376 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -18421,15 +18425,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:18424: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18428: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18427: \$? = $ac_status" >&5
++  echo "$as_me:18431: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:18429: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18433: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18432: \$? = $ac_status" >&5
++  echo "$as_me:18436: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_working_poll=yes
+ else
+@@ -18441,21 +18445,21 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:18444: result: $cf_cv_working_poll" >&5
++echo "$as_me:18448: result: $cf_cv_working_poll" >&5
+ echo "${ECHO_T}$cf_cv_working_poll" >&6
+ test "$cf_cv_working_poll" = "yes" &&
+ cat >>confdefs.h <<\EOF
+ #define HAVE_WORKING_POLL 1
+ EOF
+ 
+-echo "$as_me:18451: checking for va_copy" >&5
++echo "$as_me:18455: checking for va_copy" >&5
+ echo $ECHO_N "checking for va_copy... $ECHO_C" >&6
+ if test "${cf_cv_have_va_copy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18458 "configure"
++#line 18462 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -18472,16 +18476,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18475: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18479: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18478: \$? = $ac_status" >&5
++  echo "$as_me:18482: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18481: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18485: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18484: \$? = $ac_status" >&5
++  echo "$as_me:18488: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_va_copy=yes
+ else
+@@ -18491,7 +18495,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:18494: result: $cf_cv_have_va_copy" >&5
++echo "$as_me:18498: result: $cf_cv_have_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have_va_copy" >&6
+ 
+ test "$cf_cv_have_va_copy" = yes &&
+@@ -18499,14 +18503,14 @@
+ #define HAVE_VA_COPY 1
+ EOF
+ 
+-echo "$as_me:18502: checking for __va_copy" >&5
++echo "$as_me:18506: checking for __va_copy" >&5
+ echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6
+ if test "${cf_cv_have___va_copy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18509 "configure"
++#line 18513 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -18523,16 +18527,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18526: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18530: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18529: \$? = $ac_status" >&5
++  echo "$as_me:18533: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18532: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18536: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18535: \$? = $ac_status" >&5
++  echo "$as_me:18539: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have___va_copy=yes
+ else
+@@ -18542,7 +18546,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:18545: result: $cf_cv_have___va_copy" >&5
++echo "$as_me:18549: result: $cf_cv_have___va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___va_copy" >&6
+ 
+ test "$cf_cv_have___va_copy" = yes &&
+@@ -18550,13 +18554,13 @@
+ #define HAVE___VA_COPY 1
+ EOF
+ 
+-echo "$as_me:18553: checking for pid_t" >&5
++echo "$as_me:18557: 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 18559 "configure"
++#line 18563 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -18571,16 +18575,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18574: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18578: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18577: \$? = $ac_status" >&5
++  echo "$as_me:18581: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18580: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18584: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18583: \$? = $ac_status" >&5
++  echo "$as_me:18587: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_pid_t=yes
+ else
+@@ -18590,7 +18594,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:18593: result: $ac_cv_type_pid_t" >&5
++echo "$as_me:18597: 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
+   :
+@@ -18605,23 +18609,23 @@
+ for ac_header in unistd.h vfork.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18608: checking for $ac_header" >&5
++echo "$as_me:18612: 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 18614 "configure"
++#line 18618 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18618: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:18622: \"$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:18624: \$? = $ac_status" >&5
++  echo "$as_me:18628: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18640,7 +18644,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:18643: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:18647: 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 <&5
++echo "$as_me:18660: 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 18662 "configure"
++#line 18666 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -18690,16 +18694,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18693: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18697: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18696: \$? = $ac_status" >&5
++  echo "$as_me:18700: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18699: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18703: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18702: \$? = $ac_status" >&5
++  echo "$as_me:18706: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -18709,7 +18713,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:18712: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:18716: 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 <&5
++  echo "$as_me:18728: 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
+@@ -18744,15 +18748,15 @@
+       }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:18747: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18751: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18750: \$? = $ac_status" >&5
++  echo "$as_me:18754: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:18752: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18756: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18755: \$? = $ac_status" >&5
++  echo "$as_me:18759: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_fork_works=yes
+ else
+@@ -18764,7 +18768,7 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:18767: result: $ac_cv_func_fork_works" >&5
++echo "$as_me:18771: result: $ac_cv_func_fork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+ 
+ fi
+@@ -18778,12 +18782,12 @@
+       ac_cv_func_fork_works=yes
+       ;;
+   esac
+-  { echo "$as_me:18781: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:18785: 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:18786: checking for working vfork" >&5
++  echo "$as_me:18790: 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
+@@ -18792,7 +18796,7 @@
+   ac_cv_func_vfork_works=cross
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 18795 "configure"
++#line 18799 "configure"
+ #include "confdefs.h"
+ /* Thanks to Paul Eggert for this test.  */
+ #include 
+@@ -18889,15 +18893,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:18892: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18896: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18895: \$? = $ac_status" >&5
++  echo "$as_me:18899: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:18897: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18901: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18900: \$? = $ac_status" >&5
++  echo "$as_me:18904: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_vfork_works=yes
+ else
+@@ -18909,13 +18913,13 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:18912: result: $ac_cv_func_vfork_works" >&5
++echo "$as_me:18916: 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:18918: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:18922: 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
+ 
+@@ -18942,7 +18946,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:18945: checking for openpty in -lutil" >&5
++echo "$as_me:18949: checking for openpty in -lutil" >&5
+ echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
+ if test "${ac_cv_lib_util_openpty+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18950,7 +18954,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18953 "configure"
++#line 18957 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18969,16 +18973,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18972: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18976: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18975: \$? = $ac_status" >&5
++  echo "$as_me:18979: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18978: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18982: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18981: \$? = $ac_status" >&5
++  echo "$as_me:18985: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -18989,7 +18993,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18992: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:18996: result: $ac_cv_lib_util_openpty" >&5
+ echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
+ if test $ac_cv_lib_util_openpty = yes; then
+   cf_cv_lib_util=yes
+@@ -18997,7 +19001,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:19000: checking for openpty header" >&5
++echo "$as_me:19004: checking for openpty header" >&5
+ echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
+ if test "${cf_cv_func_openpty+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19024,7 +19028,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 19027 "configure"
++#line 19031 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -19041,16 +19045,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19044: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19048: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19047: \$? = $ac_status" >&5
++  echo "$as_me:19051: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19050: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19054: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19053: \$? = $ac_status" >&5
++  echo "$as_me:19057: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -19068,7 +19072,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:19071: result: $cf_cv_func_openpty" >&5
++echo "$as_me:19075: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -19138,7 +19142,7 @@
+ 			  cf_save_CPPFLAGS=$CPPFLAGS
+ 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 19141 "configure"
++#line 19145 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -19150,16 +19154,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19153: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19157: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19156: \$? = $ac_status" >&5
++  echo "$as_me:19160: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19159: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19163: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19162: \$? = $ac_status" >&5
++  echo "$as_me:19166: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -19176,7 +19180,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:19179: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:19183: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -19212,7 +19216,7 @@
+ 			if test "$cf_have_libdir" = no ; then
+ 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+ 
+-echo "${as_me:-configure}:19215: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:19219: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -19223,7 +19227,7 @@
+ 	else
+ 		case "$with_hashed_db" in
+ 		(./*|../*|/*)
+-			{ echo "$as_me:19226: WARNING: no such directory $with_hashed_db" >&5
++			{ echo "$as_me:19230: WARNING: no such directory $with_hashed_db" >&5
+ echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
+ 			;;
+ 		(*)
+@@ -19292,7 +19296,7 @@
+ 			  cf_save_CPPFLAGS=$CPPFLAGS
+ 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 19295 "configure"
++#line 19299 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -19304,16 +19308,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19307: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19311: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19310: \$? = $ac_status" >&5
++  echo "$as_me:19314: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19313: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19317: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19316: \$? = $ac_status" >&5
++  echo "$as_me:19320: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -19330,7 +19334,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:19333: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:19337: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -19410,7 +19414,7 @@
+ 			if test "$cf_have_libdir" = no ; then
+ 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+ 
+-echo "${as_me:-configure}:19413: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:19417: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -19427,23 +19431,23 @@
+ 	fi
+ esac
+ 
+-echo "$as_me:19430: checking for db.h" >&5
++echo "$as_me:19434: checking for db.h" >&5
+ echo $ECHO_N "checking for db.h... $ECHO_C" >&6
+ if test "${ac_cv_header_db_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 19436 "configure"
++#line 19440 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:19440: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:19444: \"$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:19446: \$? = $ac_status" >&5
++  echo "$as_me:19450: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -19462,11 +19466,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:19465: result: $ac_cv_header_db_h" >&5
++echo "$as_me:19469: result: $ac_cv_header_db_h" >&5
+ echo "${ECHO_T}$ac_cv_header_db_h" >&6
+ if test $ac_cv_header_db_h = yes; then
+ 
+-echo "$as_me:19469: checking for version of db" >&5
++echo "$as_me:19473: checking for version of db" >&5
+ echo $ECHO_N "checking for version of db... $ECHO_C" >&6
+ if test "${cf_cv_hashed_db_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19477,10 +19481,10 @@
+ for cf_db_version in 1 2 3 4 5 6
+ do
+ 
+-echo "${as_me:-configure}:19480: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me:-configure}:19484: testing checking for db version $cf_db_version ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 19483 "configure"
++#line 19487 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -19510,16 +19514,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19513: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19517: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19516: \$? = $ac_status" >&5
++  echo "$as_me:19520: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19519: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19523: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19522: \$? = $ac_status" >&5
++  echo "$as_me:19526: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_hashed_db_version=$cf_db_version
+@@ -19533,16 +19537,16 @@
+ done
+ 
+ fi
+-echo "$as_me:19536: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:19540: result: $cf_cv_hashed_db_version" >&5
+ echo "${ECHO_T}$cf_cv_hashed_db_version" >&6
+ 
+ if test "$cf_cv_hashed_db_version" = unknown ; then
+-	{ { echo "$as_me:19540: error: Cannot determine version of db" >&5
++	{ { echo "$as_me:19544: error: Cannot determine version of db" >&5
+ echo "$as_me: error: Cannot determine version of db" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+ 
+-echo "$as_me:19545: checking for db libraries" >&5
++echo "$as_me:19549: checking for db libraries" >&5
+ echo $ECHO_N "checking for db libraries... $ECHO_C" >&6
+ if test "${cf_cv_hashed_db_libs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19572,10 +19576,10 @@
+ 
+ 	fi
+ 
+-echo "${as_me:-configure}:19575: testing checking for library "$cf_db_libs" ..." 1>&5
++echo "${as_me:-configure}:19579: testing checking for library "$cf_db_libs" ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 19578 "configure"
++#line 19582 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -19630,16 +19634,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19633: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19637: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19636: \$? = $ac_status" >&5
++  echo "$as_me:19640: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19639: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19643: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19642: \$? = $ac_status" >&5
++  echo "$as_me:19646: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	if test -n "$cf_db_libs" ; then
+@@ -19659,11 +19663,11 @@
+ done
+ 
+ fi
+-echo "$as_me:19662: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:19666: result: $cf_cv_hashed_db_libs" >&5
+ echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6
+ 
+ 	if test "$cf_cv_hashed_db_libs" = unknown ; then
+-		{ { echo "$as_me:19666: error: Cannot determine library for db" >&5
++		{ { echo "$as_me:19670: error: Cannot determine library for db" >&5
+ echo "$as_me: error: Cannot determine library for db" >&2;}
+    { (exit 1); exit 1; }; }
+ 	elif test "$cf_cv_hashed_db_libs" != default ; then
+@@ -19689,7 +19693,7 @@
+ 
+ else
+ 
+-	{ { echo "$as_me:19692: error: Cannot find db.h" >&5
++	{ { echo "$as_me:19696: error: Cannot find db.h" >&5
+ echo "$as_me: error: Cannot find db.h" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -19704,7 +19708,7 @@
+ 
+ # Just in case, check if the C compiler has a bool type.
+ 
+-echo "$as_me:19707: checking if we should include stdbool.h" >&5
++echo "$as_me:19711: checking if we should include stdbool.h" >&5
+ echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
+ 
+ if test "${cf_cv_header_stdbool_h+set}" = set; then
+@@ -19712,7 +19716,7 @@
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 19715 "configure"
++#line 19719 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -19724,23 +19728,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19727: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19731: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19730: \$? = $ac_status" >&5
++  echo "$as_me:19734: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19733: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19737: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19736: \$? = $ac_status" >&5
++  echo "$as_me:19740: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_header_stdbool_h=0
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19743 "configure"
++#line 19747 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -19756,16 +19760,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19759: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19763: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19762: \$? = $ac_status" >&5
++  echo "$as_me:19766: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19765: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19769: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19768: \$? = $ac_status" >&5
++  echo "$as_me:19772: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -19779,13 +19783,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:19782: result: yes" >&5
++then	echo "$as_me:19786: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:19784: result: no" >&5
++else	echo "$as_me:19788: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:19788: checking for builtin bool type" >&5
++echo "$as_me:19792: checking for builtin bool type" >&5
+ echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
+ 
+ if test "${cf_cv_cc_bool_type+set}" = set; then
+@@ -19793,7 +19797,7 @@
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 19796 "configure"
++#line 19800 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19808,16 +19812,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19811: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19815: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19814: \$? = $ac_status" >&5
++  echo "$as_me:19818: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19817: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19821: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19820: \$? = $ac_status" >&5
++  echo "$as_me:19824: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cc_bool_type=1
+ else
+@@ -19830,9 +19834,9 @@
+ fi
+ 
+ if test "$cf_cv_cc_bool_type" = 1
+-then	echo "$as_me:19833: result: yes" >&5
++then	echo "$as_me:19837: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:19835: result: no" >&5
++else	echo "$as_me:19839: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -19849,10 +19853,10 @@
+ 
+ 	cf_save="$LIBS"
+ 	LIBS="$LIBS $CXXLIBS"
+-	echo "$as_me:19852: checking if we already have C++ library" >&5
++	echo "$as_me:19856: checking if we already have C++ library" >&5
+ echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 19855 "configure"
++#line 19859 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -19866,16 +19870,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19869: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19873: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19872: \$? = $ac_status" >&5
++  echo "$as_me:19876: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19875: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19879: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19878: \$? = $ac_status" >&5
++  echo "$as_me:19882: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_have_libstdcpp=yes
+ else
+@@ -19884,7 +19888,7 @@
+ cf_have_libstdcpp=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-	echo "$as_me:19887: result: $cf_have_libstdcpp" >&5
++	echo "$as_me:19891: result: $cf_have_libstdcpp" >&5
+ echo "${ECHO_T}$cf_have_libstdcpp" >&6
+ 	LIBS="$cf_save"
+ 
+@@ -19903,7 +19907,7 @@
+ 			;;
+ 		esac
+ 
+-		echo "$as_me:19906: checking for library $cf_stdcpp_libname" >&5
++		echo "$as_me:19910: checking for library $cf_stdcpp_libname" >&5
+ echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6
+ if test "${cf_cv_libstdcpp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19929,7 +19933,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 19932 "configure"
++#line 19936 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -19943,16 +19947,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19946: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19950: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19949: \$? = $ac_status" >&5
++  echo "$as_me:19953: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19952: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19956: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19955: \$? = $ac_status" >&5
++  echo "$as_me:19959: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_libstdcpp=yes
+ else
+@@ -19964,7 +19968,7 @@
+ 			LIBS="$cf_save"
+ 
+ fi
+-echo "$as_me:19967: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:19971: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ 		test "$cf_cv_libstdcpp" = yes && {
+ cf_add_libs="-l$cf_stdcpp_libname"
+@@ -19986,7 +19990,7 @@
+ 	fi
+ fi
+ 
+-	echo "$as_me:19989: checking whether $CXX understands -c and -o together" >&5
++	echo "$as_me:19993: checking whether $CXX understands -c and -o together" >&5
+ echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6
+ if test "${cf_cv_prog_CXX_c_o+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20001,15 +20005,15 @@
+ # We do the test twice because some compilers refuse to overwrite an
+ # existing .o file with -o, though they will create one.
+ ac_try='$CXX $CXXFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+-if { (eval echo "$as_me:20004: \"$ac_try\"") >&5
++if { (eval echo "$as_me:20008: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20007: \$? = $ac_status" >&5
++  echo "$as_me:20011: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:20009: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:20013: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20012: \$? = $ac_status" >&5
++  echo "$as_me:20016: \$? = $ac_status" >&5
+   (exit $ac_status); };
+ then
+   eval cf_cv_prog_CXX_c_o=yes
+@@ -20020,10 +20024,10 @@
+ 
+ fi
+ if test $cf_cv_prog_CXX_c_o = yes; then
+-  echo "$as_me:20023: result: yes" >&5
++  echo "$as_me:20027: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:20026: result: no" >&5
++  echo "$as_me:20030: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -20043,7 +20047,7 @@
+ 	;;
+ esac
+ if test "$GXX" = yes; then
+-	echo "$as_me:20046: checking for lib$cf_gpp_libname" >&5
++	echo "$as_me:20050: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ 	cf_save="$LIBS"
+ 
+@@ -20064,7 +20068,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 20067 "configure"
++#line 20071 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_gpp_libname/builtin.h>
+@@ -20078,16 +20082,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20081: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20085: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20084: \$? = $ac_status" >&5
++  echo "$as_me:20088: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20087: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20091: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20090: \$? = $ac_status" >&5
++  echo "$as_me:20094: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -20124,7 +20128,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 20127 "configure"
++#line 20131 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20138,16 +20142,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20141: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20145: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20144: \$? = $ac_status" >&5
++  echo "$as_me:20148: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20147: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20151: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20150: \$? = $ac_status" >&5
++  echo "$as_me:20154: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -20180,7 +20184,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 	LIBS="$cf_save"
+-	echo "$as_me:20183: result: $cf_cxx_library" >&5
++	echo "$as_me:20187: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+ 
+@@ -20196,7 +20200,7 @@
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ ac_main_return=return
+-echo "$as_me:20199: checking how to run the C++ preprocessor" >&5
++echo "$as_me:20203: checking how to run the C++ preprocessor" >&5
+ echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
+ if test -z "$CXXCPP"; then
+   if test "${ac_cv_prog_CXXCPP+set}" = set; then
+@@ -20213,18 +20217,18 @@
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 20216 "configure"
++#line 20220 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:20221: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:20225: \"$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:20227: \$? = $ac_status" >&5
++  echo "$as_me:20231: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -20247,17 +20251,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 20250 "configure"
++#line 20254 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:20254: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:20258: \"$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:20260: \$? = $ac_status" >&5
++  echo "$as_me:20264: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -20294,7 +20298,7 @@
+ else
+   ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:20297: result: $CXXCPP" >&5
++echo "$as_me:20301: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -20304,18 +20308,18 @@
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 20307 "configure"
++#line 20311 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:20312: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:20316: \"$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:20318: \$? = $ac_status" >&5
++  echo "$as_me:20322: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -20338,17 +20342,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 20341 "configure"
++#line 20345 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:20345: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:20349: \"$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:20351: \$? = $ac_status" >&5
++  echo "$as_me:20355: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -20376,7 +20380,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:20379: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++  { { echo "$as_me:20383: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -20391,23 +20395,23 @@
+ for ac_header in typeinfo
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20394: checking for $ac_header" >&5
++echo "$as_me:20398: 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 20400 "configure"
++#line 20404 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20404: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:20408: \"$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:20410: \$? = $ac_status" >&5
++  echo "$as_me:20414: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -20426,7 +20430,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:20429: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:20433: 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 <&5
++echo "$as_me:20446: 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 20448 "configure"
++#line 20452 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20452: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:20456: \"$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:20458: \$? = $ac_status" >&5
++  echo "$as_me:20462: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -20474,7 +20478,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:20477: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:20481: 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 <&5
++	echo "$as_me:20492: checking if iostream uses std-namespace" >&5
+ echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 20491 "configure"
++#line 20495 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20505,16 +20509,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20508: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20512: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20511: \$? = $ac_status" >&5
++  echo "$as_me:20515: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20514: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20518: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20517: \$? = $ac_status" >&5
++  echo "$as_me:20521: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_iostream_namespace=yes
+ else
+@@ -20523,7 +20527,7 @@
+ cf_iostream_namespace=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-	echo "$as_me:20526: result: $cf_iostream_namespace" >&5
++	echo "$as_me:20530: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+ 	if test "$cf_iostream_namespace" = yes ; then
+ 
+@@ -20534,7 +20538,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:20537: checking if we should include stdbool.h" >&5
++echo "$as_me:20541: checking if we should include stdbool.h" >&5
+ echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
+ 
+ if test "${cf_cv_header_stdbool_h+set}" = set; then
+@@ -20542,7 +20546,7 @@
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 20545 "configure"
++#line 20549 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -20554,23 +20558,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20557: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20561: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20560: \$? = $ac_status" >&5
++  echo "$as_me:20564: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20563: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20567: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20566: \$? = $ac_status" >&5
++  echo "$as_me:20570: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_header_stdbool_h=0
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 20573 "configure"
++#line 20577 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -20586,16 +20590,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20589: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20593: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20592: \$? = $ac_status" >&5
++  echo "$as_me:20596: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20595: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20599: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20598: \$? = $ac_status" >&5
++  echo "$as_me:20602: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -20609,13 +20613,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:20612: result: yes" >&5
++then	echo "$as_me:20616: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:20614: result: no" >&5
++else	echo "$as_me:20618: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:20618: checking for builtin bool type" >&5
++echo "$as_me:20622: checking for builtin bool type" >&5
+ echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
+ 
+ if test "${cf_cv_builtin_bool+set}" = set; then
+@@ -20623,7 +20627,7 @@
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 20626 "configure"
++#line 20630 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20638,16 +20642,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20641: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20645: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20644: \$? = $ac_status" >&5
++  echo "$as_me:20648: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20647: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20651: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20650: \$? = $ac_status" >&5
++  echo "$as_me:20654: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_builtin_bool=1
+ else
+@@ -20660,13 +20664,13 @@
+ fi
+ 
+ if test "$cf_cv_builtin_bool" = 1
+-then	echo "$as_me:20663: result: yes" >&5
++then	echo "$as_me:20667: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:20665: result: no" >&5
++else	echo "$as_me:20669: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:20669: checking for size of bool" >&5
++echo "$as_me:20673: checking for size of bool" >&5
+ echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
+ if test "${cf_cv_type_of_bool+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20677,7 +20681,7 @@
+   cf_cv_type_of_bool=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 20680 "configure"
++#line 20684 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20719,15 +20723,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:20722: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20726: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20725: \$? = $ac_status" >&5
++  echo "$as_me:20729: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:20727: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20731: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20730: \$? = $ac_status" >&5
++  echo "$as_me:20734: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_type_of_bool=`cat cf_test.out`
+ 		 if test -z "$cf_cv_type_of_bool"; then
+@@ -20745,18 +20749,18 @@
+ fi
+ 
+ 	rm -f cf_test.out
+-echo "$as_me:20748: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:20752: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ if test "$cf_cv_type_of_bool" = unknown ; then
+ 	case .$NCURSES_BOOL in
+ 	(.auto|.) NCURSES_BOOL=unsigned;;
+ 	esac
+-	{ echo "$as_me:20754: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:20758: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+ echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
+ 	cf_cv_type_of_bool=$NCURSES_BOOL
+ fi
+ 
+-echo "$as_me:20759: checking for special defines needed for etip.h" >&5
++echo "$as_me:20763: checking for special defines needed for etip.h" >&5
+ echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6
+ cf_save_CXXFLAGS="$CXXFLAGS"
+ cf_result="none"
+@@ -20774,7 +20778,7 @@
+ 	test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}"
+ 	test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 20777 "configure"
++#line 20781 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20788,16 +20792,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20791: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20795: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20794: \$? = $ac_status" >&5
++  echo "$as_me:20798: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20797: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20801: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20800: \$? = $ac_status" >&5
++  echo "$as_me:20804: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	test -n "$cf_math" && cat >>confdefs.h <&5
++echo "$as_me:20825: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ CXXFLAGS="$cf_save_CXXFLAGS"
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:20826: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:20830: checking if $CXX accepts parameter initialization" >&5
+ echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6
+ if test "${cf_cv_cpp_param_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20840,7 +20844,7 @@
+   cf_cv_cpp_param_init=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 20843 "configure"
++#line 20847 "configure"
+ #include "confdefs.h"
+ 
+ class TEST {
+@@ -20859,15 +20863,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:20862: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20866: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20865: \$? = $ac_status" >&5
++  echo "$as_me:20869: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:20867: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20871: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20870: \$? = $ac_status" >&5
++  echo "$as_me:20874: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cpp_param_init=yes
+ else
+@@ -20886,7 +20890,7 @@
+ ac_main_return=return
+ 
+ fi
+-echo "$as_me:20889: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:20893: result: $cf_cv_cpp_param_init" >&5
+ echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
+ fi
+ test "$cf_cv_cpp_param_init" = yes &&
+@@ -20896,7 +20900,7 @@
+ 
+ if test -n "$CXX"; then
+ 
+-echo "$as_me:20899: checking if $CXX accepts static_cast" >&5
++echo "$as_me:20903: checking if $CXX accepts static_cast" >&5
+ echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6
+ if test "${cf_cv_cpp_static_cast+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20910,7 +20914,7 @@
+ ac_main_return=return
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 20913 "configure"
++#line 20917 "configure"
+ #include "confdefs.h"
+ 
+ class NCursesPanel
+@@ -20954,16 +20958,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20957: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20961: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20960: \$? = $ac_status" >&5
++  echo "$as_me:20964: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20963: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20967: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20966: \$? = $ac_status" >&5
++  echo "$as_me:20970: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cpp_static_cast=yes
+ else
+@@ -20981,7 +20985,7 @@
+ ac_main_return=return
+ 
+ fi
+-echo "$as_me:20984: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:20988: result: $cf_cv_cpp_static_cast" >&5
+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
+ 
+ fi
+@@ -21030,7 +21034,7 @@
+ 	else
+ 		if test "$cf_cv_header_stdbool_h" = 1 ; then
+ 
+-echo "$as_me:21033: checking for size of bool" >&5
++echo "$as_me:21037: checking for size of bool" >&5
+ echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
+ if test "${cf_cv_type_of_bool+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21041,7 +21045,7 @@
+   cf_cv_type_of_bool=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 21044 "configure"
++#line 21048 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21083,15 +21087,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:21086: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21090: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21089: \$? = $ac_status" >&5
++  echo "$as_me:21093: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:21091: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21095: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21094: \$? = $ac_status" >&5
++  echo "$as_me:21098: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_type_of_bool=`cat cf_test.out`
+ 		 if test -z "$cf_cv_type_of_bool"; then
+@@ -21109,25 +21113,25 @@
+ fi
+ 
+ 	rm -f cf_test.out
+-echo "$as_me:21112: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:21116: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ if test "$cf_cv_type_of_bool" = unknown ; then
+ 	case .$NCURSES_BOOL in
+ 	(.auto|.) NCURSES_BOOL=unsigned;;
+ 	esac
+-	{ echo "$as_me:21118: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:21122: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+ echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
+ 	cf_cv_type_of_bool=$NCURSES_BOOL
+ fi
+ 
+ 		else
+-			echo "$as_me:21124: checking for fallback type of bool" >&5
++			echo "$as_me:21128: checking for fallback type of bool" >&5
+ echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
+ 			case "$host_cpu" in
+ 			(i?86)	cf_cv_type_of_bool=char	;;
+ 			(*)	cf_cv_type_of_bool=int	;;
+ 			esac
+-			echo "$as_me:21130: result: $cf_cv_type_of_bool" >&5
++			echo "$as_me:21134: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ 		fi
+ 	fi
+@@ -21156,7 +21160,7 @@
+ 
+ 	if test "$cf_with_ada" != "no" ; then
+ 		if test "$with_libtool" != "no"; then
+-			{ echo "$as_me:21159: WARNING: libtool does not support Ada - disabling feature" >&5
++			{ echo "$as_me:21163: WARNING: libtool does not support Ada - disabling feature" >&5
+ echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
+ 			cf_with_ada=no
+ 		fi
+@@ -21167,7 +21171,7 @@
+ cf_ada_make=gnatmake
+ # Extract the first word of "$cf_ada_make", so it can be a program name with args.
+ set dummy $cf_ada_make; ac_word=$2
+-echo "$as_me:21170: checking for $ac_word" >&5
++echo "$as_me:21174: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_gnat_exists+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21182,7 +21186,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_gnat_exists="yes"
+-echo "$as_me:21185: found $ac_dir/$ac_word" >&5
++echo "$as_me:21189: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -21191,10 +21195,10 @@
+ fi
+ gnat_exists=$ac_cv_prog_gnat_exists
+ if test -n "$gnat_exists"; then
+-  echo "$as_me:21194: result: $gnat_exists" >&5
++  echo "$as_me:21198: result: $gnat_exists" >&5
+ echo "${ECHO_T}$gnat_exists" >&6
+ else
+-  echo "$as_me:21197: result: no" >&5
++  echo "$as_me:21201: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -21203,12 +21207,12 @@
+ 	cf_cv_prog_gnat_correct=no
+ else
+ 
+-echo "$as_me:21206: checking for gnat version" >&5
++echo "$as_me:21210: checking for gnat version" >&5
+ echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
+ cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
+ 	grep '[0-9].[0-9][0-9]*' |\
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+-echo "$as_me:21211: result: $cf_gnat_version" >&5
++echo "$as_me:21215: result: $cf_gnat_version" >&5
+ echo "${ECHO_T}$cf_gnat_version" >&6
+ 
+ case $cf_gnat_version in
+@@ -21216,7 +21220,7 @@
+ 	cf_cv_prog_gnat_correct=yes
+ 	;;
+ (*)
+-	{ echo "$as_me:21219: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
++	{ echo "$as_me:21223: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+ echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
+ 	cf_cv_prog_gnat_correct=no
+ 	;;
+@@ -21224,7 +21228,7 @@
+ 
+ 	# Extract the first word of "m4", so it can be a program name with args.
+ set dummy m4; ac_word=$2
+-echo "$as_me:21227: checking for $ac_word" >&5
++echo "$as_me:21231: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_M4_exists+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21239,7 +21243,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_M4_exists="yes"
+-echo "$as_me:21242: found $ac_dir/$ac_word" >&5
++echo "$as_me:21246: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -21248,10 +21252,10 @@
+ fi
+ M4_exists=$ac_cv_prog_M4_exists
+ if test -n "$M4_exists"; then
+-  echo "$as_me:21251: result: $M4_exists" >&5
++  echo "$as_me:21255: result: $M4_exists" >&5
+ echo "${ECHO_T}$M4_exists" >&6
+ else
+-  echo "$as_me:21254: result: no" >&5
++  echo "$as_me:21258: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -21260,7 +21264,7 @@
+ 		echo Ada95 binding required program m4 not found. Ada95 binding disabled.
+ 	fi
+ 	if test "$cf_cv_prog_gnat_correct" = yes; then
+-		echo "$as_me:21263: checking if GNAT works" >&5
++		echo "$as_me:21267: checking if GNAT works" >&5
+ echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+ 
+ rm -rf conftest* *~conftest*
+@@ -21288,7 +21292,7 @@
+ fi
+ rm -rf conftest* *~conftest*
+ 
+-		echo "$as_me:21291: result: $cf_cv_prog_gnat_correct" >&5
++		echo "$as_me:21295: result: $cf_cv_prog_gnat_correct" >&5
+ echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
+ 	fi
+ fi
+@@ -21297,7 +21301,7 @@
+ 
+  	ADAFLAGS="$ADAFLAGS -gnatpn"
+ 
+-	echo "$as_me:21300: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:21304: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -21314,10 +21318,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:21317: result: $ADAFLAGS" >&5
++	echo "$as_me:21321: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:21320: checking if GNATPREP supports -T option" >&5
++echo "$as_me:21324: checking if GNATPREP supports -T option" >&5
+ echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
+ if test "${cf_cv_gnatprep_opt_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21327,11 +21331,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:21330: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:21334: result: $cf_cv_gnatprep_opt_t" >&5
+ echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
+ test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
+ 
+-echo "$as_me:21334: checking if GNAT supports generics" >&5
++echo "$as_me:21338: checking if GNAT supports generics" >&5
+ echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
+ case $cf_gnat_version in
+ (3.[1-9]*|[4-9].*)
+@@ -21341,7 +21345,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:21344: result: $cf_gnat_generics" >&5
++echo "$as_me:21348: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -21353,7 +21357,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:21356: checking if GNAT supports SIGINT" >&5
++echo "$as_me:21360: checking if GNAT supports SIGINT" >&5
+ echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
+ if test "${cf_cv_gnat_sigint+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21401,7 +21405,7 @@
+ rm -rf conftest* *~conftest*
+ 
+ fi
+-echo "$as_me:21404: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:21408: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test $cf_cv_gnat_sigint = yes ; then
+@@ -21414,7 +21418,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:21417: checking if GNAT supports project files" >&5
++echo "$as_me:21421: checking if GNAT supports project files" >&5
+ echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
+ case $cf_gnat_version in
+ (3.[0-9]*)
+@@ -21474,15 +21478,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:21477: result: $cf_gnat_projects" >&5
++echo "$as_me:21481: result: $cf_gnat_projects" >&5
+ echo "${ECHO_T}$cf_gnat_projects" >&6
+ fi # enable_gnat_projects
+ 
+ if test $cf_gnat_projects = yes
+ then
+-	echo "$as_me:21483: checking if GNAT supports libraries" >&5
++	echo "$as_me:21487: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:21485: result: $cf_gnat_libraries" >&5
++	echo "$as_me:21489: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -21502,7 +21506,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:21505: checking for ada-compiler" >&5
++echo "$as_me:21509: checking for ada-compiler" >&5
+ echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -21513,12 +21517,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:21516: result: $cf_ada_compiler" >&5
++echo "$as_me:21520: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 			cf_ada_package=terminal_interface
+ 
+-echo "$as_me:21521: checking for ada-include" >&5
++echo "$as_me:21525: checking for ada-include" >&5
+ echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -21554,7 +21558,7 @@
+ 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:21557: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:21561: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -21563,10 +21567,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:21566: result: $ADA_INCLUDE" >&5
++echo "$as_me:21570: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:21569: checking for ada-objects" >&5
++echo "$as_me:21573: checking for ada-objects" >&5
+ echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -21602,7 +21606,7 @@
+ 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:21605: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:21609: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -21611,10 +21615,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:21614: result: $ADA_OBJECTS" >&5
++echo "$as_me:21618: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:21617: checking if an Ada95 shared-library should be built" >&5
++echo "$as_me:21621: checking if an Ada95 shared-library should be built" >&5
+ echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -21624,7 +21628,7 @@
+ else
+   with_ada_sharedlib=no
+ fi;
+-echo "$as_me:21627: result: $with_ada_sharedlib" >&5
++echo "$as_me:21631: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ 
+ ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
+@@ -21647,13 +21651,13 @@
+ 
+ # do this "late" to avoid conflict with header-checks
+ if test "x$with_widec" = xyes ; then
+-	echo "$as_me:21650: checking for wchar_t" >&5
++	echo "$as_me:21654: checking for wchar_t" >&5
+ echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6
+ if test "${ac_cv_type_wchar_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 21656 "configure"
++#line 21660 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -21668,16 +21672,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:21671: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21675: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21674: \$? = $ac_status" >&5
++  echo "$as_me:21678: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:21677: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21681: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21680: \$? = $ac_status" >&5
++  echo "$as_me:21684: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_wchar_t=yes
+ else
+@@ -21687,10 +21691,10 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:21690: result: $ac_cv_type_wchar_t" >&5
++echo "$as_me:21694: result: $ac_cv_type_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
+ 
+-echo "$as_me:21693: checking size of wchar_t" >&5
++echo "$as_me:21697: checking size of wchar_t" >&5
+ echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6
+ if test "${ac_cv_sizeof_wchar_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21699,7 +21703,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 21702 "configure"
++#line 21706 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -21711,21 +21715,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:21714: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21718: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21717: \$? = $ac_status" >&5
++  echo "$as_me:21721: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:21720: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21724: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21723: \$? = $ac_status" >&5
++  echo "$as_me:21727: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 21728 "configure"
++#line 21732 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -21737,16 +21741,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:21740: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21744: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21743: \$? = $ac_status" >&5
++  echo "$as_me:21747: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:21746: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21750: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21749: \$? = $ac_status" >&5
++  echo "$as_me:21753: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -21762,7 +21766,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 21765 "configure"
++#line 21769 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -21774,16 +21778,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:21777: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21781: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21780: \$? = $ac_status" >&5
++  echo "$as_me:21784: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:21783: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21787: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21786: \$? = $ac_status" >&5
++  echo "$as_me:21790: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -21799,7 +21803,7 @@
+ 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 21802 "configure"
++#line 21806 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -21811,16 +21815,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:21814: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21818: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21817: \$? = $ac_status" >&5
++  echo "$as_me:21821: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:21820: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21824: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21823: \$? = $ac_status" >&5
++  echo "$as_me:21827: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -21833,12 +21837,12 @@
+ ac_cv_sizeof_wchar_t=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:21836: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:21840: 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 21841 "configure"
++#line 21845 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -21854,15 +21858,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:21857: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21861: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21860: \$? = $ac_status" >&5
++  echo "$as_me:21864: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:21862: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21866: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21865: \$? = $ac_status" >&5
++  echo "$as_me:21869: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_wchar_t=`cat conftest.val`
+ else
+@@ -21878,7 +21882,7 @@
+   ac_cv_sizeof_wchar_t=0
+ fi
+ fi
+-echo "$as_me:21881: result: $ac_cv_sizeof_wchar_t" >&5
++echo "$as_me:21885: result: $ac_cv_sizeof_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:21903: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+ 
+@@ -21938,7 +21942,7 @@
+ test "x$with_widec"     = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
+ test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
+ 
+-echo "$as_me:21941: result: $LIB_SUBSETS" >&5
++echo "$as_me:21945: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+ 
+ ### Construct the list of include-directories to be generated
+@@ -21969,7 +21973,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:21972: checking default library suffix" >&5
++echo "$as_me:21976: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -21980,10 +21984,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:21983: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:21987: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:21986: checking default library-dependency suffix" >&5
++echo "$as_me:21990: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -22041,10 +22045,10 @@
+ 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
+ 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
+ 	fi
+-echo "$as_me:22044: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:22048: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:22047: checking default object directory" >&5
++echo "$as_me:22051: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -22060,11 +22064,11 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:22063: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:22067: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ if test "x$cf_with_cxx" = xyes ; then
+-echo "$as_me:22067: checking c++ library-dependency suffix" >&5
++echo "$as_me:22071: checking c++ library-dependency suffix" >&5
+ echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
+ if test "$with_libtool" != "no"; then
+ 	# libtool thinks it can make c++ shared libraries (perhaps only g++)
+@@ -22132,7 +22136,7 @@
+ 	fi
+ 
+ fi
+-echo "$as_me:22135: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:22139: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+ 
+ fi
+@@ -22308,19 +22312,19 @@
+ 
+ if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
+ then
+-	echo "$as_me:22311: checking if linker supports switching between static/dynamic" >&5
++	echo "$as_me:22315: checking if linker supports switching between static/dynamic" >&5
+ echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6
+ 
+ 	rm -f libconftest.a
+ 	cat >conftest.$ac_ext <
+ int cf_ldflags_static(FILE *fp) { return fflush(fp); }
+ EOF
+-	if { (eval echo "$as_me:22320: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:22324: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22323: \$? = $ac_status" >&5
++  echo "$as_me:22327: \$? = $ac_status" >&5
+   (exit $ac_status); } ; then
+ 		( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null
+ 		( eval $RANLIB libconftest.a ) 2>&5 >/dev/null
+@@ -22331,10 +22335,10 @@
+ 
+ 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 22334 "configure"
++#line 22338 "configure"
+ #include "confdefs.h"
+ 
+-#line 22337 "configure"
++#line 22341 "configure"
+ #include 
+ int cf_ldflags_static(FILE *fp);
+ 
+@@ -22349,16 +22353,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:22352: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22356: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22355: \$? = $ac_status" >&5
++  echo "$as_me:22359: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:22358: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22362: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22361: \$? = $ac_status" >&5
++  echo "$as_me:22365: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	# some linkers simply ignore the -dynamic
+@@ -22381,7 +22385,7 @@
+ 	rm -f libconftest.*
+ 	LIBS="$cf_save_LIBS"
+ 
+-	echo "$as_me:22384: result: $cf_ldflags_static" >&5
++	echo "$as_me:22388: result: $cf_ldflags_static" >&5
+ echo "${ECHO_T}$cf_ldflags_static" >&6
+ 
+ 	if test $cf_ldflags_static != yes
+@@ -22397,7 +22401,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:22400: checking where we will install curses.h" >&5
++echo "$as_me:22404: checking where we will install curses.h" >&5
+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
+ 
+ includesubdir=
+@@ -22407,7 +22411,7 @@
+ then
+ 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
+ fi
+-echo "$as_me:22410: result: ${includedir}${includesubdir}" >&5
++echo "$as_me:22414: result: ${includedir}${includesubdir}" >&5
+ echo "${ECHO_T}${includedir}${includesubdir}" >&6
+ 
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -22415,7 +22419,7 @@
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+-	{ echo "$as_me:22418: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++	{ echo "$as_me:22422: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+ echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
+ fi
+ fi
+@@ -22433,7 +22437,7 @@
+ ### Construct the list of subdirectories for which we'll customize makefiles
+ ### with the appropriate compile-rules.
+ 
+-echo "$as_me:22436: checking for src modules" >&5
++echo "$as_me:22440: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+ 
+ # dependencies and linker-arguments for test-programs
+@@ -22498,7 +22502,7 @@
+ 		fi
+ 	fi
+ done
+-echo "$as_me:22501: result: $cf_cv_src_modules" >&5
++echo "$as_me:22505: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+ 
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+@@ -22715,7 +22719,7 @@
+ 
+ # Extract the first word of "tic", so it can be a program name with args.
+ set dummy tic; ac_word=$2
+-echo "$as_me:22718: checking for $ac_word" >&5
++echo "$as_me:22722: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_TIC_PATH+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22732,7 +22736,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_TIC_PATH="$ac_dir/$ac_word"
+-   echo "$as_me:22735: found $ac_dir/$ac_word" >&5
++   echo "$as_me:22739: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -22744,10 +22748,10 @@
+ TIC_PATH=$ac_cv_path_TIC_PATH
+ 
+ if test -n "$TIC_PATH"; then
+-  echo "$as_me:22747: result: $TIC_PATH" >&5
++  echo "$as_me:22751: result: $TIC_PATH" >&5
+ echo "${ECHO_T}$TIC_PATH" >&6
+ else
+-  echo "$as_me:22750: result: no" >&5
++  echo "$as_me:22754: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -22755,7 +22759,7 @@
+ then
+ 	if test "$TIC_PATH" = unknown
+ 	then
+-		{ echo "$as_me:22758: WARNING: no tic program found for fallbacks" >&5
++		{ echo "$as_me:22762: WARNING: no tic program found for fallbacks" >&5
+ echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
+ 	fi
+ fi
+@@ -22791,7 +22795,7 @@
+ 	(*-D_XOPEN_SOURCE_EXTENDED*)
+ 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
+ 
+-echo "${as_me:-configure}:22794: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
++echo "${as_me:-configure}:22798: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+ 
+ 		CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
+ 		CPPFLAGS=`echo "x$CPPFLAGS" | sed -e  's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'`
+@@ -22802,7 +22806,7 @@
+ 
+ # Help to automatically enable the extended curses features when using either
+ # the *-config or the ".pc" files by adding defines.
+-echo "$as_me:22805: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
++echo "$as_me:22809: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
+ echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6
+ PKG_CFLAGS=
+ for cf_loop1 in $CPPFLAGS_after_XOPEN
+@@ -22818,7 +22822,7 @@
+ 	done
+ 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
+ done
+-echo "$as_me:22821: result: $PKG_CFLAGS" >&5
++echo "$as_me:22825: result: $PKG_CFLAGS" >&5
+ echo "${ECHO_T}$PKG_CFLAGS" >&6
+ 
+ # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
+@@ -22875,7 +22879,7 @@
+ 	cf_filter_syms=$cf_dft_filter_syms
+ 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_version" 1>&6
+ 
+-echo "${as_me:-configure}:22878: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
++echo "${as_me:-configure}:22882: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
+ 
+ fi
+ 
+@@ -22979,7 +22983,7 @@
+ : ${CONFIG_STATUS=./config.status}
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:22982: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:22986: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >$CONFIG_STATUS <<_ACEOF
+ #! $SHELL
+@@ -23155,7 +23159,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:23158: error: ambiguous option: $1
++    { { echo "$as_me:23162: 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;}
+@@ -23174,7 +23178,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:23177: error: unrecognized option: $1
++  -*) { { echo "$as_me:23181: 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;}
+@@ -23293,7 +23297,7 @@
+   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
+   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
+-  *) { { echo "$as_me:23296: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:23300: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -23768,7 +23772,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:23771: creating $ac_file" >&5
++    { echo "$as_me:23775: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -23786,7 +23790,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:23789: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:23793: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -23799,7 +23803,7 @@
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+-           { { echo "$as_me:23802: error: cannot find input file: $f" >&5
++           { { echo "$as_me:23806: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -23815,7 +23819,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' $ac_item`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:23818: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:23822: 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;}
+@@ -23824,7 +23828,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' $ac_item`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:23827: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:23831: 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;}
+@@ -23861,7 +23865,7 @@
+             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:23864: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:23868: 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;}
+@@ -23872,7 +23876,7 @@
+     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:23875: WARNING: Some variables may not be substituted:
++      { echo "$as_me:23879: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -23921,7 +23925,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:23924: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:23928: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -23932,7 +23936,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:23935: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:23939: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -23945,7 +23949,7 @@
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+-           { { echo "$as_me:23948: error: cannot find input file: $f" >&5
++           { { echo "$as_me:23952: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -24003,7 +24007,7 @@
+   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:24006: $ac_file is unchanged" >&5
++      { echo "$as_me:24010: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -24348,7 +24352,7 @@
+ 				(cygdll|msysdll|mingw)
+ 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
+ 
+-echo "${as_me:-configure}:24351: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:24355: testing overriding CXX_MODEL to SHARED ..." 1>&5
+ 
+ 					with_shared_cxx=yes
+ 					;;
+Index: dist.mk
+Prereq:  1.1126 
+--- ncurses-6.0-20161001+/dist.mk	2016-10-01 11:52:22.000000000 +0000
++++ ncurses-6.0-20161008/dist.mk	2016-10-03 00:57:15.000000000 +0000
+@@ -25,7 +25,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1126 2016/10/01 11:52:22 tom Exp $
++# $Id: dist.mk,v 1.1127 2016/10/03 00:57:15 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -37,7 +37,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 0
+-NCURSES_PATCH = 20161001
++NCURSES_PATCH = 20161008
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: ncurses/tinfo/lib_baudrate.c
+Prereq:  1.41 
+--- ncurses-6.0-20161001+/ncurses/tinfo/lib_baudrate.c	2016-08-28 00:35:00.000000000 +0000
++++ ncurses-6.0-20161008/ncurses/tinfo/lib_baudrate.c	2016-10-03 00:29:21.000000000 +0000
+@@ -39,7 +39,7 @@
+ 
+ #include 
+ #include 		/* ospeed */
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__)
+ #include 
+ #endif
+ 
+@@ -49,7 +49,11 @@
+  * of the indices up to B115200 fit nicely in a 'short', allowing us to retain
+  * ospeed's type for compatibility.
+  */
+-#if NCURSES_OSPEED_COMPAT && ((defined(__FreeBSD__) && (__FreeBSD_version < 700000)) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__))
++#if NCURSES_OSPEED_COMPAT && \
++ 	((defined(__FreeBSD__) && (__FreeBSD_version < 700000)) || \
++	defined(__NetBSD__) || \
++	((defined(__OpenBSD__) && OpenBSD < 201510)) || \
++	defined(__APPLE__))
+ #undef B0
+ #undef B50
+ #undef B75
+@@ -79,7 +83,7 @@
+ #undef USE_OLD_TTY
+ #endif /* USE_OLD_TTY */
+ 
+-MODULE_ID("$Id: lib_baudrate.c,v 1.41 2016/08/28 00:35:00 tom Exp $")
++MODULE_ID("$Id: lib_baudrate.c,v 1.42 2016/10/03 00:29:21 tom Exp $")
+ 
+ /*
+  *	int
+Index: package/debian-mingw/changelog
+--- ncurses-6.0-20161001+/package/debian-mingw/changelog	2016-10-01 11:52:22.000000000 +0000
++++ ncurses-6.0-20161008/package/debian-mingw/changelog	2016-10-03 00:57:15.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161001) unstable; urgency=low
++ncurses6 (6.0+20161008) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 01 Oct 2016 07:52:23 -0400
++ -- Thomas E. Dickey   Sun, 02 Oct 2016 20:57:15 -0400
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.0-20161001+/package/debian-mingw64/changelog	2016-10-01 11:52:22.000000000 +0000
++++ ncurses-6.0-20161008/package/debian-mingw64/changelog	2016-10-03 00:57:15.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161001) unstable; urgency=low
++ncurses6 (6.0+20161008) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 01 Oct 2016 07:52:23 -0400
++ -- Thomas E. Dickey   Sun, 02 Oct 2016 20:57:15 -0400
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.0-20161001+/package/debian/changelog	2016-10-01 11:52:22.000000000 +0000
++++ ncurses-6.0-20161008/package/debian/changelog	2016-10-03 00:57:15.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161001) unstable; urgency=low
++ncurses6 (6.0+20161008) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 01 Oct 2016 07:52:23 -0400
++ -- Thomas E. Dickey   Sun, 02 Oct 2016 20:57:15 -0400
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.178 
+--- ncurses-6.0-20161001+/package/mingw-ncurses.nsi	2016-10-01 11:52:22.000000000 +0000
++++ ncurses-6.0-20161008/package/mingw-ncurses.nsi	2016-10-03 00:57:15.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.178 2016/10/01 11:52:22 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.179 2016/10/03 00:57:15 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "0"
+ !define VERSION_YYYY  "2016"
+-!define VERSION_MMDD  "1001"
++!define VERSION_MMDD  "1008"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.0-20161001+/package/mingw-ncurses.spec	2016-10-01 11:52:22.000000000 +0000
++++ ncurses-6.0-20161008/package/mingw-ncurses.spec	2016-10-03 00:57:15.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.0
+-Release: 20161001
++Release: 20161008
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.0-20161001+/package/ncurses.spec	2016-10-01 11:52:22.000000000 +0000
++++ ncurses-6.0-20161008/package/ncurses.spec	2016-10-03 00:57:15.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.0
+-Release: 20161001
++Release: 20161008
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: progs/dump_entry.c
+Prereq:  1.141 
+--- ncurses-6.0-20161001+/progs/dump_entry.c	2016-10-02 01:28:04.000000000 +0000
++++ ncurses-6.0-20161008/progs/dump_entry.c	2016-10-09 01:30:14.000000000 +0000
+@@ -39,7 +39,7 @@
+ #include "termsort.c"		/* this C file is generated */
+ #include 	/* so is this */
+ 
+-MODULE_ID("$Id: dump_entry.c,v 1.141 2016/10/02 01:28:04 tom Exp $")
++MODULE_ID("$Id: dump_entry.c,v 1.143 2016/10/09 01:30:14 tom Exp $")
+ 
+ #define DISCARD(string) string = ABSENT_STRING
+ #define PRINTF (void) printf
+@@ -123,7 +123,7 @@
+ 	if (dst->text == 0)
+ 	    failed("strncpy_DYN");
+     }
+-    _nc_STRNCPY(dst->text + dst->used, src, need);
++    _nc_STRNCPY(dst->text + dst->used, src, need + 1);
+     dst->used += need;
+     dst->text[dst->used] = 0;
+ }
+@@ -581,7 +581,7 @@
+ 	    base = (int) (p + 1 - fill);
+ 	    if (base > 8)
+ 		base = 8;
+-	    sprintf(align, "%*s", base, " ");
++	    _nc_SPRINTF(align, _nc_SLIMIT(align) "%*s", base, " ");
+ 	} else {
+ 	    align[base] = '\0';
+ 	}
+Index: test/aclocal.m4
+Prereq:  1.135 
+--- ncurses-6.0-20161001+/test/aclocal.m4	2016-09-10 22:09:38.000000000 +0000
++++ ncurses-6.0-20161008/test/aclocal.m4	2016-10-08 21:36:55.000000000 +0000
+@@ -26,7 +26,7 @@
+ dnl authorization.                                                           *
+ dnl***************************************************************************
+ dnl
+-dnl $Id: aclocal.m4,v 1.135 2016/09/10 22:09:38 tom Exp $
++dnl $Id: aclocal.m4,v 1.136 2016/10/08 21:36:55 tom Exp $
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+@@ -1118,7 +1118,7 @@
+ fi
+ ])
+ dnl ---------------------------------------------------------------------------
+-dnl CF_ENABLE_STRING_HACKS version: 4 updated: 2016/09/10 15:33:21
++dnl CF_ENABLE_STRING_HACKS version: 5 updated: 2016/10/08 17:34:11
+ dnl ----------------------
+ dnl On a few platforms, the compiler and/or loader nags with untruthful
+ dnl comments stating that "most" uses of strcat/strcpy/sprintf are incorrect,
+@@ -1145,7 +1145,9 @@
+ if test "x$with_string_hacks" = "xyes"; then
+  	AC_DEFINE(USE_STRING_HACKS,1,[Define to 1 to work around bogus compiler/loader warnings])
+ 	AC_MSG_WARN(enabling string-hacks to work around bogus compiler/loader warnings)
+-	AC_CHECK_FUNC(strlcat,,[
++	AC_CHECK_FUNC(strlcat,[
++		AC_DEFINE(HAVE_STRLCAT,1,[Define to 1 if we have strlcat function])
++		],[
+ 		AC_CHECK_LIB(bsd,strlcat,[
+ 			CF_ADD_LIB(bsd)
+ 			AC_CHECK_HEADERS(bsd/string.h)
+Index: test/configure
+--- ncurses-6.0-20161001+/test/configure	2016-09-10 22:10:07.000000000 +0000
++++ ncurses-6.0-20161008/test/configure	2016-10-08 21:37:21.000000000 +0000
+@@ -2898,10 +2898,14 @@
+ echo "$as_me:2898: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test $ac_cv_func_strlcat = yes; then
+-  :
++
++cat >>confdefs.h <<\EOF
++#define HAVE_STRLCAT 1
++EOF
++
+ else
+ 
+-		echo "$as_me:2904: checking for strlcat in -lbsd" >&5
++		echo "$as_me:2908: checking for strlcat in -lbsd" >&5
+ echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_strlcat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2909,7 +2913,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 2912 "configure"
++#line 2916 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -2928,16 +2932,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:2931: \"$ac_link\"") >&5
++if { (eval echo "$as_me:2935: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:2934: \$? = $ac_status" >&5
++  echo "$as_me:2938: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:2937: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2941: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2940: \$? = $ac_status" >&5
++  echo "$as_me:2944: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -2948,7 +2952,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:2951: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:2955: result: $ac_cv_lib_bsd_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6
+ if test $ac_cv_lib_bsd_strlcat = yes; then
+ 
+@@ -2971,23 +2975,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:2974: checking for $ac_header" >&5
++echo "$as_me:2978: 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 2980 "configure"
++#line 2984 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:2984: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:2988: \"$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:2990: \$? = $ac_status" >&5
++  echo "$as_me:2994: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -3006,7 +3010,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:3009: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:3013: 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 <&5
++echo "$as_me:3034: 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 3036 "configure"
++#line 3040 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -3064,16 +3068,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:3067: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3071: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3070: \$? = $ac_status" >&5
++  echo "$as_me:3074: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:3073: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3077: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3076: \$? = $ac_status" >&5
++  echo "$as_me:3080: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -3083,7 +3087,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:3086: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:3090: 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 <&5
++echo "$as_me:3140: 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 3143 "configure"
++#line 3147 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -3155,16 +3159,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3158: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3162: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3161: \$? = $ac_status" >&5
++  echo "$as_me:3165: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3164: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3168: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3167: \$? = $ac_status" >&5
++  echo "$as_me:3171: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -3173,7 +3177,7 @@
+ cf_save="$CPPFLAGS"
+ 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 3176 "configure"
++#line 3180 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -3188,16 +3192,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3191: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3195: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3194: \$? = $ac_status" >&5
++  echo "$as_me:3198: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3197: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3201: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3200: \$? = $ac_status" >&5
++  echo "$as_me:3204: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -3212,12 +3216,12 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:3215: result: $cf_cv_gnu_source" >&5
++echo "$as_me:3219: 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:3220: checking if we should also define _DEFAULT_SOURCE" >&5
++echo "$as_me:3224: 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
+@@ -3225,7 +3229,7 @@
+ 
+ CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 3228 "configure"
++#line 3232 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -3240,16 +3244,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3243: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3247: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3246: \$? = $ac_status" >&5
++  echo "$as_me:3250: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3249: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3253: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3252: \$? = $ac_status" >&5
++  echo "$as_me:3256: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -3260,7 +3264,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:3263: result: $cf_cv_default_source" >&5
++echo "$as_me:3267: 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
+@@ -3286,16 +3290,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:3289: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:3293: 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}:3295: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:3299: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 3298 "configure"
++#line 3302 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -3310,16 +3314,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3313: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3317: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3316: \$? = $ac_status" >&5
++  echo "$as_me:3320: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3319: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3323: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3322: \$? = $ac_status" >&5
++  echo "$as_me:3326: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -3340,7 +3344,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 3343 "configure"
++#line 3347 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -3355,16 +3359,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3358: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3362: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3361: \$? = $ac_status" >&5
++  echo "$as_me:3365: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3364: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3368: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3367: \$? = $ac_status" >&5
++  echo "$as_me:3371: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -3375,15 +3379,15 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 	 fi
+ 
+-echo "${as_me:-configure}:3378: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:3382: 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}:3383: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:3387: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 3386 "configure"
++#line 3390 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -3398,16 +3402,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3401: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3405: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3404: \$? = $ac_status" >&5
++  echo "$as_me:3408: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3407: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3411: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3410: \$? = $ac_status" >&5
++  echo "$as_me:3414: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -3423,7 +3427,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:3426: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:3430: 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
+@@ -3541,14 +3545,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:3544: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:3548: 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 3551 "configure"
++#line 3555 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -3567,16 +3571,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3570: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3574: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3573: \$? = $ac_status" >&5
++  echo "$as_me:3577: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3576: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3580: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3579: \$? = $ac_status" >&5
++  echo "$as_me:3583: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -3585,7 +3589,7 @@
+ cf_save="$CPPFLAGS"
+ 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 3588 "configure"
++#line 3592 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -3604,16 +3608,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3607: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3611: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3610: \$? = $ac_status" >&5
++  echo "$as_me:3614: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3613: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3617: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3616: \$? = $ac_status" >&5
++  echo "$as_me:3620: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -3628,7 +3632,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:3631: result: $cf_cv_xopen_source" >&5
++echo "$as_me:3635: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -3736,16 +3740,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:3739: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:3743: 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}:3745: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:3749: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 3748 "configure"
++#line 3752 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -3760,16 +3764,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3763: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3767: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3766: \$? = $ac_status" >&5
++  echo "$as_me:3770: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3769: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3773: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3772: \$? = $ac_status" >&5
++  echo "$as_me:3776: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -3790,7 +3794,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 3793 "configure"
++#line 3797 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -3805,16 +3809,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3808: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3812: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3811: \$? = $ac_status" >&5
++  echo "$as_me:3815: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3814: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3818: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3817: \$? = $ac_status" >&5
++  echo "$as_me:3821: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -3825,15 +3829,15 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 	 fi
+ 
+-echo "${as_me:-configure}:3828: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:3832: 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}:3833: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:3837: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 3836 "configure"
++#line 3840 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -3848,16 +3852,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3851: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3855: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3854: \$? = $ac_status" >&5
++  echo "$as_me:3858: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3857: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3861: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3860: \$? = $ac_status" >&5
++  echo "$as_me:3864: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -3873,7 +3877,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:3876: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:3880: 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
+@@ -4031,7 +4035,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:4034: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:4038: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	CFLAGS="$CFLAGS $cf_new_cflags"
+ fi
+@@ -4039,7 +4043,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:4042: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:4046: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+ fi
+@@ -4047,7 +4051,7 @@
+ 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}:4050: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:4054: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+ 
+ 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+ fi
+@@ -4055,10 +4059,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:4058: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:4062: 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 4061 "configure"
++#line 4065 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4073,16 +4077,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4076: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4080: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4079: \$? = $ac_status" >&5
++  echo "$as_me:4083: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4082: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4086: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4085: \$? = $ac_status" >&5
++  echo "$as_me:4089: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -4091,12 +4095,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-	echo "$as_me:4094: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:4098: 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 4099 "configure"
++#line 4103 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4111,16 +4115,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4114: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4118: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4117: \$? = $ac_status" >&5
++  echo "$as_me:4121: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4120: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4124: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4123: \$? = $ac_status" >&5
++  echo "$as_me:4127: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -4131,19 +4135,19 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 		if test $cf_XOPEN_SOURCE_set_ok = no
+ 		then
+-			{ echo "$as_me:4134: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:4138: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:4139: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:4143: 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 4146 "configure"
++#line 4150 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -4162,16 +4166,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4165: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4169: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4168: \$? = $ac_status" >&5
++  echo "$as_me:4172: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4171: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4175: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4174: \$? = $ac_status" >&5
++  echo "$as_me:4178: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -4180,7 +4184,7 @@
+ cf_save="$CPPFLAGS"
+ 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 4183 "configure"
++#line 4187 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -4199,16 +4203,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4202: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4206: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4205: \$? = $ac_status" >&5
++  echo "$as_me:4209: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4208: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4212: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4211: \$? = $ac_status" >&5
++  echo "$as_me:4215: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -4223,7 +4227,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:4226: result: $cf_cv_xopen_source" >&5
++echo "$as_me:4230: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -4321,7 +4325,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:4324: checking for signal global datatype" >&5
++echo "$as_me:4328: checking for signal global datatype" >&5
+ echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6
+ if test "${cf_cv_sig_atomic_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4333,7 +4337,7 @@
+ 		"int"
+ 	do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 4336 "configure"
++#line 4340 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -4356,16 +4360,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4359: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4363: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4362: \$? = $ac_status" >&5
++  echo "$as_me:4366: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4365: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4369: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4368: \$? = $ac_status" >&5
++  echo "$as_me:4372: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -4379,7 +4383,7 @@
+ 
+ fi
+ 
+-echo "$as_me:4382: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:4386: result: $cf_cv_sig_atomic_t" >&5
+ echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
+ test "$cf_cv_sig_atomic_t" != no &&
+ cat >>confdefs.h <&5
++echo "$as_me:4395: 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 4398 "configure"
++#line 4402 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -4410,23 +4414,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4413: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4417: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4416: \$? = $ac_status" >&5
++  echo "$as_me:4420: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4419: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4423: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4422: \$? = $ac_status" >&5
++  echo "$as_me:4426: \$? = $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 4429 "configure"
++#line 4433 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -4444,16 +4448,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4447: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4451: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4450: \$? = $ac_status" >&5
++  echo "$as_me:4454: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4453: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4457: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4456: \$? = $ac_status" >&5
++  echo "$as_me:4460: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_define_sigwinch=maybe
+ else
+@@ -4467,11 +4471,11 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:4470: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:4474: 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:4474: checking for actual SIGWINCH definition" >&5
++echo "$as_me:4478: 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
+@@ -4482,7 +4486,7 @@
+ while test $cf_sigwinch != 1
+ do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 4485 "configure"
++#line 4489 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -4504,16 +4508,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4507: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4511: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4510: \$? = $ac_status" >&5
++  echo "$as_me:4514: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4513: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4517: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4516: \$? = $ac_status" >&5
++  echo "$as_me:4520: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_fixup_sigwinch=$cf_sigwinch
+ 	 break
+@@ -4527,7 +4531,7 @@
+ done
+ 
+ fi
+-echo "$as_me:4530: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:4534: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+ 
+ 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -4537,13 +4541,13 @@
+ 
+ # Checks for CODESET support.
+ 
+-echo "$as_me:4540: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:4544: 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 4546 "configure"
++#line 4550 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4555,16 +4559,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:4558: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4562: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4561: \$? = $ac_status" >&5
++  echo "$as_me:4565: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:4564: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4568: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4567: \$? = $ac_status" >&5
++  echo "$as_me:4571: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   am_cv_langinfo_codeset=yes
+ else
+@@ -4575,7 +4579,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:4578: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:4582: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ 	if test $am_cv_langinfo_codeset = yes; then
+ 
+@@ -4585,7 +4589,7 @@
+ 
+ 	fi
+ 
+-echo "$as_me:4588: checking if you want to use pkg-config" >&5
++echo "$as_me:4592: 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.
+@@ -4595,7 +4599,7 @@
+ else
+   cf_pkg_config=yes
+ fi;
+-echo "$as_me:4598: result: $cf_pkg_config" >&5
++echo "$as_me:4602: result: $cf_pkg_config" >&5
+ echo "${ECHO_T}$cf_pkg_config" >&6
+ 
+ case $cf_pkg_config in
+@@ -4607,7 +4611,7 @@
+ 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:4610: checking for $ac_word" >&5
++echo "$as_me:4614: 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
+@@ -4624,7 +4628,7 @@
+   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:4627: found $ac_dir/$ac_word" >&5
++   echo "$as_me:4631: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -4635,10 +4639,10 @@
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ 
+ if test -n "$PKG_CONFIG"; then
+-  echo "$as_me:4638: result: $PKG_CONFIG" >&5
++  echo "$as_me:4642: result: $PKG_CONFIG" >&5
+ echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+-  echo "$as_me:4641: result: no" >&5
++  echo "$as_me:4645: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4647,7 +4651,7 @@
+   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:4650: checking for $ac_word" >&5
++echo "$as_me:4654: 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
+@@ -4664,7 +4668,7 @@
+   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:4667: found $ac_dir/$ac_word" >&5
++   echo "$as_me:4671: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -4676,10 +4680,10 @@
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+ 
+ if test -n "$ac_pt_PKG_CONFIG"; then
+-  echo "$as_me:4679: result: $ac_pt_PKG_CONFIG" >&5
++  echo "$as_me:4683: result: $ac_pt_PKG_CONFIG" >&5
+ echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+ else
+-  echo "$as_me:4682: result: no" >&5
++  echo "$as_me:4686: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4722,18 +4726,18 @@
+ 	PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:4725: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++	{ { echo "$as_me:4729: 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:4732: WARNING: pkg-config is not installed" >&5
++	{ echo "$as_me:4736: WARNING: pkg-config is not installed" >&5
+ echo "$as_me: WARNING: pkg-config is not installed" >&2;}
+ fi
+ 
+-echo "$as_me:4736: checking if you want to see long compiling messages" >&5
++echo "$as_me:4740: 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.
+@@ -4767,10 +4771,10 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:4770: result: $enableval" >&5
++echo "$as_me:4774: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+-echo "$as_me:4773: checking for ncurses wrap-prefix" >&5
++echo "$as_me:4777: checking for ncurses wrap-prefix" >&5
+ echo $ECHO_N "checking for ncurses wrap-prefix... $ECHO_C" >&6
+ 
+ # Check whether --with-ncurses-wrap-prefix or --without-ncurses-wrap-prefix was given.
+@@ -4780,10 +4784,10 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-echo "$as_me:4783: result: $NCURSES_WRAP_PREFIX" >&5
++echo "$as_me:4787: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ 
+-echo "$as_me:4786: checking if you want to check for wide-character functions" >&5
++echo "$as_me:4790: checking if you want to check for wide-character functions" >&5
+ echo $ECHO_N "checking if you want to check for wide-character functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-widec or --disable-widec was given.
+@@ -4800,10 +4804,10 @@
+ 	cf_enable_widec=yes
+ 
+ fi;
+-echo "$as_me:4803: result: $cf_enable_widec" >&5
++echo "$as_me:4807: result: $cf_enable_widec" >&5
+ echo "${ECHO_T}$cf_enable_widec" >&6
+ 
+-echo "$as_me:4806: checking for specific curses-directory" >&5
++echo "$as_me:4810: 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.
+@@ -4813,7 +4817,7 @@
+ else
+   cf_cv_curses_dir=no
+ fi;
+-echo "$as_me:4816: result: $cf_cv_curses_dir" >&5
++echo "$as_me:4820: 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" )
+@@ -4844,7 +4848,7 @@
+ 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:4847: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:4851: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -4877,7 +4881,7 @@
+ 			  cf_save_CPPFLAGS=$CPPFLAGS
+ 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 4880 "configure"
++#line 4884 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4889,16 +4893,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4892: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4896: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4895: \$? = $ac_status" >&5
++  echo "$as_me:4899: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4898: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4902: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4901: \$? = $ac_status" >&5
++  echo "$as_me:4905: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -4915,7 +4919,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:4918: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:4922: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -4951,7 +4955,7 @@
+ 			if test "$cf_have_libdir" = no ; then
+ 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+ 
+-echo "${as_me:-configure}:4954: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:4958: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -4964,7 +4968,7 @@
+ 
+ cf_cv_screen=curses
+ 
+-echo "$as_me:4967: checking for specified curses library type" >&5
++echo "$as_me:4971: checking for specified curses library type" >&5
+ echo $ECHO_N "checking for specified curses library type... $ECHO_C" >&6
+ 
+ # Check whether --with-screen or --without-screen was given.
+@@ -5008,13 +5012,13 @@
+ fi;
+ fi;
+ 
+-echo "$as_me:5011: result: $cf_cv_screen" >&5
++echo "$as_me:5015: result: $cf_cv_screen" >&5
+ echo "${ECHO_T}$cf_cv_screen" >&6
+ 
+ case $cf_cv_screen in
+ (curses|curses_*)
+ 
+-echo "$as_me:5017: checking for extra include directories" >&5
++echo "$as_me:5021: 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
+@@ -5040,11 +5044,11 @@
+ esac
+ 
+ fi
+-echo "$as_me:5043: result: $cf_cv_curses_incdir" >&5
++echo "$as_me:5047: 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:5047: checking if we have identified curses headers" >&5
++echo "$as_me:5051: 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
+@@ -5056,7 +5060,7 @@
+ 	curses.h  ncurses/ncurses.h ncurses/curses.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5059 "configure"
++#line 5063 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -5068,16 +5072,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5071: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5075: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5074: \$? = $ac_status" >&5
++  echo "$as_me:5078: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5077: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5081: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5080: \$? = $ac_status" >&5
++  echo "$as_me:5084: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -5088,11 +5092,11 @@
+ done
+ 
+ fi
+-echo "$as_me:5091: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:5095: 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:5095: error: No curses header-files found" >&5
++	{ { echo "$as_me:5099: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -5102,23 +5106,23 @@
+ for ac_header in $cf_cv_ncurses_header
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:5105: checking for $ac_header" >&5
++echo "$as_me:5109: 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 5111 "configure"
++#line 5115 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:5115: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:5119: \"$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:5121: \$? = $ac_status" >&5
++  echo "$as_me:5125: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -5137,7 +5141,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:5140: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:5144: 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 <&5
++echo "$as_me:5154: 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
+@@ -5165,7 +5169,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5168 "configure"
++#line 5172 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -5180,16 +5184,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5183: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5187: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5186: \$? = $ac_status" >&5
++  echo "$as_me:5190: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5189: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5193: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5192: \$? = $ac_status" >&5
++  echo "$as_me:5196: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -5205,7 +5209,7 @@
+ done
+ 
+ fi
+-echo "$as_me:5208: result: $cf_cv_term_header" >&5
++echo "$as_me:5212: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -5237,7 +5241,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:5240: checking for ncurses version" >&5
++echo "$as_me:5244: 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
+@@ -5263,10 +5267,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:5266: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:5270: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5269: \$? = $ac_status" >&5
++  echo "$as_me:5273: \$? = $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%".*%%'`
+@@ -5276,7 +5280,7 @@
+ 
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5279 "configure"
++#line 5283 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -5301,15 +5305,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:5304: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5308: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5307: \$? = $ac_status" >&5
++  echo "$as_me:5311: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:5309: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5313: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5312: \$? = $ac_status" >&5
++  echo "$as_me:5316: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -5323,17 +5327,17 @@
+ 	rm -f $cf_tempfile
+ 
+ fi
+-echo "$as_me:5326: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:5330: 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:5333: checking if we have identified curses libraries" >&5
++echo "$as_me:5337: 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 5336 "configure"
++#line 5340 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -5345,16 +5349,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5348: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5352: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5351: \$? = $ac_status" >&5
++  echo "$as_me:5355: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5354: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5358: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5357: \$? = $ac_status" >&5
++  echo "$as_me:5361: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -5363,13 +5367,13 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-echo "$as_me:5366: result: $cf_result" >&5
++echo "$as_me:5370: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ if test "$cf_result" = no ; then
+ case $host_os in
+ (freebsd*)
+-	echo "$as_me:5372: checking for tgoto in -lmytinfo" >&5
++	echo "$as_me:5376: 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
+@@ -5377,7 +5381,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5380 "configure"
++#line 5384 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -5396,16 +5400,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5399: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5403: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5402: \$? = $ac_status" >&5
++  echo "$as_me:5406: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5405: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5409: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5408: \$? = $ac_status" >&5
++  echo "$as_me:5412: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -5416,7 +5420,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:5419: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:5423: 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
+ 
+@@ -5446,7 +5450,7 @@
+ 	# term.h) for cur_colr
+ 	if test "x$cf_cv_screen" = "xcurses_colr"
+ 	then
+-		echo "$as_me:5449: checking for initscr in -lcur_colr" >&5
++		echo "$as_me:5453: 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
+@@ -5454,7 +5458,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lcur_colr  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5457 "configure"
++#line 5461 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -5473,16 +5477,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5476: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5480: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5479: \$? = $ac_status" >&5
++  echo "$as_me:5483: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5482: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5486: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5485: \$? = $ac_status" >&5
++  echo "$as_me:5489: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_cur_colr_initscr=yes
+ else
+@@ -5493,7 +5497,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:5496: result: $ac_cv_lib_cur_colr_initscr" >&5
++echo "$as_me:5500: 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
+ 
+@@ -5517,7 +5521,7 @@
+ 
+ else
+ 
+-		echo "$as_me:5520: checking for initscr in -lHcurses" >&5
++		echo "$as_me:5524: 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
+@@ -5525,7 +5529,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lHcurses  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5528 "configure"
++#line 5532 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -5544,16 +5548,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5547: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5551: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5550: \$? = $ac_status" >&5
++  echo "$as_me:5554: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5553: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5557: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5556: \$? = $ac_status" >&5
++  echo "$as_me:5560: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_Hcurses_initscr=yes
+ else
+@@ -5564,7 +5568,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:5567: result: $ac_cv_lib_Hcurses_initscr" >&5
++echo "$as_me:5571: 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
+ 
+@@ -5620,7 +5624,7 @@
+ 			if test "$cf_have_libdir" = no ; then
+ 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+ 
+-echo "${as_me:-configure}:5623: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:5627: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -5649,7 +5653,7 @@
+ 			if test "$cf_have_libdir" = no ; then
+ 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+ 
+-echo "${as_me:-configure}:5652: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:5656: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -5680,7 +5684,7 @@
+ 			if test "$cf_have_libdir" = no ; then
+ 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+ 
+-echo "${as_me:-configure}:5683: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:5687: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -5715,7 +5719,7 @@
+ 			if test "$cf_have_libdir" = no ; then
+ 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+ 
+-echo "${as_me:-configure}:5718: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:5722: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -5759,13 +5763,13 @@
+ 	# because it may be needed to link the test-case for initscr.
+ 	if test "x$cf_term_lib" = x
+ 	then
+-		echo "$as_me:5762: checking for tgoto" >&5
++		echo "$as_me:5766: 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 5768 "configure"
++#line 5772 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char tgoto (); below.  */
+@@ -5796,16 +5800,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5799: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5803: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5802: \$? = $ac_status" >&5
++  echo "$as_me:5806: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5805: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5809: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5808: \$? = $ac_status" >&5
++  echo "$as_me:5812: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_tgoto=yes
+ else
+@@ -5815,7 +5819,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:5818: result: $ac_cv_func_tgoto" >&5
++echo "$as_me:5822: 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
+@@ -5824,7 +5828,7 @@
+ 			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:5827: checking for tgoto in -l$cf_term_lib" >&5
++echo "$as_me:5831: 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
+@@ -5832,7 +5836,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_term_lib  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5835 "configure"
++#line 5839 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -5851,16 +5855,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5854: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5858: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5857: \$? = $ac_status" >&5
++  echo "$as_me:5861: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5860: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5864: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5863: \$? = $ac_status" >&5
++  echo "$as_me:5867: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -5871,7 +5875,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:5874: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:5878: 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
+@@ -5890,7 +5894,7 @@
+ 		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:5893: checking for initscr in -l$cf_curs_lib" >&5
++echo "$as_me:5897: 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
+@@ -5898,7 +5902,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_curs_lib  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5901 "configure"
++#line 5905 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -5917,16 +5921,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5920: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5924: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5923: \$? = $ac_status" >&5
++  echo "$as_me:5927: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5926: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5930: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5929: \$? = $ac_status" >&5
++  echo "$as_me:5933: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -5937,7 +5941,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:5940: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:5944: 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
+@@ -5945,16 +5949,16 @@
+ 
+ 		done
+ 	fi
+-	test $cf_curs_lib = unknown && { { echo "$as_me:5948: error: no curses library found" >&5
++	test $cf_curs_lib = unknown && { { echo "$as_me:5952: 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:5954: checking if we can link with $cf_curs_lib library" >&5
++		echo "$as_me:5958: 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 5957 "configure"
++#line 5961 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -5966,16 +5970,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5969: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5973: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5972: \$? = $ac_status" >&5
++  echo "$as_me:5976: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5975: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5979: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5978: \$? = $ac_status" >&5
++  echo "$as_me:5982: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -5984,18 +5988,18 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-		echo "$as_me:5987: result: $cf_result" >&5
++		echo "$as_me:5991: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+-		test $cf_result = no && { { echo "$as_me:5989: error: Cannot link curses library" >&5
++		test $cf_result = no && { { echo "$as_me:5993: 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:5995: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
++		echo "$as_me:5999: 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 5998 "configure"
++#line 6002 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6007,16 +6011,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6010: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6014: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6013: \$? = $ac_status" >&5
++  echo "$as_me:6017: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6016: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6020: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6019: \$? = $ac_status" >&5
++  echo "$as_me:6023: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=no
+ else
+@@ -6025,7 +6029,7 @@
+ 
+ 			LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 6028 "configure"
++#line 6032 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6037,16 +6041,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6040: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6044: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6043: \$? = $ac_status" >&5
++  echo "$as_me:6047: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6046: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6050: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6049: \$? = $ac_status" >&5
++  echo "$as_me:6053: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -6058,7 +6062,7 @@
+ 
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-		echo "$as_me:6061: result: $cf_result" >&5
++		echo "$as_me:6065: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	fi
+ fi
+@@ -6067,7 +6071,7 @@
+ 	;;
+ (ncursesw*)
+ 
+-echo "$as_me:6070: checking for multibyte character support" >&5
++echo "$as_me:6074: 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
+@@ -6075,7 +6079,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 6078 "configure"
++#line 6082 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -6088,16 +6092,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6091: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6095: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6094: \$? = $ac_status" >&5
++  echo "$as_me:6098: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6097: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6101: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6100: \$? = $ac_status" >&5
++  echo "$as_me:6104: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -6109,12 +6113,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:6112: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:6116: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6117 "configure"
++#line 6121 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -6127,16 +6131,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6130: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6134: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6133: \$? = $ac_status" >&5
++  echo "$as_me:6137: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6136: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6140: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6139: \$? = $ac_status" >&5
++  echo "$as_me:6143: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -6150,7 +6154,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6153 "configure"
++#line 6157 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -6163,16 +6167,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6166: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6170: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6169: \$? = $ac_status" >&5
++  echo "$as_me:6173: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6172: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6176: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6175: \$? = $ac_status" >&5
++  echo "$as_me:6179: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -6189,9 +6193,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:6192: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:6196: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:6194: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:6198: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -6282,11 +6286,11 @@
+ 		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}:6285: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:6289: 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 6289 "configure"
++#line 6293 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -6299,21 +6303,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6302: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6306: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6305: \$? = $ac_status" >&5
++  echo "$as_me:6309: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6308: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6312: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6311: \$? = $ac_status" >&5
++  echo "$as_me:6315: \$? = $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}:6316: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:6320: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -6331,7 +6335,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:6334: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:6338: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -6406,13 +6410,13 @@
+ 				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}:6409: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:6413: 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 6415 "configure"
++#line 6419 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -6425,21 +6429,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6428: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6432: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6431: \$? = $ac_status" >&5
++  echo "$as_me:6435: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6434: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6438: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6437: \$? = $ac_status" >&5
++  echo "$as_me:6441: \$? = $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}:6442: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:6446: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -6481,7 +6485,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:6484: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:6488: 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
+@@ -6516,7 +6520,7 @@
+ 			  cf_save_CPPFLAGS=$CPPFLAGS
+ 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 6519 "configure"
++#line 6523 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6528,16 +6532,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6531: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6535: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6534: \$? = $ac_status" >&5
++  echo "$as_me:6538: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6537: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6541: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6540: \$? = $ac_status" >&5
++  echo "$as_me:6544: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -6554,7 +6558,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:6557: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6561: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -6590,7 +6594,7 @@
+ 			if test "$cf_have_libdir" = no ; then
+ 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+ 
+-echo "${as_me:-configure}:6593: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:6597: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -6620,13 +6624,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:6623: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:6627: 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:6626: result: yes" >&5
++		echo "$as_me:6630: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:6629: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:6633: 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
+ 
+@@ -6652,7 +6656,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 6655 "configure"
++#line 6659 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6664,37 +6668,37 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6667: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6671: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6670: \$? = $ac_status" >&5
++  echo "$as_me:6674: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6673: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6677: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6676: \$? = $ac_status" >&5
++  echo "$as_me:6680: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6682 "configure"
++#line 6686 "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:6689: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6693: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6692: \$? = $ac_status" >&5
++  echo "$as_me:6696: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:6694: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6698: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6697: \$? = $ac_status" >&5
++  echo "$as_me:6701: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -6711,7 +6715,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-		echo "$as_me:6714: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:6718: 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"
+@@ -6729,7 +6733,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:6732: result: no" >&5
++		echo "$as_me:6736: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -6745,7 +6749,7 @@
+   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:6748: checking for $ac_word" >&5
++echo "$as_me:6752: 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
+@@ -6760,7 +6764,7 @@
+   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:6763: found $ac_dir/$ac_word" >&5
++echo "$as_me:6767: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -6768,10 +6772,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:6771: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:6775: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:6774: result: no" >&5
++  echo "$as_me:6778: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -6784,7 +6788,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:6787: checking for $ac_word" >&5
++echo "$as_me:6791: 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
+@@ -6799,7 +6803,7 @@
+   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:6802: found $ac_dir/$ac_word" >&5
++echo "$as_me:6806: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -6807,10 +6811,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:6810: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:6814: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:6813: result: no" >&5
++  echo "$as_me:6817: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -6843,7 +6847,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:6846: checking if we have identified curses headers" >&5
++echo "$as_me:6850: 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
+@@ -6855,7 +6859,7 @@
+ 	curses.h $cf_cv_screen/curses.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6858 "configure"
++#line 6862 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -6867,16 +6871,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6870: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6874: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6873: \$? = $ac_status" >&5
++  echo "$as_me:6877: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6876: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6880: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6879: \$? = $ac_status" >&5
++  echo "$as_me:6883: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -6887,11 +6891,11 @@
+ done
+ 
+ fi
+-echo "$as_me:6890: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:6894: 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:6894: error: No curses header-files found" >&5
++	{ { echo "$as_me:6898: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -6901,23 +6905,23 @@
+ for ac_header in $cf_cv_ncurses_header
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:6904: checking for $ac_header" >&5
++echo "$as_me:6908: 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 6910 "configure"
++#line 6914 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:6914: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:6918: \"$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:6920: \$? = $ac_status" >&5
++  echo "$as_me:6924: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -6936,7 +6940,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:6939: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:6943: 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 <conftest.$ac_ext <<_ACEOF
+-#line 6992 "configure"
++#line 6996 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -7001,16 +7005,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7004: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7008: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7007: \$? = $ac_status" >&5
++  echo "$as_me:7011: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7010: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7014: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7013: \$? = $ac_status" >&5
++  echo "$as_me:7017: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -7027,7 +7031,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:7030: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:7034: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -7046,7 +7050,7 @@
+ 
+ }
+ 
+-echo "$as_me:7049: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:7053: 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
+@@ -7058,7 +7062,7 @@
+ 	do
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 7061 "configure"
++#line 7065 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -7082,16 +7086,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7085: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7089: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7088: \$? = $ac_status" >&5
++  echo "$as_me:7092: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7091: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7095: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7094: \$? = $ac_status" >&5
++  echo "$as_me:7098: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -7106,14 +7110,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:7109: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:7113: 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:7116: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:7120: 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
+@@ -7231,7 +7235,7 @@
+ 			  cf_save_CPPFLAGS=$CPPFLAGS
+ 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 7234 "configure"
++#line 7238 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -7243,16 +7247,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7246: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7250: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7249: \$? = $ac_status" >&5
++  echo "$as_me:7253: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7252: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7256: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7255: \$? = $ac_status" >&5
++  echo "$as_me:7259: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -7269,7 +7273,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:7272: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:7276: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -7292,7 +7296,7 @@
+ 		do
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 7295 "configure"
++#line 7299 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -7316,16 +7320,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7319: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7323: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7322: \$? = $ac_status" >&5
++  echo "$as_me:7326: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7325: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7329: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7328: \$? = $ac_status" >&5
++  echo "$as_me:7332: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -7346,12 +7350,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:7349: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:7353: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:7354: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:7358: 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%/[^/]*$%%'`
+@@ -7384,7 +7388,7 @@
+ 			  cf_save_CPPFLAGS=$CPPFLAGS
+ 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 7387 "configure"
++#line 7391 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -7396,16 +7400,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7399: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7403: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7402: \$? = $ac_status" >&5
++  echo "$as_me:7406: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7405: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7409: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7408: \$? = $ac_status" >&5
++  echo "$as_me:7412: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -7422,7 +7426,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:7425: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:7429: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -7470,7 +7474,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:7473: checking for terminfo header" >&5
++echo "$as_me:7477: 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
+@@ -7488,7 +7492,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7491 "configure"
++#line 7495 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -7503,16 +7507,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7506: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7510: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7509: \$? = $ac_status" >&5
++  echo "$as_me:7513: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7512: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7516: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7515: \$? = $ac_status" >&5
++  echo "$as_me:7519: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -7528,7 +7532,7 @@
+ done
+ 
+ fi
+-echo "$as_me:7531: result: $cf_cv_term_header" >&5
++echo "$as_me:7535: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -7566,7 +7570,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:7569: checking for ncurses version" >&5
++echo "$as_me:7573: 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
+@@ -7592,10 +7596,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:7595: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:7599: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7598: \$? = $ac_status" >&5
++  echo "$as_me:7602: \$? = $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%".*%%'`
+@@ -7605,7 +7609,7 @@
+ 
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 7608 "configure"
++#line 7612 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -7630,15 +7634,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:7633: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7637: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7636: \$? = $ac_status" >&5
++  echo "$as_me:7640: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:7638: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7642: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7641: \$? = $ac_status" >&5
++  echo "$as_me:7645: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -7652,7 +7656,7 @@
+ 	rm -f $cf_tempfile
+ 
+ fi
+-echo "$as_me:7655: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:7659: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -7665,7 +7669,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:7668: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:7672: 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
+@@ -7673,7 +7677,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7676 "configure"
++#line 7680 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7692,16 +7696,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7695: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7699: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7698: \$? = $ac_status" >&5
++  echo "$as_me:7702: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7701: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7705: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7704: \$? = $ac_status" >&5
++  echo "$as_me:7708: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -7712,10 +7716,10 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7715: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:7719: 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:7718: checking for initscr in -lgpm" >&5
++  echo "$as_me:7722: 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
+@@ -7723,7 +7727,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7726 "configure"
++#line 7730 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7742,16 +7746,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7745: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7749: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7748: \$? = $ac_status" >&5
++  echo "$as_me:7752: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7751: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7755: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7754: \$? = $ac_status" >&5
++  echo "$as_me:7758: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -7762,7 +7766,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7765: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:7769: 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"
+@@ -7777,7 +7781,7 @@
+ 	# 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:7780: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:7784: 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
+@@ -7785,7 +7789,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7788 "configure"
++#line 7792 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7804,16 +7808,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7807: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7811: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7810: \$? = $ac_status" >&5
++  echo "$as_me:7814: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7813: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7817: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7816: \$? = $ac_status" >&5
++  echo "$as_me:7820: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -7824,7 +7828,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7827: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:7831: 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"
+@@ -7873,13 +7877,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
+ 	cf_libdir=""
+-	echo "$as_me:7876: checking for initscr" >&5
++	echo "$as_me:7880: 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 7882 "configure"
++#line 7886 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char initscr (); below.  */
+@@ -7910,16 +7914,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7913: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7917: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7916: \$? = $ac_status" >&5
++  echo "$as_me:7920: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7919: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7923: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7922: \$? = $ac_status" >&5
++  echo "$as_me:7926: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -7929,18 +7933,18 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:7932: result: $ac_cv_func_initscr" >&5
++echo "$as_me:7936: 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:7939: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:7943: 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 7943 "configure"
++#line 7947 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7952,25 +7956,25 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7955: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7959: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7958: \$? = $ac_status" >&5
++  echo "$as_me:7962: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7961: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7965: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7964: \$? = $ac_status" >&5
++  echo "$as_me:7968: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:7966: result: yes" >&5
++  echo "$as_me:7970: 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:7973: result: no" >&5
++echo "$as_me:7977: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -8038,11 +8042,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:8041: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:8045: 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 8045 "configure"
++#line 8049 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8054,25 +8058,25 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8057: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8061: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8060: \$? = $ac_status" >&5
++  echo "$as_me:8064: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:8063: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8067: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8066: \$? = $ac_status" >&5
++  echo "$as_me:8070: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:8068: result: yes" >&5
++  echo "$as_me:8072: 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:8075: result: no" >&5
++echo "$as_me:8079: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -8087,7 +8091,7 @@
+ eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
+ 
+ if test $cf_found_library = no ; then
+-	{ { echo "$as_me:8090: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:8094: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -8095,7 +8099,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:8098: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:8102: 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
+@@ -8105,7 +8109,7 @@
+ 		fi
+ 	done
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 8108 "configure"
++#line 8112 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8117,23 +8121,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8120: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8124: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8123: \$? = $ac_status" >&5
++  echo "$as_me:8127: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:8126: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8130: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8129: \$? = $ac_status" >&5
++  echo "$as_me:8133: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:8131: result: yes" >&5
++  echo "$as_me:8135: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:8136: result: no" >&5
++echo "$as_me:8140: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -8158,13 +8162,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:8161: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:8165: 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:8164: result: yes" >&5
++		echo "$as_me:8168: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:8167: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:8171: 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
+ 
+@@ -8190,7 +8194,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 8193 "configure"
++#line 8197 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8202,37 +8206,37 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8205: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8209: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8208: \$? = $ac_status" >&5
++  echo "$as_me:8212: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:8211: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8215: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8214: \$? = $ac_status" >&5
++  echo "$as_me:8218: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 8220 "configure"
++#line 8224 "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:8227: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8231: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8230: \$? = $ac_status" >&5
++  echo "$as_me:8234: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:8232: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8236: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8235: \$? = $ac_status" >&5
++  echo "$as_me:8239: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -8249,7 +8253,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-		echo "$as_me:8252: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:8256: 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"
+@@ -8267,7 +8271,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:8270: result: no" >&5
++		echo "$as_me:8274: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -8283,7 +8287,7 @@
+   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:8286: checking for $ac_word" >&5
++echo "$as_me:8290: 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
+@@ -8298,7 +8302,7 @@
+   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:8301: found $ac_dir/$ac_word" >&5
++echo "$as_me:8305: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8306,10 +8310,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:8309: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:8313: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:8312: result: no" >&5
++  echo "$as_me:8316: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8322,7 +8326,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:8325: checking for $ac_word" >&5
++echo "$as_me:8329: 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
+@@ -8337,7 +8341,7 @@
+   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:8340: found $ac_dir/$ac_word" >&5
++echo "$as_me:8344: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8345,10 +8349,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:8348: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:8352: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:8351: result: no" >&5
++  echo "$as_me:8355: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8381,7 +8385,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:8384: checking if we have identified curses headers" >&5
++echo "$as_me:8388: 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
+@@ -8393,7 +8397,7 @@
+ 	curses.h $cf_cv_screen/curses.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8396 "configure"
++#line 8400 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -8405,16 +8409,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8408: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8412: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8411: \$? = $ac_status" >&5
++  echo "$as_me:8415: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8414: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8418: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8417: \$? = $ac_status" >&5
++  echo "$as_me:8421: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -8425,11 +8429,11 @@
+ done
+ 
+ fi
+-echo "$as_me:8428: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:8432: 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:8432: error: No curses header-files found" >&5
++	{ { echo "$as_me:8436: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -8439,23 +8443,23 @@
+ for ac_header in $cf_cv_ncurses_header
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:8442: checking for $ac_header" >&5
++echo "$as_me:8446: 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 8448 "configure"
++#line 8452 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8452: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:8456: \"$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:8458: \$? = $ac_status" >&5
++  echo "$as_me:8462: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8474,7 +8478,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:8477: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:8481: 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 <conftest.$ac_ext <<_ACEOF
+-#line 8530 "configure"
++#line 8534 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8539,16 +8543,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8542: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8546: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8545: \$? = $ac_status" >&5
++  echo "$as_me:8549: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8548: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8552: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8551: \$? = $ac_status" >&5
++  echo "$as_me:8555: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -8565,7 +8569,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:8568: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8572: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8584,7 +8588,7 @@
+ 
+ }
+ 
+-echo "$as_me:8587: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:8591: 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
+@@ -8596,7 +8600,7 @@
+ 	do
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 8599 "configure"
++#line 8603 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -8620,16 +8624,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8623: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8627: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8626: \$? = $ac_status" >&5
++  echo "$as_me:8630: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8629: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8633: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8632: \$? = $ac_status" >&5
++  echo "$as_me:8636: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -8644,14 +8648,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:8647: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:8651: 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:8654: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:8658: 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
+@@ -8769,7 +8773,7 @@
+ 			  cf_save_CPPFLAGS=$CPPFLAGS
+ 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 8772 "configure"
++#line 8776 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8781,16 +8785,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8784: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8788: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8787: \$? = $ac_status" >&5
++  echo "$as_me:8791: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8790: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8794: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8793: \$? = $ac_status" >&5
++  echo "$as_me:8797: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -8807,7 +8811,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:8810: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8814: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8830,7 +8834,7 @@
+ 		do
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 8833 "configure"
++#line 8837 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -8854,16 +8858,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8857: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8861: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8860: \$? = $ac_status" >&5
++  echo "$as_me:8864: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8863: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8867: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8866: \$? = $ac_status" >&5
++  echo "$as_me:8870: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -8884,12 +8888,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8887: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8891: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:8892: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:8896: 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%/[^/]*$%%'`
+@@ -8922,7 +8926,7 @@
+ 			  cf_save_CPPFLAGS=$CPPFLAGS
+ 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 8925 "configure"
++#line 8929 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8934,16 +8938,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8937: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8941: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8940: \$? = $ac_status" >&5
++  echo "$as_me:8944: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8943: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8947: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8946: \$? = $ac_status" >&5
++  echo "$as_me:8950: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -8960,7 +8964,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:8963: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8967: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -9008,7 +9012,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:9011: checking for terminfo header" >&5
++echo "$as_me:9015: 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
+@@ -9026,7 +9030,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9029 "configure"
++#line 9033 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -9041,16 +9045,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9044: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9048: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9047: \$? = $ac_status" >&5
++  echo "$as_me:9051: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9050: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9054: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9053: \$? = $ac_status" >&5
++  echo "$as_me:9057: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -9066,7 +9070,7 @@
+ done
+ 
+ fi
+-echo "$as_me:9069: result: $cf_cv_term_header" >&5
++echo "$as_me:9073: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -9104,7 +9108,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:9107: checking for ncurses version" >&5
++echo "$as_me:9111: 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
+@@ -9130,10 +9134,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:9133: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:9137: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9136: \$? = $ac_status" >&5
++  echo "$as_me:9140: \$? = $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%".*%%'`
+@@ -9143,7 +9147,7 @@
+ 
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9146 "configure"
++#line 9150 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -9168,15 +9172,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:9171: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9175: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9174: \$? = $ac_status" >&5
++  echo "$as_me:9178: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:9176: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9180: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9179: \$? = $ac_status" >&5
++  echo "$as_me:9183: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -9190,7 +9194,7 @@
+ 	rm -f $cf_tempfile
+ 
+ fi
+-echo "$as_me:9193: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:9197: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -9203,7 +9207,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:9206: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:9210: 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
+@@ -9211,7 +9215,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9214 "configure"
++#line 9218 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -9230,16 +9234,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9233: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9237: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9236: \$? = $ac_status" >&5
++  echo "$as_me:9240: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9239: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9243: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9242: \$? = $ac_status" >&5
++  echo "$as_me:9246: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -9250,10 +9254,10 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9253: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:9257: 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:9256: checking for initscr in -lgpm" >&5
++  echo "$as_me:9260: 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
+@@ -9261,7 +9265,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9264 "configure"
++#line 9268 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -9280,16 +9284,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9283: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9287: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9286: \$? = $ac_status" >&5
++  echo "$as_me:9290: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9289: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9293: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9292: \$? = $ac_status" >&5
++  echo "$as_me:9296: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -9300,7 +9304,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9303: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:9307: 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"
+@@ -9315,7 +9319,7 @@
+ 	# 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:9318: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:9322: 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
+@@ -9323,7 +9327,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9326 "configure"
++#line 9330 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -9342,16 +9346,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9345: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9349: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9348: \$? = $ac_status" >&5
++  echo "$as_me:9352: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9351: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9355: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9354: \$? = $ac_status" >&5
++  echo "$as_me:9358: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -9362,7 +9366,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9365: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:9369: 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"
+@@ -9411,13 +9415,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
+ 	cf_libdir=""
+-	echo "$as_me:9414: checking for initscr" >&5
++	echo "$as_me:9418: 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 9420 "configure"
++#line 9424 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char initscr (); below.  */
+@@ -9448,16 +9452,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9451: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9455: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9454: \$? = $ac_status" >&5
++  echo "$as_me:9458: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9457: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9461: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9460: \$? = $ac_status" >&5
++  echo "$as_me:9464: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -9467,18 +9471,18 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:9470: result: $ac_cv_func_initscr" >&5
++echo "$as_me:9474: 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:9477: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:9481: 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 9481 "configure"
++#line 9485 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9490,25 +9494,25 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9493: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9497: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9496: \$? = $ac_status" >&5
++  echo "$as_me:9500: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9499: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9503: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9502: \$? = $ac_status" >&5
++  echo "$as_me:9506: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:9504: result: yes" >&5
++  echo "$as_me:9508: 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:9511: result: no" >&5
++echo "$as_me:9515: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -9576,11 +9580,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:9579: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:9583: 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 9583 "configure"
++#line 9587 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9592,25 +9596,25 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9595: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9599: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9598: \$? = $ac_status" >&5
++  echo "$as_me:9602: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9601: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9605: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9604: \$? = $ac_status" >&5
++  echo "$as_me:9608: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:9606: result: yes" >&5
++  echo "$as_me:9610: 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:9613: result: no" >&5
++echo "$as_me:9617: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -9625,7 +9629,7 @@
+ eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
+ 
+ if test $cf_found_library = no ; then
+-	{ { echo "$as_me:9628: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:9632: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -9633,7 +9637,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:9636: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:9640: 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
+@@ -9643,7 +9647,7 @@
+ 		fi
+ 	done
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 9646 "configure"
++#line 9650 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9655,23 +9659,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9658: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9662: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9661: \$? = $ac_status" >&5
++  echo "$as_me:9665: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9664: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9668: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9667: \$? = $ac_status" >&5
++  echo "$as_me:9671: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:9669: result: yes" >&5
++  echo "$as_me:9673: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:9674: result: no" >&5
++echo "$as_me:9678: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -9691,7 +9695,7 @@
+ 
+ 	;;
+ (pdcurses)
+-	echo "$as_me:9694: checking for X" >&5
++	echo "$as_me:9698: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+ 
+ # Check whether --with-x or --without-x was given.
+@@ -9788,17 +9792,17 @@
+   # 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 9791 "configure"
++#line 9795 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:9795: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:9799: \"$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:9801: \$? = $ac_status" >&5
++  echo "$as_me:9805: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -9831,7 +9835,7 @@
+   ac_save_LIBS=$LIBS
+   LIBS="-lXt $LIBS"
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9834 "configure"
++#line 9838 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9843,16 +9847,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9846: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9850: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9849: \$? = $ac_status" >&5
++  echo "$as_me:9853: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9852: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9856: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9855: \$? = $ac_status" >&5
++  echo "$as_me:9859: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+@@ -9890,7 +9894,7 @@
+ fi # $with_x != no
+ 
+ if test "$have_x" != yes; then
+-  echo "$as_me:9893: result: $have_x" >&5
++  echo "$as_me:9897: result: $have_x" >&5
+ echo "${ECHO_T}$have_x" >&6
+   no_x=yes
+ else
+@@ -9900,7 +9904,7 @@
+   # 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:9903: result: libraries $x_libraries, headers $x_includes" >&5
++  echo "$as_me:9907: result: libraries $x_libraries, headers $x_includes" >&5
+ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ fi
+ 
+@@ -9924,11 +9928,11 @@
+     # others require no space.  Words are not sufficient . . . .
+     case `(uname -sr) 2>/dev/null` in
+     "SunOS 5"*)
+-      echo "$as_me:9927: checking whether -R must be followed by a space" >&5
++      echo "$as_me:9931: 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 9931 "configure"
++#line 9935 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -9940,16 +9944,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9943: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9947: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9946: \$? = $ac_status" >&5
++  echo "$as_me:9950: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9949: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9953: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9952: \$? = $ac_status" >&5
++  echo "$as_me:9956: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_R_nospace=yes
+ else
+@@ -9959,13 +9963,13 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+       if test $ac_R_nospace = yes; then
+-	echo "$as_me:9962: result: no" >&5
++	echo "$as_me:9966: 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 9968 "configure"
++#line 9972 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -9977,16 +9981,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9980: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9984: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9983: \$? = $ac_status" >&5
++  echo "$as_me:9987: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9986: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9990: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9989: \$? = $ac_status" >&5
++  echo "$as_me:9993: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_R_space=yes
+ else
+@@ -9996,11 +10000,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 	if test $ac_R_space = yes; then
+-	  echo "$as_me:9999: result: yes" >&5
++	  echo "$as_me:10003: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	  X_LIBS="$X_LIBS -R $x_libraries"
+ 	else
+-	  echo "$as_me:10003: result: neither works" >&5
++	  echo "$as_me:10007: result: neither works" >&5
+ echo "${ECHO_T}neither works" >&6
+ 	fi
+       fi
+@@ -10020,7 +10024,7 @@
+     # the Alpha needs dnet_stub (dnet does not exist).
+     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 10023 "configure"
++#line 10027 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10039,22 +10043,22 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10042: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10046: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10045: \$? = $ac_status" >&5
++  echo "$as_me:10049: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10048: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10052: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10051: \$? = $ac_status" >&5
++  echo "$as_me:10055: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:10057: checking for dnet_ntoa in -ldnet" >&5
++echo "$as_me:10061: 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
+@@ -10062,7 +10066,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10065 "configure"
++#line 10069 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10081,16 +10085,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10084: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10088: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10087: \$? = $ac_status" >&5
++  echo "$as_me:10091: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10090: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10094: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10093: \$? = $ac_status" >&5
++  echo "$as_me:10097: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+@@ -10101,14 +10105,14 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10104: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "$as_me:10108: 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:10111: checking for dnet_ntoa in -ldnet_stub" >&5
++      echo "$as_me:10115: 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
+@@ -10116,7 +10120,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10119 "configure"
++#line 10123 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10135,16 +10139,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10138: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10142: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10141: \$? = $ac_status" >&5
++  echo "$as_me:10145: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10144: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10148: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10147: \$? = $ac_status" >&5
++  echo "$as_me:10151: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+@@ -10155,7 +10159,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10158: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "$as_me:10162: 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"
+@@ -10174,13 +10178,13 @@
+     # 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:10177: checking for gethostbyname" >&5
++    echo "$as_me:10181: 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 10183 "configure"
++#line 10187 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char gethostbyname (); below.  */
+@@ -10211,16 +10215,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10214: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10218: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10217: \$? = $ac_status" >&5
++  echo "$as_me:10221: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10220: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10224: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10223: \$? = $ac_status" >&5
++  echo "$as_me:10227: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_gethostbyname=yes
+ else
+@@ -10230,11 +10234,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:10233: result: $ac_cv_func_gethostbyname" >&5
++echo "$as_me:10237: 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:10237: checking for gethostbyname in -lnsl" >&5
++      echo "$as_me:10241: 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
+@@ -10242,7 +10246,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10245 "configure"
++#line 10249 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10261,16 +10265,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10264: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10268: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10267: \$? = $ac_status" >&5
++  echo "$as_me:10271: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10270: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10274: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10273: \$? = $ac_status" >&5
++  echo "$as_me:10277: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_nsl_gethostbyname=yes
+ else
+@@ -10281,14 +10285,14 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10284: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "$as_me:10288: 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:10291: checking for gethostbyname in -lbsd" >&5
++        echo "$as_me:10295: 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
+@@ -10296,7 +10300,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10299 "configure"
++#line 10303 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10315,16 +10319,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10318: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10322: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10321: \$? = $ac_status" >&5
++  echo "$as_me:10325: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10324: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10328: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10327: \$? = $ac_status" >&5
++  echo "$as_me:10331: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_bsd_gethostbyname=yes
+ else
+@@ -10335,7 +10339,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10338: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "$as_me:10342: 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"
+@@ -10351,13 +10355,13 @@
+     # 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:10354: checking for connect" >&5
++    echo "$as_me:10358: 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 10360 "configure"
++#line 10364 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char connect (); below.  */
+@@ -10388,16 +10392,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10391: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10395: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10394: \$? = $ac_status" >&5
++  echo "$as_me:10398: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10397: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10401: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10400: \$? = $ac_status" >&5
++  echo "$as_me:10404: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_connect=yes
+ else
+@@ -10407,11 +10411,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:10410: result: $ac_cv_func_connect" >&5
++echo "$as_me:10414: 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:10414: checking for connect in -lsocket" >&5
++      echo "$as_me:10418: 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
+@@ -10419,7 +10423,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10422 "configure"
++#line 10426 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10438,16 +10442,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10441: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10445: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10444: \$? = $ac_status" >&5
++  echo "$as_me:10448: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10447: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10451: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10450: \$? = $ac_status" >&5
++  echo "$as_me:10454: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_socket_connect=yes
+ else
+@@ -10458,7 +10462,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10461: result: $ac_cv_lib_socket_connect" >&5
++echo "$as_me:10465: 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"
+@@ -10467,13 +10471,13 @@
+     fi
+ 
+     # Guillermo Gomez says -lposix is necessary on A/UX.
+-    echo "$as_me:10470: checking for remove" >&5
++    echo "$as_me:10474: 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 10476 "configure"
++#line 10480 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char remove (); below.  */
+@@ -10504,16 +10508,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10507: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10511: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10510: \$? = $ac_status" >&5
++  echo "$as_me:10514: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10513: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10517: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10516: \$? = $ac_status" >&5
++  echo "$as_me:10520: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_remove=yes
+ else
+@@ -10523,11 +10527,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:10526: result: $ac_cv_func_remove" >&5
++echo "$as_me:10530: 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:10530: checking for remove in -lposix" >&5
++      echo "$as_me:10534: 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
+@@ -10535,7 +10539,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10538 "configure"
++#line 10542 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10554,16 +10558,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10557: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10561: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10560: \$? = $ac_status" >&5
++  echo "$as_me:10564: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10563: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10567: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10566: \$? = $ac_status" >&5
++  echo "$as_me:10570: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_posix_remove=yes
+ else
+@@ -10574,7 +10578,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10577: result: $ac_cv_lib_posix_remove" >&5
++echo "$as_me:10581: 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"
+@@ -10583,13 +10587,13 @@
+     fi
+ 
+     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+-    echo "$as_me:10586: checking for shmat" >&5
++    echo "$as_me:10590: 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 10592 "configure"
++#line 10596 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char shmat (); below.  */
+@@ -10620,16 +10624,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10623: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10627: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10626: \$? = $ac_status" >&5
++  echo "$as_me:10630: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10629: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10633: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10632: \$? = $ac_status" >&5
++  echo "$as_me:10636: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_shmat=yes
+ else
+@@ -10639,11 +10643,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:10642: result: $ac_cv_func_shmat" >&5
++echo "$as_me:10646: 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:10646: checking for shmat in -lipc" >&5
++      echo "$as_me:10650: 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
+@@ -10651,7 +10655,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10654 "configure"
++#line 10658 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10670,16 +10674,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10673: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10677: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10676: \$? = $ac_status" >&5
++  echo "$as_me:10680: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10679: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10683: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10682: \$? = $ac_status" >&5
++  echo "$as_me:10686: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_ipc_shmat=yes
+ else
+@@ -10690,7 +10694,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10693: result: $ac_cv_lib_ipc_shmat" >&5
++echo "$as_me:10697: 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"
+@@ -10708,7 +10712,7 @@
+   # 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:10711: checking for IceConnectionNumber in -lICE" >&5
++  echo "$as_me:10715: 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
+@@ -10716,7 +10720,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10719 "configure"
++#line 10723 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10735,16 +10739,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10738: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10742: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10741: \$? = $ac_status" >&5
++  echo "$as_me:10745: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10744: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10748: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10747: \$? = $ac_status" >&5
++  echo "$as_me:10751: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+@@ -10755,7 +10759,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10758: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "$as_me:10762: 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"
+@@ -10767,7 +10771,7 @@
+ 
+ cf_x_athena=${cf_x_athena:-Xaw}
+ 
+-echo "$as_me:10770: checking if you want to link with Xaw 3d library" >&5
++echo "$as_me:10774: 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=
+ 
+@@ -10778,14 +10782,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=Xaw3d
+-	echo "$as_me:10781: result: yes" >&5
++	echo "$as_me:10785: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:10784: result: no" >&5
++	echo "$as_me:10788: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:10788: checking if you want to link with Xaw 3d xft library" >&5
++echo "$as_me:10792: 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=
+ 
+@@ -10796,14 +10800,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=Xaw3dxft
+-	echo "$as_me:10799: result: yes" >&5
++	echo "$as_me:10803: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:10802: result: no" >&5
++	echo "$as_me:10806: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:10806: checking if you want to link with neXT Athena library" >&5
++echo "$as_me:10810: 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=
+ 
+@@ -10814,14 +10818,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=neXtaw
+-	echo "$as_me:10817: result: yes" >&5
++	echo "$as_me:10821: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:10820: result: no" >&5
++	echo "$as_me:10824: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:10824: checking if you want to link with Athena-Plus library" >&5
++echo "$as_me:10828: 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=
+ 
+@@ -10832,10 +10836,10 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=XawPlus
+-	echo "$as_me:10835: result: yes" >&5
++	echo "$as_me:10839: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:10838: result: no" >&5
++	echo "$as_me:10842: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -10855,17 +10859,17 @@
+ 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}:10858: testing found package $cf_athena_pkg ..." 1>&5
++echo "${as_me:-configure}:10862: 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}:10864: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:10868: 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}:10868: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:10872: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -10976,20 +10980,20 @@
+ 			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}:10979: testing ..trimmed $LIBS ..." 1>&5
++echo "${as_me:-configure}:10983: testing ..trimmed $LIBS ..." 1>&5
+ 
+ 			;;
+ 		esac
+ 	done
+ 
+-echo "$as_me:10985: checking for usable $cf_x_athena/Xmu package" >&5
++echo "$as_me:10989: 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 10992 "configure"
++#line 10996 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -11005,16 +11009,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11008: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11012: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11011: \$? = $ac_status" >&5
++  echo "$as_me:11015: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11014: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11018: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11017: \$? = $ac_status" >&5
++  echo "$as_me:11021: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xaw_compat=yes
+ else
+@@ -11024,7 +11028,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:11027: result: $cf_cv_xaw_compat" >&5
++echo "$as_me:11031: result: $cf_cv_xaw_compat" >&5
+ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
+ 
+ 			if test "$cf_cv_xaw_compat" = no
+@@ -11036,7 +11040,7 @@
+ 				(*)
+ 					test -n "$verbose" && echo "	work around broken package" 1>&6
+ 
+-echo "${as_me:-configure}:11039: testing work around broken package ..." 1>&5
++echo "${as_me:-configure}:11043: testing work around broken package ..." 1>&5
+ 
+ 					cf_save_xmu="$LIBS"
+ 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
+@@ -11044,17 +11048,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xmu; then
+ 	test -n "$verbose" && echo "	found package xmu" 1>&6
+ 
+-echo "${as_me:-configure}:11047: testing found package xmu ..." 1>&5
++echo "${as_me:-configure}:11051: 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}:11053: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:11057: 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}:11057: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:11061: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -11154,12 +11158,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:11157: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:11161: 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}:11162: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:11166: testing ...after  $LIBS ..." 1>&5
+ 
+ else
+ 	cf_pkgconfig_incs=
+@@ -11167,12 +11171,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:11170: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:11174: 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}:11175: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:11179: testing ...after  $LIBS ..." 1>&5
+ 
+ fi
+ 
+@@ -11183,7 +11187,7 @@
+ 			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}:11186: testing ..trimmed $LIBS ..." 1>&5
++echo "${as_me:-configure}:11190: testing ..trimmed $LIBS ..." 1>&5
+ 
+ 			;;
+ 		esac
+@@ -11208,17 +11212,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then
+ 	test -n "$verbose" && echo "	found package Xext" 1>&6
+ 
+-echo "${as_me:-configure}:11211: testing found package Xext ..." 1>&5
++echo "${as_me:-configure}:11215: 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}:11217: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:11221: 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}:11221: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:11225: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -11319,7 +11323,7 @@
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+ 
+-	echo "$as_me:11322: checking for XextCreateExtension in -lXext" >&5
++	echo "$as_me:11326: 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
+@@ -11327,7 +11331,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXext  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11330 "configure"
++#line 11334 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11346,16 +11350,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11349: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11353: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11352: \$? = $ac_status" >&5
++  echo "$as_me:11356: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11355: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11359: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11358: \$? = $ac_status" >&5
++  echo "$as_me:11362: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_Xext_XextCreateExtension=yes
+ else
+@@ -11366,7 +11370,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11369: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
++echo "$as_me:11373: 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
+ 
+@@ -11402,17 +11406,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
+ 	test -n "$verbose" && echo "	found package x11" 1>&6
+ 
+-echo "${as_me:-configure}:11405: testing found package x11 ..." 1>&5
++echo "${as_me:-configure}:11409: 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}:11411: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:11415: 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}:11415: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:11419: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -11512,24 +11516,24 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:11515: WARNING: unable to find X11 library" >&5
++	{ echo "$as_me:11519: 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}:11522: testing found package ice ..." 1>&5
++echo "${as_me:-configure}:11526: 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}:11528: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:11532: 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}:11532: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:11536: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -11629,24 +11633,24 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:11632: WARNING: unable to find ICE library" >&5
++	{ echo "$as_me:11636: 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}:11639: testing found package sm ..." 1>&5
++echo "${as_me:-configure}:11643: 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}:11645: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:11649: 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}:11649: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:11653: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -11746,24 +11750,24 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:11749: WARNING: unable to find SM library" >&5
++	{ echo "$as_me:11753: 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}:11756: testing found package xt ..." 1>&5
++echo "${as_me:-configure}:11760: 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}:11762: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:11766: 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}:11766: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:11770: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -11863,7 +11867,7 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:11866: WARNING: unable to find Xt library" >&5
++	{ echo "$as_me:11870: WARNING: unable to find Xt library" >&5
+ echo "$as_me: WARNING: unable to find Xt library" >&2;}
+ fi
+ 
+@@ -11874,17 +11878,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
+ 	test -n "$verbose" && echo "	found package xt" 1>&6
+ 
+-echo "${as_me:-configure}:11877: testing found package xt ..." 1>&5
++echo "${as_me:-configure}:11881: 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}:11883: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:11887: 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}:11887: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:11891: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -11985,14 +11989,14 @@
+ 		;;
+ 	(*)
+ # we have an "xt" package, but it may omit Xt's dependency on X11
+-echo "$as_me:11988: checking for usable X dependency" >&5
++echo "$as_me:11992: 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 11995 "configure"
++#line 11999 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12011,16 +12015,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12014: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12018: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12017: \$? = $ac_status" >&5
++  echo "$as_me:12021: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12020: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12024: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12023: \$? = $ac_status" >&5
++  echo "$as_me:12027: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xt_x11_compat=yes
+ else
+@@ -12030,30 +12034,30 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:12033: result: $cf_cv_xt_x11_compat" >&5
++echo "$as_me:12037: 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}:12039: testing work around broken X11 dependency ..." 1>&5
++echo "${as_me:-configure}:12043: 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}:12046: testing found package x11 ..." 1>&5
++echo "${as_me:-configure}:12050: 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}:12052: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:12056: 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}:12056: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:12060: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -12156,12 +12160,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:12159: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:12163: 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}:12164: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:12168: testing ...after  $LIBS ..." 1>&5
+ 
+ fi
+ 
+@@ -12169,14 +12173,14 @@
+ 		;;
+ 	esac
+ 
+-echo "$as_me:12172: checking for usable X Toolkit package" >&5
++echo "$as_me:12176: 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 12179 "configure"
++#line 12183 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12191,16 +12195,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12194: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12198: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12197: \$? = $ac_status" >&5
++  echo "$as_me:12201: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12200: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12204: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12203: \$? = $ac_status" >&5
++  echo "$as_me:12207: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xt_ice_compat=yes
+ else
+@@ -12210,7 +12214,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:12213: result: $cf_cv_xt_ice_compat" >&5
++echo "$as_me:12217: result: $cf_cv_xt_ice_compat" >&5
+ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
+ 
+ 	if test "$cf_cv_xt_ice_compat" = no
+@@ -12224,22 +12228,22 @@
+ 			(*)
+ 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
+ 
+-echo "${as_me:-configure}:12227: testing work around broken ICE dependency ..." 1>&5
++echo "${as_me:-configure}:12231: 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}:12232: testing found package ice ..." 1>&5
++echo "${as_me:-configure}:12236: 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}:12238: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:12242: 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}:12242: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:12246: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -12338,17 +12342,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
+ 	test -n "$verbose" && echo "	found package sm" 1>&6
+ 
+-echo "${as_me:-configure}:12341: testing found package sm ..." 1>&5
++echo "${as_me:-configure}:12345: 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}:12347: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:12351: 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}:12351: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:12355: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -12457,12 +12461,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:12460: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:12464: 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}:12465: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:12469: testing ...after  $LIBS ..." 1>&5
+ 
+ fi
+ 
+@@ -12482,7 +12486,7 @@
+ 
+ test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:12485: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:12489: testing checking additions to CFLAGS ..." 1>&5
+ 
+ cf_check_cflags="$CFLAGS"
+ cf_check_cppflags="$CPPFLAGS"
+@@ -12553,7 +12557,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:12556: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:12560: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	CFLAGS="$CFLAGS $cf_new_cflags"
+ fi
+@@ -12561,7 +12565,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:12564: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:12568: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+ fi
+@@ -12569,14 +12573,14 @@
+ 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}:12572: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:12576: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+ 
+ 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+ fi
+ 
+ if test "x$cf_check_cflags" != "x$CFLAGS" ; then
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12579 "configure"
++#line 12583 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12588,16 +12592,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12591: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12595: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12594: \$? = $ac_status" >&5
++  echo "$as_me:12598: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12597: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12601: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12600: \$? = $ac_status" >&5
++  echo "$as_me:12604: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -12605,12 +12609,12 @@
+ cat conftest.$ac_ext >&5
+ test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:12608: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:12612: 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}:12613: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:12617: testing but keeping change to \$CPPFLAGS ..." 1>&5
+ 
+ 	 fi
+ 	 CFLAGS="$cf_check_flags"
+@@ -12618,13 +12622,13 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+-	echo "$as_me:12621: checking for XOpenDisplay" >&5
++	echo "$as_me:12625: 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 12627 "configure"
++#line 12631 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char XOpenDisplay (); below.  */
+@@ -12655,16 +12659,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12658: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12662: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12661: \$? = $ac_status" >&5
++  echo "$as_me:12665: \$? = $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:12668: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12667: \$? = $ac_status" >&5
++  echo "$as_me:12671: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_XOpenDisplay=yes
+ else
+@@ -12674,13 +12678,13 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:12677: result: $ac_cv_func_XOpenDisplay" >&5
++echo "$as_me:12681: 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:12683: checking for XOpenDisplay in -lX11" >&5
++	echo "$as_me:12687: 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
+@@ -12688,7 +12692,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12691 "configure"
++#line 12695 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12707,16 +12711,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12710: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12714: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12713: \$? = $ac_status" >&5
++  echo "$as_me:12717: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12716: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12720: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12719: \$? = $ac_status" >&5
++  echo "$as_me:12723: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_X11_XOpenDisplay=yes
+ else
+@@ -12727,7 +12731,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12730: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:12734: 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
+ 
+@@ -12751,13 +12755,13 @@
+ 
+ fi
+ 
+-	echo "$as_me:12754: checking for XtAppInitialize" >&5
++	echo "$as_me:12758: 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 12760 "configure"
++#line 12764 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char XtAppInitialize (); below.  */
+@@ -12788,16 +12792,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12791: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12795: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12794: \$? = $ac_status" >&5
++  echo "$as_me:12798: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12797: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12801: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12800: \$? = $ac_status" >&5
++  echo "$as_me:12804: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_XtAppInitialize=yes
+ else
+@@ -12807,13 +12811,13 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:12810: result: $ac_cv_func_XtAppInitialize" >&5
++echo "$as_me:12814: 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:12816: checking for XtAppInitialize in -lXt" >&5
++	echo "$as_me:12820: 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
+@@ -12821,7 +12825,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12824 "configure"
++#line 12828 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12840,16 +12844,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12843: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12847: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12846: \$? = $ac_status" >&5
++  echo "$as_me:12850: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12849: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12853: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12852: \$? = $ac_status" >&5
++  echo "$as_me:12856: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_Xt_XtAppInitialize=yes
+ else
+@@ -12860,7 +12864,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12863: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
++echo "$as_me:12867: 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
+ 
+@@ -12877,7 +12881,7 @@
+ fi
+ 
+ if test $cf_have_X_LIBS = no ; then
+-	{ echo "$as_me:12880: WARNING: Unable to successfully link X Toolkit library (-lXt) with
++	{ echo "$as_me:12884: 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
+@@ -12899,14 +12903,14 @@
+ 		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:12902: checking for $cf_test in $cf_path" >&5
++			echo "$as_me:12906: 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:12905: checking for $cf_test" >&5
++			echo "$as_me:12909: checking for $cf_test" >&5
+ echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
+ 		fi
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 12909 "configure"
++#line 12913 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12920,16 +12924,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12923: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12927: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12926: \$? = $ac_status" >&5
++  echo "$as_me:12930: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12929: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12933: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12932: \$? = $ac_status" >&5
++  echo "$as_me:12936: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -12938,7 +12942,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-		echo "$as_me:12941: result: $cf_result" >&5
++		echo "$as_me:12945: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 		if test "$cf_result" = yes ; then
+ 			cf_x_athena_inc=$cf_path
+@@ -12950,7 +12954,7 @@
+ done
+ 
+ if test -z "$cf_x_athena_inc" ; then
+-	{ echo "$as_me:12953: WARNING: Unable to successfully find Athena header files with test program" >&5
++	{ echo "$as_me:12957: 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"
+@@ -12996,7 +13000,7 @@
+ done
+ LIBS="$cf_add_libs"
+ 
+-				echo "$as_me:12999: checking for $cf_libs in $cf_path" >&5
++				echo "$as_me:13003: checking for $cf_libs in $cf_path" >&5
+ echo $ECHO_N "checking for $cf_libs in $cf_path... $ECHO_C" >&6
+ 			else
+ 
+@@ -13016,11 +13020,11 @@
+ done
+ LIBS="$cf_add_libs"
+ 
+-				echo "$as_me:13019: checking for $cf_test in $cf_libs" >&5
++				echo "$as_me:13023: 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 13023 "configure"
++#line 13027 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13036,16 +13040,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13039: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13043: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13042: \$? = $ac_status" >&5
++  echo "$as_me:13046: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13045: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13049: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13048: \$? = $ac_status" >&5
++  echo "$as_me:13052: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -13054,7 +13058,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-			echo "$as_me:13057: result: $cf_result" >&5
++			echo "$as_me:13061: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 			if test "$cf_result" = yes ; then
+ 				cf_x_athena_lib="$cf_libs"
+@@ -13068,7 +13072,7 @@
+ done
+ 
+ if test -z "$cf_x_athena_lib" ; then
+-	{ { echo "$as_me:13071: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
++	{ { echo "$as_me:13075: 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
+@@ -13086,7 +13090,7 @@
+   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:13089: checking for $ac_word" >&5
++echo "$as_me:13093: 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
+@@ -13101,7 +13105,7 @@
+   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:13104: found $ac_dir/$ac_word" >&5
++echo "$as_me:13108: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -13109,10 +13113,10 @@
+ fi
+ XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
+ if test -n "$XCURSES_CONFIG"; then
+-  echo "$as_me:13112: result: $XCURSES_CONFIG" >&5
++  echo "$as_me:13116: result: $XCURSES_CONFIG" >&5
+ echo "${ECHO_T}$XCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:13115: result: no" >&5
++  echo "$as_me:13119: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -13125,7 +13129,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:13128: checking for $ac_word" >&5
++echo "$as_me:13132: 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
+@@ -13140,7 +13144,7 @@
+   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:13143: found $ac_dir/$ac_word" >&5
++echo "$as_me:13147: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -13148,10 +13152,10 @@
+ fi
+ ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
+ if test -n "$ac_ct_XCURSES_CONFIG"; then
+-  echo "$as_me:13151: result: $ac_ct_XCURSES_CONFIG" >&5
++  echo "$as_me:13155: result: $ac_ct_XCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:13154: result: no" >&5
++  echo "$as_me:13158: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -13190,7 +13194,7 @@
+ 
+ test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:13193: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:13197: testing checking additions to CFLAGS ..." 1>&5
+ 
+ cf_check_cflags="$CFLAGS"
+ cf_check_cppflags="$CPPFLAGS"
+@@ -13261,7 +13265,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:13264: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:13268: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	CFLAGS="$CFLAGS $cf_new_cflags"
+ fi
+@@ -13269,7 +13273,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:13272: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:13276: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+ fi
+@@ -13277,14 +13281,14 @@
+ 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}:13280: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:13284: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+ 
+ 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+ fi
+ 
+ if test "x$cf_check_cflags" != "x$CFLAGS" ; then
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13287 "configure"
++#line 13291 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13296,16 +13300,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13299: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13303: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13302: \$? = $ac_status" >&5
++  echo "$as_me:13306: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13305: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13309: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13308: \$? = $ac_status" >&5
++  echo "$as_me:13312: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -13313,12 +13317,12 @@
+ cat conftest.$ac_ext >&5
+ test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:13316: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:13320: 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}:13321: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:13325: testing but keeping change to \$CPPFLAGS ..." 1>&5
+ 
+ 	 fi
+ 	 CFLAGS="$cf_check_flags"
+@@ -13326,7 +13330,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+-echo "$as_me:13329: checking for XOpenDisplay in -lX11" >&5
++echo "$as_me:13333: 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
+@@ -13334,7 +13338,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13337 "configure"
++#line 13341 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13353,16 +13357,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13356: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13360: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13359: \$? = $ac_status" >&5
++  echo "$as_me:13363: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13362: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13366: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13365: \$? = $ac_status" >&5
++  echo "$as_me:13369: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_X11_XOpenDisplay=yes
+ else
+@@ -13373,7 +13377,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13376: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:13380: 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
+ 
+@@ -13395,7 +13399,7 @@
+ 
+ fi
+ 
+-echo "$as_me:13398: checking for XCurses library" >&5
++echo "$as_me:13402: 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
+@@ -13418,7 +13422,7 @@
+ LIBS="$cf_add_libs"
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13421 "configure"
++#line 13425 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13433,16 +13437,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13436: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13440: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13439: \$? = $ac_status" >&5
++  echo "$as_me:13443: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13442: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13446: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13445: \$? = $ac_status" >&5
++  echo "$as_me:13449: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_lib_XCurses=yes
+ else
+@@ -13453,7 +13457,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:13456: result: $cf_cv_lib_XCurses" >&5
++echo "$as_me:13460: result: $cf_cv_lib_XCurses" >&5
+ echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
+ 
+ fi
+@@ -13468,23 +13472,23 @@
+ #define XCURSES 1
+ EOF
+ 
+-	echo "$as_me:13471: checking for xcurses.h" >&5
++	echo "$as_me:13475: 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 13477 "configure"
++#line 13481 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:13481: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:13485: \"$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:13487: \$? = $ac_status" >&5
++  echo "$as_me:13491: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -13503,7 +13507,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:13506: result: $ac_cv_header_xcurses_h" >&5
++echo "$as_me:13510: 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
+ 
+@@ -13514,14 +13518,14 @@
+ fi
+ 
+ else
+-	{ { echo "$as_me:13517: error: Cannot link with XCurses" >&5
++	{ { echo "$as_me:13521: error: Cannot link with XCurses" >&5
+ echo "$as_me: error: Cannot link with XCurses" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ 	;;
+ (*)
+-	{ { echo "$as_me:13524: error: unexpected screen-value: $cf_cv_screen" >&5
++	{ { echo "$as_me:13528: error: unexpected screen-value: $cf_cv_screen" >&5
+ echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -13529,7 +13533,7 @@
+ 
+ : ${cf_nculib_root:=$cf_cv_screen}
+ as_ac_Lib=`echo "ac_cv_lib_$cf_nculib_root''__nc_init_pthreads" | $as_tr_sh`
+-echo "$as_me:13532: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5
++echo "$as_me:13536: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5
+ echo $ECHO_N "checking for _nc_init_pthreads in -l$cf_nculib_root... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13537,7 +13541,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_nculib_root  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13540 "configure"
++#line 13544 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13556,16 +13560,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13559: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13563: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13562: \$? = $ac_status" >&5
++  echo "$as_me:13566: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13565: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13569: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13568: \$? = $ac_status" >&5
++  echo "$as_me:13572: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -13576,7 +13580,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13579: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:13583: 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
+   cf_cv_ncurses_pthreads=yes
+@@ -13611,14 +13615,14 @@
+ 	;;
+ (curses|curses_*)
+ 
+-echo "$as_me:13614: checking for NetBSD form.h" >&5
++echo "$as_me:13618: checking for NetBSD form.h" >&5
+ echo $ECHO_N "checking for NetBSD form.h... $ECHO_C" >&6
+ if test "${cf_cv_netbsd_form_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13621 "configure"
++#line 13625 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -13637,16 +13641,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13640: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13644: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13643: \$? = $ac_status" >&5
++  echo "$as_me:13647: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13646: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13650: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13649: \$? = $ac_status" >&5
++  echo "$as_me:13653: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_netbsd_form_h=yes
+ 
+@@ -13658,7 +13662,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:13661: result: $cf_cv_netbsd_form_h" >&5
++echo "$as_me:13665: result: $cf_cv_netbsd_form_h" >&5
+ echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
+ 
+ test "$cf_cv_netbsd_form_h" = yes &&
+@@ -13666,14 +13670,14 @@
+ #define HAVE_NETBSD_FORM_H 1
+ EOF
+ 
+-echo "$as_me:13669: checking for NetBSD menu.h" >&5
++echo "$as_me:13673: checking for NetBSD menu.h" >&5
+ echo $ECHO_N "checking for NetBSD menu.h... $ECHO_C" >&6
+ if test "${cf_cv_netbsd_menu_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13676 "configure"
++#line 13680 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -13691,16 +13695,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13694: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13698: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13697: \$? = $ac_status" >&5
++  echo "$as_me:13701: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13700: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13704: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13703: \$? = $ac_status" >&5
++  echo "$as_me:13707: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_netbsd_menu_h=yes
+ 
+@@ -13712,7 +13716,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:13715: result: $cf_cv_netbsd_menu_h" >&5
++echo "$as_me:13719: result: $cf_cv_netbsd_menu_h" >&5
+ echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
+ 
+ test "$cf_cv_netbsd_menu_h" = yes &&
+@@ -13730,7 +13734,7 @@
+ 	# look for curses-related libraries
+ 
+ as_ac_Lib=`echo "ac_cv_lib_panel$cf_cv_libtype''_new_panel" | $as_tr_sh`
+-echo "$as_me:13733: checking for new_panel in -lpanel$cf_cv_libtype" >&5
++echo "$as_me:13737: checking for new_panel in -lpanel$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for new_panel in -lpanel$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13738,7 +13742,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpanel$cf_cv_libtype  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13741 "configure"
++#line 13745 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13757,16 +13761,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13760: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13764: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13763: \$? = $ac_status" >&5
++  echo "$as_me:13767: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13766: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13770: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13769: \$? = $ac_status" >&5
++  echo "$as_me:13773: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -13777,7 +13781,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13780: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:13784: 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
+ 
+@@ -13806,7 +13810,7 @@
+ fi
+ 
+ as_ac_Lib=`echo "ac_cv_lib_menu$cf_cv_libtype''_menu_driver" | $as_tr_sh`
+-echo "$as_me:13809: checking for menu_driver in -lmenu$cf_cv_libtype" >&5
++echo "$as_me:13813: checking for menu_driver in -lmenu$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for menu_driver in -lmenu$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13814,7 +13818,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmenu$cf_cv_libtype  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13817 "configure"
++#line 13821 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13833,16 +13837,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13836: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13840: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13839: \$? = $ac_status" >&5
++  echo "$as_me:13843: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13842: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13846: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13845: \$? = $ac_status" >&5
++  echo "$as_me:13849: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -13853,7 +13857,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13856: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:13860: 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
+ 
+@@ -13882,7 +13886,7 @@
+ fi
+ 
+ as_ac_Lib=`echo "ac_cv_lib_form$cf_cv_libtype''_form_driver" | $as_tr_sh`
+-echo "$as_me:13885: checking for form_driver in -lform$cf_cv_libtype" >&5
++echo "$as_me:13889: checking for form_driver in -lform$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for form_driver in -lform$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13890,7 +13894,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lform$cf_cv_libtype  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13893 "configure"
++#line 13897 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13909,16 +13913,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13912: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13916: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13915: \$? = $ac_status" >&5
++  echo "$as_me:13919: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13918: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13922: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13921: \$? = $ac_status" >&5
++  echo "$as_me:13925: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -13929,7 +13933,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13932: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:13936: 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
+ 
+@@ -13969,23 +13973,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:13972: checking for $ac_header" >&5
++echo "$as_me:13976: 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 13978 "configure"
++#line 13982 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:13982: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:13986: \"$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:13988: \$? = $ac_status" >&5
++  echo "$as_me:13992: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -14004,7 +14008,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:14007: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:14011: 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 <&5
++echo "$as_me:14024: 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 14026 "configure"
++#line 14030 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -14031,13 +14035,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:14034: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:14038: \"$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:14040: \$? = $ac_status" >&5
++  echo "$as_me:14044: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -14059,7 +14063,7 @@
+ 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 14062 "configure"
++#line 14066 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -14077,7 +14081,7 @@
+ 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 14080 "configure"
++#line 14084 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -14098,7 +14102,7 @@
+   :
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 14101 "configure"
++#line 14105 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -14124,15 +14128,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:14127: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14131: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14130: \$? = $ac_status" >&5
++  echo "$as_me:14134: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:14132: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14136: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14135: \$? = $ac_status" >&5
++  echo "$as_me:14139: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -14145,7 +14149,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:14148: result: $ac_cv_header_stdc" >&5
++echo "$as_me:14152: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -14155,13 +14159,13 @@
+ 
+ fi
+ 
+-echo "$as_me:14158: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:14162: 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 14164 "configure"
++#line 14168 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -14177,16 +14181,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14180: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14184: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14183: \$? = $ac_status" >&5
++  echo "$as_me:14187: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14186: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14190: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14189: \$? = $ac_status" >&5
++  echo "$as_me:14193: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -14196,7 +14200,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:14199: result: $ac_cv_header_time" >&5
++echo "$as_me:14203: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -14219,23 +14223,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:14222: checking for $ac_header" >&5
++echo "$as_me:14226: 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 14228 "configure"
++#line 14232 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:14232: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:14236: \"$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:14238: \$? = $ac_status" >&5
++  echo "$as_me:14242: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -14254,7 +14258,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:14257: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:14261: 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 <&5
++echo "$as_me:14274: 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 14276 "configure"
++#line 14280 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:14280: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:14284: \"$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:14286: \$? = $ac_status" >&5
++  echo "$as_me:14290: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -14302,7 +14306,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:14305: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:14309: 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 <&5
++echo "$as_me:14319: checking for header declaring getopt variables" >&5
+ echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6
+ if test "${cf_cv_getopt_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14322,7 +14326,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14325 "configure"
++#line 14329 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -14335,16 +14339,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14338: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14342: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14341: \$? = $ac_status" >&5
++  echo "$as_me:14345: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14344: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14348: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14347: \$? = $ac_status" >&5
++  echo "$as_me:14351: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -14356,7 +14360,7 @@
+ done
+ 
+ fi
+-echo "$as_me:14359: result: $cf_cv_getopt_header" >&5
++echo "$as_me:14363: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test $cf_cv_getopt_header != none ; then
+ 
+@@ -14379,13 +14383,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:14382: checking for $ac_func" >&5
++echo "$as_me:14386: 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 14388 "configure"
++#line 14392 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -14416,16 +14420,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14419: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14423: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14422: \$? = $ac_status" >&5
++  echo "$as_me:14426: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14425: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14429: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14428: \$? = $ac_status" >&5
++  echo "$as_me:14432: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -14435,7 +14439,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:14438: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:14442: 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 <&5
++	{ { echo "$as_me:14453: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -14465,13 +14469,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:14468: checking for $ac_func" >&5
++echo "$as_me:14472: 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 14474 "configure"
++#line 14478 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -14502,16 +14506,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14505: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14509: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14508: \$? = $ac_status" >&5
++  echo "$as_me:14512: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14511: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14515: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14514: \$? = $ac_status" >&5
++  echo "$as_me:14518: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -14521,7 +14525,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:14524: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:14528: 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 <&5
++echo "$as_me:14540: 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
+@@ -14541,7 +14545,7 @@
+ 
+ cf_cv_need_xopen_extension=unknown
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14544 "configure"
++#line 14548 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14567,16 +14571,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14570: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14574: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14573: \$? = $ac_status" >&5
++  echo "$as_me:14577: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14576: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14580: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14579: \$? = $ac_status" >&5
++  echo "$as_me:14583: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_need_xopen_extension=none
+ else
+@@ -14586,7 +14590,7 @@
+ 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
+ 	do
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 14589 "configure"
++#line 14593 "configure"
+ #include "confdefs.h"
+ 
+ #define $cf_try_xopen_extension 1
+@@ -14608,16 +14612,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14611: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14615: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14614: \$? = $ac_status" >&5
++  echo "$as_me:14618: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14617: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14621: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14620: \$? = $ac_status" >&5
++  echo "$as_me:14624: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
+ else
+@@ -14631,7 +14635,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:14634: result: $cf_cv_need_xopen_extension" >&5
++echo "$as_me:14638: result: $cf_cv_need_xopen_extension" >&5
+ echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
+ 
+ case $cf_cv_need_xopen_extension in
+@@ -14640,7 +14644,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:14643: checking for term.h" >&5
++echo "$as_me:14647: 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
+@@ -14661,7 +14665,7 @@
+ for cf_header in $cf_header_list
+ do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 14664 "configure"
++#line 14668 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -14675,16 +14679,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14678: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14682: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14681: \$? = $ac_status" >&5
++  echo "$as_me:14685: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14684: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14688: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14687: \$? = $ac_status" >&5
++  echo "$as_me:14691: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_term_header=$cf_header
+ 	 break
+@@ -14703,7 +14707,7 @@
+ 	for cf_header in ncurses/term.h ncursesw/term.h
+ 	do
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 14706 "configure"
++#line 14710 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -14721,16 +14725,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14724: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14728: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14727: \$? = $ac_status" >&5
++  echo "$as_me:14731: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14730: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14734: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14733: \$? = $ac_status" >&5
++  echo "$as_me:14737: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_term_header=$cf_header
+ 			 break
+@@ -14745,7 +14749,7 @@
+ esac
+ 
+ fi
+-echo "$as_me:14748: result: $cf_cv_term_header" >&5
++echo "$as_me:14752: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ case $cf_cv_term_header in
+@@ -14772,7 +14776,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:14775: checking for unctrl.h" >&5
++echo "$as_me:14779: 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
+@@ -14793,7 +14797,7 @@
+ for cf_header in $cf_header_list
+ do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 14796 "configure"
++#line 14800 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -14807,16 +14811,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14810: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14814: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14813: \$? = $ac_status" >&5
++  echo "$as_me:14817: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14816: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14820: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14819: \$? = $ac_status" >&5
++  echo "$as_me:14823: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_unctrl_header=$cf_header
+ 	 break
+@@ -14829,12 +14833,12 @@
+ done
+ 
+ fi
+-echo "$as_me:14832: result: $cf_cv_unctrl_header" >&5
++echo "$as_me:14836: result: $cf_cv_unctrl_header" >&5
+ echo "${ECHO_T}$cf_cv_unctrl_header" >&6
+ 
+ case $cf_cv_unctrl_header in
+ (no)
+-	{ echo "$as_me:14837: WARNING: unctrl.h header not found" >&5
++	{ echo "$as_me:14841: WARNING: unctrl.h header not found" >&5
+ echo "$as_me: WARNING: unctrl.h header not found" >&2;}
+ 	;;
+ esac
+@@ -14909,10 +14913,10 @@
+ 
+ cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+ 
+-	echo "$as_me:14912: checking for ${cf_func}" >&5
++	echo "$as_me:14916: checking for ${cf_func}" >&5
+ echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
+ 
+-echo "${as_me:-configure}:14915: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:14919: testing ${cf_func} ..." 1>&5
+ 
+ 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14921,7 +14925,7 @@
+ 		eval cf_result='$ac_cv_func_'$cf_func
+ 		if test ".$cf_result" != ".no"; then
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 14924 "configure"
++#line 14928 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -14954,16 +14958,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14957: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14961: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14960: \$? = $ac_status" >&5
++  echo "$as_me:14964: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14963: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14967: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14966: \$? = $ac_status" >&5
++  echo "$as_me:14970: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -14979,7 +14983,7 @@
+ 
+ 	# use the computed/retrieved cache-value:
+ 	eval 'cf_result=$cf_cv_func_'$cf_func
+-	echo "$as_me:14982: result: $cf_result" >&5
++	echo "$as_me:14986: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test $cf_result != no; then
+ 		cat >>confdefs.h <&5
++	echo "$as_me:15001: checking for ${cf_func}" >&5
+ echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
+ 
+-echo "${as_me:-configure}:15000: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:15004: testing ${cf_func} ..." 1>&5
+ 
+ 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15006,7 +15010,7 @@
+ 		eval cf_result='$ac_cv_func_'$cf_func
+ 		if test ".$cf_result" != ".no"; then
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 15009 "configure"
++#line 15013 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -15039,16 +15043,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15042: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15046: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15045: \$? = $ac_status" >&5
++  echo "$as_me:15049: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15048: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15052: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15051: \$? = $ac_status" >&5
++  echo "$as_me:15055: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -15064,7 +15068,7 @@
+ 
+ 	# use the computed/retrieved cache-value:
+ 	eval 'cf_result=$cf_cv_func_'$cf_func
+-	echo "$as_me:15067: result: $cf_result" >&5
++	echo "$as_me:15071: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test $cf_result != no; then
+ 		cat >>confdefs.h <conftest.$ac_ext <<_ACEOF
+-#line 15091 "configure"
++#line 15095 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -15108,21 +15112,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15111: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15115: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15114: \$? = $ac_status" >&5
++  echo "$as_me:15118: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15117: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15121: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15120: \$? = $ac_status" >&5
++  echo "$as_me:15124: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 		test -n "$verbose" && echo "	prototype $cf_ret func($cf_arg value)" 1>&6
+ 
+-echo "${as_me:-configure}:15125: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
++echo "${as_me:-configure}:15129: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
+ 
+ 		cat >>confdefs.h <&5
++echo "$as_me:15149: checking for ncurses extended functions" >&5
+ echo $ECHO_N "checking for ncurses extended functions... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_ext_funcs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15152 "configure"
++#line 15156 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -15164,16 +15168,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15167: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15171: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15170: \$? = $ac_status" >&5
++  echo "$as_me:15174: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15173: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15177: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15176: \$? = $ac_status" >&5
++  echo "$as_me:15180: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_ext_funcs=defined
+ else
+@@ -15181,7 +15185,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15184 "configure"
++#line 15188 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -15206,16 +15210,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15209: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15213: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15212: \$? = $ac_status" >&5
++  echo "$as_me:15216: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15215: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15219: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15218: \$? = $ac_status" >&5
++  echo "$as_me:15222: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_ext_funcs=yes
+ else
+@@ -15229,7 +15233,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:15232: result: $cf_cv_ncurses_ext_funcs" >&5
++echo "$as_me:15236: result: $cf_cv_ncurses_ext_funcs" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6
+ test "$cf_cv_ncurses_ext_funcs" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -15243,11 +15247,11 @@
+ 	if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
+ 	then
+ 		cf_define_xpg5=no
+-		echo "$as_me:15246: checking if _XPG5 should be defined to enable wide-characters" >&5
++		echo "$as_me:15250: checking if _XPG5 should be defined to enable wide-characters" >&5
+ echo $ECHO_N "checking if _XPG5 should be defined to enable wide-characters... $ECHO_C" >&6
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 15250 "configure"
++#line 15254 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -15260,16 +15264,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15263: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15267: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15266: \$? = $ac_status" >&5
++  echo "$as_me:15270: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15269: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15273: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15272: \$? = $ac_status" >&5
++  echo "$as_me:15276: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -15278,7 +15282,7 @@
+ cf_save_cppflags="$CPPFLAGS"
+ 			 CPPFLAGS="$CPPFLAGS -D_XPG5"
+ 			 cat >conftest.$ac_ext <<_ACEOF
+-#line 15281 "configure"
++#line 15285 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -15291,16 +15295,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15294: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15298: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15297: \$? = $ac_status" >&5
++  echo "$as_me:15301: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15300: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15304: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15303: \$? = $ac_status" >&5
++  echo "$as_me:15307: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_define_xpg5=yes
+ else
+@@ -15311,7 +15315,7 @@
+ 			 CPPFLAGS="$cf_save_cppflags"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-		echo "$as_me:15314: result: $cf_define_xpg5" >&5
++		echo "$as_me:15318: result: $cf_define_xpg5" >&5
+ echo "${ECHO_T}$cf_define_xpg5" >&6
+ 
+ 		if test "$cf_define_xpg5" = yes
+@@ -15320,14 +15324,14 @@
+ 		fi
+ 	fi
+ 
+-	echo "$as_me:15323: checking for wide-character functions" >&5
++	echo "$as_me:15327: checking for wide-character functions" >&5
+ echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6
+ if test "${cf_cv_widechar_funcs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 15330 "configure"
++#line 15334 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -15344,16 +15348,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15347: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15351: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15350: \$? = $ac_status" >&5
++  echo "$as_me:15354: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15353: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15357: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15356: \$? = $ac_status" >&5
++  echo "$as_me:15360: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_widechar_funcs=yes
+ else
+@@ -15364,7 +15368,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:15367: result: $cf_cv_widechar_funcs" >&5
++echo "$as_me:15371: result: $cf_cv_widechar_funcs" >&5
+ echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
+ 	if test "$cf_cv_widechar_funcs" != no ; then
+ 
+@@ -15385,14 +15389,14 @@
+ 
+ fi
+ 
+-echo "$as_me:15388: checking if $cf_cv_screen library uses pthreads" >&5
++echo "$as_me:15392: checking if $cf_cv_screen library uses pthreads" >&5
+ echo $ECHO_N "checking if $cf_cv_screen library uses pthreads... $ECHO_C" >&6
+ if test "${cf_cv_use_pthreads+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15395 "configure"
++#line 15399 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -15410,16 +15414,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15413: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15417: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15416: \$? = $ac_status" >&5
++  echo "$as_me:15420: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15419: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15423: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15422: \$? = $ac_status" >&5
++  echo "$as_me:15426: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_use_pthreads=yes
+ else
+@@ -15430,20 +15434,20 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:15433: result: $cf_cv_use_pthreads" >&5
++echo "$as_me:15437: result: $cf_cv_use_pthreads" >&5
+ echo "${ECHO_T}$cf_cv_use_pthreads" >&6
+ test $cf_cv_use_pthreads = yes && cat >>confdefs.h <<\EOF
+ #define USE_PTHREADS 1
+ EOF
+ 
+-echo "$as_me:15439: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:15443: checking if sys/time.h works with sys/select.h" >&5
+ echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
+ if test "${cf_cv_sys_time_select+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15446 "configure"
++#line 15450 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -15463,16 +15467,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15466: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15470: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15469: \$? = $ac_status" >&5
++  echo "$as_me:15473: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15472: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15476: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15475: \$? = $ac_status" >&5
++  echo "$as_me:15479: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -15484,7 +15488,7 @@
+ 
+ fi
+ 
+-echo "$as_me:15487: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:15491: result: $cf_cv_sys_time_select" >&5
+ echo "${ECHO_T}$cf_cv_sys_time_select" >&6
+ test "$cf_cv_sys_time_select" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -15493,7 +15497,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:15496: checking for openpty in -lutil" >&5
++echo "$as_me:15500: checking for openpty in -lutil" >&5
+ echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
+ if test "${ac_cv_lib_util_openpty+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15501,7 +15505,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15504 "configure"
++#line 15508 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -15520,16 +15524,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15523: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15527: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15526: \$? = $ac_status" >&5
++  echo "$as_me:15530: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15529: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15533: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15532: \$? = $ac_status" >&5
++  echo "$as_me:15536: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -15540,7 +15544,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:15543: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:15547: result: $ac_cv_lib_util_openpty" >&5
+ echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
+ if test $ac_cv_lib_util_openpty = yes; then
+   cf_cv_lib_util=yes
+@@ -15548,7 +15552,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:15551: checking for openpty header" >&5
++echo "$as_me:15555: checking for openpty header" >&5
+ echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
+ if test "${cf_cv_func_openpty+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15575,7 +15579,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 15578 "configure"
++#line 15582 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -15592,16 +15596,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15595: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15599: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15598: \$? = $ac_status" >&5
++  echo "$as_me:15602: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15601: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15605: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15604: \$? = $ac_status" >&5
++  echo "$as_me:15608: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -15619,7 +15623,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:15622: result: $cf_cv_func_openpty" >&5
++echo "$as_me:15626: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -15653,7 +15657,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:15656: checking for function curses_version" >&5
++echo "$as_me:15660: 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
+@@ -15663,7 +15667,7 @@
+   cf_cv_func_curses_version=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15666 "configure"
++#line 15670 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -15676,15 +15680,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:15679: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15683: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15682: \$? = $ac_status" >&5
++  echo "$as_me:15686: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:15684: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15688: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15687: \$? = $ac_status" >&5
++  echo "$as_me:15691: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_curses_version=yes
+ 
+@@ -15699,14 +15703,14 @@
+ fi
+ rm -f core
+ fi
+-echo "$as_me:15702: result: $cf_cv_func_curses_version" >&5
++echo "$as_me:15706: result: $cf_cv_func_curses_version" >&5
+ echo "${ECHO_T}$cf_cv_func_curses_version" >&6
+ test "$cf_cv_func_curses_version" = yes &&
+ cat >>confdefs.h <<\EOF
+ #define HAVE_CURSES_VERSION 1
+ EOF
+ 
+-echo "$as_me:15709: checking for alternate character set array" >&5
++echo "$as_me:15713: checking for alternate character set array" >&5
+ echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6
+ if test "${cf_cv_curses_acs_map+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15716,7 +15720,7 @@
+ for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15719 "configure"
++#line 15723 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -15732,16 +15736,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15735: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15739: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15738: \$? = $ac_status" >&5
++  echo "$as_me:15742: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15741: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15745: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15744: \$? = $ac_status" >&5
++  echo "$as_me:15748: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_curses_acs_map=$name; break
+ else
+@@ -15752,7 +15756,7 @@
+ done
+ 
+ fi
+-echo "$as_me:15755: result: $cf_cv_curses_acs_map" >&5
++echo "$as_me:15759: result: $cf_cv_curses_acs_map" >&5
+ echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
+ 
+ test "$cf_cv_curses_acs_map" != unknown &&
+@@ -15762,7 +15766,7 @@
+ 
+ if test "$cf_enable_widec" = yes; then
+ 
+-echo "$as_me:15765: checking for wide alternate character set array" >&5
++echo "$as_me:15769: checking for wide alternate character set array" >&5
+ echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6
+ if test "${cf_cv_curses_wacs_map+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15772,7 +15776,7 @@
+ 	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
+ 	do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 15775 "configure"
++#line 15779 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -15788,16 +15792,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15791: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15795: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15794: \$? = $ac_status" >&5
++  echo "$as_me:15798: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15797: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15801: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15800: \$? = $ac_status" >&5
++  echo "$as_me:15804: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_curses_wacs_map=$name
+ 	 break
+@@ -15808,7 +15812,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 	done
+ fi
+-echo "$as_me:15811: result: $cf_cv_curses_wacs_map" >&5
++echo "$as_me:15815: result: $cf_cv_curses_wacs_map" >&5
+ echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
+ 
+ test "$cf_cv_curses_wacs_map" != unknown &&
+@@ -15816,7 +15820,7 @@
+ #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
+ EOF
+ 
+-echo "$as_me:15819: checking for wide alternate character constants" >&5
++echo "$as_me:15823: checking for wide alternate character constants" >&5
+ echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6
+ if test "${cf_cv_curses_wacs_symbols+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15826,7 +15830,7 @@
+ if test "$cf_cv_curses_wacs_map" != unknown
+ then
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 15829 "configure"
++#line 15833 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -15843,16 +15847,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15846: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15850: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15849: \$? = $ac_status" >&5
++  echo "$as_me:15853: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15852: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15856: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15855: \$? = $ac_status" >&5
++  echo "$as_me:15859: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_curses_wacs_symbols=yes
+ else
+@@ -15862,7 +15866,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ else
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 15865 "configure"
++#line 15869 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -15878,16 +15882,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15881: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15885: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15884: \$? = $ac_status" >&5
++  echo "$as_me:15888: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15887: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15891: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15890: \$? = $ac_status" >&5
++  echo "$as_me:15894: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_curses_wacs_symbols=yes
+ else
+@@ -15898,7 +15902,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:15901: result: $cf_cv_curses_wacs_symbols" >&5
++echo "$as_me:15905: result: $cf_cv_curses_wacs_symbols" >&5
+ echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
+ 
+ test "$cf_cv_curses_wacs_symbols" != no &&
+@@ -15908,10 +15912,10 @@
+ 
+ fi
+ 
+-echo "$as_me:15911: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:15915: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15914 "configure"
++#line 15918 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -15929,16 +15933,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15932: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15936: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15935: \$? = $ac_status" >&5
++  echo "$as_me:15939: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15938: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15942: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15941: \$? = $ac_status" >&5
++  echo "$as_me:15945: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -15947,7 +15951,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:15950: result: $cf_result" >&5
++echo "$as_me:15954: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test $cf_result = yes ; then
+ 
+@@ -15968,14 +15972,14 @@
+ if test "$cf_enable_widec" = yes; then
+ 
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:15971: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:15975: 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_mbstate_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15978 "configure"
++#line 15982 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -15993,23 +15997,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15996: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16000: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15999: \$? = $ac_status" >&5
++  echo "$as_me:16003: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:16002: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16006: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16005: \$? = $ac_status" >&5
++  echo "$as_me:16009: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_mbstate_t=no
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16012 "configure"
++#line 16016 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16028,16 +16032,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16031: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16035: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16034: \$? = $ac_status" >&5
++  echo "$as_me:16038: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:16037: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16041: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16040: \$? = $ac_status" >&5
++  echo "$as_me:16044: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_mbstate_t=yes
+ else
+@@ -16049,7 +16053,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:16052: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:16056: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+ 
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -16072,14 +16076,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:16075: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:16079: checking if we must include wchar.h to declare wchar_t" >&5
+ echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
+ if test "${cf_cv_wchar_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16082 "configure"
++#line 16086 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16097,23 +16101,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16100: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16104: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16103: \$? = $ac_status" >&5
++  echo "$as_me:16107: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:16106: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16110: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16109: \$? = $ac_status" >&5
++  echo "$as_me:16113: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wchar_t=no
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16116 "configure"
++#line 16120 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16132,16 +16136,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16135: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16139: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16138: \$? = $ac_status" >&5
++  echo "$as_me:16142: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:16141: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16145: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16144: \$? = $ac_status" >&5
++  echo "$as_me:16148: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wchar_t=yes
+ else
+@@ -16153,7 +16157,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:16156: result: $cf_cv_wchar_t" >&5
++echo "$as_me:16160: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+ 
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -16176,14 +16180,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:16179: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:16183: checking if we must include wchar.h to declare wint_t" >&5
+ echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
+ if test "${cf_cv_wint_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16186 "configure"
++#line 16190 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16201,23 +16205,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16204: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16208: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16207: \$? = $ac_status" >&5
++  echo "$as_me:16211: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:16210: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16214: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16213: \$? = $ac_status" >&5
++  echo "$as_me:16217: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wint_t=no
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16220 "configure"
++#line 16224 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16236,16 +16240,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16239: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16243: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16242: \$? = $ac_status" >&5
++  echo "$as_me:16246: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:16245: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16249: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16248: \$? = $ac_status" >&5
++  echo "$as_me:16252: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wint_t=yes
+ else
+@@ -16257,7 +16261,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:16260: result: $cf_cv_wint_t" >&5
++echo "$as_me:16264: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+ 
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -16281,10 +16285,10 @@
+ 
+ 	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
+ 
+-echo "$as_me:16284: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:16288: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16287 "configure"
++#line 16291 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -16302,16 +16306,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16305: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16309: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16308: \$? = $ac_status" >&5
++  echo "$as_me:16312: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:16311: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16315: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16314: \$? = $ac_status" >&5
++  echo "$as_me:16318: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -16320,7 +16324,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:16323: result: $cf_result" >&5
++echo "$as_me:16327: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test $cf_result = yes ; then
+ 
+@@ -16342,10 +16346,10 @@
+ 
+ 	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
+ 
+-echo "$as_me:16345: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:16349: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16348 "configure"
++#line 16352 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -16363,16 +16367,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16366: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16370: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16369: \$? = $ac_status" >&5
++  echo "$as_me:16373: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:16372: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16376: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16375: \$? = $ac_status" >&5
++  echo "$as_me:16379: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -16381,7 +16385,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:16384: result: $cf_result" >&5
++echo "$as_me:16388: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test $cf_result = yes ; then
+ 
+@@ -16403,10 +16407,10 @@
+ 
+ 	if test "$NCURSES_OK_WINT_T" = 0 ; then
+ 
+-echo "$as_me:16406: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:16410: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16409 "configure"
++#line 16413 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -16424,16 +16428,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16427: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16431: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16430: \$? = $ac_status" >&5
++  echo "$as_me:16434: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:16433: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16437: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16436: \$? = $ac_status" >&5
++  echo "$as_me:16440: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -16442,7 +16446,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:16445: result: $cf_result" >&5
++echo "$as_me:16449: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test $cf_result = yes ; then
+ 
+@@ -16463,11 +16467,11 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:16466: checking for data ospeed declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:16470: checking for data ospeed declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for data ospeed declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16470 "configure"
++#line 16474 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -16495,16 +16499,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16498: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16502: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16501: \$? = $ac_status" >&5
++  echo "$as_me:16505: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:16504: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16508: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16507: \$? = $ac_status" >&5
++  echo "$as_me:16511: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -16513,7 +16517,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:16516: result: $cf_result" >&5
++echo "$as_me:16520: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ if test $cf_result = yes ; then
+@@ -16525,14 +16529,14 @@
+ EOF
+ 
+ else
+-	echo "$as_me:16528: checking for data ospeed in library" >&5
++	echo "$as_me:16532: checking for data ospeed in library" >&5
+ echo $ECHO_N "checking for data ospeed in library... $ECHO_C" >&6
+ 	# BSD linkers insist on making weak linkage, but resolve at runtime.
+ 	if test "$cross_compiling" = yes; then
+ 
+ 	# cross-compiling
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 16535 "configure"
++#line 16539 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -16565,16 +16569,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16568: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16572: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16571: \$? = $ac_status" >&5
++  echo "$as_me:16575: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16574: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16578: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16577: \$? = $ac_status" >&5
++  echo "$as_me:16581: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -16586,7 +16590,7 @@
+ 
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 16589 "configure"
++#line 16593 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -16612,15 +16616,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:16615: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16619: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16618: \$? = $ac_status" >&5
++  echo "$as_me:16622: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:16620: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16624: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16623: \$? = $ac_status" >&5
++  echo "$as_me:16627: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -16631,7 +16635,7 @@
+ fi
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+-	echo "$as_me:16634: result: $cf_result" >&5
++	echo "$as_me:16638: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test $cf_result = yes ; then
+ 
+@@ -16644,11 +16648,11 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:16647: checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:16651: checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16651 "configure"
++#line 16655 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -16676,16 +16680,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16679: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16683: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16682: \$? = $ac_status" >&5
++  echo "$as_me:16686: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:16685: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16689: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16688: \$? = $ac_status" >&5
++  echo "$as_me:16692: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -16694,7 +16698,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:16697: result: $cf_result" >&5
++echo "$as_me:16701: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ if test $cf_result = yes ; then
+@@ -16706,14 +16710,14 @@
+ EOF
+ 
+ else
+-	echo "$as_me:16709: checking for data boolnames in library" >&5
++	echo "$as_me:16713: checking for data boolnames in library" >&5
+ echo $ECHO_N "checking for data boolnames in library... $ECHO_C" >&6
+ 	# BSD linkers insist on making weak linkage, but resolve at runtime.
+ 	if test "$cross_compiling" = yes; then
+ 
+ 	# cross-compiling
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 16716 "configure"
++#line 16720 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -16746,16 +16750,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16749: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16753: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16752: \$? = $ac_status" >&5
++  echo "$as_me:16756: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16755: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16759: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16758: \$? = $ac_status" >&5
++  echo "$as_me:16762: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -16767,7 +16771,7 @@
+ 
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 16770 "configure"
++#line 16774 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -16793,15 +16797,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:16796: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16800: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16799: \$? = $ac_status" >&5
++  echo "$as_me:16803: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:16801: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16805: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16804: \$? = $ac_status" >&5
++  echo "$as_me:16808: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -16812,7 +16816,7 @@
+ fi
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+-	echo "$as_me:16815: result: $cf_result" >&5
++	echo "$as_me:16819: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test $cf_result = yes ; then
+ 
+@@ -16825,11 +16829,11 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:16828: checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:16832: checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16832 "configure"
++#line 16836 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -16857,16 +16861,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16860: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16864: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16863: \$? = $ac_status" >&5
++  echo "$as_me:16867: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:16866: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16870: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16869: \$? = $ac_status" >&5
++  echo "$as_me:16873: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -16875,7 +16879,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:16878: result: $cf_result" >&5
++echo "$as_me:16882: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ if test $cf_result = yes ; then
+@@ -16887,14 +16891,14 @@
+ EOF
+ 
+ else
+-	echo "$as_me:16890: checking for data boolfnames in library" >&5
++	echo "$as_me:16894: checking for data boolfnames in library" >&5
+ echo $ECHO_N "checking for data boolfnames in library... $ECHO_C" >&6
+ 	# BSD linkers insist on making weak linkage, but resolve at runtime.
+ 	if test "$cross_compiling" = yes; then
+ 
+ 	# cross-compiling
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 16897 "configure"
++#line 16901 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -16927,16 +16931,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16930: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16934: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16933: \$? = $ac_status" >&5
++  echo "$as_me:16937: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16936: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16940: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16939: \$? = $ac_status" >&5
++  echo "$as_me:16943: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -16948,7 +16952,7 @@
+ 
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 16951 "configure"
++#line 16955 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -16974,15 +16978,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:16977: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16981: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16980: \$? = $ac_status" >&5
++  echo "$as_me:16984: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:16982: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16986: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16985: \$? = $ac_status" >&5
++  echo "$as_me:16989: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -16993,7 +16997,7 @@
+ fi
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+-	echo "$as_me:16996: result: $cf_result" >&5
++	echo "$as_me:17000: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test $cf_result = yes ; then
+ 
+@@ -17006,11 +17010,11 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:17009: checking for data ttytype declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:17013: checking for data ttytype declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for data ttytype declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17013 "configure"
++#line 17017 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -17038,16 +17042,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17041: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17045: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17044: \$? = $ac_status" >&5
++  echo "$as_me:17048: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17047: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17051: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17050: \$? = $ac_status" >&5
++  echo "$as_me:17054: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -17056,7 +17060,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:17059: result: $cf_result" >&5
++echo "$as_me:17063: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ if test $cf_result = yes ; then
+@@ -17068,14 +17072,14 @@
+ EOF
+ 
+ else
+-	echo "$as_me:17071: checking for data ttytype in library" >&5
++	echo "$as_me:17075: checking for data ttytype in library" >&5
+ echo $ECHO_N "checking for data ttytype in library... $ECHO_C" >&6
+ 	# BSD linkers insist on making weak linkage, but resolve at runtime.
+ 	if test "$cross_compiling" = yes; then
+ 
+ 	# cross-compiling
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 17078 "configure"
++#line 17082 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -17108,16 +17112,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17111: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17115: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17114: \$? = $ac_status" >&5
++  echo "$as_me:17118: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17117: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17121: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17120: \$? = $ac_status" >&5
++  echo "$as_me:17124: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -17129,7 +17133,7 @@
+ 
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 17132 "configure"
++#line 17136 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -17155,15 +17159,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:17158: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17162: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17161: \$? = $ac_status" >&5
++  echo "$as_me:17165: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:17163: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17167: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17166: \$? = $ac_status" >&5
++  echo "$as_me:17170: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -17174,7 +17178,7 @@
+ fi
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+-	echo "$as_me:17177: result: $cf_result" >&5
++	echo "$as_me:17181: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test $cf_result = yes ; then
+ 
+@@ -17189,7 +17193,7 @@
+ 
+ if ( test "$GCC" = yes || test "$GXX" = yes )
+ then
+-echo "$as_me:17192: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:17196: 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.
+@@ -17206,7 +17210,7 @@
+ 	with_warnings=no
+ 
+ fi;
+-echo "$as_me:17209: result: $with_warnings" >&5
++echo "$as_me:17213: result: $with_warnings" >&5
+ echo "${ECHO_T}$with_warnings" >&6
+ if test "$with_warnings" = "yes"
+ then
+@@ -17229,10 +17233,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:17232: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:17236: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > conftest.$ac_ext <&5
++		if { (eval echo "$as_me:17288: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17287: \$? = $ac_status" >&5
++  echo "$as_me:17291: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:17289: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:17293: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case $cf_attribute in
+@@ -17350,12 +17354,12 @@
+ if test "$GCC" = yes ; then
+ 	case $host_os in
+ 	(linux*|gnu*)
+-		echo "$as_me:17353: checking if this is really Intel C compiler" >&5
++		echo "$as_me:17357: 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 17358 "configure"
++#line 17362 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17372,16 +17376,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17375: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17379: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17378: \$? = $ac_status" >&5
++  echo "$as_me:17382: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17381: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17385: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17384: \$? = $ac_status" >&5
++  echo "$as_me:17388: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   INTEL_COMPILER=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -17392,7 +17396,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 		CFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:17395: result: $INTEL_COMPILER" >&5
++		echo "$as_me:17399: result: $INTEL_COMPILER" >&5
+ echo "${ECHO_T}$INTEL_COMPILER" >&6
+ 		;;
+ 	esac
+@@ -17401,12 +17405,12 @@
+ CLANG_COMPILER=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:17404: checking if this is really Clang C compiler" >&5
++	echo "$as_me:17408: 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 17409 "configure"
++#line 17413 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17423,16 +17427,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17426: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17430: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17429: \$? = $ac_status" >&5
++  echo "$as_me:17433: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17432: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17436: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17435: \$? = $ac_status" >&5
++  echo "$as_me:17439: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   CLANG_COMPILER=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
+@@ -17443,12 +17447,12 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 	CFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:17446: result: $CLANG_COMPILER" >&5
++	echo "$as_me:17450: result: $CLANG_COMPILER" >&5
+ echo "${ECHO_T}$CLANG_COMPILER" >&6
+ fi
+ 
+ cat > conftest.$ac_ext <&5
++	{ echo "$as_me:17472: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="-Wall"
+@@ -17481,12 +17485,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:17484: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17488: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17487: \$? = $ac_status" >&5
++  echo "$as_me:17491: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:17489: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17493: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -17495,7 +17499,7 @@
+ 
+ elif test "$GCC" = yes
+ then
+-	{ echo "$as_me:17498: checking for $CC warning options..." >&5
++	{ echo "$as_me:17502: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS=
+@@ -17519,12 +17523,12 @@
+ 		Wundef $cf_gcc_warnings $cf_warn_CONST
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:17522: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17526: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17525: \$? = $ac_status" >&5
++  echo "$as_me:17529: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:17527: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17531: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case $cf_opt in
+ 			(Wcast-qual)
+@@ -17535,7 +17539,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:17538: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17542: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -17545,7 +17549,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:17548: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17552: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -17561,7 +17565,7 @@
+ fi
+ fi
+ 
+-echo "$as_me:17564: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:17568: 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.
+@@ -17578,7 +17582,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:17581: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:17585: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case .$with_cflags in
+@@ -17672,23 +17676,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:17675: checking for dmalloc.h" >&5
++	echo "$as_me:17679: 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 17681 "configure"
++#line 17685 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:17685: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17689: \"$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:17691: \$? = $ac_status" >&5
++  echo "$as_me:17695: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17707,11 +17711,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:17710: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:17714: 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:17714: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:17718: 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
+@@ -17719,7 +17723,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17722 "configure"
++#line 17726 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17738,16 +17742,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17741: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17745: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17744: \$? = $ac_status" >&5
++  echo "$as_me:17748: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17747: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17751: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17750: \$? = $ac_status" >&5
++  echo "$as_me:17754: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -17758,7 +17762,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17761: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:17765: 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 <&5
++echo "$as_me:17780: 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.
+@@ -17790,7 +17794,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:17793: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:17797: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case .$with_cflags in
+@@ -17884,23 +17888,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:17887: checking for dbmalloc.h" >&5
++	echo "$as_me:17891: 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 17893 "configure"
++#line 17897 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:17897: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17901: \"$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:17903: \$? = $ac_status" >&5
++  echo "$as_me:17907: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17919,11 +17923,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:17922: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:17926: 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:17926: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:17930: 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
+@@ -17931,7 +17935,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17934 "configure"
++#line 17938 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17950,16 +17954,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17953: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17957: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17956: \$? = $ac_status" >&5
++  echo "$as_me:17960: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17959: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17963: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17962: \$? = $ac_status" >&5
++  echo "$as_me:17966: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -17970,7 +17974,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17973: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:17977: 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 <&5
++echo "$as_me:17992: checking if you want to use valgrind for testing" >&5
+ echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
+ 
+ # Check whether --with-valgrind or --without-valgrind was given.
+@@ -18002,7 +18006,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:18005: result: ${with_valgrind:-no}" >&5
++echo "$as_me:18009: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case .$with_cflags in
+@@ -18095,7 +18099,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:18098: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:18102: checking if you want to perform memory-leak testing" >&5
+ echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
+ 
+ # Check whether --enable-leaks or --disable-leaks was given.
+@@ -18105,7 +18109,7 @@
+ else
+   : ${with_no_leaks:=no}
+ fi;
+-echo "$as_me:18108: result: $with_no_leaks" >&5
++echo "$as_me:18112: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$with_no_leaks" = yes ; then
+@@ -18121,7 +18125,7 @@
+ fi
+ 
+ LD_RPATH_OPT=
+-echo "$as_me:18124: checking for an rpath option" >&5
++echo "$as_me:18128: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ case $cf_cv_system_name in
+ (irix*)
+@@ -18152,12 +18156,12 @@
+ (*)
+ 	;;
+ esac
+-echo "$as_me:18155: result: $LD_RPATH_OPT" >&5
++echo "$as_me:18159: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ case "x$LD_RPATH_OPT" in
+ (x-R*)
+-	echo "$as_me:18160: checking if we need a space after rpath option" >&5
++	echo "$as_me:18164: 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"
+ 
+@@ -18178,7 +18182,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 18181 "configure"
++#line 18185 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18190,16 +18194,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18193: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18197: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18196: \$? = $ac_status" >&5
++  echo "$as_me:18200: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18199: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18203: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18202: \$? = $ac_status" >&5
++  echo "$as_me:18206: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_rpath_space=no
+ else
+@@ -18209,13 +18213,13 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 	LIBS="$cf_save_LIBS"
+-	echo "$as_me:18212: result: $cf_rpath_space" >&5
++	echo "$as_me:18216: 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:18218: checking if rpath-hack should be disabled" >&5
++echo "$as_me:18222: 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.
+@@ -18232,21 +18236,21 @@
+ 	cf_disable_rpath_hack=no
+ 
+ fi;
+-echo "$as_me:18235: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:18239: 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:18239: checking for updated LDFLAGS" >&5
++echo "$as_me:18243: 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:18242: result: maybe" >&5
++	echo "$as_me:18246: 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:18249: checking for $ac_word" >&5
++echo "$as_me:18253: 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
+@@ -18261,7 +18265,7 @@
+   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:18264: found $ac_dir/$ac_word" >&5
++echo "$as_me:18268: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -18269,10 +18273,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+-  echo "$as_me:18272: result: $cf_ldd_prog" >&5
++  echo "$as_me:18276: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+-  echo "$as_me:18275: result: no" >&5
++  echo "$as_me:18279: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -18286,7 +18290,7 @@
+ 		cf_rpath_oops=
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18289 "configure"
++#line 18293 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -18298,16 +18302,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18301: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18305: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18304: \$? = $ac_status" >&5
++  echo "$as_me:18308: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18307: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18311: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18310: \$? = $ac_status" >&5
++  echo "$as_me:18314: \$? = $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`
+@@ -18335,7 +18339,7 @@
+ 					then
+ 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+ 
+-echo "${as_me:-configure}:18338: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:18342: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+ 
+ 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ 						break
+@@ -18347,11 +18351,11 @@
+ 
+ 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:18350: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:18354: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:18354: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:18358: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -18388,7 +18392,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:18391: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:18395: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -18401,11 +18405,11 @@
+ 
+ test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:18404: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:18408: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:18408: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:18412: testing ...checking LIBS $LIBS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -18442,7 +18446,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:18445: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:18449: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -18455,14 +18459,14 @@
+ 
+ test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:18458: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:18462: testing ...checked LIBS $LIBS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:18462: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:18466: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ else
+-	echo "$as_me:18465: result: no" >&5
++	echo "$as_me:18469: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -18552,7 +18556,7 @@
+ : ${CONFIG_STATUS=./config.status}
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:18555: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:18559: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >$CONFIG_STATUS <<_ACEOF
+ #! $SHELL
+@@ -18728,7 +18732,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:18731: error: ambiguous option: $1
++    { { echo "$as_me:18735: 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;}
+@@ -18747,7 +18751,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:18750: error: unrecognized option: $1
++  -*) { { echo "$as_me:18754: 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;}
+@@ -18797,7 +18801,7 @@
+   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
+   "ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ncurses_cfg.h:ncurses_tst.hin" ;;
+-  *) { { echo "$as_me:18800: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:18804: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -19088,7 +19092,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:19091: creating $ac_file" >&5
++    { echo "$as_me:19095: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -19106,7 +19110,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:19109: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:19113: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -19119,7 +19123,7 @@
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+-           { { echo "$as_me:19122: error: cannot find input file: $f" >&5
++           { { echo "$as_me:19126: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -19135,7 +19139,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' $ac_item`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:19138: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:19142: 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;}
+@@ -19144,7 +19148,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' $ac_item`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:19147: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:19151: 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;}
+@@ -19181,7 +19185,7 @@
+             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:19184: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:19188: 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;}
+@@ -19192,7 +19196,7 @@
+     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:19195: WARNING: Some variables may not be substituted:
++      { echo "$as_me:19199: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -19241,7 +19245,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:19244: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:19248: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -19252,7 +19256,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:19255: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:19259: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -19265,7 +19269,7 @@
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+-           { { echo "$as_me:19268: error: cannot find input file: $f" >&5
++           { { echo "$as_me:19272: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -19323,7 +19327,7 @@
+   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:19326: $ac_file is unchanged" >&5
++      { echo "$as_me:19330: $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/ncurses-6.0-20161015.patch b/ncurses-6.0-20161015.patch
new file mode 100644
index 0000000..a205f48
--- /dev/null
+++ b/ncurses-6.0-20161015.patch
@@ -0,0 +1,5094 @@
+# ncurses 6.0 - patch 20161015 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.0 is at
+# 	ftp.gnu.org:/pub/gnu
+#
+# Patches for ncurses 6.0 can be found at
+# 	ftp://invisible-island.net/ncurses/6.0
+#	http://invisible-mirror.net/archives/ncurses/6.0 
+#
+# ------------------------------------------------------------------------------
+# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20161015.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Oct 16 00:57:24 UTC 2016
+# ------------------------------------------------------------------------------
+# NEWS                                |   14 
+# VERSION                             |    2 
+# dist.mk                             |    4 
+# doc/html/man/captoinfo.1m.html      |   12 
+# doc/html/man/clear.1.html           |    2 
+# doc/html/man/curs_attr.3x.html      |   10 
+# doc/html/man/curs_clear.3x.html     |   10 
+# doc/html/man/curs_color.3x.html     |    8 
+# doc/html/man/curs_extend.3x.html    |   22 
+# doc/html/man/curs_getch.3x.html     |    4 
+# doc/html/man/curs_initscr.3x.html   |    6 
+# doc/html/man/curs_inopts.3x.html    |   10 
+# doc/html/man/curs_kernel.3x.html    |    6 
+# doc/html/man/curs_outopts.3x.html   |    8 
+# doc/html/man/curs_refresh.3x.html   |   14 
+# doc/html/man/curs_slk.3x.html       |    8 
+# doc/html/man/curs_terminfo.3x.html  |  149 ++--
+# doc/html/man/curs_trace.3x.html     |    6 
+# doc/html/man/curs_window.3x.html    |    6 
+# doc/html/man/default_colors.3x.html |   62 -
+# doc/html/man/form.3x.html           |    2 
+# doc/html/man/infocmp.1m.html        |   23 
+# doc/html/man/infotocap.1m.html      |   10 
+# doc/html/man/legacy_coding.3x.html  |    6 
+# doc/html/man/menu.3x.html           |    2 
+# doc/html/man/menu_format.3x.html    |    6 
+# doc/html/man/menu_post.3x.html      |    8 
+# doc/html/man/ncurses.3x.html        |    2 
+# doc/html/man/panel.3x.html          |   45 -
+# doc/html/man/tabs.1.html            |    6 
+# doc/html/man/term.5.html            |   12 
+# doc/html/man/terminfo.5.html        | 1239 +++++++++++++++++-----------------
+# doc/html/man/tic.1m.html            |   81 +-
+# doc/html/man/toe.1m.html            |    2 
+# doc/html/man/tput.1.html            |    2 
+# doc/html/man/tset.1.html            |    2 
+# man/captoinfo.1m                    |   10 
+# man/curs_attr.3x                    |   11 
+# man/curs_clear.3x                   |    6 
+# man/curs_color.3x                   |    6 
+# man/curs_extend.3x                  |    8 
+# man/curs_getch.3x                   |    4 
+# man/curs_initscr.3x                 |    6 
+# man/curs_inopts.3x                  |    8 
+# man/curs_kernel.3x                  |    6 
+# man/curs_outopts.3x                 |    8 
+# man/curs_refresh.3x                 |   10 
+# man/curs_slk.3x                     |    6 
+# man/curs_terminfo.3x                |   18 
+# man/curs_trace.3x                   |    6 
+# man/curs_window.3x                  |    6 
+# man/default_colors.3x               |   33 
+# man/infotocap.1m                    |    8 
+# man/legacy_coding.3x                |    8 
+# man/menu_format.3x                  |    6 
+# man/menu_post.3x                    |    8 
+# man/panel.3x                        |   18 
+# man/tabs.1                          |    4 
+# man/term.5                          |   12 
+# man/terminfo.head                   |    4 
+# man/terminfo.tail                   |   54 -
+# ncurses/llib-lncurses               |   14 
+# ncurses/llib-lncursest              |   14 
+# ncurses/llib-lncursestw             |   14 
+# ncurses/llib-lncursesw              |   14 
+# ncurses/llib-ltic                   |   11 
+# ncurses/llib-ltict                  |   11 
+# ncurses/llib-ltictw                 |   11 
+# ncurses/llib-lticw                  |   11 
+# ncurses/llib-ltinfo                 |    7 
+# ncurses/llib-ltinfot                |    7 
+# ncurses/llib-ltinfotw               |    7 
+# ncurses/llib-ltinfow                |    7 
+# ncurses/tty/tty_update.c            |    8 
+# package/debian-mingw/changelog      |    4 
+# package/debian-mingw64/changelog    |    4 
+# package/debian/changelog            |    4 
+# package/mingw-ncurses.nsi           |    4 
+# package/mingw-ncurses.spec          |    2 
+# package/ncurses.spec                |    2 
+# 80 files changed, 1168 insertions(+), 1073 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.2677 
+--- ncurses-6.0-20161008+/NEWS	2016-10-09 01:52:39.000000000 +0000
++++ ncurses-6.0-20161015/NEWS	2016-10-15 23:26:53.000000000 +0000
+@@ -25,7 +25,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.2677 2016/10/09 01:52:39 tom Exp $
++-- $Id: NEWS,v 1.2682 2016/10/15 23:26:53 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -45,6 +45,16 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20161015
++	+ amend internal use of tputs to consistently use the number of lines
++	  affected, e.g., for insert/delete character operations.  While
++	  merging terminfo source early in 1995, several descriptions used the
++	  "*" proportional delay for these operations, prompting a change in
++	  doupdate.
++	+ regenerate llib-* files.
++	+ regenerate HTML manpages.
++	+ fix several formatting issues with manual pages.
++
+ 20161008
+ 	+ adjust size in infocmp/tic to work with strlcpy.
+ 	+ fix configure script to record when strlcat is found on OpenBSD.
+@@ -11094,7 +11104,7 @@
+ 	  (SVr4) curses, which doesn't use 'const' in its prototypes.
+ 	+ modify ifdef's in test/hashtest.c and test/view.c to compile with
+ 	  Solaris curses.
+-	+ modify _tracedump() to pad pad colors & attrs lines to match change
++	+ modify _tracedump() to pad colors & attrs lines to match change
+ 	  in 970101 showing first/last changes.
+ 	+ corrected location of terminating null on dynamically allocated forms
+ 	  fields (patch by Per Foreby).
+Index: VERSION
+--- ncurses-6.0-20161008+/VERSION	2016-10-03 00:57:15.000000000 +0000
++++ ncurses-6.0-20161015/VERSION	2016-10-15 15:43:49.000000000 +0000
+@@ -1 +1 @@
+-5:0:9	6.0	20161008
++5:0:9	6.0	20161015
+Index: dist.mk
+Prereq:  1.1127 
+--- ncurses-6.0-20161008+/dist.mk	2016-10-03 00:57:15.000000000 +0000
++++ ncurses-6.0-20161015/dist.mk	2016-10-15 15:43:49.000000000 +0000
+@@ -25,7 +25,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1127 2016/10/03 00:57:15 tom Exp $
++# $Id: dist.mk,v 1.1128 2016/10/15 15:43:49 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -37,7 +37,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 0
+-NCURSES_PATCH = 20161008
++NCURSES_PATCH = 20161015
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/man/captoinfo.1m.html
+--- ncurses-6.0-20161008+/doc/html/man/captoinfo.1m.html	2016-09-10 22:14:37.000000000 +0000
++++ ncurses-6.0-20161015/doc/html/man/captoinfo.1m.html	2016-10-15 23:12:19.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -160,7 +160,7 @@
+        GG    acs magic cookie count
+ 
+        If the single-line capabilities occur in  an  entry,  they
+-       will  automatically  be composed into an acsc string.  The
++       will  automatically  be composed into an acsc string.  The
+        double-line capabilities and GG are discarded with a warn-
+        ing message.
+ 
+@@ -178,10 +178,10 @@
+        font3   s3ds
+ 
+        Additionally,  the  AIX  box1 capability will be automati-
+-       cally translated to an acsc string.
++       cally translated to an acsc string.
+ 
+        Hewlett-Packard's terminfo library supports  two  nonstan-
+-       dard  terminfo  capabilities  meml  (memory lock) and memu
++       dard  terminfo  capabilities  meml  (memory lock) and memu
+        (memory unlock).  These will be discarded with  a  warning
+        message.
+ 
+@@ -198,7 +198,7 @@
+ 
    SEE ALSO
    +        infocmp(1m), curses(3x), terminfo(5)
+ 
+-       This describes ncurses version 6.0 (patch 20160910).
++       This describes ncurses version 6.0 (patch 20161015).
+ 
+ 
+ 
    AUTHOR
    +Index: doc/html/man/clear.1.html
+--- ncurses-6.0-20161008+/doc/html/man/clear.1.html	2016-09-10 22:14:37.000000000 +0000
++++ ncurses-6.0-20161015/doc/html/man/clear.1.html	2016-10-15 23:12:19.000000000 +0000
+@@ -67,7 +67,7 @@
+ 
    SEE ALSO
    +        tput(1), terminfo(5)
+ 
+-       This describes ncurses version 6.0 (patch 20160910).
++       This describes ncurses version 6.0 (patch 20161015).
+ 
+ 
+ 
+Index: doc/html/man/curs_attr.3x.html
+--- ncurses-6.0-20161008+/doc/html/man/curs_attr.3x.html	2016-07-24 00:13:41.000000000 +0000
++++ ncurses-6.0-20161015/doc/html/man/curs_attr.3x.html	2016-10-15 23:12:20.000000000 +0000
+@@ -27,7 +27,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_attr.3x,v 1.47 2016/07/23 23:48:49 tom Exp @
++  * @Id: curs_attr.3x,v 1.48 2016/10/15 17:09:05 tom Exp @
+   * attr_get
+   * .br
+   * .br
+@@ -266,12 +266,12 @@
+        A_ALTCHARSET, A_PROTECT, and A_INVIS).
+ 
+        This implementation provides the  A_ITALIC  attribute  for
+-       terminals which have the enter_italics_mode (sitm) and ex-
+-       it_italics_mode (ritm) capabilities.  Italics are not men-
++       terminals which have the enter_italics_mode (sitm) and ex-
++       it_italics_mode (ritm) capabilities.  Italics are not men-
+        tioned  in  X/Open  Curses.   Unlike  the  other video at-
+-       tributes, I_ITALIC is unrelated to the set_attributes  ca-
++       tributes, A_ITALIC is unrelated to the set_attributes  ca-
+        pabilities.  This implementation makes the assumption that
+-       exit_attribute_mode may also reset italics.
++       exit_attribute_mode may also reset italics.
+ 
+        XSI Curses added the new entry points, attr_get,  attr_on,
+        attr_off,  attr_set,  wattr_on, wattr_off, wattr_get, wat-
+Index: doc/html/man/curs_clear.3x.html
+--- ncurses-6.0-20161008+/doc/html/man/curs_clear.3x.html	2016-01-30 19:24:51.000000000 +0000
++++ ncurses-6.0-20161015/doc/html/man/curs_clear.3x.html	2016-10-15 23:12:20.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -111,9 +111,9 @@
+        scr).  This will not work under ncurses.
+ 
+        This implementation, and others such as Solaris, sets  the
+-       current  position  to  0,0  after erasing via werase() and
+-       wclear().  That fact is not documented in other  implemen-
+-       tations, and may not be true of implementations which were
++       current  position  to  0,0  after  erasing  via werase and
++       wclear.  That fact is not documented in other  implementa-
++       tions,  and  may not be true of implementations which were
+        not derived from SVr4 source.
+ 
+        Not obvious from  the  description,  most  implementations
+Index: doc/html/man/curs_color.3x.html
+--- ncurses-6.0-20161008+/doc/html/man/curs_color.3x.html	2016-07-30 22:04:27.000000000 +0000
++++ ncurses-6.0-20161015/doc/html/man/curs_color.3x.html	2016-10-15 23:12:20.000000000 +0000
+@@ -26,7 +26,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_color.3x,v 1.43 2016/07/30 15:22:11 tom Exp @
++  * @Id: curs_color.3x,v 1.45 2016/10/15 17:10:19 tom Exp @
+   * .br
+   * .br
+   * .br
+@@ -302,8 +302,8 @@
+ 
+ 
+ 
    RETURN VALUE
    +-       The routines can_change_color()  and  has_colors()  return
+-       TRUE or FALSE.
++       The routines can_change_color and has_colors  return  TRUE
++       or FALSE.
+ 
+        All other routines return the integer ERR upon failure and
+        an OK (SVr4 specifies only "an integer  value  other  than
+@@ -321,7 +321,7 @@
+ 
+           init_color
+                returns  an error if the terminal does not support
+-               this feature, e.g., if the initialize_color  capa-
++               this feature, e.g., if the initialize_color  capa-
+                bility is absent from the terminal description.
+ 
+           start_color
+Index: doc/html/man/curs_extend.3x.html
+--- ncurses-6.0-20161008+/doc/html/man/curs_extend.3x.html	2016-05-15 01:17:07.000000000 +0000
++++ ncurses-6.0-20161015/doc/html/man/curs_extend.3x.html	2016-10-15 23:12:20.000000000 +0000
+@@ -27,7 +27,7 @@
+   * authorization.                                                           *
+   ****************************************************************************
+   * Author: Thomas E. Dickey 1999-on
+-  * @Id: curs_extend.3x,v 1.20 2016/05/14 23:10:54 tom Exp @
++  * @Id: curs_extend.3x,v 1.21 2016/10/15 16:52:48 tom Exp @
+ -->
+ 
+ 
+@@ -64,20 +64,20 @@
+ 
+ 
+ 
    curses_version
    +-       Use  curses_version() to get the version number, including
++       Use  curses_version  to  get the version number, including
+        patch level of the library, e.g., 5.0.19991023
+ 
+ 
+ 
    use_extended_names
    +-       The use_extended_names()  function  controls  whether  the
+-       calling  application  is  able to use user-defined or non-
+-       standard names which may be  compiled  into  the  terminfo
+-       description, i.e., via the terminfo or termcap interfaces.
+-       Normally these names are  available  for  use,  since  the
+-       essential  decision  is made by using the -x option of tic
+-       to compile extended terminal definitions.  However you can
+-       disable  this  feature  to ensure compatibility with other
+-       implementations of curses.
++       The use_extended_names function controls whether the call-
++       ing application is able to use user-defined or nonstandard
++       names which may be compiled into the terminfo description,
++       i.e.,  via  the  terminfo or termcap interfaces.  Normally
++       these names are available for  use,  since  the  essential
++       decision  is made by using the -x option of tic to compile
++       extended terminal definitions.  However  you  can  disable
++       this  feature to ensure compatibility with other implemen-
++       tations of curses.
+ 
+ 
+ 
    RETURN VALUE
    +Index: doc/html/man/curs_getch.3x.html
+--- ncurses-6.0-20161008+/doc/html/man/curs_getch.3x.html	2016-09-10 22:14:38.000000000 +0000
++++ ncurses-6.0-20161015/doc/html/man/curs_getch.3x.html	2016-10-15 23:12:20.000000000 +0000
+@@ -27,7 +27,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_getch.3x,v 1.48 2016/09/10 21:56:25 Leon.Winter Exp @
++  * @Id: curs_getch.3x,v 1.49 2016/10/15 16:44:01 tom Exp @
+ -->
+ 
+ 
+@@ -295,7 +295,7 @@
+ 
+ 
    RETURN VALUE
    +        All  routines  return  the integer ERR upon failure and an
+-       integer value other than ERR (OK in the case of ungetch())
++       integer value other than ERR (OK in the case  of  ungetch)
+        upon successful completion.
+ 
+           ungetch
+Index: doc/html/man/curs_initscr.3x.html
+--- ncurses-6.0-20161008+/doc/html/man/curs_initscr.3x.html	2016-01-30 19:24:52.000000000 +0000
++++ ncurses-6.0-20161015/doc/html/man/curs_initscr.3x.html	2016-10-15 23:12:20.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -202,7 +202,7 @@
+ 
+             Curses implementations may provide for  special  han-
+             dling  of  the SIGINT, SIGQUIT and SIGTSTP signals if
+-            their disposition is SIG_DFL at the time initscr() is
++            their disposition is SIG_DFL at the time  initscr  is
+             called ...
+ 
+             Any  special handling for these signals may remain in
+Index: doc/html/man/curs_inopts.3x.html
+--- ncurses-6.0-20161008+/doc/html/man/curs_inopts.3x.html	2016-01-30 19:24:52.000000000 +0000
++++ ncurses-6.0-20161015/doc/html/man/curs_inopts.3x.html	2016-10-15 23:12:20.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -193,8 +193,8 @@
+        and  output queues associated with the INTR, QUIT and SUSP
+        characters will not be done [see termio(7)].  When qiflush
+        is  called,  the queues will be flushed when these control
+-       characters are read.  You may want to call noqiflush()  in
+-       a  signal handler if you want output to continue as though
++       characters are read.  You may want to call noqiflush in  a
++       signal  handler  if  you want output to continue as though
+        the interrupt had not occurred, after the handler exits.
+ 
+ 
+@@ -268,7 +268,7 @@
+        curses  key-names).  On the other hand, an application can
+        use define_key to establish a specific keycode for a given
+        string.   This  makes  it  possible  for an application to
+-       check for an extended capability's presence with tigetstr,
++       check for an extended capability's presence with tigetstr,
+        and reassign the keycode to match its own needs.
+ 
+        Low-level applications can use tigetstr to obtain the def-
+Index: doc/html/man/curs_kernel.3x.html
+--- ncurses-6.0-20161008+/doc/html/man/curs_kernel.3x.html	2016-01-30 19:24:53.000000000 +0000
++++ ncurses-6.0-20161015/doc/html/man/curs_kernel.3x.html	2016-10-15 23:12:21.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -79,7 +79,7 @@
+        "shell"   (not  in  curses)  state  for  use  by  the  re-
+        set_prog_mode and reset_shell_mode routines.  This is done
+        automatically by initscr.  There is one such save area for
+-       each screen context allocated by newterm().
++       each screen context allocated by newterm.
+ 
+ 
+ 
    reset_prog_mode, reset_shell_mode
    +Index: doc/html/man/curs_outopts.3x.html
+--- ncurses-6.0-20161008+/doc/html/man/curs_outopts.3x.html	2016-01-30 19:24:53.000000000 +0000
++++ ncurses-6.0-20161015/doc/html/man/curs_outopts.3x.html	2016-10-15 23:12:21.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -193,8 +193,8 @@
+        Issue 4.
+ 
+        The XSI Curses standard is ambiguous on  the  question  of
+-       whether  raw()  should  disable the CRLF translations con-
+-       trolled by nl() and nonl().  BSD curses did turn off these
++       whether  raw  should  disable  the  CRLF translations con-
++       trolled by nl and nonl.  BSD curses  did  turn  off  these
+        translations;  AT&T  curses (at least as late as SVr1) did
+        not.  We choose to do so, on the theory that a  programmer
+        requesting  raw  input wants a clean (ideally 8-bit clean)
+Index: doc/html/man/curs_refresh.3x.html
+--- ncurses-6.0-20161008+/doc/html/man/curs_refresh.3x.html	2016-01-30 19:24:53.000000000 +0000
++++ ncurses-6.0-20161015/doc/html/man/curs_refresh.3x.html	2016-10-15 23:12:21.000000000 +0000
+@@ -26,7 +26,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_refresh.3x,v 1.16 2016/01/30 15:52:36 tom Exp @
++  * @Id: curs_refresh.3x,v 1.17 2016/10/15 16:45:45 tom Exp @
+ -->
+ 
+ 
+@@ -114,7 +114,7 @@
+        The wredrawln routine indicates to curses that some screen
+        lines are corrupted and should be thrown away before  any-
+        thing  is  written  over  them.   It touches the indicated
+-       lines (marking them  changed).   The  routine  redrawwin()
++       lines  (marking  them  changed).   The  routine  redrawwin
+        touches the entire window.
+ 
+ 
+@@ -143,14 +143,14 @@
+        The XSI Curses standard, Issue  4  describes  these  func-
+        tions.
+ 
+-       Whether  wnoutrefresh()  copies  to the virtual screen the
+-       entire contents of a window or just its  changed  portions
+-       has never been well-documented in historic curses versions
++       Whether  wnoutrefresh copies to the virtual screen the en-
++       tire contents of a window or just its changed portions has
++       never  been  well-documented  in  historic curses versions
+        (including SVr4).  It might be unwise to  rely  on  either
+        behavior  in  programs  that  might have to be linked with
+        other curses implementations.  Instead, you can do an  ex-
+-       plicit  touchwin() before the wnoutrefresh() call to guar-
+-       antee an entire-contents copy anywhere.
++       plicit  touchwin before the wnoutrefresh call to guarantee
++       an entire-contents copy anywhere.
+ 
+ 
+ 
    SEE ALSO
    +Index: doc/html/man/curs_slk.3x.html
+--- ncurses-6.0-20161008+/doc/html/man/curs_slk.3x.html	2016-01-30 19:24:54.000000000 +0000
++++ ncurses-6.0-20161015/doc/html/man/curs_slk.3x.html	2016-10-15 23:12:21.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -207,8 +207,8 @@
+        tions.   It changes the argument type of the attribute-ma-
+        nipulation functions slk_attron, slk_attroff,  slk_attrset
+        to be attr_t, and adds const qualifiers.  The format codes
+-       2 and 3 for slk_init() and the function slk_attr are  spe-
+-       cific to ncurses.
++       2 and 3 for slk_init and the function slk_attr are specif-
++       ic to ncurses.
+ 
+ 
+ 
    SEE ALSO
    +Index: doc/html/man/curs_terminfo.3x.html
+--- ncurses-6.0-20161008+/doc/html/man/curs_terminfo.3x.html	2016-08-21 00:10:09.000000000 +0000
++++ ncurses-6.0-20161015/doc/html/man/curs_terminfo.3x.html	2016-10-15 23:12:21.000000000 +0000
+@@ -26,7 +26,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_terminfo.3x,v 1.44 2016/08/20 23:26:10 tom Exp @
++  * @Id: curs_terminfo.3x,v 1.46 2016/10/15 17:27:48 tom Exp @
+   * ***************************************************************************
+   * ***************************************************************************
+   * ***************************************************************************
+@@ -149,14 +149,14 @@
+             for curses applications.
+ 
+             setupterm  determines if the entry is a hardcopy type
+-            by checking the hc (hardcopy) capability.
++            by checking the hc (hardcopy) capability.
+ 
+        0    means that the terminal could not be found,  or  that
+             it  is  a generic type, having too little information
+             for curses applications to run.
+ 
+             setupterm determines if the entry is a  generic  type
+-            by checking the gn (generic) capability.
++            by checking the gn (generic) capability.
+ 
+        -1   means that the terminfo database could not be found.
+ 
+@@ -226,44 +226,49 @@
+ 
+ 
    Output Functions
    +        The tputs  routine  applies  padding  information  to  the
+-       string  str  and  outputs  it.  The str must be a terminfo
+-       string variable or the return value from  tparm,  tgetstr,
+-       or tgoto.  affcnt is the number of lines affected, or 1 if
+-       not applicable.  putc is a putchar-like routine  to  which
+-       the characters are passed, one at a time.
++       string str and outputs it:
+ 
+-       The  putp routine calls tputs(str, 1, putchar).  Note that
+-       the output of putp always  goes  to  stdout,  not  to  the
++       o   The  str must be a terminfo string variable or the re-
++           turn value from tparm, tgetstr, or tgoto.
++
++       o   affcnt is the number of lines affected, or  1  if  not
++           applicable.
++
++       o   putc is a putchar-like routine to which the characters
++           are passed, one at a time.
++
++       The putp routine calls tputs(str, 1, putchar).  Note  that
++       the  output  of  putp  always  goes  to stdout, not to the
+        fildes specified in setupterm.
+ 
+        The vidputs routine displays the string on the terminal in
+-       the video attribute mode attrs, which is  any  combination
+-       of  the  attributes  listed in curses(3x).  The characters
++       the  video  attribute mode attrs, which is any combination
++       of the attributes listed in  curses(3x).   The  characters
+        are passed to the putchar-like routine putc.
+ 
+-       The vidattr routine is like the  vidputs  routine,  except
++       The  vidattr  routine  is like the vidputs routine, except
+        that it outputs through putchar.
+ 
+-       The  vid_attr  and vid_puts routines correspond to vidattr
+-       and vidputs, respectively.  They use a  set  of  arguments
+-       for  representing  the  video attributes plus color, i.e.,
++       The vid_attr and vid_puts routines correspond  to  vidattr
++       and  vidputs,  respectively.   They use a set of arguments
++       for representing the video attributes  plus  color,  i.e.,
+        one of type attr_t for the attributes and one of short for
+        the color_pair number.  The vid_attr and vid_puts routines
+-       are designed to use the attribute constants with  the  WA_
+-       prefix.   The  opts  argument  is reserved for future use.
+-       Currently, applications must provide a  null  pointer  for
++       are  designed  to use the attribute constants with the WA_
++       prefix.  The opts argument is  reserved  for  future  use.
++       Currently,  applications  must  provide a null pointer for
+        that argument.
+ 
+-       The  mvcur  routine  provides low-level cursor motion.  It
+-       takes effect immediately (rather  than  at  the  next  re-
++       The mvcur routine provides low-level  cursor  motion.   It
++       takes  effect  immediately  (rather  than  at the next re-
+        fresh).
+ 
+ 
+ 
    Terminal Capability Functions
    +-       The  tigetflag,  tigetnum and tigetstr routines return the
++       The tigetflag, tigetnum and tigetstr routines  return  the
+        value of the capability corresponding to the terminfo cap-
+-       name  passed  to them, such as xenl.  The capname for each
+-       capability is given in the table column  entitled  capname
++       name passed to them, such as xenl.  The capname  for  each
++       capability  is  given in the table column entitled capname
+        code in the capabilities section of terminfo(5).
+ 
+        These routines return special values to denote errors.
+@@ -272,14 +277,14 @@
+ 
+        -1     if capname is not a boolean capability, or
+ 
+-       0      if  it  is canceled or absent from the terminal de-
++       0      if it is canceled or absent from the  terminal  de-
+               scription.
+ 
+        The tigetnum routine returns
+ 
+        -2     if capname is not a numeric capability, or
+ 
+-       -1     if it is canceled or absent from the  terminal  de-
++       -1     if  it  is canceled or absent from the terminal de-
+               scription.
+ 
+        The tigetstr routine returns
+@@ -287,13 +292,13 @@
+        (char *)-1
+               if capname is not a string capability, or
+ 
+-       0      if  it  is canceled or absent from the terminal de-
++       0      if it is canceled or absent from the  terminal  de-
+               scription.
+ 
+ 
+ 
    Terminal Capability Names
    +-       These null-terminated arrays contain  the  short  terminfo
+-       names  ("codes"), the termcap names, and the long terminfo
++       These  null-terminated  arrays  contain the short terminfo
++       names ("codes"), the termcap names, and the long  terminfo
+        names ("fnames") for each of the predefined terminfo vari-
+        ables:
+               char *boolnames[], *boolcodes[], *boolfnames[]
+@@ -304,119 +309,119 @@
+ 
+ 
+ 
    RETURN VALUE
    +-       Routines  that  return  an integer return ERR upon failure
+-       and OK (SVr4 only specifies "an integer value  other  than
+-       ERR")  upon  successful completion, unless otherwise noted
++       Routines that return an integer return  ERR  upon  failure
++       and  OK  (SVr4 only specifies "an integer value other than
++       ERR") upon successful completion, unless  otherwise  noted
+        in the preceding routine descriptions.
+ 
+        Routines that return pointers always return NULL on error.
+ 
+-       X/Open defines no error conditions.  In  this  implementa-
++       X/Open  defines  no error conditions.  In this implementa-
+        tion
+ 
+             del_curterm
+-                 returns  an  error  if its terminal parameter is
++                 returns an error if its  terminal  parameter  is
+                  null.
+ 
+             putp calls tputs, returning the same error-codes.
+ 
+             restartterm
+-                 returns an error if the associated call  to  se-
++                 returns  an  error if the associated call to se-
+                  tupterm returns an error.
+ 
+             setupterm
+-                 returns  an  error  if it cannot allocate enough
+-                 memory, or create the initial  windows  (stdscr,
+-                 curscr,  newscr).   Other  error  conditions are
++                 returns an error if it  cannot  allocate  enough
++                 memory,  or  create the initial windows (stdscr,
++                 curscr, newscr).   Other  error  conditions  are
+                  documented above.
+ 
+             tputs
+-                 returns an error  if  the  string  parameter  is
+-                 null.   It  does  not  detect I/O errors: X/Open
+-                 states that tputs ignores the  return  value  of
++                 returns  an  error  if  the  string parameter is
++                 null.  It does not  detect  I/O  errors:  X/Open
++                 states  that  tputs  ignores the return value of
+                  the output function putc.
+ 
+ 
+ 
    PORTABILITY
    +        X/Open notes that vidattr and vidputs may be macros.
+ 
+-       The  function  setterm is not described by X/Open and must
+-       be considered non-portable.  All other  functions  are  as
++       The function setterm is not described by X/Open  and  must
++       be  considered  non-portable.   All other functions are as
+        described by X/Open.
+ 
+-       setupterm  copies  the terminal name to the array ttytype.
+-       This is not part of X/Open Curses, but is assumed by  some
++       setupterm copies the terminal name to the  array  ttytype.
++       This  is not part of X/Open Curses, but is assumed by some
+        applications.
+ 
+-       If  configured  to  use the terminal-driver, e.g., for the
++       If configured to use the terminal-driver,  e.g.,  for  the
+        MinGW port,
+ 
+-       o   setupterm interprets a missing/empty TERM variable  as
++       o   setupterm  interprets a missing/empty TERM variable as
+            the special value "unknown".
+ 
+-       o   setupterm  allows explicit use of the the windows con-
++       o   setupterm allows explicit use of the the windows  con-
+            sole driver by checking if $TERM is set to "#win32con"
+            or an abbreviation of that string.
+ 
+        Older versions of ncurses assumed that the file descriptor
+-       passed to setupterm from initscr or newterm uses  buffered
+-       I/O,  and would write to the corresponding stream.  In ad-
+-       dition to the limitation that the  terminal  was  left  in
++       passed  to setupterm from initscr or newterm uses buffered
++       I/O, and would write to the corresponding stream.  In  ad-
++       dition  to  the  limitation  that the terminal was left in
+        block-buffered mode on exit (like System V curses), it was
+-       problematic because ncurses did not allow a  reliable  way
++       problematic  because  ncurses did not allow a reliable way
+        to cleanup on receiving SIGTSTP.  The current version uses
+-       output buffers managed directly by ncurses.  Some  of  the
++       output  buffers  managed directly by ncurses.  Some of the
+        low-level functions described in this manual page write to
+        the standard output.  They are not signal-safe.  The high-
+        level functions in ncurses use alternate versions of these
+        functions using the more reliable buffering scheme.
+ 
+-       In System V Release 4, set_curterm has an int return  type
+-       and  returns  OK  or ERR.  We have chosen to implement the
++       In  System V Release 4, set_curterm has an int return type
++       and returns OK or ERR.  We have chosen  to  implement  the
+        X/Open Curses semantics.
+ 
+        In System V Release 4, the third argument of tputs has the
+        type int (*putc)(char).
+ 
+        At least one implementation of X/Open Curses (Solaris) re-
+-       turns a value other than OK/ERR from tputs.  That  returns
++       turns  a value other than OK/ERR from tputs.  That returns
+        the length of the string, and does no error-checking.
+ 
+-       X/Open  Curses prototypes tparm with a fixed number of pa-
+-       rameters, rather than a variable argument list.  This  im-
+-       plementation  uses  a  variable  argument list, but can be
+-       configured to use the fixed-parameter list.  Portable  ap-
+-       plications  should  provide 9 parameters after the format;
++       X/Open Curses prototypes tparm with a fixed number of  pa-
++       rameters,  rather than a variable argument list.  This im-
++       plementation uses a variable argument  list,  but  can  be
++       configured  to use the fixed-parameter list.  Portable ap-
++       plications should provide 9 parameters after  the  format;
+        zeroes are fine for this purpose.
+ 
+        In response to comments by Thomas E. Dickey, X/Open Curses
+        Issue 7 proposed the tiparm function in mid-2009.
+ 
+-       X/Open  notes  that  after calling mvcur, the curses state
+-       may not match the actual terminal state, and that  an  ap-
+-       plication  should  touch and refresh the window before re-
++       X/Open notes that after calling mvcur,  the  curses  state
++       may  not  match the actual terminal state, and that an ap-
++       plication should touch and refresh the window  before  re-
+        suming normal curses calls.  Both ncurses and System V Re-
+        lease 4 curses implement mvcur using the SCREEN data allo-
+        cated in either initscr or newterm.  So though it is docu-
+-       mented  as  a  terminfo function, mvcur is really a curses
++       mented as a terminfo function, mvcur is  really  a  curses
+        function which is not well specified.
+ 
+-       X/Open states that the old  location  must  be  given  for
+-       mvcur.   This implementation allows the caller to use -1's
+-       for the old ordinates.  In that case, the old location  is
++       X/Open  states  that  the  old  location must be given for
++       mvcur.  This implementation allows the caller to use  -1's
++       for  the old ordinates.  In that case, the old location is
+        unknown.
+ 
+-       Other  implementions  may  not declare the capability name
++       Other implementions may not declare  the  capability  name
+        arrays.  Some provide them without declaring them.  X/Open
+        does not specify them.
+ 
+-       Extended  terminal  capability  names, e.g., as defined by
++       Extended terminal capability names, e.g.,  as  defined  by
+        tic -x, are not stored in the arrays described here.
+ 
+ 
+ 
    SEE ALSO
    +-       curses(3x), curs_initscr(3x), curs_kernel(3x),  curs_term-
+-       cap(3x),  curs_variables(3x), term_variables(3x), putc(3),
++       curses(3x),  curs_initscr(3x), curs_kernel(3x), curs_term-
++       cap(3x), curs_variables(3x), term_variables(3x),  putc(3),
+        terminfo(5)
+ 
+ 
+Index: doc/html/man/curs_trace.3x.html
+--- ncurses-6.0-20161008+/doc/html/man/curs_trace.3x.html	2016-01-30 19:24:54.000000000 +0000
++++ ncurses-6.0-20161015/doc/html/man/curs_trace.3x.html	2016-10-15 23:12:21.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -99,7 +99,7 @@
+             trace user and system times of updates.
+ 
+        TRACE_TPUTS
+-            trace tputs calls.
++            trace tputs calls.
+ 
+        TRACE_UPDATE
+             trace update actions, old & new screens.
+Index: doc/html/man/curs_window.3x.html
+--- ncurses-6.0-20161008+/doc/html/man/curs_window.3x.html	2016-01-30 19:24:54.000000000 +0000
++++ ncurses-6.0-20161015/doc/html/man/curs_window.3x.html	2016-10-15 23:12:21.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -218,7 +218,7 @@
+ 
+ 
+ 
    BUGS
    +-       The  subwindow  functions (subwin, derwin, mvderwin, wsyn-
++       The  subwindow  functions (subwin, derwin, mvderwin, wsyn-
+        cup, wsyncdown, wcursyncup, syncok) are flaky, incomplete-
+        ly implemented, and not well tested.
+ 
+Index: doc/html/man/default_colors.3x.html
+--- ncurses-6.0-20161008+/doc/html/man/default_colors.3x.html	2016-01-30 19:24:54.000000000 +0000
++++ ncurses-6.0-20161015/doc/html/man/default_colors.3x.html	2016-10-15 23:12:22.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -59,9 +59,9 @@
+ 
+ 
+ 
    DESCRIPTION
    +-       The use_default_colors() and assume_default_colors() func-
+-       tions are extensions to the curses library.  They are used
+-       with terminals that support ISO 6429 color, or equivalent.
++       The use_default_colors and assume_default_colors functions
++       are  extensions to the curses library.  They are used with
++       terminals that support  ISO  6429  color,  or  equivalent.
+        These terminals allow the application to reset color to an
+        unspecified default value (e.g., with SGR 39 or SGR 49).
+ 
+@@ -72,19 +72,19 @@
+        there are several implementations of the ls program  which
+        use  colors to denote different file types or permissions.
+        These "color ls" programs do not  necessarily  modify  the
+-       background  color, typically using only the setaf terminfo
++       background  color, typically using only the setaf terminfo
+        capability  to  set  the  foreground  color.   Full-screen
+        applications  that  use default colors can achieve similar
+        visual effects.
+ 
+-       The first function, use_default_colors() tells the  curses
++       The first function, use_default_colors  tells  the  curses
+        library  to  assign terminal default foreground/background
+        colors to color number  -1.  So  init_pair(x,COLOR_RED,-1)
+        will  initialize  pair  x as red on default background and
+        init_pair(x,-1,COLOR_BLUE)  will  initialize  pair  x   as
+        default foreground on blue.
+ 
+-       The  other,  assume_default_colors() is a refinement which
++       The  other,  assume_default_colors  is  a refinement which
+        tells which colors to paint for color pair 0.  This  func-
+        tion  recognizes  a special color number -1, which denotes
+        the default terminal color.
+@@ -95,23 +95,23 @@
+ 
+        These are ncurses extensions.  For other curses  implemen-
+        tations,  color  number -1 does not mean anything, just as
+-       for ncurses before a successful call  of  use_default_col-
+-       ors() or assume_default_colors().
++       for ncurses before a successful call of use_default_colors
++       or assume_default_colors.
+ 
+        Other  curses  implementations do not allow an application
+        to modify color pair 0.  They assume that  the  background
+        is COLOR_BLACK, but do not ensure that the color pair 0 is
+        painted to match the assumption.  If your application does
+-       not use either use_default_colors() or assume_default_col-
+-       ors() ncurses will paint a white  foreground  (text)  with
+-       black background for color pair 0.
++       not use either use_default_colors or assume_default_colors
++       ncurses will paint a white foreground  (text)  with  black
++       background for color pair 0.
+ 
+ 
+ 
    RETURN VALUE
    +        These functions return the integer ERR upon failure and OK
+        on success.  They will fail if either  the  terminal  does
+-       not  support  the orig_pair or orig_colors capability.  If
+-       the initialize_pair capability is not found,  this  causes
++       not  support  the orig_pair or orig_colors capability.  If
++       the initialize_pair capability is not found,  this  causes
+        an error as well.
+ 
+ 
+@@ -120,24 +120,24 @@
+        accepts negative arguments to specify  default  foreground
+        or background colors.
+ 
+-       The  use_default_colors()  function  was  added to support
+-       ded.  This is a full-screen application which uses  curses
+-       to  manage only part of the screen.  The bottom portion of
+-       the screen, which is of adjustable size, is left uncolored
+-       to  display the results from shell commands.  The top por-
+-       tion of the screen colors filenames using  a  scheme  like
+-       the  "color  ls" programs.  Attempting to manage the back-
+-       ground color of the screen for this application would give
+-       unsatisfactory  results  for  a  variety of reasons.  This
+-       extension was devised after noting that color  xterm  (and
+-       similar  programs)  provides a background color which does
+-       not necessarily correspond to  any  of  the  ANSI  colors.
+-       While  a special terminfo entry could be constructed using
+-       nine colors, there was no mechanism provided within curses
+-       to  account for the related orig_pair and back_color_erase
++       The  use_default_colors function was added to support ded.
++       This is a full-screen application  which  uses  curses  to
++       manage only part of the screen.  The bottom portion of the
++       screen, which is of adjustable size, is left uncolored  to
++       display  the results from shell commands.  The top portion
++       of the screen colors filenames using  a  scheme  like  the
++       "color  ls" programs.  Attempting to manage the background
++       color of the screen for this application would give unsat-
++       isfactory  results  for a variety of reasons.  This exten-
++       sion was devised after noting that color xterm (and  simi-
++       lar  programs)  provides a background color which does not
++       necessarily correspond to any of the ANSI colors.  While a
++       special  terminfo  entry  could  be constructed using nine
++       colors, there was no mechanism provided within  curses  to
++       account  for  the  related  orig_pair and back_color_erase
+        capabilities.
+ 
+-       The assume_default_colors() function was added to solve  a
++       The assume_default_colors function was added  to  solve  a
+        different  problem:  support  for applications which would
+        use  environment  variables  and  other  configuration  to
+        bypass  curses'  notion  of the terminal's default colors,
+Index: doc/html/man/form.3x.html
+--- ncurses-6.0-20161008+/doc/html/man/form.3x.html	2016-09-10 22:14:40.000000000 +0000
++++ ncurses-6.0-20161015/doc/html/man/form.3x.html	2016-10-15 23:12:22.000000000 +0000
+@@ -235,7 +235,7 @@
+        curses(3x) and related pages whose names begin "form_" for
+        detailed descriptions of the entry points.
+ 
+-       This describes ncurses version 6.0 (patch 20160910).
++       This describes ncurses version 6.0 (patch 20161015).
+ 
+ 
+ 
+Index: doc/html/man/infocmp.1m.html
+--- ncurses-6.0-20161008+/doc/html/man/infocmp.1m.html	2016-09-10 22:14:40.000000000 +0000
++++ ncurses-6.0-20161015/doc/html/man/infocmp.1m.html	2016-10-15 23:12:22.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -51,7 +51,7 @@
+ 
+ 
+ 
    SYNOPSIS
    +-       infocmp [-1CDEFGIKLTUVcdegilnpqrtux]
++       infocmp [-1CDEFGIKLTUVWcdegilnpqrtux]
+              [-v n] [-s d| i| l| c] [-Q n] [-R subset]
+              [-w width] [-A directory] [-B directory]
+              [termname...]
+@@ -441,10 +441,13 @@
+             the  program runs.  Higher values of n induce greater
+             verbosity.
+ 
++       -W   By itself, the -w option will not force long  strings
++            to be wrapped.  Use the -W option to do this.
++
+        -w width
+             changes the output to width characters.
+ 
+-       -x   print  information  for  user-defined   capabilities.
++       -x   print   information  for  user-defined  capabilities.
+             These are extensions to the terminfo repertoire which
+             can be loaded using the -x option of tic.
+ 
+@@ -455,13 +458,13 @@
+ 
+ 
+ 
    EXTENSIONS
    +-       The  -0,  -1,  -E, -F, -G, -R, -T, -V, -a, -e, -f, -g, -i,
+-       -l, -p, -q and  -t  options  are  not  supported  in  SVr4
++       The -0, -1, -E, -F, -G, -R, -T, -V, -a, -e,  -f,  -g,  -i,
++       -l,  -p,  -q  and  -t  options  are  not supported in SVr4
+        curses.
+ 
+        The -r option's notion of `termcap' capabilities is System
+-       V Release 4's.  Actual BSD curses  versions  will  have  a
+-       more  restricted  set.  To see only the 4.4BSD set, use -r
++       V  Release  4's.   Actual  BSD curses versions will have a
++       more restricted set.  To see only the 4.4BSD set,  use  -r
+        -RBSD.
+ 
+ 
+@@ -470,12 +473,12 @@
+ 
+ 
+ 
    SEE ALSO
    +-       captoinfo(1m),    infotocap(1m),     tic(1m),     toe(1m),
++       captoinfo(1m),     infotocap(1m),     tic(1m),    toe(1m),
+        curses(3x), terminfo(5).
+ 
+        http://invisible-island.net/ncurses/tctest.html
+ 
+-       This describes ncurses version 6.0 (patch 20160910).
++       This describes ncurses version 6.0 (patch 20161015).
+ 
+ 
+ 
    AUTHOR
    +Index: doc/html/man/infotocap.1m.html
+--- ncurses-6.0-20161008+/doc/html/man/infotocap.1m.html	2016-09-10 22:14:40.000000000 +0000
++++ ncurses-6.0-20161015/doc/html/man/infotocap.1m.html	2016-10-15 23:12:22.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -81,14 +81,14 @@
+ 
+ 
+ 
    NOTES
    +-       This  utility  is  actually  a  link to tic, running in -C
+-       mode.  You can use other tic options such as -f and  -x.
++       This  utility  is  actually  a  link to tic, running in -C
++       mode.  You can use other tic options such as -f and  -x.
+ 
+ 
+ 
    SEE ALSO
    +        curses(3x), tic(1m), infocmp(1m), terminfo(5)
+ 
+-       This describes ncurses version 6.0 (patch 20160910).
++       This describes ncurses version 6.0 (patch 20161015).
+ 
+ 
+ 
    AUTHOR
    +Index: doc/html/man/legacy_coding.3x.html
+--- ncurses-6.0-20161008+/doc/html/man/legacy_coding.3x.html	2016-01-30 19:24:56.000000000 +0000
++++ ncurses-6.0-20161015/doc/html/man/legacy_coding.3x.html	2016-10-15 23:12:23.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -57,7 +57,7 @@
+ 
+ 
+ 
    DESCRIPTION
    +-       The  use_legacy_coding()  function  is an extension to the
++       The  use_legacy_coding  function  is  an  extension to the
+        curses library.  It allows the caller to change the result
+        of  unctrl, and suppress related checks within the library
+        that would normally cause  nonprinting  characters  to  be
+Index: doc/html/man/menu.3x.html
+--- ncurses-6.0-20161008+/doc/html/man/menu.3x.html	2016-09-10 22:14:41.000000000 +0000
++++ ncurses-6.0-20161015/doc/html/man/menu.3x.html	2016-10-15 23:12:23.000000000 +0000
+@@ -217,7 +217,7 @@
+        curses(3x) and related pages whose names begin "menu_" for
+        detailed descriptions of the entry points.
+ 
+-       This describes ncurses version 6.0 (patch 20160910).
++       This describes ncurses version 6.0 (patch 20161015).
+ 
+ 
+ 
+Index: doc/html/man/menu_format.3x.html
+--- ncurses-6.0-20161008+/doc/html/man/menu_format.3x.html	2016-01-30 19:24:57.000000000 +0000
++++ ncurses-6.0-20161015/doc/html/man/menu_format.3x.html	2016-10-15 23:12:23.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -61,7 +61,7 @@
+        of the given menu.  If this size is too small  to  display
+        all  menu items, the menu will be made scrollable. If this
+        size is larger than the menus subwindow and the  subwindow
+-       is  too  small to display all menu items, post_menu() will
++       is  too  small  to  display all menu items, post_menu will
+        fail.
+ 
+        The  default  format  is  16  rows,  1  column.    Calling
+Index: doc/html/man/menu_post.3x.html
+--- ncurses-6.0-20161008+/doc/html/man/menu_post.3x.html	2016-01-30 19:24:57.000000000 +0000
++++ ncurses-6.0-20161015/doc/html/man/menu_post.3x.html	2016-10-15 23:12:23.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -89,8 +89,8 @@
+             tion function.
+ 
+        E_NO_ROOM
+-            Menu is too large for its window. You should consider
+-            to use set_menu_format() to solve the problem.
++            Menu is too large for its window.   You  should  con-
++            sider using set_menu_format to solve the problem.
+ 
+        E_NOT_POSTED
+             The menu has not been posted.
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.0-20161008+/doc/html/man/ncurses.3x.html	2016-09-10 22:14:41.000000000 +0000
++++ ncurses-6.0-20161015/doc/html/man/ncurses.3x.html	2016-10-15 23:12:23.000000000 +0000
+@@ -60,7 +60,7 @@
+        sonable optimization.  This implementation is "new curses"
+        (ncurses) and is the approved replacement for 4.4BSD clas-
+        sic  curses,  which has been discontinued.  This describes
+-       ncurses version 6.0 (patch 20160910).
++       ncurses version 6.0 (patch 20161015).
+ 
+        The ncurses library emulates the curses library of  System
+        V  Release  4  UNIX,  and  XPG4 (X/Open Portability Guide)
+Index: doc/html/man/panel.3x.html
+--- ncurses-6.0-20161008+/doc/html/man/panel.3x.html	2016-09-10 22:14:41.000000000 +0000
++++ ncurses-6.0-20161015/doc/html/man/panel.3x.html	2016-10-15 23:12:23.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -98,13 +98,13 @@
+               (causes   it  to   be   displayed  above  any other
+               panel) and returns a pointer to the new panel.
+ 
+-       update_panels()
++       update_panels
+               refreshes the virtual screen to reflect  the  rela-
+               tions between the panels in the stack, but does not
+-              call doupdate() to  refresh  the  physical  screen.
+-              Use this function and not wrefresh or wnoutrefresh.
++              call doupdate to refresh the physical screen.   Use
++              this  function  and  not  wrefresh or wnoutrefresh.
+               update_panels may be called more than once before a
+-              call  to doupdate(), but doupdate() is the function
++              call  to  doupdate,  but  doupdate  is the function
+               responsible for updating the physical screen.
+ 
+        del_panel(pan)
+@@ -138,8 +138,8 @@
+               moves the given panel window so that its upper-left
+               corner is at starty, startx.  It  does  not  change
+               the position of the panel in the stack.  Be sure to
+-              use this function, not mvwin(),  to  move  a  panel
+-              window.
++              use this function, not mvwin, to move a panel  win-
++              dow.
+ 
+        replace_panel(pan,window)
+               replaces  the  current  window of panel with window
+@@ -182,20 +182,19 @@
+        are  merely   similar. The  programmer is cautioned not to
+        directly use PANEL fields.
+ 
+-       The functions show_panel() and top_panel()  are  identical
+-       in  this  implementation,  and work equally well with dis-
+-       played or hidden panels.  In the native System V implemen-
+-       tation, show_panel() is intended for making a hidden panel
+-       visible (at the top  of  the  stack)  and  top_panel()  is
+-       intended  for  making an already-visible panel move to the
+-       top of the stack. You are cautioned  to  use  the  correct
+-       function   to   ensure  compatibility  with  native  panel
+-       libraries.
++       The functions show_panel and top_panel  are  identical  in
++       this  implementation, and work equally well with displayed
++       or hidden panels.  In the native System V  implementation,
++       show_panel  is  intended for making a hidden panel visible
++       (at the top of the stack) and top_panel  is  intended  for
++       making  an  already-visible  panel  move to the top of the
++       stack. You are cautioned to use the  correct  function  to
++       ensure compatibility with native panel libraries.
+ 
+ 
+ 
    NOTE
    +-       In your library list, libpanel.a should  be  before  libn-
+-       curses.a;  that  is,  you want to say `-lpanel -lncurses',
++       In  your  library  list, libpanel.a should be before libn-
++       curses.a; that is, you want to  say  `-lpanel  -lncurses',
+        not the other way around (which would usually give a link-
+        error).
+ 
+@@ -209,13 +208,13 @@
+ 
    SEE ALSO
    +        curses(3x), curs_variables(3x),
+ 
+-       This describes ncurses version 6.0 (patch 20160910).
++       This describes ncurses version 6.0 (patch 20161015).
+ 
+ 
+ 
    AUTHOR
    +-       Originally   written   by   Warren  Tucker  <wht@n4hgf.mt-
+-       park.ga.us>, primarily to assist  in  porting  u386mon  to
+-       systems  without  a native panels library.  Repackaged for
++       Originally  written  by   Warren   Tucker   <wht@n4hgf.mt-
++       park.ga.us>,  primarily  to  assist  in porting u386mon to
++       systems without a native panels library.   Repackaged  for
+        ncurses by Zeyd ben-Halim.
+ 
+ 
+Index: doc/html/man/tabs.1.html
+--- ncurses-6.0-20161008+/doc/html/man/tabs.1.html	2016-09-10 22:14:41.000000000 +0000
++++ ncurses-6.0-20161015/doc/html/man/tabs.1.html	2016-10-15 23:12:23.000000000 +0000
+@@ -26,7 +26,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: tabs.1,v 1.12 2016/04/02 23:40:46 tom Exp @
++  * @Id: tabs.1,v 1.13 2016/10/15 16:16:38 tom Exp @
+ -->
+ 
+ 
+@@ -148,7 +148,7 @@
+            terminal database provide this capability.
+ 
+        o   There  is  no counterpart in X/Open Curses Issue 7 for
+-           this utility, unlike tput(3x).
++           this utility, unlike tput(1).
+ 
+        The -d (debug) and -n (no-op) options are  extensions  not
+        provided by other implementations.
+@@ -164,7 +164,7 @@
+ 
    SEE ALSO
    +        tset(1), infocmp(1m), curses(3x), terminfo(5).
+ 
+-       This describes ncurses version 6.0 (patch 20160910).
++       This describes ncurses version 6.0 (patch 20161015).
+ 
+ 
+ 
+Index: doc/html/man/term.5.html
+--- ncurses-6.0-20161008+/doc/html/man/term.5.html	2016-01-30 19:24:58.000000000 +0000
++++ ncurses-6.0-20161015/doc/html/man/term.5.html	2016-10-15 23:12:24.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -95,7 +95,7 @@
+        made.
+ 
+        The  compiled  file  is  created with the tic program, and
+-       read by the routine setupterm.  The file is  divided  into
++       read by the routine setupterm.  The file is  divided  into
+        six parts: the header, terminal names, boolean flags, num-
+        bers, strings, and string table.
+ 
+@@ -207,13 +207,13 @@
+ 
+ 
+ 
    PORTABILITY
    +-       Note that it is possible for setupterm to expect a differ-
++       Note that it is possible for setupterm to expect a differ-
+        ent  set  of capabilities than are actually present in the
+        file.  Either the database may  have  been  updated  since
+-       setupterm has been recompiled (resulting in extra unrecog-
++       setupterm has been recompiled (resulting in extra unrecog-
+        nized entries in the file) or the program  may  have  been
+        recompiled  more  recently  than  the database was updated
+-       (resulting in missing  entries).   The  routine  setupterm
++       (resulting in missing  entries).   The  routine  setupterm
+        must  be prepared for both possibilities - this is why the
+        numbers and sizes are included.   Also,  new  capabilities
+        must  always  be added at the end of the lists of boolean,
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.0-20161008+/doc/html/man/terminfo.5.html	2016-09-10 22:14:42.000000000 +0000
++++ ncurses-6.0-20161015/doc/html/man/terminfo.5.html	2016-10-15 23:12:24.000000000 +0000
+@@ -5,7 +5,7 @@
+   * Note: this must be run through tbl before nroff.
+   * The magic cookie on the first line triggers this under some man programs.
+   ****************************************************************************
+-  * Copyright (c) 1998-2012,2013 Free Software Foundation, Inc.              *
++  * Copyright (c) 1998-2013,2016 Free Software Foundation, Inc.              *
+   *                                                                          *
+   * Permission is hereby granted, free of charge, to any person obtaining a  *
+   * copy of this software and associated documentation files (the            *
+@@ -31,9 +31,9 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: terminfo.head,v 1.21 2013/03/09 22:11:36 tom Exp @
++  * @Id: terminfo.head,v 1.22 2016/10/15 17:02:31 tom Exp @
+   * Head of terminfo man page ends here
+-  * @Id: terminfo.tail,v 1.69 2015/04/26 14:47:23 tom Exp @
++  * @Id: terminfo.tail,v 1.72 2016/10/15 18:34:58 tom Exp @
+   * Beginning of terminfo.tail file
+   * This file is part of ncurses.
+   * See "terminfo.head" for copyright.
+@@ -75,7 +75,7 @@
+        nals by giving a set of capabilities which they  have,  by
+        specifying how to perform screen operations, and by speci-
+        fying padding requirements and  initialization  sequences.
+-       This describes ncurses version 6.0 (patch 20160910).
++       This describes ncurses version 6.0 (patch 20161015).
+ 
+        Entries in terminfo consist of a sequence of `,' separated
+        fields (embedded commas may be escaped with a backslash or
+@@ -1167,56 +1167,63 @@
+ 
+        A  delay  in  milliseconds may appear anywhere in a string
+        capability, enclosed in $<..> brackets, as in  el=\EK$<5>,
+-       and  padding  characters  are supplied by tputs to provide
+-       this delay.  The delay must be a number with at  most  one
+-       decimal place of precision; it may be followed by suffixes
+-       "*" or "/" or both.  A  "*"  indicates  that  the  padding
+-       required  is  proportional to the number of lines affected
+-       by the  operation,  and  the  amount  given  is  the  per-
+-       affected-unit  padding  required.   (In the case of insert
+-       character,  the  factor  is  still  the  number  of  lines
+-       affected.)   Normally,  padding  is advisory if the device
+-       has the xon capability; it is used  for  cost  computation
+-       but  does not trigger delays.  A "/" suffix indicates that
+-       the padding is mandatory and forces a delay of  the  given
+-       number  of  milliseconds  even on devices for which xon is
+-       present to indicate flow control.
++       and  padding  characters  are supplied by tputs to provide
++       this delay.
+ 
+-       Sometimes individual capabilities must be  commented  out.
+-       To  do this, put a period before the capability name.  For
++       o   The delay must be a number with at  most  one  decimal
++           place of precision; it may be followed by suffixes "*"
++           or "/" or both.
++
++       o   A "*" indicates that the padding required  is  propor-
++           tional  to  the number of lines affected by the opera-
++           tion, and the amount given  is  the  per-affected-unit
++           padding  required.   (In the case of insert character,
++           the factor is still the number of lines affected.)
++
++           Normally, padding is advisory if the  device  has  the
++           xon  capability;  it  is used for cost computation but
++           does not trigger delays.
++
++       o   A "/" suffix indicates that the padding  is  mandatory
++           and forces a delay of the given number of milliseconds
++           even on devices for which xon is present  to  indicate
++           flow control.
++
++       Sometimes  individual  capabilities must be commented out.
++       To do this, put a period before the capability name.   For
+        example, see the second ind in the example above.
+ 
+ 
+ 
    Fetching Compiled Descriptions
    +-       The ncurses library searches for terminal descriptions  in
++       The  ncurses library searches for terminal descriptions in
+        several places.  It uses only the first description found.
+-       The library has a compiled-in list  of  places  to  search
+-       which  can be overridden by environment variables.  Before
+-       starting to search, ncurses eliminates duplicates  in  its
++       The  library  has  a  compiled-in list of places to search
++       which can be overridden by environment variables.   Before
++       starting  to  search, ncurses eliminates duplicates in its
+        search list.
+ 
+-       o   If  the  environment  variable  TERMINFO is set, it is
+-           interpreted as the pathname of a directory  containing
+-           the  compiled  description  you  are working on.  Only
++       o   If the environment variable TERMINFO  is  set,  it  is
++           interpreted  as the pathname of a directory containing
++           the compiled description you  are  working  on.   Only
+            that directory is searched.
+ 
+-       o   If TERMINFO is not set, ncurses will instead  look  in
+-           the  directory $HOME/.terminfo for a compiled descrip-
++       o   If  TERMINFO  is not set, ncurses will instead look in
++           the directory $HOME/.terminfo for a compiled  descrip-
+            tion.
+ 
+-       o   Next, if the  environment  variable  TERMINFO_DIRS  is
++       o   Next,  if  the  environment  variable TERMINFO_DIRS is
+            set, ncurses will interpret the contents of that vari-
+-           able as a  list  of  colon-separated  directories  (or
++           able  as  a  list  of  colon-separated directories (or
+            database files) to be searched.
+ 
+-           An  empty directory name (i.e., if the variable begins
+-           or ends with a colon, or contains adjacent colons)  is
+-           interpreted  as  the  system  location /usr/share/ter-
++           An empty directory name (i.e., if the variable  begins
++           or  ends with a colon, or contains adjacent colons) is
++           interpreted as  the  system  location  /usr/share/ter-
+            minfo.
+ 
+        o   Finally, ncurses searches these compiled-in locations:
+ 
+-           o   a          list           of           directories
++           o   a           list           of          directories
+                (/usr/local/ncurses/share/terminfo:/usr/share/ter-
+                minfo), and
+ 
+@@ -1225,91 +1232,91 @@
+ 
+ 
+ 
    Preparing Descriptions
    +-       We  now  outline how to prepare descriptions of terminals.
+-       The most effective way to prepare a  terminal  description
+-       is  by  imitating the description of a similar terminal in
+-       terminfo and to build up a  description  gradually,  using
++       We now outline how to prepare descriptions  of  terminals.
++       The  most  effective way to prepare a terminal description
++       is by imitating the description of a similar  terminal  in
++       terminfo  and  to  build up a description gradually, using
+        partial descriptions with vi or some other screen-oriented
+-       program to check that they are correct.  Be aware  that  a
++       program  to  check that they are correct.  Be aware that a
+        very unusual terminal may expose deficiencies in the abil-
+-       ity of the terminfo file to describe it  or  bugs  in  the
++       ity  of  the  terminfo  file to describe it or bugs in the
+        screen-handling code of the test program.
+ 
+-       To  get the padding for insert line right (if the terminal
++       To get the padding for insert line right (if the  terminal
+        manufacturer did not document it) a severe test is to edit
+-       a  large file at 9600 baud, delete 16 or so lines from the
+-       middle of the screen, then hit the "u" key  several  times
+-       quickly.   If the terminal messes up, more padding is usu-
+-       ally needed.  A similar test can be used for insert  char-
++       a large file at 9600 baud, delete 16 or so lines from  the
++       middle  of  the screen, then hit the "u" key several times
++       quickly.  If the terminal messes up, more padding is  usu-
++       ally  needed.  A similar test can be used for insert char-
+        acter.
+ 
+ 
+ 
    Basic Capabilities
    +-       The  number  of  columns  on each line for the terminal is
+-       given by the cols numeric capability.  If the terminal  is
+-       a  CRT, then the number of lines on the screen is given by
++       The number of columns on each line  for  the  terminal  is
++       given  by the cols numeric capability.  If the terminal is
++       a CRT, then the number of lines on the screen is given  by
+        the lines capability.  If the terminal wraps around to the
+-       beginning  of the next line when it reaches the right mar-
++       beginning of the next line when it reaches the right  mar-
+        gin, then it should have the am capability.  If the termi-
+-       nal  can  clear its screen, leaving the cursor in the home
+-       position, then this is given by the clear string  capabil-
+-       ity.   If the terminal overstrikes (rather than clearing a
+-       position when a character is struck over) then  it  should
+-       have  the  os  capability.   If the terminal is a printing
+-       terminal, with no soft copy unit, give it both hc and  os.
+-       (os  applies to storage scope terminals, such as TEKTRONIX
+-       4010 series, as well as hard copy and APL terminals.)   If
++       nal can clear its screen, leaving the cursor in  the  home
++       position,  then this is given by the clear string capabil-
++       ity.  If the terminal overstrikes (rather than clearing  a
++       position  when  a character is struck over) then it should
++       have the os capability.  If the  terminal  is  a  printing
++       terminal,  with no soft copy unit, give it both hc and os.
++       (os applies to storage scope terminals, such as  TEKTRONIX
++       4010  series, as well as hard copy and APL terminals.)  If
+        there is a code to move the cursor to the left edge of the
+        current row, give this as cr.  (Normally this will be car-
+-       riage  return,  control M.)  If there is a code to produce
++       riage return, control M.)  If there is a code  to  produce
+        an audible signal (bell, beep, etc) give this as bel.
+ 
+-       If there is a code to move the cursor one position to  the
+-       left  (such  as backspace) that capability should be given
+-       as cub1.  Similarly, codes to move to the right,  up,  and
++       If  there is a code to move the cursor one position to the
++       left (such as backspace) that capability should  be  given
++       as  cub1.   Similarly, codes to move to the right, up, and
+        down should be given as cuf1, cuu1, and cud1.  These local
+-       cursor motions should not alter the text they  pass  over,
+-       for  example,  you would not normally use "cuf1= " because
++       cursor  motions  should not alter the text they pass over,
++       for example, you would not normally use  "cuf1= "  because
+        the space would erase the character moved over.
+ 
+-       A very important point  here  is  that  the  local  cursor
+-       motions  encoded in terminfo are undefined at the left and
+-       top edges  of  a  CRT  terminal.   Programs  should  never
+-       attempt  to  backspace  around the left edge, unless bw is
++       A  very  important  point  here  is  that the local cursor
++       motions encoded in terminfo are undefined at the left  and
++       top  edges  of  a  CRT  terminal.   Programs  should never
++       attempt to backspace around the left edge,  unless  bw  is
+        given, and never attempt to go up locally off the top.  In
+-       order  to  scroll text up, a program will go to the bottom
++       order to scroll text up, a program will go to  the  bottom
+        left corner of the screen and send the ind (index) string.
+ 
+        To scroll text down, a program goes to the top left corner
+-       of  the  screen  and  sends the ri (reverse index) string.
+-       The strings ind and ri are undefined  when  not  on  their
++       of the screen and sends the  ri  (reverse  index)  string.
++       The  strings  ind  and  ri are undefined when not on their
+        respective corners of the screen.
+ 
+        Parameterized versions of the scrolling sequences are indn
+        and rin which have the same semantics as ind and ri except
+-       that  they take one parameter, and scroll that many lines.
+-       They are also undefined except at the appropriate edge  of
++       that they take one parameter, and scroll that many  lines.
++       They  are also undefined except at the appropriate edge of
+        the screen.
+ 
+-       The  am  capability tells whether the cursor sticks at the
+-       right edge of the screen when text  is  output,  but  this
++       The am capability tells whether the cursor sticks  at  the
++       right  edge  of  the  screen when text is output, but this
+        does not necessarily apply to a cuf1 from the last column.
+-       The only local motion which is defined from the left  edge
+-       is  if  bw  is  given, then a cub1 from the left edge will
+-       move to the right edge of the previous row.  If bw is  not
+-       given,  the effect is undefined.  This is useful for draw-
+-       ing a box around the edge of the screen, for example.   If
+-       the  terminal has switch selectable automatic margins, the
+-       terminfo file usually assumes that this is on;  i.e.,  am.
+-       If  the  terminal  has  a command which moves to the first
+-       column of the next line, that command can be given as  nel
+-       (newline).   It  does not matter if the command clears the
+-       remainder of the current line, so if the terminal  has  no
+-       cr  and lf it may still be possible to craft a working nel
++       The  only local motion which is defined from the left edge
++       is if bw is given, then a cub1 from  the  left  edge  will
++       move  to the right edge of the previous row.  If bw is not
++       given, the effect is undefined.  This is useful for  draw-
++       ing  a box around the edge of the screen, for example.  If
++       the terminal has switch selectable automatic margins,  the
++       terminfo  file  usually assumes that this is on; i.e., am.
++       If the terminal has a command which  moves  to  the  first
++       column  of the next line, that command can be given as nel
++       (newline).  It does not matter if the command  clears  the
++       remainder  of  the current line, so if the terminal has no
++       cr and lf it may still be possible to craft a working  nel
+        out of one or both of them.
+ 
+        These  capabilities  suffice  to  describe  hard-copy  and
+-       "glass-tty"  terminals.   Thus  the  model  33 teletype is
++       "glass-tty" terminals.  Thus  the  model  33  teletype  is
+        described as
+ 
+        33|tty33|tty|model 33 teletype,
+@@ -1323,21 +1330,21 @@
+ 
+ 
+ 
    Parameterized Strings
    +-       Cursor addressing and other strings  requiring  parameters
+-       in  the  terminal  are described by a parameterized string
+-       capability, with printf-like escapes such  as  %x  in  it.
+-       For  example, to address the cursor, the cup capability is
++       Cursor  addressing  and other strings requiring parameters
++       in the terminal are described by  a  parameterized  string
++       capability,  with  printf-like  escapes  such as %x in it.
++       For example, to address the cursor, the cup capability  is
+        given, using two parameters: the row and column to address
+        to.  (Rows and columns are numbered from zero and refer to
+        the physical screen visible to the user, not to any unseen
+-       memory.)   If  the  terminal  has  memory  relative cursor
++       memory.)  If  the  terminal  has  memory  relative  cursor
+        addressing, that can be indicated by mrcup.
+ 
+-       The parameter mechanism uses a stack and special  %  codes
+-       to  manipulate  it.  Typically a sequence will push one of
+-       the parameters onto the stack and then print  it  in  some
+-       format.   Print  (e.g.,  "%d")  is  a special case.  Other
+-       operations, including "%t"  pop  their  operand  from  the
++       The  parameter  mechanism uses a stack and special % codes
++       to manipulate it.  Typically a sequence will push  one  of
++       the  parameters  onto  the stack and then print it in some
++       format.  Print (e.g., "%d")  is  a  special  case.   Other
++       operations,  including  "%t"  pop  their  operand from the
+        stack.  It is noted that more complex operations are often
+        necessary, e.g., in the sgr string.
+ 
+@@ -1346,19 +1353,19 @@
+        %%   outputs "%"
+ 
+        %[[:]flags][width[.precision]][doxXs]
+-            as in printf, flags are [-+#] and space.  Use  a  ":"
+-            to  allow the next character to be a "-" flag, avoid-
++            as  in  printf, flags are [-+#] and space.  Use a ":"
++            to allow the next character to be a "-" flag,  avoid-
+             ing interpreting "%-" as an operator.
+ 
+-       %c   print pop() like %c in printf
++       %c   print pop() like %c in printf
+ 
+-       %s   print pop() like %s in printf
++       %s   print pop() like %s in printf
+ 
+        %p[1-9]
+             push i'th parameter
+ 
+        %P[a-z]
+-            set dynamic variable [a-z] to pop()
++            set dynamic variable [a-z] to pop()
+ 
+        %g[a-z]/
+             get dynamic variable [a-z] and push it
+@@ -1369,11 +1376,11 @@
+        %g[A-Z]
+             get static variable [a-z] and push it
+ 
+-            The terms  "static"  and  "dynamic"  are  misleading.
+-            Historically,  these are simply two different sets of
+-            variables, whose values are not reset  between  calls
+-            to  tparm.   However,  that fact is not documented in
+-            other implementations.  Relying on it will  adversely
++            The  terms  "static"  and  "dynamic"  are misleading.
++            Historically, these are simply two different sets  of
++            variables,  whose  values are not reset between calls
++            to tparm.  However, that fact is  not  documented  in
++            other  implementations.  Relying on it will adversely
+             impact portability to other implementations.
+ 
+        %'c' char constant c
+@@ -1384,7 +1391,7 @@
+        %l   push strlen(pop)
+ 
+        %+, %-, %*, %/, %m
+-            arithmetic (%m is mod): push(pop() op pop())
++            arithmetic (%m is mod): push(pop() op pop())
+ 
+        %&, %|, %^
+             bit operations (AND, OR and exclusive-OR): push(pop()
+@@ -1397,16 +1404,16 @@
+             logical AND and OR operations (for conditionals)
+ 
+        %!, %~
+-            unary  operations  (logical  and   bit   complement):
+-            push(op pop())
++            unary   operations   (logical  and  bit  complement):
++            push(op pop())
+ 
+        %i   add 1 to first two parameters (for ANSI terminals)
+ 
+        %? expr %t thenpart %e elsepart %;
+-            This  forms  an  if-then-else.   The  %e  elsepart is
+-            optional.  Usually the %? expr part  pushes  a  value
+-            onto  the stack, and %t pops it from the stack, test-
+-            ing if it is nonzero (true).  If it is zero  (false),
++            This forms  an  if-then-else.   The  %e  elsepart  is
++            optional.   Usually  the  %? expr part pushes a value
++            onto the stack, and %t pops it from the stack,  test-
++            ing  if it is nonzero (true).  If it is zero (false),
+             control passes to the %e (else) part.
+ 
+             It is possible to form else-if's a la Algol 68:
+@@ -1415,221 +1422,221 @@
+             where ci are conditions, bi are bodies.
+ 
+             Use the -f option of tic or infocmp to see the struc-
+-            ture of if-then-else's.  Some strings, e.g., sgr  can
++            ture  of if-then-else's.  Some strings, e.g., sgr can
+             be very complicated when written on one line.  The -f
+-            option splits the string into lines  with  the  parts
++            option  splits  the  string into lines with the parts
+             indented.
+ 
+        Binary operations are in postfix form with the operands in
+-       the usual order.  That  is,  to  get  x-5  one  would  use
+-       "%gx%{5}%-".   %P  and  %g variables are persistent across
++       the  usual  order.   That  is,  to  get  x-5 one would use
++       "%gx%{5}%-".  %P and %g variables  are  persistent  across
+        escape-string evaluations.
+ 
+        Consider the HP2645, which, to get to row 3 and column 12,
+-       needs  to  be  sent  \E&a12c03Y padded for 6 milliseconds.
+-       Note that the order of the rows and  columns  is  inverted
+-       here,  and that the row and column are printed as two dig-
++       needs to be sent \E&a12c03Y  padded  for  6  milliseconds.
++       Note  that  the  order of the rows and columns is inverted
++       here, and that the row and column are printed as two  dig-
+        its.  Thus its cup capability is "cup=6\E&%p2%2dc%p1%2dY".
+ 
+        The Microterm ACT-IV needs the current row and column sent
+-       preceded  by  a ^T, with the row and column simply encoded
+-       in binary, "cup=^T%p1%c%p2%c".  Terminals which  use  "%c"
+-       need  to  be  able  to backspace the cursor (cub1), and to
++       preceded by a ^T, with the row and column  simply  encoded
++       in  binary,  "cup=^T%p1%c%p2%c".  Terminals which use "%c"
++       need to be able to backspace the  cursor  (cub1),  and  to
+        move the cursor up one line on the screen (cuu1).  This is
+-       necessary  because it is not always safe to transmit \n ^D
+-       and \r, as the system may change or  discard  them.   (The
+-       library  routines  dealing  with terminfo set tty modes so
++       necessary because it is not always safe to transmit \n  ^D
++       and  \r,  as  the system may change or discard them.  (The
++       library routines dealing with terminfo set  tty  modes  so
+        that tabs are never expanded, so \t is safe to send.  This
+        turns out to be essential for the Ann Arbor 4080.)
+ 
+        A final example is the LSI ADM-3a, which uses row and col-
+        umn  offset  by  a  blank  character,  thus  "cup=\E=%p1%'
+-       '%+%c%p2%'  '%+%c".   After sending "\E=", this pushes the
+-       first parameter, pushes the ASCII value for a space  (32),
+-       adds  them  (pushing  the sum on the stack in place of the
+-       two previous values) and outputs that value as  a  charac-
+-       ter.   Then  the  same  is  done for the second parameter.
++       '%+%c%p2%' '%+%c".  After sending "\E=", this  pushes  the
++       first  parameter, pushes the ASCII value for a space (32),
++       adds them (pushing the sum on the stack in  place  of  the
++       two  previous  values) and outputs that value as a charac-
++       ter.  Then the same is  done  for  the  second  parameter.
+        More complex arithmetic is possible using the stack.
+ 
+ 
+ 
    Cursor Motions
    +        If the terminal has a fast way to home the cursor (to very
+-       upper  left  corner  of  screen) then this can be given as
+-       home; similarly a fast way of getting to the  lower  left-
+-       hand  corner can be given as ll; this may involve going up
+-       with cuu1 from the home position,  but  a  program  should
+-       never  do this itself (unless ll does) because it can make
+-       no assumption about the effect of moving up from the  home
+-       position.   Note  that  the  home  position is the same as
++       upper left corner of screen) then this  can  be  given  as
++       home;  similarly  a fast way of getting to the lower left-
++       hand corner can be given as ll; this may involve going  up
++       with  cuu1  from  the  home position, but a program should
++       never do this itself (unless ll does) because it can  make
++       no  assumption about the effect of moving up from the home
++       position.  Note that the home  position  is  the  same  as
+        addressing to (0,0): to the top left corner of the screen,
+-       not  of  memory.   (Thus, the \EH sequence on HP terminals
++       not of memory.  (Thus, the \EH sequence  on  HP  terminals
+        cannot be used for home.)
+ 
+        If the terminal has row or column absolute cursor address-
+-       ing,  these  can be given as single parameter capabilities
++       ing, these can be given as single  parameter  capabilities
+        hpa (horizontal position absolute) and vpa (vertical posi-
+        tion absolute).  Sometimes these are shorter than the more
+-       general two parameter sequence (as with  the  hp2645)  and
++       general  two  parameter  sequence (as with the hp2645) and
+        can be used in preference to cup.  If there are parameter-
+-       ized local motions (e.g., move  n  spaces  to  the  right)
++       ized  local  motions  (e.g.,  move  n spaces to the right)
+        these can be given as cud, cub, cuf, and cuu with a single
+-       parameter indicating how many spaces to move.   These  are
+-       primarily  useful  if the terminal does not have cup, such
++       parameter  indicating  how many spaces to move.  These are
++       primarily useful if the terminal does not have  cup,  such
+        as the TEKTRONIX 4025.
+ 
+        If the terminal needs to be in a special mode when running
+        a program that uses these capabilities, the codes to enter
+-       and exit this mode can be given as smcup and rmcup.   This
+-       arises,  for example, from terminals like the Concept with
+-       more than one page of memory.  If the  terminal  has  only
+-       memory  relative cursor addressing and not screen relative
++       and  exit this mode can be given as smcup and rmcup.  This
++       arises, for example, from terminals like the Concept  with
++       more  than  one  page of memory.  If the terminal has only
++       memory relative cursor addressing and not screen  relative
+        cursor addressing, a one screen-sized window must be fixed
+-       into  the terminal for cursor addressing to work properly.
++       into the terminal for cursor addressing to work  properly.
+        This is also used for the TEKTRONIX 4025, where smcup sets
+-       the  command character to be the one used by terminfo.  If
+-       the smcup sequence will not restore the  screen  after  an
++       the command character to be the one used by terminfo.   If
++       the  smcup  sequence  will not restore the screen after an
+        rmcup sequence is output (to the state prior to outputting
+        rmcup), specify nrrmc.
+ 
+ 
+ 
    Area Clears
    +        If the terminal can clear from the current position to the
+-       end  of  the  line,  leaving  the cursor where it is, this
++       end of the line, leaving the  cursor  where  it  is,  this
+        should be given as el.  If the terminal can clear from the
+-       beginning  of  the line to the current position inclusive,
+-       leaving the cursor where it is, this should  be  given  as
+-       el1.   If the terminal can clear from the current position
+-       to the end of the display, then this should  be  given  as
+-       ed.   Ed  is only defined from the first column of a line.
+-       (Thus, it can be simulated by a request to delete a  large
++       beginning of the line to the current  position  inclusive,
++       leaving  the  cursor  where it is, this should be given as
++       el1.  If the terminal can clear from the current  position
++       to  the  end  of the display, then this should be given as
++       ed.  Ed is only defined from the first column of  a  line.
++       (Thus,  it can be simulated by a request to delete a large
+        number of lines, if a true ed is not available.)
+ 
+ 
+ 
    Insert/delete line and vertical motions
    +-       If  the terminal can open a new blank line before the line
+-       where the cursor is, this should be given as il1; this  is
+-       done  only  from the first position of a line.  The cursor
++       If the terminal can open a new blank line before the  line
++       where  the cursor is, this should be given as il1; this is
++       done only from the first position of a line.   The  cursor
+        must then appear on the newly blank line.  If the terminal
+-       can  delete  the  line  which  the cursor is on, then this
+-       should be given as dl1; this is done only from  the  first
+-       position  on  the line to be deleted.  Versions of il1 and
+-       dl1 which take a single parameter  and  insert  or  delete
++       can delete the line which the  cursor  is  on,  then  this
++       should  be  given as dl1; this is done only from the first
++       position on the line to be deleted.  Versions of  il1  and
++       dl1  which  take  a  single parameter and insert or delete
+        that many lines can be given as il and dl.
+ 
+-       If  the terminal has a settable scrolling region (like the
+-       vt100) the command to set this can be described  with  the
+-       csr  capability,  which  takes two parameters: the top and
++       If the terminal has a settable scrolling region (like  the
++       vt100)  the  command to set this can be described with the
++       csr capability, which takes two parameters:  the  top  and
+        bottom lines of the scrolling region.  The cursor position
+        is, alas, undefined after using this command.
+ 
+-       It  is possible to get the effect of insert or delete line
++       It is possible to get the effect of insert or delete  line
+        using csr on a properly chosen region; the sc and rc (save
+-       and  restore  cursor)  commands may be useful for ensuring
+-       that your synthesized insert/delete string does  not  move
+-       the  cursor.  (Note that the ncurses(3x) library does this
+-       synthesis  automatically,  so   you   need   not   compose
++       and restore cursor) commands may be  useful  for  ensuring
++       that  your  synthesized insert/delete string does not move
++       the cursor.  (Note that the ncurses(3x) library does  this
++       synthesis   automatically,   so   you   need  not  compose
+        insert/delete strings for an entry with csr).
+ 
+        Yet another way to construct insert and delete might be to
+-       use a combination of index with  the  memory-lock  feature
+-       found  on some terminals (like the HP-700/90 series, which
++       use  a  combination  of index with the memory-lock feature
++       found on some terminals (like the HP-700/90 series,  which
+        however also has insert/delete).
+ 
+-       Inserting lines at the top or bottom  of  the  screen  can
+-       also  be  done using ri or ind on many terminals without a
+-       true insert/delete line, and is often faster even on  ter-
++       Inserting  lines  at  the  top or bottom of the screen can
++       also be done using ri or ind on many terminals  without  a
++       true  insert/delete line, and is often faster even on ter-
+        minals with those features.
+ 
+-       The  boolean  non_dest_scroll_region should be set if each
+-       scrolling window is effectively a view port on  a  screen-
+-       sized  canvas.   To  test  for  this  capability, create a
+-       scrolling region in the middle of the screen, write  some-
+-       thing  to  the  bottom line, move the cursor to the top of
++       The boolean non_dest_scroll_region should be set  if  each
++       scrolling  window  is effectively a view port on a screen-
++       sized canvas.  To  test  for  this  capability,  create  a
++       scrolling  region in the middle of the screen, write some-
++       thing to the bottom line, move the cursor to  the  top  of
+        the region, and do ri followed by dl1 or ind.  If the data
+-       scrolled  off  the  bottom  of  the  region  by the ri re-
+-       appears, then scrolling is non-destructive.  System V  and
+-       XSI  Curses  expect that ind, ri, indn, and rin will simu-
+-       late destructive scrolling; their  documentation  cautions
+-       you  not  to  define csr unless this is true.  This curses
++       scrolled off the bottom  of  the  region  by  the  ri  re-
++       appears,  then scrolling is non-destructive.  System V and
++       XSI Curses expect that ind, ri, indn, and rin  will  simu-
++       late  destructive  scrolling; their documentation cautions
++       you not to define csr unless this is  true.   This  curses
+        implementation is more liberal and will do explicit erases
+        after scrolling if ndstr is defined.
+ 
+        If the terminal has the ability to define a window as part
+-       of memory, which all commands affect, it should  be  given
++       of  memory,  which all commands affect, it should be given
+        as the parameterized string wind.  The four parameters are
+-       the starting and ending lines in memory and  the  starting
++       the  starting  and ending lines in memory and the starting
+        and ending columns in memory, in that order.
+ 
+-       If  the terminal can retain display memory above, then the
+-       da capability should be given; if display  memory  can  be
+-       retained  below,  then db should be given.  These indicate
+-       that deleting a line  or  scrolling  may  bring  non-blank
+-       lines  up  from  below  or that scrolling back with ri may
++       If the terminal can retain display memory above, then  the
++       da  capability  should  be given; if display memory can be
++       retained below, then db should be given.   These  indicate
++       that  deleting  a  line  or  scrolling may bring non-blank
++       lines up from below or that scrolling  back  with  ri  may
+        bring down non-blank lines.
+ 
+ 
+ 
    Insert/Delete Character
    +-       There are two basic kinds of  intelligent  terminals  with
+-       respect  to insert/delete character which can be described
+-       using terminfo.  The most common  insert/delete  character
+-       operations  affect only the characters on the current line
+-       and shift characters off the  end  of  the  line  rigidly.
+-       Other  terminals,  such  as the Concept 100 and the Perkin
+-       Elmer Owl, make a distinction between  typed  and  untyped
+-       blanks  on  the  screen, shifting upon an insert or delete
+-       only to an untyped blank on the  screen  which  is  either
++       There  are  two  basic kinds of intelligent terminals with
++       respect to insert/delete character which can be  described
++       using  terminfo.   The most common insert/delete character
++       operations affect only the characters on the current  line
++       and  shift  characters  off  the  end of the line rigidly.
++       Other terminals, such as the Concept 100  and  the  Perkin
++       Elmer  Owl,  make  a distinction between typed and untyped
++       blanks on the screen, shifting upon an  insert  or  delete
++       only  to  an  untyped  blank on the screen which is either
+        eliminated, or expanded to two untyped blanks.
+ 
+-       You  can determine the kind of terminal you have by clear-
+-       ing the screen and then typing text  separated  by  cursor
+-       motions.   Type  "abc    def"  using  local cursor motions
+-       (not spaces) between the "abc" and the "def".  Then  posi-
+-       tion  the  cursor before the "abc" and put the terminal in
+-       insert mode.  If typing characters causes the rest of  the
+-       line  to shift rigidly and characters to fall off the end,
++       You can determine the kind of terminal you have by  clear-
++       ing  the  screen  and then typing text separated by cursor
++       motions.  Type "abc    def"  using  local  cursor  motions
++       (not  spaces) between the "abc" and the "def".  Then posi-
++       tion the cursor before the "abc" and put the  terminal  in
++       insert  mode.  If typing characters causes the rest of the
++       line to shift rigidly and characters to fall off the  end,
+        then your terminal does not distinguish between blanks and
+-       untyped  positions.  If the "abc" shifts over to the "def"
+-       which then move together around the  end  of  the  current
+-       line  and onto the next as you insert, you have the second
++       untyped positions.  If the "abc" shifts over to the  "def"
++       which  then  move  together  around the end of the current
++       line and onto the next as you insert, you have the  second
+        type of terminal, and should give the capability in, which
+        stands for "insert null".
+ 
+-       While  these  are  two  logically separate attributes (one
+-       line versus multi-line insert mode, and special  treatment
+-       of  untyped spaces) we have seen no terminals whose insert
++       While these are two  logically  separate  attributes  (one
++       line  versus multi-line insert mode, and special treatment
++       of untyped spaces) we have seen no terminals whose  insert
+        mode cannot be described with the single attribute.
+ 
+-       Terminfo can describe both terminals which have an  insert
++       Terminfo  can describe both terminals which have an insert
+        mode, and terminals which send a simple sequence to open a
+-       blank position on the current  line.   Give  as  smir  the
+-       sequence  to  get  into  insert  mode.   Give  as rmir the
+-       sequence to leave insert  mode.   Now  give  as  ich1  any
++       blank  position  on  the  current  line.  Give as smir the
++       sequence to get  into  insert  mode.   Give  as  rmir  the
++       sequence  to  leave  insert  mode.   Now  give as ich1 any
+        sequence needed to be sent just before sending the charac-
+-       ter to be inserted.  Most terminals  with  a  true  insert
+-       mode  will  not give ich1; terminals which send a sequence
++       ter  to  be  inserted.   Most terminals with a true insert
++       mode will not give ich1; terminals which send  a  sequence
+        to open a screen position should give it here.
+ 
+-       If your terminal has both, insert mode is usually  prefer-
+-       able  to  ich1.   Technically,  you  should  not give both
+-       unless the terminal actually requires both to be  used  in
+-       combination.   Accordingly,  some  non-curses applications
+-       get confused if both are present; the symptom  is  doubled
++       If  your terminal has both, insert mode is usually prefer-
++       able to ich1.   Technically,  you  should  not  give  both
++       unless  the  terminal actually requires both to be used in
++       combination.  Accordingly,  some  non-curses  applications
++       get  confused  if both are present; the symptom is doubled
+        characters in an update using insert.  This requirement is
+        now rare; most ich sequences do not require previous smir,
+        and most smir insert modes do not require ich1 before each
+-       character.  Therefore, the  new  curses  actually  assumes
+-       this  is the case and uses either rmir/smir or ich/ich1 as
++       character.   Therefore,  the  new  curses actually assumes
++       this is the case and uses either rmir/smir or ich/ich1  as
+        appropriate (but not both).  If you have to write an entry
+-       to  be  used under new curses for a terminal old enough to
++       to be used under new curses for a terminal old  enough  to
+        need both, include the rmir/smir sequences in ich1.
+ 
+        If post insert padding is needed, give this as a number of
+-       milliseconds  in ip (a string option).  Any other sequence
+-       which may need to be sent after  an  insert  of  a  single
++       milliseconds in ip (a string option).  Any other  sequence
++       which  may  need  to  be  sent after an insert of a single
+        character may also be given in ip.  If your terminal needs
+        both to be placed into an "insert mode" and a special code
+-       to  precede  each  inserted character, then both smir/rmir
+-       and ich1 can be given, and both will  be  used.   The  ich
++       to precede each inserted character,  then  both  smir/rmir
++       and  ich1  can  be  given, and both will be used.  The ich
+        capability, with one parameter, n, will repeat the effects
+        of ich1 n times.
+ 
+@@ -1637,62 +1644,62 @@
+        in insert mode, give this as a number of milliseconds pad-
+        ding in rmp.
+ 
+-       It is occasionally  necessary  to  move  around  while  in
+-       insert  mode  to delete characters on the same line (e.g.,
+-       if there is a tab after the insertion position).  If  your
+-       terminal  allows  motion while in insert mode you can give
+-       the capability mir to speed up  inserting  in  this  case.
+-       Omitting  mir  will  affect  only  speed.   Some terminals
++       It  is  occasionally  necessary  to  move  around while in
++       insert mode to delete characters on the same  line  (e.g.,
++       if  there is a tab after the insertion position).  If your
++       terminal allows motion while in insert mode you  can  give
++       the  capability  mir  to  speed up inserting in this case.
++       Omitting mir  will  affect  only  speed.   Some  terminals
+        (notably Datamedia's) must not have mir because of the way
+        their insert mode works.
+ 
+-       Finally,  you  can specify dch1 to delete a single charac-
+-       ter, dch with one parameter, n, to  delete  n  characters,
+-       and  delete mode by giving smdc and rmdc to enter and exit
+-       delete mode (any mode the terminal needs to be  placed  in
++       Finally, you can specify dch1 to delete a  single  charac-
++       ter,  dch  with  one parameter, n, to delete n characters,
++       and delete mode by giving smdc and rmdc to enter and  exit
++       delete  mode  (any mode the terminal needs to be placed in
+        for dch1 to work).
+ 
+-       A  command to erase n characters (equivalent to outputting
+-       n blanks without moving the cursor) can be  given  as  ech
++       A command to erase n characters (equivalent to  outputting
++       n  blanks  without  moving the cursor) can be given as ech
+        with one parameter.
+ 
+ 
+ 
    Highlighting, Underlining, and Visible Bells
    +        If  your  terminal  has  one  or  more  kinds  of  display
+-       attributes, these can be represented in a number  of  dif-
++       attributes,  these  can be represented in a number of dif-
+        ferent ways.  You should choose one display form as stand-
+        out mode, representing a good, high contrast, easy-on-the-
+-       eyes,  format  for  highlighting  error messages and other
+-       attention getters.  (If you have a choice,  reverse  video
+-       plus  half-bright  is  good, or reverse video alone.)  The
+-       sequences to enter and exit standout  mode  are  given  as
+-       smso  and  rmso, respectively.  If the code to change into
+-       or out of standout mode leaves one or even two blank  spa-
+-       ces  on  the  screen,  as the TVI 912 and Teleray 1061 do,
++       eyes, format for highlighting  error  messages  and  other
++       attention  getters.   (If you have a choice, reverse video
++       plus half-bright is good, or reverse  video  alone.)   The
++       sequences  to  enter  and  exit standout mode are given as
++       smso and rmso, respectively.  If the code to  change  into
++       or  out of standout mode leaves one or even two blank spa-
++       ces on the screen, as the TVI 912  and  Teleray  1061  do,
+        then xmc should be given to tell how many spaces are left.
+ 
+-       Codes to begin underlining  and  end  underlining  can  be
+-       given  as smul and rmul respectively.  If the terminal has
+-       a code to underline the current  character  and  move  the
++       Codes  to  begin  underlining  and  end underlining can be
++       given as smul and rmul respectively.  If the terminal  has
++       a  code  to  underline  the current character and move the
+        cursor one space to the right, such as the Microterm Mime,
+        this can be given as uc.
+ 
+-       Other capabilities to  enter  various  highlighting  modes
+-       include  blink  (blinking) bold (bold or extra bright) dim
+-       (dim or half-bright) invis (blanking  or  invisible  text)
+-       prot  (protected)  rev  (reverse video) sgr0 (turn off all
+-       attribute modes)  smacs  (enter  alternate  character  set
+-       mode)  and  rmacs  (exit  alternate  character  set mode).
+-       Turning on any of these modes singly may or may  not  turn
++       Other  capabilities  to  enter  various highlighting modes
++       include blink (blinking) bold (bold or extra  bright)  dim
++       (dim  or  half-bright)  invis (blanking or invisible text)
++       prot (protected) rev (reverse video) sgr0  (turn  off  all
++       attribute  modes)  smacs  (enter  alternate  character set
++       mode) and  rmacs  (exit  alternate  character  set  mode).
++       Turning  on  any of these modes singly may or may not turn
+        off other modes.
+ 
+-       If  there  is  a sequence to set arbitrary combinations of
+-       modes, this should be given as sgr (set attributes),  tak-
+-       ing  9 parameters.  Each parameter is either 0 or nonzero,
++       If there is a sequence to set  arbitrary  combinations  of
++       modes,  this should be given as sgr (set attributes), tak-
++       ing 9 parameters.  Each parameter is either 0 or  nonzero,
+        as the corresponding attribute is on or off.  The 9 param-
+-       eters  are, in order: standout, underline, reverse, blink,
+-       dim, bold, blank, protect, alternate character  set.   Not
+-       all  modes  need be supported by sgr, only those for which
++       eters are, in order: standout, underline, reverse,  blink,
++       dim,  bold,  blank, protect, alternate character set.  Not
++       all modes need be supported by sgr, only those  for  which
+        corresponding separate attribute commands exist.
+ 
+        For example, the DEC vt220 supports most of the modes:
+@@ -1710,22 +1717,22 @@
+         p8                   protect          not used
+         p9                   altcharset       ^O (off) ^N (on)
+ 
+-       We begin each escape sequence by turning off any  existing
+-       modes,  since  there  is no quick way to determine whether
++       We  begin each escape sequence by turning off any existing
++       modes, since there is no quick way  to  determine  whether
+        they are active.  Standout is set up to be the combination
+-       of  reverse  and  bold.   The vt220 terminal has a protect
+-       mode, though it is not commonly used  in  sgr  because  it
+-       protects  characters  on  the  screen from the host's era-
+-       sures.  The altcharset mode also is different in  that  it
+-       is  either ^O or ^N, depending on whether it is off or on.
+-       If all modes are turned  on,  the  resulting  sequence  is
++       of reverse and bold.  The vt220  terminal  has  a  protect
++       mode,  though  it  is  not commonly used in sgr because it
++       protects characters on the screen  from  the  host's  era-
++       sures.   The  altcharset mode also is different in that it
++       is either ^O or ^N, depending on whether it is off or  on.
++       If  all  modes  are  turned  on, the resulting sequence is
+        \E[0;1;4;5;7;8m^N.
+ 
+-       Some  sequences  are common to different modes.  For exam-
+-       ple, ;7 is output when either p1 or p3 is true,  that  is,
++       Some sequences are common to different modes.   For  exam-
++       ple,  ;7  is output when either p1 or p3 is true, that is,
+        if either standout or reverse modes are turned on.
+ 
+-       Writing  out  the above sequences, along with their depen-
++       Writing out the above sequences, along with  their  depen-
+        dencies yields
+ 
+       sequence             when to output      terminfo translation
+@@ -1744,62 +1751,62 @@
+            sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p4%t;5%;
+                %?%p1%p3%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 
+-       Remember that if you specify sgr, you  must  also  specify
+-       sgr0.   Also, some implementations rely on sgr being given
+-       if sgr0 is, Not all terminfo entries necessarily  have  an
+-       sgr  string,  however.   Many terminfo entries are derived
+-       from termcap entries which have no sgr string.   The  only
+-       drawback  to  adding  an  sgr  string is that termcap also
+-       assumes that sgr0 does not exit  alternate  character  set
++       Remember  that  if  you specify sgr, you must also specify
++       sgr0.  Also, some implementations rely on sgr being  given
++       if  sgr0  is, Not all terminfo entries necessarily have an
++       sgr string, however.  Many terminfo  entries  are  derived
++       from  termcap  entries which have no sgr string.  The only
++       drawback to adding an sgr  string  is  that  termcap  also
++       assumes  that  sgr0  does not exit alternate character set
+        mode.
+ 
+-       Terminals  with  the  "magic  cookie" glitch (xmc) deposit
++       Terminals with the "magic  cookie"  glitch  (xmc)  deposit
+        special   "cookies"   when   they   receive   mode-setting
+-       sequences,  which affect the display algorithm rather than
+-       having extra bits for  each  character.   Some  terminals,
+-       such  as  the  HP  2621, automatically leave standout mode
+-       when they move to a new line or the cursor  is  addressed.
+-       Programs  using  standout  mode  should exit standout mode
+-       before moving the cursor or sending a newline, unless  the
+-       msgr  capability,  asserting  that  it  is safe to move in
++       sequences, which affect the display algorithm rather  than
++       having  extra  bits  for  each character.  Some terminals,
++       such as the HP 2621,  automatically  leave  standout  mode
++       when  they  move to a new line or the cursor is addressed.
++       Programs using standout mode  should  exit  standout  mode
++       before  moving the cursor or sending a newline, unless the
++       msgr capability, asserting that it  is  safe  to  move  in
+        standout mode, is present.
+ 
+-       If the terminal has a way of flashing the screen to  indi-
+-       cate  an  error quietly (a bell replacement) then this can
++       If  the terminal has a way of flashing the screen to indi-
++       cate an error quietly (a bell replacement) then  this  can
+        be given as flash; it must not move the cursor.
+ 
+-       If the cursor needs to be made more  visible  than  normal
++       If  the  cursor  needs to be made more visible than normal
+        when it is not on the bottom line (to make, for example, a
+-       non-blinking underline into an easier  to  find  block  or
++       non-blinking  underline  into  an  easier to find block or
+        blinking underline) give this sequence as cvvis.  If there
+-       is a way to make the  cursor  completely  invisible,  give
++       is  a  way  to  make the cursor completely invisible, give
+        that as civis.  The capability cnorm should be given which
+        undoes the effects of both of these modes.
+ 
+        If your terminal correctly generates underlined characters
+-       (with  no  special  codes  needed) even though it does not
+-       overstrike, then you should give the capability ul.  If  a
+-       character  overstriking  another leaves both characters on
++       (with no special codes needed) even  though  it  does  not
++       overstrike,  then you should give the capability ul.  If a
++       character overstriking another leaves both  characters  on
+        the screen, specify the capability os.  If overstrikes are
+-       erasable  with  a  blank, then this should be indicated by
++       erasable with a blank, then this should  be  indicated  by
+        giving eo.
+ 
+ 
+ 
    Keypad and Function Keys
    +        If the terminal has a keypad that transmits codes when the
+-       keys  are  pressed,  this  information can be given.  Note
++       keys are pressed, this information  can  be  given.   Note
+        that it is not possible to handle terminals where the key-
+        pad only works in local (this applies, for example, to the
+-       unshifted HP 2621 keys).  If the  keypad  can  be  set  to
+-       transmit  or  not  transmit,  give these codes as smkx and
++       unshifted  HP  2621  keys).   If  the keypad can be set to
++       transmit or not transmit, give these  codes  as  smkx  and
+        rmkx.  Otherwise the keypad is assumed to always transmit.
+ 
+-       The codes sent by the left arrow, right arrow,  up  arrow,
+-       down  arrow,  and  home keys can be given as kcub1, kcuf1,
+-       kcuu1, kcud1, and khome respectively.  If there are  func-
+-       tion  keys  such  as f0, f1, ..., f10, the codes they send
+-       can be given as kf0, kf1, ..., kf10.  If these  keys  have
+-       labels  other  than the default f0 through f10, the labels
++       The  codes  sent by the left arrow, right arrow, up arrow,
++       down arrow, and home keys can be given  as  kcub1,  kcuf1,
++       kcuu1,  kcud1, and khome respectively.  If there are func-
++       tion keys such as f0, f1, ..., f10, the  codes  they  send
++       can  be  given as kf0, kf1, ..., kf10.  If these keys have
++       labels other than the default f0 through f10,  the  labels
+        can be given as lf0, lf1, ..., lf10.
+ 
+        The codes transmitted by certain other special keys can be
+@@ -1839,60 +1846,60 @@
+ 
+        o   khts (set a tab stop in this column).
+ 
+-       In  addition,  if  the  keypad  has a 3 by 3 array of keys
+-       including the four arrow keys, the other five keys can  be
++       In addition, if the keypad has a 3  by  3  array  of  keys
++       including  the four arrow keys, the other five keys can be
+        given as ka1, ka3, kb2, kc1, and kc3.  These keys are use-
+-       ful when the effects of a  3  by  3  directional  pad  are
++       ful  when  the  effects  of  a  3 by 3 directional pad are
+        needed.
+ 
+-       Strings  to  program  function keys can be given as pfkey,
+-       pfloc, and pfx.  A string to program screen labels  should
+-       be  specified  as  pln.   Each  of these strings takes two
+-       parameters: the function key number to program (from 0  to
+-       10)  and the string to program it with.  Function key num-
+-       bers out of this range may program  undefined  keys  in  a
+-       terminal  dependent  manner.   The  difference between the
+-       capabilities is that pfkey causes pressing the  given  key
+-       to  be the same as the user typing the given string; pfloc
++       Strings to program function keys can be  given  as  pfkey,
++       pfloc,  and pfx.  A string to program screen labels should
++       be specified as pln.  Each  of  these  strings  takes  two
++       parameters:  the function key number to program (from 0 to
++       10) and the string to program it with.  Function key  num-
++       bers  out  of  this  range may program undefined keys in a
++       terminal dependent manner.   The  difference  between  the
++       capabilities  is  that pfkey causes pressing the given key
++       to be the same as the user typing the given string;  pfloc
+        causes the string to be executed by the terminal in local;
+-       and  pfx  causes  the string to be transmitted to the com-
++       and pfx causes the string to be transmitted  to  the  com-
+        puter.
+ 
+        The capabilities nlab, lw and lh define the number of pro-
+-       grammable  screen  labels  and their width and height.  If
+-       there are commands to turn the labels  on  and  off,  give
+-       them  in smln and rmln.  smln is normally output after one
++       grammable screen labels and their width  and  height.   If
++       there  are  commands  to  turn the labels on and off, give
++       them in smln and rmln.  smln is normally output after  one
+        or more pln sequences to make sure that the change becomes
+        visible.
+ 
+ 
+ 
    Tabs and Initialization
    +-       If  the terminal has hardware tabs, the command to advance
+-       to the next tab stop can be given as ht  (usually  control
++       If the terminal has hardware tabs, the command to  advance
++       to  the  next tab stop can be given as ht (usually control
+        I).  A "back-tab" command which moves leftward to the pre-
+-       ceding tab stop can be given as cbt.   By  convention,  if
+-       the  teletype  modes indicate that tabs are being expanded
+-       by the computer rather than being sent  to  the  terminal,
+-       programs  should  not  use  ht  or  cbt  even  if they are
+-       present, since the user may not have the tab  stops  prop-
+-       erly  set.   If  the  terminal has hardware tabs which are
+-       initially set every n spaces when the terminal is  powered
+-       up,  the numeric parameter it is given, showing the number
+-       of spaces the tabs are set to.  This is normally  used  by
+-       the  tset command to determine whether to set the mode for
+-       hardware tab expansion, and whether to set the tab  stops.
+-       If  the  terminal  has tab stops that can be saved in non-
+-       volatile memory, the terminfo description can assume  that
++       ceding  tab  stop  can be given as cbt.  By convention, if
++       the teletype modes indicate that tabs are  being  expanded
++       by  the  computer  rather than being sent to the terminal,
++       programs should not  use  ht  or  cbt  even  if  they  are
++       present,  since  the user may not have the tab stops prop-
++       erly set.  If the terminal has  hardware  tabs  which  are
++       initially  set every n spaces when the terminal is powered
++       up, the numeric parameter it is given, showing the  number
++       of  spaces  the tabs are set to.  This is normally used by
++       the tset command to determine whether to set the mode  for
++       hardware  tab expansion, and whether to set the tab stops.
++       If the terminal has tab stops that can be  saved  in  non-
++       volatile  memory, the terminfo description can assume that
+        they are properly set.
+ 
+-       Other  capabilities include is1, is2, and is3, initializa-
+-       tion strings for the terminal, iprog, the path name  of  a
+-       program  to be run to initialize the terminal, and if, the
+-       name of a file  containing  long  initialization  strings.
+-       These  strings are expected to set the terminal into modes
+-       consistent with the  rest  of  the  terminfo  description.
++       Other capabilities include is1, is2, and is3,  initializa-
++       tion  strings  for the terminal, iprog, the path name of a
++       program to be run to initialize the terminal, and if,  the
++       name  of  a  file  containing long initialization strings.
++       These strings are expected to set the terminal into  modes
++       consistent  with  the  rest  of  the terminfo description.
+        They are normally sent to the terminal, by the init option
+-       of the tput program, each time the  user  logs  in.   They
++       of  the  tput  program,  each time the user logs in.  They
+        will be printed in the following order:
+ 
+               run the program
+@@ -1912,107 +1919,107 @@
+               and finally
+                      output is3.
+ 
+-       Most  initialization  is  done with is2.  Special terminal
++       Most initialization is done with  is2.   Special  terminal
+        modes can be set up without duplicating strings by putting
+-       the  common  sequences in is2 and special cases in is1 and
++       the common sequences in is2 and special cases in  is1  and
+        is3.
+ 
+        A set of sequences that does a harder reset from a totally
+        unknown state can be given as rs1, rs2, rf and rs3, analo-
+-       gous to is1 ,  is2  ,  if  and  is3  respectively.   These
+-       strings  are  output  by  the reset program, which is used
+-       when the terminal gets into a wedged state.  Commands  are
+-       normally  placed  in rs1, rs2 rs3 and rf only if they pro-
+-       duce annoying effects on the screen and are not  necessary
+-       when  logging  in.   For  example,  the command to set the
+-       vt100 into 80-column mode would normally be part  of  is2,
+-       but  it causes an annoying glitch of the screen and is not
+-       normally needed since the terminal is usually  already  in
++       gous  to  is1  ,  is2  ,  if  and is3 respectively.  These
++       strings are output by the reset  program,  which  is  used
++       when  the terminal gets into a wedged state.  Commands are
++       normally placed in rs1, rs2 rs3 and rf only if  they  pro-
++       duce  annoying effects on the screen and are not necessary
++       when logging in.  For example,  the  command  to  set  the
++       vt100  into  80-column mode would normally be part of is2,
++       but it causes an annoying glitch of the screen and is  not
++       normally  needed  since the terminal is usually already in
+        80 column mode.
+ 
+-       The reset program writes strings including iprog, etc., in
+-       the same order as  the  init  program,  using  rs1,  etc.,
++       The reset program writes strings including iprog, etc., in
++       the  same  order  as  the  init  program, using rs1, etc.,
+        instead of is1, etc.  If any of rs1, rs2, rs3, or rf reset
+-       capability strings are missing, the  reset  program  falls
++       capability  strings  are  missing, the reset program falls
+        back  upon  the  corresponding  initialization  capability
+        string.
+ 
+        If there are commands to set and clear tab stops, they can
+-       be  given  as tbc (clear all tab stops) and hts (set a tab
+-       stop in the current column of every row).  If a more  com-
+-       plex  sequence  is  needed  to  set  the  tabs than can be
+-       described by this, the sequence can be placed  in  is2  or
++       be given as tbc (clear all tab stops) and hts (set  a  tab
++       stop  in the current column of every row).  If a more com-
++       plex sequence is needed  to  set  the  tabs  than  can  be
++       described  by  this,  the sequence can be placed in is2 or
+        if.
+ 
+ 
+ 
    Delays and Padding
    +-       Many  older  and  slower  terminals  do not support either
++       Many older and slower  terminals  do  not  support  either
+        XON/XOFF or DTR handshaking, including hard copy terminals
+-       and  some  very  archaic CRTs (including, for example, DEC
+-       VT100s).  These may require padding characters after  cer-
++       and some very archaic CRTs (including,  for  example,  DEC
++       VT100s).   These may require padding characters after cer-
+        tain cursor motions and screen changes.
+ 
+        If the terminal uses xon/xoff handshaking for flow control
+-       (that is, it automatically emits ^S back to the host  when
++       (that  is, it automatically emits ^S back to the host when
+        its input buffers are close to full), set xon.  This capa-
+-       bility suppresses the emission of padding.  You  can  also
+-       set  it for memory-mapped console devices effectively that
+-       do not have a speed  limit.   Padding  information  should
+-       still  be  included so that routines can make better deci-
++       bility  suppresses  the emission of padding.  You can also
++       set it for memory-mapped console devices effectively  that
++       do  not  have  a  speed limit.  Padding information should
++       still be included so that routines can make  better  deci-
+        sions about relative costs, but actual pad characters will
+        not be transmitted.
+ 
+-       If  pb (padding baud rate) is given, padding is suppressed
+-       at baud rates below the value of pb.  If the entry has  no
+-       padding  baud rate, then whether padding is emitted or not
++       If pb (padding baud rate) is given, padding is  suppressed
++       at  baud rates below the value of pb.  If the entry has no
++       padding baud rate, then whether padding is emitted or  not
+        is completely controlled by xon.
+ 
+-       If the terminal requires other than a null (zero)  charac-
+-       ter  as  a  pad,  then this can be given as pad.  Only the
++       If  the terminal requires other than a null (zero) charac-
++       ter as a pad, then this can be given  as  pad.   Only  the
+        first character of the pad string is used.
+ 
+ 
+ 
    Status Lines
    +-       Some terminals have an extra "status line"  which  is  not
+-       normally  used  by  software  (and thus not counted in the
++       Some  terminals  have  an extra "status line" which is not
++       normally used by software (and thus  not  counted  in  the
+        terminal's lines capability).
+ 
+-       The simplest case  is  a  status  line  which  is  cursor-
+-       addressable  but  not part of the main scrolling region on
+-       the screen; the Heathkit H19 has a  status  line  of  this
+-       kind,  as  would  a 24-line VT100 with a 23-line scrolling
+-       region set up on initialization.  This situation is  indi-
++       The  simplest  case  is  a  status  line  which is cursor-
++       addressable but not part of the main scrolling  region  on
++       the  screen;  the  Heathkit  H19 has a status line of this
++       kind, as would a 24-line VT100 with  a  23-line  scrolling
++       region  set up on initialization.  This situation is indi-
+        cated by the hs capability.
+ 
+        Some terminals with status lines need special sequences to
+-       access the status line.   These  may  be  expressed  as  a
++       access  the  status  line.   These  may  be expressed as a
+        string with single parameter tsl which takes the cursor to
+-       a given zero-origin column on the status line.  The  capa-
++       a  given zero-origin column on the status line.  The capa-
+        bility fsl must return to the main-screen cursor positions
+-       before the last tsl.  You may need  to  embed  the  string
+-       values  of sc (save cursor) and rc (restore cursor) in tsl
++       before  the  last  tsl.   You may need to embed the string
++       values of sc (save cursor) and rc (restore cursor) in  tsl
+        and fsl to accomplish this.
+ 
+-       The status line is normally assumed to be the  same  width
+-       as  the width of the terminal.  If this is untrue, you can
++       The  status  line is normally assumed to be the same width
++       as the width of the terminal.  If this is untrue, you  can
+        specify it with the numeric capability wsl.
+ 
+-       A command to erase or blank the status line may be  speci-
++       A  command to erase or blank the status line may be speci-
+        fied as dsl.
+ 
+-       The   boolean   capability  eslok  specifies  that  escape
++       The  boolean  capability  eslok  specifies   that   escape
+        sequences, tabs, etc., work ordinarily in the status line.
+ 
+-       The ncurses implementation does not yet use any  of  these
+-       capabilities.   They are documented here in case they ever
++       The  ncurses  implementation does not yet use any of these
++       capabilities.  They are documented here in case they  ever
+        become important.
+ 
+ 
+ 
    Line Graphics
    +-       Many terminals have alternate character  sets  useful  for
+-       forms-drawing.   Terminfo  and curses build in support for
+-       the drawing characters supported by the VT100,  with  some
+-       characters  from  the  AT&T  4410v1 added.  This alternate
++       Many  terminals  have  alternate character sets useful for
++       forms-drawing.  Terminfo and curses build in  support  for
++       the  drawing  characters supported by the VT100, with some
++       characters from the AT&T  4410v1  added.   This  alternate
+        character set may be specified by the acsc capability.
+ 
+        Glyph                       ACS           Ascii     VT100
+@@ -2050,58 +2057,58 @@
+        upper right corner          ACS_URCORNER  +         k
+        vertical line               ACS_VLINE     |         x
+ 
+-       The best way to define a new device's graphics set  is  to
+-       add  a  column  to a copy of this table for your terminal,
+-       giving  the  character   which   (when   emitted   between
+-       smacs/rmacs  switches) will be rendered as the correspond-
+-       ing graphic.  Then read off the VT100/your terminal  char-
+-       acter  pairs  right  to left in sequence; these become the
++       The  best  way to define a new device's graphics set is to
++       add a column to a copy of this table  for  your  terminal,
++       giving   the   character   which   (when  emitted  between
++       smacs/rmacs switches) will be rendered as the  correspond-
++       ing  graphic.  Then read off the VT100/your terminal char-
++       acter pairs right to left in sequence;  these  become  the
+        ACSC string.
+ 
+ 
+ 
    Color Handling
    +-       Most color terminals are either "Tektronix-like"  or  "HP-
+-       like".   Tektronix-like terminals have a predefined set of
+-       N colors (where N usually 8), and can  set  character-cell
++       Most  color  terminals are either "Tektronix-like" or "HP-
++       like".  Tektronix-like terminals have a predefined set  of
++       N  colors  (where N usually 8), and can set character-cell
+        foreground and background characters independently, mixing
+-       them into N * N color-pairs.  On  HP-like  terminals,  the
++       them  into  N * N  color-pairs.  On HP-like terminals, the
+        use must set each color pair up separately (foreground and
+-       background are  not  independently  settable).   Up  to  M
+-       color-pairs  may  be  set  up  from  2*M different colors.
++       background  are  not  independently  settable).   Up  to M
++       color-pairs may be  set  up  from  2*M  different  colors.
+        ANSI-compatible terminals are Tektronix-like.
+ 
+        Some basic color capabilities are independent of the color
+        method.  The numeric capabilities colors and pairs specify
+-       the maximum numbers of colors and color-pairs that can  be
+-       displayed  simultaneously.   The op (original pair) string
+-       resets foreground and background colors to  their  default
+-       values  for the terminal.  The oc string resets all colors
+-       or color-pairs to their default values for  the  terminal.
+-       Some  terminals  (including  many  PC  terminal emulators)
+-       erase screen  areas  with  the  current  background  color
+-       rather  than the power-up default background; these should
++       the  maximum numbers of colors and color-pairs that can be
++       displayed simultaneously.  The op (original  pair)  string
++       resets  foreground  and background colors to their default
++       values for the terminal.  The oc string resets all  colors
++       or  color-pairs  to their default values for the terminal.
++       Some terminals  (including  many  PC  terminal  emulators)
++       erase  screen  areas  with  the  current  background color
++       rather than the power-up default background; these  should
+        have the boolean capability bce.
+ 
+-       To change the current foreground or background color on  a
+-       Tektronix-type  terminal,  use setaf (set ANSI foreground)
+-       and setab (set ANSI background) or setf  (set  foreground)
+-       and  setb (set background).  These take one parameter, the
++       To  change the current foreground or background color on a
++       Tektronix-type terminal, use setaf (set  ANSI  foreground)
++       and  setab  (set ANSI background) or setf (set foreground)
++       and setb (set background).  These take one parameter,  the
+        color  number.   The  SVr4  documentation  describes  only
+-       setaf/setab;  the  XPG4  draft  says that "If the terminal
++       setaf/setab; the XPG4 draft says  that  "If  the  terminal
+        supports ANSI escape sequences to set background and fore-
+-       ground,  they  should be coded as setaf and setab, respec-
+-       tively.  If the terminal supports other  escape  sequences
+-       to  set background and foreground, they should be coded as
+-       setf and setb, respectively.  The vidputs()  function  and
+-       the  refresh  functions  use  setaf  and setab if they are
++       ground, they should be coded as setaf and  setab,  respec-
++       tively.   If  the terminal supports other escape sequences
++       to set background and foreground, they should be coded  as
++       setf and setb, respectively.  The vidputs function and the
++       refresh  functions  use  setaf  and  setab  if  they   are
+        defined."
+ 
+-       The setaf/setab and setf/setb capabilities take  a  single
++       The  setaf/setab  and setf/setb capabilities take a single
+        numeric argument each.  Argument values 0-7 of setaf/setab
+-       are portably defined as follows (the middle column is  the
++       are  portably defined as follows (the middle column is the
+        symbolic #define available in the header for the curses or
+-       ncurses libraries).  The terminal hardware is free to  map
+-       these  as  it  likes,  but  the RGB values indicate normal
++       ncurses  libraries).  The terminal hardware is free to map
++       these as it likes, but  the  RGB  values  indicate  normal
+        locations in color space.
+ 
+              Color       #define       Value       RGB
+@@ -2114,7 +2121,7 @@
+              cyan      COLOR_CYAN        6     0,max,max
+              white     COLOR_WHITE       7     max,max,max
+ 
+-       The argument values of setf/setb  historically  correspond
++       The  argument  values of setf/setb historically correspond
+        to a different mapping, i.e.,
+ 
+              Color       #define       Value       RGB
+@@ -2128,32 +2135,32 @@
+              white     COLOR_WHITE       7     max,max,max
+ 
+        It is important to not confuse the two sets of color capa-
+-       bilities; otherwise red/blue will be interchanged  on  the
++       bilities;  otherwise  red/blue will be interchanged on the
+        display.
+ 
+-       On  an  HP-like terminal, use scp with a color-pair number
++       On an HP-like terminal, use scp with a  color-pair  number
+        parameter to set which color pair is current.
+ 
+-       On a Tektronix-like terminal, the capability  ccc  may  be
+-       present  to  indicate that colors can be modified.  If so,
++       On  a  Tektronix-like  terminal, the capability ccc may be
++       present to indicate that colors can be modified.   If  so,
+        the initc capability will take a color number (0 to colors
+-       -  1)and  three  more parameters which describe the color.
++       - 1)and three more parameters which  describe  the  color.
+        These three parameters default to being interpreted as RGB
+-       (Red,  Green, Blue) values.  If the boolean capability hls
++       (Red, Green, Blue) values.  If the boolean capability  hls
+        is present, they are instead as HLS (Hue, Lightness, Satu-
+        ration) indices.  The ranges are terminal-dependent.
+ 
+-       On  an  HP-like  terminal, initp may give a capability for
+-       changing a color-pair value.  It will take  seven  parame-
+-       ters;  a  color-pair  number (0 to max_pairs - 1), and two
+-       triples describing first background  and  then  foreground
+-       colors.   These  parameters  must be (Red, Green, Blue) or
++       On an HP-like terminal, initp may give  a  capability  for
++       changing  a  color-pair value.  It will take seven parame-
++       ters; a color-pair number (0 to max_pairs -  1),  and  two
++       triples  describing  first  background and then foreground
++       colors.  These parameters must be (Red,  Green,  Blue)  or
+        (Hue, Lightness, Saturation) depending on hls.
+ 
+-       On some color terminals, colors collide  with  highlights.
++       On  some  color terminals, colors collide with highlights.
+        You can register these collisions with the ncv capability.
+-       This is a bit-mask of attributes not to be used when  col-
+-       ors  are  enabled.  The correspondence with the attributes
++       This  is a bit-mask of attributes not to be used when col-
++       ors are enabled.  The correspondence with  the  attributes
+        understood by curses is as follows:
+ 
+           Attribute              Bit   Decimal      Set by
+@@ -2174,240 +2181,240 @@
+           A_VERTICAL             14    16384        sgr1
+           A_ITALIC               15    32768        sitm
+ 
+-       For example,  on  many  IBM  PC  consoles,  the  underline
+-       attribute  collides  with the foreground color blue and is
+-       not available in color mode.  These  should  have  an  ncv
++       For  example,  on  many  IBM  PC  consoles,  the underline
++       attribute collides with the foreground color blue  and  is
++       not  available  in  color  mode.  These should have an ncv
+        capability of 2.
+ 
+-       SVr4  curses  does nothing with ncv, ncurses recognizes it
++       SVr4 curses does nothing with ncv, ncurses  recognizes  it
+        and optimizes the output in favor of colors.
+ 
+ 
+ 
    Miscellaneous
    +-       If the terminal requires other than a null (zero)  charac-
+-       ter  as  a  pad,  then this can be given as pad.  Only the
+-       first character of the pad string is used.  If the  termi-
++       If  the terminal requires other than a null (zero) charac-
++       ter as a pad, then this can be given  as  pad.   Only  the
++       first  character of the pad string is used.  If the termi-
+        nal does not have a pad character, specify npc.  Note that
+-       ncurses implements  the  termcap-compatible  PC  variable;
+-       though  the  application  may  set this value to something
+-       other than a null, ncurses will test  npc  first  and  use
++       ncurses  implements  the  termcap-compatible  PC variable;
++       though the application may set  this  value  to  something
++       other  than  a  null,  ncurses will test npc first and use
+        napms if the terminal has no pad character.
+ 
+-       If  the terminal can move up or down half a line, this can
+-       be indicated with hu  (half-line  up)  and  hd  (half-line
++       If the terminal can move up or down half a line, this  can
++       be  indicated  with  hu  (half-line  up) and hd (half-line
+        down).  This is primarily useful for superscripts and sub-
+-       scripts on hard-copy terminals.  If a  hard-copy  terminal
+-       can  eject  to  the next page (form feed), give this as ff
++       scripts  on  hard-copy terminals.  If a hard-copy terminal
++       can eject to the next page (form feed), give  this  as  ff
+        (usually control L).
+ 
+-       If there is a command to repeat a given character a  given
+-       number  of times (to save time transmitting a large number
+-       of identical characters) this can be  indicated  with  the
+-       parameterized  string  rep.   The  first  parameter is the
+-       character to be repeated and the second is the  number  of
+-       times  to repeat it.  Thus, tparm(repeat_char, 'x', 10) is
++       If  there is a command to repeat a given character a given
++       number of times (to save time transmitting a large  number
++       of  identical  characters)  this can be indicated with the
++       parameterized string rep.   The  first  parameter  is  the
++       character  to  be repeated and the second is the number of
++       times to repeat it.  Thus, tparm(repeat_char, 'x', 10)  is
+        the same as "xxxxxxxxxx".
+ 
+-       If the terminal has a settable command character, such  as
+-       the  TEKTRONIX  4025, this can be indicated with cmdch.  A
++       If  the terminal has a settable command character, such as
++       the TEKTRONIX 4025, this can be indicated with  cmdch.   A
+        prototype command character is chosen which is used in all
+-       capabilities.   This character is given in the cmdch capa-
+-       bility to identify it.  The following convention  is  sup-
+-       ported  on  some  UNIX  systems:  The environment is to be
+-       searched for a CC variable, and if found, all  occurrences
++       capabilities.  This character is given in the cmdch  capa-
++       bility  to  identify it.  The following convention is sup-
++       ported on some UNIX systems:  The  environment  is  to  be
++       searched  for a CC variable, and if found, all occurrences
+        of the prototype character are replaced with the character
+        in the environment variable.
+ 
+-       Terminal descriptions that do  not  represent  a  specific
++       Terminal  descriptions  that  do  not represent a specific
+        kind of known terminal, such as switch, dialup, patch, and
+-       network, should include the  gn  (generic)  capability  so
+-       that  programs  can  complain that they do not know how to
+-       talk to the terminal.  (This capability does not apply  to
+-       virtual   terminal   descriptions  for  which  the  escape
++       network,  should  include  the  gn (generic) capability so
++       that programs can complain that they do not  know  how  to
++       talk  to the terminal.  (This capability does not apply to
++       virtual  terminal  descriptions  for  which   the   escape
+        sequences are known.)
+ 
+-       If the terminal has a "meta key" which  acts  as  a  shift
+-       key,  setting  the  8th  bit of any character transmitted,
+-       this fact can be indicated with km.   Otherwise,  software
++       If  the  terminal  has  a "meta key" which acts as a shift
++       key, setting the 8th bit  of  any  character  transmitted,
++       this  fact  can be indicated with km.  Otherwise, software
+        will assume that the 8th bit is parity and it will usually
+-       be cleared.  If strings exist to turn this "meta mode"  on
++       be  cleared.  If strings exist to turn this "meta mode" on
+        and off, they can be given as smm and rmm.
+ 
+-       If  the terminal has more lines of memory than will fit on
+-       the screen at once, the number of lines of memory  can  be
+-       indicated  with  lm.   A  value of lm#0 indicates that the
++       If the terminal has more lines of memory than will fit  on
++       the  screen  at once, the number of lines of memory can be
++       indicated with lm.  A value of  lm#0  indicates  that  the
+        number of lines is not fixed, but that there is still more
+        memory than fits on the screen.
+ 
+        If the terminal is one of those supported by the UNIX vir-
+-       tual terminal protocol, the terminal number can  be  given
++       tual  terminal  protocol, the terminal number can be given
+        as vt.
+ 
+        Media copy strings which control an auxiliary printer con-
+        nected to the terminal can be given as mc0: print the con-
+-       tents  of  the screen, mc4: turn off the printer, and mc5:
+-       turn on the printer.  When the printer  is  on,  all  text
+-       sent  to  the terminal will be sent to the printer.  It is
++       tents of the screen, mc4: turn off the printer,  and  mc5:
++       turn  on  the  printer.   When the printer is on, all text
++       sent to the terminal will be sent to the printer.   It  is
+        undefined whether the text is also displayed on the termi-
+        nal screen when the printer is on.  A variation mc5p takes
+        one parameter, and leaves the printer on for as many char-
+-       acters  as  the  value  of  the  parameter, then turns the
+-       printer off.  The parameter should not  exceed  255.   All
++       acters as the value  of  the  parameter,  then  turns  the
++       printer  off.   The  parameter should not exceed 255.  All
+        text,  including  mc4,  is  transparently  passed  to  the
+        printer while an mc5p is in effect.
+ 
+ 
+ 
    Glitches and Braindamage
    +-       Hazeltine terminals, which do not allow "~" characters  to
++       Hazeltine  terminals, which do not allow "~" characters to
+        be displayed should indicate hz.
+ 
+        Terminals which ignore a line-feed immediately after an am
+        wrap, such as the Concept and vt100, should indicate xenl.
+ 
+-       If el is required to  get  rid  of  standout  (instead  of
+-       merely  writing  normal  text on top of it), xhp should be
++       If  el  is  required  to  get  rid of standout (instead of
++       merely writing normal text on top of it),  xhp  should  be
+        given.
+ 
+-       Teleray terminals, where tabs turn  all  characters  moved
+-       over  to  blanks,  should  indicate xt (destructive tabs).
+-       Note:   the    variable    indicating    this    is    now
+-       "dest_tabs_magic_smso";  in  older  versions,  it was tel-
++       Teleray  terminals,  where  tabs turn all characters moved
++       over to blanks, should  indicate  xt  (destructive  tabs).
++       Note:    the    variable    indicating    this    is   now
++       "dest_tabs_magic_smso"; in older  versions,  it  was  tel-
+        eray_glitch.  This glitch is also taken to mean that it is
+-       not  possible  to  position  the cursor on top of a "magic
+-       cookie", that to erase standout mode it is instead  neces-
++       not possible to position the cursor on  top  of  a  "magic
++       cookie",  that to erase standout mode it is instead neces-
+        sary to use delete and insert line.  The ncurses implemen-
+        tation ignores this glitch.
+ 
+-       The Beehive Superbee, which is unable to correctly  trans-
+-       mit  the escape or control C characters, has xsb, indicat-
+-       ing that the f1 key is used for escape and f2 for  control
+-       C.   (Only  certain Superbees have this problem, depending
+-       on the ROM.)  Note that in older terminfo  versions,  this
+-       capability   was   called   "beehive_glitch";  it  is  now
++       The  Beehive Superbee, which is unable to correctly trans-
++       mit the escape or control C characters, has xsb,  indicat-
++       ing  that the f1 key is used for escape and f2 for control
++       C.  (Only certain Superbees have this  problem,  depending
++       on  the  ROM.)  Note that in older terminfo versions, this
++       capability  was  called  "beehive_glitch";   it   is   now
+        "no_esc_ctl_c".
+ 
+-       Other specific  terminal  problems  may  be  corrected  by
++       Other  specific  terminal  problems  may  be  corrected by
+        adding more capabilities of the form xx.
+ 
+ 
+ 
    Similar Terminals
    +        If there are two very similar terminals, one (the variant)
+-       can be defined as being just like  the  other  (the  base)
+-       with  certain  exceptions.  In the definition of the vari-
+-       ant, the string capability use can be given with the  name
+-       of  the  base terminal.  The capabilities given before use
+-       override those in the base type named by  use.   If  there
+-       are  multiple use capabilities, they are merged in reverse
+-       order.  That is, the rightmost use reference is  processed
+-       first,  then the one to its left, and so forth.  Capabili-
+-       ties given explicitly in the entry override those  brought
++       can  be  defined  as  being just like the other (the base)
++       with certain exceptions.  In the definition of  the  vari-
++       ant,  the string capability use can be given with the name
++       of the base terminal.  The capabilities given  before  use
++       override  those  in  the base type named by use.  If there
++       are multiple use capabilities, they are merged in  reverse
++       order.   That is, the rightmost use reference is processed
++       first, then the one to its left, and so forth.   Capabili-
++       ties  given explicitly in the entry override those brought
+        in by use references.
+ 
+        A capability can be canceled by placing xx@ to the left of
+-       the use reference that imports it, where xx is  the  capa-
++       the  use  reference that imports it, where xx is the capa-
+        bility.  For example, the entry
+ 
+               2621-nl, smkx@, rmkx@, use=2621,
+ 
+-       defines  a  2621-nl  that  does  not have the smkx or rmkx
+-       capabilities, and hence does not turn on the function  key
+-       labels  when in visual mode.  This is useful for different
++       defines a 2621-nl that does not  have  the  smkx  or  rmkx
++       capabilities,  and hence does not turn on the function key
++       labels when in visual mode.  This is useful for  different
+        modes for a terminal, or for different user preferences.
+ 
+ 
+ 
    Pitfalls of Long Entries
    +-       Long terminfo entries are unlikely to  be  a  problem;  to
+-       date,  no  entry  has even approached terminfo's 4096-byte
++       Long  terminfo  entries  are  unlikely to be a problem; to
++       date, no entry has even  approached  terminfo's  4096-byte
+        string-table maximum.  Unfortunately, the termcap transla-
+        tions are much more strictly limited (to 1023 bytes), thus
+-       termcap translations of long terminfo  entries  can  cause
++       termcap  translations  of  long terminfo entries can cause
+        problems.
+ 
+-       The  man  pages for 4.3BSD and older versions of tgetent()
+-       instruct the user to allocate a 1024-byte buffer  for  the
+-       termcap  entry.   The  entry  gets  null-terminated by the
++       The man pages for 4.3BSD and  older  versions  of  tgetent
++       instruct  the  user to allocate a 1024-byte buffer for the
++       termcap entry.  The  entry  gets  null-terminated  by  the
+        termcap library, so that makes the maximum safe length for
+-       a  termcap entry 1k-1 (1023) bytes.  Depending on what the
+-       application and the termcap library being used  does,  and
+-       where in the termcap file the terminal type that tgetent()
++       a termcap entry 1k-1 (1023) bytes.  Depending on what  the
++       application  and  the termcap library being used does, and
++       where in the termcap file the terminal type  that  tgetent
+        is searching for is, several bad things can happen.
+ 
+-       Some termcap libraries print a warning message or exit  if
+-       they  find  an entry that's longer than 1023 bytes; others
+-       do not; others truncate the entries to 1023  bytes.   Some
++       Some  termcap libraries print a warning message or exit if
++       they find an entry that's longer than 1023  bytes;  others
++       do  not;  others truncate the entries to 1023 bytes.  Some
+        application programs allocate more than the recommended 1K
+        for the termcap entry; others do not.
+ 
+        Each termcap entry has two important sizes associated with
+        it: before "tc" expansion, and after "tc" expansion.  "tc"
+-       is the capability that tacks on another termcap  entry  to
+-       the  end  of  the current one, to add on its capabilities.
+-       If a termcap entry does not use the "tc" capability,  then
++       is  the  capability that tacks on another termcap entry to
++       the end of the current one, to add  on  its  capabilities.
++       If  a termcap entry does not use the "tc" capability, then
+        of course the two lengths are the same.
+ 
+-       The  "before  tc  expansion"  length is the most important
+-       one, because it affects more than just users of that  par-
+-       ticular  terminal.   This is the length of the entry as it
++       The "before tc expansion" length  is  the  most  important
++       one,  because it affects more than just users of that par-
++       ticular terminal.  This is the length of the entry  as  it
+        exists in /etc/termcap, minus the backslash-newline pairs,
+-       which tgetent() strips out while reading it.  Some termcap
+-       libraries strip off the final newline,  too  (GNU  termcap
++       which tgetent strips out while reading it.   Some  termcap
++       libraries  strip  off  the final newline, too (GNU termcap
+        does not).  Now suppose:
+ 
+-       o   a  termcap  entry  before  expansion is more than 1023
++       o   a termcap entry before expansion  is  more  than  1023
+            bytes long,
+ 
+        o   and the application has only allocated a 1k buffer,
+ 
+-       o   and the termcap library (like the one  in  BSD/OS  1.1
+-           and  GNU)  reads  the  whole entry into the buffer, no
+-           matter what its length, to see if it is the  entry  it
++       o   and  the  termcap  library (like the one in BSD/OS 1.1
++           and GNU) reads the whole entry  into  the  buffer,  no
++           matter  what  its length, to see if it is the entry it
+            wants,
+ 
+-       o   and  tgetent()  is  searching for a terminal type that
+-           either is the long entry, appears in the termcap  file
+-           after  the  long entry, or does not appear in the file
+-           at all (so that tgetent()  has  to  search  the  whole
+-           termcap file).
+-
+-       Then  tgetent()  will overwrite memory, perhaps its stack,
+-       and probably core dump the program.  Programs like  telnet
+-       are  particularly  vulnerable;  modern  telnets pass along
+-       values like the terminal type automatically.  The  results
+-       are  almost  as  undesirable  with a termcap library, like
+-       SunOS 4.1.3 and Ultrix 4.4, that prints  warning  messages
+-       when  it reads an overly long termcap entry.  If a termcap
+-       library truncates long entries,  like  OSF/1  3.0,  it  is
+-       immune  to  dying  here but will return incorrect data for
+-       the terminal.
++       o   and tgetent is searching  for  a  terminal  type  that
++           either  is the long entry, appears in the termcap file
++           after the long entry, or does not appear in  the  file
++           at  all (so that tgetent has to search the whole term-
++           cap file).
++
++       Then tgetent will overwrite memory, perhaps its stack, and
++       probably  core dump the program.  Programs like telnet are
++       particularly vulnerable; modern telnets pass along  values
++       like  the  terminal  type  automatically.  The results are
++       almost as undesirable with a termcap library,  like  SunOS
++       4.1.3 and Ultrix 4.4, that prints warning messages when it
++       reads an overly long termcap entry.  If a termcap  library
++       truncates  long  entries,  like OSF/1 3.0, it is immune to
++       dying here but will return incorrect data for  the  termi-
++       nal.
+ 
+        The "after tc expansion" length will have a similar effect
+        to the above, but only for people who actually set TERM to
+-       that terminal type, since tgetent() only does "tc"  expan-
+-       sion  once  it  is  found the terminal type it was looking
+-       for, not while searching.
++       that terminal type, since tgetent only does "tc" expansion
++       once it is found the terminal type it was looking for, not
++       while searching.
+ 
+        In summary, a termcap entry that is longer than 1023 bytes
+-       can  cause,  on  various combinations of termcap libraries
+-       and applications, a  core  dump,  warnings,  or  incorrect
+-       operation.   If it is too long even before "tc" expansion,
++       can cause, on various combinations  of  termcap  libraries
++       and  applications,  a  core  dump,  warnings, or incorrect
++       operation.  If it is too long even before "tc"  expansion,
+        it will have this effect even for users of some other ter-
+-       minal  types and users whose TERM variable does not have a
++       minal types and users whose TERM variable does not have  a
+        termcap entry.
+ 
+        When in -C (translate to termcap) mode, the ncurses imple-
+        mentation of tic(1m) issues warning messages when the pre-
+-       tc length of a termcap translation is too  long.   The  -c
+-       (check)  option  also checks resolved (after tc expansion)
++       tc  length  of  a termcap translation is too long.  The -c
++       (check) option also checks resolved (after  tc  expansion)
+        lengths.
+ 
+ 
+ 
    Binary Compatibility
    +-       It is not wise to count on portability of binary  terminfo
+-       entries  between commercial UNIX versions.  The problem is
+-       that there are at least two versions  of  terminfo  (under
++       It  is not wise to count on portability of binary terminfo
++       entries between commercial UNIX versions.  The problem  is
++       that  there  are  at least two versions of terminfo (under
+        HP-UX and AIX) which diverged from System V terminfo after
+-       SVr1, and have added extension capabilities to the  string
+-       table  that  (in  the binary format) collide with System V
++       SVr1,  and have added extension capabilities to the string
++       table that (in the binary format) collide  with  System  V
+        and XSI Curses extensions.
+ 
+ 
+@@ -2415,66 +2422,66 @@
+        Searching for terminal descriptions in $HOME/.terminfo and
+        TERMINFO_DIRS is not supported by older implementations.
+ 
+-       Some  SVr4  curses  implementations,  and  all previous to
+-       SVr4, do not interpret the %A and %O operators in  parame-
++       Some SVr4 curses  implementations,  and  all  previous  to
++       SVr4,  do not interpret the %A and %O operators in parame-
+        ter strings.
+ 
+-       SVr4/XPG4  do  not  specify whether msgr licenses movement
+-       while in an alternate-character-set mode (such modes  may,
+-       among  other  things,  map CR and NL to characters that do
+-       not trigger local motions).   The  ncurses  implementation
+-       ignores  msgr  in ALTCHARSET mode.  This raises the possi-
+-       bility that an XPG4  implementation  making  the  opposite
+-       interpretation  may need terminfo entries made for ncurses
++       SVr4/XPG4 do not specify whether  msgr  licenses  movement
++       while  in an alternate-character-set mode (such modes may,
++       among other things, map CR and NL to  characters  that  do
++       not  trigger  local  motions).  The ncurses implementation
++       ignores msgr in ALTCHARSET mode.  This raises  the  possi-
++       bility  that  an  XPG4  implementation making the opposite
++       interpretation may need terminfo entries made for  ncurses
+        to have msgr turned off.
+ 
+-       The ncurses library handles insert-character  and  insert-
++       The  ncurses  library handles insert-character and insert-
+        character modes in a slightly non-standard way to get bet-
+-       ter update efficiency.  See  the  Insert/Delete  Character
++       ter  update  efficiency.   See the Insert/Delete Character
+        subsection above.
+ 
+-       The   parameter   substitutions  for  set_clock  and  dis-
+-       play_clock are not documented in SVr4 or  the  XSI  Curses
++       The  parameter  substitutions  for  set_clock   and   dis-
++       play_clock  are  not  documented in SVr4 or the XSI Curses
+        standard.  They are deduced from the documentation for the
+        AT&T 505 terminal.
+ 
+-       Be careful assigning the kmous  capability.   The  ncurses
+-       wants  to  interpret it as KEY_MOUSE, for use by terminals
+-       and emulators like xterm that  can  return  mouse-tracking
++       Be  careful  assigning  the kmous capability.  The ncurses
++       wants to interpret it as KEY_MOUSE, for use  by  terminals
++       and  emulators  like  xterm that can return mouse-tracking
+        information in the keyboard-input stream.
+ 
+        X/Open Curses does not mention italics.  Portable applica-
+-       tions must assume that  numeric  capabilities  are  signed
+-       16-bit  values.   This  includes  the no_color_video (ncv)
+-       capability.  The 32768 mask value used  for  italics  with
+-       ncv  can  be confused with an absent or cancelled ncv.  If
+-       italics should work with colors, then the ncv  value  must
++       tions  must  assume  that  numeric capabilities are signed
++       16-bit values.  This  includes  the  no_color_video  (ncv)
++       capability.   The  32768  mask value used for italics with
++       ncv can be confused with an absent or cancelled  ncv.   If
++       italics  should  work with colors, then the ncv value must
+        be specified, even if it is zero.
+ 
+-       Different  commercial ports of terminfo and curses support
+-       different subsets of the XSI Curses standard and (in  some
++       Different commercial ports of terminfo and curses  support
++       different  subsets of the XSI Curses standard and (in some
+        cases) different extension sets.  Here is a summary, accu-
+        rate as of October 1995:
+ 
+        SVR4, Solaris, ncurses -- These support all SVr4 capabili-
+        ties.
+ 
+-       SGI  --  Supports  the  SVr4  set,  adds  one undocumented
++       SGI --  Supports  the  SVr4  set,  adds  one  undocumented
+        extended string capability (set_pglen).
+ 
+-       SVr1, Ultrix -- These support a restricted subset of  ter-
+-       minfo  capabilities.   The booleans end with xon_xoff; the
+-       numerics with  width_status_line;  and  the  strings  with
++       SVr1,  Ultrix -- These support a restricted subset of ter-
++       minfo capabilities.  The booleans end with  xon_xoff;  the
++       numerics  with  width_status_line;  and  the  strings with
+        prtr_non.
+ 
+-       HP/UX  --  Supports  the  SVr1  subset,  plus the SVr[234]
++       HP/UX -- Supports  the  SVr1  subset,  plus  the  SVr[234]
+        numerics num_labels, label_height, label_width, plus func-
+-       tion  keys  11  through  63, plus plab_norm, label_on, and
++       tion keys 11 through 63,  plus  plab_norm,  label_on,  and
+        label_off, plus some incompatible extensions in the string
+        table.
+ 
+-       AIX  --  Supports  the  SVr1 subset, plus function keys 11
+-       through 63, plus a number  of  incompatible  string  table
++       AIX -- Supports the SVr1 subset,  plus  function  keys  11
++       through  63,  plus  a  number of incompatible string table
+        extensions.
+ 
+        OSF -- Supports both the SVr4 set and the AIX extensions.
+@@ -2486,12 +2493,12 @@
+ 
+ 
+ 
    SEE ALSO
    +-       tic(1m),  infocmp(1m),  curses(3x),  printf(3),   term(5).
++       tic(1m),   infocmp(1m),  curses(3x),  printf(3),  term(5).
+        term_variables(3x).
+ 
+ 
+ 
    AUTHORS
    +-       Zeyd  M.  Ben-Halim,  Eric  S.  Raymond, Thomas E. Dickey.
++       Zeyd M. Ben-Halim, Eric  S.  Raymond,  Thomas  E.  Dickey.
+        Based on pcurses by Pavel Curtis.
+ 
+ 
+Index: doc/html/man/tic.1m.html
+--- ncurses-6.0-20161008+/doc/html/man/tic.1m.html	2016-09-10 22:14:42.000000000 +0000
++++ ncurses-6.0-20161015/doc/html/man/tic.1m.html	2016-10-15 23:12:24.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -50,7 +50,7 @@
+ 
+ 
+ 
    SYNOPSIS
    +-       tic  [-01CDGIKLNTUVacfgqrstx]  [-e names] [-o dir] [-Q[n]]
++       tic  [-01CDGIKLNTUVWacfgqrstx] [-e names] [-o dir] [-Q[n]]
+        [-R subset] [-v[n]] [-w[n]] file
+ 
+ 
+@@ -304,25 +304,28 @@
+             If the debug level n is not given, it is taken to  be
+             one.
+ 
+-       -wn  specifies  the width of the output.  The parameter is
++       -W   By  itself, the -w option will not force long strings
++            to be wrapped.  Use the -W option to do this.
++
++       -wn  specifies the width of the output.  The parameter  is
+             optional.  If it is omitted, it defaults to 60.
+ 
+        -x   Treat unknown capabilities as user-defined.  That is,
+-            if  you  supply  a capability name which tic does not
++            if you supply a capability name which  tic  does  not
+             recognize, it will infer its type (boolean, number or
+-            string)  from  the  syntax and make an extended table
++            string) from the syntax and make  an  extended  table
+             entry  for  that.   User-defined  capability  strings
+-            whose  name  begins  with "k" are treated as function
++            whose name begins with "k" are  treated  as  function
+             keys.
+ 
+ 
+ 
    PARAMETERS
    +        file   contains one or more terminfo terminal descriptions
+-              in  source format [see terminfo(5)].  Each descrip-
+-              tion in the file describes the  capabilities  of  a
++              in source format [see terminfo(5)].  Each  descrip-
++              tion  in  the  file describes the capabilities of a
+               particular terminal.
+ 
+-              If  file  is  "-",  then  the data is read from the
++              If file is "-", then the  data  is  read  from  the
+               standard input.  The file parameter may also be the
+               path of a character-device.
+ 
+@@ -332,60 +335,60 @@
+        umented in terminfo(5).  The exception is the use capabil-
+        ity.
+ 
+-       When  a  use=entry-name  field is discovered in a terminal
+-       entry currently being compiled, tic reads  in  the  binary
+-       from  /usr/share/terminfo to complete the entry.  (Entries
+-       created from file will be used first.  tic duplicates  the
++       When a use=entry-name field is discovered  in  a  terminal
++       entry  currently  being  compiled, tic reads in the binary
++       from /usr/share/terminfo to complete the entry.   (Entries
++       created  from file will be used first.  tic duplicates the
+        capabilities in entry-name for the current entry, with the
+-       exception  of  those  capabilities  that  explicitly   are
++       exception   of  those  capabilities  that  explicitly  are
+        defined in the current entry.
+ 
+-       When    an   entry,   e.g.,   entry_name_1,   contains   a
+-       use=entry_name_2  field,  any  canceled  capabilities   in
+-       entry_name_2  must also appear in entry_name_1 before use=
++       When   an   entry,   e.g.,   entry_name_1,   contains    a
++       use=entry_name_2   field,  any  canceled  capabilities  in
++       entry_name_2 must also appear in entry_name_1 before  use=
+        for these capabilities to be canceled in entry_name_1.
+ 
+        Total compiled entries cannot exceed 4096 bytes.  The name
+-       field  cannot  exceed 512 bytes.  Terminal names exceeding
+-       the maximum alias length (32 characters  on  systems  with
++       field cannot exceed 512 bytes.  Terminal  names  exceeding
++       the  maximum  alias  length (32 characters on systems with
+        long filenames, 14 characters otherwise) will be truncated
+-       to the maximum alias length and a warning message will  be
++       to  the maximum alias length and a warning message will be
+        printed.
+ 
+ 
+ 
    COMPATIBILITY
    +-       There  is  some evidence that historic tic implementations
+-       treated description fields with no whitespace in  them  as
+-       additional  aliases  or short names.  This tic does not do
+-       that, but it does warn  when  description  fields  may  be
++       There is some evidence that historic  tic  implementations
++       treated  description  fields with no whitespace in them as
++       additional aliases or short names.  This tic does  not  do
++       that,  but  it  does  warn  when description fields may be
+        treated that way and check them for dangerous characters.
+ 
+ 
+ 
    EXTENSIONS
    +        Unlike the SVr4 tic command, this implementation can actu-
+-       ally compile termcap sources.  In fact,  entries  in  ter-
+-       minfo  and  termcap syntax can be mixed in a single source
++       ally  compile  termcap  sources.  In fact, entries in ter-
++       minfo and termcap syntax can be mixed in a  single  source
+        file.  See terminfo(5) for the list of termcap names taken
+        to be equivalent to terminfo names.
+ 
+-       The  SVr4  manual  pages  are  not clear on the resolution
+-       rules for use capabilities.  This  implementation  of  tic
++       The SVr4 manual pages are  not  clear  on  the  resolution
++       rules  for  use  capabilities.  This implementation of tic
+        will find use targets anywhere in the source file, or any-
+-       where in the file tree rooted at TERMINFO (if TERMINFO  is
++       where  in the file tree rooted at TERMINFO (if TERMINFO is
+        defined), or in the user's $HOME/.terminfo database (if it
+-       exists), or (finally) anywhere in the system's  file  tree
++       exists),  or  (finally) anywhere in the system's file tree
+        of compiled entries.
+ 
+-       The  error  messages from this tic have the same format as
+-       GNU C error messages, and can be  parsed  by  GNU  Emacs's
++       The error messages from this tic have the same  format  as
++       GNU  C  error  messages,  and can be parsed by GNU Emacs's
+        compile facility.
+ 
+-       The  -0,  -1,  -C, -G, -I, -N, -R, -T, -V, -a, -e, -f, -g,
+-       -o, -r, -s, -t and -x  options  are  not  supported  under
++       The -0, -1, -C, -G, -I, -N, -R, -T, -V, -a,  -e,  -f,  -g,
++       -o,  -r,  -s,  -t  and  -x options are not supported under
+        SVr4.  The SVr4 -c mode does not report bad use links.
+ 
+-       System  V does not compile entries to or read entries from
+-       your $HOME/.terminfo database unless TERMINFO  is  explic-
++       System V does not compile entries to or read entries  from
++       your  $HOME/.terminfo  database unless TERMINFO is explic-
+        itly set to it.
+ 
+ 
+@@ -395,10 +398,10 @@
+ 
+ 
+ 
    SEE ALSO
    +-       infocmp(1m),    captoinfo(1m),   infotocap(1m),   toe(1m),
++       infocmp(1m),   captoinfo(1m),   infotocap(1m),    toe(1m),
+        curses(3x), term(5).  terminfo(5).
+ 
+-       This describes ncurses version 6.0 (patch 20160910).
++       This describes ncurses version 6.0 (patch 20161015).
+ 
+ 
+ 
    AUTHOR
    +Index: doc/html/man/toe.1m.html
+--- ncurses-6.0-20161008+/doc/html/man/toe.1m.html	2016-09-10 22:14:42.000000000 +0000
++++ ncurses-6.0-20161015/doc/html/man/toe.1m.html	2016-10-15 23:12:24.000000000 +0000
+@@ -117,7 +117,7 @@
+        tic(1m),   infocmp(1m),   captoinfo(1m),    infotocap(1m),
+        curses(3x), terminfo(5).
+ 
+-       This describes ncurses version 6.0 (patch 20160910).
++       This describes ncurses version 6.0 (patch 20161015).
+ 
+ 
+ 
+Index: doc/html/man/tput.1.html
+--- ncurses-6.0-20161008+/doc/html/man/tput.1.html	2016-09-10 22:14:42.000000000 +0000
++++ ncurses-6.0-20161015/doc/html/man/tput.1.html	2016-10-15 23:12:24.000000000 +0000
+@@ -438,7 +438,7 @@
+        clear(1),    stty(1),   tabs(1),   tset(1),   terminfo(5),
+        curs_termcap(3x).
+ 
+-       This describes ncurses version 6.0 (patch 20160910).
++       This describes ncurses version 6.0 (patch 20161015).
+ 
+ 
+ 
+Index: doc/html/man/tset.1.html
+--- ncurses-6.0-20161008+/doc/html/man/tset.1.html	2016-09-10 22:14:42.000000000 +0000
++++ ncurses-6.0-20161015/doc/html/man/tset.1.html	2016-10-15 23:12:24.000000000 +0000
+@@ -387,7 +387,7 @@
+        csh(1),   sh(1),   stty(1),   curs_terminfo(3x),   tty(4),
+        terminfo(5), ttys(5), environ(7)
+ 
+-       This describes ncurses version 6.0 (patch 20160910).
++       This describes ncurses version 6.0 (patch 20161015).
+ 
+ 
+ 
+Index: man/captoinfo.1m
+Prereq:  1.25 
+--- ncurses-6.0-20161008+/man/captoinfo.1m	2010-12-04 18:36:44.000000000 +0000
++++ ncurses-6.0-20161015/man/captoinfo.1m	2016-10-15 17:26:09.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2007,2010 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2010,2016 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: captoinfo.1m,v 1.25 2010/12/04 18:36:44 tom Exp $
++.\" $Id: captoinfo.1m,v 1.26 2016/10/15 17:26:09 tom Exp $
+ .TH @CAPTOINFO@ 1M ""
+ .ds n 5
+ .ds d @TERMINFO@
+@@ -152,7 +152,7 @@
+ .TE
+ .PP
+ If the single-line capabilities occur in an entry, they will automatically
+-be composed into an \fIacsc\fR string.
++be composed into an \fBacsc\fR string.
+ The double-line capabilities and
+ \fBGG\fR are discarded with a warning message.
+ .PP
+@@ -174,10 +174,10 @@
+ .TE
+ .PP
+ Additionally, the AIX \fIbox1\fR capability will be automatically translated to
+-an \fIacsc\fR string.
++an \fBacsc\fR string.
+ .PP
+ Hewlett-Packard's terminfo library supports two nonstandard terminfo
+-capabilities \fImeml\fR (memory lock) and \fImemu\fR (memory unlock).
++capabilities \fBmeml\fR (memory lock) and \fBmemu\fR (memory unlock).
+ These will be discarded with a warning message.
+ .SH NOTES
+ This utility is actually a link to \fB@TIC@\fR(1M), running in \fI\-I\fR mode.
+Index: man/curs_attr.3x
+Prereq:  1.47 
+--- ncurses-6.0-20161008+/man/curs_attr.3x	2016-07-23 23:48:49.000000000 +0000
++++ ncurses-6.0-20161015/man/curs_attr.3x	2016-10-15 17:09:05.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_attr.3x,v 1.47 2016/07/23 23:48:49 tom Exp $
++.\" $Id: curs_attr.3x,v 1.48 2016/10/15 17:09:05 tom Exp $
+ .TH curs_attr 3X ""
+ .de bP
+ .IP \(bu 4
+@@ -285,12 +285,13 @@
+ (specifically, \fBA_ALTCHARSET\fR, \fBA_PROTECT\fR, and \fBA_INVIS\fR).
+ .PP
+ This implementation provides the \fBA_ITALIC\fP attribute for terminals
+-which have the \fIenter_italics_mode\fP (sitm) and \fIexit_italics_mode\fP (ritm) capabilities.
++which have the \fBenter_italics_mode\fP (\fBsitm\fP)
++and \fBexit_italics_mode\fP (\fBritm\fP) capabilities.
+ Italics are not mentioned in X/Open Curses.
+-Unlike the other video attributes, \fBI_ITALIC\fP is unrelated
+-to the \fIset_attributes\fP capabilities.
++Unlike the other video attributes, \fBA_ITALIC\fP is unrelated
++to the \fBset_attributes\fP capabilities.
+ This implementation makes the assumption that
+-\fIexit_attribute_mode\fP may also reset italics.
++\fBexit_attribute_mode\fP may also reset italics.
+ .PP
+ XSI Curses added the new entry points, \fBattr_get\fR, \fBattr_on\fR,
+ \fBattr_off\fR, \fBattr_set\fR, \fBwattr_on\fR, \fBwattr_off\fR,
+Index: man/curs_clear.3x
+Prereq:  1.14 
+--- ncurses-6.0-20161008+/man/curs_clear.3x	2010-12-04 18:36:44.000000000 +0000
++++ ncurses-6.0-20161015/man/curs_clear.3x	2016-10-15 17:02:31.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2007,2010 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2010,2016 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_clear.3x,v 1.14 2010/12/04 18:36:44 tom Exp $
++.\" $Id: curs_clear.3x,v 1.15 2016/10/15 17:02:31 tom Exp $
+ .TH curs_clear 3X ""
+ .na
+ .hy 0
+@@ -101,7 +101,7 @@
+ .PP
+ This implementation, and others such as Solaris,
+ sets the current position to 0,0 after erasing
+-via \fBwerase()\fP and \fBwclear()\fP.
++via \fBwerase\fP and \fBwclear\fP.
+ That fact is not documented in other implementations,
+ and may not be true of implementations
+ which were not derived from SVr4 source.
+Index: man/curs_color.3x
+Prereq:  1.43 
+--- ncurses-6.0-20161008+/man/curs_color.3x	2016-07-30 15:22:11.000000000 +0000
++++ ncurses-6.0-20161015/man/curs_color.3x	2016-10-15 17:10:19.000000000 +0000
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_color.3x,v 1.43 2016/07/30 15:22:11 tom Exp $
++.\" $Id: curs_color.3x,v 1.45 2016/10/15 17:10:19 tom Exp $
+ .TH curs_color 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -295,7 +295,7 @@
+       \fBCOLOR_WHITE\fR
+ .fi
+ .SH RETURN VALUE
+-The routines \fBcan_change_color()\fR and \fBhas_colors()\fR return \fBTRUE\fR
++The routines \fBcan_change_color\fR and \fBhas_colors\fR return \fBTRUE\fR
+ or \fBFALSE\fR.
+ .PP
+ All other routines return the integer \fBERR\fR upon failure and an \fBOK\fR
+@@ -316,7 +316,7 @@
+ .TP 5
+ \fBinit_color\fP
+ returns an error if the terminal does not support
+-this feature, e.g., if the \fIinitialize_color\fP capability is absent
++this feature, e.g., if the \fBinitialize_color\fP capability is absent
+ from the terminal description.
+ .TP 5
+ \fBstart_color\fP
+Index: man/curs_extend.3x
+Prereq:  1.20 
+--- ncurses-6.0-20161008+/man/curs_extend.3x	2016-05-14 23:10:54.000000000 +0000
++++ ncurses-6.0-20161015/man/curs_extend.3x	2016-10-15 16:52:48.000000000 +0000
+@@ -28,7 +28,7 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1999-on
+ .\"
+-.\" $Id: curs_extend.3x,v 1.20 2016/05/14 23:10:54 tom Exp $
++.\" $Id: curs_extend.3x,v 1.21 2016/10/15 16:52:48 tom Exp $
+ .TH curs_extend 3X ""
+ .SH NAME
+ \fBcurses_version\fP,
+@@ -45,14 +45,12 @@
+ which do not fit easily into other categories.
+ .SS curses_version
+ .PP
+-Use
+-.I curses_version()
++Use \fBcurses_version\fP
+ to get the version number, including patch level of the library, e.g.,
+ .B 5.0.19991023
+ .SS use_extended_names
+ .PP
+-The
+-.I use_extended_names()
++The \fBuse_extended_names\fP
+ function controls whether the calling application
+ is able to use user-defined or nonstandard names
+ which may be compiled into the terminfo
+Index: man/curs_getch.3x
+Prereq:  1.48 
+--- ncurses-6.0-20161008+/man/curs_getch.3x	2016-09-10 21:56:25.000000000 +0000
++++ ncurses-6.0-20161015/man/curs_getch.3x	2016-10-15 16:44:01.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_getch.3x,v 1.48 2016/09/10 21:56:25 Leon.Winter Exp $
++.\" $Id: curs_getch.3x,v 1.49 2016/10/15 16:44:01 tom Exp $
+ .TH curs_getch 3X ""
+ .na
+ .hy 0
+@@ -289,7 +289,7 @@
+ .PP
+ .SH RETURN VALUE
+ All routines return the integer \fBERR\fR upon failure and an integer value
+-other than \fBERR\fR (\fBOK\fR in the case of ungetch()) upon successful
++other than \fBERR\fR (\fBOK\fR in the case of \fBungetch\fP) upon successful
+ completion.
+ .RS 3
+ .TP 5
+Index: man/curs_initscr.3x
+Prereq:  1.24 
+--- ncurses-6.0-20161008+/man/curs_initscr.3x	2015-07-21 23:01:38.000000000 +0000
++++ ncurses-6.0-20161015/man/curs_initscr.3x	2016-10-15 17:02:31.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_initscr.3x,v 1.24 2015/07/21 23:01:38 tom Exp $
++.\" $Id: curs_initscr.3x,v 1.25 2016/10/15 17:02:31 tom Exp $
+ .TH curs_initscr 3X ""
+ .de bP
+ .IP \(bu 4
+@@ -189,7 +189,7 @@
+ .PP
+ \fICurses implementations may provide for special handling of the SIGINT,
+ SIGQUIT and SIGTSTP signals if their disposition is SIG_DFL at the time
+-\fBinitscr()\fP is called \fP...
++\fBinitscr\fP is called \fP...
+ .PP
+ \fIAny special handling for these signals may remain in effect for the
+ life of the process or until the process changes the disposition of
+Index: man/curs_inopts.3x
+Prereq:  1.20 
+--- ncurses-6.0-20161008+/man/curs_inopts.3x	2015-11-28 19:03:12.000000000 +0000
++++ ncurses-6.0-20161015/man/curs_inopts.3x	2016-10-15 17:13:45.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2013,2015 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_inopts.3x,v 1.20 2015/11/28 19:03:12 Benno.Schulenberg Exp $
++.\" $Id: curs_inopts.3x,v 1.22 2016/10/15 17:13:45 tom Exp $
+ .TH curs_inopts 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -229,7 +229,7 @@
+ When
+ \fBqiflush\fR is called, the queues will be flushed when these control
+ characters are read.
+-You may want to call \fBnoqiflush()\fR in a signal
++You may want to call \fBnoqiflush\fR in a signal
+ handler if you want output to continue as though the interrupt
+ had not occurred, after the handler exits.
+ .\"
+@@ -308,7 +308,7 @@
+ On the other hand, an application can use \fBdefine_key\fP to establish
+ a specific keycode for a given string.
+ This makes it possible for an application to check for an extended
+-capability's presence with \fItigetstr\fP,
++capability's presence with \fBtigetstr\fP,
+ and reassign the keycode to match its own needs.
+ .PP
+ Low-level applications can use \fBtigetstr\fP to obtain the definition
+Index: man/curs_kernel.3x
+Prereq:  1.20 
+--- ncurses-6.0-20161008+/man/curs_kernel.3x	2015-07-21 01:10:11.000000000 +0000
++++ ncurses-6.0-20161015/man/curs_kernel.3x	2016-10-15 16:42:55.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.                        *
++.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.                        *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_kernel.3x,v 1.20 2015/07/21 01:10:11 tom Exp $
++.\" $Id: curs_kernel.3x,v 1.21 2016/10/15 16:42:55 tom Exp $
+ .de bP
+ .IP \(bu 4
+ ..
+@@ -83,7 +83,7 @@
+ (not in \fBcurses\fR) state for use by the \fBreset_prog_mode\fR and
+ \fBreset_shell_mode\fR routines.  This is done automatically by
+ \fBinitscr\fR.  There is one such save area for each screen context
+-allocated by \fBnewterm()\fR.
++allocated by \fBnewterm\fR.
+ .SS reset_prog_mode, reset_shell_mode
+ .PP
+ The \fBreset_prog_mode\fR and \fBreset_shell_mode\fR routines restore
+Index: man/curs_outopts.3x
+Prereq:  1.26 
+--- ncurses-6.0-20161008+/man/curs_outopts.3x	2015-07-21 00:23:43.000000000 +0000
++++ ncurses-6.0-20161015/man/curs_outopts.3x	2016-10-15 17:02:31.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_outopts.3x,v 1.26 2015/07/21 00:23:43 tom Exp $
++.\" $Id: curs_outopts.3x,v 1.27 2016/10/15 17:02:31 tom Exp $
+ .TH curs_outopts 3X ""
+ .na
+ .hy 0
+@@ -189,8 +189,8 @@
+ .SH PORTABILITY
+ These functions are described in the XSI Curses standard, Issue 4.
+ .PP
+-The XSI Curses standard is ambiguous on the question of whether \fBraw\fR()
+-should disable the CRLF translations controlled by \fBnl\fR() and \fBnonl\fR().
++The XSI Curses standard is ambiguous on the question of whether \fBraw\fR
++should disable the CRLF translations controlled by \fBnl\fR and \fBnonl\fR.
+ BSD curses did turn off these translations; AT&T curses (at least as late as
+ SVr1) did not.
+ We choose to do so, on the theory that a programmer requesting
+Index: man/curs_refresh.3x
+Prereq:  1.16 
+--- ncurses-6.0-20161008+/man/curs_refresh.3x	2016-01-30 15:52:36.000000000 +0000
++++ ncurses-6.0-20161015/man/curs_refresh.3x	2016-10-15 16:45:45.000000000 +0000
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_refresh.3x,v 1.16 2016/01/30 15:52:36 tom Exp $
++.\" $Id: curs_refresh.3x,v 1.17 2016/10/15 16:45:45 tom Exp $
+ .TH curs_refresh 3X ""
+ .na
+ .hy 0
+@@ -105,7 +105,7 @@
+ The \fBwredrawln\fR routine indicates to \fBcurses\fR that some screen lines
+ are corrupted and should be thrown away before anything is written over them.
+ It touches the indicated lines (marking them changed).
+-The routine \fBredrawwin\fR() touches the entire window.
++The routine \fBredrawwin\fR touches the entire window.
+ .SH RETURN VALUE
+ Routines that return an integer return \fBERR\fR upon failure, and \fBOK\fR
+ (SVr4 only specifies "an integer value other than \fBERR\fR") upon successful
+@@ -129,14 +129,14 @@
+ .SH PORTABILITY
+ The XSI Curses standard, Issue 4 describes these functions.
+ .PP
+-Whether \fBwnoutrefresh()\fR copies to the virtual screen the entire contents
++Whether \fBwnoutrefresh\fR copies to the virtual screen the entire contents
+ of a window or just its changed portions has never been well-documented in
+ historic curses versions (including SVr4).
+ It might be unwise to rely on
+ either behavior in programs that might have to be linked with other curses
+ implementations.
+-Instead, you can do an explicit \fBtouchwin()\fR before the
+-\fBwnoutrefresh()\fR call to guarantee an entire-contents copy anywhere.
++Instead, you can do an explicit \fBtouchwin\fR before the
++\fBwnoutrefresh\fR call to guarantee an entire-contents copy anywhere.
+ .SH SEE ALSO
+ \fBcurses\fR(3X),
+ \fBcurs_outopts\fR(3X)
+Index: man/curs_slk.3x
+Prereq:  1.22 
+--- ncurses-6.0-20161008+/man/curs_slk.3x	2010-12-04 18:38:55.000000000 +0000
++++ ncurses-6.0-20161015/man/curs_slk.3x	2016-10-15 17:02:31.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2007,2010 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2010,2016 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_slk.3x,v 1.22 2010/12/04 18:38:55 tom Exp $
++.\" $Id: curs_slk.3x,v 1.23 2016/10/15 17:02:31 tom Exp $
+ .TH curs_slk 3X ""
+ .na
+ .hy 0
+@@ -232,7 +232,7 @@
+ argument type of the attribute-manipulation functions \fBslk_attron\fR,
+ \fBslk_attroff\fR, \fBslk_attrset\fR to be \fBattr_t\fR, and adds \fBconst\fR
+ qualifiers.
+-The format codes \fB2\fR and \fB3\fR for \fBslk_init()\fR and the
++The format codes \fB2\fR and \fB3\fR for \fBslk_init\fR and the
+ function \fBslk_attr\fR are specific to ncurses.
+ .SH SEE ALSO
+ \fBcurses\fR(3X),
+Index: man/curs_terminfo.3x
+Prereq:  1.44 
+--- ncurses-6.0-20161008+/man/curs_terminfo.3x	2016-08-20 23:26:10.000000000 +0000
++++ ncurses-6.0-20161015/man/curs_terminfo.3x	2016-10-15 17:27:48.000000000 +0000
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_terminfo.3x,v 1.44 2016/08/20 23:26:10 tom Exp $
++.\" $Id: curs_terminfo.3x,v 1.46 2016/10/15 17:27:48 tom Exp $
+ .TH curs_terminfo 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -172,7 +172,7 @@
+ means that the terminal is hardcopy, cannot be used for curses applications.
+ .IP
+ \fBsetupterm\fP determines if the entry is a hardcopy type by
+-checking the \fIhc\fP (\fIhardcopy\fP) capability.
++checking the \fBhc\fP (\fBhardcopy\fP) capability.
+ .TP 5
+ .B 0
+ means that the terminal could not be found,
+@@ -180,7 +180,7 @@
+ having too little information for curses applications to run.
+ .IP
+ \fBsetupterm\fP determines if the entry is a generic type by
+-checking the \fIgn\fP (\fIgeneric\fP) capability.
++checking the \fBgn\fP (\fBgeneric\fP) capability.
+ .TP 5
+ .B \-1
+ means that the \fBterminfo\fR database could not be found.
+@@ -249,10 +249,16 @@
+ .SS Output Functions
+ .PP
+ The \fBtputs\fR routine applies padding information to the string
+-\fIstr\fR and outputs it.  The \fIstr\fR must be a terminfo string
++\fIstr\fR and outputs it:
++.bP
++The \fIstr\fR must be a terminfo string
+ variable or the return value from \fBtparm\fR, \fBtgetstr\fR, or
+-\fBtgoto\fR.  \fIaffcnt\fR is the number of lines affected, or 1 if
+-not applicable.  \fIputc\fR is a \fBputchar\fR-like routine to which
++\fBtgoto\fR.
++.bP
++\fIaffcnt\fR is the number of lines affected, or 1 if
++not applicable.
++.bP
++\fIputc\fR is a \fBputchar\fR-like routine to which
+ the characters are passed, one at a time.
+ .PP
+ The \fBputp\fR routine calls \fBtputs(\fR\fIstr\fR\fB, 1, putchar)\fR.
+Index: man/curs_trace.3x
+Prereq:  1.13 
+--- ncurses-6.0-20161008+/man/curs_trace.3x	2015-07-20 22:54:44.000000000 +0000
++++ ncurses-6.0-20161015/man/curs_trace.3x	2016-10-15 17:26:09.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 2000-2010,2015 Free Software Foundation, Inc.              *
++.\" Copyright (c) 2000-2015,2016 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_trace.3x,v 1.13 2015/07/20 22:54:44 tom Exp $
++.\" $Id: curs_trace.3x,v 1.14 2016/10/15 17:26:09 tom Exp $
+ .de bP
+ .IP \(bu 4
+ ..
+@@ -102,7 +102,7 @@
+ trace user and system times of updates.
+ .TP 5
+ .B TRACE_TPUTS
+-trace tputs calls.
++trace \fBtputs\fP calls.
+ .TP 5
+ .B TRACE_UPDATE
+ trace update actions, old & new screens.
+Index: man/curs_window.3x
+Prereq:  1.19 
+--- ncurses-6.0-20161008+/man/curs_window.3x	2015-07-21 08:25:23.000000000 +0000
++++ ncurses-6.0-20161015/man/curs_window.3x	2016-10-15 17:26:09.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_window.3x,v 1.19 2015/07/21 08:25:23 tom Exp $
++.\" $Id: curs_window.3x,v 1.20 2016/10/15 17:26:09 tom Exp $
+ .TH curs_window 3X ""
+ .na
+ .hy 0
+@@ -215,7 +215,7 @@
+ .PP
+ Note that \fBsyncok\fR may be a macro.
+ .SH BUGS
+-The subwindow functions (\fIsubwin\fR, \fIderwin\fR, \fImvderwin\fR,
++The subwindow functions (\fBsubwin\fR, \fBderwin\fR, \fBmvderwin\fR,
+ \fBwsyncup\fR, \fBwsyncdown\fR, \fBwcursyncup\fR, \fBsyncok\fR) are flaky,
+ incompletely implemented, and not well tested.
+ .PP
+Index: man/default_colors.3x
+Prereq:  1.23 
+--- ncurses-6.0-20161008+/man/default_colors.3x	2011-01-03 21:52:27.000000000 +0000
++++ ncurses-6.0-20161015/man/default_colors.3x	2016-10-15 17:16:48.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2011,2016 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -28,7 +28,7 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1997,1999,2000,2005
+ .\"
+-.\" $Id: default_colors.3x,v 1.23 2011/01/03 21:52:27 Tim.van.der.Molen Exp $
++.\" $Id: default_colors.3x,v 1.25 2016/10/15 17:16:48 tom Exp $
+ .TH default_colors 3X ""
+ .SH NAME
+ \fBuse_default_colors\fR,
+@@ -40,10 +40,7 @@
+ .br
+ \fBint assume_default_colors(int fg, int bg);\fP
+ .SH DESCRIPTION
+-The
+-.I use_default_colors()
+-and
+-.I assume_default_colors()
++The \fBuse_default_colors\fP and \fBassume_default_colors\fP
+ functions are extensions to the curses library.
+ They are used with terminals that support ISO 6429 color, or equivalent.
+ These terminals allow the application to reset color to an unspecified
+@@ -56,20 +53,18 @@
+ For example, there are several implementations of the \fBls\fP program
+ which use colors to denote different file types or permissions.
+ These "color ls" programs do not necessarily modify the background color,
+-typically using only the \fIsetaf\fP terminfo capability to set the
++typically using only the \fBsetaf\fP terminfo capability to set the
+ foreground color.
+ Full-screen applications that use default colors can achieve similar
+ visual effects.
+ .PP
+-The first function,
+-.I use_default_colors()
++The first function, \fBuse_default_colors\fP
+ tells the curses library to assign terminal default
+ foreground/background colors to color number \-1. So init_pair(x,COLOR_RED,\-1)
+ will initialize pair x as red on default background and init_pair(x,\-1,COLOR_BLUE) will
+ initialize pair x as default foreground on blue.
+ .PP
+-The other,
+-.I assume_default_colors()
++The other, \fBassume_default_colors\fP
+ is a refinement which tells which colors to paint for color pair 0.
+ This function recognizes a special color number \-1,
+ which denotes the default terminal color.
+@@ -85,29 +80,29 @@
+ These are ncurses extensions.
+ For other curses implementations, color
+ number \-1 does not mean anything, just as for ncurses before a
+-successful call of \fIuse_default_colors()\fP or \fIassume_default_colors()\fP.
++successful call of \fBuse_default_colors\fP or \fBassume_default_colors\fP.
+ .PP
+ Other curses implementations do not allow an application to modify color pair 0.
+ They assume that the background is COLOR_BLACK,
+ but do not ensure that the color pair 0 is painted to match the
+ assumption.
+ If your application does not use either
+-.I use_default_colors()
++.B use_default_colors
+ or
+-.I assume_default_colors()
++.B assume_default_colors
+ ncurses will paint a white foreground (text) with black background
+ for color pair 0.
+ .SH RETURN VALUE
+ These functions return the integer \fBERR\fP upon failure and \fBOK\fP on success.
+ They will fail if either the terminal does not support
+-the \fIorig_pair\fP or \fIorig_colors\fP capability.
+-If the \fIinitialize_pair\fP capability is not found, this causes an
++the \fBorig_pair\fP or \fBorig_colors\fP capability.
++If the \fBinitialize_pair\fP capability is not found, this causes an
+ error as well.
+ .SH NOTES
+ Associated with this extension, the \fBinit_pair\fR function accepts
+ negative arguments to specify default foreground or background colors.
+ .PP
+-The \fIuse_default_colors()\fP function was added to support \fIded\fP.
++The \fBuse_default_colors\fP function was added to support \fIded\fP.
+ This is a full-screen application which uses curses to manage only part
+ of the screen.  The bottom portion of the screen, which is of adjustable
+ size, is left uncolored to display the results from shell commands.
+@@ -120,9 +115,9 @@
+ which does not necessarily correspond to any of the ANSI colors.
+ While a special terminfo entry could be constructed using nine colors,
+ there was no mechanism provided within curses to account for the related
+-\fIorig_pair\fP and \fIback_color_erase\fP capabilities.
++\fBorig_pair\fP and \fBback_color_erase\fP capabilities.
+ .PP
+-The \fIassume_default_colors()\fP function was added to solve
++The \fBassume_default_colors\fP function was added to solve
+ a different problem: support for applications which would use
+ environment variables and other configuration to bypass curses'
+ notion of the terminal's default colors, setting specific values.
+Index: man/infotocap.1m
+Prereq:  1.11 
+--- ncurses-6.0-20161008+/man/infotocap.1m	2010-12-04 18:38:55.000000000 +0000
++++ ncurses-6.0-20161015/man/infotocap.1m	2016-10-15 17:26:09.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright (c) 1999-2006,2010 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1999-2010,2016 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: infotocap.1m,v 1.11 2010/12/04 18:38:55 tom Exp $
++.\" $Id: infotocap.1m,v 1.12 2016/10/15 17:26:09 tom Exp $
+ .TH @INFOTOCAP@ 1M ""
+ .ds n 5
+ .ds d @TERMINFO@
+@@ -61,8 +61,8 @@
+ \*d
+ Compiled terminal description database.
+ .SH NOTES
+-This utility is actually a link to \fI@TIC@\fR, running in \fI\-C\fR mode.
+-You can use other \fI@TIC@\fR options such as \fB\-f\fR and  \fB\-x\fR.
++This utility is actually a link to \fB@TIC@\fR, running in \fI\-C\fR mode.
++You can use other \fB@TIC@\fR options such as \fB\-f\fR and  \fB\-x\fR.
+ .SH SEE ALSO
+ \fBcurses\fR(3X),
+ \fB@TIC@\fR(1M),
+Index: man/legacy_coding.3x
+Prereq:  1.4 
+--- ncurses-6.0-20161008+/man/legacy_coding.3x	2010-12-04 18:49:20.000000000 +0000
++++ ncurses-6.0-20161015/man/legacy_coding.3x	2016-10-15 17:02:31.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 2005-2006,2010 Free Software Foundation, Inc.              *
++.\" Copyright (c) 2005-2010,2016 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -28,7 +28,7 @@
+ .\"
+ .\" Author: Thomas E. Dickey
+ .\"
+-.\" $Id: legacy_coding.3x,v 1.4 2010/12/04 18:49:20 tom Exp $
++.\" $Id: legacy_coding.3x,v 1.5 2016/10/15 17:02:31 tom Exp $
+ .TH legacy_coding 3X ""
+ .SH NAME
+ \fBuse_legacy_coding\fR \- use terminal's default colors
+@@ -37,9 +37,7 @@
+ .sp
+ \fBint use_legacy_coding(int level);\fP
+ .SH DESCRIPTION
+-The
+-.I use_legacy_coding()
+-function is an extension to the curses library.
++The \fBuse_legacy_coding\fP function is an extension to the curses library.
+ It allows the caller to change the result of \fBunctrl\fP,
+ and suppress related checks within the library that would normally
+ cause nonprinting characters to be rendered in visible form.
+Index: man/menu_format.3x
+Prereq:  1.13 
+--- ncurses-6.0-20161008+/man/menu_format.3x	2015-12-05 23:01:16.000000000 +0000
++++ ncurses-6.0-20161015/man/menu_format.3x	2016-10-15 17:02:31.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_format.3x,v 1.13 2015/12/05 23:01:16 tom Exp $
++.\" $Id: menu_format.3x,v 1.14 2016/10/15 17:02:31 tom Exp $
+ .TH menu_format 3X ""
+ .SH NAME
+ \fBset_menu_format\fP,
+@@ -43,7 +43,7 @@
+ The function \fBset_menu_format\fR sets the maximum display size of the given
+ menu.  If this size is too small to display all menu items, the menu will be
+ made scrollable. If this size is larger than the menus subwindow and the
+-subwindow is too small to display all menu items, \fBpost_menu()\fR will fail.
++subwindow is too small to display all menu items, \fBpost_menu\fR will fail.
+ .PP
+ The default format is 16 rows, 1 column.  Calling \fBset_menu_format\fR with a
+ null menu pointer will change this default.  A zero row or column argument to
+Index: man/menu_post.3x
+Prereq:  1.12 
+--- ncurses-6.0-20161008+/man/menu_post.3x	2015-12-05 23:42:45.000000000 +0000
++++ ncurses-6.0-20161015/man/menu_post.3x	2016-10-15 17:02:31.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_post.3x,v 1.12 2015/12/05 23:42:45 tom Exp $
++.\" $Id: menu_post.3x,v 1.13 2016/10/15 17:02:31 tom Exp $
+ .TH menu_post 3X ""
+ .SH NAME
+ \fBpost_menu\fR,
+@@ -65,8 +65,8 @@
+ Routine was called from an initialization or termination function.
+ .TP 5
+ .B E_NO_ROOM
+-Menu is too large for its window. You should consider to use
+-\fBset_menu_format()\fR to solve the problem.
++Menu is too large for its window.
++You should consider using \fBset_menu_format\fR to solve the problem.
+ .TP 5
+ .B E_NOT_POSTED
+ The menu has not been posted.
+Index: man/panel.3x
+Prereq:  1.19 
+--- ncurses-6.0-20161008+/man/panel.3x	2015-12-05 23:42:45.000000000 +0000
++++ ncurses-6.0-20161015/man/panel.3x	2016-10-15 17:02:31.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: panel.3x,v 1.19 2015/12/05 23:42:45 tom Exp $
++.\" $Id: panel.3x,v 1.20 2016/10/15 17:02:31 tom Exp $
+ .TH panel 3X ""
+ .ds n 5
+ .ds d @TERMINFO@
+@@ -90,14 +90,14 @@
+ to  be  displayed above any other panel) and returns a
+ pointer to the new panel.
+ .TP
+-.B update_panels()
++.B update_panels
+ refreshes the virtual screen to reflect the relations between the
+-panels in the stack, but does not call doupdate() to refresh the
++panels in the stack, but does not call \fBdoupdate\fP to refresh the
+ physical screen.
+ Use this function and not \fBwrefresh\fP or \fBwnoutrefresh\fP.
+ .B update_panels
+ may be called more than once before a call to
+-doupdate(), but doupdate() is the function responsible for updating
++\fBdoupdate\fP, but \fBdoupdate\fP is the function responsible for updating
+ the physical screen.
+ .TP
+ .B del_panel(pan)
+@@ -127,7 +127,7 @@
+ .B move_panel(pan,starty,startx)
+ moves the given panel window so that its upper-left corner is at
+ \fBstarty\fR, \fBstartx\fR.  It does not change the position of the
+-panel in the stack.  Be sure to use this function, not \fBmvwin()\fR,
++panel in the stack.  Be sure to use this function, not \fBmvwin\fR,
+ to move a panel window.
+ .TP
+ .B replace_panel(pan,window)
+@@ -163,11 +163,11 @@
+ The \fBPANEL\fR data structures are merely  similar. The  programmer
+ is cautioned not to directly use \fBPANEL\fR fields.
+ .P
+-The functions \fBshow_panel()\fR and \fBtop_panel()\fR are identical
++The functions \fBshow_panel\fR and \fBtop_panel\fR are identical
+ in this implementation, and work equally well with displayed or hidden
+-panels.  In the native System V implementation, \fBshow_panel()\fR is
++panels.  In the native System V implementation, \fBshow_panel\fR is
+ intended for making a hidden panel visible (at the top of the stack)
+-and \fBtop_panel()\fR is intended for making an already-visible panel
++and \fBtop_panel\fR is intended for making an already-visible panel
+ move to the top of the stack. You are cautioned to use the correct
+ function to ensure compatibility with native panel libraries.
+ .SH NOTE
+Index: man/tabs.1
+Prereq:  1.12 
+--- ncurses-6.0-20161008+/man/tabs.1	2016-04-02 23:40:46.000000000 +0000
++++ ncurses-6.0-20161015/man/tabs.1	2016-10-15 16:16:38.000000000 +0000
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tabs.1,v 1.12 2016/04/02 23:40:46 tom Exp $
++.\" $Id: tabs.1,v 1.13 2016/10/15 16:16:38 tom Exp $
+ .TH @TABS@ 1 ""
+ .ds n 5
+ .de bP
+@@ -133,7 +133,7 @@
+ Very few of the entries in the terminal database provide this capability.
+ .bP
+ There is no counterpart in X/Open Curses Issue 7 for this utility,
+-unlike @TPUT@(3X).
++unlike @TPUT@(1).
+ .PP
+ The \fB\-d\fP (debug) and \fB\-n\fP (no-op) options are extensions not provided
+ by other implementations.
+Index: man/term.5
+Prereq:  1.22 
+--- ncurses-6.0-20161008+/man/term.5	2015-04-26 14:50:23.000000000 +0000
++++ ncurses-6.0-20161015/man/term.5	2016-10-15 17:02:31.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: term.5,v 1.22 2015/04/26 14:50:23 tom Exp $
++.\" $Id: term.5,v 1.23 2016/10/15 17:02:31 tom Exp $
+ .TH term 5
+ .ds n 5
+ .ds d @TERMINFO@
+@@ -76,7 +76,7 @@
+ The compiled file is created with the
+ .B @TIC@
+ program, and read by the routine
+-.IR setupterm .
++.BR setupterm .
+ The file is divided into six parts:
+ the header,
+ terminal names,
+@@ -197,18 +197,18 @@
+ .
+ .SH PORTABILITY
+ Note that it is possible for
+-.I setupterm
++.B setupterm
+ to expect a different set of capabilities
+ than are actually present in the file.
+ Either the database may have been updated since
+-.I setupterm
++.B setupterm
+ has been recompiled
+ (resulting in extra unrecognized entries in the file)
+ or the program may have been recompiled more recently
+ than the database was updated
+ (resulting in missing entries).
+ The routine
+-.I setupterm
++.B setupterm
+ must be prepared for both possibilities \-
+ this is why the numbers and sizes are included.
+ Also, new capabilities must always be added at the end of the lists
+Index: man/terminfo.head
+Prereq:  1.21 
+--- ncurses-6.0-20161008+/man/terminfo.head	2013-03-09 22:11:36.000000000 +0000
++++ ncurses-6.0-20161015/man/terminfo.head	2016-10-15 17:02:31.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2012,2013 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2013,2016 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: terminfo.head,v 1.21 2013/03/09 22:11:36 tom Exp $
++.\" $Id: terminfo.head,v 1.22 2016/10/15 17:02:31 tom Exp $
+ .TH terminfo 5 "" "" "File Formats"
+ .ds n 5
+ .ds d @TERMINFO@
+Index: man/terminfo.tail
+Prereq:  1.69 
+--- ncurses-6.0-20161008+/man/terminfo.tail	2015-04-26 14:47:23.000000000 +0000
++++ ncurses-6.0-20161015/man/terminfo.tail	2016-10-15 18:34:58.000000000 +0000
+@@ -1,4 +1,4 @@
+-.\" $Id: terminfo.tail,v 1.69 2015/04/26 14:47:23 tom Exp $
++.\" $Id: terminfo.tail,v 1.72 2016/10/15 18:34:58 tom Exp $
+ .\" Beginning of terminfo.tail file
+ .\" This file is part of ncurses.
+ .\" See "terminfo.head" for copyright.
+@@ -156,20 +156,23 @@
+ Finally, characters may be given as three octal digits after a \fB\e\fR.
+ .PP
+ A delay in milliseconds may appear anywhere in a string capability, enclosed in
+-$<..> brackets, as in \fBel\fP=\eEK$<5>, and padding characters are supplied by
+-.I tputs
++$<..> brackets, as in \fBel\fP=\eEK$<5>,
++and padding characters are supplied by \fBtputs\fP
+ to provide this delay.
++.bP
+ The delay must be a number with at most one decimal
+ place of precision; it may be followed by suffixes \*(``*\*('' or \*(``/\*('' or both.
++.bP
+ A \*(``*\*(''
+ indicates that the padding required is proportional to the number of lines
+ affected by the operation, and the amount given is the per-affected-unit
+ padding required.
+ (In the case of insert character, the factor is still the
+-number of
+-.IR lines
+-affected.)  Normally, padding is advisory if the device has the \fBxon\fR
++number of \fIlines\fP affected.)
++.IP
++Normally, padding is advisory if the device has the \fBxon\fR
+ capability; it is used for cost computation but does not trigger delays.
++.bP
+ A \*(``/\*(''
+ suffix indicates that the padding is mandatory and forces a delay of the given
+ number of milliseconds even on devices for which \fBxon\fR is present to
+@@ -409,16 +412,16 @@
+ avoiding interpreting "%\-" as an operator.
+ .TP
+ \f(CW%c\fP
+-print pop() like %c in \fBprintf\fP
++print \fIpop()\fP like %c in \fBprintf\fP
+ .TP
+ \fB%s\fP
+-print pop() like %s in \fBprintf\fP
++print \fIpop()\fP like %s in \fBprintf\fP
+ .TP
+ \fB%p\fP\fI[1\-9]\fP
+ push \fIi\fP'th parameter
+ .TP
+ \fB%P\fP\fI[a\-z]\fP
+-set dynamic variable \fI[a\-z]\fP to pop()
++set dynamic variable \fI[a\-z]\fP to \fIpop()\fP
+ .TP
+ \fB%g\fP\fI[a\-z]/\fP
+ get dynamic variable \fI[a\-z]\fP and push it
+@@ -445,7 +448,7 @@
+ push strlen(pop)
+ .TP
+ \fB%+\fP, \fB%\-\fP, \fB%*\fP, \fB%/\fP, \fB%m\fP
+-arithmetic (%m is mod): \fIpush(pop() op pop())\fP
++arithmetic (%m is \fImod\fP): \fIpush(pop() op pop())\fP
+ .TP
+ \fB%&\fP, \fB%|\fP, \fB%^\fP
+ bit operations (AND, OR and exclusive-OR): \fIpush(pop() op pop())\fP
+@@ -457,7 +460,7 @@
+ logical AND and OR operations (for conditionals)
+ .TP
+ \fB%!\fP, \fB%~\fP
+-unary operations (logical and bit complement): push(op pop())
++unary operations (logical and bit complement): \fIpush(op pop())\fP
+ .TP
+ \fB%i\fP
+ add 1 to first two parameters (for ANSI terminals)
+@@ -1156,9 +1159,8 @@
+ and
+ .BR is3
+ respectively.
+-These strings are output by the
+-.IR reset
+-program, which is used when the terminal gets into a wedged state.
++These strings are output by the \fB@RESET@\fP program,
++which is used when the terminal gets into a wedged state.
+ Commands are normally placed in
+ .BR rs1 ,
+ .BR rs2
+@@ -1173,10 +1175,7 @@
+ but it causes an annoying glitch of the screen and is not normally
+ needed since the terminal is usually already in 80 column mode.
+ .PP
+-The
+-.IR reset
+-program writes strings
+-including
++The \fB@RESET@\fP program writes strings including
+ .BR iprog ,
+ etc., in the same order as the
+ .IR init
+@@ -1191,8 +1190,7 @@
+ .BR rs3 ,
+ or
+ .BR rf
+-reset capability strings are missing, the
+-.IR reset
++reset capability strings are missing, the \fB@RESET@\fP 
+ program falls back upon the corresponding initialization capability string.
+ .PP
+ If there are commands to set and clear tab stops, they can be given as
+@@ -1365,7 +1363,7 @@
+ If the terminal
+ supports other escape sequences to set background and foreground, they should
+ be coded as \fBsetf\fR and \fBsetb\fR, respectively.
+-The \fIvidputs()\fR
++The \fBvidputs\fR
+ function and the refresh functions use \fBsetaf\fR and \fBsetab\fR if they are
+ defined."
+ .PP
+@@ -1656,13 +1654,13 @@
+ translations are much more strictly limited (to 1023 bytes), thus termcap translations
+ of long terminfo entries can cause problems.
+ .PP
+-The man pages for 4.3BSD and older versions of \fBtgetent()\fP instruct the user to
++The man pages for 4.3BSD and older versions of \fBtgetent\fP instruct the user to
+ allocate a 1024-byte buffer for the termcap entry.
+ The entry gets null-terminated by
+ the termcap library, so that makes the maximum safe length for a termcap entry
+ 1k\-1 (1023) bytes.
+ Depending on what the application and the termcap library
+-being used does, and where in the termcap file the terminal type that \fBtgetent()\fP
++being used does, and where in the termcap file the terminal type that \fBtgetent\fP
+ is searching for is, several bad things can happen.
+ .PP
+ Some termcap libraries print a warning message or exit if they find an
+@@ -1683,7 +1681,7 @@
+ affects more than just users of that particular terminal.
+ This is the
+ length of the entry as it exists in /etc/termcap, minus the
+-backslash-newline pairs, which \fBtgetent()\fP strips out while reading it.
++backslash-newline pairs, which \fBtgetent\fP strips out while reading it.
+ Some termcap libraries strip off the final newline, too (GNU termcap does not).
+ Now suppose:
+ .bP
+@@ -1695,12 +1693,12 @@
+ the whole entry into the buffer, no matter what its length, to see
+ if it is the entry it wants,
+ .bP
+-and \fBtgetent()\fP is searching for a terminal type that either is the
++and \fBtgetent\fP is searching for a terminal type that either is the
+ long entry, appears in the termcap file after the long entry, or
+-does not appear in the file at all (so that \fBtgetent()\fP has to search
++does not appear in the file at all (so that \fBtgetent\fP has to search
+ the whole termcap file).
+ .PP
+-Then \fBtgetent()\fP will overwrite memory, perhaps its stack, and probably core dump
++Then \fBtgetent\fP will overwrite memory, perhaps its stack, and probably core dump
+ the program.
+ Programs like telnet are particularly vulnerable; modern telnets
+ pass along values like the terminal type automatically.
+@@ -1713,7 +1711,7 @@
+ .PP
+ The "after tc expansion" length will have a similar effect to the
+ above, but only for people who actually set TERM to that terminal
+-type, since \fBtgetent()\fP only does "tc" expansion once it is found the
++type, since \fBtgetent\fP only does "tc" expansion once it is found the
+ terminal type it was looking for, not while searching.
+ .PP
+ In summary, a termcap entry that is longer than 1023 bytes can cause,
+Index: ncurses/llib-lncurses
+--- ncurses-6.0-20161008+/ncurses/llib-lncurses	2015-08-15 19:06:20.000000000 +0000
++++ ncurses-6.0-20161015/ncurses/llib-lncurses	2016-10-15 23:25:20.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2013,2015 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -3000,8 +3000,8 @@
+ /* ./tinfo/lib_baudrate.c */
+ 
+ struct speed {
+-    short s; 
+-    int sp; 
++    int given_speed; 
++    int actual_speed; 
+ };
+ 
+ #undef _nc_baudrate
+@@ -4269,6 +4269,14 @@
+ 		TERMTYPE *const tp)
+ 		{ /* void */ }
+ 
++#undef _nc_write_object
++int	_nc_write_object(
++		TERMTYPE *tp, 
++		char	*buffer, 
++		unsigned *offset, 
++		unsigned limit)
++		{ return(*(int *)0); }
++
+ #undef _nc_tic_written
+ int	_nc_tic_written(void)
+ 		{ return(*(int *)0); }
+Index: ncurses/llib-lncursest
+--- ncurses-6.0-20161008+/ncurses/llib-lncursest	2015-08-15 20:08:58.000000000 +0000
++++ ncurses-6.0-20161015/ncurses/llib-lncursest	2016-10-15 23:25:20.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2008-2013,2015 Free Software Foundation, Inc.              *
++ * Copyright (c) 2008-2015,2016 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -3015,8 +3015,8 @@
+ /* ./tinfo/lib_baudrate.c */
+ 
+ struct speed {
+-    short s; 
+-    int sp; 
++    int given_speed; 
++    int actual_speed; 
+ };
+ 
+ #undef _nc_baudrate
+@@ -4382,6 +4382,14 @@
+ 		TERMTYPE *const tp)
+ 		{ /* void */ }
+ 
++#undef _nc_write_object
++int	_nc_write_object(
++		TERMTYPE *tp, 
++		char	*buffer, 
++		unsigned *offset, 
++		unsigned limit)
++		{ return(*(int *)0); }
++
+ #undef _nc_tic_written
+ int	_nc_tic_written(void)
+ 		{ return(*(int *)0); }
+Index: ncurses/llib-lncursestw
+--- ncurses-6.0-20161008+/ncurses/llib-lncursestw	2015-08-15 19:07:52.000000000 +0000
++++ ncurses-6.0-20161015/ncurses/llib-lncursestw	2016-10-15 23:25:20.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2009-2013,2015 Free Software Foundation, Inc.              *
++ * Copyright (c) 2009-2015,2016 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -3798,8 +3798,8 @@
+ /* ./tinfo/lib_baudrate.c */
+ 
+ struct speed {
+-    short s; 
+-    int sp; 
++    int given_speed; 
++    int actual_speed; 
+ };
+ 
+ #undef _nc_baudrate
+@@ -5198,6 +5198,14 @@
+ 		TERMTYPE *const tp)
+ 		{ /* void */ }
+ 
++#undef _nc_write_object
++int	_nc_write_object(
++		TERMTYPE *tp, 
++		char	*buffer, 
++		unsigned *offset, 
++		unsigned limit)
++		{ return(*(int *)0); }
++
+ #undef _nc_tic_written
+ int	_nc_tic_written(void)
+ 		{ return(*(int *)0); }
+Index: ncurses/llib-lncursesw
+--- ncurses-6.0-20161008+/ncurses/llib-lncursesw	2015-08-15 20:03:43.000000000 +0000
++++ ncurses-6.0-20161015/ncurses/llib-lncursesw	2016-10-15 23:25:20.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2001-2013,2015 Free Software Foundation, Inc.              *
++ * Copyright (c) 2001-2015,2016 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -3783,8 +3783,8 @@
+ /* ./tinfo/lib_baudrate.c */
+ 
+ struct speed {
+-    short s; 
+-    int sp; 
++    int given_speed; 
++    int actual_speed; 
+ };
+ 
+ #undef _nc_baudrate
+@@ -5085,6 +5085,14 @@
+ 		TERMTYPE *const tp)
+ 		{ /* void */ }
+ 
++#undef _nc_write_object
++int	_nc_write_object(
++		TERMTYPE *tp, 
++		char	*buffer, 
++		unsigned *offset, 
++		unsigned limit)
++		{ return(*(int *)0); }
++
+ #undef _nc_tic_written
+ int	_nc_tic_written(void)
+ 		{ return(*(int *)0); }
+Index: ncurses/llib-ltic
+--- ncurses-6.0-20161008+/ncurses/llib-ltic	2015-08-15 19:06:29.000000000 +0000
++++ ncurses-6.0-20161015/ncurses/llib-ltic	2016-10-15 23:24:41.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2012,2015 Free Software Foundation, Inc.                   *
++ * Copyright (c) 2012-2015,2016 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -34,6 +34,7 @@
+ /* ./tinfo/alloc_entry.c */
+ 
+ #include 
++
+ #undef _nc_init_entry
+ void	_nc_init_entry(
+ 		TERMTYPE *const tp)
+@@ -196,6 +197,14 @@
+ 		TERMTYPE *const tp)
+ 		{ /* void */ }
+ 
++#undef _nc_write_object
++int	_nc_write_object(
++		TERMTYPE *tp, 
++		char	*buffer, 
++		unsigned *offset, 
++		unsigned limit)
++		{ return(*(int *)0); }
++
+ #undef _nc_tic_written
+ int	_nc_tic_written(void)
+ 		{ return(*(int *)0); }
+Index: ncurses/llib-ltict
+--- ncurses-6.0-20161008+/ncurses/llib-ltict	2015-08-15 19:08:45.000000000 +0000
++++ ncurses-6.0-20161015/ncurses/llib-ltict	2016-10-15 23:24:41.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2013,2015 Free Software Foundation, Inc.                   *
++ * Copyright (c) 2013-2015,2016 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -34,6 +34,7 @@
+ /* ./tinfo/alloc_entry.c */
+ 
+ #include 
++
+ #undef _nc_init_entry
+ void	_nc_init_entry(
+ 		TERMTYPE *const tp)
+@@ -196,6 +197,14 @@
+ 		TERMTYPE *const tp)
+ 		{ /* void */ }
+ 
++#undef _nc_write_object
++int	_nc_write_object(
++		TERMTYPE *tp, 
++		char	*buffer, 
++		unsigned *offset, 
++		unsigned limit)
++		{ return(*(int *)0); }
++
+ #undef _nc_tic_written
+ int	_nc_tic_written(void)
+ 		{ return(*(int *)0); }
+Index: ncurses/llib-ltictw
+--- ncurses-6.0-20161008+/ncurses/llib-ltictw	2015-08-15 19:08:02.000000000 +0000
++++ ncurses-6.0-20161015/ncurses/llib-ltictw	2016-10-15 23:24:41.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2012,2015 Free Software Foundation, Inc.                   *
++ * Copyright (c) 2012-2015,2016 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -34,6 +34,7 @@
+ /* ./tinfo/alloc_entry.c */
+ 
+ #include 
++
+ #undef _nc_init_entry
+ void	_nc_init_entry(
+ 		TERMTYPE *const tp)
+@@ -196,6 +197,14 @@
+ 		TERMTYPE *const tp)
+ 		{ /* void */ }
+ 
++#undef _nc_write_object
++int	_nc_write_object(
++		TERMTYPE *tp, 
++		char	*buffer, 
++		unsigned *offset, 
++		unsigned limit)
++		{ return(*(int *)0); }
++
+ #undef _nc_tic_written
+ int	_nc_tic_written(void)
+ 		{ return(*(int *)0); }
+Index: ncurses/llib-lticw
+--- ncurses-6.0-20161008+/ncurses/llib-lticw	2015-08-15 19:07:15.000000000 +0000
++++ ncurses-6.0-20161015/ncurses/llib-lticw	2016-10-15 23:24:41.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2012,2015 Free Software Foundation, Inc.                   *
++ * Copyright (c) 2012-2015,2016 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -34,6 +34,7 @@
+ /* ./tinfo/alloc_entry.c */
+ 
+ #include 
++
+ #undef _nc_init_entry
+ void	_nc_init_entry(
+ 		TERMTYPE *const tp)
+@@ -196,6 +197,14 @@
+ 		TERMTYPE *const tp)
+ 		{ /* void */ }
+ 
++#undef _nc_write_object
++int	_nc_write_object(
++		TERMTYPE *tp, 
++		char	*buffer, 
++		unsigned *offset, 
++		unsigned limit)
++		{ return(*(int *)0); }
++
+ #undef _nc_tic_written
+ int	_nc_tic_written(void)
+ 		{ return(*(int *)0); }
+Index: ncurses/llib-ltinfo
+--- ncurses-6.0-20161008+/ncurses/llib-ltinfo	2015-08-15 19:06:34.000000000 +0000
++++ ncurses-6.0-20161015/ncurses/llib-ltinfo	2016-10-15 23:24:41.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2012-2013,2015 Free Software Foundation, Inc.              *
++ * Copyright (c) 2012-2015,2016 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -34,6 +34,7 @@
+ /* ./tinfo/access.c */
+ 
+ #include 
++
+ #undef _nc_rootname
+ char	*_nc_rootname(
+ 		char	*path)
+@@ -318,8 +319,8 @@
+ /* ./tinfo/lib_baudrate.c */
+ 
+ struct speed {
+-    short s; 
+-    int sp; 
++    int given_speed; 
++    int actual_speed; 
+ };
+ 
+ #undef _nc_baudrate
+Index: ncurses/llib-ltinfot
+--- ncurses-6.0-20161008+/ncurses/llib-ltinfot	2015-08-15 19:08:50.000000000 +0000
++++ ncurses-6.0-20161015/ncurses/llib-ltinfot	2016-10-15 23:24:41.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2013,2015 Free Software Foundation, Inc.                   *
++ * Copyright (c) 2013-2015,2016 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -34,6 +34,7 @@
+ /* ./tinfo/access.c */
+ 
+ #include 
++
+ #undef _nc_rootname
+ char	*_nc_rootname(
+ 		char	*path)
+@@ -324,8 +325,8 @@
+ /* ./tinfo/lib_baudrate.c */
+ 
+ struct speed {
+-    short s; 
+-    int sp; 
++    int given_speed; 
++    int actual_speed; 
+ };
+ 
+ #undef _nc_baudrate
+Index: ncurses/llib-ltinfotw
+--- ncurses-6.0-20161008+/ncurses/llib-ltinfotw	2015-08-15 19:08:08.000000000 +0000
++++ ncurses-6.0-20161015/ncurses/llib-ltinfotw	2016-10-15 23:24:41.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2012-2013,2015 Free Software Foundation, Inc.              *
++ * Copyright (c) 2012-2015,2016 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -34,6 +34,7 @@
+ /* ./tinfo/access.c */
+ 
+ #include 
++
+ #undef _nc_rootname
+ char	*_nc_rootname(
+ 		char	*path)
+@@ -324,8 +325,8 @@
+ /* ./tinfo/lib_baudrate.c */
+ 
+ struct speed {
+-    short s; 
+-    int sp; 
++    int given_speed; 
++    int actual_speed; 
+ };
+ 
+ #undef _nc_baudrate
+Index: ncurses/llib-ltinfow
+--- ncurses-6.0-20161008+/ncurses/llib-ltinfow	2015-08-15 19:07:20.000000000 +0000
++++ ncurses-6.0-20161015/ncurses/llib-ltinfow	2016-10-15 23:24:41.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2012-2013,2015 Free Software Foundation, Inc.              *
++ * Copyright (c) 2012-2015,2016 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -34,6 +34,7 @@
+ /* ./tinfo/access.c */
+ 
+ #include 
++
+ #undef _nc_rootname
+ char	*_nc_rootname(
+ 		char	*path)
+@@ -318,8 +319,8 @@
+ /* ./tinfo/lib_baudrate.c */
+ 
+ struct speed {
+-    short s; 
+-    int sp; 
++    int given_speed; 
++    int actual_speed; 
+ };
+ 
+ #undef _nc_baudrate
+Index: ncurses/tty/tty_update.c
+Prereq:  1.283 
+--- ncurses-6.0-20161008+/ncurses/tty/tty_update.c	2016-05-28 23:32:40.000000000 +0000
++++ ncurses-6.0-20161015/ncurses/tty/tty_update.c	2016-10-15 23:00:29.000000000 +0000
+@@ -82,7 +82,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: tty_update.c,v 1.283 2016/05/28 23:32:40 tom Exp $")
++MODULE_ID("$Id: tty_update.c,v 1.284 2016/10/15 23:00:29 tom Exp $")
+ 
+ /*
+  * This define controls the line-breakout optimization.  Every once in a
+@@ -676,7 +676,7 @@
+ 					TPARM_2(repeat_char,
+ 						CharOf(ntext0),
+ 						rep_count),
+-					rep_count,
++					1,
+ 					NCURSES_SP_NAME(_nc_outch));
+ 		SP_PARM->_curscol += rep_count;
+ 
+@@ -1736,7 +1736,7 @@
+ 	TPUTS_TRACE("parm_ich");
+ 	NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
+ 				TPARM_1(parm_ich, count),
+-				count,
++				1,
+ 				NCURSES_SP_NAME(_nc_outch));
+ 	while (count) {
+ 	    PutAttrChar(NCURSES_SP_ARGx CHREF(*line));
+@@ -1789,7 +1789,7 @@
+ 	TPUTS_TRACE("parm_dch");
+ 	NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
+ 				TPARM_1(parm_dch, count),
+-				count,
++				1,
+ 				NCURSES_SP_NAME(_nc_outch));
+     } else {
+ 	int n;
+Index: package/debian-mingw/changelog
+--- ncurses-6.0-20161008+/package/debian-mingw/changelog	2016-10-03 00:57:15.000000000 +0000
++++ ncurses-6.0-20161015/package/debian-mingw/changelog	2016-10-15 15:43:49.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161008) unstable; urgency=low
++ncurses6 (6.0+20161015) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 02 Oct 2016 20:57:15 -0400
++ -- Thomas E. Dickey   Sat, 15 Oct 2016 11:43:49 -0400
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.0-20161008+/package/debian-mingw64/changelog	2016-10-03 00:57:15.000000000 +0000
++++ ncurses-6.0-20161015/package/debian-mingw64/changelog	2016-10-15 15:43:49.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161008) unstable; urgency=low
++ncurses6 (6.0+20161015) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 02 Oct 2016 20:57:15 -0400
++ -- Thomas E. Dickey   Sat, 15 Oct 2016 11:43:49 -0400
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.0-20161008+/package/debian/changelog	2016-10-03 00:57:15.000000000 +0000
++++ ncurses-6.0-20161015/package/debian/changelog	2016-10-15 15:43:49.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161008) unstable; urgency=low
++ncurses6 (6.0+20161015) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 02 Oct 2016 20:57:15 -0400
++ -- Thomas E. Dickey   Sat, 15 Oct 2016 11:43:49 -0400
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.179 
+--- ncurses-6.0-20161008+/package/mingw-ncurses.nsi	2016-10-03 00:57:15.000000000 +0000
++++ ncurses-6.0-20161015/package/mingw-ncurses.nsi	2016-10-15 15:43:49.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.179 2016/10/03 00:57:15 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.180 2016/10/15 15:43:49 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "0"
+ !define VERSION_YYYY  "2016"
+-!define VERSION_MMDD  "1008"
++!define VERSION_MMDD  "1015"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.0-20161008+/package/mingw-ncurses.spec	2016-10-03 00:57:15.000000000 +0000
++++ ncurses-6.0-20161015/package/mingw-ncurses.spec	2016-10-15 15:43:49.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.0
+-Release: 20161008
++Release: 20161015
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.0-20161008+/package/ncurses.spec	2016-10-03 00:57:15.000000000 +0000
++++ ncurses-6.0-20161015/package/ncurses.spec	2016-10-15 15:43:49.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.0
+-Release: 20161008
++Release: 20161015
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/ncurses-6.0-20161022.patch b/ncurses-6.0-20161022.patch
new file mode 100644
index 0000000..52c183e
--- /dev/null
+++ b/ncurses-6.0-20161022.patch
@@ -0,0 +1,1804 @@
+# ncurses 6.0 - patch 20161022 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.0 is at
+# 	ftp.gnu.org:/pub/gnu
+#
+# Patches for ncurses 6.0 can be found at
+# 	ftp://invisible-island.net/ncurses/6.0
+#	http://invisible-mirror.net/archives/ncurses/6.0 
+#
+# ------------------------------------------------------------------------------
+# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20161022.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Oct 23 01:59:31 UTC 2016
+# ------------------------------------------------------------------------------
+# MANIFEST                                                   |    6 
+# NEWS                                                       |   14 
+# VERSION                                                    |    2 
+# dist.mk                                                    |    4 
+# doc/html/man/captoinfo.1m.html                             |    2 
+# doc/html/man/clear.1.html                                  |    2 
+# doc/html/man/curs_inopts.3x.html                           |    4 
+# doc/html/man/form.3x.html                                  |    2 
+# doc/html/man/infocmp.1m.html                               |    8 
+# doc/html/man/infotocap.1m.html                             |    2 
+# doc/html/man/menu.3x.html                                  |    2 
+# doc/html/man/ncurses.3x.html                               |    2 
+# doc/html/man/panel.3x.html                                 |    2 
+# doc/html/man/tabs.1.html                                   |    6 
+# doc/html/man/term.5.html                                   |    2 
+# doc/html/man/terminfo.5.html                               |    8 
+# doc/html/man/tic.1m.html                                   |    2 
+# doc/html/man/toe.1m.html                                   |    2 
+# doc/html/man/tput.1.html                                   |  207 +++++------
+# doc/html/man/tset.1.html                                   |    2 
+# man/curs_inopts.3x                                         |    4 
+# man/infocmp.1m                                             |    6 
+# man/tabs.1                                                 |    4 
+# man/term.5                                                 |    8 
+# man/terminfo.tail                                          |    9 
+# man/tput.1                                                 |   29 -
+# ncurses-6.0-20161022/doc/html/man/adacurses6-config.1.html |  151 ++++++++
+# ncurses-6.0-20161022/doc/html/man/ncurses6-config.1.html   |  133 +++++++
+# ncurses-6.0-20161022/progs/clear_cmd.c                     |   59 +++
+# ncurses-6.0-20161022/progs/clear_cmd.h                     |   44 ++
+# package/debian-mingw/changelog                             |    4 
+# package/debian-mingw64/changelog                           |    4 
+# package/debian/changelog                                   |    4 
+# package/mingw-ncurses.nsi                                  |    4 
+# package/mingw-ncurses.spec                                 |    2 
+# package/ncurses.spec                                       |    2 
+# progs/Makefile.in                                          |    8 
+# progs/clear.c                                              |   23 -
+# progs/modules                                              |    3 
+# progs/reset_cmd.c                                          |   24 -
+# progs/reset_cmd.h                                          |    4 
+# progs/tput.c                                               |   43 +-
+# progs/tset.c                                               |    4 
+# 43 files changed, 639 insertions(+), 218 deletions(-)
+# ------------------------------------------------------------------------------
+# Please remove the following files before applying this patch.
+# (You can feed this patch to 'sh' to do so.)
+
+rm -f doc/html/man/adacurses-config.1.html
+rm -f doc/html/man/ncurses5-config.1.html
+exit
+
+Index: MANIFEST
+--- ncurses-6.0-20161015+/MANIFEST	2016-09-18 00:39:59.000000000 +0000
++++ ncurses-6.0-20161022/MANIFEST	2016-10-22 20:16:37.000000000 +0000
+@@ -342,7 +342,7 @@
+ ./doc/html/announce.html
+ ./doc/html/hackguide.html
+ ./doc/html/index.html
+-./doc/html/man/adacurses-config.1.html
++./doc/html/man/adacurses6-config.1.html
+ ./doc/html/man/captoinfo.1m.html
+ ./doc/html/man/clear.1.html
+ ./doc/html/man/curs_add_wch.3x.html
+@@ -463,7 +463,7 @@
+ ./doc/html/man/mitem_value.3x.html
+ ./doc/html/man/mitem_visible.3x.html
+ ./doc/html/man/ncurses.3x.html
+-./doc/html/man/ncurses5-config.1.html
++./doc/html/man/ncurses6-config.1.html
+ ./doc/html/man/panel.3x.html
+ ./doc/html/man/resizeterm.3x.html
+ ./doc/html/man/tabs.1.html
+@@ -1047,6 +1047,8 @@
+ ./progs/capconvert
+ ./progs/clear.c
+ ./progs/clear.sh
++./progs/clear_cmd.c
++./progs/clear_cmd.h
+ ./progs/dump_entry.c
+ ./progs/dump_entry.h
+ ./progs/infocmp.c
+Index: NEWS
+Prereq:  1.2682 
+--- ncurses-6.0-20161015+/NEWS	2016-10-15 23:26:53.000000000 +0000
++++ ncurses-6.0-20161022/NEWS	2016-10-23 00:03:47.000000000 +0000
+@@ -25,7 +25,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.2682 2016/10/15 23:26:53 tom Exp $
++-- $Id: NEWS,v 1.2687 2016/10/23 00:03:47 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -45,6 +45,18 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20161022
++	+ modify tset -w (and tput reset) to update the program's copy of the
++	  screensize if it was already set in the system, to improve tabstop
++	  setting which relies upon knowing the actual screensize.
++	+ add functionality of tset -w to tput, like the "-c" feature this is
++	  not optional in tput.
++	+ add "clear" as a possible link/alias to tput.
++	+ improve tput's check for being called as "init" or "reset" to allow
++	  for transformed names.
++	+ split-out the "clear" function from progs/clear.c, share with
++	  tput to get the same behavior, e.g., the E3 extension.
++
+ 20161015
+ 	+ amend internal use of tputs to consistently use the number of lines
+ 	  affected, e.g., for insert/delete character operations.  While
+Index: VERSION
+--- ncurses-6.0-20161015+/VERSION	2016-10-15 15:43:49.000000000 +0000
++++ ncurses-6.0-20161022/VERSION	2016-10-21 22:47:18.000000000 +0000
+@@ -1 +1 @@
+-5:0:9	6.0	20161015
++5:0:9	6.0	20161022
+Index: dist.mk
+Prereq:  1.1128 
+--- ncurses-6.0-20161015+/dist.mk	2016-10-15 15:43:49.000000000 +0000
++++ ncurses-6.0-20161022/dist.mk	2016-10-21 22:47:18.000000000 +0000
+@@ -25,7 +25,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1128 2016/10/15 15:43:49 tom Exp $
++# $Id: dist.mk,v 1.1129 2016/10/21 22:47:18 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -37,7 +37,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 0
+-NCURSES_PATCH = 20161015
++NCURSES_PATCH = 20161022
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/man/adacurses6-config.1.html
+--- /dev/null	2016-10-22 18:36:25.655999441 +0000
++++ ncurses-6.0-20161022/doc/html/man/adacurses6-config.1.html	2016-10-22 20:13:52.000000000 +0000
+@@ -0,0 +1,151 @@
++
++
++
++
++
++
++ADACURSES 1   User Commands
++
++
++
++
++
    ADACURSES 1   User Commands
    
++
    ++ADACURSES(1)                 User Commands                 ADACURSES(1)
++
++
++
++
++
    NAME
    ++       adacurses-config - helper script for AdaCurses libraries
++
++
++
    SYNOPSIS
    ++       adacurses-config [options]
++
++
++
    DESCRIPTION
    ++       This  is  a  shell  script which simplifies configuring an
++       application  to  use  the  AdaCurses  library  binding  to
++       ncurses.
++
++
++
    OPTIONS
    ++       --cflags
++              echos  the gnat (Ada compiler) flags needed to com-
++              pile with AdaCurses.
++
++       --libs echos  the  gnat  libraries  needed  to  link  with
++              AdaCurses.
++
++       --version
++              echos  the release+patchdate version of the ncurses
++              libraries used to configure and build AdaCurses.
++
++       --help prints a  list  of  the  adacurses-config  script's
++              options.
++
++       If  no options are given, adacurses-config prints the com-
++       bination of --cflags and --libs that gnatmake expects (see
++       example).
++
++
++
    EXAMPLE
    ++       For example, supposing that you want to compile the "Hello
++       World!"   program  for  AdaCurses.   Make  a  file   named
++       "hello.adb":
++              with Terminal_Interface.Curses; use Terminal_Interface.Curses;
++
++              procedure Hello is
++
++                 Visibility : Cursor_Visibility := Invisible;
++                 done : Boolean := False;
++                 c : Key_Code;
++
++              begin
++
++                 Init_Screen;
++                 Set_Echo_Mode (False);
++
++                 Set_Cursor_Visibility (Visibility);
++                 Set_Timeout_Mode (Standard_Window, Non_Blocking, 0);
++
++                 Move_Cursor (Line => Lines / 2, Column => (Columns - 12) / 2);
++                 Add (Str => "Hello World!");
++
++                 while not done loop
++
++                    c := Get_Keystroke (Standard_Window);
++                    case c is
++                    when Character'Pos ('q') => done := True;
++                    when others => null;
++                    end case;
++
++                    Nap_Milli_Seconds (50);
++
++                 end loop;
++
++                 End_Windows;
++
++              end Hello;
++
++       Then, using
++              gnatmake  `adacurses-config  --cflags` hello -largs
++              `adacurses-config --libs`
++
++       or (simpler):
++              gnatmake hello `adacurses-config`
++
++       you will compile and link the program.
++
++
++
    SEE ALSO
    ++       curses(3x)
++
++       This describes ncurses version 6.0 (patch 20161022).
++
++
++
++                                                           ADACURSES(1)
++
    
++
    
++
++
    
++
++
+Index: doc/html/man/captoinfo.1m.html
+--- ncurses-6.0-20161015+/doc/html/man/captoinfo.1m.html	2016-10-15 23:12:19.000000000 +0000
++++ ncurses-6.0-20161022/doc/html/man/captoinfo.1m.html	2016-10-22 20:13:52.000000000 +0000
+@@ -198,7 +198,7 @@
+ 
    SEE ALSO
    +        infocmp(1m), curses(3x), terminfo(5)
+ 
+-       This describes ncurses version 6.0 (patch 20161015).
++       This describes ncurses version 6.0 (patch 20161022).
+ 
+ 
+ 
    AUTHOR
    +Index: doc/html/man/clear.1.html
+--- ncurses-6.0-20161015+/doc/html/man/clear.1.html	2016-10-15 23:12:19.000000000 +0000
++++ ncurses-6.0-20161022/doc/html/man/clear.1.html	2016-10-22 20:13:52.000000000 +0000
+@@ -67,7 +67,7 @@
+ 
    SEE ALSO
    +        tput(1), terminfo(5)
+ 
+-       This describes ncurses version 6.0 (patch 20161015).
++       This describes ncurses version 6.0 (patch 20161022).
+ 
+ 
+ 
+Index: doc/html/man/curs_inopts.3x.html
+--- ncurses-6.0-20161015+/doc/html/man/curs_inopts.3x.html	2016-10-15 23:12:20.000000000 +0000
++++ ncurses-6.0-20161022/doc/html/man/curs_inopts.3x.html	2016-10-22 20:13:53.000000000 +0000
+@@ -26,7 +26,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_inopts.3x,v 1.22 2016/10/15 17:13:45 tom Exp @
++  * @Id: curs_inopts.3x,v 1.23 2016/10/22 19:54:35 tom Exp @
+ -->
+ 
+ 
+@@ -257,7 +257,7 @@
+        When keypad is first enabled, ncurses loads the  key-defi-
+        nitions for the current terminal description.  If the ter-
+        minal description includes extended  string  capabilities,
+-       e.g.,  from  using the -x option of tic, then ncurses also
++       e.g.,  from  using the -x option of tic, then ncurses also
+        defines keys for the capabilities whose names  begin  with
+        "k".   The  corresponding  keycodes are generated and (de-
+        pending on previous loads of  terminal  descriptions)  may
+Index: doc/html/man/form.3x.html
+--- ncurses-6.0-20161015+/doc/html/man/form.3x.html	2016-10-15 23:12:22.000000000 +0000
++++ ncurses-6.0-20161022/doc/html/man/form.3x.html	2016-10-22 20:13:54.000000000 +0000
+@@ -235,7 +235,7 @@
+        curses(3x) and related pages whose names begin "form_" for
+        detailed descriptions of the entry points.
+ 
+-       This describes ncurses version 6.0 (patch 20161015).
++       This describes ncurses version 6.0 (patch 20161022).
+ 
+ 
+ 
+Index: doc/html/man/infocmp.1m.html
+--- ncurses-6.0-20161015+/doc/html/man/infocmp.1m.html	2016-10-15 23:12:22.000000000 +0000
++++ ncurses-6.0-20161022/doc/html/man/infocmp.1m.html	2016-10-22 20:13:55.000000000 +0000
+@@ -27,7 +27,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: infocmp.1m,v 1.58 2016/10/01 17:15:45 tom Exp @
++  * @Id: infocmp.1m,v 1.59 2016/10/22 19:54:35 tom Exp @
+ -->
+ 
+ 
+@@ -121,7 +121,7 @@
+ 
+        For best results when converting to  termcap  format,  you
+        should use both -C and -r.  Normally a termcap description
+-       is limited to 1023 bytes.  infocmp trims away less  essen-
++       is limited to 1023 bytes.  infocmp trims away less  essen-
+        tial  parts  to make it fit.  If you are converting to one
+        of the (rare)  termcap  implementations  which  accept  an
+        unlimited  size  of  termcap,  you  may want to add the -T
+@@ -216,7 +216,7 @@
+        needed.
+ 
+    Changing Databases [-A directory] [-B directory]
+-       Like other ncurses utilities, infocmp looks for the termi-
++       Like other ncurses utilities, infocmp looks for the termi-
+        nal descriptions in several places.  You can use the  TER-
+        MINFO  and TERMINFO_DIRS environment variables to override
+        the compiled-in default list  of  places  to  search  (see
+@@ -478,7 +478,7 @@
+ 
+        http://invisible-island.net/ncurses/tctest.html
+ 
+-       This describes ncurses version 6.0 (patch 20161015).
++       This describes ncurses version 6.0 (patch 20161022).
+ 
+ 
+ 
    AUTHOR
    +Index: doc/html/man/infotocap.1m.html
+--- ncurses-6.0-20161015+/doc/html/man/infotocap.1m.html	2016-10-15 23:12:22.000000000 +0000
++++ ncurses-6.0-20161022/doc/html/man/infotocap.1m.html	2016-10-22 20:13:55.000000000 +0000
+@@ -88,7 +88,7 @@
+ 
    SEE ALSO
    +        curses(3x), tic(1m), infocmp(1m), terminfo(5)
+ 
+-       This describes ncurses version 6.0 (patch 20161015).
++       This describes ncurses version 6.0 (patch 20161022).
+ 
+ 
+ 
    AUTHOR
    +Index: doc/html/man/menu.3x.html
+--- ncurses-6.0-20161015+/doc/html/man/menu.3x.html	2016-10-15 23:12:23.000000000 +0000
++++ ncurses-6.0-20161022/doc/html/man/menu.3x.html	2016-10-22 20:13:55.000000000 +0000
+@@ -217,7 +217,7 @@
+        curses(3x) and related pages whose names begin "menu_" for
+        detailed descriptions of the entry points.
+ 
+-       This describes ncurses version 6.0 (patch 20161015).
++       This describes ncurses version 6.0 (patch 20161022).
+ 
+ 
+ 
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.0-20161015+/doc/html/man/ncurses.3x.html	2016-10-15 23:12:23.000000000 +0000
++++ ncurses-6.0-20161022/doc/html/man/ncurses.3x.html	2016-10-22 20:13:56.000000000 +0000
+@@ -60,7 +60,7 @@
+        sonable optimization.  This implementation is "new curses"
+        (ncurses) and is the approved replacement for 4.4BSD clas-
+        sic  curses,  which has been discontinued.  This describes
+-       ncurses version 6.0 (patch 20161015).
++       ncurses version 6.0 (patch 20161022).
+ 
+        The ncurses library emulates the curses library of  System
+        V  Release  4  UNIX,  and  XPG4 (X/Open Portability Guide)
+Index: doc/html/man/ncurses6-config.1.html
+--- /dev/null	2016-10-22 18:36:25.655999441 +0000
++++ ncurses-6.0-20161022/doc/html/man/ncurses6-config.1.html	2016-10-22 20:13:56.000000000 +0000
+@@ -0,0 +1,133 @@
++
++
++
++
++
++
++ncurses6-config 1
++
++
++
++
++
    ncurses6-config 1
    
++
    ++ncurses6-config(1)                                   ncurses6-config(1)
++
++
++
++
++
    NAME
    ++       ncurses6-config - helper script for ncurses libraries
++
++
++
    SYNOPSIS
    ++       ncurses6-config [options]
++
++
++
    DESCRIPTION
    ++       This is a shell script which simplifies configuring appli-
++       cations against a particular set of ncurses libraries.
++
++
++
    OPTIONS
    ++       --prefix
++              echos the package-prefix of ncurses
++
++       --exec-prefix
++              echos the executable-prefix of ncurses
++
++       --cflags
++              echos the C compiler flags needed to  compile  with
++              ncurses
++
++       --libs echos the libraries needed to link with ncurses
++
++       --version
++              echos the release+patchdate version of ncurses
++
++       --abi-version
++              echos the ABI version of ncurses
++
++       --mouse-version
++              echos the mouse-interface version of ncurses
++
++       --bindir
++              echos the directory containing ncurses programs
++
++       --datadir
++              echos the directory containing ncurses data
++
++       --includedir
++              echos the directory containing ncurses header files
++
++       --libdir
++              echos the directory containing ncurses libraries
++
++       --mandir
++              echos the directory containing ncurses manpages
++
++       --terminfo
++              echos the $TERMINFO terminfo database path, e.g.,
++              /usr/share/terminfo
++
++       --terminfo-dirs
++              echos the $TERMINFO_DIRS directory list, e.g.,
++              /usr/local/ncurses/share/terminfo:/usr/share/ter-
++              minfo
++
++       --termpath
++              echos the $TERMPATH termcap list,  if  support  for
++              termcap is configured.
++
++       --help prints this message
++
++
++
    SEE ALSO
    ++       curses(3x)
++
++       This describes ncurses version 6.0 (patch 20161022).
++
++
++
++                                                     ncurses6-config(1)
++
    
++
    
++
++
    
++
++
+Index: doc/html/man/panel.3x.html
+--- ncurses-6.0-20161015+/doc/html/man/panel.3x.html	2016-10-15 23:12:23.000000000 +0000
++++ ncurses-6.0-20161022/doc/html/man/panel.3x.html	2016-10-22 20:13:56.000000000 +0000
+@@ -208,7 +208,7 @@
+ 
    SEE ALSO
    +        curses(3x), curs_variables(3x),
+ 
+-       This describes ncurses version 6.0 (patch 20161015).
++       This describes ncurses version 6.0 (patch 20161022).
+ 
+ 
+ 
    AUTHOR
    +Index: doc/html/man/tabs.1.html
+--- ncurses-6.0-20161015+/doc/html/man/tabs.1.html	2016-10-15 23:12:23.000000000 +0000
++++ ncurses-6.0-20161022/doc/html/man/tabs.1.html	2016-10-22 20:13:56.000000000 +0000
+@@ -26,7 +26,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: tabs.1,v 1.13 2016/10/15 16:16:38 tom Exp @
++  * @Id: tabs.1,v 1.14 2016/10/22 19:54:35 tom Exp @
+ -->
+ 
+ 
+@@ -148,7 +148,7 @@
+            terminal database provide this capability.
+ 
+        o   There  is  no counterpart in X/Open Curses Issue 7 for
+-           this utility, unlike tput(1).
++           this utility, unlike tput(1).
+ 
+        The -d (debug) and -n (no-op) options are  extensions  not
+        provided by other implementations.
+@@ -164,7 +164,7 @@
+ 
    SEE ALSO
    +        tset(1), infocmp(1m), curses(3x), terminfo(5).
+ 
+-       This describes ncurses version 6.0 (patch 20161015).
++       This describes ncurses version 6.0 (patch 20161022).
+ 
+ 
+ 
+Index: doc/html/man/term.5.html
+--- ncurses-6.0-20161015+/doc/html/man/term.5.html	2016-10-15 23:12:24.000000000 +0000
++++ ncurses-6.0-20161022/doc/html/man/term.5.html	2016-10-22 20:13:56.000000000 +0000
+@@ -26,7 +26,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: term.5,v 1.23 2016/10/15 17:02:31 tom Exp @
++  * @Id: term.5,v 1.24 2016/10/22 19:55:01 tom Exp @
+ -->
+ 
+ 
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.0-20161015+/doc/html/man/terminfo.5.html	2016-10-15 23:12:24.000000000 +0000
++++ ncurses-6.0-20161022/doc/html/man/terminfo.5.html	2016-10-22 20:13:57.000000000 +0000
+@@ -33,7 +33,7 @@
+   ****************************************************************************
+   * @Id: terminfo.head,v 1.22 2016/10/15 17:02:31 tom Exp @
+   * Head of terminfo man page ends here
+-  * @Id: terminfo.tail,v 1.72 2016/10/15 18:34:58 tom Exp @
++  * @Id: terminfo.tail,v 1.73 2016/10/22 19:56:17 tom Exp @
+   * Beginning of terminfo.tail file
+   * This file is part of ncurses.
+   * See "terminfo.head" for copyright.
+@@ -75,7 +75,7 @@
+        nals by giving a set of capabilities which they  have,  by
+        specifying how to perform screen operations, and by speci-
+        fying padding requirements and  initialization  sequences.
+-       This describes ncurses version 6.0 (patch 20161015).
++       This describes ncurses version 6.0 (patch 20161022).
+ 
+        Entries in terminfo consist of a sequence of `,' separated
+        fields (embedded commas may be escaped with a backslash or
+@@ -1886,7 +1886,7 @@
+        initially  set every n spaces when the terminal is powered
+        up, the numeric parameter it is given, showing the  number
+        of  spaces  the tabs are set to.  This is normally used by
+-       the tset command to determine whether to set the mode  for
++       the tset command to determine whether to set the mode  for
+        hardware  tab expansion, and whether to set the tab stops.
+        If the terminal has tab stops that can be  saved  in  non-
+        volatile  memory, the terminfo description can assume that
+@@ -1899,7 +1899,7 @@
+        These strings are expected to set the terminal into  modes
+        consistent  with  the  rest  of  the terminfo description.
+        They are normally sent to the terminal, by the init option
+-       of  the  tput  program,  each time the user logs in.  They
++       of  the  tput  program,  each time the user logs in.  They
+        will be printed in the following order:
+ 
+               run the program
+Index: doc/html/man/tic.1m.html
+--- ncurses-6.0-20161015+/doc/html/man/tic.1m.html	2016-10-15 23:12:24.000000000 +0000
++++ ncurses-6.0-20161022/doc/html/man/tic.1m.html	2016-10-22 20:13:57.000000000 +0000
+@@ -401,7 +401,7 @@
+        infocmp(1m),   captoinfo(1m),   infotocap(1m),    toe(1m),
+        curses(3x), term(5).  terminfo(5).
+ 
+-       This describes ncurses version 6.0 (patch 20161015).
++       This describes ncurses version 6.0 (patch 20161022).
+ 
+ 
+ 
    AUTHOR
    +Index: doc/html/man/toe.1m.html
+--- ncurses-6.0-20161015+/doc/html/man/toe.1m.html	2016-10-15 23:12:24.000000000 +0000
++++ ncurses-6.0-20161022/doc/html/man/toe.1m.html	2016-10-22 20:13:57.000000000 +0000
+@@ -117,7 +117,7 @@
+        tic(1m),   infocmp(1m),   captoinfo(1m),    infotocap(1m),
+        curses(3x), terminfo(5).
+ 
+-       This describes ncurses version 6.0 (patch 20161015).
++       This describes ncurses version 6.0 (patch 20161022).
+ 
+ 
+ 
+Index: doc/html/man/tput.1.html
+--- ncurses-6.0-20161015+/doc/html/man/tput.1.html	2016-10-15 23:12:24.000000000 +0000
++++ ncurses-6.0-20161022/doc/html/man/tput.1.html	2016-10-22 20:13:57.000000000 +0000
+@@ -27,7 +27,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: tput.1,v 1.44 2016/08/20 23:40:31 tom Exp @
++  * @Id: tput.1,v 1.46 2016/10/22 19:57:25 tom Exp @
+ -->
+ 
+ 
+@@ -170,43 +170,46 @@
+ 
+ 
+ 
    Aliases
    +-       tput  handles  the  init  and reset commands specially: it
+-       allows for the possibility that it is invoked  by  a  link
++       tput handles the clear, init and reset commands specially:
++       it allows for the possibility that it is invoked by a link
+        with those names.
+ 
+        If  tput  is  invoked  by a link named reset, this has the
+        same effect as  tput  reset.   The  tset(1)  utility  also
+-       treats a link named reset specially:
++       treats a link named reset specially.
+ 
+-       o   That  utility  resets  the  terminal modes and special
+-           characters (not done here).
++       Before  ncurses 6.1, the two utilities were different from
++       each other:
+ 
+-       o   On the other hand, tset's repertoire of terminal capa-
+-           bilities  for  resetting the terminal is more limited,
++       o   tset utility reset  the  terminal  modes  and  special
++           characters (not done with tput).
++
++       o   On the other hand, tset's repertoire of terminal capa-
++           bilities for resetting the terminal was more  limited,
+            i.e., only reset_1string, reset_2string and reset_file
+            in contrast to the tab-stops and margins which are set
+            by this utility.
+ 
+-       o   The reset program is usually an alias for tset, due to
+-           the  resetting  of  terminal modes and special charac-
+-           ters.
++       o   The  reset  program  is  usually  an  alias  for tset,
++           because of this  difference  with  resetting  terminal
++           modes and special characters.
+ 
+        If tput is invoked by a link named init, this has the same
+-       effect  as  tput  init.  Again, you are less likely to use
+-       that link because another program named init  has  a  more
++       effect as tput init.  Again, you are less  likely  to  use
++       that  link  because  another program named init has a more
+        well-established use.
+ 
+ 
+ 
    EXAMPLES
    +        tput init
+             Initialize the terminal according to the type of ter-
+-            minal in the environmental variable TERM.  This  com-
+-            mand  should be included in everyone's .profile after
++            minal  in the environmental variable TERM.  This com-
++            mand should be included in everyone's .profile  after
+             the environmental variable TERM has been exported, as
+             illustrated on the profile(5) manual page.
+ 
+        tput -T5620 reset
+-            Reset  an  AT&T 5620 terminal, overriding the type of
++            Reset an AT&T 5620 terminal, overriding the  type  of
+             terminal in the environmental variable TERM.
+ 
+        tput cup 0 0
+@@ -227,16 +230,16 @@
+        bold=`tput smso` offbold=`tput rmso`
+             Set the shell variables bold, to begin stand-out mode
+             sequence, and offbold, to end standout mode sequence,
+-            for  the current terminal.  This might be followed by
+-            a prompt: echo  "${bold}Please  type  in  your  name:
++            for the current terminal.  This might be followed  by
++            a  prompt:  echo  "${bold}Please  type  in your name:
+             ${offbold}\c"
+ 
+        tput hc
+-            Set  exit code to indicate if the current terminal is
++            Set exit code to indicate if the current terminal  is
+             a hard copy terminal.
+ 
+        tput cup 23 4
+-            Send the sequence to move the cursor to row 23,  col-
++            Send  the sequence to move the cursor to row 23, col-
+             umn 4.
+ 
+        tput cup
+@@ -244,8 +247,8 @@
+             parameters substituted.
+ 
+        tput longname
+-            Print the long name from the  terminfo  database  for
+-            the  type  of terminal specified in the environmental
++            Print  the  long  name from the terminfo database for
++            the type of terminal specified in  the  environmental
+             variable TERM.
+ 
+             tput -S <<!
+@@ -254,10 +257,10 @@
+             > bold
+             > !
+ 
+-            This example shows tput processing several  capabili-
+-            ties  in one invocation.  It clears the screen, moves
+-            the cursor to position  10,  10  and  turns  on  bold
+-            (extra  bright)  mode.   The list is terminated by an
++            This  example shows tput processing several capabili-
++            ties in one invocation.  It clears the screen,  moves
++            the  cursor  to  position  10,  10  and turns on bold
++            (extra bright) mode.  The list is  terminated  by  an
+             exclamation mark (!) on a line by itself.
+ 
+ 
+@@ -267,44 +270,44 @@
+ 
+        /usr/share/tabset/*
+               tab settings for some terminals, in a format appro-
+-              priate   to  be  output  to  the  terminal  (escape
+-              sequences that set  margins  and  tabs);  for  more
+-              information,  see the Tabs and Initialization, sec-
++              priate  to  be  output  to  the  terminal   (escape
++              sequences  that  set  margins  and  tabs); for more
++              information, see the Tabs and Initialization,  sec-
+               tion of terminfo(5)
+ 
+ 
+ 
    EXIT CODES
    +        If the -S option is used, tput checks for errors from each
+-       line,  and if any errors are found, will set the exit code
+-       to 4 plus the number of lines with errors.  If  no  errors
+-       are  found,  the  exit  code is 0.  No indication of which
++       line, and if any errors are found, will set the exit  code
++       to  4  plus the number of lines with errors.  If no errors
++       are found, the exit code is 0.   No  indication  of  which
+        line failed can be given so exit code 1 will never appear.
+-       Exit  codes 2, 3, and 4 retain their usual interpretation.
++       Exit codes 2, 3, and 4 retain their usual  interpretation.
+        If the -S option is not used, the exit code depends on the
+        type of capname:
+ 
+           boolean
+                  a value of 0 is set for TRUE and 1 for FALSE.
+ 
+-          string a  value  of  0 is set if the capname is defined
+-                 for this terminal type (the value of capname  is
+-                 returned  on  standard  output); a value of 1 is
+-                 set if capname is not defined for this  terminal
++          string a value of 0 is set if the  capname  is  defined
++                 for  this terminal type (the value of capname is
++                 returned on standard output); a value  of  1  is
++                 set  if capname is not defined for this terminal
+                  type (nothing is written to standard output).
+ 
+           integer
+-                 a  value of 0 is always set, whether or not cap-
+-                 name is defined  for  this  terminal  type.   To
+-                 determine  if capname is defined for this termi-
+-                 nal type, the user must test the  value  written
+-                 to  standard  output.   A value of -1 means that
++                 a value of 0 is always set, whether or not  cap-
++                 name  is  defined  for  this  terminal type.  To
++                 determine if capname is defined for this  termi-
++                 nal  type,  the user must test the value written
++                 to standard output.  A value of  -1  means  that
+                  capname is not defined for this terminal type.
+ 
+-          other  reset or init may fail to find their  respective
+-                 files.   In that case, the exit code is set to 4
++          other  reset  or init may fail to find their respective
++                 files.  In that case, the exit code is set to  4
+                  + errno.
+ 
+-       Any other exit code indicates an error; see  the  DIAGNOS-
++       Any  other  exit code indicates an error; see the DIAGNOS-
+        TICS section.
+ 
+ 
+@@ -314,8 +317,8 @@
+ 
+        exit code   error message
+        ---------------------------------------------------------------------
+-       0           (capname is a numeric variable that is not specified  in
+-                   the  terminfo(5)  database  for this terminal type, e.g.
++       0           (capname  is a numeric variable that is not specified in
++                   the terminfo(5) database for this  terminal  type,  e.g.
+                    tput -T450 lines and tput -T2621 xmc)
+        1           no error message is printed, see the EXIT CODES section.
+        2           usage error
+@@ -326,119 +329,119 @@
+ 
+ 
+ 
    HISTORY
    +-       The tput command was begun by Bill Joy in 1980.  The  ini-
++       The  tput command was begun by Bill Joy in 1980.  The ini-
+        tial version only cleared the screen.
+ 
+-       AT&T  System  V  provided  a different tput command, whose
+-       init and reset  subcommands (more than half  the  program)
++       AT&T System V provided a  different  tput  command,  whose
++       init  and  reset  subcommands (more than half the program)
+        were incorporated from the reset feature of BSD tset writ-
+-       ten by Eric Allman.  Later the corresponding  source  code
+-       for  reset  was  removed  from the BSD tset (in June 1993,
++       ten  by  Eric Allman.  Later the corresponding source code
++       for reset was removed from the BSD  tset  (in  June  1993,
+        released in 4.4BSD-Lite a year later).
+ 
+-       Keith Bostic replaced the BSD tput command in 1989 with  a
+-       new  implementation  based  on  the  AT&T System V program
+-       tput.  Like the AT&T program,  Bostic's  version  accepted
+-       some  parameters  named  for terminfo capabilities (clear,
+-       init, longname and reset).  However (because he  had  only
+-       termcap  available),  it  accepted termcap names for other
+-       capabilities.  Also, Bostic's BSD tput did not modify  the
++       Keith  Bostic replaced the BSD tput command in 1989 with a
++       new implementation based on  the  AT&T  System  V  program
++       tput.   Like  the  AT&T program, Bostic's version accepted
++       some parameters named for  terminfo  capabilities  (clear,
++       init,  longname  and reset).  However (because he had only
++       termcap available), it accepted termcap  names  for  other
++       capabilities.   Also, Bostic's BSD tput did not modify the
+        terminal I/O modes as the earlier BSD tset had done.
+ 
+-       At  the  same  time,  Bostic  added  a  shell script named
++       At the same  time,  Bostic  added  a  shell  script  named
+        "clear", which used tput to clear the screen.
+ 
+-       Both of these appeared in 4.4BSD,  becoming  the  "modern"
++       Both  of  these  appeared in 4.4BSD, becoming the "modern"
+        BSD implementation of tput.
+ 
+ 
+ 
    PORTABILITY
    +-       This  implementation of tput differs from AT&T tput in two
++       This implementation of tput differs from AT&T tput in  two
+        important areas:
+ 
+-       o   tput capname writes to the standard output.  That need
+-           not  be  a regular terminal.  However, the subcommands
+-           which manipulate terminal modes may not use the  stan-
++       o   tput capname writes to the standard output.  That need
++           not be a regular terminal.  However,  the  subcommands
++           which  manipulate terminal modes may not use the stan-
+            dard output.
+ 
+-           The  AT&T implementation's init and reset commands use
++           The AT&T implementation's init and reset commands  use
+            the BSD (4.1c) tset source, which manipulates terminal
+-           modes.   It  successively tries standard output, stan-
+-           dard error, standard  input  before  falling  back  to
++           modes.  It successively tries standard  output,  stan-
++           dard  error,  standard  input  before  falling back to
+            "/dev/tty" and finally just assumes a 1200Bd terminal.
+            When updating terminal modes, it ignores errors.
+ 
+-           Until changes made after ncurses  6.0,  tput  did  not
+-           modify  terminal  modes.   tput  now  uses  a  similar
+-           scheme, using functions shared with  tset  (and  ulti-
+-           mately  based  on the 4.4BSD tset).  If it is not able
+-           to open a terminal, e.g., when running in  cron,  tput
++           Until  changes  made  after  ncurses 6.0, tput did not
++           modify  terminal  modes.   tput  now  uses  a  similar
++           scheme,  using  functions  shared with tset (and ulti-
++           mately based on the 4.4BSD tset).  If it is  not  able
++           to  open  a terminal, e.g., when running in cron, tput
+            will return an error.
+ 
+-       o   AT&T  tput guesses the type of its capname operands by
++       o   AT&T tput guesses the type of its capname operands  by
+            seeing if all of the characters are numeric, or not.
+ 
+            Most implementations which provide support for capname
+-           operands  use  the tparm function to expand parameters
++           operands use the tparm function to  expand  parameters
+            in it.  That function expects a mixture of numeric and
+-           string  parameters,  requiring tput to know which type
++           string parameters, requiring tput to know  which  type
+            to use.
+ 
+-           This implementation uses  a  table  to  determine  the
++           This  implementation  uses  a  table  to determine the
+            parameter types for the standard capname operands, and
+-           an internal library function  to  analyze  nonstandard
++           an  internal  library  function to analyze nonstandard
+            capname operands.
+ 
+-       The  longname  and -S options, and the parameter-substitu-
+-       tion features used in the cup example, were not  supported
+-       in  BSD curses before 4.3reno (1989) or in AT&T/USL curses
++       The longname and -S options, and  the  parameter-substitu-
++       tion  features used in the cup example, were not supported
++       in BSD curses before 4.3reno (1989) or in AT&T/USL  curses
+        before SVr4 (1988).
+ 
+-       IEEE Std 1003.1/The Open Group  Base Specifications  Issue
+-       7  (POSIX.1-2008)  documents  only the operands for clear,
+-       init and reset.  There are a few interesting  observations
++       IEEE  Std 1003.1/The Open Group  Base Specifications Issue
++       7 (POSIX.1-2008) documents only the  operands  for  clear,
++       init  and reset.  There are a few interesting observations
+        to make regarding that:
+ 
+-       o   In  this  implementation, clear is part of the capname
++       o   In this implementation, clear is part of  the  capname
+            support.  The others (init and longname) do not corre-
+            spond to terminal capabilities.
+ 
+-       o   Other  implementations  of  tput on SVr4-based systems
+-           such as Solaris, IRIX64 and HPUX  as  well  as  others
+-           such  as AIX and Tru64 provide support for capname op-
++       o   Other implementations of tput  on  SVr4-based  systems
++           such  as  Solaris,  IRIX64  and HPUX as well as others
++           such as AIX and Tru64 provide support for capname  op-
+            erands.
+ 
+-       o   A few platforms  such  as  FreeBSD  recognize  termcap
+-           names  rather  than terminfo capability names in their
+-           respective tput commands.  Since 2010,  NetBSD's  tput
+-           uses  terminfo  names.  Before that, it (like FreeBSD)
++       o   A  few  platforms  such  as  FreeBSD recognize termcap
++           names rather than terminfo capability names  in  their
++           respective  tput  commands.  Since 2010, NetBSD's tput
++           uses terminfo names.  Before that, it  (like  FreeBSD)
+            recognized termcap names.
+ 
+-       Because (apparently) all of  the  certified  Unix  systems
+-       support  the  full  set of capability names, the reasoning
++       Because  (apparently)  all  of  the certified Unix systems
++       support the full set of capability  names,  the  reasoning
+        for documenting only a few may not be apparent.
+ 
+        o   X/Open Curses Issue 7 documents tput differently, with
+-           capname  and the other features used in this implemen-
++           capname and the other features used in this  implemen-
+            tation.
+ 
+-       o   That is, there are two standards for  tput:  POSIX  (a
+-           subset)  and  X/Open Curses (the full implementation).
+-           POSIX documents a subset to avoid the complication  of
+-           including  X/Open Curses and the terminal capabilities
++       o   That  is,  there  are two standards for tput: POSIX (a
++           subset) and X/Open Curses (the  full  implementation).
++           POSIX  documents a subset to avoid the complication of
++           including X/Open Curses and the terminal  capabilities
+            database.
+ 
+        o   While it is certainly possible to write a tput program
+            without using curses, none of the systems which have a
+-           curses implementation provide  a  tput  utility  which
++           curses  implementation  provide  a  tput utility which
+            does not provide the capname feature.
+ 
+ 
+ 
    SEE ALSO
    +-       clear(1),    stty(1),   tabs(1),   tset(1),   terminfo(5),
++       clear(1),   stty(1),   tabs(1),   tset(1),    terminfo(5),
+        curs_termcap(3x).
+ 
+-       This describes ncurses version 6.0 (patch 20161015).
++       This describes ncurses version 6.0 (patch 20161022).
+ 
+ 
+ 
+Index: doc/html/man/tset.1.html
+--- ncurses-6.0-20161015+/doc/html/man/tset.1.html	2016-10-15 23:12:24.000000000 +0000
++++ ncurses-6.0-20161022/doc/html/man/tset.1.html	2016-10-22 20:13:57.000000000 +0000
+@@ -387,7 +387,7 @@
+        csh(1),   sh(1),   stty(1),   curs_terminfo(3x),   tty(4),
+        terminfo(5), ttys(5), environ(7)
+ 
+-       This describes ncurses version 6.0 (patch 20161015).
++       This describes ncurses version 6.0 (patch 20161022).
+ 
+ 
+ 
+Index: man/curs_inopts.3x
+Prereq:  1.22 
+--- ncurses-6.0-20161015+/man/curs_inopts.3x	2016-10-15 17:13:45.000000000 +0000
++++ ncurses-6.0-20161022/man/curs_inopts.3x	2016-10-22 19:54:35.000000000 +0000
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_inopts.3x,v 1.22 2016/10/15 17:13:45 tom Exp $
++.\" $Id: curs_inopts.3x,v 1.23 2016/10/22 19:54:35 tom Exp $
+ .TH curs_inopts 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -296,7 +296,7 @@
+ When \fBkeypad\fP is first enabled,
+ ncurses loads the key-definitions for the current terminal description.
+ If the terminal description includes extended string capabilities,
+-e.g., from using the \fB\-x\fP option of @TIC@,
++e.g., from using the \fB\-x\fP option of \fB@TIC@\fP,
+ then ncurses also defines keys for the capabilities whose names
+ begin with "k".
+ The corresponding keycodes are generated and (depending on previous
+Index: man/infocmp.1m
+Prereq:  1.58 
+--- ncurses-6.0-20161015+/man/infocmp.1m	2016-10-01 17:15:45.000000000 +0000
++++ ncurses-6.0-20161022/man/infocmp.1m	2016-10-22 19:54:35.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: infocmp.1m,v 1.58 2016/10/01 17:15:45 tom Exp $
++.\" $Id: infocmp.1m,v 1.59 2016/10/22 19:54:35 tom Exp $
+ .TH @INFOCMP@ 1M ""
+ .ds n 5
+ .de bP
+@@ -138,7 +138,7 @@
+ For best results when converting to \fBtermcap\fP format,
+ you should use both \fB\-C\fP and \fB\-r\fP.
+ Normally a termcap description is limited to 1023 bytes.
+-@INFOCMP@ trims away less essential parts to make it fit.
++\fB@INFOCMP@\fP trims away less essential parts to make it fit.
+ If you are converting to one of the (rare) termcap implementations
+ which accept an unlimited size of termcap,
+ you may want to add the \fB\-T\fP option.
+@@ -235,7 +235,7 @@
+ were not needed.
+ .SS Changing Databases [\-A \fIdirectory\fR] [\-B \fIdirectory\fR]
+ Like other \fBncurses\fP utilities,
+-@INFOCMP@ looks for the terminal descriptions in several places.
++\fB@INFOCMP@\fP looks for the terminal descriptions in several places.
+ You can use the \fBTERMINFO\fP and \fBTERMINFO_DIRS\fP environment variables
+ to override the compiled-in default list of places to search
+ (see \fBcurses\fP(3X) for details).
+Index: man/tabs.1
+Prereq:  1.13 
+--- ncurses-6.0-20161015+/man/tabs.1	2016-10-15 16:16:38.000000000 +0000
++++ ncurses-6.0-20161022/man/tabs.1	2016-10-22 19:54:35.000000000 +0000
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tabs.1,v 1.13 2016/10/15 16:16:38 tom Exp $
++.\" $Id: tabs.1,v 1.14 2016/10/22 19:54:35 tom Exp $
+ .TH @TABS@ 1 ""
+ .ds n 5
+ .de bP
+@@ -133,7 +133,7 @@
+ Very few of the entries in the terminal database provide this capability.
+ .bP
+ There is no counterpart in X/Open Curses Issue 7 for this utility,
+-unlike @TPUT@(1).
++unlike \fB@TPUT@(1)\fP.
+ .PP
+ The \fB\-d\fP (debug) and \fB\-n\fP (no-op) options are extensions not provided
+ by other implementations.
+Index: man/term.5
+Prereq:  1.23 
+--- ncurses-6.0-20161015+/man/term.5	2016-10-15 17:02:31.000000000 +0000
++++ ncurses-6.0-20161022/man/term.5	2016-10-22 19:55:01.000000000 +0000
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: term.5,v 1.23 2016/10/15 17:02:31 tom Exp $
++.\" $Id: term.5,v 1.24 2016/10/22 19:55:01 tom Exp $
+ .TH term 5
+ .ds n 5
+ .ds d @TERMINFO@
+@@ -73,10 +73,8 @@
+ An 8 or more bit byte is assumed, but no assumptions about byte ordering
+ or sign extension are made.
+ .PP
+-The compiled file is created with the
+-.B @TIC@
+-program, and read by the routine
+-.BR setupterm .
++The compiled file is created with the \fB@TIC@\fP program,
++and read by the routine \fBsetupterm\fP.
+ The file is divided into six parts:
+ the header,
+ terminal names,
+Index: man/terminfo.tail
+Prereq:  1.72 
+--- ncurses-6.0-20161015+/man/terminfo.tail	2016-10-15 18:34:58.000000000 +0000
++++ ncurses-6.0-20161022/man/terminfo.tail	2016-10-22 19:56:17.000000000 +0000
+@@ -1,4 +1,4 @@
+-.\" $Id: terminfo.tail,v 1.72 2016/10/15 18:34:58 tom Exp $
++.\" $Id: terminfo.tail,v 1.73 2016/10/22 19:56:17 tom Exp $
+ .\" Beginning of terminfo.tail file
+ .\" This file is part of ncurses.
+ .\" See "terminfo.head" for copyright.
+@@ -1082,8 +1082,7 @@
+ the numeric parameter
+ .B it
+ is given, showing the number of spaces the tabs are set to.
+-This is normally used by the
+-.IR @TSET@
++This is normally used by the \fB@TSET@\fP
+ command to determine whether to set the mode for hardware tab expansion,
+ and whether to set the tab stops.
+ If the terminal has tab stops that can be saved in non-volatile memory,
+@@ -1103,9 +1102,7 @@
+ with the rest of the terminfo description.
+ They are normally sent to the terminal, by the
+ .I init
+-option of the
+-.IR @TPUT@
+-program, each time the user logs in.
++option of the \fB@TPUT@\fP program, each time the user logs in.
+ They will be printed in the following order:
+ .RS
+ .TP
+Index: man/tput.1
+Prereq:  1.44 
+--- ncurses-6.0-20161015+/man/tput.1	2016-08-20 23:40:31.000000000 +0000
++++ ncurses-6.0-20161022/man/tput.1	2016-10-22 19:57:25.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tput.1,v 1.44 2016/08/20 23:40:31 tom Exp $
++.\" $Id: tput.1,v 1.46 2016/10/22 19:57:25 tom Exp $
+ .TH @TPUT@ 1 ""
+ .ds d @TERMINFO@
+ .ds n 1
+@@ -168,21 +168,25 @@
+ name in the first line of the terminal's description in the
+ \fBterminfo\fR database [see \fBterm\fR(5)].
+ .SS Aliases
+-\fB@TPUT@\fR handles the \fBinit\fP and \fBreset\fP commands specially:
++\fB@TPUT@\fR handles the \fBclear\fP, \fBinit\fP and \fBreset\fP
++commands specially:
+ it allows for the possibility that it is invoked by a link with those names.
+ .PP
+ If \fB@TPUT@\fR is invoked by a link named \fBreset\fR, this has the
+ same effect as \fB@TPUT@ reset\fR.
+-The \fB@TSET@\fR(\*n) utility also treats a link named \fBreset\fP specially:
++The \fB@TSET@\fR(\*n) utility also treats a link named \fBreset\fP specially.
++.PP
++Before ncurses 6.1, the two utilities were different from each other:
+ .bP
+-That utility resets the terminal modes and special characters (not done here).
++\fB@TSET@\fP utility reset the terminal modes and special characters
++(not done with \fB@TPUT@\fP).
+ .bP
+-On the other hand, @TSET@'s repertoire of terminal capabilities for
+-resetting the terminal is more limited, i.e., only \fBreset_1string\fP, \fBreset_2string\fP and \fBreset_file\fP
++On the other hand, \fB@TSET@\fP's repertoire of terminal capabilities for
++resetting the terminal was more limited, i.e., only \fBreset_1string\fP, \fBreset_2string\fP and \fBreset_file\fP
+ in contrast to the tab-stops and margins which are set by this utility.
+ .bP
+-The \fBreset\fP program is usually an alias for @TSET@,
+-due to the resetting of terminal modes and special characters.
++The \fBreset\fP program is usually an alias for \fB@TSET@\fP,
++because of this difference with resetting terminal modes and special characters.
+ .PP
+ If \fB@TPUT@\fR is invoked by a link named \fBinit\fR, this has the
+ same effect as \fB@TPUT@ init\fR.
+@@ -356,7 +360,7 @@
+ This implementation of \fBtput\fP differs from AT&T \fBtput\fP in
+ two important areas:
+ .bP
+-@TPUT@ \fIcapname\fP writes to the standard output.
++\fB@TPUT@\fP \fIcapname\fP writes to the standard output.
+ That need not be a regular terminal.
+ However, the subcommands which manipulate terminal modes
+ may not use the standard output.
+@@ -368,11 +372,12 @@
+ a 1200Bd terminal.
+ When updating terminal modes, it ignores errors.
+ .IP
+-Until changes made after ncurses 6.0, @TPUT@ did not modify terminal modes.
+-@TPUT@ now uses a similar scheme, using functions shared with @TSET@
++Until changes made after ncurses 6.0, \fB@TPUT@\fP did not modify terminal modes.
++\fB@TPUT@\fP now uses a similar scheme,
++using functions shared with \fB@TSET@\fP
+ (and ultimately based on the 4.4BSD \fBtset\fP).
+ If it is not able to open a terminal, e.g., when running in \fBcron\fP,
+-@TPUT@ will return an error.
++\fB@TPUT@\fP will return an error.
+ .bP
+ AT&T \fBtput\fP guesses the type of its \fIcapname\fP operands by seeing if
+ all of the characters are numeric, or not.
+Index: package/debian-mingw/changelog
+--- ncurses-6.0-20161015+/package/debian-mingw/changelog	2016-10-15 15:43:49.000000000 +0000
++++ ncurses-6.0-20161022/package/debian-mingw/changelog	2016-10-21 22:47:18.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161015) unstable; urgency=low
++ncurses6 (6.0+20161022) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 15 Oct 2016 11:43:49 -0400
++ -- Thomas E. Dickey   Fri, 21 Oct 2016 18:47:18 -0400
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.0-20161015+/package/debian-mingw64/changelog	2016-10-15 15:43:49.000000000 +0000
++++ ncurses-6.0-20161022/package/debian-mingw64/changelog	2016-10-21 22:47:18.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161015) unstable; urgency=low
++ncurses6 (6.0+20161022) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 15 Oct 2016 11:43:49 -0400
++ -- Thomas E. Dickey   Fri, 21 Oct 2016 18:47:18 -0400
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.0-20161015+/package/debian/changelog	2016-10-15 15:43:49.000000000 +0000
++++ ncurses-6.0-20161022/package/debian/changelog	2016-10-21 22:47:18.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161015) unstable; urgency=low
++ncurses6 (6.0+20161022) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 15 Oct 2016 11:43:49 -0400
++ -- Thomas E. Dickey   Fri, 21 Oct 2016 18:47:18 -0400
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.180 
+--- ncurses-6.0-20161015+/package/mingw-ncurses.nsi	2016-10-15 15:43:49.000000000 +0000
++++ ncurses-6.0-20161022/package/mingw-ncurses.nsi	2016-10-21 22:47:18.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.180 2016/10/15 15:43:49 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.181 2016/10/21 22:47:18 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "0"
+ !define VERSION_YYYY  "2016"
+-!define VERSION_MMDD  "1015"
++!define VERSION_MMDD  "1022"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.0-20161015+/package/mingw-ncurses.spec	2016-10-15 15:43:49.000000000 +0000
++++ ncurses-6.0-20161022/package/mingw-ncurses.spec	2016-10-21 22:47:18.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.0
+-Release: 20161015
++Release: 20161022
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.0-20161015+/package/ncurses.spec	2016-10-15 15:43:49.000000000 +0000
++++ ncurses-6.0-20161022/package/ncurses.spec	2016-10-21 22:47:18.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.0
+-Release: 20161015
++Release: 20161022
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: progs/Makefile.in
+Prereq:  1.97 
+--- ncurses-6.0-20161015+/progs/Makefile.in	2016-08-06 13:25:38.000000000 +0000
++++ ncurses-6.0-20161022/progs/Makefile.in	2016-10-22 00:13:20.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: Makefile.in,v 1.97 2016/08/06 13:25:38 tom Exp $
++# $Id: Makefile.in,v 1.99 2016/10/22 00:13:20 tom Exp $
+ ##############################################################################
+ # Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.                #
+ #                                                                            #
+@@ -179,6 +179,7 @@
+ 
+ # transformed names for comparing at runtime
+ define_captoinfo = `echo captoinfo|   $(TRANSFORM)`
++define_clear     = `echo clear|       $(TRANSFORM)`
+ define_infotocap = `echo infotocap|   $(TRANSFORM)`
+ define_init      = `echo init|        $(TRANSFORM)`
+ define_reset     = `echo reset|       $(TRANSFORM)`
+@@ -191,6 +192,7 @@
+ 	-$(SHELL) -c 'if test -n "$x" ; then echo "#define SUFFIX_IGNORED \"$x\"">>$@; fi'
+ 	echo "#define PROG_CAPTOINFO \"$(define_captoinfo)\""		>>$@
+ 	echo "#define PROG_INFOTOCAP \"$(define_infotocap)\""		>>$@
++	echo "#define PROG_CLEAR     \"$(define_clear)\""		>>$@
+ 	echo "#define PROG_RESET     \"$(define_reset)\""		>>$@
+ 	echo "#define PROG_INIT      \"$(define_init)\""		>>$@
+ 	echo "#endif /* __TRANSFORM_H */"				>>$@
+@@ -248,7 +250,8 @@
+ 	@ECHO_LD@ $(LINK) $(DEPS_TOE) $(LDFLAGS_TIC) -o $@
+ 
+ DEPS_CLEAR = \
+-	$(MODEL)/clear$o
++	$(MODEL)/clear$o \
++	$(MODEL)/clear_cmd$o
+ 
+ clear$x: $(DEPS_CLEAR) $(DEPS_CURSES)
+ 	@ECHO_LD@ $(LINK) $(DEPS_CLEAR) $(LDFLAGS_TINFO) -o $@
+@@ -261,6 +264,7 @@
+ 
+ DEPS_TPUT = \
+ 	$(MODEL)/tput$o \
++	$(MODEL)/clear_cmd$o \
+ 	$(MODEL)/reset_cmd$o \
+ 	$(MODEL)/tparm_type$o \
+ 	$(MODEL)/transform$o
+Index: progs/clear.c
+Prereq:  1.13 
+--- ncurses-6.0-20161015+/progs/clear.c	2013-06-22 22:20:54.000000000 +0000
++++ ncurses-6.0-20161022/progs/clear.c	2016-10-23 00:36:36.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2007,2013 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2013,2016 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -36,32 +36,19 @@
+  * clear.c --  clears the terminal's screen
+  */
+ 
+-#define USE_LIBTINFO
+-#include 
++#define USE_LIBTINFO 1
++#include 
+ 
+-MODULE_ID("$Id: clear.c,v 1.13 2013/06/22 22:20:54 tom Exp $")
+-
+-static int
+-putch(int c)
+-{
+-    return putchar(c);
+-}
++MODULE_ID("$Id: clear.c,v 1.15 2016/10/23 00:36:36 tom Exp $")
+ 
+ int
+ main(
+ 	int argc GCC_UNUSED,
+ 	char *argv[]GCC_UNUSED)
+ {
+-    char *E3;
+-
+     setupterm((char *) 0, STDOUT_FILENO, (int *) 0);
+ 
+-    /* Clear the scrollback buffer if possible. */
+-    E3 = tigetstr("E3");
+-    if (E3)
+-	(void) tputs(E3, lines > 0 ? lines : 1, putch);
+-
+-    ExitProgram((tputs(clear_screen, lines > 0 ? lines : 1, putch) == ERR)
++    ExitProgram((clear_cmd() == ERR)
+ 		? EXIT_FAILURE
+ 		: EXIT_SUCCESS);
+ }
+Index: progs/clear_cmd.c
+--- /dev/null	2016-10-22 18:36:25.655999441 +0000
++++ ncurses-6.0-20161022/progs/clear_cmd.c	2016-10-21 23:37:35.000000000 +0000
+@@ -0,0 +1,59 @@
++/****************************************************************************
++ * Copyright (c) 2016 Free Software Foundation, Inc.                        *
++ *                                                                          *
++ * Permission is hereby granted, free of charge, to any person obtaining a  *
++ * copy of this software and associated documentation files (the            *
++ * "Software"), to deal in the Software without restriction, including      *
++ * without limitation the rights to use, copy, modify, merge, publish,      *
++ * distribute, distribute with modifications, sublicense, and/or sell       *
++ * copies of the Software, and to permit persons to whom the Software is    *
++ * furnished to do so, subject to the following conditions:                 *
++ *                                                                          *
++ * The above copyright notice and this permission notice shall be included  *
++ * in all copies or substantial portions of the Software.                   *
++ *                                                                          *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
++ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
++ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
++ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
++ *                                                                          *
++ * Except as contained in this notice, the name(s) of the above copyright   *
++ * holders shall not be used in advertising or otherwise to promote the     *
++ * sale, use or other dealings in this Software without prior written       *
++ * authorization.                                                           *
++ ****************************************************************************/
++
++/****************************************************************************
++ *  Author: Thomas E. Dickey                                                *
++ ****************************************************************************/
++
++/*
++ * clear.c --  clears the terminal's screen
++ */
++
++#define USE_LIBTINFO
++#include 
++
++MODULE_ID("$Id: clear_cmd.c,v 1.1 2016/10/21 23:37:35 tom Exp $")
++
++static int
++putch(int c)
++{
++    return putchar(c);
++}
++
++int
++clear_cmd(void)
++{
++    char *E3;
++
++    /* Clear the scrollback buffer if possible. */
++    E3 = tigetstr("E3");
++    if (E3)
++	(void) tputs(E3, lines > 0 ? lines : 1, putch);
++
++    return tputs(clear_screen, lines > 0 ? lines : 1, putch);
++}
+Index: progs/clear_cmd.h
+--- /dev/null	2016-10-22 18:36:25.655999441 +0000
++++ ncurses-6.0-20161022/progs/clear_cmd.h	2016-10-21 23:29:04.000000000 +0000
+@@ -0,0 +1,44 @@
++/****************************************************************************
++ * Copyright (c) 2016 Free Software Foundation, Inc.                        *
++ *                                                                          *
++ * Permission is hereby granted, free of charge, to any person obtaining a  *
++ * copy of this software and associated documentation files (the            *
++ * "Software"), to deal in the Software without restriction, including      *
++ * without limitation the rights to use, copy, modify, merge, publish,      *
++ * distribute, distribute with modifications, sublicense, and/or sell       *
++ * copies of the Software, and to permit persons to whom the Software is    *
++ * furnished to do so, subject to the following conditions:                 *
++ *                                                                          *
++ * The above copyright notice and this permission notice shall be included  *
++ * in all copies or substantial portions of the Software.                   *
++ *                                                                          *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
++ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
++ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
++ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
++ *                                                                          *
++ * Except as contained in this notice, the name(s) of the above copyright   *
++ * holders shall not be used in advertising or otherwise to promote the     *
++ * sale, use or other dealings in this Software without prior written       *
++ * authorization.                                                           *
++ ****************************************************************************/
++
++/****************************************************************************
++ *  Author: Thomas E. Dickey                                                *
++ ****************************************************************************/
++
++/*
++ * $Id: clear_cmd.h,v 1.1 2016/10/21 23:29:04 tom Exp $
++ *
++ * Utility functions for clearing terminal.
++ */
++#ifndef CLEAR_CMD_H
++#define CLEAR_CMD_H 1
++
++#include 
++extern int clear_cmd(void);
++
++#endif /* CLEAR_CMD_H */
+Index: progs/modules
+Prereq:  1.19 
+--- ncurses-6.0-20161015+/progs/modules	2016-08-06 16:52:30.000000000 +0000
++++ ncurses-6.0-20161022/progs/modules	2016-10-21 23:15:41.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: modules,v 1.19 2016/08/06 16:52:30 tom Exp $
++# $Id: modules,v 1.20 2016/10/21 23:15:41 tom Exp $
+ # Program modules (some are in ncurses lib!)
+ ##############################################################################
+ # Copyright (c) 1998-2014,2016 Free Software Foundation, Inc.                #
+@@ -35,6 +35,7 @@
+ clear		progs		$(srcdir)	$(HEADER_DEPS)
+ tic		progs		$(srcdir)	$(HEADER_DEPS) transform.h $(srcdir)/dump_entry.h $(srcdir)/tparm_type.h
+ toe		progs		$(srcdir)	$(HEADER_DEPS)             $(INCDIR)/hashed_db.h
++clear_cmd	progs		$(srcdir)	$(HEADER_DEPS) clear_cmd.h
+ dump_entry	progs		$(srcdir)	$(HEADER_DEPS)             $(srcdir)/dump_entry.h ../include/parametrized.h $(INCDIR)/capdefaults.c termsort.c
+ infocmp		progs		$(srcdir)	$(HEADER_DEPS)             $(srcdir)/dump_entry.h
+ reset_cmd	progs		$(srcdir)	$(HEADER_DEPS) reset_cmd.h
+Index: progs/reset_cmd.c
+Prereq:  1.7 
+--- ncurses-6.0-20161015+/progs/reset_cmd.c	2016-09-10 20:49:10.000000000 +0000
++++ ncurses-6.0-20161022/progs/reset_cmd.c	2016-10-23 01:08:11.000000000 +0000
+@@ -51,7 +51,7 @@
+ #include 
+ #endif
+ 
+-MODULE_ID("$Id: reset_cmd.c,v 1.7 2016/09/10 20:49:10 tom Exp $")
++MODULE_ID("$Id: reset_cmd.c,v 1.9 2016/10/23 01:08:11 tom Exp $")
+ 
+ /*
+  * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,
+@@ -661,18 +661,26 @@
+ }
+ 
+ #if HAVE_SIZECHANGE
+-/* Set window size if not set already */
++/*
++ * Set window size if not set already, but update our copy of the values if the
++ * size was set.
++ */
+ void
+-set_window_size(int fd, int high, int wide)
++set_window_size(int fd, short *high, short *wide)
+ {
+     STRUCT_WINSIZE win;
+     (void) ioctl(fd, IOCTL_GET_WINSIZE, &win);
+     if (WINSIZE_ROWS(win) == 0 &&
+-	WINSIZE_COLS(win) == 0 &&
+-	high > 0 && wide > 0) {
+-	WINSIZE_ROWS(win) = (unsigned short) high;
+-	WINSIZE_COLS(win) = (unsigned short) wide;
+-	(void) ioctl(fd, IOCTL_SET_WINSIZE, &win);
++	WINSIZE_COLS(win) == 0) {
++	if (*high > 0 && *wide > 0) {
++	    WINSIZE_ROWS(win) = (unsigned short) *high;
++	    WINSIZE_COLS(win) = (unsigned short) *wide;
++	    (void) ioctl(fd, IOCTL_SET_WINSIZE, &win);
++	}
++    } else if (WINSIZE_ROWS(win) > 0 &&
++	       WINSIZE_COLS(win) > 0) {
++	*high = (short) WINSIZE_ROWS(win);
++	*wide = (short) WINSIZE_COLS(win);
+     }
+ }
+ #endif
+Index: progs/reset_cmd.h
+Prereq:  1.5 
+--- ncurses-6.0-20161015+/progs/reset_cmd.h	2016-08-06 20:09:34.000000000 +0000
++++ ncurses-6.0-20161022/progs/reset_cmd.h	2016-10-22 23:34:37.000000000 +0000
+@@ -31,7 +31,7 @@
+  ****************************************************************************/
+ 
+ /*
+- * $Id: reset_cmd.h,v 1.5 2016/08/06 20:09:34 tom Exp $
++ * $Id: reset_cmd.h,v 1.6 2016/10/22 23:34:37 tom Exp $
+  *
+  * Utility functions for resetting terminal.
+  */
+@@ -58,7 +58,7 @@
+ extern void update_tty_settings(TTY * /* old_settings */, TTY * /* new_settings */);
+ 
+ #if HAVE_SIZECHANGE
+-extern void set_window_size(int /* fd */, int /* high */, int /* wide */);
++extern void set_window_size(int /* fd */, short * /* high */, short * /* wide */);
+ #endif
+ 
+ extern const char *_nc_progname;
+Index: progs/tput.c
+Prereq:  1.57 
+--- ncurses-6.0-20161015+/progs/tput.c	2016-08-20 21:46:31.000000000 +0000
++++ ncurses-6.0-20161022/progs/tput.c	2016-10-23 01:08:28.000000000 +0000
+@@ -40,6 +40,7 @@
+  */
+ 
+ #include 
++#include 
+ #include 
+ 
+ #if !PURE_TERMINFO
+@@ -48,7 +49,7 @@
+ #endif
+ #include 
+ 
+-MODULE_ID("$Id: tput.c,v 1.57 2016/08/20 21:46:31 tom Exp $")
++MODULE_ID("$Id: tput.c,v 1.63 2016/10/23 01:08:28 tom Exp $")
+ 
+ #define PUTS(s)		fputs(s, stdout)
+ 
+@@ -57,6 +58,7 @@
+ static char *prg_name;
+ static bool is_init = FALSE;
+ static bool is_reset = FALSE;
++static bool is_clear = FALSE;
+ 
+ static void
+ quit(int status, const char *fmt,...)
+@@ -78,11 +80,21 @@
+     ExitProgram(EXIT_FAILURE);
+ }
+ 
+-static void
+-check_aliases(const char *name, bool program)
++static char *
++check_aliases(char *name, bool program)
+ {
+-    is_init = same_program(name, program ? PROG_INIT : "init");
+-    is_reset = same_program(name, program ? PROG_RESET : "reset");
++    static char my_init[] = "init";
++    static char my_reset[] = "reset";
++    static char my_clear[] = "clear";
++
++    char *result = name;
++    if ((is_init = same_program(name, program ? PROG_INIT : my_init)))
++	result = my_init;
++    if ((is_reset = same_program(name, program ? PROG_RESET : my_reset)))
++	result = my_reset;
++    if ((is_clear = same_program(name, program ? PROG_CLEAR : my_clear)))
++	result = my_clear;
++    return result;
+ }
+ 
+ static int
+@@ -114,9 +126,7 @@
+     bool termcap = FALSE;
+ #endif
+ 
+-    if ((name = argv[0]) == 0)
+-	name = "";
+-    check_aliases(name, FALSE);
++    name = check_aliases(argv[0], FALSE);
+     if (is_reset || is_init) {
+ 	TTY mode, oldmode;
+ 
+@@ -124,11 +134,16 @@
+ 	int intrchar = -1;	/* new interrupt character */
+ 	int tkillchar = -1;	/* new kill character */
+ 
+-	(void) save_tty_settings(&mode);
++	int my_fd = save_tty_settings(&mode);
+ 
+ 	reset_start(stdout, is_reset, is_init);
+ 	reset_tty_settings(&mode);
+ 
++#if HAVE_SIZECHANGE
++	set_window_size(my_fd, &lines, &columns);
++#else
++	(void) my_fd;
++#endif
+ 	set_control_chars(&mode, terasechar, intrchar, tkillchar);
+ 	set_conversions(&mode);
+ 	if (send_init_strings(&oldmode)) {
+@@ -146,7 +161,9 @@
+ #if !PURE_TERMINFO
+   retry:
+ #endif
+-    if ((status = tigetflag(name)) != -1) {
++    if (strcmp(name, "clear") == 0) {
++	return clear_cmd();
++    } else if ((status = tigetflag(name)) != -1) {
+ 	return exit_code(BOOLEAN, status);
+     } else if ((status = tigetnum(name)) != CANCELLED_NUMERIC) {
+ 	(void) printf("%d\n", status);
+@@ -246,7 +263,7 @@
+     char buf[BUFSIZ];
+     int result = 0;
+ 
+-    check_aliases(prg_name = _nc_rootname(argv[0]), TRUE);
++    prg_name = check_aliases(_nc_rootname(argv[0]), TRUE);
+ 
+     term = getenv("TERM");
+ 
+@@ -271,7 +288,7 @@
+     /*
+      * Modify the argument list to omit the options we processed.
+      */
+-    if (is_reset || is_init) {
++    if (is_clear || is_reset || is_init) {
+ 	if (optind-- < argc) {
+ 	    argc -= optind;
+ 	    argv += optind;
+@@ -289,7 +306,7 @@
+ 	quit(3, "unknown terminal \"%s\"", term);
+ 
+     if (cmdline) {
+-	if ((argc <= 0) && !is_reset && !is_init)
++	if ((argc <= 0) && !(is_clear || is_reset || is_init))
+ 	    usage();
+ 	ExitProgram(tput_cmd(argc, argv));
+     }
+Index: progs/tset.c
+Prereq:  1.112 
+--- ncurses-6.0-20161015+/progs/tset.c	2016-09-10 23:33:10.000000000 +0000
++++ ncurses-6.0-20161022/progs/tset.c	2016-10-22 23:34:47.000000000 +0000
+@@ -96,7 +96,7 @@
+ char *ttyname(int fd);
+ #endif
+ 
+-MODULE_ID("$Id: tset.c,v 1.112 2016/09/10 23:33:10 tom Exp $")
++MODULE_ID("$Id: tset.c,v 1.113 2016/10/22 23:34:47 tom Exp $")
+ 
+ #ifndef environ
+ extern char **environ;
+@@ -844,7 +844,7 @@
+     if (!noset) {
+ #if HAVE_SIZECHANGE
+ 	if (opt_w) {
+-	    set_window_size(my_fd, lines, columns);
++	    set_window_size(my_fd, &lines, &columns);
+ 	}
+ #endif
+ 	if (opt_c) {
diff --git a/ncurses-6.0-20161029.patch b/ncurses-6.0-20161029.patch
new file mode 100644
index 0000000..754c47f
--- /dev/null
+++ b/ncurses-6.0-20161029.patch
@@ -0,0 +1,782 @@
+# ncurses 6.0 - patch 20161029 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.0 is at
+# 	ftp.gnu.org:/pub/gnu
+#
+# Patches for ncurses 6.0 can be found at
+# 	ftp://invisible-island.net/ncurses/6.0
+#	http://invisible-mirror.net/archives/ncurses/6.0 
+#
+# ------------------------------------------------------------------------------
+# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20161029.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Oct 30 01:40:40 UTC 2016
+# ------------------------------------------------------------------------------
+# NEWS                             |    5 +
+# VERSION                          |    2 
+# dist.mk                          |    4 -
+# form/fld_current.c               |   32 ++++++++++-
+# form/form.h                      |    5 +
+# form/form.priv.h                 |    5 +
+# form/frm_driver.c                |  102 ++++++++++++++++++++-----------------
+# man/form.3x                      |    9 ++-
+# man/form_page.3x                 |   14 +++--
+# package/debian-mingw/changelog   |    4 -
+# package/debian-mingw64/changelog |    4 -
+# package/debian/changelog         |    4 -
+# package/mingw-ncurses.nsi        |    4 -
+# package/mingw-ncurses.spec       |    2 
+# package/ncurses.map              |   12 +++-
+# package/ncurses.spec             |    2 
+# package/ncurses.sym              |    6 +-
+# package/ncursest.map             |   11 +++
+# package/ncursest.sym             |    5 +
+# package/ncursestw.map            |   11 +++
+# package/ncursestw.sym            |    5 +
+# package/ncursesw.map             |   12 +++-
+# package/ncursesw.sym             |    6 +-
+# 23 files changed, 178 insertions(+), 88 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.2687 
+--- ncurses-6.0-20161022+/NEWS	2016-10-23 00:03:47.000000000 +0000
++++ ncurses-6.0-20161029/NEWS	2016-10-29 22:28:11.000000000 +0000
+@@ -25,7 +25,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.2687 2016/10/23 00:03:47 tom Exp $
++-- $Id: NEWS,v 1.2689 2016/10/29 22:28:11 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -45,6 +45,9 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20161029
++	+ add new function "unfocus_current_field" (Leon Winter)
++
+ 20161022
+ 	+ modify tset -w (and tput reset) to update the program's copy of the
+ 	  screensize if it was already set in the system, to improve tabstop
+Index: VERSION
+--- ncurses-6.0-20161022+/VERSION	2016-10-21 22:47:18.000000000 +0000
++++ ncurses-6.0-20161029/VERSION	2016-10-29 19:16:10.000000000 +0000
+@@ -1 +1 @@
+-5:0:9	6.0	20161022
++5:0:9	6.0	20161029
+Index: dist.mk
+Prereq:  1.1129 
+--- ncurses-6.0-20161022+/dist.mk	2016-10-21 22:47:18.000000000 +0000
++++ ncurses-6.0-20161029/dist.mk	2016-10-29 19:16:10.000000000 +0000
+@@ -25,7 +25,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1129 2016/10/21 22:47:18 tom Exp $
++# $Id: dist.mk,v 1.1130 2016/10/29 19:16:10 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -37,7 +37,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 0
+-NCURSES_PATCH = 20161022
++NCURSES_PATCH = 20161029
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: form/fld_current.c
+Prereq:  1.12 
+--- ncurses-6.0-20161022+/form/fld_current.c	2010-01-23 21:14:35.000000000 +0000
++++ ncurses-6.0-20161029/form/fld_current.c	2016-10-29 22:30:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2004,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2016 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -32,7 +32,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: fld_current.c,v 1.12 2010/01/23 21:14:35 tom Exp $")
++MODULE_ID("$Id: fld_current.c,v 1.14 2016/10/29 22:30:10 tom Exp $")
+ 
+ /*---------------------------------------------------------------------------
+ |   Facility      :  libnform
+@@ -76,7 +76,7 @@
+ 	{
+ 	  if (form->current != field)
+ 	    {
+-	      if (!_nc_Internal_Validation(form))
++	      if (form->current && !_nc_Internal_Validation(form))
+ 		{
+ 		  err = E_INVALID_FIELD;
+ 		}
+@@ -103,6 +103,32 @@
+ }
+ 
+ /*---------------------------------------------------------------------------
++|   Facility      :  libnform
++|   Function      :  int unfocus_current_field(FORM * form)
++|
++|   Description   :  Removes focus from the current field.
++|
++|   Return Values :  E_OK              - success
++|                    E_BAD_ARGUMENT    - invalid form pointer
++|                    E_REQUEST_DENIED  - there is no current field to unfocus
+++--------------------------------------------------------------------------*/
++NCURSES_EXPORT(int)
++unfocus_current_field(FORM *const form)
++{
++  T((T_CALLED("unfocus_current_field(%p)"), (const void *)form));
++  if (form == 0)
++    {
++      RETURN(E_BAD_ARGUMENT);
++    }
++  else if (form->current == 0)
++    {
++      RETURN(E_REQUEST_DENIED);
++    }
++  _nc_Unset_Current_Field(form);
++  RETURN(E_OK);
++}
++
++/*---------------------------------------------------------------------------
+ |   Facility      :  libnform
+ |   Function      :  FIELD *current_field(const FORM * form)
+ |
+Index: form/form.h
+Prereq:  0.25 
+--- ncurses-6.0-20161022+/form/form.h	2015-11-28 20:13:39.000000000 +0000
++++ ncurses-6.0-20161029/form/form.h	2016-10-29 22:24:24.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -30,7 +30,7 @@
+  *   Author:  Juergen Pfeifer, 1995,1997                                    *
+  ****************************************************************************/
+ 
+-/* $Id: form.h,v 0.25 2015/11/28 20:13:39 Leon.Winter Exp $ */
++/* $Id: form.h,v 0.26 2016/10/29 22:24:24 Leon.Winter Exp $ */
+ 
+ #ifndef FORM_H
+ #define FORM_H
+@@ -387,6 +387,7 @@
+ extern NCURSES_EXPORT(int)	set_form_win (FORM *,WINDOW *);
+ extern NCURSES_EXPORT(int)	set_form_sub (FORM *,WINDOW *);
+ extern NCURSES_EXPORT(int)	set_current_field (FORM *,FIELD *);
++extern NCURSES_EXPORT(int)	unfocus_current_field (FORM *);
+ extern NCURSES_EXPORT(int)	field_index (const FIELD *);
+ extern NCURSES_EXPORT(int)	set_form_page (FORM *,int);
+ extern NCURSES_EXPORT(int)	form_page (const FORM *);
+Index: form/form.priv.h
+Prereq:  0.39 
+--- ncurses-6.0-20161022+/form/form.priv.h	2015-11-28 20:13:39.000000000 +0000
++++ ncurses-6.0-20161029/form/form.priv.h	2016-10-29 22:30:23.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -30,7 +30,7 @@
+  *   Author:  Juergen Pfeifer, 1995,1997                                    *
+  ****************************************************************************/
+ 
+-/* $Id: form.priv.h,v 0.39 2015/11/28 20:13:39 Leon.Winter Exp $ */
++/* $Id: form.priv.h,v 0.41 2016/10/29 22:30:23 tom Exp $ */
+ 
+ #ifndef FORM_PRIV_H
+ #define FORM_PRIV_H 1
+@@ -184,6 +184,7 @@
+ extern NCURSES_EXPORT(bool) _nc_Internal_Validation (FORM*);
+ extern NCURSES_EXPORT(int) _nc_Set_Current_Field (FORM*, FIELD*);
+ extern NCURSES_EXPORT(int) _nc_Position_Form_Cursor (FORM*);
++extern NCURSES_EXPORT(void) _nc_Unset_Current_Field(FORM *form);
+ 
+ #if NCURSES_INTEROP_FUNCS
+ extern NCURSES_EXPORT(FIELDTYPE *) _nc_TYPE_INTEGER(void);
+Index: form/frm_driver.c
+Prereq:  1.117 
+--- ncurses-6.0-20161022+/form/frm_driver.c	2015-11-28 20:39:09.000000000 +0000
++++ ncurses-6.0-20161029/form/frm_driver.c	2016-10-29 22:30:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -32,7 +32,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: frm_driver.c,v 1.117 2015/11/28 20:39:09 tom Exp $")
++MODULE_ID("$Id: frm_driver.c,v 1.119 2016/10/29 22:30:10 tom Exp $")
+ 
+ /*----------------------------------------------------------------------------
+   This is the core module of the form library. It contains the majority
+@@ -1395,6 +1395,57 @@
+   returnCode(res);
+ }
+ 
++/*
++ * Removes the focus from the current field of the form.
++ */
++void
++_nc_Unset_Current_Field(FORM *form)
++{
++  FIELD *field = form->current;
++
++  _nc_Refresh_Current_Field(form);
++  if (Field_Has_Option(field, O_PUBLIC))
++    {
++      if (field->drows > field->rows)
++	{
++	  if (form->toprow == 0)
++	    ClrStatus(field, _NEWTOP);
++	  else
++	    SetStatus(field, _NEWTOP);
++	}
++      else
++	{
++	  if (Justification_Allowed(field))
++	    {
++	      Window_To_Buffer(form, field);
++	      werase(form->w);
++	      Perform_Justification(field, form->w);
++	      if (Field_Has_Option(field, O_DYNAMIC_JUSTIFY) &&
++		  (form->w->_parent == 0))
++		{
++		  copywin(form->w,
++			  Get_Form_Window(form),
++			  0,
++			  0,
++			  field->frow,
++			  field->fcol,
++			  field->frow,
++			  field->cols + field->fcol - 1,
++			  0);
++		  wsyncup(Get_Form_Window(form));
++		}
++	      else
++		{
++		  wsyncup(form->w);
++		}
++	    }
++	}
++    }
++  delwin(form->w);
++  form->w = (WINDOW *)0;
++  form->current = 0;
++}
++
+ /*---------------------------------------------------------------------------
+ |   Facility      :  libnform
+ |   Function      :  int _nc_Set_Current_Field(FORM  * form,
+@@ -1415,7 +1466,7 @@
+ 
+   T((T_CALLED("_nc_Set_Current_Field(%p,%p)"), (void *)form, (void *)newfield));
+ 
+-  if (!form || !newfield || !form->current || (newfield->form != form))
++  if (!form || !newfield || (newfield->form != form))
+     returnCode(E_BAD_ARGUMENT);
+ 
+   if ((form->status & _IN_DRIVER))
+@@ -1429,51 +1480,10 @@
+   if ((field != newfield) ||
+       !(form->status & _POSTED))
+     {
+-      if ((form->w) &&
++      if (field && (form->w) &&
+ 	  (Field_Has_Option(field, O_VISIBLE)) &&
+ 	  (field->form->curpage == field->page))
+-	{
+-	  _nc_Refresh_Current_Field(form);
+-	  if (Field_Has_Option(field, O_PUBLIC))
+-	    {
+-	      if (field->drows > field->rows)
+-		{
+-		  if (form->toprow == 0)
+-		    ClrStatus(field, _NEWTOP);
+-		  else
+-		    SetStatus(field, _NEWTOP);
+-		}
+-	      else
+-		{
+-		  if (Justification_Allowed(field))
+-		    {
+-		      Window_To_Buffer(form, field);
+-		      werase(form->w);
+-		      Perform_Justification(field, form->w);
+-		      if (Field_Has_Option(field, O_DYNAMIC_JUSTIFY) &&
+-			  (form->w->_parent == 0))
+-			{
+-			  copywin(form->w,
+-				  Get_Form_Window(form),
+-				  0,
+-				  0,
+-				  field->frow,
+-				  field->fcol,
+-				  field->frow,
+-				  field->cols + field->fcol - 1,
+-				  0);
+-			  wsyncup(Get_Form_Window(form));
+-			}
+-		      else
+-			{
+-			  wsyncup(form->w);
+-			}
+-		    }
+-		}
+-	    }
+-	  delwin(form->w);
+-	  form->w = (WINDOW *)0;
+-	}
++	_nc_Unset_Current_Field(form);
+ 
+       field = newfield;
+ 
+Index: man/form.3x
+Prereq:  1.26 
+--- ncurses-6.0-20161022+/man/form.3x	2015-08-02 18:14:50.000000000 +0000
++++ ncurses-6.0-20161029/man/form.3x	2016-10-29 22:26:35.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form.3x,v 1.26 2015/08/02 18:14:50 tom Exp $
++.\" $Id: form.3x,v 1.28 2016/10/29 22:26:35 tom Exp $
+ .TH form 3X ""
+ .SH NAME
+ \fBform\fR \- curses extension for programming forms
+@@ -146,6 +146,7 @@
+ set_form_win	\fBform_win\fR(3X)
+ set_max_field	\fBform_field_buffer\fR(3X)
+ set_new_page	\fBform_new_page\fR(3X)
++unfocus_current_field	\fBform_page\fR(3X)
+ unpost_form	\fBform_post\fR(3X)
+ .TE
+ .SH RETURN VALUE
+@@ -200,6 +201,10 @@
+ .SH PORTABILITY
+ These routines emulate the System V forms library.  They were not supported on
+ Version 7 or BSD versions.
++.PP
++A few functions are extensions added for ncurses, e.g.,
++\fBform_driver_w\fP,
++\fBunfocus_current_field\fP.
+ .SH AUTHORS
+ Juergen Pfeifer.  Manual pages and adaptation for ncurses by Eric
+ S. Raymond.
+Index: man/form_page.3x
+Prereq:  1.12 
+--- ncurses-6.0-20161022+/man/form_page.3x	2010-12-04 18:40:45.000000000 +0000
++++ ncurses-6.0-20161029/man/form_page.3x	2016-10-29 22:27:24.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2010,2016 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_page.3x,v 1.12 2010/12/04 18:40:45 tom Exp $
++.\" $Id: form_page.3x,v 1.14 2016/10/29 22:27:24 tom Exp $
+ .TH form_page 3X ""
+ .SH NAME
+ \fBform_page\fR \- set and get form page number
+@@ -38,6 +38,8 @@
+ .br
+ FIELD *current_field(const FORM *);
+ .br
++int unfocus_current_field(FORM *form);
++.br
+ int set_form_page(FORM *form, int n);
+ .br
+ int form_page(const FORM *form);
+@@ -45,9 +47,13 @@
+ int field_index(const FIELD *field);
+ .br
+ .SH DESCRIPTION
+-The function \fBset_current field\fR sets the current field of the given
++The function \fBset_current_field\fR sets the current field of the given
+ form; \fBcurrent_field\fR returns the current field of the given form.
+ .PP
++The function \fBunfocus_current_field\fR removes the focus from the current
++field of the form. In such state, inquiries via \fBcurrent_field\fR shall return
++a NULL pointer.
++.PP
+ The function \fBset_form_page\fR sets the form's page number (goes to page
+ \fIn\fR of the form).
+ .PP
+@@ -85,6 +91,8 @@
+ .SH PORTABILITY
+ These routines emulate the System V forms library.  They were not supported on
+ Version 7 or BSD versions.
++.PP
++The \fBunfocus_current_field\fP function is an ncurses extension.
+ .SH AUTHORS
+ Juergen Pfeifer.  Manual pages and adaptation for new curses by Eric
+ S. Raymond.
+Index: package/debian-mingw/changelog
+--- ncurses-6.0-20161022+/package/debian-mingw/changelog	2016-10-21 22:47:18.000000000 +0000
++++ ncurses-6.0-20161029/package/debian-mingw/changelog	2016-10-29 19:16:10.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161022) unstable; urgency=low
++ncurses6 (6.0+20161029) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Fri, 21 Oct 2016 18:47:18 -0400
++ -- Thomas E. Dickey   Sat, 29 Oct 2016 15:16:10 -0400
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.0-20161022+/package/debian-mingw64/changelog	2016-10-21 22:47:18.000000000 +0000
++++ ncurses-6.0-20161029/package/debian-mingw64/changelog	2016-10-29 19:16:10.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161022) unstable; urgency=low
++ncurses6 (6.0+20161029) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Fri, 21 Oct 2016 18:47:18 -0400
++ -- Thomas E. Dickey   Sat, 29 Oct 2016 15:16:10 -0400
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.0-20161022+/package/debian/changelog	2016-10-21 22:47:18.000000000 +0000
++++ ncurses-6.0-20161029/package/debian/changelog	2016-10-29 19:16:10.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161022) unstable; urgency=low
++ncurses6 (6.0+20161029) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Fri, 21 Oct 2016 18:47:18 -0400
++ -- Thomas E. Dickey   Sat, 29 Oct 2016 15:16:10 -0400
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.181 
+--- ncurses-6.0-20161022+/package/mingw-ncurses.nsi	2016-10-21 22:47:18.000000000 +0000
++++ ncurses-6.0-20161029/package/mingw-ncurses.nsi	2016-10-29 19:16:10.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.181 2016/10/21 22:47:18 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.182 2016/10/29 19:16:10 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "0"
+ !define VERSION_YYYY  "2016"
+-!define VERSION_MMDD  "1022"
++!define VERSION_MMDD  "1029"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.0-20161022+/package/mingw-ncurses.spec	2016-10-21 22:47:18.000000000 +0000
++++ ncurses-6.0-20161029/package/mingw-ncurses.spec	2016-10-29 19:16:10.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.0
+-Release: 20161022
++Release: 20161029
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.map
+Prereq:  1.35 
+--- ncurses-6.0-20161022+/package/ncurses.map	2015-09-05 19:27:16.000000000 +0000
++++ ncurses-6.0-20161029/package/ncurses.map	2016-10-30 01:06:37.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: ncurses.map,v 1.35 2015/09/05 19:27:16 tom Exp $
++# $Id: ncurses.map,v 1.36 2016/10/30 01:06:37 tom Exp $
+ # script for shared library symbol-versioning using ld
+ #
+ # This file was generated by ncu-mapsyms
+@@ -740,12 +740,19 @@
+ 	global:
+ 		wgetdelay;
+ 	local:
+-		_*;
+ 		_nc_mvcur;
+ 		_nc_mvcur_sp;
+ 		_nc_trace_mmask_t;
+ } NCURSES_5.8.20110226;
+ 
++NCURSES_6.0.current {
++	global:
++		unfocus_current_field;
++	local:
++		_*;
++		_nc_Unset_Current_Field;
++} NCURSES_5.9.20150530;
++
+ NCURSES_TIC_5.0.19991023 {
+ 	global:
+ 		_nc_capcmp;
+@@ -1107,6 +1114,7 @@
+ 		keyname_sp;
+ 		keyok_sp;
+ 		killchar_sp;
++		longname_sp;
+ 		napms_sp;
+ 		new_prescr;
+ 		nocbreak_sp;
+Index: package/ncurses.spec
+--- ncurses-6.0-20161022+/package/ncurses.spec	2016-10-21 22:47:18.000000000 +0000
++++ ncurses-6.0-20161029/package/ncurses.spec	2016-10-29 19:16:10.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.0
+-Release: 20161022
++Release: 20161029
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.sym
+Prereq:  1.24 
+--- ncurses-6.0-20161022+/package/ncurses.sym	2015-09-05 19:36:49.000000000 +0000
++++ ncurses-6.0-20161029/package/ncurses.sym	2016-10-30 00:45:38.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: ncurses.sym,v 1.24 2015/09/05 19:36:49 tom Exp $
++# $Id: ncurses.sym,v 1.25 2016/10/30 00:45:38 tom Exp $
+ # script for shared library symbol-visibility using libtool
+ #
+ # This file was generated by ncu-mapsyms
+@@ -51,7 +51,7 @@
+ #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-sp-funcs --with-termlib --with-trace
+ #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-wgetch-events --with-hashed-db --with-termlib --with-ticlib --with-trace
+ #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --with-broken_linker --with-termlib --with-ticlib --with-trace
+-# Configure options (6.0.current)
++# Configure options (6.0.20161029)
+ #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-getcap --enable-getcap-cache --enable-hard-tabs --enable-termcap --with-termlib --with-trace
+ #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-interop --with-termlib --with-trace
+ #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-sp-funcs --with-broken_linker --with-hashed-db --with-termlib --with-trace
+@@ -457,6 +457,7 @@
+ link_field
+ link_fieldtype
+ longname
++longname_sp
+ mcprint
+ mcprint_sp
+ menu_back
+@@ -763,6 +764,7 @@
+ typeahead_sp
+ unctrl
+ unctrl_sp
++unfocus_current_field
+ ungetch
+ ungetch_sp
+ ungetmouse
+Index: package/ncursest.map
+Prereq:  1.31 
+--- ncurses-6.0-20161022+/package/ncursest.map	2015-09-05 19:35:45.000000000 +0000
++++ ncurses-6.0-20161029/package/ncursest.map	2016-10-30 01:08:04.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: ncursest.map,v 1.31 2015/09/05 19:35:45 tom Exp $
++# $Id: ncursest.map,v 1.32 2016/10/30 01:08:04 tom Exp $
+ # script for shared library symbol-versioning using ld
+ #
+ # This file was generated by ncu-mapsyms
+@@ -1111,8 +1111,15 @@
+ 	global:
+ 		wgetdelay;
+ 	local:
+-		_*;
+ 		_nc_mvcur;
+ 		_nc_mvcur_sp;
+ 		_nc_trace_mmask_t;
+ } NCURSEST_5.8.20110226;
++
++NCURSEST_6.0.current {
++	global:
++		unfocus_current_field;
++	local:
++		_*;
++		_nc_Unset_Current_Field;
++} NCURSEST_5.9.20150530;
+Index: package/ncursest.sym
+Prereq:  1.26 
+--- ncurses-6.0-20161022+/package/ncursest.sym	2015-09-05 19:36:49.000000000 +0000
++++ ncurses-6.0-20161029/package/ncursest.sym	2016-10-30 00:55:06.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: ncursest.sym,v 1.26 2015/09/05 19:36:49 tom Exp $
++# $Id: ncursest.sym,v 1.27 2016/10/30 00:55:06 tom Exp $
+ # script for shared library symbol-visibility using libtool
+ #
+ # This file was generated by ncu-mapsyms
+@@ -35,7 +35,7 @@
+ #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-sp-funcs --enable-weak-symbols --with-pthread --with-termlib --with-trace
+ #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-weak-symbols --enable-wgetch-events --with-hashed-db --with-pthread --with-termlib --with-ticlib --with-trace
+ #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-weak-symbols --with-broken_linker --with-pthread --with-termlib --with-ticlib --with-trace
+-# Configure options (6.0.current)
++# Configure options (6.0.20161029)
+ #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-getcap --enable-getcap-cache --enable-hard-tabs --enable-termcap --enable-weak-symbols --with-pthread --with-termlib --with-trace
+ #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-interop --enable-weak-symbols --with-pthread --with-termlib --with-trace
+ #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-reentrant --enable-sp-funcs --enable-weak-symbols --with-pthread --with-termlib --with-trace
+@@ -748,6 +748,7 @@
+ typeahead_sp
+ unctrl
+ unctrl_sp
++unfocus_current_field
+ ungetch
+ ungetch_sp
+ ungetmouse
+Index: package/ncursestw.map
+Prereq:  1.32 
+--- ncurses-6.0-20161022+/package/ncursestw.map	2015-09-05 19:35:05.000000000 +0000
++++ ncurses-6.0-20161029/package/ncursestw.map	2016-10-30 01:09:53.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: ncursestw.map,v 1.32 2015/09/05 19:35:05 tom Exp $
++# $Id: ncursestw.map,v 1.33 2016/10/30 01:09:53 tom Exp $
+ # script for shared library symbol-versioning using ld
+ #
+ # This file was generated by ncu-mapsyms
+@@ -1230,8 +1230,15 @@
+ 		form_driver_w;
+ 		wgetdelay;
+ 	local:
+-		_*;
+ 		_nc_mvcur;
+ 		_nc_mvcur_sp;
+ 		_nc_trace_mmask_t;
+ } NCURSESTW_5.8.20110226;
++
++NCURSESTW_6.0.current {
++	global:
++		unfocus_current_field;
++	local:
++		_*;
++		_nc_Unset_Current_Field;
++} NCURSESTW_5.9.20150530;
+Index: package/ncursestw.sym
+Prereq:  1.24 
+--- ncurses-6.0-20161022+/package/ncursestw.sym	2015-09-05 19:36:49.000000000 +0000
++++ ncurses-6.0-20161029/package/ncursestw.sym	2016-10-30 01:00:08.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: ncursestw.sym,v 1.24 2015/09/05 19:36:49 tom Exp $
++# $Id: ncursestw.sym,v 1.25 2016/10/30 01:00:08 tom Exp $
+ # script for shared library symbol-visibility using libtool
+ #
+ # This file was generated by ncu-mapsyms
+@@ -35,7 +35,7 @@
+ #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-sp-funcs --enable-weak-symbols --enable-widec --with-pthread --with-termlib --with-trace
+ #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-weak-symbols --enable-wgetch-events --enable-widec --with-hashed-db --with-pthread --with-termlib --with-ticlib --with-trace
+ #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-weak-symbols --enable-widec --with-broken_linker --with-pthread --with-termlib --with-ticlib --with-trace
+-# Configure options (6.0.current)
++# Configure options (6.0.20161029)
+ #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-getcap --enable-getcap-cache --enable-hard-tabs --enable-termcap --enable-weak-symbols --enable-widec --with-pthread --with-termlib --with-trace
+ #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-interop --enable-weak-symbols --enable-widec --with-pthread --with-termlib --with-trace
+ #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-reentrant --enable-sp-funcs --enable-weak-symbols --enable-widec --with-pthread --with-termlib --with-trace
+@@ -826,6 +826,7 @@
+ typeahead_sp
+ unctrl
+ unctrl_sp
++unfocus_current_field
+ unget_wch
+ unget_wch_sp
+ ungetch
+Index: package/ncursesw.map
+Prereq:  1.37 
+--- ncurses-6.0-20161022+/package/ncursesw.map	2015-09-05 19:33:48.000000000 +0000
++++ ncurses-6.0-20161029/package/ncursesw.map	2016-10-30 01:11:09.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: ncursesw.map,v 1.37 2015/09/05 19:33:48 tom Exp $
++# $Id: ncursesw.map,v 1.38 2016/10/30 01:11:09 tom Exp $
+ # script for shared library symbol-versioning using ld
+ #
+ # This file was generated by ncu-mapsyms
+@@ -421,6 +421,7 @@
+ 		keyname_sp;
+ 		keyok_sp;
+ 		killchar_sp;
++		longname_sp;
+ 		napms_sp;
+ 		new_prescr;
+ 		nocbreak_sp;
+@@ -1254,8 +1255,15 @@
+ 		form_driver_w;
+ 		wgetdelay;
+ 	local:
+-		_*;
+ 		_nc_mvcur;
+ 		_nc_mvcur_sp;
+ 		_nc_trace_mmask_t;
+ } NCURSESW_5.8.20110226;
++
++NCURSESW_6.0.current {
++	global:
++		unfocus_current_field;
++	local:
++		_*;
++		_nc_Unset_Current_Field;
++} NCURSESW_5.9.20150530;
+Index: package/ncursesw.sym
+Prereq:  1.25 
+--- ncurses-6.0-20161022+/package/ncursesw.sym	2015-09-05 19:36:49.000000000 +0000
++++ ncurses-6.0-20161029/package/ncursesw.sym	2016-10-30 00:50:36.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: ncursesw.sym,v 1.25 2015/09/05 19:36:49 tom Exp $
++# $Id: ncursesw.sym,v 1.26 2016/10/30 00:50:36 tom Exp $
+ # script for shared library symbol-visibility using libtool
+ #
+ # This file was generated by ncu-mapsyms
+@@ -46,7 +46,7 @@
+ #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-sp-funcs --enable-widec --with-termlib --with-trace
+ #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-wgetch-events --enable-widec --with-hashed-db --with-termlib --with-ticlib --with-trace
+ #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-widec --with-broken_linker --with-termlib --with-ticlib --with-trace
+-# Configure options (6.0.current)
++# Configure options (6.0.20161029)
+ #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-getcap --enable-getcap-cache --enable-hard-tabs --enable-termcap --enable-widec --with-termlib --with-trace
+ #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-interop --enable-widec --with-termlib --with-trace
+ #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-sp-funcs --enable-widec --with-broken_linker --with-hashed-db --with-termlib --with-trace
+@@ -489,6 +489,7 @@
+ link_field
+ link_fieldtype
+ longname
++longname_sp
+ mcprint
+ mcprint_sp
+ menu_back
+@@ -836,6 +837,7 @@
+ typeahead_sp
+ unctrl
+ unctrl_sp
++unfocus_current_field
+ unget_wch
+ unget_wch_sp
+ ungetch
diff --git a/ncurses-6.0-20161105.patch b/ncurses-6.0-20161105.patch
new file mode 100644
index 0000000..2dcc344
--- /dev/null
+++ b/ncurses-6.0-20161105.patch
@@ -0,0 +1,266 @@
+# ncurses 6.0 - patch 20161105 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.0 is at
+# 	ftp.gnu.org:/pub/gnu
+#
+# Patches for ncurses 6.0 can be found at
+# 	ftp://invisible-island.net/ncurses/6.0
+#	http://invisible-mirror.net/archives/ncurses/6.0 
+#
+# ------------------------------------------------------------------------------
+# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20161105.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Nov  6 00:04:10 UTC 2016
+# ------------------------------------------------------------------------------
+# Ada95/gen/adacurses-config.in    |    9 +++++----
+# NEWS                             |    6 +++++-
+# VERSION                          |    2 +-
+# dist.mk                          |    4 ++--
+# man/MKada_config.in              |   13 +++++++------
+# man/terminfo.tail                |    4 ++--
+# package/debian-mingw/changelog   |    4 ++--
+# package/debian-mingw64/changelog |    4 ++--
+# package/debian/changelog         |    4 ++--
+# package/mingw-ncurses.nsi        |    4 ++--
+# package/mingw-ncurses.spec       |    2 +-
+# package/ncurses.spec             |    2 +-
+# 12 files changed, 32 insertions(+), 26 deletions(-)
+# ------------------------------------------------------------------------------
+Index: Ada95/gen/adacurses-config.in
+Prereq:  1.9 
+--- ncurses-6.0-20161029+/Ada95/gen/adacurses-config.in	2014-06-07 19:32:22.000000000 +0000
++++ ncurses-6.0-20161105/Ada95/gen/adacurses-config.in	2016-11-05 20:48:35.000000000 +0000
+@@ -1,7 +1,7 @@
+ #! /bin/sh
+-# $Id: adacurses-config.in,v 1.9 2014/06/07 19:32:22 Pascal.Pignard Exp $
++# $Id: adacurses-config.in,v 1.11 2016/11/05 20:48:35 tom Exp $
+ ##############################################################################
+-# Copyright (c) 2007-2010,2014 Free Software Foundation, Inc.                #
++# Copyright (c) 2007-2012,2016 Free Software Foundation, Inc.                #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+ # copy of this software and associated documentation files (the "Software"), #
+@@ -44,6 +44,7 @@
+ LIBS="-L$ADA_OBJECTS -lAdaCurses"
+ 
+ THIS="adacurses"
++THIS_CFG="$THIS@DFT_ARG_SUFFIX@-config"
+ 
+ case "x$1" in
+ 	x--version)
+@@ -61,7 +62,7 @@
+ 		;;
+ 	x--help)
+ 		cat <&2
++		echo 'Usage: $THIS_CFG [--version | --cflags | --libs]' >&2
+ 		exit 1
+ 		;;
+ esac
+Index: NEWS
+Prereq:  1.2689 
+--- ncurses-6.0-20161029+/NEWS	2016-10-29 22:28:11.000000000 +0000
++++ ncurses-6.0-20161105/NEWS	2016-11-05 21:17:13.000000000 +0000
+@@ -25,7 +25,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.2689 2016/10/29 22:28:11 tom Exp $
++-- $Id: NEWS,v 1.2692 2016/11/05 21:17:13 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -45,6 +45,10 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20161105
++	+ fix typo in man/terminfo.tail (Alain Williams).
++	+ correct program-name in adacurses6-config.1 manual page.
++
+ 20161029
+ 	+ add new function "unfocus_current_field" (Leon Winter)
+ 
+Index: VERSION
+--- ncurses-6.0-20161029+/VERSION	2016-10-29 19:16:10.000000000 +0000
++++ ncurses-6.0-20161105/VERSION	2016-11-05 16:39:30.000000000 +0000
+@@ -1 +1 @@
+-5:0:9	6.0	20161029
++5:0:9	6.0	20161105
+Index: dist.mk
+Prereq:  1.1130 
+--- ncurses-6.0-20161029+/dist.mk	2016-10-29 19:16:10.000000000 +0000
++++ ncurses-6.0-20161105/dist.mk	2016-11-05 16:39:30.000000000 +0000
+@@ -25,7 +25,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1130 2016/10/29 19:16:10 tom Exp $
++# $Id: dist.mk,v 1.1131 2016/11/05 16:39:30 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -37,7 +37,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 0
+-NCURSES_PATCH = 20161029
++NCURSES_PATCH = 20161105
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: man/MKada_config.in
+Prereq:  1.8 
+--- ncurses-6.0-20161029+/man/MKada_config.in	2014-06-07 19:32:52.000000000 +0000
++++ ncurses-6.0-20161105/man/MKada_config.in	2016-11-05 21:08:21.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 2010-2011,2014 Free Software Foundation, Inc.              *
++.\" Copyright (c) 2010-2014,2016 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,12 +26,13 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: MKada_config.in,v 1.8 2014/06/07 19:32:52 tom Exp $
++.\" $Id: MKada_config.in,v 1.10 2016/11/05 21:08:21 tom Exp $
++.ds C adacurses@USE_CFG_SUFFIX@\-config
+ .TH ADACURSES "1" "" "" "User Commands"
+ .SH NAME
+-adacurses\-config \- helper script for AdaCurses libraries
++adacurses@USE_CFG_SUFFIX@\-config \- helper script for AdaCurses libraries
+ .SH SYNOPSIS
+-.B adacurses\-config
++.B \*C
+ [\fIoptions\fR]
+ .SH DESCRIPTION
+ This is a shell script which simplifies configuring an application to use
+@@ -49,9 +50,9 @@
+ to configure and build AdaCurses.
+ .TP
+ \fB\-\-help\fR
+-prints a list of the \fBadacurses\-config\fP script's options.
++prints a list of the \fB\*C\fP script's options.
+ .PP
+-If no options are given, \fBadacurses\-config\fP prints the combination
++If no options are given, \fB\*C\fP prints the combination
+ of 
+ \fB\-\-cflags\fR and
+ \fB\-\-libs\fR
+Index: man/terminfo.tail
+Prereq:  1.73 
+--- ncurses-6.0-20161029+/man/terminfo.tail	2016-10-22 19:56:17.000000000 +0000
++++ ncurses-6.0-20161105/man/terminfo.tail	2016-11-05 21:15:43.000000000 +0000
+@@ -1,4 +1,4 @@
+-.\" $Id: terminfo.tail,v 1.73 2016/10/22 19:56:17 tom Exp $
++.\" $Id: terminfo.tail,v 1.74 2016/11/05 21:15:43 Alain.Williams Exp $
+ .\" Beginning of terminfo.tail file
+ .\" This file is part of ncurses.
+ .\" See "terminfo.head" for copyright.
+@@ -648,7 +648,7 @@
+ \fBindn\fR, and \fBrin\fR will simulate destructive scrolling; their
+ documentation cautions you not to define \fBcsr\fR unless this is true.
+ This \fBcurses\fR implementation is more liberal and will do explicit erases
+-after scrolling if \fBndstr\fR is defined.
++after scrolling if \fBndsrc\fR is defined.
+ .PP
+ If the terminal has the ability to define a window as part of
+ memory, which all commands affect,
+Index: package/debian-mingw/changelog
+--- ncurses-6.0-20161029+/package/debian-mingw/changelog	2016-10-29 19:16:10.000000000 +0000
++++ ncurses-6.0-20161105/package/debian-mingw/changelog	2016-11-05 16:39:30.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161029) unstable; urgency=low
++ncurses6 (6.0+20161105) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 29 Oct 2016 15:16:10 -0400
++ -- Thomas E. Dickey   Sat, 05 Nov 2016 12:39:30 -0400
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.0-20161029+/package/debian-mingw64/changelog	2016-10-29 19:16:10.000000000 +0000
++++ ncurses-6.0-20161105/package/debian-mingw64/changelog	2016-11-05 16:39:30.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161029) unstable; urgency=low
++ncurses6 (6.0+20161105) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 29 Oct 2016 15:16:10 -0400
++ -- Thomas E. Dickey   Sat, 05 Nov 2016 12:39:30 -0400
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.0-20161029+/package/debian/changelog	2016-10-29 19:16:10.000000000 +0000
++++ ncurses-6.0-20161105/package/debian/changelog	2016-11-05 16:39:30.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161029) unstable; urgency=low
++ncurses6 (6.0+20161105) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 29 Oct 2016 15:16:10 -0400
++ -- Thomas E. Dickey   Sat, 05 Nov 2016 12:39:30 -0400
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.182 
+--- ncurses-6.0-20161029+/package/mingw-ncurses.nsi	2016-10-29 19:16:10.000000000 +0000
++++ ncurses-6.0-20161105/package/mingw-ncurses.nsi	2016-11-05 16:39:30.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.182 2016/10/29 19:16:10 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.183 2016/11/05 16:39:30 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "0"
+ !define VERSION_YYYY  "2016"
+-!define VERSION_MMDD  "1029"
++!define VERSION_MMDD  "1105"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.0-20161029+/package/mingw-ncurses.spec	2016-10-29 19:16:10.000000000 +0000
++++ ncurses-6.0-20161105/package/mingw-ncurses.spec	2016-11-05 16:39:30.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.0
+-Release: 20161029
++Release: 20161105
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.0-20161029+/package/ncurses.spec	2016-10-29 19:16:10.000000000 +0000
++++ ncurses-6.0-20161105/package/ncurses.spec	2016-11-05 16:39:30.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.0
+-Release: 20161029
++Release: 20161105
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/ncurses-6.0-20161112.patch b/ncurses-6.0-20161112.patch
new file mode 100644
index 0000000..6fc2478
--- /dev/null
+++ b/ncurses-6.0-20161112.patch
@@ -0,0 +1,1166 @@
+# ncurses 6.0 - patch 20161112 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.0 is at
+# 	ftp.gnu.org:/pub/gnu
+#
+# Patches for ncurses 6.0 can be found at
+# 	ftp://invisible-island.net/ncurses/6.0
+#	http://invisible-mirror.net/archives/ncurses/6.0 
+#
+# ------------------------------------------------------------------------------
+# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20161112.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Nov 13 02:39:52 UTC 2016
+# ------------------------------------------------------------------------------
+# NEWS                             |    8 -
+# VERSION                          |    2 
+# dist.mk                          |    4 
+# misc/terminfo.src                |  283 ++++++++++++++++++++++---------------
+# package/debian-mingw/changelog   |    4 
+# package/debian-mingw64/changelog |    4 
+# package/debian/changelog         |    4 
+# package/mingw-ncurses.nsi        |    4 
+# package/mingw-ncurses.spec       |    2 
+# package/ncurses.spec             |    2 
+# progs/dump_entry.c               |   53 ++++--
+# 11 files changed, 224 insertions(+), 146 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.2692 
+--- ncurses-6.0-20161105+/NEWS	2016-11-05 21:17:13.000000000 +0000
++++ ncurses-6.0-20161112/NEWS	2016-11-13 00:10:13.000000000 +0000
+@@ -25,7 +25,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.2692 2016/11/05 21:17:13 tom Exp $
++-- $Id: NEWS,v 1.2695 2016/11/13 00:10:13 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -45,6 +45,12 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20161112
++	+ improve -W option in tic/infocmp:
++	  + correct order of size-adjustments in wrapped lines
++	  + if -f option splits line, do not further split it with -W
++	  + begin a new line when adding "use=" after a wrapped line
++
+ 20161105
+ 	+ fix typo in man/terminfo.tail (Alain Williams).
+ 	+ correct program-name in adacurses6-config.1 manual page.
+Index: VERSION
+--- ncurses-6.0-20161105+/VERSION	2016-11-05 16:39:30.000000000 +0000
++++ ncurses-6.0-20161112/VERSION	2016-11-12 15:46:51.000000000 +0000
+@@ -1 +1 @@
+-5:0:9	6.0	20161105
++5:0:9	6.0	20161112
+Index: dist.mk
+Prereq:  1.1131 
+--- ncurses-6.0-20161105+/dist.mk	2016-11-05 16:39:30.000000000 +0000
++++ ncurses-6.0-20161112/dist.mk	2016-11-12 15:46:51.000000000 +0000
+@@ -25,7 +25,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1131 2016/11/05 16:39:30 tom Exp $
++# $Id: dist.mk,v 1.1132 2016/11/12 15:46:51 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -37,7 +37,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 0
+-NCURSES_PATCH = 20161105
++NCURSES_PATCH = 20161112
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: misc/terminfo.src
+--- ncurses-6.0-20161105+/misc/terminfo.src	2016-10-02 01:19:07.000000000 +0000
++++ ncurses-6.0-20161112/misc/terminfo.src	2016-11-13 00:17:12.000000000 +0000
+@@ -6,8 +6,8 @@
+ # Report bugs and new terminal descriptions to
+ #	bug-ncurses@gnu.org
+ #
+-#	$Revision: 1.572 $
+-#	$Date: 2016/10/02 01:19:07 $
++#	$Revision: 1.573 $
++#	$Date: 2016/11/13 00:17:12 $
+ #
+ # The original header is preserved below for reference.  It is noted that there
+ # is a "newer" version which differs in some cosmetic details (but actually
+@@ -371,11 +371,13 @@
+ ansi+sgrbold|ansi graphic renditions; assuming terminal has bold; not dim,
+ 	bold=\E[1m,
+ 	sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;
+-	    %;%?%p7%t8;%;m, use=ansi+sgr, use=ansi+sgrso, use=ansi+sgrul,
++	    %;%?%p7%t8;%;m,
++	use=ansi+sgr, use=ansi+sgrso, use=ansi+sgrul,
+ ansi+sgrdim|ansi graphic renditions; assuming terminal has dim; not bold,
+ 	dim=\E[2m,
+ 	sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p5%t2;
+-	    %;%?%p7%t8;%;m, use=ansi+sgr, use=ansi+sgrso, use=ansi+sgrul,
++	    %;%?%p7%t8;%;m,
++	use=ansi+sgr, use=ansi+sgrso, use=ansi+sgrul,
+ ansi+csr|ansi scroll-region plus cursor save & restore,
+ 	csr=\E[%i%p1%d;%p2%dr, rc=\E8, sc=\E7,
+ 
+@@ -417,7 +419,8 @@
+ klone+sgr8|attribute control for ansi.sys displays,
+ 	invis=\E[8m,
+ 	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6
+-	    %t;1%;%?%p7%t;8%;%?%p9%t;11%;m, use=klone+sgr,
++	    %t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
++	use=klone+sgr,
+ 
+ # Highlight controls corresponding to the ANSI.SYS standard.  *All*
+ # console drivers for Intel boxes obey these.  Does not assume \E[11m will
+@@ -436,8 +439,8 @@
+ klone+koi8acs|alternate character set for ansi.sys displays with KOI8 charset,
+ 	acsc=+\020\,\021-\036.^_0\215`\004a\237f\234g\232h\222i
+ 	     \220j\205k\203l\202m\204n\212o\213p\216q\0r\217s\214t
+-	     \206u\207v\210w\211x\201y\230z\231{\267|\274}L
+-	     ~\225,
++	     \206u\207v\210w\211x\201y\230z\231{\267|\274}L~
++	     \225,
+ 	rmacs=\E[10m, smacs=\E[11m,
+ 
+ # ANSI.SYS color control.  The setab/setaf caps depend on the coincidence
+@@ -673,7 +676,8 @@
+ 	kf9=\0C, khome=\0G, kich1=\0R, knp=\0Q, kpp=\0I,
+ 	pfkey=\E[0;%?%p1%{11}%<%t%'\:'%e%p1%{13}%<%t%'z'%e%p1%{23}%<
+ 	      %t%'G'%e%p1%{25}%<%t%'p'%e%p1%'#'%<%t%'E'%e%p1%'%'%<%t
+-	      %'f'%e%p1%'/'%<%t%'C'%e%{92}%;%p1%+%d;%p2"%s"p, use=ansi.sys-old,
++	      %'f'%e%p1%'/'%<%t%'C'%e%{92}%;%p1%+%d;%p2"%s"p,
++	use=ansi.sys-old,
+ 
+ #
+ # Define IBM PC keypad keys for vi as per MS-Kermit while using ANSI.SYS.
+@@ -694,7 +698,8 @@
+ 	rmkx=\E[;71;0;71p\E[;72;0;72p\E[;73;0;73p\E[;77;0;77p\E[;80;
+ 	     0;80p\E[;81;0;81p\E[;82;0;82p\E[;83;0;83p,
+ 	smkx=\E[;71;30p\E[;72;11p\E[;73;27;21p\E[;77;12p\E[;80;10p
+-	     \E[;81;27;4p\E[;82;27;27;105p\E[;83;127p, use=ansi.sys,
++	     \E[;81;27;4p\E[;82;27;27;105p\E[;83;127p,
++	use=ansi.sys,
+ #
+ # Adds ins/del line/character, hence vi reverse scrolls/inserts/deletes nicer.
+ nansi.sys|nansisys|PC-DOS Public Domain NANSI.SYS,
+@@ -706,7 +711,8 @@
+ nansi.sysk|nansisysk|PC-DOS Public Domain NANSI.SYS with keypad redefined for vi,
+ 	dch1=\E[1P, dl1=\E[1M, ich1=\E[1@, il1=\E[1L,
+ 	is2=U4\sPC-DOS\sPublic\sDomain\sNANSI.SYS\swith\skeypad
+-	    \sredefined\sfor\svi\s9-29-86\n\E[;75;8p, use=ansi.sysk,
++	    \sredefined\sfor\svi\s9-29-86\n\E[;75;8p,
++	use=ansi.sysk,
+ 
+ #### Atari ST terminals
+ 
+@@ -723,7 +729,8 @@
+ 	setb=\Ec%?%p1%{0}%=%t?%e%p1%{7}%=%t0%e%p1%{15}%=%t7%e%p1
+ 	     %{48}%+%c,
+ 	setf=\Eb%?%p1%{0}%=%t?%e%p1%{7}%=%t0%e%p1%{15}%=%t7%e%p1
+-	     %{48}%+%c, use=tw52-m,
++	     %{48}%+%c,
++	use=tw52-m,
+ tw52-m|Toswin window manager monochrome,
+ 	ul,
+ 	ma#999,
+@@ -756,7 +763,8 @@
+ 	     %=%t>%e%p1%{4}%=%t4%e%p1%{5}%=%t7%e%p1%{6}%=%t5%e%p1
+ 	     %{7}%=%t0%e%p1%{8}%=%t8%e%p1%{9}%=%t9%e%p1%{10}%=%t\:%e
+ 	     %p1%{11}%=%t;%e%p1%{12}%=%t<%e%p1%{13}%=%t=%e%p1%{14}%=
+-	     %t6%e?, use=st52,
++	     %t6%e?,
++	use=st52,
+ st52|st52-m|at|at-m|atari|atari-m|atari_st|atarist-m|Atari ST,
+ 	am, eo, mir, npc,
+ 	cols#80, it#8, lines#24,
+@@ -1343,7 +1351,8 @@
+ 	bce, bw@,
+ 	csr@, dim@, kend=\EOF, khome=\EOH,
+ 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
+-	    %p7%t;8%;m%?%p9%t\016%e\017%;, use=xterm+256setaf, use=nsterm-16color,
++	    %p7%t;8%;m%?%p9%t\016%e\017%;,
++	use=xterm+256setaf, use=nsterm-16color,
+ 
+ # xnuppc - Darwin PowerPC Console (a.k.a. "darwin")
+ #
+@@ -1721,8 +1730,8 @@
+ 	      %{9}%>%t%gx%{10}%-%'a'%+%c%e%gx%d%;%gr%{15}%&%Px%?%gx
+ 	      %{9}%>%t%gx%{10}%-%'a'%+%c%e%gx%d%;%p4%{255}%*%{1000}
+ 	      %/%Pr%gr%{16}%/%Px%?%gx%{9}%>%t%gx%{10}%-%'a'%+%c%e%gx
+-	      %d%;%gr%{15}%&%Px%?%gx%{9}%>%t%gx%{10}%-%'a'%+%c%e
+-	      %gx%d%;,
++	      %d%;%gr%{15}%&%Px%?%gx%{9}%>%t%gx%{10}%-%'a'%+%c%e%gx
++	      %d%;,
+ 	oc=\E]R, use=linux-basic,
+ 
+ # The 2.2.x kernels add a private mode that sets the cursor type; use that to
+@@ -1776,7 +1785,8 @@
+ linux-koi8|linux with koi8 alternate character set,
+ 	acsc=+\020\,\021-\030.^Y0\215`\004a\221f\234g\237h\220i
+ 	     \276j\205k\203l\202m\204n\212o~p\0q\0r\0s_t\206u\207v
+-	     \211w\210x\201y\230z\231{\267|\274~\224, use=linux, use=klone+koi8acs,
++	     \211w\210x\201y\230z\231{\267|\274~\224,
++	use=linux, use=klone+koi8acs,
+ 
+ # Another entry for KOI8-r with Qing Long's acsc.
+ # (which one better complies with the standard?)
+@@ -1787,7 +1797,8 @@
+ linux-lat|linux with latin1 or latin2 alternate character set,
+ 	acsc=+\020\,\021-\030.^Y0\333`\004a\013f\370g\361h\260i
+ 	     \316j\211k\214l\206m\203n\305o~p\304q\212r\304s_t\207u
+-	     \215v\301w\302x\205y\363z\362{\343|\330}\234~\376, use=linux,
++	     \215v\301w\302x\205y\363z\362{\343|\330}\234~\376,
++	use=linux,
+ 
+ # This uses graphics from VT codeset instead of from cp437.
+ # reason: cp437 (aka "straight to font") is not functional under luit.
+@@ -1887,7 +1898,8 @@
+ 	el1=\E[1K, hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ich1=\E[@,
+ 	indn=\E[%p1%dS, invis=\E[8m, nel=\EE, rin=\E[%p1%dT,
+ 	sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;
+-	    2%;%?%p6%t;1%;%?%p7%t;8%;m, use=mach,
++	    2%;%?%p6%t;1%;%?%p7%t;8%;m,
++	use=mach,
+ 
+ mach-gnu-color|Mach Console with ANSI color,
+ 	colors#8, pairs#64,
+@@ -2650,8 +2662,9 @@
+ 	sgr0=\E[m, smso=\E[7m, vpa=\E[%i%p1%dd,
+ cons25|ansis|ansi80x25|freebsd console (25-line ansi mode),
+ 	acsc=-\030.^Y0\333`\004a\260f\370g\361h\261i\025j\331k\277l
+-	     \332m\300n\305q\304t\303u\264v\301w\302x\263y\363z
+-	     \362~\371, use=cons25w,
++	     \332m\300n\305q\304t\303u\264v\301w\302x\263y\363z\362~
++	     \371,
++	use=cons25w,
+ cons25-debian|freebsd console with debian backspace (25-line ansi mode),
+ 	kbs=\177, kdch1=\E[3~, use=cons25,
+ cons25-m|ansis-mono|ansi80x25-mono|freebsd console (25-line mono ansi mode),
+@@ -2677,8 +2690,9 @@
+ 	lines#60, use=cons25-m,
+ cons25r|pc3r|ibmpc3r|cons25-koi8-r|freebsd console w/koi8-r cyrillic,
+ 	acsc=-\030.^Y0\215`\004a\220f\234h\221i\025j\205k\203l\202m
+-	     \204n\212q\0t\206u\207v\211w\210x\201y\230z
+-	     \231~\225, use=cons25w,
++	     \204n\212q\0t\206u\207v\211w\210x\201y\230z\231~
++	     \225,
++	use=cons25w,
+ cons25r-m|pc3r-m|ibmpc3r-mono|cons25-koi8r-m|freebsd console w/koi8-r cyrillic (mono),
+ 	colors@, pairs@,
+ 	op@, rmul=\E[m, setab@, setaf@,
+@@ -2697,7 +2711,8 @@
+ cons25l1|cons25-iso8859|freebsd console w/iso 8859-1 chars,
+ 	acsc=+\253\,\273-\030.\031`\201a\202f\207g\210i\247j\213k
+ 	     \214l\215m\216n\217o\220p\221q\222r\223s\224t\225u
+-	     \226v\227w\230x\231y\232z\233~\237, use=cons25w,
++	     \226v\227w\230x\231y\232z\233~\237,
++	use=cons25w,
+ cons25l1-m|cons25-iso-m|freebsd console w/iso 8859-1 chars (mono),
+ 	colors@, pairs@,
+ 	bold@, dim@, op@, rmul=\E[m, setab@, setaf@,
+@@ -2796,7 +2811,8 @@
+ # Bug: The  capability resets attributes.
+ bsdos-pc|IBM PC BSD/OS Console,
+ 	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;1%;%?%p3%t;7%;%?%p4%t;5%;%?%p6
+-	    %t;1%;%?%p7%t;8%;%?%p9%t;11%;m, use=bsdos-pc-nobold,
++	    %t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
++	use=bsdos-pc-nobold,
+ 
+ bsdos-pc-nobold|BSD/OS PC console w/o bold,
+ 	use=klone+color, use=bsdos-pc-m,
+@@ -2812,7 +2828,8 @@
+ 	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, khome=\E[H, kich1=\E[L,
+ 	kll=\E[F, knp=\E[G, kpp=\E[I, nel=^M^J, rc=\E8, sc=\E7,
+ 	sgr=\E[0;10%?%p1%t;7%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7
+-	    %t;8%;%?%p9%t;11%;m%?%p5%t\E[=8F%;, use=klone+sgr8,
++	    %t;8%;%?%p9%t;11%;m%?%p5%t\E[=8F%;,
++	use=klone+sgr8,
+ 
+ # Old names for BSD/OS PC console used in releases before 4.1.
+ pc3|BSD/OS on the PC Console,
+@@ -3542,7 +3559,8 @@
+ 	pctrm=USR_TERM\:vt420pcdos\:,
+ 	pfx=\EP1;1|%?%{16}%p1%>%t%{0}%e%{21}%p1%>%t%{1}%e%{25}%p1%>
+ 	    %t%{2}%e%{27}%p1%>%t%{3}%e%{30}%p1%>%t%{4}%e%{5}%;%p1%+
+-	    %d/%p2%s\E\\, use=vt420,
++	    %d/%p2%s\E\\,
++	use=vt420,
+ 
+ vt420pcdos|DEC VT420 w/PC for DOS Merge,
+ 	lines#25,
+@@ -4112,7 +4130,8 @@
+ 	kLFT=\E[1;2D, kNXT=\E[6;2~, kPRV=\E[5;2~, kRIT=\E[1;2C,
+ 	kbeg@,
+ 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
+-	    %p7%t;8%;m%?%p9%t\016%e\017%;, use=xterm-xf86-v40,
++	    %p7%t;8%;m%?%p9%t\016%e\017%;,
++	use=xterm-xf86-v40,
+ 
+ # This version was released in XFree86 4.4.
+ xterm-xf86-v44|xterm terminal emulator (XFree86 4.4 Window System),
+@@ -4783,7 +4802,8 @@
+ 	setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
+ 	     %=%t3%e%p1%d%;m,
+ 	setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
+-	     %=%t3%e%p1%d%;m, use=xtermm,
++	     %=%t3%e%p1%d%;m,
++	use=xtermm,
+ 
+ # From: David J. MacKenzie  20 Apr 1995
+ # Here's a termcap entry I've been using for xterm_color, which comes
+@@ -4935,7 +4955,8 @@
+ gnome-fc5|GNOME Terminal,
+ 	rs1=\Ec,
+ 	rs2=\E7\E[r\E8\E[m\E[?7h\E[!p\E[?1;3;4;6l\E[4l\E>\E[?1000l
+-	    \E[?25h, use=ansi+enq, use=xterm+pcc0, use=gnome-rh90,
++	    \E[?25h,
++	use=ansi+enq, use=xterm+pcc0, use=gnome-rh90,
+ 
+ # GNOME Terminal 2.18.1 (2007 snapshot)
+ #
+@@ -5408,11 +5429,13 @@
+ rxvt-cygwin|rxvt terminal emulator (X Window System) on cygwin,
+ 	acsc=+\257\,\256-\^0\333`\004a\261f\370g\361h\260j\331k
+ 	     \277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w
+-	     \302x\263y\363z\362{\343|\330}\234~\376, use=rxvt,
++	     \302x\263y\363z\362{\343|\330}\234~\376,
++	use=rxvt,
+ rxvt-cygwin-native|rxvt terminal emulator (native MS Window System port) on cygwin,
+ 	acsc=+\257\,\256-\^0\333`\004a\261f\370g\361h\260j\331k
+ 	     \277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w
+-	     \302x\263y\363z\362{\343|\330~\376, use=rxvt-cygwin,
++	     \302x\263y\363z\362{\343|\330~\376,
++	use=rxvt-cygwin,
+ 
+ # This variant is supposed to work with rxvt 2.7.7 when compiled with
+ # NO_BRIGHTCOLOR defined.  rxvt needs more work...
+@@ -6313,7 +6336,8 @@
+ 	ncv#127,
+ 	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i
+ 	     \316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u
+-	     \264v\301w\302x\263y\363z\362{\343|\330}\234~\376, use=screen+fkeys, use=screen,
++	     \264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
++	use=screen+fkeys, use=screen,
+ # Other terminals
+ screen.rxvt|screen in rxvt,
+ 	bw, XT,
+@@ -6830,7 +6854,8 @@
+ 	OTbs,
+ 	lines#40,
+ 	is2=\E7\E[r\E8\EE\EE\EE\EM\EM\EM\E[?7h\E[?1l\E[?3l\E7\E[1;40
+-	    r\E8, use=news-old-unk,
++	    r\E8,
++	use=news-old-unk,
+ #
+ # (nwp512-a: this had :TY=ascii: and the alias vt100-bm --esr)
+ nwp512-a|nwp514-a|news-a|news42|news40-a|sony vt100 emulator 42 line,
+@@ -6843,14 +6868,16 @@
+ 	OTbs,
+ 	lines#40,
+ 	is2=\E7\E[r\E8\EE\EE\EE\EM\EM\EM\E[?7h\E[?1l\E[?3l\E7\E[1;40
+-	    r\E8, use=news-old-unk,
++	    r\E8,
++	use=news-old-unk,
+ #
+ # (nwp513: this had :DE=^H: and the alias vt100-bm --esr)
+ nwp513|nwp518|nwe501|newscbm|news31|sony vt100 emulator 33 lines,
+ 	OTbs,
+ 	lines#31,
+ 	is2=\E7\E[r\E8\EE\EE\EE\EM\EM\EM\E[?7h\E[?1l\E[?3l\E7\E[1;31
+-	    r\E8, use=news-old-unk,
++	    r\E8,
++	use=news-old-unk,
+ #
+ # (nwp513-a: this had :TY=ascii: and :DE=^H:, which I interpret as ; --esr)
+ # also the alias vt100-bm.
+@@ -6858,27 +6885,31 @@
+ 	OTbs,
+ 	lines#33,
+ 	is2=\E7\E[r\E8\EE\EE\EE\EM\EM\EM\E[?7h\E[?1l\E[?3l\E7\E[1;33
+-	    r\E8, use=news-old-unk,
++	    r\E8,
++	use=news-old-unk,
+ #
+ # (nwp513-o: had :DE=^H:, I think that's ; also the alias vt100-bm --esr)
+ nwp513-o|nwp518-o|nwe501-o|nwp251-o|newscbm-o|news31-o|old sony vt100 emulator 33 lines,
+ 	OTbs,
+ 	lines#31,
+ 	is2=\E7\E[r\E8\EE\EE\EE\EM\EM\EM\E[?7h\E[?1l\E[?3l\E7\E[1;31
+-	    r\E8, use=news-old-unk,
++	    r\E8,
++	use=news-old-unk,
+ #
+ # (news28: this had :DE=^H:, I think that's , and :KB=nws1200: --esr)
+ news28|sony vt100 emulator 28 lines,
+ 	OTbs,
+ 	lines#28,
+ 	is2=\E7\E[r\E8\EE\EE\EE\EM\EM\EM\E[?7h\E[?1l\E[?3l\E7\E[1;28
+-	    r\E8, use=news-old-unk,
++	    r\E8,
++	use=news-old-unk,
+ #
+ # (news29: this had :TY=ascii:KB=nws1200:\ --esr)
+ news29|news28-a|sony vt100 emulator 29 lines,
+ 	lines#29,
+ 	is2=\E7\E[r\E8\EE\EE\EE\EM\EM\EM\E[?7h\E[?1l\E[?3l\E7\E[1;29
+-	    r\E8, use=news-old-unk,
++	    r\E8,
++	use=news-old-unk,
+ #
+ # (news511: this had :TY=sjis: --esr)
+ nwp511|nwp-511|nwp-511 vt100,
+@@ -7770,7 +7801,8 @@
+ # Force terminal back to 24 lines after being 23.
+ hp2626-ns|hp 2626 using all 24 lines,
+ 	is1=\E&q3t0{0H\s\E&w0f118n1I\s\E&w0f1n2I\s\E&w2f1i0d0u23l0S
+-	    \s\E&w3f2I\s\E&w7f2p1I\s\r, use=hp2626,
++	    \s\E&w3f2I\s\E&w7f2p1I\s\r,
++	use=hp2626,
+ # Various entries useful for small windows on 2626.
+ hp2626-12|hewlett-packard 2626 12 lines,
+ 	lines#12, use=hp2626,
+@@ -7834,8 +7866,7 @@
+ 	kind=\ES, knp=\EU, kpp=\EV, kri=\ET, krmir=\ER, rev=\E&dB,
+ 	rmkx=\E&s0A,
+ 	sgr=\E&d%{64}%?%p1%t%{66}%|%;%?%p2%t%{68}%|%;%?%p3%t%{66}%|
+-	    %;%?%p4%t%{65}%|%;%?%p5%t%{72}%|%;%?%p6%t%{66}%|
+-	    %;%c,
++	    %;%?%p4%t%{65}%|%;%?%p5%t%{72}%|%;%?%p6%t%{66}%|%;%c,
+ 	sgr0=\E&d@, smkx=\E&s1A, smul=\E&dD, use=hpgeneric,
+ # You should use this terminal at 4800 baud or less.
+ hp2648|hp2648a|HP 2648a graphics terminal,
+@@ -9685,8 +9716,9 @@
+ tvi950-rv|televideo950 rev video,
+ 	flash=\Ed$<200/>\Eb,
+ 	is2=\EDF\EC\Eb\EG0\Eg\Er\EO\E'\E(\E%\Ew\EX\Ee\s\017\011\El
+-	    \E016\E004\Ex0\0\0\Ex1\0\0\Ex2\0\0\011\Ex3\0\0
+-	    \Ex4\r\0, use=tvi950,
++	    \E016\E004\Ex0\0\0\Ex1\0\0\Ex2\0\0\011\Ex3\0\0\Ex4\r
++	    \0,
++	use=tvi950,
+ 
+ # tvi950-rv-2p uses the appropriate entries from 950-2p and 950-rv
+ tvi950-rv-2p|televideo950 rev video w/2 pages,
+@@ -10166,8 +10198,8 @@
+ 	rmacs=\EG0\EH\003, rmir=\Er, rmln=\EA11, setb=,
+ 	setf=%?%p1%{0}%=%t%{76}%e%p1%{1}%=%t%{64}%e%p1%{2}%=%t%{8}%e
+ 	     %p1%{3}%=%t%{72}%e%p1%{4}%=%t%{4}%e%p1%{5}%=%t%{68}%e
+-	     %p1%{6}%=%t%{12}%e%p1%{7}%=%t%{0}%;%PC\EG%gC%gA%+
+-	     %{48}%+%c,
++	     %p1%{6}%=%t%{12}%e%p1%{7}%=%t%{0}%;%PC\EG%gC%gA%+%{48}
++	     %+%c,
+ 	sgr=%{0}%?%p4%t%{2}%|%;%?%p7%t%{1}%|%;%PA\EG%?%gC%t%gC%e%{0}
+ 	    %?%p1%t%{4}%|%;%?%p2%t%{8}%|%;%?%p3%t%{4}%|%;%?%p5%t
+ 	    %{64}%|%;%;%gA%+%{48}%+%c%?%p8%t\E)%e\E(%;%?%p9%t\EH
+@@ -10443,8 +10475,7 @@
+ 	    \E[4i,
+ 	sc=\E7,
+ 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%O%t;7%;%?%p4%t;5%;%?
+-	    %p5%t;2%;%?%p7%t;8%;m\E[%?%p8%t1%;"q%?%p9%t\016%e
+-	    \017%;,
++	    %p5%t;2%;%?%p7%t;8%;m\E[%?%p8%t1%;"q%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017\E["q, smacs=^N, smam=\E[?7h, smir=\E[4h,
+ 	smkx=\E[?1h, smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd,
+ 
+@@ -11366,7 +11397,8 @@
+ 	am,
+ 	cvvis=\EO\Eq\EG\EvK5,
+ 	is2=\EO\Eq\EG\Ev\EJ\EY7\sK5\sMS\sKermit\s2.27\s+automatic
+-	    \smargins\s3-17-85\n, use=msk227,
++	    \smargins\s3-17-85\n,
++	use=msk227,
+ # MS-DOS Kermit 2.27 UCB 227.14 for the IBM PC
+ # Automatic margins now default.  Use ansi  for highlights.
+ # Define function keys.
+@@ -11765,8 +11797,7 @@
+ 	rin=\E[%p1%dF, rmam=\E[?7l, rmir=\E[4l,
+ 	rmkx=\E[19;0j\E[21;1j\212, rmln=\E|,
+ 	sgr=\E[0%?%p1%p5%|%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1
+-	    %|%p6%|%t;7%;%?%p7%t;8%;m%?%p8%t\EV%;%?%p9%t\016%e
+-	    \017%;,
++	    %|%p6%|%t;7%;%?%p7%t;8%;m%?%p8%t\EV%;%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smam=\E[?7h, smir=\E[4h,
+ 	smkx=\E[19;1j\E[21;4j\Eent, smln=\E~, tbc=\E[3g,
+ 	tsl=\E7\E[25;%p1%{8}%+%dH, vpa=\E[%p1%{1}%+%dd,
+@@ -11849,7 +11880,8 @@
+ 	cols#132,
+ 	is1=\E[0;23r\Ex\Ey\E[2;0j\E[3;3j\E[4;0j\E[5;1j\E[6;0j\E[7;0j
+ 	    \E[8;0j\E[9;1j\E[10;0j\E[15;0j\E[16;1j\E[19;0j\E[20;1j
+-	    \E[29;0j\E[1;24r, use=att5420_2,
++	    \E[29;0j\E[1;24r,
++	use=att5420_2,
+ 
+ att4418|att5418|AT&T 5418 80 cols,
+ 	am, xon,
+@@ -11981,8 +12013,7 @@
+ 	rmir=\E[4l, rmkx=\E[21;0j\E[25;1j\212, rmln=\E|,
+ 	rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l\E[2;0y, sc=\E7,
+ 	sgr=\E[0%?%p5%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6
+-	    %|%t;7%;%?%p7%t;8%;m%?%p8%t\EV%;%?%p9%t\016%e
+-	    \017%;,
++	    %|%t;7%;%?%p7%t;8%;m%?%p8%t\EV%;%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h,
+ 	smkx=\E[21;1j\E[25;4j\Eent\E~, smln=\E~, smso=\E[7m,
+ 	smul=\E[4m, tbc=\E[3g, tsl=\E7\E[25;%p1%{8}%+%dH,
+@@ -12170,8 +12201,7 @@
+ 	cud=\E[%p1%de, cud1=^J, cuf=\E[%p1%da, cuf1=\s, cuu1=\EM,
+ 	ff=^L, hpa=\E[%p1%d`, ht=^I, is1=\Ec, is2=\E[20l\r,
+ 	lpi=%?%p1%{2}%=%t\E[4z%e%p1%{3}%=%t\E[5z%e%p1%{4}%=%t\E[6z%e
+-	    %p1%{6}%=%t\E[z%e%p1%{8}%=%t\E[2z%e%p1%{12}%=%t\E[
+-	    3z%;,
++	    %p1%{6}%=%t\E[z%e%p1%{8}%=%t\E[2z%e%p1%{12}%=%t\E[3z%;,
+ 	rshm=\E[m,
+ 	scs=%?%p1%{0}%=%t\E(B%e%p1%{1}%=%t\E(A%e%p1%{2}%=%t\E(C%e%p1
+ 	    %{3}%=%t\E(D%e%p1%{4}%=%t\E(E%e%p1%{5}%=%t\E(H%e%p1%{6}
+@@ -12631,8 +12661,7 @@
+ 	kich1=\E[@, kil1=\E[L, kind=\E[S, kri=\E[T,
+ 	mc0=\E[?19h\E[0i, mc4=\E[?4i, mc5=\E[?5i, nel=\EE,
+ 	pfx=\E[%?%p1%{25}%<%t%p1%e%p1%{24}%-%;%d;%p2%l%02d%?%p1%{25}
+-	    %<%tq\s\s\sSYS\s\s\s\s\sF%p1%:-2d\s\s%e;0;3q%;
+-	    %p2%s,
++	    %<%tq\s\s\sSYS\s\s\s\s\sF%p1%:-2d\s\s%e;0;3q%;%p2%s,
+ 	pfxl=\E[%p1%d;%p2%l%02d;0;0q%p3%:-16.16s%p2%s,
+ 	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, rc=\E8,
+ 	rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, ri=\EM, rmacs=^O,
+@@ -13634,12 +13663,14 @@
+ 	cols#96,
+ 	is1=\EE,
+ 	is2=\E(009\,017\,025\,033\,041\,049\,057\,065\,073\,081\,089
+-	    ., use=citoh,
++	    .,
++	use=citoh,
+ citoh-comp|citoh in compressed,
+ 	cols#136,
+ 	is1=\EQ,
+ 	is2=\E(009\,017\,025\,033\,041\,049\,057\,065\,073\,081\,089
+-	    \,097\,105\,113\,121\,129., use=citoh,
++	    \,097\,105\,113\,121\,129.,
++	use=citoh,
+ # citoh has infinite cols because we don't want lp ever inserting \n\t**.
+ citoh-prop|citoh-ps|ips|citoh in proportional spacing mode,
+ 	cols#32767,
+@@ -14178,8 +14209,7 @@
+ 	    \177\E$S\177\E[200;1u\177\E$A\177\E[201;1u\177\E$B\177
+ 	    \E[202;1u\177\E$C\177\E[203;1u\177\E$D\177\E[204;1u\177
+ 	    \E$H\177\E[212;1u\177\E$I\177\E[213;1u\177\E$\010\177\E[
+-	    214;1u"\E$\177"\E[2!w\E[25;25w\E[!w\E[2*w\E[2+x\E[
+-	    ;3+},
++	    214;1u"\E$\177"\E[2!w\E[25;25w\E[!w\E[2*w\E[2+x\E[;3+},
+ 	kDC=\E$\177, kHOM=\E$H, kLFT=\E$D, kRIT=\E$C, kbs=^H,
+ 	kcbt=\E$I, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+ 	kdch1=\177, kent=^M, kf1=^\001\r, kf10=^\010\r,
+@@ -14438,7 +14468,8 @@
+ 	     %?%gR%t;7%;m,
+ 	setf=\E[%?%p1%{8}%<%t3%e<%;%p1%{2}%&%?%p1%{1}%&%t%{4}%|%;%?
+ 	     %p1%{4}%&%t%{1}%|%;%d%?%gD%t;2%;%?%gU%t;4%;%?%gB%t;5%;
+-	     %?%gR%t;7%;m, use=dg+color8,
++	     %?%gR%t;7%;m,
++	use=dg+color8,
+ 
+ dgmode+color8|Color info for Data General D220/D230C terminals in DG mode,
+ 	bce,
+@@ -14455,7 +14486,8 @@
+ 	setab=\036B%p1%?%p1%{8}%<%t%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1
+ 	      %{4}%&%t%{1}%|%;%;%{48}%+%c,
+ 	setaf=\036A%p1%?%p1%{8}%<%t%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1
+-	      %{4}%&%t%{1}%|%;%;%{48}%+%c, use=dgmode+color8,
++	      %{4}%&%t%{1}%|%;%;%{48}%+%c,
++	use=dgmode+color8,
+ 
+ dgunix+ccc|Configurable color info for DG D430C terminals in DG-UNIX mode,
+ 	bce, ccc,
+@@ -14766,8 +14798,7 @@
+ 	ll=\036FG\027, mc4=^^Fa, mc5=^^F`, ri=^^I, rmacs=^^O,
+ 	rs1=^^FA, rs2=\036F]\036FT0,
+ 	sgr=\036%?%p1%p3%|%p6%|%tD%eE%;%?%p2%p6%|%t\024%e\025%;%?%p4
+-	    %t\016%e\017%;%?%p1%p5%|%t\034%e\035%;\036%?%p9%tN
+-	    %eO%;,
++	    %t\016%e\017%;%?%p1%p5%|%t\034%e\035%;\036%?%p9%tN%eO%;,
+ 	sgr0=\017\025\035\036E\036O, smacs=^^N,
+ 	vpa=\020\177%p1%c, use=d210-dg,
+ 
+@@ -14849,8 +14880,8 @@
+ 	km,
+ 	enacs@, rmacs=\036FS00,
+ 	sgr=\036%?%p1%p3%|%p6%|%tD%eE%;%?%p2%p6%|%t\024%e\025%;%?%p4
+-	    %t\016%e\017%;%?%p1%p5%|%t\034%e\035%;\036FS%?%p9%t11%e
+-	    00%;,
++	    %t\016%e\017%;%?%p1%p5%|%t\034%e\035%;\036FS%?%p9%t11%e0
++	    0%;,
+ 	sgr0=\017\025\035\036E\036FS00, smacs=\036FS11,
+ 	use=d400-dg,
+ 
+@@ -14900,26 +14931,30 @@
+ 	rs1=\036FA\036FT0, rs2=\036P@1, sc=\036F}10,
+ 	vpa=\036FPFF%p1%2.2X,
+ 	wind=\036FB%?%p1%t%p1%2.2X0%;%p2%p1%-%{1}%+%2.2X0%?%{23}%p2
+-	     %>%t000%;\036FX%p3%2.2X%p4%2.2X, use=d216+,
++	     %>%t000%;\036FX%p3%2.2X%p4%2.2X,
++	use=d216+,
+ d412-unix-w|d462-unix-w|d412+w|d462+w|Data General DASHER D412+/D462+ series in wide Unix mode,
+ 	cols#132,
+ 	is2=\036FQ5\036FW\036FK\036F\^\036FX0083\036O
+ 	    \036FS00,
+ 	rs2=\036P@1\036FK\036FX0083,
+ 	wind=\036FB%?%p1%t%p1%2.2X1%;%p2%p1%-%{1}%+%2.2X1%?%{23}%p2
+-	     %>%t001%;\036FX%p3%2.2X%p4%2.2X, use=d412-unix,
++	     %>%t001%;\036FX%p3%2.2X%p4%2.2X,
++	use=d412-unix,
+ d412-unix-25|d462-unix-25|d412+25|d462+25|Data General DASHER D412+/D462+ series in Unix mode with 25 lines,
+ 	lines#25,
+ 	is3=\036Fz2,
+ 	wind=\036FB%?%p1%t%p1%2.2X0%;%p2%p1%-%{1}%+%2.2X0%?%{24}%p2
+-	     %>%t000%;\036FX%p3%2.2X%p4%2.2X, use=d462+,
++	     %>%t000%;\036FX%p3%2.2X%p4%2.2X,
++	use=d462+,
+ d412-unix-s|d462-unix-s|d412+s|d462+s|Data General DASHER D412+/D462+ in Unix mode with status line,
+ 	eslok, hs,
+ 	clear=\036FG\036PH, fsl=\036F}01\022,
+ 	is3=\036Fz2\036F}00\036FB180000\036F}01, ll@,
+ 	tsl=\036F}00\036FP%p1%2.2X18\036PG,
+ 	wind=\036FB%?%p1%t%p1%2.2X0%;%p2%p1%-%{1}%+%2.2X0%?%{23}%p2
+-	     %>%t%{23}%p2%-%2.2X0%;000\036FX%p3%2.2X%p4%2.2X, use=d462+,
++	     %>%t%{23}%p2%-%2.2X0%;000\036FX%p3%2.2X%p4%2.2X,
++	use=d462+,
+ 
+ #	Relative cursor motions are confined to the current window,
+ #	which is not what the scrolling region specification expects.
+@@ -14996,12 +15031,14 @@
+ d470c|d470|Data General DASHER D470C,
+ 	is1=\E[<0;<1;<2;<4l\E[1;1;80w\E[1;6;<2h,
+ 	sgr=\E[%?%p3%t7;%;%?%p4%t5;%;%?%p2%t4;%;%?%p6%t4;7;%;%?%p1%t
+-	    2;7;%;%?%p5%t2;%;m\E)%?%p9%t6\016%e4\017%;, use=dg+color, use=d460,
++	    2;7;%;%?%p5%t2;%;m\E)%?%p9%t6\016%e4\017%;,
++	use=dg+color, use=d460,
+ 
+ d470c-7b|d470-7b|Data General DASHER D470C in 7 bit mode,
+ 	is1=\E[<0;<1;<2;<4l\E[1;1;80w\E[1;6;<2h,
+ 	sgr=\E[%?%p3%t7;%;%?%p4%t5;%;%?%p2%t4;%;%?%p6%t4;7;%;%?%p1%t
+-	    2;7;%;%?%p5%t2;%;m%?%p9%t\016%e\017%;, use=dg+color, use=d460-7b,
++	    2;7;%;%?%p5%t2;%;m%?%p9%t\016%e\017%;,
++	use=dg+color, use=d460-7b,
+ 
+ # Initialization string 2 sets:
+ #	^^FQ2		- default cursor (solid rectangle)
+@@ -15015,7 +15052,8 @@
+ #
+ d470c-dg|d470-dg|Data General DASHER D470C in DG mode,
+ 	is2=\036FQ2\036FW\036F\^\036FX004?\036F]\036O
+-	    \036FS00, use=dgmode+color, use=d460-dg,
++	    \036FS00,
++	use=dgmode+color, use=d460-dg,
+ 
+ # DASHER D555 terminal in ANSI mode.
+ # Like a D411, but has an integrated phone.
+@@ -16644,8 +16682,7 @@
+ 	cols#80, lines#24,
+ 	bel=^G, clear=\014$<20>, cr=^M, cub1=^H, cud1=^J, cuf1=^F,
+ 	cup=\013%p1%{32}%+%c\020%p2%{10}%/%{16}%*%p2%{10}%m%+%Pc%?
+-	    %{17}%gc%=%{19}%gc%=%|%gc%!%|%t%{1}%gc%+%c%{8}%e%gc
+-	    %;%c,
++	    %{17}%gc%=%{19}%gc%=%|%gc%!%|%t%{1}%gc%+%c%{8}%e%gc%;%c,
+ 	cuu1=^Z, ed=\EJ, el=\EK, home=^A,
+ 	hpa=\020%p1%{10}%/%{16}%*%p1%{10}%m%+%Pc%?%{17}%gc%=%{19}%gc
+ 	    %=%|%gc%!%|%t%{1}%gc%+%c%{8}%e%gc%;%c,
+@@ -16667,8 +16704,7 @@
+ 	bel=^G, blink=^CB, civis=^]\344, clear=\014$<20>,
+ 	cnorm=^]\342, cr=^M, cub1=^H, cud1=^J, cuf1=^F,
+ 	cup=\013%p1%{32}%+%c\020%p2%{10}%/%{16}%*%p2%{10}%m%+%Pc%?
+-	    %{17}%gc%=%{19}%gc%=%|%gc%!%|%t%{1}%gc%+%c%{8}%e%gc
+-	    %;%c,
++	    %{17}%gc%=%{19}%gc%=%|%gc%!%|%t%{1}%gc%+%c%{8}%e%gc%;%c,
+ 	cuu1=^Z, dim=^CA, dsl=\035\343\035\345, ed=\EJ, el=\EK,
+ 	fsl=^]\345, home=^A,
+ 	hpa=\020%p1%{10}%/%{16}%*%p1%{10}%m%+%Pc%?%{17}%gc%=%{19}%gc
+@@ -16676,8 +16712,7 @@
+ 	ind=^J, invis=^CH, kbs=^H, khome=^A, mc0=\EU, mc4=\ET, mc5=\ER,
+ 	rev=^CD, rmso=^C\s, rmul=^C\s,
+ 	sgr=\003%{64}%?%p1%p3%|%t%{4}%+%;%?%p2%t%{16}%+%;%?%p4%t%{2}
+-	    %+%;%?%p5%t%{1}%+%;%?%p7%t%{8}%+%;%c%?%p9%t\016%e
+-	    \017%;,
++	    %+%;%?%p5%t%{1}%+%;%?%p7%t%{8}%+%;%c%?%p9%t\016%e\017%;,
+ 	sgr0=^C\s, smso=^CD, smul=^CP, tsl=^]\343,
+ 	vpa=\013%p1%{32}%+%c,
+ 
+@@ -17114,7 +17149,8 @@
+ 	is2=\Ee6\E~%$<100>\E+\E`;\Ed/\E`1\EO\Ee4\Ec@0@\Ec@1A\EcB0
+ 	    \EcC1\Ee7$<100>,
+ 	rs2=\Ee6\E~%$<100>\E+\E`;\Ed/\E`1\EO\Ee4\Ec@0@\Ec@1A\EcB0
+-	    \EcC1\Ee7$<100>, use=ncr260vppp,
++	    \EcC1\Ee7$<100>,
++	use=ncr260vppp,
+ ncr260vt100an|NCR 2900_260 vt100 with ansi kybd,
+ 	am, hs, mir, msgr, xenl, xon,
+ 	cols#80, lines#24, nlab#32,
+@@ -17153,7 +17189,8 @@
+ 	is2=\E[!p\E[?3;7;19;67h\E[?1;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<
+ 	    200>,
+ 	rs2=\E[!p\E[?3;7;19;67h\E[?1;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<
+-	    200>, use=ncr260vt100an,
++	    200>,
++	use=ncr260vt100an,
+ ncr260vt100pp|NCR 2900_260 vt100 with PC+ kybd,
+ 	is2=\E[!p\E[?7;19;67h\E[?1;3;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<
+ 	    200>,
+@@ -17170,7 +17207,8 @@
+ 	is2=\E[!p\E[?3;7;19;67h\E[?1;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<
+ 	    200>,
+ 	rs2=\E[!p\E[?3;7;19;67h\E[?1;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<
+-	    200>, use=ncr260vt100pp,
++	    200>,
++	use=ncr260vt100pp,
+ ncr260vt200an|NCR 2900_260 vt200 with ansi kybd,
+ 	am, hs, mir, msgr, xenl, xon,
+ 	cols#80, lines#24, nlab#32,
+@@ -17229,7 +17267,8 @@
+ 	is2=\E[!p\E[?3;7;19;67h\E[?1;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<
+ 	    200>,
+ 	rs2=\E[!p\E[?3;7;19;67h\E[?1;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<
+-	    200>, use=ncr260vt200pp,
++	    200>,
++	use=ncr260vt200pp,
+ ncr260vt300an|NCR 2900_260 vt300 with ansi kybd,
+ 	am, hs, mir, msgr, xenl, xon,
+ 	cols#80, lines#24, nlab#32,
+@@ -17277,7 +17316,8 @@
+ 	is2=\E[!p\E[?3;7;19;67h\E[?4l\E[1;0%w\E(B\E)0\017\E[2J\E[1;1
+ 	    H$<200>,
+ 	rs2=\E[!p\E[?3;7;19;67h\E[?4l\E[1;0%w\E(B\E)0\017\E[2J\E[1;1
+-	    H$<200>, use=ncr260vt300an,
++	    H$<200>,
++	use=ncr260vt300an,
+ ncr260vt300pp|NCR 2900_260 vt300 with pc+ kybd,
+ 	ka1=\E[H, ka3=\EOu, kb2=\E[V, kc3=\E[U, kcub1=\E[D,
+ 	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[4~,
+@@ -17290,7 +17330,8 @@
+ 	is2=\E[!p\E[?3;7;19;67h\E[?1;4l\E[1;0%w\E(B\E)0\017\E[2J\E[1
+ 	    ;1H\E>$<200>,
+ 	rs2=\E[!p\E[?3;7;19;67h\E[?1;4l\E[1;0%w\E(B\E)0\017\E[2J\E[1
+-	    ;1H\E>$<200>, use=ncr260vt300pp,
++	    ;1H\E>$<200>,
++	use=ncr260vt300pp,
+ # This terminfo file contains color capabilities for the Wyse325 emulation of
+ # the NCR 2900/260C color terminal.  Because of the structure of the command
+ # (escape sequence) used to set color attributes, one of the fore/background
+@@ -17349,7 +17390,8 @@
+ 	is2=\Ee6\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~!\E"\Ee4\Ex@\E`9
+ 	    \Ee7$<100>,
+ 	rs2=\Ee6\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~!\E"\Ee4\Ex@\E`9
+-	    \Ee7$<100>, use=ncr260wy325pp,
++	    \Ee7$<100>,
++	use=ncr260wy325pp,
+ # This definition for Wyse 350 supports several attributes.  This means
+ # that it has magic cookies (extra spaces where the attributes begin).
+ # Some applications do not function well with magic cookies.  The System
+@@ -17410,7 +17452,8 @@
+ 	is2=\Ee6\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~!\E"\Ee4\Ex@\E`9
+ 	    \Ee7$<200>,
+ 	rs2=\Ee6\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~!\E"\Ee4\Ex@\E`9
+-	    \Ee7$<200>, use=ncr260wy350pp,
++	    \Ee7$<200>,
++	use=ncr260wy350pp,
+ # This definition for Wyse 50+ supports several attributes.  This means
+ # that it has magic cookies (extra spaces where the attributes begin).
+ # Some applications do not function well with magic cookies.  The System
+@@ -17458,7 +17501,8 @@
+ 	is2=\Ee6\E~"$<100>\E+\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~!\E"
+ 	    \Ee4\Ex@\E`9\Ee7$<200>,
+ 	rs2=\Ee6\E~"$<100>\E+\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~!\E"
+-	    \Ee4\Ex@\E`9\Ee7$<200>, use=ncr260wy50+pp,
++	    \Ee4\Ex@\E`9\Ee7$<200>,
++	use=ncr260wy50+pp,
+ ncr260wy60pp|NCR 2900_260 wyse 60,
+ 	am, bw, hs, km, mc5i, mir, msgr, xon,
+ 	cols#80, lines#24, nlab#32,
+@@ -17497,7 +17541,8 @@
+ 	is2=\Ee6\E~4$<100>\E+\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~!\E"
+ 	    \Ee4\Ex@\E`9\Ee7$<100>,
+ 	rs2=\Ee6\E~4$<100>\E+\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~!\E"
+-	    \Ee4\Ex@\E`9\Ee7$<100>, use=ncr260wy60pp,
++	    \Ee4\Ex@\E`9\Ee7$<100>,
++	use=ncr260wy60pp,
+ ncr160vppp|NCR 2900_160 viewpoint,
+ 	use=ncr260vppp,
+ ncr160vpwpp|NCR 2900_160 viewpoint wide mode,
+@@ -17568,7 +17613,8 @@
+ 	cols#132,
+ 	is2=\E[12h\E[?10l\E%/0n\E[P\031\E[?3h\E(B\E)0$<200>,
+ 	rs2=\Ec\E[12;31h\E[?4;5;10l\E?3;6;7;19;25h\E[33;34l\E[0m\E(B
+-	    \E)0\E%/0n\E[P\031$<200>, use=ncrvt100an,
++	    \E)0\E%/0n\E[P\031$<200>,
++	use=ncrvt100an,
+ #
+ # Vendor-supplied NCR termcaps end here
+ 
+@@ -17728,8 +17774,7 @@
+ 	xmc#1,
+ 	blink=\EG2, invis=\EG1, rev=\EG4, rmso=\EG0, rmul=\EG0,
+ 	sgr=\E%%\E(%?%p5%p8%|%t\E)%;%?%p9%t\E$%;\EG%{48}%?%p7%t%{1}
+-	    %+%;%?%p4%t%{2}%+%;%?%p3%p1%|%t%{4}%+%;%?%p2%t%{8}%+
+-	    %;%c,
++	    %+%;%?%p4%t%{2}%+%;%?%p3%p1%|%t%{4}%+%;%?%p2%t%{8}%+%;%c,
+ 	sgr0=\EG0\E%%\E(, smso=\EG4, smul=\EG8, use=ndr9500,
+ 
+ ndr9500-25-mc|NDR 500 with 25 lines and magic cookies,
+@@ -19257,8 +19302,8 @@
+ 	rev=\E], ri=^K, rmso=\E\\,
+ 	rs2=\024\037XA\030\n\030\n\030\n\030\n\030\n\030\n\030\n
+ 	    \030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n
+-	    \030\n\030\n\030\n\030\n\030\n\030\n\030\n\030
+-	    \014\021,
++	    \030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\014
++	    \021,
+ 	setab=\0, setaf=\E%p1%'@'%+%c, setb=\0,
+ 	setf=\E%?%p1%{1}%=%tD%e%p1%{3}%=%tF%e%p1%{4}%=%tA%e%p1%{6}%=
+ 	     %tC%e%p1%'@'%+%c%;,
+@@ -19346,8 +19391,8 @@
+ 	   \355i\,\356i\,\357i\,\360d\,\361n\,\362o\,\363o\,\364o\,
+ 	   \365o\,\366o\,\372u\,\373u\,\374u\,\375y\,\377y\,\267.\,
+ 	   \327x\,\367/\,\261\E7\E[4m+\E8\E[C\,\,0\017%\016\,x|\,y
+-	   \E7\E[4m<\E8\E[C\,z\E7\E[4m>\E8\E[C\,g\E7\E[4m+\E8
+-	   \E[C, use=minitel1b,
++	   \E7\E[4m<\E8\E[C\,z\E7\E[4m>\E8\E[C\,g\E7\E[4m+\E8\E[C,
++	use=minitel1b,
+ 
+ minitel1-nb|minitel 1 (40cols) noir & blanc sans couleurs avec bold et dim ...,
+ 	colors@, pairs@,
+@@ -19405,7 +19450,8 @@
+ 	   \,\356\E(3H\,\357\E(3I\,\360d\,\361\E(3X\,\362o\,\363o\,
+ 	   \364\E(3J\,\365o\,\366\E(3K\,\367\E(3h\,\371\E(3L\,\372u
+ 	   \,\373\E(3M\,\374\E(3N\,\375y\,\377y\,\,0\E)3%\E)0\,\\\,m
+-	   \,+k\,.l\,0\177\,-j, use=minitel12-80,
++	   \,+k\,.l\,0\177\,-j,
++	use=minitel12-80,
+ 
+ minitel12-80|minitel 12 (80cols),
+ 	G0,
+@@ -19428,7 +19474,8 @@
+ 	   \,\355i\,\356\E(3H\,\357\E(3I\,\360d\,\361n\,\362o\,
+ 	   \363o\,\364\E(3J\,\365o\,\366\E(3K\,\367\E(3h\,\371\E(3L
+ 	   \,\372u\,\373\E(3M\,\374\E(3N\,\375y\,\377y\,\,0\E)3%\E)0
+-	   \,\\\,m\,+k\,.l\,0\177\,-j, use=minitel1b-80,
++	   \,\\\,m\,+k\,.l\,0\177\,-j,
++	use=minitel1b-80,
+ 
+ #
+ # Add these in your ~/.screenrc for inputting some special glyphs like french
+@@ -19542,7 +19589,8 @@
+ 	oc@, op@, rmacs@, setab=^A, setaf=^A, smacs@, .setab@, .setaf@,
+ 	.smcup=\E]R\E]P1A9A9A9\E]P2A9A9A9\E]P3FFFFFF\E]P4A9A9A9\E]P5
+ 	       A9A9A9\E]P6A9A9A9\E]P9FFFFFF\E]PAFFFFFF\E]PBFFFFFF\E]
+-	       PCFFFFFF\E]PDFFFFFF\E]PEFFFFFF\E[?2c, use=linux-m1,
++	       PCFFFFFF\E]PDFFFFFF\E]PEFFFFFF\E[?2c,
++	use=linux-m1,
+ 
+ linux-m2|Linux Minitel 2 "like" Couleurs (Vert/Blanc/Noir+Bleu),
+ 	ccc@,
+@@ -19560,7 +19608,8 @@
+ 	.smcup=\E]R\E]P100A900\E]P200A900\E]P3FFFFFF\E]P400A900\E]P5
+ 	       00A900\E]P600A900\E]P700A900\E]P80000FF\E]P9FFFFFF\E]
+ 	       PAFFFFFF\E]PBFFFFFF\E]PCFFFFFF\E]PDFFFFFF\E]PEFFFFFF
+-	       \E]PFFFFFFF\E[;37m, use=linux-m1,
++	       \E]PFFFFFFF\E[;37m,
++	use=linux-m1,
+ 
+ # Screen entries counterpart :
+ 
+@@ -19577,7 +19626,8 @@
+ 	   \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
+ 	   \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
+ 	   \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
+-	   \n\n\n\n\n\n\n\n\n\n, use=screen,
++	   \n\n\n\n\n\n\n\n\n\n,
++	use=screen,
+ 
+ screen.linux-m1b|Linux m1b specific for screen,
+ 	colors@, pairs@,
+@@ -19585,7 +19635,8 @@
+ 
+ screen.linux-m2|Linux m2 specific for screen,
+ 	acsc=++\,\,--..00``aabbccddeeffgghhiijjkkllmmnnooppqqrrssttu
+-	     uvvwwxxyyzz{{||}}~~, use=screen.linux-m1b,
++	     uvvwwxxyyzz{{||}}~~,
++	use=screen.linux-m1b,
+ 
+ # Putty :
+ 
+@@ -19625,7 +19676,8 @@
+ 
+ screen.putty-m2|Putty m2 specific for screen,
+ 	acsc=++\,\,--..00``aabbccddeeffgghhiijjkkllmmnnooppqqrrssttu
+-	     uvvwwxxyyzz{{||}}~~, use=screen.putty-m1b,
++	     uvvwwxxyyzz{{||}}~~,
++	use=screen.putty-m1b,
+ # From: Alexandre Montaron, 19 Nov 2015, updated 19 Sep 2016
+ #
+ # He comments:
+@@ -20029,7 +20081,8 @@
+ bq300-rv|Bull vt320 reverse 80 columns,
+ 	flash=\E[?5l$<50>\E[?5h,
+ 	is2=\E[?2h\E[?3l\E[?5h\E[?7h\E[?8h\E>\E[?1l\E\sF\E[?42l\E[?4
+-	    l, use=bq300,
++	    l,
++	use=bq300,
+ bq300-w|Bull vt320 132 columns,
+ 	cols#132, wsl#132,
+ 	is2=\E[?2h\E[?3h\E[?5l\E[?7h\E[?8h\E>\E[?1l\E\sF\E[?42l\E[?4
+@@ -20136,7 +20189,8 @@
+ bq300-8rv|Bull vt320 8-bit reverse mode 80 columns,
+ 	flash=\233?5l$<50>\233?5h,
+ 	is2=\E[?2h\E[?3l\E[?5h\E[?7h\E[?8h\E>\E[?1l\E\sG\E[?42l\E[?4
+-	    l, use=bq300-8,
++	    l,
++	use=bq300-8,
+ bq300-8w|Bull vt320 8-bit 132 columns,
+ 	cols#132, wsl#132,
+ 	is2=\E[?2h\E[?3h\E[?5l\E[?7h\E[?8h\E>\E[?1l\E\sG\E[?42l\E[?4
+@@ -20164,7 +20218,8 @@
+ bq300-pc-rv|Questar 303 with PC keyboard reverse mode 80 columns,
+ 	flash=\E[?5l$<50>\E[?5h,
+ 	is2=\E[?2h\E[?3l\E[?5h\E[?7h\E[?8h\E>\E[?1l\E\sF\E[?42l\E[?4
+-	    l, use=bq300-pc,
++	    l,
++	use=bq300-pc,
+ bq300-pc-w|Questar 303 with PC keyboard 132 columns terminal,
+ 	cols#132, wsl#132,
+ 	is2=\E[?2h\E[?3h\E[?5l\E[?7h\E[?8h\E>\E[?1l\E\sF\E[?42l\E[?4
+@@ -20190,7 +20245,8 @@
+ bq300-8-pc-rv|Questar 303 with PC keyboard full 8 bits reverse mode 80 columns,
+ 	flash=\E[?5l$<50>\E[?5h,
+ 	is2=\E[?2h\E[?3l\E[?5h\E[?7h\E[?8h\E>\E[?1l\E\sG\E[?42l\E[?4
+-	    l, use=bq300-8-pc,
++	    l,
++	use=bq300-8-pc,
+ bq300-8-pc-w|Questar 303 with PC keyboard full 8 bits 132 columns,
+ 	cols#132, wsl#132,
+ 	is2=\E[?2h\E[?3h\E[?5l\E[?7h\E[?8h\E>\E[?1l\E\sG\E[?42l\E[?4
+@@ -20761,13 +20817,16 @@
+ 	tbc=\E[3g, tsl=\E[s\E[>5;1h\E[25;%i%dH\E[1K,
+ z29a-kc-uc|h29a-kc-uc|z29 ansi mode with keyckick and underscore cursor,
+ 	rs1=\E<\E[1;24r\E[24;1H\E[?7h\E[>1;2;3;4;5;6;7;8;9l\E[m\E[11
+-	    m, use=z29a,
++	    m,
++	use=z29a,
+ z29a-nkc-bc|h29a-nkc-bc|z29 ansi mode with block cursor and no keyclick,
+ 	rs1=\E<\E[1;24r\E[24;1H\E[?7h\E[>2;4h\E[>1;3;5;6;7;8;9l\E[m
+-	    \E[11m, use=z29a,
++	    \E[11m,
++	use=z29a,
+ z29a-nkc-uc|h29a-nkc-uc|z29 ansi mode with underscore cursor and no keyclick,
+ 	rs1=\E<\E[1;24r\E[24;1H\E[?7h\E[>2h\E[>1;3;4;5;6;7;8;9l\E[m
+-	    \E[11m, use=z29a,
++	    \E[11m,
++	use=z29a,
+ # From: Jeff Bartig  31 Mar 1995
+ z39-a|z39a|zenith39-a|zenith39-ansi|Zenith 39 in ANSI mode,
+ 	am, eslok, hs, mc5i, mir, msgr, xon,
+Index: package/debian-mingw/changelog
+--- ncurses-6.0-20161105+/package/debian-mingw/changelog	2016-11-05 16:39:30.000000000 +0000
++++ ncurses-6.0-20161112/package/debian-mingw/changelog	2016-11-12 15:46:51.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161105) unstable; urgency=low
++ncurses6 (6.0+20161112) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 05 Nov 2016 12:39:30 -0400
++ -- Thomas E. Dickey   Sat, 12 Nov 2016 10:46:51 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.0-20161105+/package/debian-mingw64/changelog	2016-11-05 16:39:30.000000000 +0000
++++ ncurses-6.0-20161112/package/debian-mingw64/changelog	2016-11-12 15:46:51.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161105) unstable; urgency=low
++ncurses6 (6.0+20161112) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 05 Nov 2016 12:39:30 -0400
++ -- Thomas E. Dickey   Sat, 12 Nov 2016 10:46:51 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.0-20161105+/package/debian/changelog	2016-11-05 16:39:30.000000000 +0000
++++ ncurses-6.0-20161112/package/debian/changelog	2016-11-12 15:46:51.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161105) unstable; urgency=low
++ncurses6 (6.0+20161112) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 05 Nov 2016 12:39:30 -0400
++ -- Thomas E. Dickey   Sat, 12 Nov 2016 10:46:51 -0500
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.183 
+--- ncurses-6.0-20161105+/package/mingw-ncurses.nsi	2016-11-05 16:39:30.000000000 +0000
++++ ncurses-6.0-20161112/package/mingw-ncurses.nsi	2016-11-12 15:46:51.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.183 2016/11/05 16:39:30 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.184 2016/11/12 15:46:51 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "0"
+ !define VERSION_YYYY  "2016"
+-!define VERSION_MMDD  "1105"
++!define VERSION_MMDD  "1112"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.0-20161105+/package/mingw-ncurses.spec	2016-11-05 16:39:30.000000000 +0000
++++ ncurses-6.0-20161112/package/mingw-ncurses.spec	2016-11-12 15:46:51.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.0
+-Release: 20161105
++Release: 20161112
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.0-20161105+/package/ncurses.spec	2016-11-05 16:39:30.000000000 +0000
++++ ncurses-6.0-20161112/package/ncurses.spec	2016-11-12 15:46:51.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.0
+-Release: 20161105
++Release: 20161112
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: progs/dump_entry.c
+Prereq:  1.143 
+--- ncurses-6.0-20161105+/progs/dump_entry.c	2016-10-09 01:30:14.000000000 +0000
++++ ncurses-6.0-20161112/progs/dump_entry.c	2016-11-13 00:28:46.000000000 +0000
+@@ -39,10 +39,11 @@
+ #include "termsort.c"		/* this C file is generated */
+ #include 	/* so is this */
+ 
+-MODULE_ID("$Id: dump_entry.c,v 1.143 2016/10/09 01:30:14 tom Exp $")
++MODULE_ID("$Id: dump_entry.c,v 1.147 2016/11/13 00:28:46 tom Exp $")
+ 
+ #define DISCARD(string) string = ABSENT_STRING
+ #define PRINTF (void) printf
++#define WRAPPED 32
+ 
+ #define OkIndex(index,array) ((int)(index) >= 0 && (int)(index) < (int) SIZEOF(array))
+ #define TcOutput() (outform == F_TERMCAP || outform == F_TCONVERR)
+@@ -62,6 +63,7 @@
+ static int oldcol;		/* last value of column before wrap */
+ static bool pretty;		/* true if we format if-then-else strings */
+ static bool wrapped;		/* true if we wrap too-long strings */
++static bool did_wrap;		/* true if last wrap_concat did wrapping */
+ static bool checking;		/* true if we are checking for tic */
+ static int quickdump;		/* true if we are dumping compiled data */
+ 
+@@ -208,6 +210,8 @@
+     checking = check;
+     quickdump = (quick & 3);
+ 
++    did_wrap = (width <= 0);
++
+     /* versions */
+     if (version == 0)
+ 	tversion = V_ALLCAPS;
+@@ -556,6 +560,7 @@
+     int gaps = (int) strlen(separator);
+     int want = gaps + need;
+ 
++    did_wrap = (width <= 0);
+     if (column > indent
+ 	&& column + want > width) {
+ 	force_wrap();
+@@ -565,14 +570,15 @@
+ 	(column + want) > width &&
+ 	(!TcOutput() || strncmp(src, "..", 2))) {
+ 	int step = 0;
+-	int used = width > 32 ? width : 32;
++	int used = width > WRAPPED ? width : WRAPPED;
+ 	int size = used;
+ 	int base = 0;
+ 	char *p, align[9];
+ 	const char *my_t = trailer;
+ 	char *fill = fill_spaces(src);
++	int last = (int) strlen(fill);
+ 
+-	need = (int) strlen(fill);
++	need = last;
+ 
+ 	if (TcOutput())
+ 	    trailer = "\\\n\t ";
+@@ -585,21 +591,26 @@
+ 	} else {
+ 	    align[base] = '\0';
+ 	}
+-	while ((column + (need + gaps)) > used) {
+-	    size = used;
+-	    if (size > ((int) strlen(fill) - step)) {
+-		size = ((int) strlen(fill) - step);
+-	    }
+-	    if (step) {
+-		strcpy_DYN(&outbuf, align);
+-		size -= base;
++	/* "pretty" overrides wrapping if it already split the line */
++	if (!pretty || strchr(fill, '\n') == 0) {
++	    while ((column + (need + gaps)) > used) {
++		size = used;
++		if (step) {
++		    strcpy_DYN(&outbuf, align);
++		    size -= base;
++		}
++		if (size > (last - step)) {
++		    size = (last - step);
++		}
++		size = find_split(fill, step, size);
++		strncpy_DYN(&outbuf, fill + step, (size_t) size);
++		step += size;
++		need -= size;
++		if (need > 0) {
++		    force_wrap();
++		    did_wrap = TRUE;
++		}
+ 	    }
+-	    size = find_split(fill, step, size);
+-	    strncpy_DYN(&outbuf, fill + step, (size_t) size);
+-	    step += size;
+-	    need -= size;
+-	    if (need > 0)
+-		force_wrap();
+ 	}
+ 	if (need > 0) {
+ 	    if (step)
+@@ -1138,9 +1149,11 @@
+     if (outcount) {
+ 	bool trimmed = FALSE;
+ 	j = (PredIdx) outbuf.used;
+-	if (j >= 2
+-	    && outbuf.text[j - 1] == '\t'
+-	    && outbuf.text[j - 2] == '\n') {
++	if (wrapped && did_wrap) {
++	    /* EMPTY */ ;
++	} else if (j >= 2
++		   && outbuf.text[j - 1] == '\t'
++		   && outbuf.text[j - 2] == '\n') {
+ 	    outbuf.used -= 2;
+ 	    trimmed = TRUE;
+ 	} else if (j >= 4
diff --git a/ncurses-6.0-20161119.patch b/ncurses-6.0-20161119.patch
new file mode 100644
index 0000000..a938290
--- /dev/null
+++ b/ncurses-6.0-20161119.patch
@@ -0,0 +1,1034 @@
+# ncurses 6.0 - patch 20161119 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.0 is at
+# 	ftp.gnu.org:/pub/gnu
+#
+# Patches for ncurses 6.0 can be found at
+# 	ftp://invisible-island.net/ncurses/6.0
+#	http://invisible-mirror.net/archives/ncurses/6.0 
+#
+# ------------------------------------------------------------------------------
+# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20161119.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Nov 20 02:06:40 UTC 2016
+# ------------------------------------------------------------------------------
+# NEWS                                  |    9 +
+# VERSION                               |    2 
+# dist.mk                               |    4 
+# doc/html/man/adacurses6-config.1.html |   14 +-
+# doc/html/man/captoinfo.1m.html        |    2 
+# doc/html/man/clear.1.html             |   76 ++++++++++++++
+# doc/html/man/form.3x.html             |  166 ++++++++++++++++----------------
+# doc/html/man/form_page.3x.html        |   16 ++-
+# doc/html/man/infocmp.1m.html          |    2 
+# doc/html/man/infotocap.1m.html        |    2 
+# doc/html/man/menu.3x.html             |    2 
+# doc/html/man/ncurses.3x.html          |    2 
+# doc/html/man/ncurses6-config.1.html   |    2 
+# doc/html/man/panel.3x.html            |    2 
+# doc/html/man/tabs.1.html              |    2 
+# doc/html/man/terminfo.5.html          |    6 -
+# doc/html/man/tic.1m.html              |    2 
+# doc/html/man/toe.1m.html              |    2 
+# doc/html/man/tput.1.html              |    2 
+# doc/html/man/tset.1.html              |    2 
+# man/clear.1                           |   91 ++++++++++++++++-
+# package/debian-mingw/changelog        |    4 
+# package/debian-mingw64/changelog      |    4 
+# package/debian/changelog              |    4 
+# package/mingw-ncurses.nsi             |    4 
+# package/mingw-ncurses.spec            |    2 
+# package/ncurses.spec                  |    2 
+# progs/tic.c                           |  101 +++++++++++++++++++
+# 28 files changed, 401 insertions(+), 128 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.2695 
+--- ncurses-6.0-20161112+/NEWS	2016-11-13 00:10:13.000000000 +0000
++++ ncurses-6.0-20161119/NEWS	2016-11-20 00:36:25.000000000 +0000
+@@ -25,7 +25,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.2695 2016/11/13 00:10:13 tom Exp $
++-- $Id: NEWS,v 1.2698 2016/11/20 00:36:25 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -45,6 +45,13 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20161119
++	+ add check in tic for some syntax errors of delays, as well as use of
++	  proportional delays for non-line capabilities.
++	+ document history of the clear program and the E3 extension, prompted
++	  by various discussions including
++	  http://unix.stackexchange.com/questions/87469/clearing-the-old-scrollback-buffer
++
+ 20161112
+ 	+ improve -W option in tic/infocmp:
+ 	  + correct order of size-adjustments in wrapped lines
+Index: VERSION
+--- ncurses-6.0-20161112+/VERSION	2016-11-12 15:46:51.000000000 +0000
++++ ncurses-6.0-20161119/VERSION	2016-11-19 18:20:25.000000000 +0000
+@@ -1 +1 @@
+-5:0:9	6.0	20161112
++5:0:9	6.0	20161119
+Index: dist.mk
+Prereq:  1.1132 
+--- ncurses-6.0-20161112+/dist.mk	2016-11-12 15:46:51.000000000 +0000
++++ ncurses-6.0-20161119/dist.mk	2016-11-19 18:20:25.000000000 +0000
+@@ -25,7 +25,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1132 2016/11/12 15:46:51 tom Exp $
++# $Id: dist.mk,v 1.1133 2016/11/19 18:20:25 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -37,7 +37,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 0
+-NCURSES_PATCH = 20161112
++NCURSES_PATCH = 20161119
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/man/adacurses6-config.1.html
+--- ncurses-6.0-20161112+/doc/html/man/adacurses6-config.1.html	2016-10-22 20:13:52.000000000 +0000
++++ ncurses-6.0-20161119/doc/html/man/adacurses6-config.1.html	2016-11-19 22:08:24.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -46,11 +46,11 @@
+ 
+ 
+ 
    NAME
    +-       adacurses-config - helper script for AdaCurses libraries
++       adacurses6-config - helper script for AdaCurses libraries
+ 
+ 
+ 
    SYNOPSIS
    +-       adacurses-config [options]
++       adacurses6-config [options]
+ 
+ 
+ 
    DESCRIPTION
    +@@ -71,10 +71,10 @@
+               echos  the release+patchdate version of the ncurses
+               libraries used to configure and build AdaCurses.
+ 
+-       --help prints a  list  of  the  adacurses-config  script's
++       --help prints a list  of  the  adacurses6-config  script's
+               options.
+ 
+-       If  no options are given, adacurses-config prints the com-
++       If no options are given, adacurses6-config prints the com-
+        bination of --cflags and --libs that gnatmake expects (see
+        example).
+ 
+@@ -131,7 +131,7 @@
+ 
    SEE ALSO
    +        curses(3x)
+ 
+-       This describes ncurses version 6.0 (patch 20161022).
++       This describes ncurses version 6.0 (patch 20161119).
+ 
+ 
+ 
+Index: doc/html/man/captoinfo.1m.html
+--- ncurses-6.0-20161112+/doc/html/man/captoinfo.1m.html	2016-10-22 20:13:52.000000000 +0000
++++ ncurses-6.0-20161119/doc/html/man/captoinfo.1m.html	2016-11-19 22:08:24.000000000 +0000
+@@ -198,7 +198,7 @@
+ 
    SEE ALSO
    +        infocmp(1m), curses(3x), terminfo(5)
+ 
+-       This describes ncurses version 6.0 (patch 20161022).
++       This describes ncurses version 6.0 (patch 20161119).
+ 
+ 
+ 
    AUTHOR
    +Index: doc/html/man/clear.1.html
+--- ncurses-6.0-20161112+/doc/html/man/clear.1.html	2016-10-22 20:13:52.000000000 +0000
++++ ncurses-6.0-20161119/doc/html/man/clear.1.html	2016-11-19 22:08:24.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -64,10 +66,76 @@
+        present.
+ 
+ 
++
    HISTORY
    ++       A clear command appeared in  2.79BSD  dated  February  24,
++       1979.  Later that was provided in Unix 8th edition (1985).
++
++       AT&T  adapted a different BSD program (tset) to make a new
++       command (tput), and used this to replace the clear command
++       with a shell script which calls tput clear, e.g.,
++           /usr/bin/tput ${1:+-T$1} clear 2> /dev/null
++           exit
++
++       In 1989, when Keith Bostic revised the BSD tput command to
++       make it similar to the AT&T tput, he added a shell  script
++       for the clear command:
++           exec tput clear
++
++       The  remainder  of  the script in each case is a copyright
++       notice.
++
++       The ncurses clear command began in 1995  by  adapting  the
++       original BSD clear command (with terminfo, of course).
++
++       The E3 extension came later:
++
++       o   In June 1999, xterm provided an extension to the stan-
++           dard control sequence for clearing the screen.  Rather
++           than  clearing  just  the  visible  part of the screen
++           using
++               printf '\033[2J'
++
++           one could clear the scrollback using
++               printf '\033[3J'
++
++           This is documented in XTerm  Control  Sequences  as  a
++           feature originating with xterm.
++
++       o   A  few  other terminal developers adopted the feature,
++           e.g., PuTTY in 2006.
++
++       o   In April 2011, a Red Hat developer submitted  a  patch
++           to  the  Linux kernel, modifying its console driver to
++           do the same thing.  The Linux change, part of the  3.0
++           release,  did not mention xterm, although it was cited
++           in the Red Hat bug report (#683733) which led  to  the
++           change.
++
++       o   Again,  a  few  other  terminal developers adopted the
++           feature.  But the next relevant step was a  change  to
++           the  clear  program in 2013 to incorporate this exten-
++           sion.
++
++       o   In 2013, the E3 extension was overlooked in tput  with
++           the  "clear" parameter.  That was addressed in 2016 by
++           reorganizing tput to share its logic  with  clear  and
++           tset.
++
++
++
    PORTABILITY
    ++       Neither  IEEE Std 1003.1/The Open  Group  Base  Specifica-
++       tions  Issue  7 (POSIX.1-2008) nor X/Open Curses  Issue  7
++       documents tset or reset.
++
++       The  latter documents tput, which could be used to replace
++       this utility either via a shell  script  or  by  an  alias
++       (such as a symbolic link) to run tput as clear.
++
++
+ 
    SEE ALSO
    +        tput(1), terminfo(5)
+ 
+-       This describes ncurses version 6.0 (patch 20161022).
++       This describes ncurses version 6.0 (patch 20161119).
+ 
+ 
+ 
+@@ -78,6 +146,8 @@
+ 
  • NAME
    • 
+ 
  • SYNOPSIS
    • 
+ 
  • DESCRIPTION
    • 
++
  • HISTORY
    • 
++
  • PORTABILITY
    • 
+ 
  • SEE ALSO
    • 
+ 
+ 
+Index: doc/html/man/form.3x.html
+--- ncurses-6.0-20161112+/doc/html/man/form.3x.html	2016-10-22 20:13:54.000000000 +0000
++++ ncurses-6.0-20161119/doc/html/man/form.3x.html	2016-11-19 22:08:26.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -88,83 +88,84 @@
+        The  following  table lists each form routine and the name
+        of the manual page on which it is described.
+ 
+-       curses Routine Name    Manual Page Name
+-       -------------------------------------------------
+-       current_field          form_page(3x)
+-       data_ahead             form_data(3x)
+-       data_behind            form_data(3x)
+-       dup_field              form_field_new(3x)
+-       dynamic_field_info     form_field_info(3x)
+-       field_arg              form_field_validation(3x)
+-       field_back             form_field_attributes(3x)
+-       field_buffer           form_field_buffer(3x)
+-       field_count            form_field(3x)
+-       field_fore             form_field_attributes(3x)
+-       field_index            form_page(3x)
+-       field_info             form_field_info(3x)
+-       field_init             form_hook(3x)
+-       field_just             form_field_just(3x)
+-       field_opts             form_field_opts(3x)
+-       field_opts_off         form_field_opts(3x)
+-       field_opts_on          form_field_opts(3x)
+-       field_pad              form_field_attributes(3x)
+-       field_status           form_field_buffer(3x)
+-       field_term             form_hook(3x)
+-       field_type             form_field_validation(3x)
+-
+-       field_userptr          form_field_userptr(3x)
+-       form_driver            form_driver(3x)
+-       form_driver_w          form_driver(3x)*
+-       form_fields            form_field(3x)
+-       form_init              form_hook(3x)
+-       form_opts              form_opts(3x)
+-       form_opts_off          form_opts(3x)
+-       form_opts_on           form_opts(3x)
+-       form_page              form_page(3x)
+-       form_request_by_name   form_requestname(3x)
+-       form_request_name      form_requestname(3x)
+-       form_sub               form_win(3x)
+-       form_term              form_hook(3x)
+-       form_userptr           form_userptr(3x)
+-       form_win               form_win(3x)
+-       free_field             form_field_new(3x)
+-       free_fieldtype         form_fieldtype(3x)
+-       free_form              form_new(3x)
+-       link_field             form_field_new(3x)
+-       link_fieldtype         form_fieldtype(3x)
+-       move_field             form_field(3x)
+-       new_field              form_field_new(3x)
+-       new_fieldtype          form_fieldtype(3x)
+-       new_form               form_new(3x)
+-       new_page               form_new_page(3x)
+-       pos_form_cursor        form_cursor(3x)
+-       post_form              form_post(3x)
+-       scale_form             form_win(3x)
+-       set_current_field      form_page(3x)
+-       set_field_back         form_field_attributes(3x)
+-       set_field_buffer       form_field_buffer(3x)
+-       set_field_fore         form_field_attributes(3x)
+-       set_field_init         form_hook(3x)
+-       set_field_just         form_field_just(3x)
+-       set_field_opts         form_field_opts(3x)
+-       set_field_pad          form_field_attributes(3x)
+-       set_field_status       form_field_buffer(3x)
+-       set_field_term         form_hook(3x)
+-       set_field_type         form_field_validation(3x)
+-       set_field_userptr      form_field_userptr(3x)
+-       set_fieldtype_arg      form_fieldtype(3x)
+-       set_fieldtype_choice   form_fieldtype(3x)
+-       set_form_fields        form_field(3x)
+-       set_form_init          form_hook(3x)
+-       set_form_opts          form_field_opts(3x)
+-       set_form_page          form_page(3x)
+-       set_form_sub           form_win(3x)
+-       set_form_term          form_hook(3x)
+-       set_form_userptr       form_userptr(3x)
+-       set_form_win           form_win(3x)
+-       set_max_field          form_field_buffer(3x)
+-       set_new_page           form_new_page(3x)
+-       unpost_form            form_post(3x)
++       curses Routine Name     Manual Page Name
++       --------------------------------------------------
++       current_field           form_page(3x)
++       data_ahead              form_data(3x)
++       data_behind             form_data(3x)
++       dup_field               form_field_new(3x)
++       dynamic_field_info      form_field_info(3x)
++       field_arg               form_field_validation(3x)
++       field_back              form_field_attributes(3x)
++       field_buffer            form_field_buffer(3x)
++       field_count             form_field(3x)
++       field_fore              form_field_attributes(3x)
++       field_index             form_page(3x)
++       field_info              form_field_info(3x)
++       field_init              form_hook(3x)
++       field_just              form_field_just(3x)
++       field_opts              form_field_opts(3x)
++       field_opts_off          form_field_opts(3x)
++       field_opts_on           form_field_opts(3x)
++       field_pad               form_field_attributes(3x)
++       field_status            form_field_buffer(3x)
++       field_term              form_hook(3x)
++       field_type              form_field_validation(3x)
++
++       field_userptr           form_field_userptr(3x)
++       form_driver             form_driver(3x)
++       form_driver_w           form_driver(3x)*
++       form_fields             form_field(3x)
++       form_init               form_hook(3x)
++       form_opts               form_opts(3x)
++       form_opts_off           form_opts(3x)
++       form_opts_on            form_opts(3x)
++       form_page               form_page(3x)
++       form_request_by_name    form_requestname(3x)
++       form_request_name       form_requestname(3x)
++       form_sub                form_win(3x)
++       form_term               form_hook(3x)
++       form_userptr            form_userptr(3x)
++       form_win                form_win(3x)
++       free_field              form_field_new(3x)
++       free_fieldtype          form_fieldtype(3x)
++       free_form               form_new(3x)
++       link_field              form_field_new(3x)
++       link_fieldtype          form_fieldtype(3x)
++       move_field              form_field(3x)
++       new_field               form_field_new(3x)
++       new_fieldtype           form_fieldtype(3x)
++       new_form                form_new(3x)
++       new_page                form_new_page(3x)
++       pos_form_cursor         form_cursor(3x)
++       post_form               form_post(3x)
++       scale_form              form_win(3x)
++       set_current_field       form_page(3x)
++       set_field_back          form_field_attributes(3x)
++       set_field_buffer        form_field_buffer(3x)
++       set_field_fore          form_field_attributes(3x)
++       set_field_init          form_hook(3x)
++       set_field_just          form_field_just(3x)
++       set_field_opts          form_field_opts(3x)
++       set_field_pad           form_field_attributes(3x)
++       set_field_status        form_field_buffer(3x)
++       set_field_term          form_hook(3x)
++       set_field_type          form_field_validation(3x)
++       set_field_userptr       form_field_userptr(3x)
++       set_fieldtype_arg       form_fieldtype(3x)
++       set_fieldtype_choice    form_fieldtype(3x)
++       set_form_fields         form_field(3x)
++       set_form_init           form_hook(3x)
++       set_form_opts           form_field_opts(3x)
++       set_form_page           form_page(3x)
++       set_form_sub            form_win(3x)
++       set_form_term           form_hook(3x)
++       set_form_userptr        form_userptr(3x)
++       set_form_win            form_win(3x)
++       set_max_field           form_field_buffer(3x)
++       set_new_page            form_new_page(3x)
++       unfocus_current_field   form_page(3x)
++       unpost_form             form_post(3x)
+ 
+ 
+ 
    RETURN VALUE
    +@@ -225,9 +226,12 @@
+        These  routines  emulate the System V forms library.  They
+        were not supported on Version 7 or BSD versions.
+ 
++       A few functions are extensions added  for  ncurses,  e.g.,
++       form_driver_w, unfocus_current_field.
++
+ 
+ 
    AUTHORS
    +-       Juergen Pfeifer.  Manual pages and adaptation for  ncurses
++       Juergen  Pfeifer.  Manual pages and adaptation for ncurses
+        by Eric S. Raymond.
+ 
+ 
+@@ -235,7 +239,7 @@
+        curses(3x) and related pages whose names begin "form_" for
+        detailed descriptions of the entry points.
+ 
+-       This describes ncurses version 6.0 (patch 20161022).
++       This describes ncurses version 6.0 (patch 20161119).
+ 
+ 
+ 
+Index: doc/html/man/form_page.3x.html
+--- ncurses-6.0-20161112+/doc/html/man/form_page.3x.html	2016-01-30 19:24:56.000000000 +0000
++++ ncurses-6.0-20161119/doc/html/man/form_page.3x.html	2016-11-19 22:08:27.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -54,16 +54,21 @@
+        #include <form.h>
+        int set_current_field(FORM *form, FIELD *field);
+        FIELD *current_field(const FORM *);
++       int unfocus_current_field(FORM *form);
+        int set_form_page(FORM *form, int n);
+        int form_page(const FORM *form);
+        int field_index(const FIELD *field);
+ 
+ 
+ 
    DESCRIPTION
    +-       The  function  set_current field sets the current field of
++       The  function  set_current_field sets the current field of
+        the given form; current_field returns the current field of
+        the given form.
+ 
++       The  function unfocus_current_field removes the focus from
++       the current field of the form. In  such  state,  inquiries
++       via current_field shall return a NULL pointer.
++
+        The  function  set_form_page  sets  the form's page number
+        (goes to page n of the form).
+ 
+@@ -113,9 +118,12 @@
+        These routines emulate the System V forms  library.   They
+        were not supported on Version 7 or BSD versions.
+ 
++       The  unfocus_current_field  function  is an ncurses exten-
++       sion.
++
+ 
+ 
    AUTHORS
    +-       Juergen  Pfeifer.   Manual  pages  and  adaptation for new
++       Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
+        curses by Eric S. Raymond.
+ 
+ 
+Index: doc/html/man/infocmp.1m.html
+--- ncurses-6.0-20161112+/doc/html/man/infocmp.1m.html	2016-10-22 20:13:55.000000000 +0000
++++ ncurses-6.0-20161119/doc/html/man/infocmp.1m.html	2016-11-19 22:08:27.000000000 +0000
+@@ -478,7 +478,7 @@
+ 
+        http://invisible-island.net/ncurses/tctest.html
+ 
+-       This describes ncurses version 6.0 (patch 20161022).
++       This describes ncurses version 6.0 (patch 20161119).
+ 
+ 
+ 
    AUTHOR
    +Index: doc/html/man/infotocap.1m.html
+--- ncurses-6.0-20161112+/doc/html/man/infotocap.1m.html	2016-10-22 20:13:55.000000000 +0000
++++ ncurses-6.0-20161119/doc/html/man/infotocap.1m.html	2016-11-19 22:08:27.000000000 +0000
+@@ -88,7 +88,7 @@
+ 
    SEE ALSO
    +        curses(3x), tic(1m), infocmp(1m), terminfo(5)
+ 
+-       This describes ncurses version 6.0 (patch 20161022).
++       This describes ncurses version 6.0 (patch 20161119).
+ 
+ 
+ 
    AUTHOR
    +Index: doc/html/man/menu.3x.html
+--- ncurses-6.0-20161112+/doc/html/man/menu.3x.html	2016-10-22 20:13:55.000000000 +0000
++++ ncurses-6.0-20161119/doc/html/man/menu.3x.html	2016-11-19 22:08:27.000000000 +0000
+@@ -217,7 +217,7 @@
+        curses(3x) and related pages whose names begin "menu_" for
+        detailed descriptions of the entry points.
+ 
+-       This describes ncurses version 6.0 (patch 20161022).
++       This describes ncurses version 6.0 (patch 20161119).
+ 
+ 
+ 
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.0-20161112+/doc/html/man/ncurses.3x.html	2016-10-22 20:13:56.000000000 +0000
++++ ncurses-6.0-20161119/doc/html/man/ncurses.3x.html	2016-11-19 22:08:28.000000000 +0000
+@@ -60,7 +60,7 @@
+        sonable optimization.  This implementation is "new curses"
+        (ncurses) and is the approved replacement for 4.4BSD clas-
+        sic  curses,  which has been discontinued.  This describes
+-       ncurses version 6.0 (patch 20161022).
++       ncurses version 6.0 (patch 20161119).
+ 
+        The ncurses library emulates the curses library of  System
+        V  Release  4  UNIX,  and  XPG4 (X/Open Portability Guide)
+Index: doc/html/man/ncurses6-config.1.html
+--- ncurses-6.0-20161112+/doc/html/man/ncurses6-config.1.html	2016-10-22 20:13:56.000000000 +0000
++++ ncurses-6.0-20161119/doc/html/man/ncurses6-config.1.html	2016-11-19 22:08:28.000000000 +0000
+@@ -114,7 +114,7 @@
+ 
    SEE ALSO
    +        curses(3x)
+ 
+-       This describes ncurses version 6.0 (patch 20161022).
++       This describes ncurses version 6.0 (patch 20161119).
+ 
+ 
+ 
+Index: doc/html/man/panel.3x.html
+--- ncurses-6.0-20161112+/doc/html/man/panel.3x.html	2016-10-22 20:13:56.000000000 +0000
++++ ncurses-6.0-20161119/doc/html/man/panel.3x.html	2016-11-19 22:08:28.000000000 +0000
+@@ -208,7 +208,7 @@
+ 
    SEE ALSO
    +        curses(3x), curs_variables(3x),
+ 
+-       This describes ncurses version 6.0 (patch 20161022).
++       This describes ncurses version 6.0 (patch 20161119).
+ 
+ 
+ 
    AUTHOR
    +Index: doc/html/man/tabs.1.html
+--- ncurses-6.0-20161112+/doc/html/man/tabs.1.html	2016-10-22 20:13:56.000000000 +0000
++++ ncurses-6.0-20161119/doc/html/man/tabs.1.html	2016-11-19 22:08:28.000000000 +0000
+@@ -164,7 +164,7 @@
+ 
    SEE ALSO
    +        tset(1), infocmp(1m), curses(3x), terminfo(5).
+ 
+-       This describes ncurses version 6.0 (patch 20161022).
++       This describes ncurses version 6.0 (patch 20161119).
+ 
+ 
+ 
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.0-20161112+/doc/html/man/terminfo.5.html	2016-10-22 20:13:57.000000000 +0000
++++ ncurses-6.0-20161119/doc/html/man/terminfo.5.html	2016-11-19 22:08:29.000000000 +0000
+@@ -33,7 +33,7 @@
+   ****************************************************************************
+   * @Id: terminfo.head,v 1.22 2016/10/15 17:02:31 tom Exp @
+   * Head of terminfo man page ends here
+-  * @Id: terminfo.tail,v 1.73 2016/10/22 19:56:17 tom Exp @
++  * @Id: terminfo.tail,v 1.74 2016/11/05 21:15:43 Alain.Williams Exp @
+   * Beginning of terminfo.tail file
+   * This file is part of ncurses.
+   * See "terminfo.head" for copyright.
+@@ -75,7 +75,7 @@
+        nals by giving a set of capabilities which they  have,  by
+        specifying how to perform screen operations, and by speci-
+        fying padding requirements and  initialization  sequences.
+-       This describes ncurses version 6.0 (patch 20161022).
++       This describes ncurses version 6.0 (patch 20161119).
+ 
+        Entries in terminfo consist of a sequence of `,' separated
+        fields (embedded commas may be escaped with a backslash or
+@@ -1559,7 +1559,7 @@
+        late  destructive  scrolling; their documentation cautions
+        you not to define csr unless this is  true.   This  curses
+        implementation is more liberal and will do explicit erases
+-       after scrolling if ndstr is defined.
++       after scrolling if ndsrc is defined.
+ 
+        If the terminal has the ability to define a window as part
+        of  memory,  which all commands affect, it should be given
+Index: doc/html/man/tic.1m.html
+--- ncurses-6.0-20161112+/doc/html/man/tic.1m.html	2016-10-22 20:13:57.000000000 +0000
++++ ncurses-6.0-20161119/doc/html/man/tic.1m.html	2016-11-19 22:08:29.000000000 +0000
+@@ -401,7 +401,7 @@
+        infocmp(1m),   captoinfo(1m),   infotocap(1m),    toe(1m),
+        curses(3x), term(5).  terminfo(5).
+ 
+-       This describes ncurses version 6.0 (patch 20161022).
++       This describes ncurses version 6.0 (patch 20161119).
+ 
+ 
+ 
    AUTHOR
    +Index: doc/html/man/toe.1m.html
+--- ncurses-6.0-20161112+/doc/html/man/toe.1m.html	2016-10-22 20:13:57.000000000 +0000
++++ ncurses-6.0-20161119/doc/html/man/toe.1m.html	2016-11-19 22:08:29.000000000 +0000
+@@ -117,7 +117,7 @@
+        tic(1m),   infocmp(1m),   captoinfo(1m),    infotocap(1m),
+        curses(3x), terminfo(5).
+ 
+-       This describes ncurses version 6.0 (patch 20161022).
++       This describes ncurses version 6.0 (patch 20161119).
+ 
+ 
+ 
+Index: doc/html/man/tput.1.html
+--- ncurses-6.0-20161112+/doc/html/man/tput.1.html	2016-10-22 20:13:57.000000000 +0000
++++ ncurses-6.0-20161119/doc/html/man/tput.1.html	2016-11-19 22:08:29.000000000 +0000
+@@ -441,7 +441,7 @@
+        clear(1),   stty(1),   tabs(1),   tset(1),    terminfo(5),
+        curs_termcap(3x).
+ 
+-       This describes ncurses version 6.0 (patch 20161022).
++       This describes ncurses version 6.0 (patch 20161119).
+ 
+ 
+ 
+Index: doc/html/man/tset.1.html
+--- ncurses-6.0-20161112+/doc/html/man/tset.1.html	2016-10-22 20:13:57.000000000 +0000
++++ ncurses-6.0-20161119/doc/html/man/tset.1.html	2016-11-19 22:08:29.000000000 +0000
+@@ -387,7 +387,7 @@
+        csh(1),   sh(1),   stty(1),   curs_terminfo(3x),   tty(4),
+        terminfo(5), ttys(5), environ(7)
+ 
+-       This describes ncurses version 6.0 (patch 20161022).
++       This describes ncurses version 6.0 (patch 20161119).
+ 
+ 
+ 
+Index: man/clear.1
+Prereq:  1.10 
+--- ncurses-6.0-20161112+/man/clear.1	2013-06-22 22:22:11.000000000 +0000
++++ ncurses-6.0-20161119/man/clear.1	2016-11-19 21:30:46.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2010,2013 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2013,2016 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,8 +26,28 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: clear.1,v 1.10 2013/06/22 22:22:11 tom Exp $
++.\" $Id: clear.1,v 1.14 2016/11/19 21:30:46 tom Exp $
+ .TH @CLEAR@ 1 ""
++.\" these would be fallbacks for DS/DE,
++.\" but groff changed the meaning of the macros.
++.de NS
++.sp .5
++.in +4
++.nf
++.ft C			\" Courier
++..
++.de NE
++.fi
++.ft R
++.in -4
++..
++.ie \n(.g .ds `` \(lq
++.el       .ds `` ``
++.ie \n(.g .ds '' \(rq
++.el       .ds '' ''
++.de bP
++.IP \(bu 4
++..
+ .ds n 5
+ .SH NAME
+ \fB@CLEAR@\fR \- clear the terminal screen
+@@ -36,11 +56,76 @@
+ .br
+ .SH DESCRIPTION
+ \fB@CLEAR@\fR clears your screen if this is possible,
+-including its scrollback buffer (if the extended "E3" capability is defined).
++including its scrollback buffer (if the extended \*(``E3\*('' capability is defined).
+ \fB@CLEAR@\fR looks in the environment for the terminal type and then in the
+ \fBterminfo\fR database to determine how to clear the screen.
+ .PP
+ \fB@CLEAR@\fR ignores any command-line parameters that may be present.
++.SH HISTORY
++A \fBclear\fP command appeared in 2.79BSD dated February 24, 1979.
++Later that was provided in Unix 8th edition (1985).
++.PP
++AT&T adapted a different BSD program (\fBtset\fP) to make
++a new command (\fBtput\fP),
++and used this to replace the \fBclear\fP command with a shell script
++which calls \fBtput clear\fP, e.g.,
++.NS
++/usr/bin/tput ${1:+-T$1} clear 2> /dev/null
++exit
++.NE
++.PP
++In 1989, when Keith Bostic revised the BSD \fBtput\fP command
++to make it similar to the AT&T \fBtput\fP,
++he added a shell script for the \fBclear\fP command:
++.NS
++exec tput clear
++.NE
++.PP
++The remainder of the script in each case is a copyright notice.
++.PP
++The ncurses \fBclear\fP command began in 1995 by adapting the original
++BSD \fBclear\fP command (with terminfo, of course).
++.PP
++The \fBE3\fP extension came later:
++.bP
++In June 1999, xterm provided an extension to the standard control
++sequence for clearing the screen.
++Rather than clearing just the visible part of the screen using
++.NS
++printf '\\033[2J'
++.NE
++.IP
++one could clear the \fIscrollback\fP using
++.NS
++printf '\\033[\fB3\fPJ'
++.NE
++.IP
++This is documented in \fIXTerm Control Sequences\fP as a feature originating
++with xterm.
++.bP
++A few other terminal developers adopted the feature, e.g., PuTTY in 2006.
++.bP
++In April 2011, a Red Hat developer submitted a patch to the Linux
++kernel, modifying its console driver to do the same thing.
++The Linux change, part of the 3.0 release, did not mention xterm,
++although it was cited in the Red Hat bug report (#683733)
++which led to the change.
++.bP
++Again, a few other terminal developers adopted the feature.  But the
++next relevant step was a change to the \fBclear\fP program in 2013
++to incorporate this extension.
++.bP
++In 2013, the \fBE3\fP extension was overlooked in \fB@TPUT@\fP with
++the \*(``clear\*('' parameter.
++That was addressed in 2016 by reorganizing \fB@TPUT@\fP to share
++its logic with \fB@CLEAR@\fP and \fB@TSET@\fP.
++.SH PORTABILITY
++Neither IEEE Std 1003.1/The Open  Group  Base  Specifications  Issue  7
++(POSIX.1-2008) nor X/Open Curses Issue 7 documents @TSET@ or @RESET@.
++.PP
++The latter documents \fBtput\fP, which could be used to replace this utility
++either via a shell script or by an alias (such as a symbolic link) to
++run \fB@TPUT@\fP as \fB@CLEAR@\fP.
+ .SH SEE ALSO
+ \fB@TPUT@\fR(1), \fBterminfo\fR(\*n)
+ .PP
+Index: package/debian-mingw/changelog
+--- ncurses-6.0-20161112+/package/debian-mingw/changelog	2016-11-12 15:46:51.000000000 +0000
++++ ncurses-6.0-20161119/package/debian-mingw/changelog	2016-11-19 18:20:25.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161112) unstable; urgency=low
++ncurses6 (6.0+20161119) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 12 Nov 2016 10:46:51 -0500
++ -- Thomas E. Dickey   Sat, 19 Nov 2016 13:20:25 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.0-20161112+/package/debian-mingw64/changelog	2016-11-12 15:46:51.000000000 +0000
++++ ncurses-6.0-20161119/package/debian-mingw64/changelog	2016-11-19 18:20:25.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161112) unstable; urgency=low
++ncurses6 (6.0+20161119) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 12 Nov 2016 10:46:51 -0500
++ -- Thomas E. Dickey   Sat, 19 Nov 2016 13:20:25 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.0-20161112+/package/debian/changelog	2016-11-12 15:46:51.000000000 +0000
++++ ncurses-6.0-20161119/package/debian/changelog	2016-11-19 18:20:25.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161112) unstable; urgency=low
++ncurses6 (6.0+20161119) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 12 Nov 2016 10:46:51 -0500
++ -- Thomas E. Dickey   Sat, 19 Nov 2016 13:20:25 -0500
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.184 
+--- ncurses-6.0-20161112+/package/mingw-ncurses.nsi	2016-11-12 15:46:51.000000000 +0000
++++ ncurses-6.0-20161119/package/mingw-ncurses.nsi	2016-11-19 18:20:25.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.184 2016/11/12 15:46:51 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.185 2016/11/19 18:20:25 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "0"
+ !define VERSION_YYYY  "2016"
+-!define VERSION_MMDD  "1112"
++!define VERSION_MMDD  "1119"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.0-20161112+/package/mingw-ncurses.spec	2016-11-12 15:46:51.000000000 +0000
++++ ncurses-6.0-20161119/package/mingw-ncurses.spec	2016-11-19 18:20:25.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.0
+-Release: 20161112
++Release: 20161119
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.0-20161112+/package/ncurses.spec	2016-11-12 15:46:51.000000000 +0000
++++ ncurses-6.0-20161119/package/ncurses.spec	2016-11-19 18:20:25.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.0
+-Release: 20161112
++Release: 20161119
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: progs/tic.c
+Prereq:  1.224 
+--- ncurses-6.0-20161112+/progs/tic.c	2016-10-01 12:46:54.000000000 +0000
++++ ncurses-6.0-20161119/progs/tic.c	2016-11-20 00:34:58.000000000 +0000
+@@ -48,7 +48,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: tic.c,v 1.224 2016/10/01 12:46:54 tom Exp $")
++MODULE_ID("$Id: tic.c,v 1.225 2016/11/20 00:34:58 tom Exp $")
+ 
+ #define STDIN_NAME ""
+ 
+@@ -1769,6 +1769,104 @@
+     }
+ }
+ 
++static bool
++line_capability(const char *name)
++{
++    bool result = FALSE;
++    static const char *table[] =
++    {
++	"csr",			/* change_scroll_region          */
++	"clear",		/* clear_screen                  */
++	"ed",			/* clr_eos                       */
++	"cwin",			/* create_window                 */
++	"cup",			/* cursor_address                */
++	"cud1",			/* cursor_down                   */
++	"home",			/* cursor_home                   */
++	"mrcup",		/* cursor_mem_address            */
++	"ll",			/* cursor_to_ll                  */
++	"cuu1",			/* cursor_up                     */
++	"dl1",			/* delete_line                   */
++	"hd",			/* down_half_line                */
++	"flash",		/* flash_screen                  */
++	"ff",			/* form_feed                     */
++	"il1",			/* insert_line                   */
++	"nel",			/* newline                       */
++	"dl",			/* parm_delete_line              */
++	"cud",			/* parm_down_cursor              */
++	"indn",			/* parm_index                    */
++	"il",			/* parm_insert_line              */
++	"rin",			/* parm_rindex                   */
++	"cuu",			/* parm_up_cursor                */
++	"mc0",			/* print_screen                  */
++	"vpa",			/* row_address                   */
++	"ind",			/* scroll_forward                */
++	"ri",			/* scroll_reverse                */
++	"hu",			/* up_half_line                  */
++    };
++    size_t n;
++    for (n = 0; n < SIZEOF(table); ++n) {
++	if (!strcmp(name, table[n])) {
++	    result = TRUE;
++	    break;
++	}
++    }
++    return result;
++}
++
++static void
++check_delays(const char *name, const char *value)
++{
++    const char *p, *q;
++    const char *mark = 0;
++
++    for (p = value; *p != '\0'; ++p) {
++	if (p[0] == '$' && p[1] == '<') {
++	    const char *base = p + 2;
++	    bool maybe = TRUE;
++	    bool mixed = FALSE;
++	    int proportional = 0;
++	    int mandatory = 0;
++
++	    for (q = base; *q != '\0'; ++q) {
++		if (*q == '>') {
++		    if (mark == 0)
++			mark = q;
++		    break;
++		} else if (*q == '*' || *q == '/') {
++		    if (*q == '*')
++			++proportional;
++		    if (*q == '/')
++			++mandatory;
++		    if (mark == 0)
++			mark = q;
++		} else if (!(isalnum(UChar(*q)) || strchr("+-.", *q) != 0)) {
++		    maybe = FALSE;
++		    break;
++		} else if (proportional || mandatory) {
++		    mixed = TRUE;
++		}
++	    }
++	    if (*q == '\0') {
++		maybe = FALSE;	/* just an isolated "$<" */
++	    } else if (maybe) {
++		float check_f;
++		char check_c;
++		int rc = sscanf(base, "%f%c", &check_f, &check_c);
++		if ((rc != 2) || (check_c != *mark) || mixed) {
++		    _nc_warning("syntax error in %s delay '%.*s'", name,
++				(int) (q - base), base);
++		} else if (*name == 'k') {
++		    _nc_warning("function-key %s has delay", name);
++		} else if (proportional && !line_capability(name)) {
++		    _nc_warning("non-line capability using proportional delay: %s", name);
++		}
++	    } else {
++		p = q - 1;	/* restart scan */
++	    }
++	}
++    }
++}
++
+ static char *
+ check_1_infotocap(const char *name, NCURSES_CONST char *value, int count)
+ {
+@@ -2388,6 +2486,7 @@
+ 	char *a = tp->Strings[j];
+ 	if (VALID_STRING(a)) {
+ 	    check_params(tp, ExtStrname(tp, (int) j, strnames), a);
++	    check_delays(ExtStrname(tp, (int) j, strnames), a);
+ 	    if (capdump) {
+ 		check_infotocap(tp, (int) j, a);
+ 	    }
diff --git a/ncurses-6.0-20161126.patch b/ncurses-6.0-20161126.patch
new file mode 100644
index 0000000..9a0c0c7
--- /dev/null
+++ b/ncurses-6.0-20161126.patch
@@ -0,0 +1,1307 @@
+# ncurses 6.0 - patch 20161126 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.0 is at
+# 	ftp.gnu.org:/pub/gnu
+#
+# Patches for ncurses 6.0 can be found at
+# 	ftp://invisible-island.net/ncurses/6.0
+#	http://invisible-mirror.net/archives/ncurses/6.0 
+#
+# ------------------------------------------------------------------------------
+# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20161126.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Nov 27 02:38:26 UTC 2016
+# ------------------------------------------------------------------------------
+# NEWS                             |   17 ++
+# VERSION                          |    2 
+# dist.mk                          |    4 
+# misc/terminfo.src                |  293 +++++++++++++++++++------------------
+# ncurses/curses.priv.h            |    4 
+# ncurses/tinfo/lib_data.c         |    4 
+# ncurses/trace/lib_trace.c        |   97 ++++++------
+# package/debian-mingw/changelog   |    4 
+# package/debian-mingw64/changelog |    4 
+# package/debian/changelog         |    4 
+# package/mingw-ncurses.nsi        |    4 
+# package/mingw-ncurses.spec       |    2 
+# package/ncurses.spec             |    2 
+# progs/tic.c                      |   97 +++++++++---
+# 14 files changed, 312 insertions(+), 226 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.2698 
+--- ncurses-6.0-20161119+/NEWS	2016-11-20 00:36:25.000000000 +0000
++++ ncurses-6.0-20161126/NEWS	2016-11-27 01:41:10.000000000 +0000
+@@ -25,7 +25,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.2698 2016/11/20 00:36:25 tom Exp $
++-- $Id: NEWS,v 1.2703 2016/11/27 01:41:10 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -45,6 +45,21 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20161126
++	+ modify linux-16color to not mask dim, standout or reverse with the
++	  ncv capability -TD
++	+ add 0.1sec mandatory delay to flash capabilities using the VT100
++	  reverse-video control -TD
++	+ omit selection of ISO-8859-1 for G0 in enacs capability from linux2.6
++	  entry, to avoid conflict with the user-defined mapping.  The reset
++	  feature will use ISO-8859-1 in any case (Mikulas Patocka).
++	+ improve check in tic for delays by also warning about beep/flash
++	  when a delay is not embedded, or if those use the VT100 reverse
++	  video escape without using a delay.
++	+ minor fix for syntax-check of delays from 20161119 changes.
++	+ modify trace() to avoid overwriting existing file (report by Maor
++	  Shwartz).
++
+ 20161119
+ 	+ add check in tic for some syntax errors of delays, as well as use of
+ 	  proportional delays for non-line capabilities.
+Index: VERSION
+--- ncurses-6.0-20161119+/VERSION	2016-11-19 18:20:25.000000000 +0000
++++ ncurses-6.0-20161126/VERSION	2016-11-21 22:34:14.000000000 +0000
+@@ -1 +1 @@
+-5:0:9	6.0	20161119
++5:0:9	6.0	20161126
+Index: dist.mk
+Prereq:  1.1133 
+--- ncurses-6.0-20161119+/dist.mk	2016-11-19 18:20:25.000000000 +0000
++++ ncurses-6.0-20161126/dist.mk	2016-11-21 22:34:14.000000000 +0000
+@@ -25,7 +25,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1133 2016/11/19 18:20:25 tom Exp $
++# $Id: dist.mk,v 1.1134 2016/11/21 22:34:14 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -37,7 +37,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 0
+-NCURSES_PATCH = 20161119
++NCURSES_PATCH = 20161126
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: misc/terminfo.src
+--- ncurses-6.0-20161119+/misc/terminfo.src	2016-11-13 00:17:12.000000000 +0000
++++ ncurses-6.0-20161126/misc/terminfo.src	2016-11-27 01:39:42.000000000 +0000
+@@ -6,8 +6,8 @@
+ # Report bugs and new terminal descriptions to
+ #	bug-ncurses@gnu.org
+ #
+-#	$Revision: 1.573 $
+-#	$Date: 2016/11/13 00:17:12 $
++#	$Revision: 1.578 $
++#	$Date: 2016/11/27 01:39:42 $
+ #
+ # The original header is preserved below for reference.  It is noted that there
+ # is a "newer" version which differs in some cosmetic details (but actually
+@@ -1753,7 +1753,7 @@
+ linux2.6|linux 2.6.x console,
+ 	acsc=++\,\,--..00__``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwx
+ 	     xyyzz{{||}c~~,
+-	enacs=\E(B\E)0, rmacs=^O,
++	enacs=\E)0, rmacs=^O,
+ 	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5
+ 	    %t;2%;%?%p6%t;1%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, use=linux2.2,
+@@ -1830,7 +1830,7 @@
+ # you use a 512-character console font. This uses bold for bright
+ # foreground colors and blink for bright background colors.
+ linux-16color|linux console with 16 colors,
+-	colors#16, ncv#63, pairs#256,
++	colors#16, ncv#42, pairs#256,
+ 	setab=\E[4%p1%{8}%m%d%?%p1%{7}%>%t;5%e;25%;m,
+ 	setaf=\E[3%p1%{8}%m%d%?%p1%{7}%>%t;1%e;21%;m,
+ 	use=linux,
+@@ -2225,7 +2225,7 @@
+ #
+ # F1-F12 generate different codes when shift or control modifiers are used.
+ # For example:
+-#	F1      	\E[001q
++#	F1		\E[001q
+ #	shift F1	\E[013q
+ #	control-F1	\E[025q
+ #
+@@ -2301,8 +2301,8 @@
+ #	identifies as vt200 with selective erase, but does not implement DECSCA
+ #	no vt52 mode
+ #	also lacks these:
+-# 		ESC # 8   DEC Screen Alignment Test (DECALN).
+-# 		CSI ? 5 h Reverse Video (DECSCNM).
++#		ESC # 8	  DEC Screen Alignment Test (DECALN).
++#		CSI ? 5 h Reverse Video (DECSCNM).
+ #
+ pccon+keys|OpenBSD PC keyboard keys,
+ 	kbs=\177, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+@@ -2545,14 +2545,14 @@
+ # Attributes do not work with color
+ # Failed: vpa/hpa
+ # Failed: kf1-kf4, kf13-kf48, khome, kend
+-# 	(effectively xterm-r6 for function-keys)
++#	(effectively xterm-r6 for function-keys)
+ # None of the function or cursor key-modifiers are encoded.
+ # Console hangs in the smm/rmm test if TERM=xterm, does not show test
+ #
+ # Testing with vttest:
+ # -------------------
+ # Identifies as vt220 with selective erase
+-# 	(however, selective erase refers to DECSCA, SPA)
++#	(however, selective erase refers to DECSCA, SPA)
+ # Does not implement vt52
+ # Uses spaces to simulate double-size characters
+ # Does not support 8-bit controls
+@@ -2562,7 +2562,7 @@
+ # Does not support DECSCA
+ # Does not support any of the ISO-6429 cursor-movement
+ # Does not support any of the ISO-6429 miscellaneous tests
+-# 	(SL/SR also leave unexpected char on screen too)
++#	(SL/SR also leave unexpected char on screen too)
+ # Background does not change in menu 11.6.9 (SGR 22-27)
+ # None of the xterm special features tests work
+ netbsd6|NetBSD wscons in 25 line DEC VT100 mode,
+@@ -3083,7 +3083,7 @@
+ 	am@, xenl@,
+ 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7l\E[?8h, use=vt100-am,
+ vt100-vb|dec vt100 (w/advanced video) & no beep,
+-	bel@, flash=\E[?5h\E[?5l, use=vt100,
++	bel@, flash=\E[?5h$<100/>\E[?5l, use=vt100,
+ 
+ # Ordinary vt100 in 132 column ("wide") mode.
+ vt100-w|vt100-w-am|dec vt100 132 cols (w/advanced video),
+@@ -3692,9 +3692,9 @@
+ 	      %e%p1%{27}%=%t\E%%G\342\206\220\E%%@%e%p1%{155}%=%t\E
+ 	      %%G\340\202\242\E%%@%e%p1%c%;,
+ 	dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
+-	el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h\E[?5l, home=\E[H,
+-	hpa=\E[%i%p1%dG, ht=^I, hts=\EH, il=\E[%p1%dL, il1=\E[L,
+-	ind=^J, indn=\E[%p1%dS,
++	el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l,
++	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, il=\E[%p1%dL,
++	il1=\E[L, ind=^J, indn=\E[%p1%dS,
+ 	initc=\E]P%p1%x%p2%{255}%*%{1000}%/%02x%p3%{255}%*%{1000}%/
+ 	      %02x%p4%{255}%*%{1000}%/%02x,
+ 	is2=\E7\E[r\E[m\E[?7h\E[?1;4;6l\E[4l\E8\E>\E]R,
+@@ -5277,9 +5277,9 @@
+ 	cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C,
+ 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
+ 	dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K,
+-	enacs=\E(B\E)0, flash=\E[?5h\E[?5l, home=\E[H, ht=^I,
+-	hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L,
+-	ind=^J, is1=\E[?47l\E=\E[?1l,
++	enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l, home=\E[H,
++	ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL,
++	il1=\E[L, ind=^J, is1=\E[?47l\E=\E[?1l,
+ 	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kbs=^H,
+ 	kcbt=\E[Z, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
+ 	rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E>, rmso=\E[27m,
+@@ -5838,7 +5838,7 @@
+ 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
+ 	cvvis=\E[?25h, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM,
+ 	dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
+-	enacs=\E)0, flash=\E[?5h\E[?5l, fsl=^G, home=\E[H,
++	enacs=\E)0, flash=\E[?5h$<100/>\E[?5l, fsl=^G, home=\E[H,
+ 	hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
+ 	il=\E[%p1%dL, il1=\E[L, ind=^J, indn=\E[%p1%dS,
+ 	is2=\E[4l\E>\E[?1034l, kDC=\E[3;2~, kEND=\E[1;2F,
+@@ -6463,7 +6463,7 @@
+ #
+ # Other special mappings:
+ #	Apple		VT220
+-#	HELP 		Find
++#	HELP		Find
+ #	HOME		Insert here
+ #	PAGEUP		Remove
+ #	DEL		Select
+@@ -6485,10 +6485,10 @@
+ 	cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C,
+ 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
+ 	dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J,
+-	el=\E[K, el1=\E[1K, enacs=\E)0, flash=\E[?5h\E[?5l,
+-	home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@,
+-	if=/usr/share/tabset/vt100, il=\E[%p1%dL, il1=\E[L,
+-	ind=\n$<150*>,
++	el=\E[K, el1=\E[1K, enacs=\E)0,
++	flash=\E[?5h$<100/>\E[?5l, home=\E[H, ht=^I, hts=\EH,
++	ich=\E[%p1%d@, if=/usr/share/tabset/vt100,
++	il=\E[%p1%dL, il1=\E[L, ind=\n$<150*>,
+ 	is2=\E7\E[r\E[m\E[?7h\E[?1;4;6l\E[4l\E8\E>, kbs=^H,
+ 	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+ 	kdch1=\E[4~, kend=\E[5~, kf1=\E[17~, kf10=\E[28~,
+@@ -6999,15 +6999,15 @@
+ 	bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l,
+ 	clear=\E[1;33;44m\E[H\E[J, cnorm=\E[?25h, cr=^M, cub1=^H,
+ 	cud1=^J, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A,
+-	dch=\E[%p1%dp, ed=\E[J, el=\E[K, flash=\E[?5h\E[?5l,
+-	home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, ind=^J,
+-	kb2=\E[G, kbs=^H, kf0=\0D, kll=\0O, kspd=^Z, nel=^M^J,
+-	rev=\E[5;37;41m, rmir=\E[4l, rmpch=\E[10m,
+-	rmso=\E[0;44m\E[1;33m, rmul=\E[0;44m\E[1;33m, rs1=\Ec,
+-	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+-	sgr0=\E[0m\E[1;33;44m, smir=\E[4h, smpch=\E[11m,
+-	smso=\E[0;31;47m, smul=\E[1;31;44m, tbc=\E[3g, u8=\E[?6c,
+-	u9=\E[c, use=emx-base,
++	dch=\E[%p1%dp, ed=\E[J, el=\E[K,
++	flash=\E[?5h$<100/>\E[?5l, home=\E[H, ht=^I, hts=\EH,
++	ich=\E[%p1%d@, ich1=\E[@, ind=^J, kb2=\E[G, kbs=^H, kf0=\0D,
++	kll=\0O, kspd=^Z, nel=^M^J, rev=\E[5;37;41m, rmir=\E[4l,
++	rmpch=\E[10m, rmso=\E[0;44m\E[1;33m,
++	rmul=\E[0;44m\E[1;33m, rs1=\Ec, setab=\E[4%p1%dm,
++	setaf=\E[3%p1%dm, sgr0=\E[0m\E[1;33;44m, smir=\E[4h,
++	smpch=\E[11m, smso=\E[0;31;47m, smul=\E[1;31;44m,
++	tbc=\E[3g, u8=\E[?6c, u9=\E[c, use=emx-base,
+ # nice colors for Emacs (white on blue, mode line white on cyan)
+ ansi-color-2-emx|ANSI.SYS color 2,
+ 	clear=\E[0;37;44m\E[H\E[J, rev=\E[1;37;46m,
+@@ -7728,15 +7728,15 @@
+ # NOT set up by the initialization strings.
+ #
+ # Port Configuration
+-# 	RecvPace=Xon/Xoff
+-# 	XmitPace=Xon/Xoff
+-# 	StripNulDel=Yes
++#	RecvPace=Xon/Xoff
++#	XmitPace=Xon/Xoff
++#	StripNulDel=Yes
+ #
+ # Terminal Configuration
+-# 	InhHndShk=Yes
+-# 	InhDC2=Yes
+-# 	XmitFnctn(A)=No
+-# 	InhEolWrp=No
++#	InhHndShk=Yes
++#	InhDC2=Yes
++#	XmitFnctn(A)=No
++#	InhEolWrp=No
+ #
+ # Note: the 2624 DOES have a true , believe it or not!
+ #
+@@ -8031,10 +8031,10 @@
+ # PC Character Set	YES
+ # Twenty-Five Line Mode	YES
+ # XON/XOFF		@128 or 64 (sc)
+-# Keycode Mode 		NO   or YES (sc)
++# Keycode Mode		NO   or YES (sc)
+ # Backspace Key		BS or BS/DEL
+ #
+-#  	sets pcterm; autowrap; 25 lines; pc char set; prog DEL key;
++# 		sets pcterm; autowrap; 25 lines; pc char set; prog DEL key;
+ # \E\\? does not turn off keycode mode
+ # 	sets alternate start/stop; keycode on
+ hpansi|hp700|hewlett packard 700/44 in HP-PCterm mode,
+@@ -8082,7 +8082,7 @@
+ # but has no padding added, so may allow runover in some terminals at high
+ # baud rates.  Will not work for hp2640a or hp2640b terminals, hp98x6 and
+ # hp98x5 terminal emulators or hp98x6 consoles.
+-# 	Adds xy-cursor addressing, vertical cursor addressing, home,
++#	Adds xy-cursor addressing, vertical cursor addressing, home,
+ # last line, and underline capabilities.
+ #
+ # (hpex: removed memory-lock capabilities ":ml=\El:mu=\Em:",
+@@ -9080,7 +9080,7 @@
+ # 10: 110
+ #
+ # S2 UART/Terminal options:
+-# 		Up			Down
++#		Up			Down
+ # 1:		Not used		Not allowed
+ # 2:	Alternate character set	  Standard character set
+ # 3:	    Full duplex		    Half duplex
+@@ -9091,10 +9091,10 @@
+ # 8:		Not used		Not allowed on Rev E or lower
+ # 9:	     Even parity	     Odd parity
+ # 10:	    Steady cursor	    Blinking cursor
+-# 	(On Rev E or lower, use W25 instead of switch 10.)
++#	(On Rev E or lower, use W25 instead of switch 10.)
+ #
+ # S5 UART/Terminal options:
+-# 		Open			Closed
++#		Open			Closed
+ # 1:	P3-6 Not connected	DSR received on P3-6
+ # 2:	P3-8 Not connected	DCD received on P3-8
+ #
+@@ -9104,8 +9104,8 @@
+ # 3 Closed, 4 Closed:	Not allowed
+ #
+ # 5 Closed:	HDX printer (hardware control) Rev. K with extension port off,
+-# 		all data transmitted out of the modem port (P3) will also be
+-# 		transmitted out of the printer port (P4).
++#		all data transmitted out of the modem port (P3) will also be
++#		transmitted out of the printer port (P4).
+ #
+ # 6 Open, 7 Open:		Not allowed
+ # 6 Open, 7 Closed:	20ma current loop input
+@@ -9117,12 +9117,12 @@
+ # is switched on).
+ #
+ # S4/W31:	Enables automatic LF upon receipt of CR from
+-# 		remote or keyboard.
++#		remote or keyboard.
+ # S4/W32:	Enables transmission of EOT at the end of Send.  If not
+-# 		installed, a carriage return is sent.
++#		installed, a carriage return is sent.
+ # S4/W33:	Disables automatic carriage return in column 80.
+ # S4/W34:	Selects Page Print Mode as initial condition.  If not
+-# 		installed, Extension Mode is selected.
++#		installed, Extension Mode is selected.
+ #
+ # NON-STANDARD CAPABILITIES
+ #
+@@ -9446,10 +9446,10 @@
+ # Position	Up	Dn	Description
+ # --------------------------------------------
+ # 1		X		Local edit
+-# 			X	Duplex edit (transmit editing keys)
++#			X	Duplex edit (transmit editing keys)
+ # --------------------------------------------
+ # 2		X		912/920 emulation
+-# 			X	925
++#			X	925
+ # --------------------------------------------
+ # 3			X
+ # 4			X	No parity
+@@ -9472,7 +9472,7 @@
+ # 5		X
+ # --------------------------------------------
+ # 6		X		White on black display
+-# 			X	Black on white display
++#			X	Black on white display
+ # --------------------------------------------
+ # 7			X	Half Duplex
+ # 8			X
+@@ -9484,17 +9484,17 @@
+ # 8		X
+ # --------------------------------------------
+ # 9			X	50 Hz
+-# 		X		60 Hz
++#		X		60 Hz
+ # --------------------------------------------
+ # 10		X		CR/LF (Auto LF)
+-# 			X	CR only
++#			X	CR only
+ #
+ # S3 (internal switch) settings:
+ #
+ # Position	Up	Dn	Description
+ # --------------------------------------------
+ # 1		X		Keyclick off
+-# 			X	Keyclick on
++#			X	Keyclick on
+ # --------------------------------------------
+ # 2			X	English
+ # 3			X
+@@ -9521,19 +9521,19 @@
+ # 5		X
+ # --------------------------------------------
+ # 6		X		Screen blanking timer (ON)
+-# 			X	Screen blanking timer (OFF)
++#			X	Screen blanking timer (OFF)
+ # --------------------------------------------
+ # 7		X		Page attributes
+-# 			X	Line attributes
++#			X	Line attributes
+ # --------------------------------------------
+ # 8		X		DCD disconnected
+-# 			X	DCD connected
++#			X	DCD connected
+ # --------------------------------------------
+ # 9		X		DSR disconnected
+-# 			X	DSR connected
++#			X	DSR connected
+ # --------------------------------------------
+ # 10		X		DTR Disconnected
+-# 			X	DTR connected
++#			X	DTR connected
+ # --------------------------------------------
+ #
+ # (tvi925: BSD has .  I got  and  from there -- esr)
+@@ -11427,7 +11427,8 @@
+ 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
+ 	dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
+ 	dsl=\E[0$~, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
+-	flash=\E[?5h\E[?5l\E[?5h\E[?5l\E[?5h\E[?5l,
++	flash=\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[
++	      ?5l,
+ 	fsl=\E[0$}, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH,
+ 	ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=^J,
+ 	is2=\E>\E F\E[?1h\E[?7h\E[r\E[2$~, kbs=^H, kcub1=\EOD,
+@@ -11456,8 +11457,9 @@
+ 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
+ 	dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
+ 	dsl=\E[2$~\r\E[1$}\E[K\E[$}, ed=\E[J, el=\E[K,
+-	flash=\E[?5h\E[?5l, fsl=\E[$}, home=\E[H, ht=^I, hts=\EH,
+-	ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L$<3/>, ind=\ED,
++	flash=\E[?5h$<100/>\E[?5l, fsl=\E[$}, home=\E[H, ht=^I,
++	hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L$<3/>,
++	ind=\ED,
+ 	is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H,
+ 	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+ 	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf6=\E[17~,
+@@ -11509,7 +11511,7 @@
+ # (^V^L and ^V^M set the current attribute as a side-effect.)
+ # ^V ^Y  [...] 	-- repeat pattern.  specifies the number of bytes
+ #			   in the pattern,  the number of times the pattern
+-#		  	   should be repeated. If either value is 0, no-op.
++#			   should be repeated. If either value is 0, no-op.
+ #			   The pattern can contain Avatar console codes,
+ #			   including other ^V ^Y patterns.
+ #				level 1:
+@@ -11662,8 +11664,8 @@
+ # Seems upward compatible with vt100, plus ins/del line/char.
+ # On sgr, the protection parameter is ignored.
+ # No check is made to make sure that only 3 parameters are output.
+-# 	standout= reverse + half-intensity = 3 | 5.
+-# 	bold= reverse + underline = 2 | 3.
++#	standout= reverse + half-intensity = 3 | 5.
++#	bold= reverse + underline = 2 | 3.
+ # note that half-bright blinking doesn't look different from normal blinking.
+ # NOTE:you must program the function keys first, label second!
+ # (att4410: a BSD entry has been seen with the following capabilities:
+@@ -11921,14 +11923,14 @@
+ #  asynchronous keyboard-display terminal.  It supports
+ #  the vi editor.  The terminal must be set up as follows,
+ #
+-# 	HIGHLIGHT DEFINITION	3-TONE
+-# 	DISPLAY FUNCTION	GROUP III
++#	HIGHLIGHT DEFINITION	3-TONE
++#	DISPLAY FUNCTION	GROUP III
+ #
+ #  The second entry below provides limited (a la adm3a)
+ #  operation under GROUP II.
+ #
+ #  This must be used with DISPLAY FUNCTION GROUP I or III
+-# 	and HIGHLIGHT DEFINITION 3-TONE
++#	and HIGHLIGHT DEFINITION 3-TONE
+ # The terminal has either bold or blink, depending on options
+ #
+ # (att4424: commented out =\E[1m, we don't need bright locked on -- esr)
+@@ -12506,7 +12508,7 @@
+ #
+ # Here is what's going onm in the init string:
+ #	ESC [ 50;4|	set 700 native mode (really is 605)
+-# x	ESC [ 56;ps| 	set lines to 24: ps=0; 40: ps=1 (plus status line)
++# x	ESC [ 56;ps|	set lines to 24: ps=0; 40: ps=1 (plus status line)
+ #	ESC [ 53;0|	set GenFlow to Xon/Xoff
+ #	ESC [ 8 ;0|	set CR on NL
+ # x	ESC [ ? 3 l/h	set workspace: 80 col(l); 132 col(h)
+@@ -13790,9 +13792,9 @@
+ 	cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C,
+ 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
+ 	dch=\E[%p1%dX, dch1=\E[X, dim=\E[2m, dl=\E[%p1%dM,
+-	dl1=\E[M, ed=\E[J, el=\E[K, flash=\E[?5h\E[?5l, home=\E[H,
+-	hpa=\E[%i%p1%dG, ht=^I, ich=\E[%p1%d@, ich1=\E[@,
+-	il=\E[%p1%dL, il1=\E[L, ind=^J, invis=\E[8m,
++	dl1=\E[M, ed=\E[J, el=\E[K, flash=\E[?5h$<100/>\E[?5l,
++	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, ich=\E[%p1%d@,
++	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=^J, invis=\E[8m,
+ 	is2=\E0;2m\E[1;25r\E[25;1H\E[?3l\E[?7h\E[?8h,
+ 	ka1=\E[f, ka3=\EOQ, kb2=\EOP, kbs=^H, kc1=\EOR, kc3=\EOS,
+ 	kcub1=\E[D, kcud1=\E[A, kcuf1=\E[C, kcuu1=\E[A, kdch1=\177,
+@@ -13954,7 +13956,7 @@
+ # From: Walter Skorski , 16-oct-1996.
+ # Lots of notes, originally inline, but ncurses doesn't grok that.
+ #
+-# am: 	not available in power on mode, but turned on with \E[=107;207h in
++# am:	not available in power on mode, but turned on with \E[=107;207h in
+ #	is2=.  Also, \E=124l in is2= could have been used to prevent needing
+ #	to specify xenl:, but that would have rendered the last space on the
+ #	last line useless.
+@@ -14143,7 +14145,7 @@
+ #		%p1%{30}%>		 ((key; 30) >;
+ #		%p1%{54}%<		  (key; 54) <
+ #		%A			 ) AND
+-#		%O		  	) OR
++#		%O			) OR
+ #	 [that is, "IF key < 24 OR (key > 30 AND key < 54)",]
+ #		%t\E[		THEN	OUTPUT	\E[
+ #		%p1%d			OUTPUT	(key) as decimal
+@@ -15171,34 +15173,34 @@
+ 	use=dm3025,
+ # Datamedia DT80 soft switches:
+ # 1	0=Jump  1=Smooth
+-# 	Autorepeat 	0=off  1=on
+-# 	Screen		0=Dark 1=light
+-# 	Cursor		0=u/l  1=block
++#	Autorepeat	0=off  1=on
++#	Screen		0=Dark 1=light
++#	Cursor		0=u/l  1=block
+ #
+ # 2	Margin Bell	0=off  1=on
+-# 	Keyclick	0=off  1=on
+-# 	Ansi/VT52	0=VT52 1=Ansi
+-# 	Xon/Xoff	0=Off  1=On
++#	Keyclick	0=off  1=on
++#	Ansi/VT52	0=VT52 1=Ansi
++#	Xon/Xoff	0=Off  1=On
+ #
+ # 3	Shift3		0=Hash 1=UK Pound
+-# 	Wrap		0=Off  1=On
+-# 	Newline		0=Off  1=On
+-# 	Interlace	0=Off  1=On
++#	Wrap		0=Off  1=On
++#	Newline		0=Off  1=On
++#	Interlace	0=Off  1=On
+ #
+ # 4	Parity		0=Odd  1=Even
+-# 	Parity		0=Off  1=On
+-# 	Bits/Char	0=7    1=8
+-# 	Power		0=60Hz 1=50Hz
++#	Parity		0=Off  1=On
++#	Bits/Char	0=7    1=8
++#	Power		0=60Hz 1=50Hz
+ #
+ # 5	Line Interface  0=EIA  1=Loop
+-# 	Aux Interface   0=EIA  1=Loop
+-# 	Local Copy    	0=Off  1=On
+-# 	Spare
++#	Aux Interface	0=EIA  1=Loop
++#	Local Copy	0=Off  1=On
++#	Spare
+ #
+ # 6	Aux Parity	0=Odd  1=Even
+-# 	Aux Parity	0=Off  1=On
+-# 	Aux Bits/Char   0=7    1=8
+-# 	CRT Saver	0=Off  1=On
++#	Aux Parity	0=Off  1=On
++#	Aux Bits/Char	0=7    1=8
++#	CRT Saver	0=Off  1=On
+ # dm80/1 is a vt100 lookalike, but it doesn't seem to need any padding.
+ dm80|dmdt80|dt80|datamedia dt80/1,
+ 	clear=\E[2J\E[H, cud1=^J, cuf1=\E[C,
+@@ -17343,7 +17345,7 @@
+ # The capablitiy 'op' sets colors to green on black (default combination).
+ #
+ # NOTE:  The NCR Unix System Administrator's Shell will not function properly
+-# 	    if the 'pairs' capability is defined. Un-Comment the 'pairs'
++#	    if the 'pairs' capability is defined. Un-Comment the 'pairs'
+ #	    capability and recompile if you wish to have it included.
+ #
+ ncr260wy325pp|NCR 2900_260 wyse 325,
+@@ -17405,7 +17407,7 @@
+ # are numbered 0 through 15.
+ #
+ # NOTE:  The NCR Unix System Administrator's Shell does not function properly
+-# 	    with the 'pairs' capability defined as below.  If you wish to
++#	    with the 'pairs' capability defined as below.  If you wish to
+ #	    have it included, Un-comment it and recompile (using 'tic').
+ #
+ ncr260wy350pp|NCR 2900_260 wyse 350,
+@@ -17826,7 +17828,7 @@
+ 	kf0=\ERA, kf1=\ERB, kf10=\ERK, kf2=\ERC, kf3=\ERD, kf4=\ERE,
+ 	kf5=\ERF, kf6=\ERG, kf7=\ERH, kf8=\ERI, kf9=\ERJ, tbc=\E3,
+ # (pe7000m: this had
+-# 	rmul=\E!\0, smul=\E!\040,
++#	rmul=\E!\0, smul=\E!\040,
+ # which is probably wrong, it collides with kf0
+ pe7000m|perkin elmer 7000 series monochrome monitor,
+ 	am,
+@@ -19009,15 +19011,15 @@
+ 	ri=\215, rin@, use=amiga-h,
+ 
+ # Commodore B-128 microcomputer from Doug Tyrol 
+-# 	I'm trying to write a termcap for a commodore b-128, and I'm
++#	I'm trying to write a termcap for a commodore b-128, and I'm
+ # having a little trouble. I've had to map most of my control characters
+ # to something that unix will accept (my delete-char is a ctrl-t, etc),
+ # and create some functions (like cm), but thats life.
+-# 	The problem is with the arrow keys - right, and up work fine, but
++#	The problem is with the arrow keys - right, and up work fine, but
+ # left deletes the previous character and down I just can't figure out.
+ # Jove knows what I want, but I don't know what it's sending to me (it
+ # isn't thats bound to next-line in jove).
+-# 	Anybody got any ideas? Here's my termcap.
++#	Anybody got any ideas? Here's my termcap.
+ # DAG -- I changed his "^n" entries to "\n"; see if that works.
+ #
+ commodore|b-128|Commodore B-128 micro,
+@@ -19537,8 +19539,8 @@
+ 	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch=\E[%p1%dP,
+ 	dch1=\E[P, dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M,
+ 	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)U,
+-	flash=\E[?5h\E[?5l, home=\E[H, hpa=\E[%i%p1%d`, ht=^I,
+-	hts=\EH, il=\E[%p1%dL, il1=\E[L, ind=^J,
++	flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%d`,
++	ht=^I, hts=\EH, il=\E[%p1%dL, il1=\E[L, ind=^J,
+ 	initc=\E]P%p1%{15}%&%X%p2%{255}%&%02X%p3%{255}%&%02X%p4
+ 	      %{255}%&%02X,
+ 	is2=\E]R\E]P3FFFF80\E[?8c, ka1=\EOw, ka3=\EOy, kb2=\E[G,
+@@ -20273,34 +20275,34 @@
+ #	CLR clear			^[`
+ #	KBU keyboard unlock (set)	^[[W
+ #	KBL keyboard lock (reset)	^[[X
+-#	CM  character mode (async.) 	^[k
++#	CM  character mode (async.)	^[k
+ #	NEP non echoplex mode (by host)	^[l
+-#	EP  echoplex mode (by host) 	^[m
++#	EP  echoplex mode (by host)	^[m
+ #	IM  insert mode set		^[[I
+-#	IM  insert mode reset 		^[[J
+-#	RMS roll mode set 		^[r
+-#	RMR roll mode reset 		^[q
+-#	SM78 set mode vip7800	 	^[[1q
+-#	SD  scroll up  	(72 lines) 	^[[0s
+-#	SD  scroll down	(72 lines) 	^[[1s
++#	IM  insert mode reset		^[[J
++#	RMS roll mode set		^[r
++#	RMR roll mode reset		^[q
++#	SM78 set mode vip7800		^[[1q
++#	SD  scroll up	(72 lines)	^[[0s
++#	SD  scroll down (72 lines)	^[[1s
+ #	RBM block mode reset		^[[E
+-#	SLS status line set 		^[w
+-#	SLR status line reset 		^[v
+-#	SLL status line lock 		^[O
+-#	LGS Line-graphic mode set 	^[G
+-#	LGR Line-graphic mode reset 	^[F
++#	SLS status line set		^[w
++#	SLR status line reset		^[v
++#	SLL status line lock		^[O
++#	LGS Line-graphic mode set	^[G
++#	LGR Line-graphic mode reset	^[F
+ #	TBC tab clear (at cursor pos.)	^[[g
+-#	TBI tab initialize 		^[[N
++#	TBI tab initialize		^[[N
+ #	TBS tab set (at cursor pos.)	^[p
+ #	PDS  print data space		^[[0p
+-#	PHD  print host data 		^[[3p
++#	PHD  print host data		^[[3p
+ #	PDT  print data terminator	^[[
    u
+ #	SSP0 partition 0 set		^[[00u
+-#	SSP1 partition n format 1 	^[[PnPnSTRINGu
+-#	SSP2 partition n format 2 	^[[PnPnSTRINGu
+-#	SSP3 partition n format 3 	^[[PnPnu
++#	SSP1 partition n format 1	^[[PnPnSTRINGu
++#	SSP2 partition n format 2	^[[PnPnSTRINGu
++#	SSP3 partition n format 3	^[[PnPnu
+ #	ATR attribute (visual)
+ #	    blink :			^[sB
+ #	    dim :			^[sL
+@@ -20541,7 +20543,7 @@
+ 	bel=^G, cr=^M, cub1=^H, cud1=^J, ind=^J, kbs=^H,
+ # \E(B		Use U.S. character set (otherwise # => british pound !)
+ # \E[20l	Disable "linefeed newline" mode (else puts \r after \n,\f,\v)
+-# \E[w   	10 char/in pitch
++# \E[w		10 char/in pitch
+ # \E[1;132	full width horizontal margins
+ # \E[2g		clear all tab stops
+ # \E[z		6 lines/in
+@@ -21766,7 +21768,7 @@
+ #	*     cfont(1) in the PC 7300 documentation.
+ #	*/
+ #
+-#	struct altfdata 	/* structure for alt font data */
++#	struct altfdata		/* structure for alt font data */
+ #	{
+ #	short	altf_slot;		/* memory slot number */
+ #	char	altf_name[FNSIZE];	/* font name (file name) */
+@@ -22872,10 +22874,10 @@
+ # terminfo entry are followed with the corresponding capability in parens:
+ #
+ #	CSI k		disable (n=0) or enable (n=1) keyclick
+-#	CSI 2h   		lock keyboard
+-#	CSI 2i  		send screen as input
+-#	CSI 2l  		unlock keyboard
+-#	CSI 6m  		enable background color intensity
++#	CSI 2h			lock keyboard
++#	CSI 2i			send screen as input
++#	CSI 2l			unlock keyboard
++#	CSI 6m			enable background color intensity
+ #	CSI <0-2>c		reserved
+ #	CSI <0-59>m		select graphic rendition
+ #	CSI ;H	(cup)	cursor to line n and column m
+@@ -22902,10 +22904,10 @@
+ #	CSI e		cursor down n lines and in first column
+ #	CSI g	(cbt)	clear all tabs
+ #	CSI z		make virtual terminal n active
+-#	CSI ?7h 	(smam)	turn automargin on
+-#	CSI ?7l 	(rmam)	turn automargin off
+-#	CSI s     		save cursor position
+-#	CSI u   		restore cursor position to saved value
++#	CSI ?7h		(smam)	turn automargin on
++#	CSI ?7l		(rmam)	turn automargin off
++#	CSI s			save cursor position
++#	CSI u			restore cursor position to saved value
+ #	CSI =A		set overscan color
+ #	CSI =F		set normal foreground color
+ #	CSI =G		set normal background color
+@@ -22918,12 +22920,12 @@
+ #	CSI =;C		set cursor parameters
+ #	CSI =D		enable/disable intensity of background color
+ #	CSI =E		set/clear blink vs. bold background
+-#	CSI 7     	(sc)	(sc) save cursor position
+-#	CSI 8   	(rc)	(rc) restore cursor position to saved value
++#	CSI 7		(sc)	(sc) save cursor position
++#	CSI 8		(rc)	(rc) restore cursor position to saved value
+ #	CSI H		(hts)	(hts) set tab stop
+ #	CSI Q	define function key string
+ #				(string must begin and end with delimiter char)
+-#	CSI c   	(clear) clear screen
++#	CSI c		(clear) clear screen
+ #
+ # The lack of any specification for attributes in SGR (among other things)
+ # makes this a wretchedly weak standard. The table above is literally
+@@ -22949,22 +22951,22 @@
+ #	CL	key_char_left
+ #	CR	key_char_right
+ #	CW	key_change_window			create_window
+-#	EN	key_end          	kend
++#	EN	key_end			kend
+ #	HM	key_home		khome
+ #	HP	??
+-#	LD	key_delete_line  	kdl1
+-#	LF	key_linefeed     			label_off
++#	LD	key_delete_line		kdl1
++#	LF	key_linefeed				label_off
+ #	NU	key_next_unlocked_cell
+-#	PD	key_page_down   	knp
++#	PD	key_page_down		knp
+ #	PL	??
+ #	PN	start_print		mc5
+ #	PR	??
+ #	PS	stop_print		mc4
+-#	PU	key_page_up     	kpp		pulse
++#	PU	key_page_up		kpp		pulse
+ #	RC	key_recalc				remove_clock
+ #	RF	key_toggle_ref				req_for_input
+-#	RT	key_return      	kent
+-#	UP	key_up_arrow           	kcuu1   	parm_up_cursor
++#	RT	key_return		kent
++#	UP	key_up_arrow		kcuu1		parm_up_cursor
+ #	WL	key_word_left
+ #	WR	key_word_right
+ #
+@@ -23534,7 +23536,7 @@
+ # 9.13.0 (Sun Mar 10 00:13:08 EST 1996):
+ #	* Another sweep through the Shuford archive looking for new info.
+ #	* Added dg100 alias to dg6053 based on a comp.terminals posting.
+-# 	* Added st52 from Per Persson.
++#	* Added st52 from Per Persson.
+ #	* Added eterm from the GNU Emacs 19.30 distribution.
+ #	* Freeze for 1.9.9.
+ # 9.13.1 (Fri Mar 29 14:06:46 EST 1996):
+@@ -24855,4 +24857,13 @@
+ #	+ add linux-m1 minitel entries (patch by Alexandre Montaron).
+ #	+ correct rs2 string for vt100-nam -TD
+ #
++# 2016-11-26
++#	+ modify linux-16color to not mask dim, standout or reverse with the
++#	  ncv capability -TD
++#	+ add 0.1sec mandatory delay to flash capabilities using the VT100
++#	  reverse-video control -TD
++#	+ omit selection of ISO-8859-1 for G0 in enacs capability from linux2.6
++#	  entry, to avoid conflict with the user-defined mapping.  The reset
++#	  feature will use ISO-8859-1 in any case (Mikulas Patocka).
++#
+ ######## SHANTIH!  SHANTIH!  SHANTIH!
+Index: ncurses/curses.priv.h
+Prereq:  1.553 
+--- ncurses-6.0-20161119+/ncurses/curses.priv.h	2016-09-10 21:52:52.000000000 +0000
++++ ncurses-6.0-20161126/ncurses/curses.priv.h	2016-11-21 23:28:54.000000000 +0000
+@@ -34,7 +34,7 @@
+  ****************************************************************************/
+ 
+ /*
+- * $Id: curses.priv.h,v 1.553 2016/09/10 21:52:52 Rich.Coe Exp $
++ * $Id: curses.priv.h,v 1.554 2016/11/21 23:28:54 tom Exp $
+  *
+  *	curses.priv.h
+  *
+@@ -901,10 +901,10 @@
+ #endif
+ 
+ #ifdef TRACE
+-	bool		init_trace;
+ 	char		trace_fname[PATH_MAX];
+ 	int		trace_level;
+ 	FILE		*trace_fp;
++	int		trace_fd;
+ 
+ 	char		*tracearg_buf;
+ 	size_t		tracearg_used;
+Index: ncurses/tinfo/lib_data.c
+Prereq:  1.67 
+--- ncurses-6.0-20161119+/ncurses/tinfo/lib_data.c	2016-09-04 00:15:54.000000000 +0000
++++ ncurses-6.0-20161126/ncurses/tinfo/lib_data.c	2016-11-21 23:29:14.000000000 +0000
+@@ -42,7 +42,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_data.c,v 1.67 2016/09/04 00:15:54 tom Exp $")
++MODULE_ID("$Id: lib_data.c,v 1.68 2016/11/21 23:29:14 tom Exp $")
+ 
+ /*
+  * OS/2's native linker complains if we don't initialize public data when
+@@ -168,10 +168,10 @@
+ #endif
+ 
+ #ifdef TRACE
+-    FALSE,			/* init_trace */
+     CHARS_0s,			/* trace_fname */
+     0,				/* trace_level */
+     NULL,			/* trace_fp */
++    -1,				/* trace_fd */
+ 
+     NULL,			/* tracearg_buf */
+     0,				/* tracearg_used */
+Index: ncurses/trace/lib_trace.c
+Prereq:  1.82 
+--- ncurses-6.0-20161119+/ncurses/trace/lib_trace.c	2013-07-06 19:42:09.000000000 +0000
++++ ncurses-6.0-20161126/ncurses/trace/lib_trace.c	2016-11-27 02:35:17.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2012,2013 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2013,2016 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -47,7 +47,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_trace.c,v 1.82 2013/07/06 19:42:09 tom Exp $")
++MODULE_ID("$Id: lib_trace.c,v 1.84 2016/11/27 02:35:17 tom Exp $")
+ 
+ NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */
+ 
+@@ -85,54 +85,59 @@
+ NCURSES_EXPORT_VAR(long) _nc_outchars = 0;
+ #endif
+ 
+-#define TraceFP		_nc_globals.trace_fp
+-#define TracePath	_nc_globals.trace_fname
+-#define TraceLevel	_nc_globals.trace_level
++#define MyFP		_nc_globals.trace_fp
++#define MyFD		_nc_globals.trace_fd
++#define MyPath		_nc_globals.trace_fname
++#define MyLevel		_nc_globals.trace_level
++#define MyNested	_nc_globals.nested_tracef
+ 
+ NCURSES_EXPORT(void)
+ trace(const unsigned int tracelevel)
+ {
+-    if ((TraceFP == 0) && tracelevel) {
+-	const char *mode = _nc_globals.init_trace ? "ab" : "wb";
+-
+-	if (TracePath[0] == '\0') {
+-	    size_t size = sizeof(TracePath) - 12;
+-	    if (getcwd(TracePath, size) == 0) {
+-		perror("curses: Can't get working directory");
+-		exit(EXIT_FAILURE);
++    if ((MyFP == 0) && tracelevel) {
++	if (MyFD >= 0) {
++	    MyFP = fdopen(MyFD, "wb");
++	} else {
++	    if (MyPath[0] == '\0') {
++		size_t size = sizeof(MyPath) - 12;
++		if (getcwd(MyPath, size) == 0) {
++		    perror("curses: Can't get working directory");
++		    exit(EXIT_FAILURE);
++		}
++		MyPath[size] = '\0';
++		assert(strlen(MyPath) <= size);
++		_nc_STRCAT(MyPath, "/trace", sizeof(MyPath));
++		if (_nc_is_dir_path(MyPath)) {
++		    _nc_STRCAT(MyPath, ".log", sizeof(MyPath));
++		}
+ 	    }
+-	    TracePath[size] = '\0';
+-	    assert(strlen(TracePath) <= size);
+-	    _nc_STRCAT(TracePath, "/trace", sizeof(TracePath));
+-	    if (_nc_is_dir_path(TracePath)) {
+-		_nc_STRCAT(TracePath, ".log", sizeof(TracePath));
++	    if (_nc_access(MyPath, W_OK) < 0
++		|| (MyFD = open(MyPath, O_CREAT | O_EXCL | O_RDWR, 0600)) < 0
++		|| (MyFP = fdopen(MyFD, "wb")) == 0) {
++		;		/* EMPTY */
+ 	    }
+ 	}
+-
+-	_nc_globals.init_trace = TRUE;
+ 	_nc_tracing = tracelevel;
+-	if (_nc_access(TracePath, W_OK) < 0
+-	    || (TraceFP = fopen(TracePath, mode)) == 0) {
+-	    perror("curses: Can't open 'trace' file");
+-	    exit(EXIT_FAILURE);
+-	}
+ 	/* Try to set line-buffered mode, or (failing that) unbuffered,
+ 	 * so that the trace-output gets flushed automatically at the
+ 	 * end of each line.  This is useful in case the program dies. 
+ 	 */
++	if (MyFP != 0) {
+ #if HAVE_SETVBUF		/* ANSI */
+-	(void) setvbuf(TraceFP, (char *) 0, _IOLBF, (size_t) 0);
++	    (void) setvbuf(MyFP, (char *) 0, _IOLBF, (size_t) 0);
+ #elif HAVE_SETBUF /* POSIX */
+-	(void) setbuffer(TraceFP, (char *) 0);
++	    (void) setbuffer(MyFP, (char *) 0);
+ #endif
++	}
+ 	_tracef("TRACING NCURSES version %s.%d (tracelevel=%#x)",
+ 		NCURSES_VERSION,
+ 		NCURSES_VERSION_PATCH,
+ 		tracelevel);
+     } else if (tracelevel == 0) {
+-	if (TraceFP != 0) {
+-	    fclose(TraceFP);
+-	    TraceFP = 0;
++	if (MyFP != 0) {
++	    MyFD = dup(MyFD);	/* allow reopen of same file */
++	    fclose(MyFP);
++	    MyFP = 0;
+ 	}
+ 	_nc_tracing = tracelevel;
+     } else if (_nc_tracing != tracelevel) {
+@@ -155,12 +160,12 @@
+     if (strlen(fmt) >= sizeof(Called) - 1) {
+ 	if (!strncmp(fmt, Called, sizeof(Called) - 1)) {
+ 	    before = TRUE;
+-	    TraceLevel++;
++	    MyLevel++;
+ 	} else if (!strncmp(fmt, Return, sizeof(Return) - 1)) {
+ 	    after = TRUE;
+ 	}
+ 	if (before || after) {
+-	    if ((TraceLevel <= 1)
++	    if ((MyLevel <= 1)
+ 		|| (doit & TRACE_ICALLS) != 0)
+ 		doit &= (TRACE_CALLS | TRACE_CCALLS);
+ 	    else
+@@ -168,9 +173,7 @@
+ 	}
+     }
+ 
+-    if (doit != 0) {
+-	if (TraceFP == 0)
+-	    TraceFP = stderr;
++    if (doit != 0 && MyFP != 0) {
+ #ifdef USE_PTHREADS
+ 	/*
+ 	 * TRACE_ICALLS is "really" needed to show normal use with threaded
+@@ -185,23 +188,23 @@
+ 	if ((pthread_self))
+ # endif
+ #ifdef __MINGW32__
+-	    fprintf(TraceFP, "%#lx:", (long) (intptr_t) pthread_self().p);
++	    fprintf(MyFP, "%#lx:", (long) (intptr_t) pthread_self().p);
+ #else
+-	    fprintf(TraceFP, "%#lx:", (long) (intptr_t) pthread_self());
++	    fprintf(MyFP, "%#lx:", (long) (intptr_t) pthread_self());
+ #endif
+ #endif
+ 	if (before || after) {
+ 	    int n;
+-	    for (n = 1; n < TraceLevel; n++)
+-		fputs("+ ", TraceFP);
++	    for (n = 1; n < MyLevel; n++)
++		fputs("+ ", MyFP);
+ 	}
+-	vfprintf(TraceFP, fmt, ap);
+-	fputc('\n', TraceFP);
+-	fflush(TraceFP);
++	vfprintf(MyFP, fmt, ap);
++	fputc('\n', MyFP);
++	fflush(MyFP);
+     }
+ 
+-    if (after && TraceLevel)
+-	TraceLevel--;
++    if (after && MyLevel)
++	MyLevel--;
+ 
+     errno = save_err;
+ }
+@@ -310,13 +313,13 @@
+     bool result = FALSE;
+ 
+     _nc_lock_global(tst_tracef);
+-    if (!_nc_globals.nested_tracef++) {
++    if (!MyNested++) {
+ 	if ((result = (_nc_tracing & (mask))) != 0
+ 	    && _nc_try_global(tracef) == 0) {
+ 	    /* we will call _nc_locked_tracef(), no nesting so far */
+ 	} else {
+ 	    /* we will not call _nc_locked_tracef() */
+-	    _nc_globals.nested_tracef = 0;
++	    MyNested = 0;
+ 	}
+     } else {
+ 	/* we may call _nc_locked_tracef(), but with nested_tracef > 0 */
+@@ -339,7 +342,7 @@
+     _nc_va_tracef(fmt, ap);
+     va_end(ap);
+ 
+-    if (--(_nc_globals.nested_tracef) == 0) {
++    if (--(MyNested) == 0) {
+ 	_nc_unlock_global(tracef);
+     }
+ }
+Index: package/debian-mingw/changelog
+--- ncurses-6.0-20161119+/package/debian-mingw/changelog	2016-11-19 18:20:25.000000000 +0000
++++ ncurses-6.0-20161126/package/debian-mingw/changelog	2016-11-21 22:34:14.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161119) unstable; urgency=low
++ncurses6 (6.0+20161126) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 19 Nov 2016 13:20:25 -0500
++ -- Thomas E. Dickey   Mon, 21 Nov 2016 17:34:14 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.0-20161119+/package/debian-mingw64/changelog	2016-11-19 18:20:25.000000000 +0000
++++ ncurses-6.0-20161126/package/debian-mingw64/changelog	2016-11-21 22:34:14.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161119) unstable; urgency=low
++ncurses6 (6.0+20161126) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 19 Nov 2016 13:20:25 -0500
++ -- Thomas E. Dickey   Mon, 21 Nov 2016 17:34:14 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.0-20161119+/package/debian/changelog	2016-11-19 18:20:25.000000000 +0000
++++ ncurses-6.0-20161126/package/debian/changelog	2016-11-21 22:34:14.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161119) unstable; urgency=low
++ncurses6 (6.0+20161126) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 19 Nov 2016 13:20:25 -0500
++ -- Thomas E. Dickey   Mon, 21 Nov 2016 17:34:14 -0500
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.185 
+--- ncurses-6.0-20161119+/package/mingw-ncurses.nsi	2016-11-19 18:20:25.000000000 +0000
++++ ncurses-6.0-20161126/package/mingw-ncurses.nsi	2016-11-21 22:34:14.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.185 2016/11/19 18:20:25 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.186 2016/11/21 22:34:14 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "0"
+ !define VERSION_YYYY  "2016"
+-!define VERSION_MMDD  "1119"
++!define VERSION_MMDD  "1126"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.0-20161119+/package/mingw-ncurses.spec	2016-11-19 18:20:25.000000000 +0000
++++ ncurses-6.0-20161126/package/mingw-ncurses.spec	2016-11-21 22:34:14.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.0
+-Release: 20161119
++Release: 20161126
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.0-20161119+/package/ncurses.spec	2016-11-19 18:20:25.000000000 +0000
++++ ncurses-6.0-20161126/package/ncurses.spec	2016-11-21 22:34:14.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.0
+-Release: 20161119
++Release: 20161126
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: progs/tic.c
+Prereq:  1.225 
+--- ncurses-6.0-20161119+/progs/tic.c	2016-11-20 00:34:58.000000000 +0000
++++ ncurses-6.0-20161126/progs/tic.c	2016-11-26 22:01:41.000000000 +0000
+@@ -48,7 +48,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: tic.c,v 1.225 2016/11/20 00:34:58 tom Exp $")
++MODULE_ID("$Id: tic.c,v 1.228 2016/11/26 22:01:41 tom Exp $")
+ 
+ #define STDIN_NAME ""
+ 
+@@ -1172,6 +1172,19 @@
+     }
+ }
+ 
++static int
++csi_length(const char *value)
++{
++    int result = 0;
++
++    if (value[0] == '\033' && value[1] == '[') {
++	result = 2;
++    } else if (UChar(value[0]) == 0x9a) {
++	result = 1;
++    }
++    return result;
++}
++
+ static char
+ keypad_final(const char *string)
+ {
+@@ -1214,7 +1227,6 @@
+ {
+     int j, k;
+     int want;
+-    size_t prefix = 0;
+     size_t suffix;
+     bool skip[4];
+     bool repeated = FALSE;
+@@ -1232,16 +1244,8 @@
+     }
+     if (!repeated) {
+ 	char *up = list[1];
++	size_t prefix = csi_length(up);
+ 
+-	if (UChar(up[0]) == '\033') {
+-	    if (up[1] == '[') {
+-		prefix = 2;
+-	    } else {
+-		prefix = 1;
+-	    }
+-	} else if (UChar(up[0]) == UChar('\233')) {
+-	    prefix = 1;
+-	}
+ 	if (prefix) {
+ 	    suffix = prefix;
+ 	    while (up[suffix] && isdigit(UChar(up[suffix])))
+@@ -1813,20 +1817,48 @@
+     return result;
+ }
+ 
++/*
++ * Check for DEC VT100 private mode for reverse video.
++ */
++static const char *
++skip_DECSCNM(const char *value, int *flag)
++{
++    *flag = -1;
++    if (value != 0) {
++	int skip = csi_length(value);
++	fprintf(stderr, "test %d:%s\n", skip, value);
++	if (skip > 0 &&
++	    value[skip++] == '?' &&
++	    value[skip++] == '5') {
++	    if (value[skip] == 'h') {
++		*flag = 1;
++	    } else if (value[skip] == 'l') {
++		*flag = 0;
++	    }
++	    value += skip + 1;
++	}
++    }
++    return value;
++}
++
+ static void
+ check_delays(const char *name, const char *value)
+ {
+     const char *p, *q;
+-    const char *mark = 0;
++    const char *first = 0;
++    const char *last = 0;
+ 
+     for (p = value; *p != '\0'; ++p) {
+ 	if (p[0] == '$' && p[1] == '<') {
+ 	    const char *base = p + 2;
++	    const char *mark = 0;
+ 	    bool maybe = TRUE;
+ 	    bool mixed = FALSE;
+ 	    int proportional = 0;
+ 	    int mandatory = 0;
+ 
++	    first = p;
++
+ 	    for (q = base; *q != '\0'; ++q) {
+ 		if (*q == '>') {
+ 		    if (mark == 0)
+@@ -1846,6 +1878,7 @@
+ 		    mixed = TRUE;
+ 		}
+ 	    }
++	    last = *q ? (q + 1) : q;
+ 	    if (*q == '\0') {
+ 		maybe = FALSE;	/* just an isolated "$<" */
+ 	    } else if (maybe) {
+@@ -1865,6 +1898,32 @@
+ 	    }
+ 	}
+     }
++
++    if (!strcmp(name, "flash") ||
++	!strcmp(name, "beep")) {
++
++	if (first != 0) {
++	    if (first == value || *last == 0) {
++		/*
++		 * Delay is on one end or the other.
++		 */
++		_nc_warning("expected delay embedded within %s", name);
++	    }
++	} else {
++	    int flag;
++
++	    /*
++	     * Check for missing delay when using VT100 reverse-video.
++	     * A real VT100 might not need this, but terminal emulators do.
++	     */
++	    if ((p = skip_DECSCNM(value, &flag)) != 0 &&
++		flag > 0 &&
++		(q = skip_DECSCNM(p, &flag)) != 0 &&
++		flag == 0) {
++		_nc_warning("expected a delay in %s", name);
++	    }
++	}
++    }
+ }
+ 
+ static char *
+@@ -2399,15 +2458,13 @@
+     bool result = FALSE;
+ 
+     if (VALID_STRING(value)) {
+-	if (value[0] == '\033' && value[1] == '[') {
+-	    result = TRUE;
+-	    value += 2;
+-	} else if (UChar(value[0]) == 0x9a) {
+-	    result = TRUE;
+-	    value += 1;
+-	}
+-	if (result) {
++	int skip = csi_length(value);
++
++	if (skip) {
+ 	    int ch;
++
++	    result = TRUE;
++	    value += skip;
+ 	    while ((ch = UChar(*value++)) != '\0') {
+ 		if (isdigit(ch) || ch == ';') {
+ 		    ;
diff --git a/ncurses-6.0-20161203.patch b/ncurses-6.0-20161203.patch
new file mode 100644
index 0000000..0b5ae3b
--- /dev/null
+++ b/ncurses-6.0-20161203.patch
@@ -0,0 +1,1173 @@
+# ncurses 6.0 - patch 20161203 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.0 is at
+# 	ftp.gnu.org:/pub/gnu
+#
+# Patches for ncurses 6.0 can be found at
+# 	ftp://invisible-island.net/ncurses/6.0
+#	http://invisible-mirror.net/archives/ncurses/6.0 
+#
+# ------------------------------------------------------------------------------
+# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20161203.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Dec  4 02:16:58 UTC 2016
+# ------------------------------------------------------------------------------
+# NEWS                                  |    6 +-
+# VERSION                               |    2 
+# dist.mk                               |    4 -
+# doc/html/man/adacurses6-config.1.html |    2 
+# doc/html/man/captoinfo.1m.html        |    2 
+# doc/html/man/clear.1.html             |    2 
+# doc/html/man/curs_trace.3x.html       |   92 ++++++++++++++++++++------------
+# doc/html/man/form.3x.html             |    2 
+# doc/html/man/form_driver.3x.html      |   76 +++++++++++++++++++-------
+# doc/html/man/infocmp.1m.html          |    2 
+# doc/html/man/infotocap.1m.html        |    2 
+# doc/html/man/menu.3x.html             |    2 
+# doc/html/man/ncurses.3x.html          |    2 
+# doc/html/man/ncurses6-config.1.html   |    2 
+# doc/html/man/panel.3x.html            |    2 
+# doc/html/man/tabs.1.html              |    2 
+# doc/html/man/terminfo.5.html          |    2 
+# doc/html/man/tic.1m.html              |    2 
+# doc/html/man/toe.1m.html              |    2 
+# doc/html/man/tput.1.html              |    2 
+# doc/html/man/tset.1.html              |    2 
+# man/curs_trace.3x                     |   77 ++++++++++++++++----------
+# man/form_driver.3x                    |   33 ++++++++++-
+# package/debian-mingw/changelog        |    4 -
+# package/debian-mingw64/changelog      |    4 -
+# package/debian/changelog              |    4 -
+# package/mingw-ncurses.nsi             |    4 -
+# package/mingw-ncurses.spec            |    2 
+# package/ncurses.spec                  |    2 
+# progs/tic.c                           |    4 -
+# test/README                           |   59 ++++++++++----------
+# 31 files changed, 260 insertions(+), 145 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.2703 
+--- ncurses-6.0-20161126+/NEWS	2016-11-27 01:41:10.000000000 +0000
++++ ncurses-6.0-20161203/NEWS	2016-12-04 01:02:15.000000000 +0000
+@@ -25,7 +25,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.2703 2016/11/27 01:41:10 tom Exp $
++-- $Id: NEWS,v 1.2705 2016/12/04 01:02:15 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -45,6 +45,10 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20161203
++	+ improve discussion of field validation in form_driver.3x manual page.
++	+ update curs_trace.3x manual page.
++
+ 20161126
+ 	+ modify linux-16color to not mask dim, standout or reverse with the
+ 	  ncv capability -TD
+Index: VERSION
+--- ncurses-6.0-20161126+/VERSION	2016-11-21 22:34:14.000000000 +0000
++++ ncurses-6.0-20161203/VERSION	2016-12-03 16:11:11.000000000 +0000
+@@ -1 +1 @@
+-5:0:9	6.0	20161126
++5:0:9	6.0	20161203
+Index: dist.mk
+Prereq:  1.1134 
+--- ncurses-6.0-20161126+/dist.mk	2016-11-21 22:34:14.000000000 +0000
++++ ncurses-6.0-20161203/dist.mk	2016-12-03 16:11:11.000000000 +0000
+@@ -25,7 +25,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1134 2016/11/21 22:34:14 tom Exp $
++# $Id: dist.mk,v 1.1135 2016/12/03 16:11:11 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -37,7 +37,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 0
+-NCURSES_PATCH = 20161126
++NCURSES_PATCH = 20161203
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/man/adacurses6-config.1.html
+--- ncurses-6.0-20161126+/doc/html/man/adacurses6-config.1.html	2016-11-19 22:08:24.000000000 +0000
++++ ncurses-6.0-20161203/doc/html/man/adacurses6-config.1.html	2016-12-04 01:10:35.000000000 +0000
+@@ -131,7 +131,7 @@
+ 
    SEE ALSO
    +        curses(3x)
+ 
+-       This describes ncurses version 6.0 (patch 20161119).
++       This describes ncurses version 6.0 (patch 20161203).
+ 
+ 
+ 
+Index: doc/html/man/captoinfo.1m.html
+--- ncurses-6.0-20161126+/doc/html/man/captoinfo.1m.html	2016-11-19 22:08:24.000000000 +0000
++++ ncurses-6.0-20161203/doc/html/man/captoinfo.1m.html	2016-12-04 01:10:35.000000000 +0000
+@@ -198,7 +198,7 @@
+ 
    SEE ALSO
    +        infocmp(1m), curses(3x), terminfo(5)
+ 
+-       This describes ncurses version 6.0 (patch 20161119).
++       This describes ncurses version 6.0 (patch 20161203).
+ 
+ 
+ 
    AUTHOR
    +Index: doc/html/man/clear.1.html
+--- ncurses-6.0-20161126+/doc/html/man/clear.1.html	2016-11-19 22:08:24.000000000 +0000
++++ ncurses-6.0-20161203/doc/html/man/clear.1.html	2016-12-04 01:10:35.000000000 +0000
+@@ -135,7 +135,7 @@
+ 
    SEE ALSO
    +        tput(1), terminfo(5)
+ 
+-       This describes ncurses version 6.0 (patch 20161119).
++       This describes ncurses version 6.0 (patch 20161203).
+ 
+ 
+ 
+Index: doc/html/man/curs_trace.3x.html
+--- ncurses-6.0-20161126+/doc/html/man/curs_trace.3x.html	2016-10-15 23:12:21.000000000 +0000
++++ ncurses-6.0-20161203/doc/html/man/curs_trace.3x.html	2016-12-04 01:10:37.000000000 +0000
+@@ -26,7 +26,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_trace.3x,v 1.14 2016/10/15 17:26:09 tom Exp @
++  * @Id: curs_trace.3x,v 1.16 2016/12/03 23:53:23 tom Exp @
+ -->
+ 
+ 
+@@ -46,27 +46,30 @@
+ 
+ 
+ 
    NAME
    +-       _tracef, _tracedump, _traceattr, _traceattr2,
+-       _nc_tracebits, _tracecchar_t, _tracecchar_t2, _tracechar,
+-       _tracechtype, _tracechtype2, _tracemouse, trace - curses
+-       debugging routines
++       trace, _tracef, _traceattr, _traceattr2, _tracecchar_t,
++       _tracecchar_t2, _tracechar, _tracechtype, _tracechtype2,
++       _nc_tracebits, _tracedump, _tracemouse - curses debugging
++       routines
+ 
+ 
+ 
    SYNOPSIS
    +        #include <curses.h>
+ 
++       void trace(const unsigned int param);
++
+        void _tracef(const char *format, ...);
+-       void _tracedump(const char *label, WINDOW *win);
++
+        char *_traceattr(attr_t attr);
+        char *_traceattr2(int buffer, chtype ch);
+-       char *_nc_tracebits(void);
+-       char * _tracecchar_t(const cchar_t *string);
+-       char * _tracecchar_t2(int buffer, const cchar_t *string);
++       char *_tracecchar_t(const cchar_t *string);
++       char *_tracecchar_t2(int buffer, const cchar_t *string);
+        char *_tracechar(int ch);
+        char *_tracechtype(chtype ch);
+        char *_tracechtype2(int buffer, chtype ch);
++
++       void _tracedump(const char *label, WINDOW *win);
++       char *_nc_tracebits(void);
+        char *_tracemouse(const MEVENT *event);
+-       void trace(const unsigned int param);
+ 
+ 
+ 
    DESCRIPTION
    +@@ -79,6 +82,8 @@
+        are only available with the  wide-character  configuration
+        of the libraries.
+ 
++
++
    Functions
    +        The principal parts of this interface are
+ 
+        o   trace,  which  selectively  enables  different tracing
+@@ -87,13 +92,32 @@
+        o   _tracef, which writes  formatted  data  to  the  trace
+            file.
+ 
+-       Calling  trace  with  a  nonzero  parameter opens the file
+-       trace in the current directory for output.  The  parameter
+-       is formed by OR'ing values from the list of TRACE_xxx def-
+-       initions in <curses.h>.  These include:
++       Calling  trace  with  a nonzero parameter creates the file
++       trace in the current directory for output.   If  the  file
++       already exists, no tracing is done.
++
++       The  other  functions either return a pointer to a string-
++       area (allocated by the corresponding function), or  return
++       no  value (such as _tracedump, which implements the screen
++       dump for TRACE_UPDATE).  The caller should not free  these
++       strings,  since  the  allocation  is  reused on successive
++       calls.  To work around the problem of a single string-area
++       per  function, some use a buffer-number parameter, telling
++       the library to allocate additional string-areas.
++
++
++
    Trace Parameter
    ++       The trace parameter is formed by OR'ing  values  from  the
++       list  of  TRACE_xxx  definitions in <curses.h>.  These in-
++       clude:
+ 
+        TRACE_DISABLE
+-            turn off tracing.
++            turn off tracing by passing a zero parameter.
++
++            The library flushes the output file, but  retains  an
++            open file-descriptor to the trace file so that it can
++            resume tracing later if a nonzero parameter is passed
++            to the trace function.
+ 
+        TRACE_TIMES
+             trace user and system times of updates.
+@@ -111,8 +135,8 @@
+             trace all character outputs.
+ 
+        TRACE_ORDINARY
+-            trace all update actions.  The  old  and  new  screen
+-            contents  are  written to the trace file for each re-
++            trace  all  update  actions.   The old and new screen
++            contents are written to the trace file for  each  re-
+             fresh.
+ 
+        TRACE_CALLS
+@@ -141,28 +165,21 @@
+             trace changes to video attributes and colors.
+ 
+        TRACE_MAXIMUM
+-            maximum  trace  level,  enables  all  of the separate
++            maximum trace level,  enables  all  of  the  separate
+             trace features.
+ 
+-       Some tracing features are enabled whenever the  trace  pa-
+-       rameter  is nonzero.  Some features overlap.  The specific
++       Some  tracing  features are enabled whenever the trace pa-
++       rameter is nonzero.  Some features overlap.  The  specific
+        names are used as a guideline.
+ 
+-       The other functions either return a pointer to  a  string-
+-       area  (allocated by the corresponding function), or return
+-       no value (such as _tracedump, which implements the  screen
+-       dump  for TRACE_UPDATE).  The caller should not free these
+-       strings, since the  allocation  is  reused  on  successive
+-       calls.  To work around the problem of a single string-area
+-       per function, some use a buffer-number parameter,  telling
+-       the library to allocate additional string-areas.
+ 
++
    Initialization
    +        These  functions check the NCURSES_TRACE environment vari-
+        able, to set the tracing feature as if trace was called:
+ 
+-              filter, initscr, new_prescr, newterm, nofilter,
+-              restartterm, ripoffline, setupterm, slk_init, tge-
+-              tent, use_env, use_extended_names, use_tioctl
++           filter, initscr, new_prescr, newterm, nofilter,
++           restartterm, ripoffline, setupterm, slk_init, tgetent,
++           use_env, use_extended_names, use_tioctl
+ 
+ 
+ 
    RETURN VALUE
    +@@ -176,6 +193,11 @@
+        undocumented  features,  but  they are not compatible with
+        ncurses.
+ 
++       A few functions are not provided when symbol versioning is
++       used:
++
++           _nc_tracebits, _tracedump, _tracemouse
++
+ 
+ 
    SEE ALSO
    +        curses(3x).
+@@ -188,7 +210,13 @@
+ 
      
+ 
    • NAME
      • 
+ 
    • SYNOPSIS
      • 
+-
    • DESCRIPTION
      • 
++
    • DESCRIPTION
++
++
      • 
+ 
    • RETURN VALUE
      • 
+ 
    • PORTABILITY
      • 
+ 
    • SEE ALSO
      • 
+Index: doc/html/man/form.3x.html
+--- ncurses-6.0-20161126+/doc/html/man/form.3x.html	2016-11-19 22:08:26.000000000 +0000
++++ ncurses-6.0-20161203/doc/html/man/form.3x.html	2016-12-04 01:10:37.000000000 +0000
+@@ -239,7 +239,7 @@
+        curses(3x) and related pages whose names begin "form_" for
+        detailed descriptions of the entry points.
+ 
+-       This describes ncurses version 6.0 (patch 20161119).
++       This describes ncurses version 6.0 (patch 20161203).
+ 
+ 
+ 
+Index: doc/html/man/form_driver.3x.html
+--- ncurses-6.0-20161126+/doc/html/man/form_driver.3x.html	2016-01-30 19:24:55.000000000 +0000
++++ ncurses-6.0-20161203/doc/html/man/form_driver.3x.html	2016-12-04 01:10:37.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -156,11 +156,44 @@
+        that request is executed.
+ 
+ 
++
    Field validation
    ++       The form library makes updates to  the  window  associated
++       with  form  fields  rather than directly to the field buf-
++       fers.
++
++       The form driver provides low-level control over updates to
++       the  form fields.  The form driver also provides for vali-
++       dating modified fields to ensure that  the  contents  meet
++       whatever  constraints  an  application  may  attach  using
++       set_field_type.
++
++       You can validate a field without making any changes to  it
++       using  REQ_VALIDATION.   The  form driver also validates a
++       field in these cases:
++
++       o   a call to set_current_field attempts to move to a dif-
++           ferent field.
++
++       o   a  call to set_current_page attempts to move to a dif-
++           ferent page of the form.
++
++       o   a request attempts to move to a different field.
++
++       o   a request attempts to move to a different page of  the
++           form.
++
++       In each case, the move fails if the field is invalid.
++
++       If the modified field is valid, the form driver copies the
++       modified data from the window associated with the field to
++       the field buffer.
++
++
+ 
    Mouse handling
    +-       If the second argument is the KEY_MOUSE special  key,  the
++       If  the  second argument is the KEY_MOUSE special key, the
+        associated mouse event is translated into one of the above
+-       pre-defined requests.  Currently only clicks in  the  user
+-       window  (e.g., inside the form display area or the decora-
++       pre-defined  requests.   Currently only clicks in the user
++       window (e.g., inside the form display area or the  decora-
+        tion window) are handled.
+ 
+        If you click above the display region of the form:
+@@ -179,33 +212,33 @@
+ 
+           a REQ_LAST_FIELD is generated for a triple-click.
+ 
+-       If you click at an field inside the display  area  of  the
++       If  you  click  at an field inside the display area of the
+        form:
+ 
+           o   the form cursor is positioned to that field.
+ 
+-          o   If  you  double-click  a  field, the form cursor is
+-              positioned to that field and  E_UNKNOWN_COMMAND  is
++          o   If you double-click a field,  the  form  cursor  is
++              positioned  to  that field and E_UNKNOWN_COMMAND is
+               returned.  This return value makes sense, because a
+-              double click usually means that  an  field-specific
+-              action  should be returned.  It is exactly the pur-
+-              pose of this return value to signal that an  appli-
++              double  click  usually means that an field-specific
++              action should be returned.  It is exactly the  pur-
++              pose  of this return value to signal that an appli-
+               cation specific command should be executed.
+ 
+-          o   If   a   translation   into  a  request  was  done,
++          o   If  a  translation  into  a   request   was   done,
+               form_driver returns the result of this request.
+ 
+-       If you clicked outside the user window or the mouse  event
+-       could   not   be   translated   into  a  form  request  an
++       If  you clicked outside the user window or the mouse event
++       could  not  be  translated  into   a   form   request   an
+        E_REQUEST_DENIED is returned.
+ 
+ 
+ 
    Application-defined commands
    +        If the second argument is neither printable nor one of the
+-       above  pre-defined form requests, the driver assumes it is
++       above pre-defined form requests, the driver assumes it  is
+        an application-specific command and returns E_UNKNOWN_COM-
+        MAND.  Application-defined commands should be defined rel-
+-       ative to MAX_COMMAND, the  maximum  value  of  these  pre-
++       ative  to  MAX_COMMAND,  the  maximum  value of these pre-
+        defined requests.
+ 
+ 
+@@ -215,7 +248,7 @@
+        E_OK The routine succeeded.
+ 
+        E_BAD_ARGUMENT
+-            Routine  detected  an incorrect or out-of-range argu-
++            Routine detected an incorrect or  out-of-range  argu-
+             ment.
+ 
+        E_BAD_STATE
+@@ -239,7 +272,9 @@
+ 
+ 
+ 
    SEE ALSO
    +-       curses(3x), form(3x), form_variables(3x), curs_getch(3x).
++       curses(3x),        form(3x),        form_field_buffer(3x),
++       form_field_validation(3x),  form_fieldtype(3x), form_vari-
++       ables(3x), curs_getch(3x).
+ 
+ 
+ 
    NOTES
    +@@ -248,12 +283,12 @@
+ 
+ 
+ 
    PORTABILITY
    +-       These routines emulate the System V forms  library.   They
++       These  routines  emulate the System V forms library.  They
+        were not supported on Version 7 or BSD versions.
+ 
+ 
+ 
    AUTHORS
    +-       Juergen  Pfeifer.   Manual  pages  and  adaptation for new
++       Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
+        curses by Eric S. Raymond.
+ 
+ 
+@@ -269,6 +304,7 @@
+ 
  • form_driver
    • 
+ 
  • form_driver_w
    • 
+ 
  • Form-driver requests
    • 
++
  • Field validation
    • 
+ 
  • Mouse handling
    • 
+ 
  • Application-defined commands
    • 
+ 
+Index: doc/html/man/infocmp.1m.html
+--- ncurses-6.0-20161126+/doc/html/man/infocmp.1m.html	2016-11-19 22:08:27.000000000 +0000
++++ ncurses-6.0-20161203/doc/html/man/infocmp.1m.html	2016-12-04 01:10:38.000000000 +0000
+@@ -478,7 +478,7 @@
+ 
+        http://invisible-island.net/ncurses/tctest.html
+ 
+-       This describes ncurses version 6.0 (patch 20161119).
++       This describes ncurses version 6.0 (patch 20161203).
+ 
+ 
+ 
    AUTHOR
    +Index: doc/html/man/infotocap.1m.html
+--- ncurses-6.0-20161126+/doc/html/man/infotocap.1m.html	2016-11-19 22:08:27.000000000 +0000
++++ ncurses-6.0-20161203/doc/html/man/infotocap.1m.html	2016-12-04 01:10:38.000000000 +0000
+@@ -88,7 +88,7 @@
+ 
    SEE ALSO
    +        curses(3x), tic(1m), infocmp(1m), terminfo(5)
+ 
+-       This describes ncurses version 6.0 (patch 20161119).
++       This describes ncurses version 6.0 (patch 20161203).
+ 
+ 
+ 
    AUTHOR
    +Index: doc/html/man/menu.3x.html
+--- ncurses-6.0-20161126+/doc/html/man/menu.3x.html	2016-11-19 22:08:27.000000000 +0000
++++ ncurses-6.0-20161203/doc/html/man/menu.3x.html	2016-12-04 01:10:38.000000000 +0000
+@@ -217,7 +217,7 @@
+        curses(3x) and related pages whose names begin "menu_" for
+        detailed descriptions of the entry points.
+ 
+-       This describes ncurses version 6.0 (patch 20161119).
++       This describes ncurses version 6.0 (patch 20161203).
+ 
+ 
+ 
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.0-20161126+/doc/html/man/ncurses.3x.html	2016-11-19 22:08:28.000000000 +0000
++++ ncurses-6.0-20161203/doc/html/man/ncurses.3x.html	2016-12-04 01:10:39.000000000 +0000
+@@ -60,7 +60,7 @@
+        sonable optimization.  This implementation is "new curses"
+        (ncurses) and is the approved replacement for 4.4BSD clas-
+        sic  curses,  which has been discontinued.  This describes
+-       ncurses version 6.0 (patch 20161119).
++       ncurses version 6.0 (patch 20161203).
+ 
+        The ncurses library emulates the curses library of  System
+        V  Release  4  UNIX,  and  XPG4 (X/Open Portability Guide)
+Index: doc/html/man/ncurses6-config.1.html
+--- ncurses-6.0-20161126+/doc/html/man/ncurses6-config.1.html	2016-11-19 22:08:28.000000000 +0000
++++ ncurses-6.0-20161203/doc/html/man/ncurses6-config.1.html	2016-12-04 01:10:39.000000000 +0000
+@@ -114,7 +114,7 @@
+ 
    SEE ALSO
    +        curses(3x)
+ 
+-       This describes ncurses version 6.0 (patch 20161119).
++       This describes ncurses version 6.0 (patch 20161203).
+ 
+ 
+ 
+Index: doc/html/man/panel.3x.html
+--- ncurses-6.0-20161126+/doc/html/man/panel.3x.html	2016-11-19 22:08:28.000000000 +0000
++++ ncurses-6.0-20161203/doc/html/man/panel.3x.html	2016-12-04 01:10:39.000000000 +0000
+@@ -208,7 +208,7 @@
+ 
    SEE ALSO
    +        curses(3x), curs_variables(3x),
+ 
+-       This describes ncurses version 6.0 (patch 20161119).
++       This describes ncurses version 6.0 (patch 20161203).
+ 
+ 
+ 
    AUTHOR
    +Index: doc/html/man/tabs.1.html
+--- ncurses-6.0-20161126+/doc/html/man/tabs.1.html	2016-11-19 22:08:28.000000000 +0000
++++ ncurses-6.0-20161203/doc/html/man/tabs.1.html	2016-12-04 01:10:39.000000000 +0000
+@@ -164,7 +164,7 @@
+ 
    SEE ALSO
    +        tset(1), infocmp(1m), curses(3x), terminfo(5).
+ 
+-       This describes ncurses version 6.0 (patch 20161119).
++       This describes ncurses version 6.0 (patch 20161203).
+ 
+ 
+ 
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.0-20161126+/doc/html/man/terminfo.5.html	2016-11-19 22:08:29.000000000 +0000
++++ ncurses-6.0-20161203/doc/html/man/terminfo.5.html	2016-12-04 01:10:39.000000000 +0000
+@@ -75,7 +75,7 @@
+        nals by giving a set of capabilities which they  have,  by
+        specifying how to perform screen operations, and by speci-
+        fying padding requirements and  initialization  sequences.
+-       This describes ncurses version 6.0 (patch 20161119).
++       This describes ncurses version 6.0 (patch 20161203).
+ 
+        Entries in terminfo consist of a sequence of `,' separated
+        fields (embedded commas may be escaped with a backslash or
+Index: doc/html/man/tic.1m.html
+--- ncurses-6.0-20161126+/doc/html/man/tic.1m.html	2016-11-19 22:08:29.000000000 +0000
++++ ncurses-6.0-20161203/doc/html/man/tic.1m.html	2016-12-04 01:10:39.000000000 +0000
+@@ -401,7 +401,7 @@
+        infocmp(1m),   captoinfo(1m),   infotocap(1m),    toe(1m),
+        curses(3x), term(5).  terminfo(5).
+ 
+-       This describes ncurses version 6.0 (patch 20161119).
++       This describes ncurses version 6.0 (patch 20161203).
+ 
+ 
+ 
    AUTHOR
    +Index: doc/html/man/toe.1m.html
+--- ncurses-6.0-20161126+/doc/html/man/toe.1m.html	2016-11-19 22:08:29.000000000 +0000
++++ ncurses-6.0-20161203/doc/html/man/toe.1m.html	2016-12-04 01:10:39.000000000 +0000
+@@ -117,7 +117,7 @@
+        tic(1m),   infocmp(1m),   captoinfo(1m),    infotocap(1m),
+        curses(3x), terminfo(5).
+ 
+-       This describes ncurses version 6.0 (patch 20161119).
++       This describes ncurses version 6.0 (patch 20161203).
+ 
+ 
+ 
+Index: doc/html/man/tput.1.html
+--- ncurses-6.0-20161126+/doc/html/man/tput.1.html	2016-11-19 22:08:29.000000000 +0000
++++ ncurses-6.0-20161203/doc/html/man/tput.1.html	2016-12-04 01:10:39.000000000 +0000
+@@ -441,7 +441,7 @@
+        clear(1),   stty(1),   tabs(1),   tset(1),    terminfo(5),
+        curs_termcap(3x).
+ 
+-       This describes ncurses version 6.0 (patch 20161119).
++       This describes ncurses version 6.0 (patch 20161203).
+ 
+ 
+ 
+Index: doc/html/man/tset.1.html
+--- ncurses-6.0-20161126+/doc/html/man/tset.1.html	2016-11-19 22:08:29.000000000 +0000
++++ ncurses-6.0-20161203/doc/html/man/tset.1.html	2016-12-04 01:10:39.000000000 +0000
+@@ -387,7 +387,7 @@
+        csh(1),   sh(1),   stty(1),   curs_terminfo(3x),   tty(4),
+        terminfo(5), ttys(5), environ(7)
+ 
+-       This describes ncurses version 6.0 (patch 20161119).
++       This describes ncurses version 6.0 (patch 20161203).
+ 
+ 
+ 
+Index: man/curs_trace.3x
+Prereq:  1.14 
+--- ncurses-6.0-20161126+/man/curs_trace.3x	2016-10-15 17:26:09.000000000 +0000
++++ ncurses-6.0-20161203/man/curs_trace.3x	2016-12-03 23:53:23.000000000 +0000
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_trace.3x,v 1.14 2016/10/15 17:26:09 tom Exp $
++.\" $Id: curs_trace.3x,v 1.16 2016/12/03 23:53:23 tom Exp $
+ .de bP
+ .IP \(bu 4
+ ..
+@@ -34,46 +34,46 @@
+ .na
+ .hy 0
+ .SH NAME
++\fBtrace\fR,
+ \fB_tracef\fR,
+-\fB_tracedump\fR,
+ \fB_traceattr\fR,
+ \fB_traceattr2\fR,
+-\fB_nc_tracebits\fR,
+ \fB_tracecchar_t\fR,
+ \fB_tracecchar_t2\fR,
+ \fB_tracechar\fR,
+ \fB_tracechtype\fR,
+ \fB_tracechtype2\fR,
+-\fB_tracemouse\fR,
+-\fBtrace\fR \- \fBcurses\fR debugging routines
++\fB_nc_tracebits\fR,
++\fB_tracedump\fR,
++\fB_tracemouse\fR \- \fBcurses\fR debugging routines
+ .ad
+ .hy
+ .SH SYNOPSIS
+ \fB#include \fR
+ .sp
++\fBvoid trace(const unsigned int \fP\fIparam\fP\fB);\fR
++.sp
+ \fBvoid _tracef(const char *\fP\fIformat\fP\fB, ...);\fR
+-.br
+-\fBvoid _tracedump(const char *\fP\fIlabel\fP\fB, WINDOW *\fP\fIwin\fP\fB);\fR
+-.br
++.sp
+ \fBchar *_traceattr(attr_t \fP\fIattr\fP\fB);\fR
+ .br
+ \fBchar *_traceattr2(int \fP\fIbuffer\fP\fB, chtype \fP\fIch\fP\fB);\fR
+ .br
+-\fBchar *_nc_tracebits(void);\fR
+-.br
+-\fBchar * _tracecchar_t(const cchar_t *\fP\fIstring\fP\fB);\fR
++\fBchar *_tracecchar_t(const cchar_t *\fP\fIstring\fP\fB);\fR
+ .br
+-\fBchar * _tracecchar_t2(int \fP\fIbuffer\fP\fB, const cchar_t *\fP\fIstring\fP\fB);\fR
++\fBchar *_tracecchar_t2(int \fP\fIbuffer\fP\fB, const cchar_t *\fP\fIstring\fP\fB);\fR
+ .br
+ \fBchar *_tracechar(int \fP\fIch\fP\fB);\fR
+ .br
+ \fBchar *_tracechtype(chtype \fP\fIch\fP\fB);\fR
+ .br
+ \fBchar *_tracechtype2(int \fP\fIbuffer\fP\fB, chtype \fP\fIch\fP\fB);\fR
++.sp
++\fBvoid _tracedump(const char *\fP\fIlabel\fP\fB, WINDOW *\fP\fIwin\fP\fB);\fR
+ .br
+-\fBchar *_tracemouse(const MEVENT *\fP\fIevent\fP\fB);\fR
++\fBchar *_nc_tracebits(void);\fR
+ .br
+-\fBvoid trace(const unsigned int \fP\fIparam\fP\fB);\fR
++\fBchar *_tracemouse(const MEVENT *\fP\fIevent\fP\fB);\fR
+ .SH DESCRIPTION
+ The \fBtrace\fR routines are used for debugging the ncurses libraries,
+ as well as applications which use the ncurses libraries.
+@@ -82,21 +82,38 @@
+ profile) by defining the symbol \fBTRACE\fR.
+ Additionally, some functions are only available with the wide-character
+ configuration of the libraries.
+-.PP
++.SS Functions
+ The principal parts of this interface are
+ .bP
+ \fBtrace\fR, which selectively enables different tracing features, and
+ .bP
+ \fB_tracef\fR, which writes formatted data to the \fItrace\fR file.
+ .PP
+-Calling \fBtrace\fR with a nonzero parameter opens the file \fBtrace\fR
++Calling \fBtrace\fR with a nonzero parameter creates the file \fBtrace\fR
+ in the current directory for output.
+-The parameter is formed by OR'ing
++If the file already exists, no tracing is done.
++.PP
++The other functions either return a pointer to a string-area
++(allocated by the corresponding function),
++or return no value (such as \fB_tracedump\fP, which implements the
++screen dump for \fBTRACE_UPDATE\fP).
++The caller should not free these
++strings, since the allocation is reused on successive calls.
++To work around the problem of a single string-area per function,
++some use a buffer-number parameter, telling the library to allocate
++additional string-areas.
++.SS Trace Parameter
++The trace parameter is formed by OR'ing
+ values from the list of \fBTRACE_\fP\fIxxx\fR definitions in \fB\fR.
+ These include:
+ .TP 5
+ .B TRACE_DISABLE
+-turn off tracing.
++turn off tracing by passing a zero parameter.
++.IP
++The library flushes the output file,
++but retains an open file-descriptor to the trace file
++so that it can resume tracing later if a nonzero parameter is passed
++to the \fBtrace\fP function.
+ .TP 5
+ .B TRACE_TIMES
+ trace user and system times of updates.
+@@ -150,22 +167,13 @@
+ is nonzero.
+ Some features overlap.
+ The specific names are used as a guideline.
+-.PP
+-The other functions either return a pointer to a string-area
+-(allocated by the corresponding function),
+-or return no value (such as \fB_tracedump\fP, which implements the
+-screen dump for \fBTRACE_UPDATE\fP).
+-The caller should not free these
+-strings, since the allocation is reused on successive calls.
+-To work around the problem of a single string-area per function,
+-some use a buffer-number parameter, telling the library to allocate
+-additional string-areas.
+-.PP
++.SS Initialization
+ These functions check the \fBNCURSES_TRACE\fP environment variable,
+ to set the tracing feature as if \fBtrace\fP was called:
+-.RS
++.RS 4
+ .PP
+ .na
++.hy 0
+ filter,
+ initscr,
+ new_prescr,
+@@ -179,6 +187,7 @@
+ use_env,
+ use_extended_names,
+ use_tioctl
++.hy
+ .ad
+ .RE
+ .SH RETURN VALUE
+@@ -189,5 +198,13 @@
+ Some other curses implementations are known to
+ have similar, undocumented features,
+ but they are not compatible with ncurses.
++.PP
++A few functions are not provided when symbol versioning is used:
++.RS 4
++.PP
++_nc_tracebits,
++_tracedump,
++_tracemouse
++.RE
+ .SH SEE ALSO
+ \fBcurses\fR(3X).
+Index: man/form_driver.3x
+Prereq:  1.25 
+--- ncurses-6.0-20161126+/man/form_driver.3x	2015-12-05 21:06:26.000000000 +0000
++++ ncurses-6.0-20161203/man/form_driver.3x	2016-12-04 01:01:17.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_driver.3x,v 1.25 2015/12/05 21:06:26 tom Exp $
++.\" $Id: form_driver.3x,v 1.26 2016/12/04 01:01:17 tom Exp $
+ .TH form_driver 3X ""
+ .de bP
+ .IP \(bu 4
+@@ -134,6 +134,32 @@
+ If the second argument is a printable character, the driver places it
+ in the current position in the current field.  If it is one of the forms
+ requests listed above, that request is executed.
++.SS Field validation
++The form library makes updates to the window associated with form fields rather than
++directly to the field buffers.
++.PP
++The form driver provides low-level control over updates to the form fields.
++The form driver also provides for validating modified fields to ensure that the contents
++meet whatever constraints an application may attach using \fBset_field_type\fP.
++.PP
++.PP
++You can validate a field without making any changes to it using
++\fBREQ_VALIDATION\fP.
++The form driver also validates a field in these cases:
++.bP
++a call to \fBset_current_field\fP attempts to move to a different field.
++.bP
++a call to \fBset_current_page\fP attempts to move to a different page of the form.
++.bP
++a request attempts to move to a different field.
++.bP
++a request attempts to move to a different page of the form.
++.PP
++In each case, the move fails if the field is invalid.
++.PP
++If the modified field is valid, the form driver copies the modified
++data from the window associated with the field
++to the field buffer.
+ .SS Mouse handling
+ .PP
+ If the second argument is the KEY_MOUSE special key, the associated
+@@ -218,6 +244,9 @@
+ .SH SEE ALSO
+ \fBcurses\fR(3X),
+ \fBform\fR(3X),
++\fBform_field_buffer\fR(3X),
++\fBform_field_validation\fR(3X),
++\fBform_fieldtype\fR(3X),
+ \fBform_variables\fR(3X),
+ \fBgetch\fR(3X).
+ .SH NOTES
+Index: package/debian-mingw/changelog
+--- ncurses-6.0-20161126+/package/debian-mingw/changelog	2016-11-21 22:34:14.000000000 +0000
++++ ncurses-6.0-20161203/package/debian-mingw/changelog	2016-12-03 16:11:11.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161126) unstable; urgency=low
++ncurses6 (6.0+20161203) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Mon, 21 Nov 2016 17:34:14 -0500
++ -- Thomas E. Dickey   Sat, 03 Dec 2016 11:11:11 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.0-20161126+/package/debian-mingw64/changelog	2016-11-21 22:34:14.000000000 +0000
++++ ncurses-6.0-20161203/package/debian-mingw64/changelog	2016-12-03 16:11:11.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161126) unstable; urgency=low
++ncurses6 (6.0+20161203) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Mon, 21 Nov 2016 17:34:14 -0500
++ -- Thomas E. Dickey   Sat, 03 Dec 2016 11:11:11 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.0-20161126+/package/debian/changelog	2016-11-21 22:34:14.000000000 +0000
++++ ncurses-6.0-20161203/package/debian/changelog	2016-12-03 16:11:11.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161126) unstable; urgency=low
++ncurses6 (6.0+20161203) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Mon, 21 Nov 2016 17:34:14 -0500
++ -- Thomas E. Dickey   Sat, 03 Dec 2016 11:11:11 -0500
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.186 
+--- ncurses-6.0-20161126+/package/mingw-ncurses.nsi	2016-11-21 22:34:14.000000000 +0000
++++ ncurses-6.0-20161203/package/mingw-ncurses.nsi	2016-12-03 16:11:11.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.186 2016/11/21 22:34:14 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.187 2016/12/03 16:11:11 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "0"
+ !define VERSION_YYYY  "2016"
+-!define VERSION_MMDD  "1126"
++!define VERSION_MMDD  "1203"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.0-20161126+/package/mingw-ncurses.spec	2016-11-21 22:34:14.000000000 +0000
++++ ncurses-6.0-20161203/package/mingw-ncurses.spec	2016-12-03 16:11:11.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.0
+-Release: 20161126
++Release: 20161203
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.0-20161126+/package/ncurses.spec	2016-11-21 22:34:14.000000000 +0000
++++ ncurses-6.0-20161203/package/ncurses.spec	2016-12-03 16:11:11.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.0
+-Release: 20161126
++Release: 20161203
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: progs/tic.c
+Prereq:  1.228 
+--- ncurses-6.0-20161126+/progs/tic.c	2016-11-26 22:01:41.000000000 +0000
++++ ncurses-6.0-20161203/progs/tic.c	2016-12-04 02:12:38.000000000 +0000
+@@ -48,7 +48,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: tic.c,v 1.228 2016/11/26 22:01:41 tom Exp $")
++MODULE_ID("$Id: tic.c,v 1.229 2016/12/04 02:12:38 tom Exp $")
+ 
+ #define STDIN_NAME ""
+ 
+@@ -1244,7 +1244,7 @@
+     }
+     if (!repeated) {
+ 	char *up = list[1];
+-	size_t prefix = csi_length(up);
++	size_t prefix = (size_t) csi_length(up);
+ 
+ 	if (prefix) {
+ 	    suffix = prefix;
+Index: test/README
+Prereq:  1.55 
+--- ncurses-6.0-20161126+/test/README	2016-04-02 23:57:07.000000000 +0000
++++ ncurses-6.0-20161203/test/README	2016-12-04 01:16:34.000000000 +0000
+@@ -25,7 +25,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: README,v 1.55 2016/04/02 23:57:07 tom Exp $
++-- $Id: README,v 1.56 2016/12/04 01:16:34 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ The programs in this directory are used to test and demonstrate ncurses.
+@@ -157,6 +157,7 @@
+ set_form_win			test: cardfile demo_forms ncurses
+ set_max_field			test: demo_forms
+ set_new_page			test: demo_forms
++unfocus_current_field		-
+ unpost_form			test: cardfile demo_forms form_driver_w ncurses
+ 
+ libmenu:
+@@ -251,17 +252,17 @@
+ addnstr				test: test_addstr
+ addnwstr			test: ncurses test_addwstr
+ addstr				test: blue bs cardfile filter gdc hanoi lrtest ncurses test_addstr
+-addwstr				test: test_addwstr
++addwstr				test: blue test_addwstr
+ assume_default_colors		test: background ncurses
+ assume_default_colors_sp	-
+ attr_get			-
+ attr_off			test: ncurses
+ attr_on				test: ncurses
+ attr_set			test: ncurses
+-attroff				test: dots_curses echochar filter gdc ncurses tclock
+-attron				test: bs dots_curses echochar filter gdc ncurses
++attroff				test: blue dots_curses echochar filter gdc ncurses tclock
++attron				test: blue bs dots_curses echochar filter gdc ncurses
+ attrset				test: bs filter firework gdc hanoi insdelln ncurses rain tclock testaddch testcurs
+-baudrate			lib: ncurses
++baudrate			test: ncurses
+ baudrate_sp			lib: ncurses
+ beep				test: blue bs cardfile chgat clip_printw demo_forms demo_menus demo_panels edit_field hanoi inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view xmas
+ beep_sp				lib: ncurses
+@@ -281,7 +282,7 @@
+ cbreak				test: background blue bs cardfile chgat clip_printw color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto filter firework foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest movewindow ncurses newdemo savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas
+ cbreak_sp			lib: ncurses
+ chgat				test: chgat
+-clear				test: blue bs gdc ncurses testcurs xmas
++clear				test: blue bs filter gdc ncurses testcurs xmas
+ clearok				test: bs knight
+ clrtobot			test: demo_menus ncurses
+ clrtoeol			test: blue bs demo_altkeys filter foldkeys form_driver_w hanoi hashtest movewindow ncurses view
+@@ -289,7 +290,7 @@
+ color_content_sp		-
+ color_set			test: color_set ncurses
+ copywin				test: ncurses testcurs
+-cur_term			test: demo_termcap demo_terminfo dots dots_mvcur lrtest test_sgr test_vid_puts test_vidputs progs: clear tabs tput tset
++cur_term			test: demo_termcap demo_terminfo dots dots_mvcur filter list_keys lrtest test_sgr test_vid_puts test_vidputs progs: clear_cmd reset_cmd tabs tput tset
+ curs_set			test: echochar firework gdc hanoi lrtest ncurses newdemo rain savescreen tclock testcurs worm xmas
+ curs_set_sp			lib: ncurses
+ curscr				test: demo_panels edit_field knight lrtest ncurses savescreen tclock view
+@@ -319,9 +320,9 @@
+ endwin				test: background blue bs cardfile chgat clip_printw color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto dots_curses dots_mvcur echochar filter firework firstlast foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest movewindow ncurses newdemo rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testaddch testcurs testscanw view worm xmas
+ endwin_sp			lib: ncurses
+ erase				test: cardfile demo_menus filter firework firstlast hanoi lrtest ncurses tclock test_opaque testcurs
+-erasechar			lib: ncurses
++erasechar			test: ncurses
+ erasechar_sp			lib: ncurses
+-erasewchar			-
++erasewchar			test: ncurses
+ filter				test: filter
+ filter_sp			-
+ flash				test: cardfile filter lrtest movewindow ncurses tclock testcurs
+@@ -356,9 +357,9 @@
+ halfdelay_sp			-
+ has_colors			test: background bs cardfile chgat clip_printw color_set demo_forms demo_menus demo_panels dots_curses echochar filter firework gdc hanoi ins_wide insdelln inserts knight ncurses newdemo rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr testcurs view worm xmas
+ has_colors_sp			lib: ncurses
+-has_ic				test: lrtest
++has_ic				test: lrtest ncurses
+ has_ic_sp			lib: ncurses
+-has_il				-
++has_il				test: ncurses
+ has_il_sp			lib: ncurses
+ has_key				-
+ has_key_sp			lib: ncurses
+@@ -398,13 +399,13 @@
+ is_idcok			test: test_opaque
+ is_idlok			test: test_opaque
+ is_immedok			test: test_opaque
+-is_keypad			test: test_opaque
++is_keypad			test: ncurses test_opaque
+ is_leaveok			test: test_opaque
+ is_linetouched			lib: form
+ is_nodelay			test: test_opaque
+ is_notimeout			test: test_opaque
+ is_pad				-
+-is_scrollok			test: test_opaque
++is_scrollok			test: ncurses test_opaque
+ is_subwin			-
+ is_syncok			test: test_opaque
+ is_term_resized			-
+@@ -422,11 +423,11 @@
+ keyok				test: demo_keyok foldkeys
+ keyok_sp			lib: ncurses
+ keypad				test: bs cardfile chgat clip_printw demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto edit_field filter firework foldkeys form_driver_w hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest movewindow ncurses redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view
+-killchar			lib: ncurses
++killchar			test: ncurses
+ killchar_sp			lib: ncurses
+-killwchar			-
++killwchar			test: ncurses
+ leaveok				test: hanoi test_opaque
+-longname			test: testcurs progs: tput
++longname			test: ncurses testcurs progs: tput
+ longname_sp			-
+ mcprint				-
+ mcprint_sp			-
+@@ -527,7 +528,7 @@
+ newpad				test: edit_field ncurses testcurs
+ newpad_sp			lib: ncurses
+ newscr				lib: ncurses
+-newterm				test: demo_altkeys ditto dots_mvcur filter foldkeys gdc key_names keynames test_setupterm
++newterm				test: demo_altkeys ditto dots_mvcur filter foldkeys gdc key_names keynames
+ newterm_sp			-
+ newwin				test: cardfile chgat clip_printw demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto edit_field firstlast inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses newdemo redraw savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs xmas
+ newwin_sp			lib: ncurses
+@@ -560,7 +561,7 @@
+ pnoutrefresh			test: edit_field ncurses
+ prefresh			test: testcurs
+ printw				test: background blue bs color_set demo_altkeys demo_defkey demo_keyok filter foldkeys ncurses savescreen testcurs testscanw view
+-putp				test: test_sgr progs: tput
++putp				test: filter test_sgr progs: tput
+ putp_sp				-
+ putwin				test: ncurses
+ qiflush				-
+@@ -571,7 +572,7 @@
+ refresh				test: blue bs demo_defkey demo_forms demo_keyok demo_menus demo_panels dots_curses echochar filter firstlast form_driver_w gdc hanoi hashtest lrtest movewindow ncurses savescreen tclock testcurs view xmas
+ reset_prog_mode			test: filter ncurses
+ reset_prog_mode_sp		lib: ncurses
+-reset_shell_mode		test: bs filter savescreen test_setupterm
++reset_shell_mode		test: bs filter savescreen
+ reset_shell_mode_sp		lib: ncurses
+ resetty				-
+ resetty_sp			-
+@@ -579,7 +580,7 @@
+ resize_term_sp			-
+ resizeterm			-
+ resizeterm_sp			lib: ncurses
+-restartterm			test: test_setupterm
++restartterm			-
+ restartterm_sp			-
+ ripoffline			test: demo_menus ncurses
+ ripoffline_sp			-
+@@ -596,7 +597,7 @@
+ scrl				test: view
+ scroll				test: testcurs
+ scrollok			test: clip_printw demo_altkeys demo_defkey demo_keyok demo_panels ditto foldkeys hashtest knight ncurses redraw test_opaque testcurs testscanw view
+-set_curterm			lib: ncurses
++set_curterm			test: list_keys
+ set_curterm_sp			-
+ set_escdelay			test: test_opaque
+ set_escdelay_sp			lib: ncurses
+@@ -605,7 +606,7 @@
+ set_term			lib: ncurses
+ setcchar			test: demo_panels ins_wide ncurses test_add_wchstr test_addwstr view
+ setscrreg			test: view
+-setupterm			test: demo_terminfo dots test_setupterm test_sgr test_vid_puts test_vidputs progs: clear tabs tput tset
++setupterm			test: demo_terminfo dots list_keys test_setupterm test_sgr test_vid_puts test_vidputs progs: clear tabs tput tset
+ slk_attr			-
+ slk_attr_off			-
+ slk_attr_on			-
+@@ -643,8 +644,8 @@
+ start_color_sp			-
+ stdscr				test: bs chgat clip_printw demo_altkeys demo_forms demo_menus demo_panels ditto filter firework foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest movewindow ncurses rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view worm xmas
+ strcodes			test: demo_termcap test_arrays progs: dump_entry
+-strfnames			test: demo_terminfo test_arrays progs: dump_entry
+-strnames			test: demo_termcap demo_terminfo foldkeys test_arrays progs: dump_entry infocmp tic
++strfnames			test: demo_terminfo list_keys test_arrays progs: dump_entry
++strnames			test: demo_termcap demo_terminfo foldkeys list_keys test_arrays progs: dump_entry infocmp tic
+ subpad				test: testcurs
+ subwin				test: movewindow ncurses newdemo testcurs
+ syncok				test: test_opaque
+@@ -652,7 +653,7 @@
+ term_attrs_sp			-
+ termattrs			test: ncurses testcurs
+ termattrs_sp			lib: ncurses
+-termname			test: testcurs
++termname			test: list_keys ncurses testcurs
+ termname_sp			lib: ncurses
+ tgetent				test: demo_termcap dots_termcap railroad
+ tgetent_sp			-
+@@ -667,14 +668,14 @@
+ tigetflag_sp			-
+ tigetnum			test: demo_terminfo ncurses progs: tput
+ tigetnum_sp			-
+-tigetstr			test: demo_defkey demo_terminfo foldkeys test_sgr testcurs progs: clear tput
++tigetstr			test: blue demo_defkey demo_terminfo foldkeys list_keys test_sgr testcurs progs: clear_cmd tput
+ tigetstr_sp			-
+ timeout				test: filter rain savescreen
+ tiparm				-
+ touchline			test: chgat clip_printw insdelln
+ touchwin			test: chgat clip_printw demo_menus edit_field filter firstlast inch_wide inchs ins_wide insdelln inserts movewindow ncurses redraw savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque xmas
+-tparm				test: dots dots_mvcur test_sgr progs: tabs tic tput
+-tputs				test: dots dots_mvcur dots_termcap railroad test_vid_puts test_vidputs progs: clear tabs tset
++tparm				test: dots dots_mvcur test_sgr progs: reset_cmd tabs tic tput
++tputs				test: dots dots_mvcur dots_termcap railroad test_vid_puts test_vidputs progs: clear_cmd reset_cmd tabs
+ tputs_sp			lib: ncurses
+ trace				test: demo_menus hashtest lrtest ncurses testcurs view worm
+ ttytype				test: demo_terminfo test_sgr
+@@ -693,7 +694,7 @@
+ use_default_colors_sp		-
+ use_env				test: ncurses progs: tput
+ use_env_sp			-
+-use_extended_names		progs: infocmp tic
++use_extended_names		test: demo_termcap demo_terminfo list_keys progs: infocmp tic
+ use_legacy_coding		-
+ use_legacy_coding_sp		-
+ use_screen			test: ditto
diff --git a/ncurses-6.0-20161210.patch b/ncurses-6.0-20161210.patch
new file mode 100644
index 0000000..25ffe53
--- /dev/null
+++ b/ncurses-6.0-20161210.patch
@@ -0,0 +1,14551 @@
+# ncurses 6.0 - patch 20161210 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.0 is at
+# 	ftp.gnu.org:/pub/gnu
+#
+# Patches for ncurses 6.0 can be found at
+# 	ftp://invisible-island.net/ncurses/6.0
+#	http://invisible-mirror.net/archives/ncurses/6.0 
+#
+# ------------------------------------------------------------------------------
+# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20161210.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Dec 11 02:45:02 UTC 2016
+# ------------------------------------------------------------------------------
+# INSTALL                              |   24 
+# MANIFEST                             |    1 
+# NEWS                                 |   12 
+# VERSION                              |    2 
+# configure                            | 4085 ++++++++++++++++-----------------
+# configure.in                         |   19 
+# dist.mk                              |    4 
+# include/curses.h.in                  |   15 
+# ncurses-6.0-20161210/test/tput-initc |   87 
+# ncurses/base/MKlib_gen.sh            |    4 
+# package/debian-mingw/changelog       |    4 
+# package/debian-mingw64/changelog     |    4 
+# package/debian/changelog             |    4 
+# package/mingw-ncurses.nsi            |    4 
+# package/mingw-ncurses.spec           |    2 
+# package/ncurses.spec                 |    2 
+# test/xterm-16color.dat               |   10 
+# test/xterm-256color.dat              |   10 
+# test/xterm-88color.dat               |   10 
+# 19 files changed, 2236 insertions(+), 2067 deletions(-)
+# ------------------------------------------------------------------------------
+Index: INSTALL
+Prereq:  1.194 
+--- ncurses-6.0-20161203+/INSTALL	2015-10-24 19:03:42.000000000 +0000
++++ ncurses-6.0-20161210/INSTALL	2016-12-11 00:41:03.000000000 +0000
+@@ -1,5 +1,5 @@
+ -------------------------------------------------------------------------------
+--- Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.               --
++-- Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.               --
+ --                                                                           --
+ -- Permission is hereby granted, free of charge, to any person obtaining a   --
+ -- copy of this software and associated documentation files (the             --
+@@ -25,7 +25,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: INSTALL,v 1.194 2015/10/24 19:03:42 Tomas.Cech Exp $
++-- $Id: INSTALL,v 1.195 2016/12/11 00:41:03 tom Exp $
+ ---------------------------------------------------------------------
+              How to install Ncurses/Terminfo on your system
+ ---------------------------------------------------------------------
+@@ -470,6 +470,26 @@
+ 	list documented in X/Open.  ncurses provides varargs support for this
+ 	function.  Use --disable-tparm-varargs to disable this support.
+ 
++    --disable-wattr-macros
++	The 6.0 ABI adds support for extended colors and for extended mouse.
++	The former is a noticeable problem when developers inadvertantly
++	compile using the ncurses6 header files and link with an ncurses5
++	library, because the wattr* macros use a new field in the WINDOW
++	structure.  These macros are used in several applications.
++
++	Since ncurses provides an actual function for each of these macros,
++	suppressing them from the curses.h header allows the ncurses5 libraries
++	to be used in most applications.
++
++	NOTE: The extended colors also are used in the cchar_t structure, but
++	fewer applications use that.
++
++	NOTE: This workaround does not help with mismatches in the ncurses
++	mouse version.  The extended mouse feature uses one less fewer bit for
++	each button, so that only the first button will work as expected with
++	a mismatch between header and library.  Again, most applications will
++	work, since most use only the first button.
++
+     --enable-assertions
+ 	For testing, compile-in assertion code.  This is used only for a few
+ 	places where ncurses cannot easily recover by returning an error code.
+Index: MANIFEST
+--- ncurses-6.0-20161203+/MANIFEST	2016-10-22 20:16:37.000000000 +0000
++++ ncurses-6.0-20161210/MANIFEST	2016-12-11 02:44:18.000000000 +0000
+@@ -1174,6 +1174,7 @@
+ ./test/testaddch.c
+ ./test/testcurs.c
+ ./test/testscanw.c
++./test/tput-initc
+ ./test/tracemunch
+ ./test/view.c
+ ./test/widechars-utf8.txt
+Index: NEWS
+Prereq:  1.2705 
+--- ncurses-6.0-20161203+/NEWS	2016-12-04 01:02:15.000000000 +0000
++++ ncurses-6.0-20161210/NEWS	2016-12-11 00:24:06.000000000 +0000
+@@ -25,7 +25,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.2705 2016/12/04 01:02:15 tom Exp $
++-- $Id: NEWS,v 1.2708 2016/12/11 00:24:06 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -45,6 +45,16 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20161210
++	+ add configure script option --disable-wattr-macros for use in cases
++	  where one wants to use the same headers for ncurses5/ncurses6
++	  development, by suppressing the wattr* macros which differ due to
++	  the introduction of extended colors (prompted by comments in
++	  Debian #230990, Redhat #1270534).
++	+ add test/tput-initc to demonstrate tput used to initialize palette
++	  from a data file.
++	+ modify test/xterm*.dat to use the newer color4/color12 values.
++
+ 20161203
+ 	+ improve discussion of field validation in form_driver.3x manual page.
+ 	+ update curs_trace.3x manual page.
+Index: VERSION
+--- ncurses-6.0-20161203+/VERSION	2016-12-03 16:11:11.000000000 +0000
++++ ncurses-6.0-20161210/VERSION	2016-12-10 12:47:46.000000000 +0000
+@@ -1 +1 @@
+-5:0:9	6.0	20161203
++5:0:9	6.0	20161210
+Index: configure
+--- ncurses-6.0-20161203+/configure	2016-10-08 21:36:01.000000000 +0000
++++ ncurses-6.0-20161210/configure	2016-12-11 02:19:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+-# From configure.in Revision: 1.631 .
++# From configure.in Revision: 1.633 .
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by Autoconf 2.52.20150926.
+ #
+@@ -773,6 +773,7 @@
+   --disable-largefile     omit support for large files
+   --disable-tparm-varargs compile tparm() without varargs interface
+   --disable-tic-depends   link tic library without explicit dependency on ncurses library
++  --disable-wattr-macros  suppress wattr* macros to help with ncurses5/ncurses6 transition
+   --with-bool=TYPE        override fallback type of bool variable
+   --with-caps=alt         compile with alternate Caps file
+   --with-chtype=TYPE      override type of chtype
+@@ -1031,7 +1032,7 @@
+ fi
+ for ac_site_file in $CONFIG_SITE; do
+   if test -r "$ac_site_file"; then
+-    { echo "$as_me:1034: loading site script $ac_site_file" >&5
++    { echo "$as_me:1035: loading site script $ac_site_file" >&5
+ echo "$as_me: loading site script $ac_site_file" >&6;}
+     cat "$ac_site_file" >&5
+     . "$ac_site_file"
+@@ -1042,7 +1043,7 @@
+   # Some versions of bash will fail to source /dev/null (special
+   # files actually), so we avoid doing that.
+   if test -f "$cache_file"; then
+-    { echo "$as_me:1045: loading cache $cache_file" >&5
++    { echo "$as_me:1046: loading cache $cache_file" >&5
+ echo "$as_me: loading cache $cache_file" >&6;}
+     case $cache_file in
+       [\\/]* | ?:[\\/]* ) . $cache_file;;
+@@ -1050,7 +1051,7 @@
+     esac
+   fi
+ else
+-  { echo "$as_me:1053: creating cache $cache_file" >&5
++  { echo "$as_me:1054: creating cache $cache_file" >&5
+ echo "$as_me: creating cache $cache_file" >&6;}
+   >$cache_file
+ fi
+@@ -1066,21 +1067,21 @@
+   eval ac_new_val="\$ac_env_${ac_var}_value"
+   case $ac_old_set,$ac_new_set in
+     set,)
+-      { echo "$as_me:1069: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++      { echo "$as_me:1070: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+ echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,set)
+-      { echo "$as_me:1073: error: \`$ac_var' was not set in the previous run" >&5
++      { echo "$as_me:1074: error: \`$ac_var' was not set in the previous run" >&5
+ echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,);;
+     *)
+       if test "x$ac_old_val" != "x$ac_new_val"; then
+-        { echo "$as_me:1079: error: \`$ac_var' has changed since the previous run:" >&5
++        { echo "$as_me:1080: error: \`$ac_var' has changed since the previous run:" >&5
+ echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+-        { echo "$as_me:1081:   former value:  $ac_old_val" >&5
++        { echo "$as_me:1082:   former value:  $ac_old_val" >&5
+ echo "$as_me:   former value:  $ac_old_val" >&2;}
+-        { echo "$as_me:1083:   current value: $ac_new_val" >&5
++        { echo "$as_me:1084:   current value: $ac_new_val" >&5
+ echo "$as_me:   current value: $ac_new_val" >&2;}
+         ac_cache_corrupted=:
+       fi;;
+@@ -1099,9 +1100,9 @@
+   fi
+ done
+ if $ac_cache_corrupted; then
+-  { echo "$as_me:1102: error: changes in the environment can compromise the build" >&5
++  { echo "$as_me:1103: error: changes in the environment can compromise the build" >&5
+ echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+-  { { echo "$as_me:1104: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++  { { echo "$as_me:1105: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+ echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1122,10 +1123,10 @@
+ echo "#! $SHELL" >conftest.sh
+ echo  "exit 0"   >>conftest.sh
+ chmod +x conftest.sh
+-if { (echo "$as_me:1125: PATH=\".;.\"; conftest.sh") >&5
++if { (echo "$as_me:1126: PATH=\".;.\"; conftest.sh") >&5
+   (PATH=".;."; conftest.sh) 2>&5
+   ac_status=$?
+-  echo "$as_me:1128: \$? = $ac_status" >&5
++  echo "$as_me:1129: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   ac_path_separator=';'
+ else
+@@ -1138,7 +1139,7 @@
+ 
+ top_builddir=`pwd`
+ 
+-echo "$as_me:1141: checking for egrep" >&5
++echo "$as_me:1142: checking for egrep" >&5
+ echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+ if test "${ac_cv_prog_egrep+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1148,11 +1149,11 @@
+ 		else ac_cv_prog_egrep='egrep'
+ 	fi
+ fi
+-echo "$as_me:1151: result: $ac_cv_prog_egrep" >&5
++echo "$as_me:1152: result: $ac_cv_prog_egrep" >&5
+ echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+ 	EGREP=$ac_cv_prog_egrep
+ 
+-	test -z "$EGREP" && { { echo "$as_me:1155: error: No egrep program found" >&5
++	test -z "$EGREP" && { { echo "$as_me:1156: error: No egrep program found" >&5
+ echo "$as_me: error: No egrep program found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -1162,11 +1163,11 @@
+ cf_cv_abi_version=${NCURSES_MAJOR}
+ cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
+ cf_cv_timestamp=`date`
+-echo "$as_me:1165: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
++echo "$as_me:1166: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
+ echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6
+ 
+ if test -f $srcdir/VERSION ; then
+-	echo "$as_me:1169: checking for package version" >&5
++	echo "$as_me:1170: checking for package version" >&5
+ echo $ECHO_N "checking for package version... $ECHO_C" >&6
+ 
+ 	# if there are not enough fields, cut returns the last one...
+@@ -1178,39 +1179,39 @@
+ 	VERSION="$cf_field1"
+ 
+ 	VERSION_MAJOR=`echo "$cf_field2" | sed -e 's/\..*//'`
+-	test -z "$VERSION_MAJOR" && { { echo "$as_me:1181: error: missing major-version" >&5
++	test -z "$VERSION_MAJOR" && { { echo "$as_me:1182: error: missing major-version" >&5
+ echo "$as_me: error: missing major-version" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ 	VERSION_MINOR=`echo "$cf_field2" | sed -e 's/^[^.]*\.//' -e 's/-.*//'`
+-	test -z "$VERSION_MINOR" && { { echo "$as_me:1186: error: missing minor-version" >&5
++	test -z "$VERSION_MINOR" && { { echo "$as_me:1187: error: missing minor-version" >&5
+ echo "$as_me: error: missing minor-version" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-	echo "$as_me:1190: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
++	echo "$as_me:1191: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
+ echo "${ECHO_T}${VERSION_MAJOR}.${VERSION_MINOR}" >&6
+ 
+-	echo "$as_me:1193: checking for package patch date" >&5
++	echo "$as_me:1194: checking for package patch date" >&5
+ echo $ECHO_N "checking for package patch date... $ECHO_C" >&6
+ 	VERSION_PATCH=`echo "$cf_field3" | sed -e 's/^[^-]*-//'`
+ 	case .$VERSION_PATCH in
+ 	(.)
+-		{ { echo "$as_me:1198: error: missing patch-date $VERSION_PATCH" >&5
++		{ { echo "$as_me:1199: error: missing patch-date $VERSION_PATCH" >&5
+ echo "$as_me: error: missing patch-date $VERSION_PATCH" >&2;}
+    { (exit 1); exit 1; }; }
+ 		;;
+ 	(.[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9])
+ 		;;
+ 	(*)
+-		{ { echo "$as_me:1205: error: illegal patch-date $VERSION_PATCH" >&5
++		{ { echo "$as_me:1206: error: illegal patch-date $VERSION_PATCH" >&5
+ echo "$as_me: error: illegal patch-date $VERSION_PATCH" >&2;}
+    { (exit 1); exit 1; }; }
+ 		;;
+ 	esac
+-	echo "$as_me:1210: result: $VERSION_PATCH" >&5
++	echo "$as_me:1211: result: $VERSION_PATCH" >&5
+ echo "${ECHO_T}$VERSION_PATCH" >&6
+ else
+-	{ { echo "$as_me:1213: error: did not find $srcdir/VERSION" >&5
++	{ { echo "$as_me:1214: error: did not find $srcdir/VERSION" >&5
+ echo "$as_me: error: did not find $srcdir/VERSION" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1218,19 +1219,19 @@
+ # show the actual data that we have for versions:
+ test -n "$verbose" && echo "	ABI VERSION $VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:1221: testing ABI VERSION $VERSION ..." 1>&5
++echo "${as_me:-configure}:1222: testing ABI VERSION $VERSION ..." 1>&5
+ 
+ test -n "$verbose" && echo "	VERSION_MAJOR $VERSION_MAJOR" 1>&6
+ 
+-echo "${as_me:-configure}:1225: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
++echo "${as_me:-configure}:1226: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
+ 
+ test -n "$verbose" && echo "	VERSION_MINOR $VERSION_MINOR" 1>&6
+ 
+-echo "${as_me:-configure}:1229: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
++echo "${as_me:-configure}:1230: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
+ 
+ test -n "$verbose" && echo "	VERSION_PATCH $VERSION_PATCH" 1>&6
+ 
+-echo "${as_me:-configure}:1233: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
++echo "${as_me:-configure}:1234: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
+ 
+ 	cf_PACKAGE=NCURSES
+ 	PACKAGE=ncurses
+@@ -1254,7 +1255,7 @@
+ # Check whether --with-rel-version or --without-rel-version was given.
+ if test "${with_rel_version+set}" = set; then
+   withval="$with_rel_version"
+-  { echo "$as_me:1257: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
++  { echo "$as_me:1258: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
+ echo "$as_me: WARNING: overriding release version $cf_cv_rel_version to $withval" >&2;}
+  cf_cv_rel_version=$withval
+ fi;
+@@ -1267,13 +1268,13 @@
+   ([0-9]*)
+  	;;
+   (*)
+-	{ { echo "$as_me:1270: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
++	{ { echo "$as_me:1271: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
+ echo "$as_me: error: Release major-version is not a number: $NCURSES_MAJOR" >&2;}
+    { (exit 1); exit 1; }; }
+  	;;
+   esac
+ else
+-  { { echo "$as_me:1276: error: Release major-version value is empty" >&5
++  { { echo "$as_me:1277: error: Release major-version value is empty" >&5
+ echo "$as_me: error: Release major-version value is empty" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1283,13 +1284,13 @@
+   ([0-9]*)
+  	;;
+   (*)
+-	{ { echo "$as_me:1286: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
++	{ { echo "$as_me:1287: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
+ echo "$as_me: error: Release minor-version is not a number: $NCURSES_MINOR" >&2;}
+    { (exit 1); exit 1; }; }
+  	;;
+   esac
+ else
+-  { { echo "$as_me:1292: error: Release minor-version value is empty" >&5
++  { { echo "$as_me:1293: error: Release minor-version value is empty" >&5
+ echo "$as_me: error: Release minor-version value is empty" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1302,7 +1303,7 @@
+ 
+ 	if test "x$cf_cv_abi_version" != "x$withval"
+ 	then
+-		{ echo "$as_me:1305: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
++		{ echo "$as_me:1306: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
+ echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;}
+ 		case $cf_cv_rel_version in
+ 		(5.*)
+@@ -1321,13 +1322,13 @@
+   ([0-9]*)
+  	;;
+   (*)
+-	{ { echo "$as_me:1324: error: ABI version is not a number: $cf_cv_abi_version" >&5
++	{ { echo "$as_me:1325: error: ABI version is not a number: $cf_cv_abi_version" >&5
+ echo "$as_me: error: ABI version is not a number: $cf_cv_abi_version" >&2;}
+    { (exit 1); exit 1; }; }
+  	;;
+   esac
+ else
+-  { { echo "$as_me:1330: error: ABI version value is empty" >&5
++  { { echo "$as_me:1331: error: ABI version value is empty" >&5
+ echo "$as_me: error: ABI version value is empty" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1358,7 +1359,7 @@
+   fi
+ done
+ if test -z "$ac_aux_dir"; then
+-  { { echo "$as_me:1361: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
++  { { echo "$as_me:1362: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+ echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1368,11 +1369,11 @@
+ 
+ # Make sure we can run config.sub.
+ $ac_config_sub sun4 >/dev/null 2>&1 ||
+-  { { echo "$as_me:1371: error: cannot run $ac_config_sub" >&5
++  { { echo "$as_me:1372: error: cannot run $ac_config_sub" >&5
+ echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:1375: checking build system type" >&5
++echo "$as_me:1376: checking build system type" >&5
+ echo $ECHO_N "checking build system type... $ECHO_C" >&6
+ if test "${ac_cv_build+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1381,23 +1382,23 @@
+ test -z "$ac_cv_build_alias" &&
+   ac_cv_build_alias=`$ac_config_guess`
+ test -z "$ac_cv_build_alias" &&
+-  { { echo "$as_me:1384: error: cannot guess build type; you must specify one" >&5
++  { { echo "$as_me:1385: error: cannot guess build type; you must specify one" >&5
+ echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+    { (exit 1); exit 1; }; }
+ ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
+-  { { echo "$as_me:1388: error: $ac_config_sub $ac_cv_build_alias failed." >&5
++  { { echo "$as_me:1389: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:1393: result: $ac_cv_build" >&5
++echo "$as_me:1394: result: $ac_cv_build" >&5
+ echo "${ECHO_T}$ac_cv_build" >&6
+ build=$ac_cv_build
+ build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+ build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+ build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ 
+-echo "$as_me:1400: checking host system type" >&5
++echo "$as_me:1401: checking host system type" >&5
+ echo $ECHO_N "checking host system type... $ECHO_C" >&6
+ if test "${ac_cv_host+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1406,12 +1407,12 @@
+ test -z "$ac_cv_host_alias" &&
+   ac_cv_host_alias=$ac_cv_build_alias
+ ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
+-  { { echo "$as_me:1409: error: $ac_config_sub $ac_cv_host_alias failed" >&5
++  { { echo "$as_me:1410: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:1414: result: $ac_cv_host" >&5
++echo "$as_me:1415: result: $ac_cv_host" >&5
+ echo "${ECHO_T}$ac_cv_host" >&6
+ host=$ac_cv_host
+ host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+@@ -1419,7 +1420,7 @@
+ host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ 
+ if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
+-	echo "$as_me:1422: checking target system type" >&5
++	echo "$as_me:1423: checking target system type" >&5
+ echo $ECHO_N "checking target system type... $ECHO_C" >&6
+ if test "${ac_cv_target+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1428,12 +1429,12 @@
+ test "x$ac_cv_target_alias" = "x" &&
+   ac_cv_target_alias=$ac_cv_host_alias
+ ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
+-  { { echo "$as_me:1431: error: $ac_config_sub $ac_cv_target_alias failed" >&5
++  { { echo "$as_me:1432: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:1436: result: $ac_cv_target" >&5
++echo "$as_me:1437: result: $ac_cv_target" >&5
+ echo "${ECHO_T}$ac_cv_target" >&6
+ target=$ac_cv_target
+ target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+@@ -1465,13 +1466,13 @@
+ fi
+ 
+ test -z "$system_name" && system_name="$cf_cv_system_name"
+-test -n "$cf_cv_system_name" && echo "$as_me:1468: result: Configuring for $cf_cv_system_name" >&5
++test -n "$cf_cv_system_name" && echo "$as_me:1469: result: Configuring for $cf_cv_system_name" >&5
+ echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
+ 
+ if test ".$system_name" != ".$cf_cv_system_name" ; then
+-	echo "$as_me:1472: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
++	echo "$as_me:1473: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+ echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
+-	{ { echo "$as_me:1474: error: \"Please remove config.cache and try again.\"" >&5
++	{ { echo "$as_me:1475: error: \"Please remove config.cache and try again.\"" >&5
+ echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1479,7 +1480,7 @@
+ # Check whether --with-system-type or --without-system-type was given.
+ if test "${with_system_type+set}" = set; then
+   withval="$with_system_type"
+-  { echo "$as_me:1482: WARNING: overriding system type to $withval" >&5
++  { echo "$as_me:1483: WARNING: overriding system type to $withval" >&5
+ echo "$as_me: WARNING: overriding system type to $withval" >&2;}
+ 	cf_cv_system_name=$withval
+ 	host_os=$withval
+@@ -1491,7 +1492,7 @@
+ 
+ ###	Default install-location
+ 
+-echo "$as_me:1494: checking for prefix" >&5
++echo "$as_me:1495: checking for prefix" >&5
+ echo $ECHO_N "checking for prefix... $ECHO_C" >&6
+ if test "x$prefix" = "xNONE" ; then
+ 	case "$cf_cv_system_name" in
+@@ -1503,11 +1504,11 @@
+ 		;;
+ 	esac
+ fi
+-echo "$as_me:1506: result: $prefix" >&5
++echo "$as_me:1507: result: $prefix" >&5
+ echo "${ECHO_T}$prefix" >&6
+ 
+ if test "x$prefix" = "xNONE" ; then
+-echo "$as_me:1510: checking for default include-directory" >&5
++echo "$as_me:1511: checking for default include-directory" >&5
+ echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6
+ test -n "$verbose" && echo 1>&6
+ for cf_symbol in \
+@@ -1530,7 +1531,7 @@
+ 	fi
+ 	test -n "$verbose"  && echo "	tested $cf_dir" 1>&6
+ done
+-echo "$as_me:1533: result: $includedir" >&5
++echo "$as_me:1534: result: $includedir" >&5
+ echo "${ECHO_T}$includedir" >&6
+ fi
+ 
+@@ -1592,7 +1593,7 @@
+   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:1595: checking for $ac_word" >&5
++echo "$as_me:1596: 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
+@@ -1607,7 +1608,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+-echo "$as_me:1610: found $ac_dir/$ac_word" >&5
++echo "$as_me:1611: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1615,10 +1616,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1618: result: $CC" >&5
++  echo "$as_me:1619: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1621: result: no" >&5
++  echo "$as_me:1622: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1631,7 +1632,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:1634: checking for $ac_word" >&5
++echo "$as_me:1635: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1646,7 +1647,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_CC="$ac_prog"
+-echo "$as_me:1649: found $ac_dir/$ac_word" >&5
++echo "$as_me:1650: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1654,10 +1655,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:1657: result: $ac_ct_CC" >&5
++  echo "$as_me:1658: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:1660: result: no" >&5
++  echo "$as_me:1661: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1667,32 +1668,32 @@
+   CC=$ac_ct_CC
+ fi
+ 
+-test -z "$CC" && { { echo "$as_me:1670: error: no acceptable cc found in \$PATH" >&5
++test -z "$CC" && { { echo "$as_me:1671: error: no acceptable cc found in \$PATH" >&5
+ echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ # Provide some information about the compiler.
+-echo "$as_me:1675:" \
++echo "$as_me:1676:" \
+      "checking for C compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:1678: \"$ac_compiler --version &5\"") >&5
++{ (eval echo "$as_me:1679: \"$ac_compiler --version &5\"") >&5
+   (eval $ac_compiler --version &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1681: \$? = $ac_status" >&5
++  echo "$as_me:1682: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:1683: \"$ac_compiler -v &5\"") >&5
++{ (eval echo "$as_me:1684: \"$ac_compiler -v &5\"") >&5
+   (eval $ac_compiler -v &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1686: \$? = $ac_status" >&5
++  echo "$as_me:1687: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:1688: \"$ac_compiler -V &5\"") >&5
++{ (eval echo "$as_me:1689: \"$ac_compiler -V &5\"") >&5
+   (eval $ac_compiler -V &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1691: \$? = $ac_status" >&5
++  echo "$as_me:1692: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 1695 "configure"
++#line 1696 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1708,13 +1709,13 @@
+ # Try to create an executable without -o first, disregard a.out.
+ # It will help us diagnose broken compilers, and finding out an intuition
+ # of exeext.
+-echo "$as_me:1711: checking for C compiler default output" >&5
++echo "$as_me:1712: checking for C compiler default output" >&5
+ echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
+ ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+-if { (eval echo "$as_me:1714: \"$ac_link_default\"") >&5
++if { (eval echo "$as_me:1715: \"$ac_link_default\"") >&5
+   (eval $ac_link_default) 2>&5
+   ac_status=$?
+-  echo "$as_me:1717: \$? = $ac_status" >&5
++  echo "$as_me:1718: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   # Find the output, starting from the most likely.  This scheme is
+ # not robust to junk in `.', hence go to wildcards (a.*) only as a last
+@@ -1737,34 +1738,34 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-{ { echo "$as_me:1740: error: C compiler cannot create executables" >&5
++{ { echo "$as_me:1741: error: C compiler cannot create executables" >&5
+ echo "$as_me: error: C compiler cannot create executables" >&2;}
+    { (exit 77); exit 77; }; }
+ fi
+ 
+ ac_exeext=$ac_cv_exeext
+-echo "$as_me:1746: result: $ac_file" >&5
++echo "$as_me:1747: result: $ac_file" >&5
+ echo "${ECHO_T}$ac_file" >&6
+ 
+ # Check the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
+-echo "$as_me:1751: checking whether the C compiler works" >&5
++echo "$as_me:1752: checking whether the C compiler works" >&5
+ echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+ # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+ # If not cross compiling, check that we can run a simple program.
+ if test "$cross_compiling" != yes; then
+   if { ac_try='./$ac_file'
+-  { (eval echo "$as_me:1757: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1758: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1760: \$? = $ac_status" >&5
++  echo "$as_me:1761: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+     cross_compiling=no
+   else
+     if test "$cross_compiling" = maybe; then
+ 	cross_compiling=yes
+     else
+-	{ { echo "$as_me:1767: error: cannot run C compiled programs.
++	{ { echo "$as_me:1768: error: cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'." >&5
+ echo "$as_me: error: cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'." >&2;}
+@@ -1772,24 +1773,24 @@
+     fi
+   fi
+ fi
+-echo "$as_me:1775: result: yes" >&5
++echo "$as_me:1776: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+ rm -f a.out a.exe conftest$ac_cv_exeext
+ ac_clean_files=$ac_clean_files_save
+ # Check the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
+-echo "$as_me:1782: checking whether we are cross compiling" >&5
++echo "$as_me:1783: checking whether we are cross compiling" >&5
+ echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:1784: result: $cross_compiling" >&5
++echo "$as_me:1785: result: $cross_compiling" >&5
+ echo "${ECHO_T}$cross_compiling" >&6
+ 
+-echo "$as_me:1787: checking for executable suffix" >&5
++echo "$as_me:1788: checking for executable suffix" >&5
+ echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+-if { (eval echo "$as_me:1789: \"$ac_link\"") >&5
++if { (eval echo "$as_me:1790: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:1792: \$? = $ac_status" >&5
++  echo "$as_me:1793: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   # If both `conftest.exe' and `conftest' are `present' (well, observable)
+ # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+@@ -1805,25 +1806,25 @@
+   esac
+ done
+ else
+-  { { echo "$as_me:1808: error: cannot compute EXEEXT: cannot compile and link" >&5
++  { { echo "$as_me:1809: error: cannot compute EXEEXT: cannot compile and link" >&5
+ echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ rm -f conftest$ac_cv_exeext
+-echo "$as_me:1814: result: $ac_cv_exeext" >&5
++echo "$as_me:1815: result: $ac_cv_exeext" >&5
+ echo "${ECHO_T}$ac_cv_exeext" >&6
+ 
+ rm -f conftest.$ac_ext
+ EXEEXT=$ac_cv_exeext
+ ac_exeext=$EXEEXT
+-echo "$as_me:1820: checking for object suffix" >&5
++echo "$as_me:1821: checking for object suffix" >&5
+ echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
+ if test "${ac_cv_objext+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 1826 "configure"
++#line 1827 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1835,10 +1836,10 @@
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (eval echo "$as_me:1838: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1839: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1841: \$? = $ac_status" >&5
++  echo "$as_me:1842: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+   case $ac_file in
+@@ -1850,24 +1851,24 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-{ { echo "$as_me:1853: error: cannot compute OBJEXT: cannot compile" >&5
++{ { echo "$as_me:1854: error: cannot compute OBJEXT: cannot compile" >&5
+ echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+-echo "$as_me:1860: result: $ac_cv_objext" >&5
++echo "$as_me:1861: result: $ac_cv_objext" >&5
+ echo "${ECHO_T}$ac_cv_objext" >&6
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-echo "$as_me:1864: checking whether we are using the GNU C compiler" >&5
++echo "$as_me:1865: checking whether we are using the GNU C compiler" >&5
+ echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+ if test "${ac_cv_c_compiler_gnu+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 1870 "configure"
++#line 1871 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1882,16 +1883,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1885: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1886: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1888: \$? = $ac_status" >&5
++  echo "$as_me:1889: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1891: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1892: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1894: \$? = $ac_status" >&5
++  echo "$as_me:1895: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_compiler_gnu=yes
+ else
+@@ -1903,19 +1904,19 @@
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:1906: result: $ac_cv_c_compiler_gnu" >&5
++echo "$as_me:1907: result: $ac_cv_c_compiler_gnu" >&5
+ echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+ GCC=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+ CFLAGS="-g"
+-echo "$as_me:1912: checking whether $CC accepts -g" >&5
++echo "$as_me:1913: checking whether $CC accepts -g" >&5
+ echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+ if test "${ac_cv_prog_cc_g+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 1918 "configure"
++#line 1919 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1927,16 +1928,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1930: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1931: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1933: \$? = $ac_status" >&5
++  echo "$as_me:1934: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1936: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1937: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1939: \$? = $ac_status" >&5
++  echo "$as_me:1940: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_prog_cc_g=yes
+ else
+@@ -1946,7 +1947,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:1949: result: $ac_cv_prog_cc_g" >&5
++echo "$as_me:1950: result: $ac_cv_prog_cc_g" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+ if test "$ac_test_CFLAGS" = set; then
+   CFLAGS=$ac_save_CFLAGS
+@@ -1973,16 +1974,16 @@
+ #endif
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1976: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1977: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1979: \$? = $ac_status" >&5
++  echo "$as_me:1980: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1982: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1983: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1985: \$? = $ac_status" >&5
++  echo "$as_me:1986: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   for ac_declaration in \
+    ''\
+@@ -1994,7 +1995,7 @@
+    'void exit (int);'
+ do
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 1997 "configure"
++#line 1998 "configure"
+ #include "confdefs.h"
+ #include 
+ $ac_declaration
+@@ -2007,16 +2008,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2010: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2011: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2013: \$? = $ac_status" >&5
++  echo "$as_me:2014: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2016: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2017: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2019: \$? = $ac_status" >&5
++  echo "$as_me:2020: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -2026,7 +2027,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2029 "configure"
++#line 2030 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -2038,16 +2039,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2041: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2042: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2044: \$? = $ac_status" >&5
++  echo "$as_me:2045: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2047: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2048: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2050: \$? = $ac_status" >&5
++  echo "$as_me:2051: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -2077,15 +2078,15 @@
+ 
+ GCC_VERSION=none
+ if test "$GCC" = yes ; then
+-	echo "$as_me:2080: checking version of $CC" >&5
++	echo "$as_me:2081: checking version of $CC" >&5
+ echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
+ 	GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+ 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
+-	echo "$as_me:2084: result: $GCC_VERSION" >&5
++	echo "$as_me:2085: result: $GCC_VERSION" >&5
+ echo "${ECHO_T}$GCC_VERSION" >&6
+ fi
+ 
+-echo "$as_me:2088: checking for $CC option to accept ANSI C" >&5
++echo "$as_me:2089: checking for $CC option to accept ANSI C" >&5
+ echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+ if test "${ac_cv_prog_cc_stdc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2093,7 +2094,7 @@
+   ac_cv_prog_cc_stdc=no
+ ac_save_CC=$CC
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 2096 "configure"
++#line 2097 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -2142,16 +2143,16 @@
+ do
+   CC="$ac_save_CC $ac_arg"
+   rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2145: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2146: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2148: \$? = $ac_status" >&5
++  echo "$as_me:2149: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2151: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2152: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2154: \$? = $ac_status" >&5
++  echo "$as_me:2155: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_prog_cc_stdc=$ac_arg
+ break
+@@ -2168,10 +2169,10 @@
+ 
+ case "x$ac_cv_prog_cc_stdc" in
+   x|xno)
+-    echo "$as_me:2171: result: none needed" >&5
++    echo "$as_me:2172: result: none needed" >&5
+ echo "${ECHO_T}none needed" >&6 ;;
+   *)
+-    echo "$as_me:2174: result: $ac_cv_prog_cc_stdc" >&5
++    echo "$as_me:2175: result: $ac_cv_prog_cc_stdc" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+     CC="$CC $ac_cv_prog_cc_stdc" ;;
+ esac
+@@ -2179,13 +2180,13 @@
+ # This should have been defined by AC_PROG_CC
+ : ${CC:=cc}
+ 
+-echo "$as_me:2182: checking \$CC variable" >&5
++echo "$as_me:2183: checking \$CC variable" >&5
+ echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
+ case "$CC" in
+ (*[\ \	]-*)
+-	echo "$as_me:2186: result: broken" >&5
++	echo "$as_me:2187: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+-	{ echo "$as_me:2188: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
++	{ echo "$as_me:2189: 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_flags=`echo "$CC" | sed -e 's/^.*[ 	]\(-[^ 	]\)/\1/'`
+@@ -2281,19 +2282,19 @@
+ 	done
+ 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
+ 
+-echo "${as_me:-configure}:2284: testing resulting CC: '$CC' ..." 1>&5
++echo "${as_me:-configure}:2285: testing resulting CC: '$CC' ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
+ 
+-echo "${as_me:-configure}:2288: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
++echo "${as_me:-configure}:2289: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
+ 
+-echo "${as_me:-configure}:2292: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
++echo "${as_me:-configure}:2293: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+ 
+ 	;;
+ (*)
+-	echo "$as_me:2296: result: ok" >&5
++	echo "$as_me:2297: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ 	;;
+ esac
+@@ -2304,7 +2305,7 @@
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return=return
+-echo "$as_me:2307: checking how to run the C preprocessor" >&5
++echo "$as_me:2308: checking how to run the C preprocessor" >&5
+ echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+@@ -2325,18 +2326,18 @@
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2328 "configure"
++#line 2329 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2333: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:2334: \"$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:2339: \$? = $ac_status" >&5
++  echo "$as_me:2340: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2359,17 +2360,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2362 "configure"
++#line 2363 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:2366: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:2367: \"$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:2372: \$? = $ac_status" >&5
++  echo "$as_me:2373: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2406,7 +2407,7 @@
+ else
+   ac_cv_prog_CPP=$CPP
+ fi
+-echo "$as_me:2409: result: $CPP" >&5
++echo "$as_me:2410: result: $CPP" >&5
+ echo "${ECHO_T}$CPP" >&6
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+@@ -2416,18 +2417,18 @@
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2419 "configure"
++#line 2420 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2424: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:2425: \"$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:2430: \$? = $ac_status" >&5
++  echo "$as_me:2431: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2450,17 +2451,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2453 "configure"
++#line 2454 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:2457: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:2458: \"$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:2463: \$? = $ac_status" >&5
++  echo "$as_me:2464: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2488,7 +2489,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:2491: error: C preprocessor \"$CPP\" fails sanity check" >&5
++  { { echo "$as_me:2492: error: C preprocessor \"$CPP\" fails sanity check" >&5
+ echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -2501,14 +2502,14 @@
+ ac_main_return=return
+ 
+ if test $ac_cv_c_compiler_gnu = yes; then
+-    echo "$as_me:2504: checking whether $CC needs -traditional" >&5
++    echo "$as_me:2505: checking whether $CC needs -traditional" >&5
+ echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
+ if test "${ac_cv_prog_gcc_traditional+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+     ac_pattern="Autoconf.*'x'"
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2511 "configure"
++#line 2512 "configure"
+ #include "confdefs.h"
+ #include 
+ int Autoconf = TIOCGETP;
+@@ -2523,7 +2524,7 @@
+ 
+   if test $ac_cv_prog_gcc_traditional = no; then
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 2526 "configure"
++#line 2527 "configure"
+ #include "confdefs.h"
+ #include 
+ int Autoconf = TCGETA;
+@@ -2536,14 +2537,14 @@
+ 
+   fi
+ fi
+-echo "$as_me:2539: result: $ac_cv_prog_gcc_traditional" >&5
++echo "$as_me:2540: result: $ac_cv_prog_gcc_traditional" >&5
+ echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
+   if test $ac_cv_prog_gcc_traditional = yes; then
+     CC="$CC -traditional"
+   fi
+ fi
+ 
+-echo "$as_me:2546: checking whether $CC understands -c and -o together" >&5
++echo "$as_me:2547: checking whether $CC understands -c and -o together" >&5
+ echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6
+ if test "${cf_cv_prog_CC_c_o+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2558,15 +2559,15 @@
+ # We do the test twice because some compilers refuse to overwrite an
+ # existing .o file with -o, though they will create one.
+ ac_try='$CC $CFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+-if { (eval echo "$as_me:2561: \"$ac_try\"") >&5
++if { (eval echo "$as_me:2562: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2564: \$? = $ac_status" >&5
++  echo "$as_me:2565: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:2566: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:2567: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2569: \$? = $ac_status" >&5
++  echo "$as_me:2570: \$? = $ac_status" >&5
+   (exit $ac_status); };
+ then
+   eval cf_cv_prog_CC_c_o=yes
+@@ -2577,10 +2578,10 @@
+ 
+ fi
+ if test $cf_cv_prog_CC_c_o = yes; then
+-  echo "$as_me:2580: result: yes" >&5
++  echo "$as_me:2581: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:2583: result: no" >&5
++  echo "$as_me:2584: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2594,7 +2595,7 @@
+ 	(*) LDPATH=$PATH:/sbin:/usr/sbin
+ 		# Extract the first word of "ldconfig", so it can be a program name with args.
+ set dummy ldconfig; ac_word=$2
+-echo "$as_me:2597: checking for $ac_word" >&5
++echo "$as_me:2598: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_LDCONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2611,7 +2612,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_LDCONFIG="$ac_dir/$ac_word"
+-   echo "$as_me:2614: found $ac_dir/$ac_word" >&5
++   echo "$as_me:2615: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -2622,10 +2623,10 @@
+ LDCONFIG=$ac_cv_path_LDCONFIG
+ 
+ if test -n "$LDCONFIG"; then
+-  echo "$as_me:2625: result: $LDCONFIG" >&5
++  echo "$as_me:2626: result: $LDCONFIG" >&5
+ echo "${ECHO_T}$LDCONFIG" >&6
+ else
+-  echo "$as_me:2628: result: no" >&5
++  echo "$as_me:2629: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2633,7 +2634,7 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:2636: checking if you want to ensure bool is consistent with C++" >&5
++echo "$as_me:2637: checking if you want to ensure bool is consistent with C++" >&5
+ echo $ECHO_N "checking if you want to ensure bool is consistent with C++... $ECHO_C" >&6
+ 
+ # Check whether --with-cxx or --without-cxx was given.
+@@ -2643,7 +2644,7 @@
+ else
+   cf_with_cxx=yes
+ fi;
+-echo "$as_me:2646: result: $cf_with_cxx" >&5
++echo "$as_me:2647: result: $cf_with_cxx" >&5
+ echo "${ECHO_T}$cf_with_cxx" >&6
+ if test "X$cf_with_cxx" = Xno ; then
+ 	CXX=""
+@@ -2661,7 +2662,7 @@
+   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:2664: checking for $ac_word" >&5
++echo "$as_me:2665: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CXX+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2676,7 +2677,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+-echo "$as_me:2679: found $ac_dir/$ac_word" >&5
++echo "$as_me:2680: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2684,10 +2685,10 @@
+ fi
+ CXX=$ac_cv_prog_CXX
+ if test -n "$CXX"; then
+-  echo "$as_me:2687: result: $CXX" >&5
++  echo "$as_me:2688: result: $CXX" >&5
+ echo "${ECHO_T}$CXX" >&6
+ else
+-  echo "$as_me:2690: result: no" >&5
++  echo "$as_me:2691: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2700,7 +2701,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:2703: checking for $ac_word" >&5
++echo "$as_me:2704: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2715,7 +2716,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_CXX="$ac_prog"
+-echo "$as_me:2718: found $ac_dir/$ac_word" >&5
++echo "$as_me:2719: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2723,10 +2724,10 @@
+ fi
+ ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+ if test -n "$ac_ct_CXX"; then
+-  echo "$as_me:2726: result: $ac_ct_CXX" >&5
++  echo "$as_me:2727: result: $ac_ct_CXX" >&5
+ echo "${ECHO_T}$ac_ct_CXX" >&6
+ else
+-  echo "$as_me:2729: result: no" >&5
++  echo "$as_me:2730: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2738,32 +2739,32 @@
+ fi
+ 
+ # Provide some information about the compiler.
+-echo "$as_me:2741:" \
++echo "$as_me:2742:" \
+      "checking for C++ compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:2744: \"$ac_compiler --version &5\"") >&5
++{ (eval echo "$as_me:2745: \"$ac_compiler --version &5\"") >&5
+   (eval $ac_compiler --version &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:2747: \$? = $ac_status" >&5
++  echo "$as_me:2748: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:2749: \"$ac_compiler -v &5\"") >&5
++{ (eval echo "$as_me:2750: \"$ac_compiler -v &5\"") >&5
+   (eval $ac_compiler -v &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:2752: \$? = $ac_status" >&5
++  echo "$as_me:2753: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:2754: \"$ac_compiler -V &5\"") >&5
++{ (eval echo "$as_me:2755: \"$ac_compiler -V &5\"") >&5
+   (eval $ac_compiler -V &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:2757: \$? = $ac_status" >&5
++  echo "$as_me:2758: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ 
+-echo "$as_me:2760: checking whether we are using the GNU C++ compiler" >&5
++echo "$as_me:2761: checking whether we are using the GNU C++ compiler" >&5
+ echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
+ if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2766 "configure"
++#line 2767 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2778,16 +2779,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2781: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2782: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2784: \$? = $ac_status" >&5
++  echo "$as_me:2785: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2787: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2788: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2790: \$? = $ac_status" >&5
++  echo "$as_me:2791: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_compiler_gnu=yes
+ else
+@@ -2799,19 +2800,19 @@
+ ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:2802: result: $ac_cv_cxx_compiler_gnu" >&5
++echo "$as_me:2803: result: $ac_cv_cxx_compiler_gnu" >&5
+ echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
+ GXX=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CXXFLAGS=${CXXFLAGS+set}
+ ac_save_CXXFLAGS=$CXXFLAGS
+ CXXFLAGS="-g"
+-echo "$as_me:2808: checking whether $CXX accepts -g" >&5
++echo "$as_me:2809: checking whether $CXX accepts -g" >&5
+ echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
+ if test "${ac_cv_prog_cxx_g+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2814 "configure"
++#line 2815 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2823,16 +2824,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2826: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2827: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2829: \$? = $ac_status" >&5
++  echo "$as_me:2830: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2832: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2833: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2835: \$? = $ac_status" >&5
++  echo "$as_me:2836: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_prog_cxx_g=yes
+ else
+@@ -2842,7 +2843,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:2845: result: $ac_cv_prog_cxx_g" >&5
++echo "$as_me:2846: result: $ac_cv_prog_cxx_g" >&5
+ echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
+ if test "$ac_test_CXXFLAGS" = set; then
+   CXXFLAGS=$ac_save_CXXFLAGS
+@@ -2869,7 +2870,7 @@
+    'void exit (int);'
+ do
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2872 "configure"
++#line 2873 "configure"
+ #include "confdefs.h"
+ #include 
+ $ac_declaration
+@@ -2882,16 +2883,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2885: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2886: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2888: \$? = $ac_status" >&5
++  echo "$as_me:2889: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2891: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2892: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2894: \$? = $ac_status" >&5
++  echo "$as_me:2895: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -2901,7 +2902,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2904 "configure"
++#line 2905 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -2913,16 +2914,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2916: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2917: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2919: \$? = $ac_status" >&5
++  echo "$as_me:2920: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2922: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2923: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2925: \$? = $ac_status" >&5
++  echo "$as_me:2926: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -2956,7 +2957,7 @@
+ 	then
+ 		# Several of the C++ configurations do not work, particularly when
+ 		# cross-compiling (20140913 -TD)
+-		echo "$as_me:2959: checking if $CXX works" >&5
++		echo "$as_me:2960: checking if $CXX works" >&5
+ echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
+ 
+ 		save_CPPFLAGS="$CPPFLAGS"
+@@ -2964,7 +2965,7 @@
+ 		CPPFLAGS="$CPPFLAGS -I${cf_includedir}"
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 2967 "configure"
++#line 2968 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -2981,16 +2982,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2984: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2985: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2987: \$? = $ac_status" >&5
++  echo "$as_me:2988: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2990: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2991: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2993: \$? = $ac_status" >&5
++  echo "$as_me:2994: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cxx_works=yes
+ else
+@@ -3001,11 +3002,11 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 		CPPFLAGS="$save_CPPFLAGS"
+ 
+-		echo "$as_me:3004: result: $cf_cxx_works" >&5
++		echo "$as_me:3005: result: $cf_cxx_works" >&5
+ echo "${ECHO_T}$cf_cxx_works" >&6
+ 		if test "x$cf_cxx_works" = xno
+ 		then
+-			{ echo "$as_me:3008: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5
++			{ echo "$as_me:3009: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5
+ echo "$as_me: WARNING: Ignore $CXX, since it cannot compile hello-world." >&2;}
+ 			cf_with_cxx=no; CXX=""; GXX="";
+ 		fi
+@@ -3021,7 +3022,7 @@
+ 	if test "$CXX" = "g++" ; then
+ 		# Extract the first word of "g++", so it can be a program name with args.
+ set dummy g++; ac_word=$2
+-echo "$as_me:3024: checking for $ac_word" >&5
++echo "$as_me:3025: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_CXX+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3038,7 +3039,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_CXX="$ac_dir/$ac_word"
+-   echo "$as_me:3041: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3042: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -3049,17 +3050,17 @@
+ CXX=$ac_cv_path_CXX
+ 
+ if test -n "$CXX"; then
+-  echo "$as_me:3052: result: $CXX" >&5
++  echo "$as_me:3053: result: $CXX" >&5
+ echo "${ECHO_T}$CXX" >&6
+ else
+-  echo "$as_me:3055: result: no" >&5
++  echo "$as_me:3056: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ 	fi
+ 	case "x$CXX" in
+ 	(x|xg++)
+-		{ echo "$as_me:3062: WARNING: You don't have any C++ compiler, too bad" >&5
++		{ echo "$as_me:3063: WARNING: You don't have any C++ compiler, too bad" >&5
+ echo "$as_me: WARNING: You don't have any C++ compiler, too bad" >&2;}
+ 		cf_with_cxx=no; CXX=""; GXX="";
+ 		;;
+@@ -3068,11 +3069,11 @@
+ 
+ GXX_VERSION=none
+ if test "$GXX" = yes; then
+-	echo "$as_me:3071: checking version of ${CXX:-g++}" >&5
++	echo "$as_me:3072: checking version of ${CXX:-g++}" >&5
+ echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6
+ 	GXX_VERSION="`${CXX:-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+ 	test -z "$GXX_VERSION" && GXX_VERSION=unknown
+-	echo "$as_me:3075: result: $GXX_VERSION" >&5
++	echo "$as_me:3076: result: $GXX_VERSION" >&5
+ echo "${ECHO_T}$GXX_VERSION" >&6
+ fi
+ 
+@@ -3080,12 +3081,12 @@
+ (1*|2.[0-6]*)
+ 	# GXX=""; CXX=""; ac_cv_prog_gxx=no
+ 	# cf_cxx_library=no
+-	{ echo "$as_me:3083: WARNING: templates do not work" >&5
++	{ echo "$as_me:3084: WARNING: templates do not work" >&5
+ echo "$as_me: WARNING: templates do not work" >&2;}
+ 	;;
+ esac
+ 
+-echo "$as_me:3088: checking if you want to build C++ binding and demo" >&5
++echo "$as_me:3089: checking if you want to build C++ binding and demo" >&5
+ echo $ECHO_N "checking if you want to build C++ binding and demo... $ECHO_C" >&6
+ 
+ # Check whether --with-cxx-binding or --without-cxx-binding was given.
+@@ -3095,15 +3096,15 @@
+ else
+   cf_with_cxx_binding=$cf_with_cxx
+ fi;
+-echo "$as_me:3098: result: $cf_with_cxx_binding" >&5
++echo "$as_me:3099: result: $cf_with_cxx_binding" >&5
+ echo "${ECHO_T}$cf_with_cxx_binding" >&6
+ 
+-echo "$as_me:3101: checking if you want to build with Ada95" >&5
++echo "$as_me:3102: checking if you want to build with Ada95" >&5
+ echo $ECHO_N "checking if you want to build with Ada95... $ECHO_C" >&6
+-echo "$as_me:3103: result: $cf_with_ada" >&5
++echo "$as_me:3104: result: $cf_with_ada" >&5
+ echo "${ECHO_T}$cf_with_ada" >&6
+ 
+-echo "$as_me:3106: checking if you want to install terminal database" >&5
++echo "$as_me:3107: checking if you want to install terminal database" >&5
+ echo $ECHO_N "checking if you want to install terminal database... $ECHO_C" >&6
+ 
+ # Check whether --enable-db-install or --disable-db-install was given.
+@@ -3113,10 +3114,10 @@
+ else
+   cf_with_db_install=yes
+ fi;
+-echo "$as_me:3116: result: $cf_with_db_install" >&5
++echo "$as_me:3117: result: $cf_with_db_install" >&5
+ echo "${ECHO_T}$cf_with_db_install" >&6
+ 
+-echo "$as_me:3119: checking if you want to install manpages" >&5
++echo "$as_me:3120: checking if you want to install manpages" >&5
+ echo $ECHO_N "checking if you want to install manpages... $ECHO_C" >&6
+ 
+ # Check whether --with-manpages or --without-manpages was given.
+@@ -3126,10 +3127,10 @@
+ else
+   cf_with_manpages=yes
+ fi;
+-echo "$as_me:3129: result: $cf_with_manpages" >&5
++echo "$as_me:3130: result: $cf_with_manpages" >&5
+ echo "${ECHO_T}$cf_with_manpages" >&6
+ 
+-echo "$as_me:3132: checking if you want to build programs such as tic" >&5
++echo "$as_me:3133: checking if you want to build programs such as tic" >&5
+ echo $ECHO_N "checking if you want to build programs such as tic... $ECHO_C" >&6
+ 
+ # Check whether --with-progs or --without-progs was given.
+@@ -3139,10 +3140,10 @@
+ else
+   cf_with_progs=yes
+ fi;
+-echo "$as_me:3142: result: $cf_with_progs" >&5
++echo "$as_me:3143: result: $cf_with_progs" >&5
+ echo "${ECHO_T}$cf_with_progs" >&6
+ 
+-echo "$as_me:3145: checking if you want to build test-programs" >&5
++echo "$as_me:3146: checking if you want to build test-programs" >&5
+ echo $ECHO_N "checking if you want to build test-programs... $ECHO_C" >&6
+ 
+ # Check whether --with-tests or --without-tests was given.
+@@ -3152,10 +3153,10 @@
+ else
+   cf_with_tests=yes
+ fi;
+-echo "$as_me:3155: result: $cf_with_tests" >&5
++echo "$as_me:3156: result: $cf_with_tests" >&5
+ echo "${ECHO_T}$cf_with_tests" >&6
+ 
+-echo "$as_me:3158: checking if you wish to install curses.h" >&5
++echo "$as_me:3159: checking if you wish to install curses.h" >&5
+ echo $ECHO_N "checking if you wish to install curses.h... $ECHO_C" >&6
+ 
+ # Check whether --with-curses-h or --without-curses-h was given.
+@@ -3165,7 +3166,7 @@
+ else
+   with_curses_h=yes
+ fi;
+-echo "$as_me:3168: result: $with_curses_h" >&5
++echo "$as_me:3169: result: $with_curses_h" >&5
+ echo "${ECHO_T}$with_curses_h" >&6
+ 
+ modules_to_build="ncurses"
+@@ -3191,7 +3192,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:3194: checking for $ac_word" >&5
++echo "$as_me:3195: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_AWK+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3206,7 +3207,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_AWK="$ac_prog"
+-echo "$as_me:3209: found $ac_dir/$ac_word" >&5
++echo "$as_me:3210: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3214,21 +3215,21 @@
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+-  echo "$as_me:3217: result: $AWK" >&5
++  echo "$as_me:3218: result: $AWK" >&5
+ echo "${ECHO_T}$AWK" >&6
+ else
+-  echo "$as_me:3220: result: no" >&5
++  echo "$as_me:3221: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+   test -n "$AWK" && break
+ done
+ 
+-test -z "$AWK" && { { echo "$as_me:3227: error: No awk program found" >&5
++test -z "$AWK" && { { echo "$as_me:3228: error: No awk program found" >&5
+ echo "$as_me: error: No awk program found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:3231: checking for egrep" >&5
++echo "$as_me:3232: checking for egrep" >&5
+ echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+ if test "${ac_cv_prog_egrep+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3238,11 +3239,11 @@
+ 		else ac_cv_prog_egrep='egrep'
+ 	fi
+ fi
+-echo "$as_me:3241: result: $ac_cv_prog_egrep" >&5
++echo "$as_me:3242: result: $ac_cv_prog_egrep" >&5
+ echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+ 	EGREP=$ac_cv_prog_egrep
+ 
+-	test -z "$EGREP" && { { echo "$as_me:3245: error: No egrep program found" >&5
++	test -z "$EGREP" && { { echo "$as_me:3246: error: No egrep program found" >&5
+ echo "$as_me: error: No egrep program found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -3258,7 +3259,7 @@
+ # 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:3261: checking for a BSD compatible install" >&5
++echo "$as_me:3262: 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
+@@ -3307,7 +3308,7 @@
+     INSTALL=$ac_install_sh
+   fi
+ fi
+-echo "$as_me:3310: result: $INSTALL" >&5
++echo "$as_me:3311: result: $INSTALL" >&5
+ echo "${ECHO_T}$INSTALL" >&6
+ 
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -3332,7 +3333,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:3335: checking for $ac_word" >&5
++echo "$as_me:3336: 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
+@@ -3347,7 +3348,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LINT="$ac_prog"
+-echo "$as_me:3350: found $ac_dir/$ac_word" >&5
++echo "$as_me:3351: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3355,28 +3356,28 @@
+ fi
+ LINT=$ac_cv_prog_LINT
+ if test -n "$LINT"; then
+-  echo "$as_me:3358: result: $LINT" >&5
++  echo "$as_me:3359: result: $LINT" >&5
+ echo "${ECHO_T}$LINT" >&6
+ else
+-  echo "$as_me:3361: result: no" >&5
++  echo "$as_me:3362: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+   test -n "$LINT" && break
+ done
+ 
+-echo "$as_me:3368: checking whether ln -s works" >&5
++echo "$as_me:3369: 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:3372: result: yes" >&5
++  echo "$as_me:3373: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:3375: result: no, using $LN_S" >&5
++  echo "$as_me:3376: result: no, using $LN_S" >&5
+ echo "${ECHO_T}no, using $LN_S" >&6
+ fi
+ 
+-echo "$as_me:3379: checking if $LN_S -f options work" >&5
++echo "$as_me:3380: checking if $LN_S -f options work" >&5
+ echo $ECHO_N "checking if $LN_S -f options work... $ECHO_C" >&6
+ 
+ rm -f conf$$.src conf$$dst
+@@ -3388,12 +3389,12 @@
+ 	cf_prog_ln_sf=no
+ fi
+ rm -f conf$$.dst conf$$src
+-echo "$as_me:3391: result: $cf_prog_ln_sf" >&5
++echo "$as_me:3392: result: $cf_prog_ln_sf" >&5
+ echo "${ECHO_T}$cf_prog_ln_sf" >&6
+ 
+ test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
+ 
+-echo "$as_me:3396: checking for long file names" >&5
++echo "$as_me:3397: checking for long file names" >&5
+ echo $ECHO_N "checking for long file names... $ECHO_C" >&6
+ if test "${ac_cv_sys_long_file_names+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3432,7 +3433,7 @@
+   rm -rf $ac_xdir 2>/dev/null
+ done
+ fi
+-echo "$as_me:3435: result: $ac_cv_sys_long_file_names" >&5
++echo "$as_me:3436: result: $ac_cv_sys_long_file_names" >&5
+ echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
+ if test $ac_cv_sys_long_file_names = yes; then
+ 
+@@ -3444,7 +3445,7 @@
+ 
+ # if we find pkg-config, check if we should install the ".pc" files.
+ 
+-echo "$as_me:3447: checking if you want to use pkg-config" >&5
++echo "$as_me:3448: 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.
+@@ -3454,7 +3455,7 @@
+ else
+   cf_pkg_config=yes
+ fi;
+-echo "$as_me:3457: result: $cf_pkg_config" >&5
++echo "$as_me:3458: result: $cf_pkg_config" >&5
+ echo "${ECHO_T}$cf_pkg_config" >&6
+ 
+ case $cf_pkg_config in
+@@ -3466,7 +3467,7 @@
+ 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:3469: checking for $ac_word" >&5
++echo "$as_me:3470: 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
+@@ -3483,7 +3484,7 @@
+   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:3486: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3487: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -3494,10 +3495,10 @@
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ 
+ if test -n "$PKG_CONFIG"; then
+-  echo "$as_me:3497: result: $PKG_CONFIG" >&5
++  echo "$as_me:3498: result: $PKG_CONFIG" >&5
+ echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+-  echo "$as_me:3500: result: no" >&5
++  echo "$as_me:3501: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3506,7 +3507,7 @@
+   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:3509: checking for $ac_word" >&5
++echo "$as_me:3510: 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
+@@ -3523,7 +3524,7 @@
+   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:3526: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3527: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -3535,10 +3536,10 @@
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+ 
+ if test -n "$ac_pt_PKG_CONFIG"; then
+-  echo "$as_me:3538: result: $ac_pt_PKG_CONFIG" >&5
++  echo "$as_me:3539: result: $ac_pt_PKG_CONFIG" >&5
+ echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+ else
+-  echo "$as_me:3541: result: no" >&5
++  echo "$as_me:3542: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3581,24 +3582,24 @@
+ 	PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:3584: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++	{ { echo "$as_me:3585: 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:3591: WARNING: pkg-config is not installed" >&5
++	{ echo "$as_me:3592: WARNING: pkg-config is not installed" >&5
+ echo "$as_me: WARNING: pkg-config is not installed" >&2;}
+ fi
+ 
+ case $PKG_CONFIG in
+ (no|none|yes)
+-	echo "$as_me:3597: checking for pkg-config library directory" >&5
++	echo "$as_me:3598: checking for pkg-config library directory" >&5
+ echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
+ 	;;
+ (*)
+-	echo "$as_me:3601: checking for $PKG_CONFIG library directory" >&5
++	echo "$as_me:3602: checking for $PKG_CONFIG library directory" >&5
+ echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
+ 	;;
+ esac
+@@ -3653,18 +3654,18 @@
+ 
+ 	test -n "$verbose" && echo "	list..." 1>&6
+ 
+-echo "${as_me:-configure}:3656: testing list... ..." 1>&5
++echo "${as_me:-configure}:3657: testing list... ..." 1>&5
+ 
+ 	for cf_config in $cf_search_path
+ 	do
+ 		test -n "$verbose" && echo "	checking $cf_config/pkgconfig" 1>&6
+ 
+-echo "${as_me:-configure}:3662: testing checking $cf_config/pkgconfig ..." 1>&5
++echo "${as_me:-configure}:3663: testing checking $cf_config/pkgconfig ..." 1>&5
+ 
+ 		if test -d $cf_config/pkgconfig
+ 		then
+ 			PKG_CONFIG_LIBDIR=$cf_config/pkgconfig
+-			echo "$as_me:3667: checking done" >&5
++			echo "$as_me:3668: checking done" >&5
+ echo $ECHO_N "checking done... $ECHO_C" >&6
+ 			break
+ 		fi
+@@ -3675,16 +3676,16 @@
+ esac
+ 
+ if test "x$PKG_CONFIG_LIBDIR" != xno ; then
+-	echo "$as_me:3678: result: $PKG_CONFIG_LIBDIR" >&5
++	echo "$as_me:3679: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ fi
+ 
+ if test "x$PKG_CONFIG" != xnone
+ then
+-	echo "$as_me:3684: checking if we should install .pc files for $PKG_CONFIG" >&5
++	echo "$as_me:3685: checking if we should install .pc files for $PKG_CONFIG" >&5
+ echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6
+ else
+-	echo "$as_me:3687: checking if we should install .pc files" >&5
++	echo "$as_me:3688: checking if we should install .pc files" >&5
+ echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6
+ fi
+ 
+@@ -3695,7 +3696,7 @@
+ else
+   enable_pc_files=no
+ fi;
+-echo "$as_me:3698: result: $enable_pc_files" >&5
++echo "$as_me:3699: result: $enable_pc_files" >&5
+ echo "${ECHO_T}$enable_pc_files" >&6
+ 
+ if test "x$enable_pc_files" != xno
+@@ -3703,7 +3704,7 @@
+ 	MAKE_PC_FILES=
+ 	case "x$PKG_CONFIG_LIBDIR" in
+ 	(xno|xyes)
+-		{ echo "$as_me:3706: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
++		{ echo "$as_me:3707: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
+ echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
+ 		;;
+ 	(*)
+@@ -3733,7 +3734,7 @@
+ 	PKG_CONFIG_LIBDIR=`echo $PKG_CONFIG_LIBDIR | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:3736: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5
++	{ { echo "$as_me:3737: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -3747,7 +3748,7 @@
+ 
+ if test -z "$MAKE_PC_FILES"
+ then
+-	echo "$as_me:3750: checking for suffix to add to pc-files" >&5
++	echo "$as_me:3751: checking for suffix to add to pc-files" >&5
+ echo $ECHO_N "checking for suffix to add to pc-files... $ECHO_C" >&6
+ 
+ # Check whether --with-pc-suffix or --without-pc-suffix was given.
+@@ -3762,13 +3763,13 @@
+ 	esac
+ fi;
+ 	test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
+-	echo "$as_me:3765: result: $PC_MODULE_SUFFIX" >&5
++	echo "$as_me:3766: result: $PC_MODULE_SUFFIX" >&5
+ echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
+ 	test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
+ 
+ fi
+ 
+-echo "$as_me:3771: checking if we should assume mixed-case filenames" >&5
++echo "$as_me:3772: checking if we should assume mixed-case filenames" >&5
+ echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6
+ 
+ # Check whether --enable-mixed-case or --disable-mixed-case was given.
+@@ -3778,11 +3779,11 @@
+ else
+   enable_mixedcase=auto
+ fi;
+-echo "$as_me:3781: result: $enable_mixedcase" >&5
++echo "$as_me:3782: result: $enable_mixedcase" >&5
+ echo "${ECHO_T}$enable_mixedcase" >&6
+ if test "$enable_mixedcase" = "auto" ; then
+ 
+-echo "$as_me:3785: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:3786: 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
+@@ -3809,7 +3810,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:3812: result: $cf_cv_mixedcase" >&5
++echo "$as_me:3813: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -3828,7 +3829,7 @@
+ fi
+ 
+ # do this after mixed-case option (tags/TAGS is not as important as tic).
+-echo "$as_me:3831: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:3832: 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
+@@ -3848,11 +3849,11 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "$as_me:3851: result: yes" >&5
++  echo "$as_me:3852: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+   SET_MAKE=
+ else
+-  echo "$as_me:3855: result: no" >&5
++  echo "$as_me:3856: result: no" >&5
+ echo "${ECHO_T}no" >&6
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+@@ -3861,7 +3862,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:3864: checking for $ac_word" >&5
++echo "$as_me:3865: 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
+@@ -3876,7 +3877,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CTAGS="$ac_prog"
+-echo "$as_me:3879: found $ac_dir/$ac_word" >&5
++echo "$as_me:3880: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3884,10 +3885,10 @@
+ fi
+ CTAGS=$ac_cv_prog_CTAGS
+ if test -n "$CTAGS"; then
+-  echo "$as_me:3887: result: $CTAGS" >&5
++  echo "$as_me:3888: result: $CTAGS" >&5
+ echo "${ECHO_T}$CTAGS" >&6
+ else
+-  echo "$as_me:3890: result: no" >&5
++  echo "$as_me:3891: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3898,7 +3899,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:3901: checking for $ac_word" >&5
++echo "$as_me:3902: 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
+@@ -3913,7 +3914,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ETAGS="$ac_prog"
+-echo "$as_me:3916: found $ac_dir/$ac_word" >&5
++echo "$as_me:3917: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3921,10 +3922,10 @@
+ fi
+ ETAGS=$ac_cv_prog_ETAGS
+ if test -n "$ETAGS"; then
+-  echo "$as_me:3924: result: $ETAGS" >&5
++  echo "$as_me:3925: result: $ETAGS" >&5
+ echo "${ECHO_T}$ETAGS" >&6
+ else
+-  echo "$as_me:3927: result: no" >&5
++  echo "$as_me:3928: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3933,7 +3934,7 @@
+ 
+ # 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:3936: checking for $ac_word" >&5
++echo "$as_me:3937: 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
+@@ -3948,7 +3949,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_MAKE_LOWER_TAGS="yes"
+-echo "$as_me:3951: found $ac_dir/$ac_word" >&5
++echo "$as_me:3952: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3957,17 +3958,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+-  echo "$as_me:3960: result: $MAKE_LOWER_TAGS" >&5
++  echo "$as_me:3961: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+-  echo "$as_me:3963: result: no" >&5
++  echo "$as_me:3964: 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:3970: checking for $ac_word" >&5
++echo "$as_me:3971: 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
+@@ -3982,7 +3983,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_MAKE_UPPER_TAGS="yes"
+-echo "$as_me:3985: found $ac_dir/$ac_word" >&5
++echo "$as_me:3986: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3991,10 +3992,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+-  echo "$as_me:3994: result: $MAKE_UPPER_TAGS" >&5
++  echo "$as_me:3995: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+-  echo "$as_me:3997: result: no" >&5
++  echo "$as_me:3998: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4014,7 +4015,7 @@
+ 	MAKE_LOWER_TAGS="#"
+ fi
+ 
+-echo "$as_me:4017: checking for makeflags variable" >&5
++echo "$as_me:4018: 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
+@@ -4048,13 +4049,13 @@
+ 	rm -f cf_makeflags.tmp
+ 
+ fi
+-echo "$as_me:4051: result: $cf_cv_makeflags" >&5
++echo "$as_me:4052: result: $cf_cv_makeflags" >&5
+ echo "${ECHO_T}$cf_cv_makeflags" >&6
+ 
+ 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:4057: checking for $ac_word" >&5
++echo "$as_me:4058: 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
+@@ -4069,7 +4070,7 @@
+   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:4072: found $ac_dir/$ac_word" >&5
++echo "$as_me:4073: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4077,10 +4078,10 @@
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+-  echo "$as_me:4080: result: $RANLIB" >&5
++  echo "$as_me:4081: result: $RANLIB" >&5
+ echo "${ECHO_T}$RANLIB" >&6
+ else
+-  echo "$as_me:4083: result: no" >&5
++  echo "$as_me:4084: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4089,7 +4090,7 @@
+   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:4092: checking for $ac_word" >&5
++echo "$as_me:4093: 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
+@@ -4104,7 +4105,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_RANLIB="ranlib"
+-echo "$as_me:4107: found $ac_dir/$ac_word" >&5
++echo "$as_me:4108: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4113,10 +4114,10 @@
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+-  echo "$as_me:4116: result: $ac_ct_RANLIB" >&5
++  echo "$as_me:4117: result: $ac_ct_RANLIB" >&5
+ echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+-  echo "$as_me:4119: result: no" >&5
++  echo "$as_me:4120: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4128,7 +4129,7 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ld; ac_word=$2
+-echo "$as_me:4131: checking for $ac_word" >&5
++echo "$as_me:4132: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_LD+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4143,7 +4144,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LD="${ac_tool_prefix}ld"
+-echo "$as_me:4146: found $ac_dir/$ac_word" >&5
++echo "$as_me:4147: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4151,10 +4152,10 @@
+ fi
+ LD=$ac_cv_prog_LD
+ if test -n "$LD"; then
+-  echo "$as_me:4154: result: $LD" >&5
++  echo "$as_me:4155: result: $LD" >&5
+ echo "${ECHO_T}$LD" >&6
+ else
+-  echo "$as_me:4157: result: no" >&5
++  echo "$as_me:4158: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4163,7 +4164,7 @@
+   ac_ct_LD=$LD
+   # Extract the first word of "ld", so it can be a program name with args.
+ set dummy ld; ac_word=$2
+-echo "$as_me:4166: checking for $ac_word" >&5
++echo "$as_me:4167: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4178,7 +4179,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_LD="ld"
+-echo "$as_me:4181: found $ac_dir/$ac_word" >&5
++echo "$as_me:4182: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4187,10 +4188,10 @@
+ fi
+ ac_ct_LD=$ac_cv_prog_ac_ct_LD
+ if test -n "$ac_ct_LD"; then
+-  echo "$as_me:4190: result: $ac_ct_LD" >&5
++  echo "$as_me:4191: result: $ac_ct_LD" >&5
+ echo "${ECHO_T}$ac_ct_LD" >&6
+ else
+-  echo "$as_me:4193: result: no" >&5
++  echo "$as_me:4194: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4202,7 +4203,7 @@
+ 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:4205: checking for $ac_word" >&5
++echo "$as_me:4206: 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
+@@ -4217,7 +4218,7 @@
+   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:4220: found $ac_dir/$ac_word" >&5
++echo "$as_me:4221: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4225,10 +4226,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:4228: result: $AR" >&5
++  echo "$as_me:4229: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:4231: result: no" >&5
++  echo "$as_me:4232: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4237,7 +4238,7 @@
+   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:4240: checking for $ac_word" >&5
++echo "$as_me:4241: 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
+@@ -4252,7 +4253,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_AR="ar"
+-echo "$as_me:4255: found $ac_dir/$ac_word" >&5
++echo "$as_me:4256: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4261,10 +4262,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:4264: result: $ac_ct_AR" >&5
++  echo "$as_me:4265: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:4267: result: no" >&5
++  echo "$as_me:4268: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4276,7 +4277,7 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}nm; ac_word=$2
+-echo "$as_me:4279: checking for $ac_word" >&5
++echo "$as_me:4280: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_NM+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4291,7 +4292,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_NM="${ac_tool_prefix}nm"
+-echo "$as_me:4294: found $ac_dir/$ac_word" >&5
++echo "$as_me:4295: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4299,10 +4300,10 @@
+ fi
+ NM=$ac_cv_prog_NM
+ if test -n "$NM"; then
+-  echo "$as_me:4302: result: $NM" >&5
++  echo "$as_me:4303: result: $NM" >&5
+ echo "${ECHO_T}$NM" >&6
+ else
+-  echo "$as_me:4305: result: no" >&5
++  echo "$as_me:4306: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4311,7 +4312,7 @@
+   ac_ct_NM=$NM
+   # Extract the first word of "nm", so it can be a program name with args.
+ set dummy nm; ac_word=$2
+-echo "$as_me:4314: checking for $ac_word" >&5
++echo "$as_me:4315: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_NM+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4326,7 +4327,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_NM="nm"
+-echo "$as_me:4329: found $ac_dir/$ac_word" >&5
++echo "$as_me:4330: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4335,10 +4336,10 @@
+ fi
+ ac_ct_NM=$ac_cv_prog_ac_ct_NM
+ if test -n "$ac_ct_NM"; then
+-  echo "$as_me:4338: result: $ac_ct_NM" >&5
++  echo "$as_me:4339: result: $ac_ct_NM" >&5
+ echo "${ECHO_T}$ac_ct_NM" >&6
+ else
+-  echo "$as_me:4341: result: no" >&5
++  echo "$as_me:4342: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4350,7 +4351,7 @@
+ 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:4353: checking for $ac_word" >&5
++echo "$as_me:4354: 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
+@@ -4365,7 +4366,7 @@
+   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:4368: found $ac_dir/$ac_word" >&5
++echo "$as_me:4369: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4373,10 +4374,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:4376: result: $AR" >&5
++  echo "$as_me:4377: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:4379: result: no" >&5
++  echo "$as_me:4380: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4385,7 +4386,7 @@
+   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:4388: checking for $ac_word" >&5
++echo "$as_me:4389: 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
+@@ -4400,7 +4401,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_AR="ar"
+-echo "$as_me:4403: found $ac_dir/$ac_word" >&5
++echo "$as_me:4404: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4409,10 +4410,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:4412: result: $ac_ct_AR" >&5
++  echo "$as_me:4413: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:4415: result: no" >&5
++  echo "$as_me:4416: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4421,7 +4422,7 @@
+   AR="$ac_cv_prog_AR"
+ fi
+ 
+-echo "$as_me:4424: checking for options to update archives" >&5
++echo "$as_me:4425: 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
+@@ -4444,13 +4445,13 @@
+ 		rm -f conftest.a
+ 
+ 		cat >conftest.$ac_ext <&5
++		if { (eval echo "$as_me:4451: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4453: \$? = $ac_status" >&5
++  echo "$as_me:4454: \$? = $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
+@@ -4461,7 +4462,7 @@
+ 		else
+ 			test -n "$verbose" && echo "	cannot compile test-program" 1>&6
+ 
+-echo "${as_me:-configure}:4464: testing cannot compile test-program ..." 1>&5
++echo "${as_me:-configure}:4465: testing cannot compile test-program ..." 1>&5
+ 
+ 			break
+ 		fi
+@@ -4469,7 +4470,7 @@
+ 	rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
+ 
+ fi
+-echo "$as_me:4472: result: $cf_cv_ar_flags" >&5
++echo "$as_me:4473: result: $cf_cv_ar_flags" >&5
+ echo "${ECHO_T}$cf_cv_ar_flags" >&6
+ 
+ if test -n "$ARFLAGS" ; then
+@@ -4480,7 +4481,7 @@
+ 	ARFLAGS=$cf_cv_ar_flags
+ fi
+ 
+-echo "$as_me:4483: checking if you have specified an install-prefix" >&5
++echo "$as_me:4484: checking if you have specified an install-prefix" >&5
+ echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6
+ 
+ # Check whether --with-install-prefix or --without-install-prefix was given.
+@@ -4493,7 +4494,7 @@
+ 		;;
+ 	esac
+ fi;
+-echo "$as_me:4496: result: $DESTDIR" >&5
++echo "$as_me:4497: result: $DESTDIR" >&5
+ echo "${ECHO_T}$DESTDIR" >&6
+ 
+ ###############################################################################
+@@ -4521,7 +4522,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:4524: checking for $ac_word" >&5
++echo "$as_me:4525: 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
+@@ -4536,7 +4537,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_BUILD_CC="$ac_prog"
+-echo "$as_me:4539: found $ac_dir/$ac_word" >&5
++echo "$as_me:4540: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4544,10 +4545,10 @@
+ fi
+ BUILD_CC=$ac_cv_prog_BUILD_CC
+ if test -n "$BUILD_CC"; then
+-  echo "$as_me:4547: result: $BUILD_CC" >&5
++  echo "$as_me:4548: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ else
+-  echo "$as_me:4550: result: no" >&5
++  echo "$as_me:4551: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4555,12 +4556,12 @@
+ done
+ 
+ fi;
+-	echo "$as_me:4558: checking for native build C compiler" >&5
++	echo "$as_me:4559: checking for native build C compiler" >&5
+ echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
+-	echo "$as_me:4560: result: $BUILD_CC" >&5
++	echo "$as_me:4561: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ 
+-	echo "$as_me:4563: checking for native build C preprocessor" >&5
++	echo "$as_me:4564: 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.
+@@ -4570,10 +4571,10 @@
+ else
+   BUILD_CPP='${BUILD_CC} -E'
+ fi;
+-	echo "$as_me:4573: result: $BUILD_CPP" >&5
++	echo "$as_me:4574: result: $BUILD_CPP" >&5
+ echo "${ECHO_T}$BUILD_CPP" >&6
+ 
+-	echo "$as_me:4576: checking for native build C flags" >&5
++	echo "$as_me:4577: 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.
+@@ -4581,10 +4582,10 @@
+   withval="$with_build_cflags"
+   BUILD_CFLAGS="$withval"
+ fi;
+-	echo "$as_me:4584: result: $BUILD_CFLAGS" >&5
++	echo "$as_me:4585: result: $BUILD_CFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CFLAGS" >&6
+ 
+-	echo "$as_me:4587: checking for native build C preprocessor-flags" >&5
++	echo "$as_me:4588: 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.
+@@ -4592,10 +4593,10 @@
+   withval="$with_build_cppflags"
+   BUILD_CPPFLAGS="$withval"
+ fi;
+-	echo "$as_me:4595: result: $BUILD_CPPFLAGS" >&5
++	echo "$as_me:4596: result: $BUILD_CPPFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
+ 
+-	echo "$as_me:4598: checking for native build linker-flags" >&5
++	echo "$as_me:4599: 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.
+@@ -4603,10 +4604,10 @@
+   withval="$with_build_ldflags"
+   BUILD_LDFLAGS="$withval"
+ fi;
+-	echo "$as_me:4606: result: $BUILD_LDFLAGS" >&5
++	echo "$as_me:4607: result: $BUILD_LDFLAGS" >&5
+ echo "${ECHO_T}$BUILD_LDFLAGS" >&6
+ 
+-	echo "$as_me:4609: checking for native build linker-libraries" >&5
++	echo "$as_me:4610: 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.
+@@ -4614,7 +4615,7 @@
+   withval="$with_build_libs"
+   BUILD_LIBS="$withval"
+ fi;
+-	echo "$as_me:4617: result: $BUILD_LIBS" >&5
++	echo "$as_me:4618: result: $BUILD_LIBS" >&5
+ echo "${ECHO_T}$BUILD_LIBS" >&6
+ 
+ 	# this assumes we're on Unix.
+@@ -4624,7 +4625,7 @@
+ 	: ${BUILD_CC:='${CC}'}
+ 
+ 	if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
+-		{ { echo "$as_me:4627: error: Cross-build requires two compilers.
++		{ { echo "$as_me:4628: 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;}
+@@ -4649,7 +4650,7 @@
+ ### shared, for example.
+ cf_list_models=""
+ 
+-echo "$as_me:4652: checking if libtool -version-number should be used" >&5
++echo "$as_me:4653: checking if libtool -version-number should be used" >&5
+ echo $ECHO_N "checking if libtool -version-number should be used... $ECHO_C" >&6
+ 
+ # Check whether --enable-libtool-version or --disable-libtool-version was given.
+@@ -4666,7 +4667,7 @@
+ 	cf_libtool_version=yes
+ 
+ fi;
+-echo "$as_me:4669: result: $cf_libtool_version" >&5
++echo "$as_me:4670: result: $cf_libtool_version" >&5
+ echo "${ECHO_T}$cf_libtool_version" >&6
+ 
+ if test "$cf_libtool_version" = yes ; then
+@@ -4675,25 +4676,25 @@
+ 	LIBTOOL_VERSION="-version-info"
+ 	case "x$VERSION" in
+ 	(x)
+-		{ echo "$as_me:4678: WARNING: VERSION was not set" >&5
++		{ echo "$as_me:4679: WARNING: VERSION was not set" >&5
+ echo "$as_me: WARNING: VERSION was not set" >&2;}
+ 		;;
+ 	(x*.*.*)
+ 		ABI_VERSION="$VERSION"
+ 		test -n "$verbose" && echo "	ABI_VERSION: $ABI_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:4685: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:4686: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+ 
+ 		;;
+ 	(x*:*:*)
+ 		ABI_VERSION=`echo "$VERSION" | sed -e 's/:/./g'`
+ 		test -n "$verbose" && echo "	ABI_VERSION: $ABI_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:4692: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:4693: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+ 
+ 		;;
+ 	(*)
+-		{ echo "$as_me:4696: WARNING: unexpected VERSION value: $VERSION" >&5
++		{ echo "$as_me:4697: WARNING: unexpected VERSION value: $VERSION" >&5
+ echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
+ 		;;
+ 	esac
+@@ -4715,7 +4716,7 @@
+ LIB_INSTALL=
+ LIB_UNINSTALL=
+ 
+-echo "$as_me:4718: checking if you want to build libraries with libtool" >&5
++echo "$as_me:4719: checking if you want to build libraries with libtool" >&5
+ echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6
+ 
+ # Check whether --with-libtool or --without-libtool was given.
+@@ -4725,7 +4726,7 @@
+ else
+   with_libtool=no
+ fi;
+-echo "$as_me:4728: result: $with_libtool" >&5
++echo "$as_me:4729: result: $with_libtool" >&5
+ echo "${ECHO_T}$with_libtool" >&6
+ if test "$with_libtool" != "no"; then
+ 
+@@ -4756,7 +4757,7 @@
+ 	with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:4759: error: expected a pathname, not \"$with_libtool\"" >&5
++	{ { echo "$as_me:4760: error: expected a pathname, not \"$with_libtool\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -4769,7 +4770,7 @@
+   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:4772: checking for $ac_word" >&5
++echo "$as_me:4773: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_LIBTOOL+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4784,7 +4785,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
+-echo "$as_me:4787: found $ac_dir/$ac_word" >&5
++echo "$as_me:4788: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4792,10 +4793,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+-  echo "$as_me:4795: result: $LIBTOOL" >&5
++  echo "$as_me:4796: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+-  echo "$as_me:4798: result: no" >&5
++  echo "$as_me:4799: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4808,7 +4809,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:4811: checking for $ac_word" >&5
++echo "$as_me:4812: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4823,7 +4824,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
+-echo "$as_me:4826: found $ac_dir/$ac_word" >&5
++echo "$as_me:4827: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4831,10 +4832,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+-  echo "$as_me:4834: result: $ac_ct_LIBTOOL" >&5
++  echo "$as_me:4835: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+-  echo "$as_me:4837: result: no" >&5
++  echo "$as_me:4838: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4865,7 +4866,7 @@
+   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:4868: checking for $ac_word" >&5
++echo "$as_me:4869: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_LIBTOOL+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4880,7 +4881,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
+-echo "$as_me:4883: found $ac_dir/$ac_word" >&5
++echo "$as_me:4884: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4888,10 +4889,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+-  echo "$as_me:4891: result: $LIBTOOL" >&5
++  echo "$as_me:4892: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+-  echo "$as_me:4894: result: no" >&5
++  echo "$as_me:4895: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4904,7 +4905,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:4907: checking for $ac_word" >&5
++echo "$as_me:4908: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4919,7 +4920,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
+-echo "$as_me:4922: found $ac_dir/$ac_word" >&5
++echo "$as_me:4923: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4927,10 +4928,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+-  echo "$as_me:4930: result: $ac_ct_LIBTOOL" >&5
++  echo "$as_me:4931: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+-  echo "$as_me:4933: result: no" >&5
++  echo "$as_me:4934: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4952,7 +4953,7 @@
+ 		fi
+ 	fi
+ 	if test -z "$LIBTOOL" ; then
+-		{ { echo "$as_me:4955: error: Cannot find libtool" >&5
++		{ { echo "$as_me:4956: error: Cannot find libtool" >&5
+ echo "$as_me: error: Cannot find libtool" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -4968,7 +4969,7 @@
+ 
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+ then
+-	echo "$as_me:4971: checking version of $LIBTOOL" >&5
++	echo "$as_me:4972: checking version of $LIBTOOL" >&5
+ echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
+ 
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+@@ -4979,15 +4980,15 @@
+ fi
+ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
+ 
+-	echo "$as_me:4982: result: $cf_cv_libtool_version" >&5
++	echo "$as_me:4983: result: $cf_cv_libtool_version" >&5
+ echo "${ECHO_T}$cf_cv_libtool_version" >&6
+ 	if test -z "$cf_cv_libtool_version" ; then
+-		{ { echo "$as_me:4985: error: This is not GNU libtool" >&5
++		{ { echo "$as_me:4986: error: This is not GNU libtool" >&5
+ echo "$as_me: error: This is not GNU libtool" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+ else
+-	{ { echo "$as_me:4990: error: GNU libtool has not been found" >&5
++	{ { echo "$as_me:4991: error: GNU libtool has not been found" >&5
+ echo "$as_me: error: GNU libtool has not been found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -5023,7 +5024,7 @@
+ 
+ else
+ 
+-echo "$as_me:5026: checking if you want to build shared libraries" >&5
++echo "$as_me:5027: checking if you want to build shared libraries" >&5
+ echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6
+ 
+ # Check whether --with-shared or --without-shared was given.
+@@ -5033,11 +5034,11 @@
+ else
+   with_shared=no
+ fi;
+-echo "$as_me:5036: result: $with_shared" >&5
++echo "$as_me:5037: result: $with_shared" >&5
+ echo "${ECHO_T}$with_shared" >&6
+ test "x$with_shared" = "xyes" && cf_list_models="$cf_list_models shared"
+ 
+-echo "$as_me:5040: checking if you want to build static libraries" >&5
++echo "$as_me:5041: checking if you want to build static libraries" >&5
+ echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6
+ 
+ # Check whether --with-normal or --without-normal was given.
+@@ -5047,11 +5048,11 @@
+ else
+   with_normal=yes
+ fi;
+-echo "$as_me:5050: result: $with_normal" >&5
++echo "$as_me:5051: result: $with_normal" >&5
+ echo "${ECHO_T}$with_normal" >&6
+ test "x$with_normal" = "xyes" && cf_list_models="$cf_list_models normal"
+ 
+-echo "$as_me:5054: checking if you want to build debug libraries" >&5
++echo "$as_me:5055: checking if you want to build debug libraries" >&5
+ echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6
+ 
+ # Check whether --with-debug or --without-debug was given.
+@@ -5061,11 +5062,11 @@
+ else
+   with_debug=yes
+ fi;
+-echo "$as_me:5064: result: $with_debug" >&5
++echo "$as_me:5065: result: $with_debug" >&5
+ echo "${ECHO_T}$with_debug" >&6
+ test "x$with_debug" = "xyes" && cf_list_models="$cf_list_models debug"
+ 
+-echo "$as_me:5068: checking if you want to build profiling libraries" >&5
++echo "$as_me:5069: checking if you want to build profiling libraries" >&5
+ echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6
+ 
+ # Check whether --with-profile or --without-profile was given.
+@@ -5075,7 +5076,7 @@
+ else
+   with_profile=no
+ fi;
+-echo "$as_me:5078: result: $with_profile" >&5
++echo "$as_me:5079: result: $with_profile" >&5
+ echo "${ECHO_T}$with_profile" >&6
+ test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
+ 
+@@ -5083,7 +5084,7 @@
+ 
+ if test "X$cf_with_cxx_binding" != Xno; then
+ if test "x$with_shared" = "xyes"; then
+-echo "$as_me:5086: checking if you want to build C++ shared libraries" >&5
++echo "$as_me:5087: checking if you want to build C++ shared libraries" >&5
+ echo $ECHO_N "checking if you want to build C++ shared libraries... $ECHO_C" >&6
+ 
+ # Check whether --with-cxx-shared or --without-cxx-shared was given.
+@@ -5093,26 +5094,26 @@
+ else
+   with_shared_cxx=no
+ fi;
+-echo "$as_me:5096: result: $with_shared_cxx" >&5
++echo "$as_me:5097: result: $with_shared_cxx" >&5
+ echo "${ECHO_T}$with_shared_cxx" >&6
+ fi
+ fi
+ 
+ ###############################################################################
+ 
+-echo "$as_me:5103: checking for specified models" >&5
++echo "$as_me:5104: checking for specified models" >&5
+ echo $ECHO_N "checking for specified models... $ECHO_C" >&6
+ test -z "$cf_list_models" && cf_list_models=normal
+ test "$with_libtool" != "no" && cf_list_models=libtool
+-echo "$as_me:5107: result: $cf_list_models" >&5
++echo "$as_me:5108: result: $cf_list_models" >&5
+ echo "${ECHO_T}$cf_list_models" >&6
+ 
+ ### Use the first model as the default, and save its suffix for use in building
+ ### up test-applications.
+-echo "$as_me:5112: checking for default model" >&5
++echo "$as_me:5113: checking for default model" >&5
+ echo $ECHO_N "checking for default model... $ECHO_C" >&6
+ DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'`
+-echo "$as_me:5115: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:5116: result: $DFT_LWR_MODEL" >&5
+ echo "${ECHO_T}$DFT_LWR_MODEL" >&6
+ 
+ DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+@@ -5126,7 +5127,7 @@
+ LIB_DIR=../lib
+ LIB_2ND=../../lib
+ 
+-echo "$as_me:5129: checking if you want to have a library-prefix" >&5
++echo "$as_me:5130: checking if you want to have a library-prefix" >&5
+ echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6
+ 
+ # Check whether --with-lib-prefix or --without-lib-prefix was given.
+@@ -5136,7 +5137,7 @@
+ else
+   with_lib_prefix=auto
+ fi;
+-echo "$as_me:5139: result: $with_lib_prefix" >&5
++echo "$as_me:5140: result: $with_lib_prefix" >&5
+ echo "${ECHO_T}$with_lib_prefix" >&6
+ 
+ if test $with_lib_prefix = auto
+@@ -5164,19 +5165,19 @@
+ 
+ LIB_SUFFIX=
+ 
+-	echo "$as_me:5167: checking for PATH separator" >&5
++	echo "$as_me:5168: 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:5174: result: $PATH_SEPARATOR" >&5
++	echo "$as_me:5175: result: $PATH_SEPARATOR" >&5
+ echo "${ECHO_T}$PATH_SEPARATOR" >&6
+ 
+ ###############################################################################
+ 
+-echo "$as_me:5179: checking if you want to build a separate terminfo library" >&5
++echo "$as_me:5180: checking if you want to build a separate terminfo library" >&5
+ echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6
+ 
+ # Check whether --with-termlib or --without-termlib was given.
+@@ -5186,10 +5187,10 @@
+ else
+   with_termlib=no
+ fi;
+-echo "$as_me:5189: result: $with_termlib" >&5
++echo "$as_me:5190: result: $with_termlib" >&5
+ echo "${ECHO_T}$with_termlib" >&6
+ 
+-echo "$as_me:5192: checking if you want to build a separate tic library" >&5
++echo "$as_me:5193: checking if you want to build a separate tic library" >&5
+ echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6
+ 
+ # Check whether --with-ticlib or --without-ticlib was given.
+@@ -5199,13 +5200,13 @@
+ else
+   with_ticlib=no
+ fi;
+-echo "$as_me:5202: result: $with_ticlib" >&5
++echo "$as_me:5203: result: $with_ticlib" >&5
+ echo "${ECHO_T}$with_ticlib" >&6
+ 
+ ### Checks for special libraries, must be done up-front.
+ SHLIB_LIST=""
+ 
+-echo "$as_me:5208: checking if you want to link with the GPM mouse library" >&5
++echo "$as_me:5209: checking if you want to link with the GPM mouse library" >&5
+ echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6
+ 
+ # Check whether --with-gpm or --without-gpm was given.
+@@ -5215,27 +5216,27 @@
+ else
+   with_gpm=maybe
+ fi;
+-echo "$as_me:5218: result: $with_gpm" >&5
++echo "$as_me:5219: result: $with_gpm" >&5
+ echo "${ECHO_T}$with_gpm" >&6
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:5222: checking for gpm.h" >&5
++	echo "$as_me:5223: checking for gpm.h" >&5
+ echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6
+ if test "${ac_cv_header_gpm_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5228 "configure"
++#line 5229 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:5232: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:5233: \"$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:5238: \$? = $ac_status" >&5
++  echo "$as_me:5239: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -5254,7 +5255,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:5257: result: $ac_cv_header_gpm_h" >&5
++echo "$as_me:5258: result: $ac_cv_header_gpm_h" >&5
+ echo "${ECHO_T}$ac_cv_header_gpm_h" >&6
+ if test $ac_cv_header_gpm_h = yes; then
+ 
+@@ -5265,7 +5266,7 @@
+ 		if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then
+ 			test -n "$verbose" && echo "	assuming we really have GPM library" 1>&6
+ 
+-echo "${as_me:-configure}:5268: testing assuming we really have GPM library ..." 1>&5
++echo "${as_me:-configure}:5269: testing assuming we really have GPM library ..." 1>&5
+ 
+ cat >>confdefs.h <<\EOF
+ #define HAVE_LIBGPM 1
+@@ -5273,7 +5274,7 @@
+ 
+ 			with_gpm=yes
+ 		else
+-			echo "$as_me:5276: checking for Gpm_Open in -lgpm" >&5
++			echo "$as_me:5277: 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
+@@ -5281,7 +5282,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5284 "configure"
++#line 5285 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -5300,16 +5301,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5303: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5304: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5306: \$? = $ac_status" >&5
++  echo "$as_me:5307: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5309: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5310: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5312: \$? = $ac_status" >&5
++  echo "$as_me:5313: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -5320,18 +5321,18 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:5323: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:5324: 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
+   :
+ else
+ 
+ 				if test "$with_gpm" = maybe; then
+-					{ echo "$as_me:5330: WARNING: Cannot link with GPM library" >&5
++					{ echo "$as_me:5331: WARNING: Cannot link with GPM library" >&5
+ echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
+ 					with_gpm=no
+ 				else
+-					{ { echo "$as_me:5334: error: Cannot link with GPM library" >&5
++					{ { echo "$as_me:5335: error: Cannot link with GPM library" >&5
+ echo "$as_me: error: Cannot link with GPM library" >&2;}
+    { (exit 1); exit 1; }; }
+ 				fi
+@@ -5342,7 +5343,7 @@
+ 
+ else
+ 
+-		test "$with_gpm" != maybe && { echo "$as_me:5345: WARNING: Cannot find GPM header" >&5
++		test "$with_gpm" != maybe && { echo "$as_me:5346: WARNING: Cannot find GPM header" >&5
+ echo "$as_me: WARNING: Cannot find GPM header" >&2;}
+ 		with_gpm=no
+ 
+@@ -5351,7 +5352,7 @@
+ fi
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:5354: checking if you want to load GPM dynamically" >&5
++	echo "$as_me:5355: checking if you want to load GPM dynamically" >&5
+ echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6
+ 
+ # Check whether --with-dlsym or --without-dlsym was given.
+@@ -5361,18 +5362,18 @@
+ else
+   with_dlsym=yes
+ fi;
+-	echo "$as_me:5364: result: $with_dlsym" >&5
++	echo "$as_me:5365: result: $with_dlsym" >&5
+ echo "${ECHO_T}$with_dlsym" >&6
+ 	if test "x$with_dlsym" = xyes ; then
+ 
+ cf_have_dlsym=no
+-echo "$as_me:5369: checking for dlsym" >&5
++echo "$as_me:5370: checking for dlsym" >&5
+ echo $ECHO_N "checking for dlsym... $ECHO_C" >&6
+ if test "${ac_cv_func_dlsym+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5375 "configure"
++#line 5376 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char dlsym (); below.  */
+@@ -5403,16 +5404,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5406: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5407: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5409: \$? = $ac_status" >&5
++  echo "$as_me:5410: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5412: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5413: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5415: \$? = $ac_status" >&5
++  echo "$as_me:5416: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_dlsym=yes
+ else
+@@ -5422,14 +5423,14 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:5425: result: $ac_cv_func_dlsym" >&5
++echo "$as_me:5426: result: $ac_cv_func_dlsym" >&5
+ echo "${ECHO_T}$ac_cv_func_dlsym" >&6
+ if test $ac_cv_func_dlsym = yes; then
+   cf_have_dlsym=yes
+ else
+ 
+ cf_have_libdl=no
+-echo "$as_me:5432: checking for dlsym in -ldl" >&5
++echo "$as_me:5433: 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
+@@ -5437,7 +5438,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5440 "configure"
++#line 5441 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -5456,16 +5457,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5459: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5460: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5462: \$? = $ac_status" >&5
++  echo "$as_me:5463: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5465: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5466: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5468: \$? = $ac_status" >&5
++  echo "$as_me:5469: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dl_dlsym=yes
+ else
+@@ -5476,7 +5477,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:5479: result: $ac_cv_lib_dl_dlsym" >&5
++echo "$as_me:5480: 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
+ 
+@@ -5505,10 +5506,10 @@
+ LIBS="$cf_add_libs"
+  }
+ 
+-	echo "$as_me:5508: checking whether able to link to dl*() functions" >&5
++	echo "$as_me:5509: checking whether able to link to dl*() functions" >&5
+ echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 5511 "configure"
++#line 5512 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5526,16 +5527,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5529: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5530: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5532: \$? = $ac_status" >&5
++  echo "$as_me:5533: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5535: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5536: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5538: \$? = $ac_status" >&5
++  echo "$as_me:5539: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ cat >>confdefs.h <<\EOF
+@@ -5546,15 +5547,15 @@
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ 
+-		{ { echo "$as_me:5549: error: Cannot link test program for libdl" >&5
++		{ { echo "$as_me:5550: error: Cannot link test program for libdl" >&5
+ echo "$as_me: error: Cannot link test program for libdl" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-	echo "$as_me:5554: result: ok" >&5
++	echo "$as_me:5555: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ else
+-	{ { echo "$as_me:5557: error: Cannot find dlsym function" >&5
++	{ { echo "$as_me:5558: error: Cannot find dlsym function" >&5
+ echo "$as_me: error: Cannot find dlsym function" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -5562,12 +5563,12 @@
+ 		if test "x$with_gpm" != xyes ; then
+ 			test -n "$verbose" && echo "	assuming soname for gpm is $with_gpm" 1>&6
+ 
+-echo "${as_me:-configure}:5565: testing assuming soname for gpm is $with_gpm ..." 1>&5
++echo "${as_me:-configure}:5566: testing assuming soname for gpm is $with_gpm ..." 1>&5
+ 
+ 			cf_cv_gpm_soname="$with_gpm"
+ 		else
+ 
+-echo "$as_me:5570: checking for soname of gpm library" >&5
++echo "$as_me:5571: checking for soname of gpm library" >&5
+ echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6
+ if test "${cf_cv_gpm_soname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5601,15 +5602,15 @@
+ done
+ LIBS="$cf_add_libs"
+ 
+-	if { (eval echo "$as_me:5604: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:5605: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5607: \$? = $ac_status" >&5
++  echo "$as_me:5608: \$? = $ac_status" >&5
+   (exit $ac_status); } ; then
+-		if { (eval echo "$as_me:5609: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:5610: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5612: \$? = $ac_status" >&5
++  echo "$as_me:5613: \$? = $ac_status" >&5
+   (exit $ac_status); } ; then
+ 			cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.`
+ 			test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
+@@ -5620,7 +5621,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:5623: result: $cf_cv_gpm_soname" >&5
++echo "$as_me:5624: result: $cf_cv_gpm_soname" >&5
+ echo "${ECHO_T}$cf_cv_gpm_soname" >&6
+ 
+ 		fi
+@@ -5655,7 +5656,7 @@
+ #define HAVE_LIBGPM 1
+ EOF
+ 
+-echo "$as_me:5658: checking for Gpm_Wgetch in -lgpm" >&5
++echo "$as_me:5659: checking for Gpm_Wgetch in -lgpm" >&5
+ echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6
+ if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5663,7 +5664,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5666 "configure"
++#line 5667 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -5682,16 +5683,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5685: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5686: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5688: \$? = $ac_status" >&5
++  echo "$as_me:5689: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5691: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5692: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5694: \$? = $ac_status" >&5
++  echo "$as_me:5695: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_Gpm_Wgetch=yes
+ else
+@@ -5702,11 +5703,11 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:5705: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
++echo "$as_me:5706: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6
+ if test $ac_cv_lib_gpm_Gpm_Wgetch = yes; then
+ 
+-echo "$as_me:5709: checking if GPM is weakly bound to curses library" >&5
++echo "$as_me:5710: checking if GPM is weakly bound to curses library" >&5
+ echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6
+ if test "${cf_cv_check_gpm_wgetch+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5730,15 +5731,15 @@
+ 	# to rely on the static library, noting that some packagers may not
+ 	# include it.
+ 	LIBS="-static -lgpm -dynamic $LIBS"
+-	if { (eval echo "$as_me:5733: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:5734: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5736: \$? = $ac_status" >&5
++  echo "$as_me:5737: \$? = $ac_status" >&5
+   (exit $ac_status); } ; then
+-		if { (eval echo "$as_me:5738: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:5739: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5741: \$? = $ac_status" >&5
++  echo "$as_me:5742: \$? = $ac_status" >&5
+   (exit $ac_status); } ; then
+ 			cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\' | egrep '\<[vVwW]\>'`
+ 			test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
+@@ -5750,11 +5751,11 @@
+ fi
+ 
+ fi
+-echo "$as_me:5753: result: $cf_cv_check_gpm_wgetch" >&5
++echo "$as_me:5754: result: $cf_cv_check_gpm_wgetch" >&5
+ echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6
+ 
+ if test "$cf_cv_check_gpm_wgetch" != yes ; then
+-	{ echo "$as_me:5757: WARNING: GPM library is already linked with curses - read the FAQ" >&5
++	{ echo "$as_me:5758: WARNING: GPM library is already linked with curses - read the FAQ" >&5
+ echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;}
+ fi
+ 
+@@ -5764,7 +5765,7 @@
+ 
+ # not everyone has "test -c"
+ if test -c /dev/sysmouse 2>/dev/null ; then
+-echo "$as_me:5767: checking if you want to use sysmouse" >&5
++echo "$as_me:5768: checking if you want to use sysmouse" >&5
+ echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6
+ 
+ # Check whether --with-sysmouse or --without-sysmouse was given.
+@@ -5776,7 +5777,7 @@
+ fi;
+ 	if test "$cf_with_sysmouse" != no ; then
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 5779 "configure"
++#line 5780 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -5799,16 +5800,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5802: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5803: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5805: \$? = $ac_status" >&5
++  echo "$as_me:5806: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5808: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5809: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5811: \$? = $ac_status" >&5
++  echo "$as_me:5812: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_with_sysmouse=yes
+ else
+@@ -5818,7 +5819,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 	fi
+-echo "$as_me:5821: result: $cf_with_sysmouse" >&5
++echo "$as_me:5822: result: $cf_with_sysmouse" >&5
+ echo "${ECHO_T}$cf_with_sysmouse" >&6
+ test "$cf_with_sysmouse" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -5837,7 +5838,7 @@
+ 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
+ fi
+ 
+-echo "$as_me:5840: checking for default loader flags" >&5
++echo "$as_me:5841: checking for default loader flags" >&5
+ echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
+ case $DFT_LWR_MODEL in
+ (libtool) LD_MODEL=''   ;;
+@@ -5846,13 +5847,13 @@
+ (profile) LD_MODEL='-pg';;
+ (shared)  LD_MODEL=''   ;;
+ esac
+-echo "$as_me:5849: result: $LD_MODEL" >&5
++echo "$as_me:5850: result: $LD_MODEL" >&5
+ echo "${ECHO_T}$LD_MODEL" >&6
+ 
+ case $DFT_LWR_MODEL in
+ (shared)
+ 
+-echo "$as_me:5855: checking if rpath option should be used" >&5
++echo "$as_me:5856: checking if rpath option should be used" >&5
+ echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6
+ 
+ # Check whether --enable-rpath or --disable-rpath was given.
+@@ -5862,10 +5863,10 @@
+ else
+   cf_cv_enable_rpath=no
+ fi;
+-echo "$as_me:5865: result: $cf_cv_enable_rpath" >&5
++echo "$as_me:5866: result: $cf_cv_enable_rpath" >&5
+ echo "${ECHO_T}$cf_cv_enable_rpath" >&6
+ 
+-echo "$as_me:5868: checking if shared libraries should be relinked during install" >&5
++echo "$as_me:5869: checking if shared libraries should be relinked during install" >&5
+ echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6
+ 
+ # Check whether --enable-relink or --disable-relink was given.
+@@ -5875,7 +5876,7 @@
+ else
+   cf_cv_do_relink=yes
+ fi;
+-echo "$as_me:5878: result: $cf_cv_do_relink" >&5
++echo "$as_me:5879: result: $cf_cv_do_relink" >&5
+ echo "${ECHO_T}$cf_cv_do_relink" >&6
+ 	;;
+ esac
+@@ -5884,7 +5885,7 @@
+ rel_builddir=..
+ 
+ LD_RPATH_OPT=
+-echo "$as_me:5887: checking for an rpath option" >&5
++echo "$as_me:5888: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ case $cf_cv_system_name in
+ (irix*)
+@@ -5915,12 +5916,12 @@
+ (*)
+ 	;;
+ esac
+-echo "$as_me:5918: result: $LD_RPATH_OPT" >&5
++echo "$as_me:5919: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ case "x$LD_RPATH_OPT" in
+ (x-R*)
+-	echo "$as_me:5923: checking if we need a space after rpath option" >&5
++	echo "$as_me:5924: 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"
+ 
+@@ -5941,7 +5942,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 5944 "configure"
++#line 5945 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -5953,16 +5954,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5956: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5957: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5959: \$? = $ac_status" >&5
++  echo "$as_me:5960: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5962: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5963: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5965: \$? = $ac_status" >&5
++  echo "$as_me:5966: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_rpath_space=no
+ else
+@@ -5972,7 +5973,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 	LIBS="$cf_save_LIBS"
+-	echo "$as_me:5975: result: $cf_rpath_space" >&5
++	echo "$as_me:5976: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ 	test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ 	;;
+@@ -5993,7 +5994,7 @@
+ 	cf_ld_rpath_opt=
+ 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+ 
+-	echo "$as_me:5996: checking if release/abi version should be used for shared libs" >&5
++	echo "$as_me:5997: checking if release/abi version should be used for shared libs" >&5
+ echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6
+ 
+ # Check whether --with-shlib-version or --without-shlib-version was given.
+@@ -6008,9 +6009,9 @@
+ 		cf_cv_shlib_version=$withval
+ 		;;
+ 	(*)
+-		echo "$as_me:6011: result: $withval" >&5
++		echo "$as_me:6012: result: $withval" >&5
+ echo "${ECHO_T}$withval" >&6
+-		{ { echo "$as_me:6013: error: option value must be one of: rel, abi, or auto" >&5
++		{ { echo "$as_me:6014: error: option value must be one of: rel, abi, or auto" >&5
+ echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
+    { (exit 1); exit 1; }; }
+ 		;;
+@@ -6019,7 +6020,7 @@
+ else
+   cf_cv_shlib_version=auto
+ fi;
+-	echo "$as_me:6022: result: $cf_cv_shlib_version" >&5
++	echo "$as_me:6023: result: $cf_cv_shlib_version" >&5
+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
+ 
+ 	cf_cv_rm_so_locs=no
+@@ -6029,14 +6030,14 @@
+ 	CC_SHARED_OPTS=
+ 	if test "$GCC" = yes
+ 	then
+-		echo "$as_me:6032: checking which $CC option to use" >&5
++		echo "$as_me:6033: checking which $CC option to use" >&5
+ echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
+ 		cf_save_CFLAGS="$CFLAGS"
+ 		for CC_SHARED_OPTS in -fPIC -fpic ''
+ 		do
+ 			CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 6039 "configure"
++#line 6040 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6048,16 +6049,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6051: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6052: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6054: \$? = $ac_status" >&5
++  echo "$as_me:6055: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6057: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6058: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6060: \$? = $ac_status" >&5
++  echo "$as_me:6061: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -6066,7 +6067,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 		done
+-		echo "$as_me:6069: result: $CC_SHARED_OPTS" >&5
++		echo "$as_me:6070: result: $CC_SHARED_OPTS" >&5
+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ 		CFLAGS="$cf_save_CFLAGS"
+ 	fi
+@@ -6137,7 +6138,7 @@
+ 		MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
+ 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
+ 		cf_cv_shlib_version_infix=yes
+-		echo "$as_me:6140: checking if ld -search_paths_first works" >&5
++		echo "$as_me:6141: checking if ld -search_paths_first works" >&5
+ echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6
+ if test "${cf_cv_ldflags_search_paths_first+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6146,7 +6147,7 @@
+ 			cf_save_LDFLAGS=$LDFLAGS
+ 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 6149 "configure"
++#line 6150 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -6158,16 +6159,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6161: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6162: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6164: \$? = $ac_status" >&5
++  echo "$as_me:6165: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6167: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6168: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6170: \$? = $ac_status" >&5
++  echo "$as_me:6171: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ldflags_search_paths_first=yes
+ else
+@@ -6178,7 +6179,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 				LDFLAGS=$cf_save_LDFLAGS
+ fi
+-echo "$as_me:6181: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:6182: result: $cf_cv_ldflags_search_paths_first" >&5
+ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
+ 		if test $cf_cv_ldflags_search_paths_first = yes; then
+ 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+@@ -6403,7 +6404,7 @@
+ 			do
+ 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ 				cat >conftest.$ac_ext <<_ACEOF
+-#line 6406 "configure"
++#line 6407 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6415,16 +6416,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6418: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6419: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6421: \$? = $ac_status" >&5
++  echo "$as_me:6422: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6424: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6425: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6427: \$? = $ac_status" >&5
++  echo "$as_me:6428: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -6461,7 +6462,7 @@
+ 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ 			;;
+ 		(*)
+-			{ echo "$as_me:6464: WARNING: ignored --with-shlib-version" >&5
++			{ echo "$as_me:6465: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ 			;;
+ 		esac
+@@ -6471,7 +6472,7 @@
+ 	if test -n "$cf_try_cflags"
+ 	then
+ cat > conftest.$ac_ext <
+ int main(int argc, char *argv[])
+ {
+@@ -6483,18 +6484,18 @@
+ 		for cf_opt in $cf_try_cflags
+ 		do
+ 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
+-			echo "$as_me:6486: checking if CFLAGS option -$cf_opt works" >&5
++			echo "$as_me:6487: checking if CFLAGS option -$cf_opt works" >&5
+ echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6
+-			if { (eval echo "$as_me:6488: \"$ac_compile\"") >&5
++			if { (eval echo "$as_me:6489: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6491: \$? = $ac_status" >&5
++  echo "$as_me:6492: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-				echo "$as_me:6493: result: yes" >&5
++				echo "$as_me:6494: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 				cf_save_CFLAGS="$CFLAGS"
+ 			else
+-				echo "$as_me:6497: result: no" >&5
++				echo "$as_me:6498: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 			fi
+ 		done
+@@ -6509,17 +6510,17 @@
+ 
+ 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+ 
+-echo "${as_me:-configure}:6512: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++echo "${as_me:-configure}:6513: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
+ 
+-echo "${as_me:-configure}:6516: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:6517: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ for model in $cf_list_models; do
+ 	case $model in
+ 	(libtool)
+ 
+-echo "$as_me:6522: checking for additional libtool options" >&5
++echo "$as_me:6523: checking for additional libtool options" >&5
+ echo $ECHO_N "checking for additional libtool options... $ECHO_C" >&6
+ 
+ # Check whether --with-libtool-opts or --without-libtool-opts was given.
+@@ -6529,7 +6530,7 @@
+ else
+   with_libtool_opts=no
+ fi;
+-echo "$as_me:6532: result: $with_libtool_opts" >&5
++echo "$as_me:6533: result: $with_libtool_opts" >&5
+ echo "${ECHO_T}$with_libtool_opts" >&6
+ 
+ case .$with_libtool_opts in
+@@ -6540,7 +6541,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:6543: checking if exported-symbols file should be used" >&5
++echo "$as_me:6544: checking if exported-symbols file should be used" >&5
+ echo $ECHO_N "checking if exported-symbols file should be used... $ECHO_C" >&6
+ 
+ # Check whether --with-export-syms or --without-export-syms was given.
+@@ -6555,7 +6556,7 @@
+ 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
+ 
+ fi
+-echo "$as_me:6558: result: $with_export_syms" >&5
++echo "$as_me:6559: result: $with_export_syms" >&5
+ echo "${ECHO_T}$with_export_syms" >&6
+ if test "x$with_export_syms" != xno
+ then
+@@ -6566,15 +6567,15 @@
+ 		;;
+ 	(shared)
+ 		if test "$CC_SHARED_OPTS" = "unknown"; then
+-			{ { echo "$as_me:6569: error: Shared libraries are not supported in this version" >&5
++			{ { echo "$as_me:6570: error: Shared libraries are not supported in this version" >&5
+ echo "$as_me: error: Shared libraries are not supported in this version" >&2;}
+    { (exit 1); exit 1; }; }
+ 		fi
+ 		# workaround for inept transition to PIE vs PIC...
+-		echo "$as_me:6574: checking if current CFLAGS link properly" >&5
++		echo "$as_me:6575: checking if current CFLAGS link properly" >&5
+ echo $ECHO_N "checking if current CFLAGS link properly... $ECHO_C" >&6
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 6577 "configure"
++#line 6578 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6586,16 +6587,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6589: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6590: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6592: \$? = $ac_status" >&5
++  echo "$as_me:6593: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6595: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6596: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6598: \$? = $ac_status" >&5
++  echo "$as_me:6599: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cflags_work=yes
+ else
+@@ -6604,18 +6605,18 @@
+ cf_cflags_work=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-		echo "$as_me:6607: result: $cf_cflags_work" >&5
++		echo "$as_me:6608: result: $cf_cflags_work" >&5
+ echo "${ECHO_T}$cf_cflags_work" >&6
+ 		if test "$cf_cflags_work" = no
+ 		then
+ 			test -n "$verbose" && echo "	try to work around by appending shared-options" 1>&6
+ 
+-echo "${as_me:-configure}:6613: testing try to work around by appending shared-options ..." 1>&5
++echo "${as_me:-configure}:6614: testing try to work around by appending shared-options ..." 1>&5
+ 
+ 			CFLAGS="$CFLAGS $CC_SHARED_OPTS"
+ 		fi
+ 
+-echo "$as_me:6618: checking if versioned-symbols file should be used" >&5
++echo "$as_me:6619: checking if versioned-symbols file should be used" >&5
+ echo $ECHO_N "checking if versioned-symbols file should be used... $ECHO_C" >&6
+ 
+ # Check whether --with-versioned-syms or --without-versioned-syms was given.
+@@ -6630,7 +6631,7 @@
+ 	with_versioned_syms='${top_srcdir}/package/${PACKAGE}.map'
+ 
+ fi
+-echo "$as_me:6633: result: $with_versioned_syms" >&5
++echo "$as_me:6634: result: $with_versioned_syms" >&5
+ echo "${ECHO_T}$with_versioned_syms" >&6
+ 
+ RESULTING_SYMS=
+@@ -6646,7 +6647,7 @@
+ 		MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-Wl,%\\${VERSIONED_SYMS} -Wl,%"`
+ 		test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
+ 
+-echo "${as_me:-configure}:6649: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:6650: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ 		;;
+ 	(*-dy\ *)
+@@ -6654,11 +6655,11 @@
+ 		MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-dy%\\${VERSIONED_SYMS} -dy%"`
+ 		test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
+ 
+-echo "${as_me:-configure}:6657: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:6658: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ 		;;
+ 	(*)
+-		{ echo "$as_me:6661: WARNING: this system does not support versioned-symbols" >&5
++		{ echo "$as_me:6662: WARNING: this system does not support versioned-symbols" >&5
+ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
+ 		;;
+ 	esac
+@@ -6670,7 +6671,7 @@
+ 	# symbols.
+ 	if test "x$VERSIONED_SYMS" != "x"
+ 	then
+-		echo "$as_me:6673: checking if wildcards can be used to selectively omit symbols" >&5
++		echo "$as_me:6674: checking if wildcards can be used to selectively omit symbols" >&5
+ echo $ECHO_N "checking if wildcards can be used to selectively omit symbols... $ECHO_C" >&6
+ 		WILDCARD_SYMS=no
+ 
+@@ -6707,7 +6708,7 @@
+ } submodule_1.0;
+ EOF
+ 		cat >conftest.$ac_ext <&5 |fgrep _ismissing | egrep '[ 	][DT][ 	]'`
+ 			test -n "$cf_missing" && WILDCARD_SYMS=yes
+ 		fi
+-		echo "$as_me:6741: result: $WILDCARD_SYMS" >&5
++		echo "$as_me:6742: result: $WILDCARD_SYMS" >&5
+ echo "${ECHO_T}$WILDCARD_SYMS" >&6
+ 		rm -f conftest.*
+ 	fi
+@@ -6749,7 +6750,7 @@
+ done
+ 
+ # pretend that ncurses==ncursesw==ncursest
+-echo "$as_me:6752: checking if you want to disable library suffixes" >&5
++echo "$as_me:6753: checking if you want to disable library suffixes" >&5
+ echo $ECHO_N "checking if you want to disable library suffixes... $ECHO_C" >&6
+ 
+ # Check whether --enable-lib-suffixes or --disable-lib-suffixes was given.
+@@ -6766,13 +6767,13 @@
+ 	disable_lib_suffixes=no
+ 
+ fi;
+-echo "$as_me:6769: result: $disable_lib_suffixes" >&5
++echo "$as_me:6770: result: $disable_lib_suffixes" >&5
+ echo "${ECHO_T}$disable_lib_suffixes" >&6
+ 
+ ### If we're building with rpath, try to link non-standard libs that way too.
+ if test "$DFT_LWR_MODEL" = "shared"; then
+ 
+-echo "$as_me:6775: checking if rpath-hack should be disabled" >&5
++echo "$as_me:6776: 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.
+@@ -6789,21 +6790,21 @@
+ 	cf_disable_rpath_hack=no
+ 
+ fi;
+-echo "$as_me:6792: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:6793: 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:6796: checking for updated LDFLAGS" >&5
++echo "$as_me:6797: 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:6799: result: maybe" >&5
++	echo "$as_me:6800: 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:6806: checking for $ac_word" >&5
++echo "$as_me:6807: 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
+@@ -6818,7 +6819,7 @@
+   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:6821: found $ac_dir/$ac_word" >&5
++echo "$as_me:6822: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -6826,10 +6827,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+-  echo "$as_me:6829: result: $cf_ldd_prog" >&5
++  echo "$as_me:6830: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+-  echo "$as_me:6832: result: no" >&5
++  echo "$as_me:6833: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -6843,7 +6844,7 @@
+ 		cf_rpath_oops=
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6846 "configure"
++#line 6847 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6855,16 +6856,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6858: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6859: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6861: \$? = $ac_status" >&5
++  echo "$as_me:6862: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6864: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6865: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6867: \$? = $ac_status" >&5
++  echo "$as_me:6868: \$? = $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`
+@@ -6892,7 +6893,7 @@
+ 					then
+ 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+ 
+-echo "${as_me:-configure}:6895: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:6896: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+ 
+ 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ 						break
+@@ -6904,11 +6905,11 @@
+ 
+ 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:6907: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:6908: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:6911: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:6912: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -6945,7 +6946,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:6948: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:6949: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -6958,11 +6959,11 @@
+ 
+ test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:6961: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:6962: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:6965: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:6966: testing ...checking LIBS $LIBS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -6999,7 +7000,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:7002: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:7003: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -7012,14 +7013,14 @@
+ 
+ test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:7015: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:7016: testing ...checked LIBS $LIBS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:7019: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:7020: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ else
+-	echo "$as_me:7022: result: no" >&5
++	echo "$as_me:7023: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -7030,7 +7031,7 @@
+ ###############################################################################
+ 
+ ###	use option --with-extra-suffix to append suffix to headers and libraries
+-echo "$as_me:7033: checking if you wish to append extra suffix to header/library paths" >&5
++echo "$as_me:7034: checking if you wish to append extra suffix to header/library paths" >&5
+ echo $ECHO_N "checking if you wish to append extra suffix to header/library paths... $ECHO_C" >&6
+ EXTRA_SUFFIX=
+ 
+@@ -7049,11 +7050,11 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:7052: result: $EXTRA_SUFFIX" >&5
++echo "$as_me:7053: result: $EXTRA_SUFFIX" >&5
+ echo "${ECHO_T}$EXTRA_SUFFIX" >&6
+ 
+ ###	use option --disable-overwrite to leave out the link to -lcurses
+-echo "$as_me:7056: checking if you wish to install ncurses overwriting curses" >&5
++echo "$as_me:7057: checking if you wish to install ncurses overwriting curses" >&5
+ echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6
+ 
+ # Check whether --enable-overwrite or --disable-overwrite was given.
+@@ -7063,10 +7064,10 @@
+ else
+   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
+ fi;
+-echo "$as_me:7066: result: $with_overwrite" >&5
++echo "$as_me:7067: result: $with_overwrite" >&5
+ echo "${ECHO_T}$with_overwrite" >&6
+ 
+-echo "$as_me:7069: checking if external terminfo-database is used" >&5
++echo "$as_me:7070: checking if external terminfo-database is used" >&5
+ echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6
+ 
+ # Check whether --enable-database or --disable-database was given.
+@@ -7076,7 +7077,7 @@
+ else
+   use_database=yes
+ fi;
+-echo "$as_me:7079: result: $use_database" >&5
++echo "$as_me:7080: result: $use_database" >&5
+ echo "${ECHO_T}$use_database" >&6
+ 
+ case $host_os in
+@@ -7092,7 +7093,7 @@
+ if test "$use_database" != no ; then
+ 	NCURSES_USE_DATABASE=1
+ 
+-	echo "$as_me:7095: checking which terminfo source-file will be installed" >&5
++	echo "$as_me:7096: checking which terminfo source-file will be installed" >&5
+ echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6
+ 
+ # Check whether --with-database or --without-database was given.
+@@ -7100,10 +7101,10 @@
+   withval="$with_database"
+   TERMINFO_SRC=$withval
+ fi;
+-	echo "$as_me:7103: result: $TERMINFO_SRC" >&5
++	echo "$as_me:7104: result: $TERMINFO_SRC" >&5
+ echo "${ECHO_T}$TERMINFO_SRC" >&6
+ 
+-	echo "$as_me:7106: checking whether to use hashed database instead of directory/tree" >&5
++	echo "$as_me:7107: checking whether to use hashed database instead of directory/tree" >&5
+ echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6
+ 
+ # Check whether --with-hashed-db or --without-hashed-db was given.
+@@ -7113,13 +7114,13 @@
+ else
+   with_hashed_db=no
+ fi;
+-	echo "$as_me:7116: result: $with_hashed_db" >&5
++	echo "$as_me:7117: result: $with_hashed_db" >&5
+ echo "${ECHO_T}$with_hashed_db" >&6
+ else
+ 	with_hashed_db=no
+ fi
+ 
+-echo "$as_me:7122: checking for list of fallback descriptions" >&5
++echo "$as_me:7123: checking for list of fallback descriptions" >&5
+ echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6
+ 
+ # Check whether --with-fallbacks or --without-fallbacks was given.
+@@ -7129,11 +7130,11 @@
+ else
+   with_fallback=
+ fi;
+-echo "$as_me:7132: result: $with_fallback" >&5
++echo "$as_me:7133: result: $with_fallback" >&5
+ echo "${ECHO_T}$with_fallback" >&6
+ FALLBACK_LIST=`test "$with_fallback" != no && echo "$with_fallback" | sed -e 's/,/ /g'`
+ 
+-echo "$as_me:7136: checking if you want modern xterm or antique" >&5
++echo "$as_me:7137: checking if you want modern xterm or antique" >&5
+ echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6
+ 
+ # Check whether --with-xterm-new or --without-xterm-new was given.
+@@ -7147,11 +7148,11 @@
+ (no) with_xterm_new=xterm-old;;
+ (*)	 with_xterm_new=xterm-new;;
+ esac
+-echo "$as_me:7150: result: $with_xterm_new" >&5
++echo "$as_me:7151: result: $with_xterm_new" >&5
+ echo "${ECHO_T}$with_xterm_new" >&6
+ WHICH_XTERM=$with_xterm_new
+ 
+-echo "$as_me:7154: checking if xterm backspace sends BS or DEL" >&5
++echo "$as_me:7155: checking if xterm backspace sends BS or DEL" >&5
+ echo $ECHO_N "checking if xterm backspace sends BS or DEL... $ECHO_C" >&6
+ 
+ # Check whether --with-xterm-kbs or --without-xterm-kbs was given.
+@@ -7172,7 +7173,7 @@
+ 	with_xterm_kbs=$withval
+ 	;;
+ esac
+-echo "$as_me:7175: result: $with_xterm_kbs" >&5
++echo "$as_me:7176: result: $with_xterm_kbs" >&5
+ echo "${ECHO_T}$with_xterm_kbs" >&6
+ XTERM_KBS=$with_xterm_kbs
+ 
+@@ -7182,7 +7183,7 @@
+ 	MAKE_TERMINFO="#"
+ else
+ 
+-echo "$as_me:7185: checking for list of terminfo directories" >&5
++echo "$as_me:7186: checking for list of terminfo directories" >&5
+ echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6
+ 
+ # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given.
+@@ -7222,7 +7223,7 @@
+ 	cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:7225: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:7226: error: expected a pathname, not \"$cf_src_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -7245,14 +7246,14 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:7248: result: $TERMINFO_DIRS" >&5
++echo "$as_me:7249: result: $TERMINFO_DIRS" >&5
+ echo "${ECHO_T}$TERMINFO_DIRS" >&6
+ test -n "$TERMINFO_DIRS" &&
+ cat >>confdefs.h <&5
++echo "$as_me:7256: checking for default terminfo directory" >&5
+ echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6
+ 
+ # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given.
+@@ -7288,7 +7289,7 @@
+ 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:7291: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:7292: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -7297,7 +7298,7 @@
+ fi
+ eval TERMINFO="$withval"
+ 
+-echo "$as_me:7300: result: $TERMINFO" >&5
++echo "$as_me:7301: result: $TERMINFO" >&5
+ echo "${ECHO_T}$TERMINFO" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:7312: checking if big-core option selected" >&5
+ echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6
+ 
+ # Check whether --enable-big-core or --disable-big-core was given.
+@@ -7320,7 +7321,7 @@
+   with_big_core=no
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 7323 "configure"
++#line 7324 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -7334,15 +7335,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:7337: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7338: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7340: \$? = $ac_status" >&5
++  echo "$as_me:7341: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:7342: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7343: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7345: \$? = $ac_status" >&5
++  echo "$as_me:7346: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   with_big_core=yes
+ else
+@@ -7354,7 +7355,7 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi;
+-echo "$as_me:7357: result: $with_big_core" >&5
++echo "$as_me:7358: result: $with_big_core" >&5
+ echo "${ECHO_T}$with_big_core" >&6
+ test "x$with_big_core" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -7364,7 +7365,7 @@
+ ### ISO C only guarantees 512-char strings, we have tables which load faster
+ ### when constructed using "big" strings.  More than the C compiler, the awk
+ ### program is a limit on most vendor UNIX systems.  Check that we can build.
+-echo "$as_me:7367: checking if big-strings option selected" >&5
++echo "$as_me:7368: checking if big-strings option selected" >&5
+ echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6
+ 
+ # Check whether --enable-big-strings or --disable-big-strings was given.
+@@ -7388,14 +7389,14 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:7391: result: $with_big_strings" >&5
++echo "$as_me:7392: result: $with_big_strings" >&5
+ echo "${ECHO_T}$with_big_strings" >&6
+ 
+ USE_BIG_STRINGS=0
+ test "x$with_big_strings" = "xyes" && USE_BIG_STRINGS=1
+ 
+ ###	use option --enable-termcap to compile in the termcap fallback support
+-echo "$as_me:7398: checking if you want termcap-fallback support" >&5
++echo "$as_me:7399: checking if you want termcap-fallback support" >&5
+ echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6
+ 
+ # Check whether --enable-termcap or --disable-termcap was given.
+@@ -7405,14 +7406,14 @@
+ else
+   with_termcap=no
+ fi;
+-echo "$as_me:7408: result: $with_termcap" >&5
++echo "$as_me:7409: result: $with_termcap" >&5
+ echo "${ECHO_T}$with_termcap" >&6
+ 
+ NCURSES_USE_TERMCAP=0
+ if test "x$with_termcap" != "xyes" ; then
+ 	if test "$use_database" = no ; then
+ 		if test -z "$with_fallback" ; then
+-			{ { echo "$as_me:7415: error: You have disabled the database w/o specifying fallbacks" >&5
++			{ { echo "$as_me:7416: error: You have disabled the database w/o specifying fallbacks" >&5
+ echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;}
+    { (exit 1); exit 1; }; }
+ 		fi
+@@ -7425,13 +7426,13 @@
+ else
+ 
+ 	if test "$with_ticlib" != no ; then
+-		{ { echo "$as_me:7428: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
++		{ { echo "$as_me:7429: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
+ echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+ 
+ 	NCURSES_USE_TERMCAP=1
+-	echo "$as_me:7434: checking for list of termcap files" >&5
++	echo "$as_me:7435: checking for list of termcap files" >&5
+ echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6
+ 
+ # Check whether --with-termpath or --without-termpath was given.
+@@ -7471,7 +7472,7 @@
+ 	cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:7474: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:7475: error: expected a pathname, not \"$cf_src_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -7494,7 +7495,7 @@
+ 	;;
+ esac
+ 
+-	echo "$as_me:7497: result: $TERMPATH" >&5
++	echo "$as_me:7498: result: $TERMPATH" >&5
+ echo "${ECHO_T}$TERMPATH" >&6
+ 	test -n "$TERMPATH" &&
+ cat >>confdefs.h <&5
++	echo "$as_me:7506: checking if fast termcap-loader is needed" >&5
+ echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6
+ 
+ # Check whether --enable-getcap or --disable-getcap was given.
+@@ -7512,14 +7513,14 @@
+ else
+   with_getcap=no
+ fi;
+-	echo "$as_me:7515: result: $with_getcap" >&5
++	echo "$as_me:7516: result: $with_getcap" >&5
+ echo "${ECHO_T}$with_getcap" >&6
+ 	test "x$with_getcap" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+ #define USE_GETCAP 1
+ EOF
+ 
+-	echo "$as_me:7522: checking if translated termcaps will be cached in ~/.terminfo" >&5
++	echo "$as_me:7523: checking if translated termcaps will be cached in ~/.terminfo" >&5
+ echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6
+ 
+ # Check whether --enable-getcap-cache or --disable-getcap-cache was given.
+@@ -7529,7 +7530,7 @@
+ else
+   with_getcap_cache=no
+ fi;
+-	echo "$as_me:7532: result: $with_getcap_cache" >&5
++	echo "$as_me:7533: result: $with_getcap_cache" >&5
+ echo "${ECHO_T}$with_getcap_cache" >&6
+ 	test "x$with_getcap_cache" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -7539,7 +7540,7 @@
+ fi
+ 
+ ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
+-echo "$as_me:7542: checking if ~/.terminfo is wanted" >&5
++echo "$as_me:7543: checking if ~/.terminfo is wanted" >&5
+ echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6
+ 
+ # Check whether --enable-home-terminfo or --disable-home-terminfo was given.
+@@ -7549,14 +7550,14 @@
+ else
+   with_home_terminfo=yes
+ fi;
+-echo "$as_me:7552: result: $with_home_terminfo" >&5
++echo "$as_me:7553: result: $with_home_terminfo" >&5
+ echo "${ECHO_T}$with_home_terminfo" >&6
+ test "x$with_home_terminfo" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+ #define USE_HOME_TERMINFO 1
+ EOF
+ 
+-echo "$as_me:7559: checking if you want to use restricted environment when running as root" >&5
++echo "$as_me:7560: checking if you want to use restricted environment when running as root" >&5
+ echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6
+ 
+ # Check whether --enable-root-environ or --disable-root-environ was given.
+@@ -7566,7 +7567,7 @@
+ else
+   with_root_environ=yes
+ fi;
+-echo "$as_me:7569: result: $with_root_environ" >&5
++echo "$as_me:7570: result: $with_root_environ" >&5
+ echo "${ECHO_T}$with_root_environ" >&6
+ test "x$with_root_environ" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -7581,13 +7582,13 @@
+ 	unlink
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:7584: checking for $ac_func" >&5
++echo "$as_me:7585: 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 7590 "configure"
++#line 7591 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -7618,16 +7619,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7621: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7622: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7624: \$? = $ac_status" >&5
++  echo "$as_me:7625: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7627: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7628: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7630: \$? = $ac_status" >&5
++  echo "$as_me:7631: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -7637,7 +7638,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:7640: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:7641: 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 <&5
++echo "$as_me:7658: 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 7663 "configure"
++#line 7664 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -7691,16 +7692,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7694: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7695: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7697: \$? = $ac_status" >&5
++  echo "$as_me:7698: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7700: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7701: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7703: \$? = $ac_status" >&5
++  echo "$as_me:7704: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -7710,7 +7711,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:7713: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:7714: 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 <&5
++	echo "$as_me:7725: checking if link/symlink functions work" >&5
+ echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6
+ if test "${cf_cv_link_funcs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7734,7 +7735,7 @@
+ 			eval 'ac_cv_func_'$cf_func'=error'
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 7737 "configure"
++#line 7738 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -7764,15 +7765,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:7767: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7768: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7770: \$? = $ac_status" >&5
++  echo "$as_me:7771: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:7772: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7773: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7775: \$? = $ac_status" >&5
++  echo "$as_me:7776: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
+@@ -7790,7 +7791,7 @@
+ 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
+ 
+ fi
+-echo "$as_me:7793: result: $cf_cv_link_funcs" >&5
++echo "$as_me:7794: result: $cf_cv_link_funcs" >&5
+ echo "${ECHO_T}$cf_cv_link_funcs" >&6
+ 	test "$ac_cv_func_link"    = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -7810,7 +7811,7 @@
+ # soft links (symbolic links) are useful for some systems where hard links do
+ # not work, or to make it simpler to copy terminfo trees around.
+ if test "x$ac_cv_func_symlink" = xyes ; then
+-	echo "$as_me:7813: checking if tic should use symbolic links" >&5
++	echo "$as_me:7814: checking if tic should use symbolic links" >&5
+ echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6
+ 
+ # Check whether --enable-symlinks or --disable-symlinks was given.
+@@ -7820,21 +7821,21 @@
+ else
+   with_symlinks=no
+ fi;
+-	echo "$as_me:7823: result: $with_symlinks" >&5
++	echo "$as_me:7824: result: $with_symlinks" >&5
+ echo "${ECHO_T}$with_symlinks" >&6
+ fi
+ 
+ # If we have hard links and did not choose to use soft links instead, there is
+ # no reason to make this choice optional - use the hard links.
+ if test "$with_symlinks" = no ; then
+-	echo "$as_me:7830: checking if tic should use hard links" >&5
++	echo "$as_me:7831: checking if tic should use hard links" >&5
+ echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6
+ 	if test "x$ac_cv_func_link" = xyes ; then
+ 		with_links=yes
+ 	else
+ 		with_links=no
+ 	fi
+-	echo "$as_me:7837: result: $with_links" >&5
++	echo "$as_me:7838: result: $with_links" >&5
+ echo "${ECHO_T}$with_links" >&6
+ fi
+ 
+@@ -7849,7 +7850,7 @@
+ EOF
+ 
+ ###   use option --enable-broken-linker to force on use of broken-linker support
+-echo "$as_me:7852: checking if you want broken-linker support code" >&5
++echo "$as_me:7853: checking if you want broken-linker support code" >&5
+ echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
+ 
+ # Check whether --enable-broken_linker or --disable-broken_linker was given.
+@@ -7859,7 +7860,7 @@
+ else
+   with_broken_linker=${BROKEN_LINKER:-no}
+ fi;
+-echo "$as_me:7862: result: $with_broken_linker" >&5
++echo "$as_me:7863: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+ 
+ BROKEN_LINKER=0
+@@ -7881,14 +7882,14 @@
+ 		BROKEN_LINKER=1
+ 		test -n "$verbose" && echo "	cygwin linker is broken anyway" 1>&6
+ 
+-echo "${as_me:-configure}:7884: testing cygwin linker is broken anyway ..." 1>&5
++echo "${as_me:-configure}:7885: testing cygwin linker is broken anyway ..." 1>&5
+ 
+ 		;;
+ 	esac
+ fi
+ 
+ ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
+-echo "$as_me:7891: checking if tputs should process BSD-style prefix padding" >&5
++echo "$as_me:7892: checking if tputs should process BSD-style prefix padding" >&5
+ echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6
+ 
+ # Check whether --enable-bsdpad or --disable-bsdpad was given.
+@@ -7898,7 +7899,7 @@
+ else
+   with_bsdpad=no
+ fi;
+-echo "$as_me:7901: result: $with_bsdpad" >&5
++echo "$as_me:7902: result: $with_bsdpad" >&5
+ echo "${ECHO_T}$with_bsdpad" >&6
+ test "x$with_bsdpad" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -7955,14 +7956,14 @@
+ 	;;
+ (linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin)
+ 
+-echo "$as_me:7958: checking if we must define _GNU_SOURCE" >&5
++echo "$as_me:7959: 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 7965 "configure"
++#line 7966 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -7977,16 +7978,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7980: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7981: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7983: \$? = $ac_status" >&5
++  echo "$as_me:7984: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7986: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7987: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7989: \$? = $ac_status" >&5
++  echo "$as_me:7990: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -7995,7 +7996,7 @@
+ cf_save="$CPPFLAGS"
+ 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 7998 "configure"
++#line 7999 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8010,16 +8011,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8013: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8014: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8016: \$? = $ac_status" >&5
++  echo "$as_me:8017: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8019: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8020: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8022: \$? = $ac_status" >&5
++  echo "$as_me:8023: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -8034,12 +8035,12 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:8037: result: $cf_cv_gnu_source" >&5
++echo "$as_me:8038: 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:8042: checking if we should also define _DEFAULT_SOURCE" >&5
++echo "$as_me:8043: 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
+@@ -8047,7 +8048,7 @@
+ 
+ CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 8050 "configure"
++#line 8051 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8062,16 +8063,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8065: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8066: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8068: \$? = $ac_status" >&5
++  echo "$as_me:8069: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8071: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8072: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8074: \$? = $ac_status" >&5
++  echo "$as_me:8075: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -8082,7 +8083,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:8085: result: $cf_cv_default_source" >&5
++echo "$as_me:8086: 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
+@@ -8108,16 +8109,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:8111: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:8112: 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}:8117: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:8118: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 8120 "configure"
++#line 8121 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8132,16 +8133,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8135: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8136: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8138: \$? = $ac_status" >&5
++  echo "$as_me:8139: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8141: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8142: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8144: \$? = $ac_status" >&5
++  echo "$as_me:8145: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -8162,7 +8163,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 8165 "configure"
++#line 8166 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8177,16 +8178,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8180: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8181: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8183: \$? = $ac_status" >&5
++  echo "$as_me:8184: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8186: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8187: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8189: \$? = $ac_status" >&5
++  echo "$as_me:8190: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -8197,15 +8198,15 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 	 fi
+ 
+-echo "${as_me:-configure}:8200: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:8201: 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}:8205: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:8206: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 8208 "configure"
++#line 8209 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8220,16 +8221,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8223: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8224: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8226: \$? = $ac_status" >&5
++  echo "$as_me:8227: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8229: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8230: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8232: \$? = $ac_status" >&5
++  echo "$as_me:8233: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -8245,7 +8246,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:8248: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:8249: 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
+@@ -8363,14 +8364,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:8366: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:8367: 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 8373 "configure"
++#line 8374 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8389,16 +8390,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8392: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8393: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8395: \$? = $ac_status" >&5
++  echo "$as_me:8396: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8398: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8399: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8401: \$? = $ac_status" >&5
++  echo "$as_me:8402: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -8407,7 +8408,7 @@
+ cf_save="$CPPFLAGS"
+ 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 8410 "configure"
++#line 8411 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8426,16 +8427,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8429: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8430: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8432: \$? = $ac_status" >&5
++  echo "$as_me:8433: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8435: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8436: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8438: \$? = $ac_status" >&5
++  echo "$as_me:8439: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -8450,7 +8451,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:8453: result: $cf_cv_xopen_source" >&5
++echo "$as_me:8454: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -8558,16 +8559,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:8561: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:8562: 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}:8567: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:8568: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 8570 "configure"
++#line 8571 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8582,16 +8583,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8585: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8586: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8588: \$? = $ac_status" >&5
++  echo "$as_me:8589: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8591: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8592: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8594: \$? = $ac_status" >&5
++  echo "$as_me:8595: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -8612,7 +8613,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 8615 "configure"
++#line 8616 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8627,16 +8628,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8630: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8631: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8633: \$? = $ac_status" >&5
++  echo "$as_me:8634: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8636: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8637: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8639: \$? = $ac_status" >&5
++  echo "$as_me:8640: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -8647,15 +8648,15 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 	 fi
+ 
+-echo "${as_me:-configure}:8650: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:8651: 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}:8655: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:8656: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 8658 "configure"
++#line 8659 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8670,16 +8671,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8673: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8674: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8676: \$? = $ac_status" >&5
++  echo "$as_me:8677: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8679: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8680: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8682: \$? = $ac_status" >&5
++  echo "$as_me:8683: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -8695,7 +8696,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:8698: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:8699: 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
+@@ -8853,7 +8854,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:8856: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:8857: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	CFLAGS="$CFLAGS $cf_new_cflags"
+ fi
+@@ -8861,7 +8862,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:8864: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:8865: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+ fi
+@@ -8869,7 +8870,7 @@
+ 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}:8872: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:8873: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+ 
+ 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+ fi
+@@ -8877,10 +8878,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:8880: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:8881: 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 8883 "configure"
++#line 8884 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8895,16 +8896,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8898: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8899: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8901: \$? = $ac_status" >&5
++  echo "$as_me:8902: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8904: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8905: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8907: \$? = $ac_status" >&5
++  echo "$as_me:8908: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -8913,12 +8914,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-	echo "$as_me:8916: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:8917: 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 8921 "configure"
++#line 8922 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8933,16 +8934,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8936: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8937: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8939: \$? = $ac_status" >&5
++  echo "$as_me:8940: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8942: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8943: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8945: \$? = $ac_status" >&5
++  echo "$as_me:8946: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -8953,19 +8954,19 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 		if test $cf_XOPEN_SOURCE_set_ok = no
+ 		then
+-			{ echo "$as_me:8956: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:8957: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:8961: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:8962: 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 8968 "configure"
++#line 8969 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8984,16 +8985,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8987: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8988: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8990: \$? = $ac_status" >&5
++  echo "$as_me:8991: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8993: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8994: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8996: \$? = $ac_status" >&5
++  echo "$as_me:8997: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -9002,7 +9003,7 @@
+ cf_save="$CPPFLAGS"
+ 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 9005 "configure"
++#line 9006 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -9021,16 +9022,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9024: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9025: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9027: \$? = $ac_status" >&5
++  echo "$as_me:9028: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9030: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9031: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9033: \$? = $ac_status" >&5
++  echo "$as_me:9034: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -9045,7 +9046,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:9048: result: $cf_cv_xopen_source" >&5
++echo "$as_me:9049: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -9147,14 +9148,14 @@
+ 
+ # Work around breakage on OS X
+ 
+-echo "$as_me:9150: checking if SIGWINCH is defined" >&5
++echo "$as_me:9151: 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 9157 "configure"
++#line 9158 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -9169,23 +9170,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9172: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9173: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9175: \$? = $ac_status" >&5
++  echo "$as_me:9176: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9178: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9179: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9181: \$? = $ac_status" >&5
++  echo "$as_me:9182: \$? = $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 9188 "configure"
++#line 9189 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -9203,16 +9204,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9206: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9207: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9209: \$? = $ac_status" >&5
++  echo "$as_me:9210: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9212: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9213: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9215: \$? = $ac_status" >&5
++  echo "$as_me:9216: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_define_sigwinch=maybe
+ else
+@@ -9226,11 +9227,11 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:9229: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:9230: 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:9233: checking for actual SIGWINCH definition" >&5
++echo "$as_me:9234: 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
+@@ -9241,7 +9242,7 @@
+ while test $cf_sigwinch != 1
+ do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 9244 "configure"
++#line 9245 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -9263,16 +9264,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9266: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9267: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9269: \$? = $ac_status" >&5
++  echo "$as_me:9270: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9272: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9273: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9275: \$? = $ac_status" >&5
++  echo "$as_me:9276: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_fixup_sigwinch=$cf_sigwinch
+ 	 break
+@@ -9286,7 +9287,7 @@
+ done
+ 
+ fi
+-echo "$as_me:9289: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:9290: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+ 
+ 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -9296,13 +9297,13 @@
+ 
+ # Checks for CODESET support.
+ 
+-echo "$as_me:9299: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:9300: 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 9305 "configure"
++#line 9306 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9314,16 +9315,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9317: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9318: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9320: \$? = $ac_status" >&5
++  echo "$as_me:9321: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9323: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9324: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9326: \$? = $ac_status" >&5
++  echo "$as_me:9327: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   am_cv_langinfo_codeset=yes
+ else
+@@ -9334,7 +9335,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:9337: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:9338: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ 	if test $am_cv_langinfo_codeset = yes; then
+ 
+@@ -9348,7 +9349,7 @@
+ NCURSES_OK_WCHAR_T=
+ NCURSES_OK_WINT_T=
+ 
+-echo "$as_me:9351: checking if you want wide-character code" >&5
++echo "$as_me:9352: checking if you want wide-character code" >&5
+ echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6
+ 
+ # Check whether --enable-widec or --disable-widec was given.
+@@ -9358,7 +9359,7 @@
+ else
+   with_widec=no
+ fi;
+-echo "$as_me:9361: result: $with_widec" >&5
++echo "$as_me:9362: result: $with_widec" >&5
+ echo "${ECHO_T}$with_widec" >&6
+ 
+ NCURSES_WCWIDTH_GRAPHICS=1
+@@ -9376,14 +9377,14 @@
+ #define NCURSES_WIDECHAR 1
+ EOF
+ 
+-echo "$as_me:9379: checking if wchar.h can be used as is" >&5
++echo "$as_me:9380: checking if wchar.h can be used as is" >&5
+ echo $ECHO_N "checking if wchar.h can be used as is... $ECHO_C" >&6
+ if test "${cf_cv_wchar_h_okay+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9386 "configure"
++#line 9387 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -9400,16 +9401,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9403: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9404: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9406: \$? = $ac_status" >&5
++  echo "$as_me:9407: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9409: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9410: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9412: \$? = $ac_status" >&5
++  echo "$as_me:9413: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wchar_h_okay=yes
+ else
+@@ -9419,16 +9420,16 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:9422: result: $cf_cv_wchar_h_okay" >&5
++echo "$as_me:9423: result: $cf_cv_wchar_h_okay" >&5
+ echo "${ECHO_T}$cf_cv_wchar_h_okay" >&6
+ 
+ if test $cf_cv_wchar_h_okay = no
+ then
+ 
+-echo "$as_me:9428: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
++echo "$as_me:9429: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+ echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9431 "configure"
++#line 9432 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -9444,16 +9445,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9447: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9448: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9450: \$? = $ac_status" >&5
++  echo "$as_me:9451: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9453: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9454: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9456: \$? = $ac_status" >&5
++  echo "$as_me:9457: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=no
+ else
+@@ -9462,16 +9463,16 @@
+ cf_result=yes
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:9465: result: $cf_result" >&5
++echo "$as_me:9466: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ if test "$cf_result" = yes ; then
+ 	CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
+ elif test "x" != "x" ; then
+-	echo "$as_me:9471: checking checking for compatible value versus " >&5
++	echo "$as_me:9472: checking checking for compatible value versus " >&5
+ echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 9474 "configure"
++#line 9475 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -9487,16 +9488,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9490: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9491: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9493: \$? = $ac_status" >&5
++  echo "$as_me:9494: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9496: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9497: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9499: \$? = $ac_status" >&5
++  echo "$as_me:9500: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -9505,7 +9506,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-	echo "$as_me:9508: result: $cf_result" >&5
++	echo "$as_me:9509: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" = no ; then
+ 		# perhaps we can override it - try...
+@@ -9515,7 +9516,7 @@
+ 
+ fi
+ 
+-echo "$as_me:9518: checking if wcwidth agrees graphics are single-width" >&5
++echo "$as_me:9519: checking if wcwidth agrees graphics are single-width" >&5
+ echo $ECHO_N "checking if wcwidth agrees graphics are single-width... $ECHO_C" >&6
+ if test "${cf_cv_wcwidth_graphics+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9586,7 +9587,7 @@
+   cf_cv_wcwidth_graphics=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9589 "configure"
++#line 9590 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -9630,15 +9631,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:9633: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9634: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9636: \$? = $ac_status" >&5
++  echo "$as_me:9637: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:9638: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9639: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9641: \$? = $ac_status" >&5
++  echo "$as_me:9642: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wcwidth_graphics=yes
+ else
+@@ -9651,7 +9652,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:9654: result: $cf_cv_wcwidth_graphics" >&5
++echo "$as_me:9655: result: $cf_cv_wcwidth_graphics" >&5
+ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
+ 
+ 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
+@@ -9662,13 +9663,13 @@
+ for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:9665: checking for $ac_func" >&5
++echo "$as_me:9666: 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 9671 "configure"
++#line 9672 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -9699,16 +9700,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9702: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9703: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9705: \$? = $ac_status" >&5
++  echo "$as_me:9706: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9708: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9709: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9711: \$? = $ac_status" >&5
++  echo "$as_me:9712: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -9718,7 +9719,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:9721: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:9722: 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 <&5
++echo "$as_me:9734: 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
+@@ -9738,7 +9739,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 9741 "configure"
++#line 9742 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -9751,16 +9752,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9754: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9755: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9757: \$? = $ac_status" >&5
++  echo "$as_me:9758: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9760: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9761: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9763: \$? = $ac_status" >&5
++  echo "$as_me:9764: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -9772,12 +9773,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:9775: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:9776: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9780 "configure"
++#line 9781 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -9790,16 +9791,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9793: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9794: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9796: \$? = $ac_status" >&5
++  echo "$as_me:9797: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9799: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9800: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9802: \$? = $ac_status" >&5
++  echo "$as_me:9803: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -9813,7 +9814,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9816 "configure"
++#line 9817 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -9826,16 +9827,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9829: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9830: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9832: \$? = $ac_status" >&5
++  echo "$as_me:9833: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9835: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9836: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9838: \$? = $ac_status" >&5
++  echo "$as_me:9839: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -9852,9 +9853,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:9855: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:9856: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:9857: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:9858: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -9945,11 +9946,11 @@
+ 		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}:9948: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:9949: 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 9952 "configure"
++#line 9953 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -9962,21 +9963,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9965: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9966: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9968: \$? = $ac_status" >&5
++  echo "$as_me:9969: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9971: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9972: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9974: \$? = $ac_status" >&5
++  echo "$as_me:9975: \$? = $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}:9979: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:9980: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -9994,7 +9995,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:9997: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:9998: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -10069,13 +10070,13 @@
+ 				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}:10072: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:10073: 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 10078 "configure"
++#line 10079 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -10088,21 +10089,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10091: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10092: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10094: \$? = $ac_status" >&5
++  echo "$as_me:10095: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10097: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10098: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10100: \$? = $ac_status" >&5
++  echo "$as_me:10101: \$? = $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}:10105: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:10106: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -10144,7 +10145,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:10147: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:10148: 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
+@@ -10179,7 +10180,7 @@
+ 			  cf_save_CPPFLAGS=$CPPFLAGS
+ 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 10182 "configure"
++#line 10183 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10191,16 +10192,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10194: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10195: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10197: \$? = $ac_status" >&5
++  echo "$as_me:10198: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10200: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10201: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10203: \$? = $ac_status" >&5
++  echo "$as_me:10204: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -10217,7 +10218,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:10220: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:10221: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -10253,7 +10254,7 @@
+ 			if test "$cf_have_libdir" = no ; then
+ 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+ 
+-echo "${as_me:-configure}:10256: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:10257: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -10285,14 +10286,14 @@
+ 	fi
+ 
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:10288: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:10289: 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_mbstate_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10295 "configure"
++#line 10296 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -10310,23 +10311,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10313: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10314: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10316: \$? = $ac_status" >&5
++  echo "$as_me:10317: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10319: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10320: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10322: \$? = $ac_status" >&5
++  echo "$as_me:10323: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_mbstate_t=no
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10329 "configure"
++#line 10330 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -10345,16 +10346,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10348: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10349: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10351: \$? = $ac_status" >&5
++  echo "$as_me:10352: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10354: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10355: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10357: \$? = $ac_status" >&5
++  echo "$as_me:10358: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_mbstate_t=yes
+ else
+@@ -10366,7 +10367,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:10369: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:10370: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+ 
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -10384,14 +10385,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:10387: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:10388: checking if we must include wchar.h to declare wchar_t" >&5
+ echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
+ if test "${cf_cv_wchar_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10394 "configure"
++#line 10395 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -10409,23 +10410,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10412: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10413: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10415: \$? = $ac_status" >&5
++  echo "$as_me:10416: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10418: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10419: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10421: \$? = $ac_status" >&5
++  echo "$as_me:10422: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wchar_t=no
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10428 "configure"
++#line 10429 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -10444,16 +10445,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10447: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10448: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10450: \$? = $ac_status" >&5
++  echo "$as_me:10451: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10453: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10454: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10456: \$? = $ac_status" >&5
++  echo "$as_me:10457: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wchar_t=yes
+ else
+@@ -10465,7 +10466,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:10468: result: $cf_cv_wchar_t" >&5
++echo "$as_me:10469: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+ 
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -10488,14 +10489,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:10491: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:10492: checking if we must include wchar.h to declare wint_t" >&5
+ echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
+ if test "${cf_cv_wint_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10498 "configure"
++#line 10499 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -10513,23 +10514,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10516: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10517: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10519: \$? = $ac_status" >&5
++  echo "$as_me:10520: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10522: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10523: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10525: \$? = $ac_status" >&5
++  echo "$as_me:10526: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wint_t=no
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10532 "configure"
++#line 10533 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -10548,16 +10549,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10551: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10552: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10554: \$? = $ac_status" >&5
++  echo "$as_me:10555: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10557: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10558: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10560: \$? = $ac_status" >&5
++  echo "$as_me:10561: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wint_t=yes
+ else
+@@ -10569,7 +10570,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:10572: result: $cf_cv_wint_t" >&5
++echo "$as_me:10573: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+ 
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -10601,7 +10602,7 @@
+ fi
+ 
+ ###   use option --disable-lp64 to allow long chtype
+-echo "$as_me:10604: checking whether to enable _LP64 definition in curses.h" >&5
++echo "$as_me:10605: checking whether to enable _LP64 definition in curses.h" >&5
+ echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6
+ 
+ # Check whether --enable-lp64 or --disable-lp64 was given.
+@@ -10611,7 +10612,7 @@
+ else
+   with_lp64=$cf_dft_with_lp64
+ fi;
+-echo "$as_me:10614: result: $with_lp64" >&5
++echo "$as_me:10615: result: $with_lp64" >&5
+ echo "${ECHO_T}$with_lp64" >&6
+ 
+ if test "x$with_lp64" = xyes ; then
+@@ -10627,7 +10628,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+ 
+-  echo "$as_me:10630: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:10631: 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
+@@ -10639,7 +10640,7 @@
+      	 # 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 10642 "configure"
++#line 10643 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -10659,16 +10660,16 @@
+ }
+ _ACEOF
+      	 rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10662: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10663: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10665: \$? = $ac_status" >&5
++  echo "$as_me:10666: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10668: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10669: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10671: \$? = $ac_status" >&5
++  echo "$as_me:10672: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -10678,16 +10679,16 @@
+ rm -f conftest.$ac_objext
+      	 CC="$CC -n32"
+      	 rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10681: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10682: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10684: \$? = $ac_status" >&5
++  echo "$as_me:10685: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10687: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10688: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10690: \$? = $ac_status" >&5
++  echo "$as_me:10691: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -10701,13 +10702,13 @@
+        rm -f conftest.$ac_ext
+     fi
+ fi
+-echo "$as_me:10704: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:10705: 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:10710: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:10711: 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
+@@ -10715,7 +10716,7 @@
+   while :; do
+   ac_cv_sys_file_offset_bits=no
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 10718 "configure"
++#line 10719 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -10735,16 +10736,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10738: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10739: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10741: \$? = $ac_status" >&5
++  echo "$as_me:10742: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10744: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10745: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10747: \$? = $ac_status" >&5
++  echo "$as_me:10748: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -10753,7 +10754,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 10756 "configure"
++#line 10757 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include 
+@@ -10774,16 +10775,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10777: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10778: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10780: \$? = $ac_status" >&5
++  echo "$as_me:10781: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10783: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10784: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10786: \$? = $ac_status" >&5
++  echo "$as_me:10787: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -10794,7 +10795,7 @@
+   break
+ done
+ fi
+-echo "$as_me:10797: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:10798: 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
+ 
+@@ -10804,7 +10805,7 @@
+ 
+ fi
+ rm -rf conftest*
+-  echo "$as_me:10807: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:10808: 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
+@@ -10812,7 +10813,7 @@
+   while :; do
+   ac_cv_sys_large_files=no
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 10815 "configure"
++#line 10816 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -10832,16 +10833,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10835: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10836: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10838: \$? = $ac_status" >&5
++  echo "$as_me:10839: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10841: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10842: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10844: \$? = $ac_status" >&5
++  echo "$as_me:10845: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -10850,7 +10851,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 10853 "configure"
++#line 10854 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include 
+@@ -10871,16 +10872,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10874: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10875: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10877: \$? = $ac_status" >&5
++  echo "$as_me:10878: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10880: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10881: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10883: \$? = $ac_status" >&5
++  echo "$as_me:10884: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sys_large_files=1; break
+ else
+@@ -10891,7 +10892,7 @@
+   break
+ done
+ fi
+-echo "$as_me:10894: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:10895: 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
+ 
+@@ -10904,7 +10905,7 @@
+ fi
+ 
+ 	if test "$enable_largefile" != no ; then
+-	echo "$as_me:10907: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++	echo "$as_me:10908: 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
+@@ -10912,7 +10913,7 @@
+   while :; do
+   ac_cv_sys_largefile_source=no
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 10915 "configure"
++#line 10916 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10924,16 +10925,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10927: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10928: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10930: \$? = $ac_status" >&5
++  echo "$as_me:10931: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10933: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10934: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10936: \$? = $ac_status" >&5
++  echo "$as_me:10937: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -10942,7 +10943,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 10945 "configure"
++#line 10946 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include 
+@@ -10955,16 +10956,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10958: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10959: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10961: \$? = $ac_status" >&5
++  echo "$as_me:10962: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10964: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10965: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10967: \$? = $ac_status" >&5
++  echo "$as_me:10968: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sys_largefile_source=1; break
+ else
+@@ -10975,7 +10976,7 @@
+   break
+ done
+ fi
+-echo "$as_me:10978: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:10979: 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
+ 
+@@ -10989,13 +10990,13 @@
+ # 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:10992: checking for fseeko" >&5
++echo "$as_me:10993: 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 10998 "configure"
++#line 10999 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11007,16 +11008,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11010: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11011: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11013: \$? = $ac_status" >&5
++  echo "$as_me:11014: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11016: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11017: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11019: \$? = $ac_status" >&5
++  echo "$as_me:11020: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_fseeko=yes
+ else
+@@ -11026,7 +11027,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:11029: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:11030: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+ 
+@@ -11047,14 +11048,14 @@
+ 	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:11050: checking whether to use struct dirent64" >&5
++	echo "$as_me:11051: 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 11057 "configure"
++#line 11058 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -11075,16 +11076,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11078: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11079: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11081: \$? = $ac_status" >&5
++  echo "$as_me:11082: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11084: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11085: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11087: \$? = $ac_status" >&5
++  echo "$as_me:11088: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_struct_dirent64=yes
+ else
+@@ -11095,7 +11096,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:11098: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:11099: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ 	test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -11105,7 +11106,7 @@
+ 	fi
+ 
+ ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
+-echo "$as_me:11108: checking if you want tparm not to use X/Open fixed-parameter list" >&5
++echo "$as_me:11109: checking if you want tparm not to use X/Open fixed-parameter list" >&5
+ echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6
+ 
+ # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given.
+@@ -11115,14 +11116,14 @@
+ else
+   with_tparm_varargs=yes
+ fi;
+-echo "$as_me:11118: result: $with_tparm_varargs" >&5
++echo "$as_me:11119: result: $with_tparm_varargs" >&5
+ echo "${ECHO_T}$with_tparm_varargs" >&6
+ NCURSES_TPARM_VARARGS=0
+ test "x$with_tparm_varargs" = xyes && NCURSES_TPARM_VARARGS=1
+ 
+ ###   use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw
+ if test "$with_ticlib" != no ; then
+-echo "$as_me:11125: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
++echo "$as_me:11126: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
+ echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6
+ 
+ # Check whether --enable-tic-depends or --disable-tic-depends was given.
+@@ -11132,14 +11133,35 @@
+ else
+   with_tic_depends=yes
+ fi;
+-echo "$as_me:11135: result: $with_tic_depends" >&5
++echo "$as_me:11136: result: $with_tic_depends" >&5
+ echo "${ECHO_T}$with_tic_depends" >&6
+ else
+ 	with_tic_depends=no
+ fi
+ 
++###   use option --disable-wattr-macros to suppress wattr* macros from curses.h
++echo "$as_me:11143: checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition" >&5
++echo $ECHO_N "checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition... $ECHO_C" >&6
++
++# Check whether --enable-wattr-macros or --disable-wattr-macros was given.
++if test "${enable_wattr_macros+set}" = set; then
++  enableval="$enable_wattr_macros"
++  with_wattr_macros=$enableval
++else
++  with_wattr_macros=yes
++fi;
++if [ "x$with_wattr_macros" != xyes ]; then
++	NCURSES_WATTR_MACROS=0
++	echo "$as_me:11155: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++else
++	NCURSES_WATTR_MACROS=1
++	echo "$as_me:11159: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
+ ###   use option --with-bool to override bool's type
+-echo "$as_me:11142: checking for type of bool" >&5
++echo "$as_me:11164: checking for type of bool" >&5
+ echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
+ 
+ # Check whether --with-bool or --without-bool was given.
+@@ -11149,10 +11171,10 @@
+ else
+   NCURSES_BOOL=auto
+ fi;
+-echo "$as_me:11152: result: $NCURSES_BOOL" >&5
++echo "$as_me:11174: result: $NCURSES_BOOL" >&5
+ echo "${ECHO_T}$NCURSES_BOOL" >&6
+ 
+-echo "$as_me:11155: checking for alternate terminal capabilities file" >&5
++echo "$as_me:11177: checking for alternate terminal capabilities file" >&5
+ echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6
+ 
+ # Check whether --with-caps or --without-caps was given.
+@@ -11163,11 +11185,11 @@
+   TERMINFO_CAPS=Caps
+ fi;
+ test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
+-echo "$as_me:11166: result: $TERMINFO_CAPS" >&5
++echo "$as_me:11188: result: $TERMINFO_CAPS" >&5
+ echo "${ECHO_T}$TERMINFO_CAPS" >&6
+ 
+ ###   use option --with-chtype to override chtype's type
+-echo "$as_me:11170: checking for type of chtype" >&5
++echo "$as_me:11192: checking for type of chtype" >&5
+ echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
+ 
+ # Check whether --with-chtype or --without-chtype was given.
+@@ -11177,11 +11199,11 @@
+ else
+   NCURSES_CHTYPE=$cf_dft_chtype
+ fi;
+-echo "$as_me:11180: result: $NCURSES_CHTYPE" >&5
++echo "$as_me:11202: result: $NCURSES_CHTYPE" >&5
+ echo "${ECHO_T}$NCURSES_CHTYPE" >&6
+ 
+ ###   use option --with-ospeed to override ospeed's type
+-echo "$as_me:11184: checking for type of ospeed" >&5
++echo "$as_me:11206: checking for type of ospeed" >&5
+ echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6
+ 
+ # Check whether --with-ospeed or --without-ospeed was given.
+@@ -11191,11 +11213,11 @@
+ else
+   NCURSES_OSPEED=short
+ fi;
+-echo "$as_me:11194: result: $NCURSES_OSPEED" >&5
++echo "$as_me:11216: result: $NCURSES_OSPEED" >&5
+ echo "${ECHO_T}$NCURSES_OSPEED" >&6
+ 
+ ###   use option --with-mmask-t to override mmask_t's type
+-echo "$as_me:11198: checking for type of mmask_t" >&5
++echo "$as_me:11220: checking for type of mmask_t" >&5
+ echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6
+ 
+ # Check whether --with-mmask-t or --without-mmask-t was given.
+@@ -11205,11 +11227,11 @@
+ else
+   NCURSES_MMASK_T=$cf_dft_mmask_t
+ fi;
+-echo "$as_me:11208: result: $NCURSES_MMASK_T" >&5
++echo "$as_me:11230: result: $NCURSES_MMASK_T" >&5
+ echo "${ECHO_T}$NCURSES_MMASK_T" >&6
+ 
+ ###   use option --with-ccharw-max to override CCHARW_MAX size
+-echo "$as_me:11212: checking for size CCHARW_MAX" >&5
++echo "$as_me:11234: checking for size CCHARW_MAX" >&5
+ echo $ECHO_N "checking for size CCHARW_MAX... $ECHO_C" >&6
+ 
+ # Check whether --with-ccharw-max or --without-ccharw-max was given.
+@@ -11219,11 +11241,11 @@
+ else
+   NCURSES_CCHARW_MAX=5
+ fi;
+-echo "$as_me:11222: result: $NCURSES_CCHARW_MAX" >&5
++echo "$as_me:11244: result: $NCURSES_CCHARW_MAX" >&5
+ echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
+ 
+ ###   use option --with-tparm-arg to override tparm's argument type
+-echo "$as_me:11226: checking for type of tparm args" >&5
++echo "$as_me:11248: checking for type of tparm args" >&5
+ echo $ECHO_N "checking for type of tparm args... $ECHO_C" >&6
+ 
+ # Check whether --with-tparm-arg or --without-tparm-arg was given.
+@@ -11233,11 +11255,11 @@
+ else
+   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
+ fi;
+-echo "$as_me:11236: result: $NCURSES_TPARM_ARG" >&5
++echo "$as_me:11258: result: $NCURSES_TPARM_ARG" >&5
+ echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
+ 
+ ### Enable compiling-in rcs id's
+-echo "$as_me:11240: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:11262: checking if RCS identifiers should be compiled-in" >&5
+ echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6
+ 
+ # Check whether --with-rcs-ids or --without-rcs-ids was given.
+@@ -11247,7 +11269,7 @@
+ else
+   with_rcs_ids=no
+ fi;
+-echo "$as_me:11250: result: $with_rcs_ids" >&5
++echo "$as_me:11272: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "x$with_rcs_ids" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -11256,7 +11278,7 @@
+ 
+ ###############################################################################
+ 
+-echo "$as_me:11259: checking format of man-pages" >&5
++echo "$as_me:11281: checking format of man-pages" >&5
+ echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6
+ 
+ # Check whether --with-manpage-format or --without-manpage-format was given.
+@@ -11345,14 +11367,14 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:11348: result: $MANPAGE_FORMAT" >&5
++echo "$as_me:11370: result: $MANPAGE_FORMAT" >&5
+ echo "${ECHO_T}$MANPAGE_FORMAT" >&6
+ if test -n "$cf_unknown" ; then
+-	{ echo "$as_me:11351: WARNING: Unexpected manpage-format $cf_unknown" >&5
++	{ echo "$as_me:11373: WARNING: Unexpected manpage-format $cf_unknown" >&5
+ echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
+ fi
+ 
+-echo "$as_me:11355: checking for manpage renaming" >&5
++echo "$as_me:11377: checking for manpage renaming" >&5
+ echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6
+ 
+ # Check whether --with-manpage-renames or --without-manpage-renames was given.
+@@ -11380,7 +11402,7 @@
+ 	if test -f $srcdir/man/$MANPAGE_RENAMES ; then
+ 		MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES
+ 	elif test ! -f $MANPAGE_RENAMES ; then
+-		{ { echo "$as_me:11383: error: not a filename: $MANPAGE_RENAMES" >&5
++		{ { echo "$as_me:11405: error: not a filename: $MANPAGE_RENAMES" >&5
+ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -11394,10 +11416,10 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:11397: result: $MANPAGE_RENAMES" >&5
++echo "$as_me:11419: result: $MANPAGE_RENAMES" >&5
+ echo "${ECHO_T}$MANPAGE_RENAMES" >&6
+ 
+-echo "$as_me:11400: checking if manpage aliases will be installed" >&5
++echo "$as_me:11422: checking if manpage aliases will be installed" >&5
+ echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6
+ 
+ # Check whether --with-manpage-aliases or --without-manpage-aliases was given.
+@@ -11408,7 +11430,7 @@
+   MANPAGE_ALIASES=yes
+ fi;
+ 
+-echo "$as_me:11411: result: $MANPAGE_ALIASES" >&5
++echo "$as_me:11433: result: $MANPAGE_ALIASES" >&5
+ echo "${ECHO_T}$MANPAGE_ALIASES" >&6
+ 
+ case "x$LN_S" in
+@@ -11422,7 +11444,7 @@
+ 
+ MANPAGE_SYMLINKS=no
+ if test "$MANPAGE_ALIASES" = yes ; then
+-echo "$as_me:11425: checking if manpage symlinks should be used" >&5
++echo "$as_me:11447: checking if manpage symlinks should be used" >&5
+ echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6
+ 
+ # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given.
+@@ -11435,17 +11457,17 @@
+ 
+ if test "$$cf_use_symlinks" = no; then
+ if test "$MANPAGE_SYMLINKS" = yes ; then
+-	{ echo "$as_me:11438: WARNING: cannot make symlinks" >&5
++	{ echo "$as_me:11460: WARNING: cannot make symlinks" >&5
+ echo "$as_me: WARNING: cannot make symlinks" >&2;}
+ 	MANPAGE_SYMLINKS=no
+ fi
+ fi
+ 
+-echo "$as_me:11444: result: $MANPAGE_SYMLINKS" >&5
++echo "$as_me:11466: result: $MANPAGE_SYMLINKS" >&5
+ echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
+ fi
+ 
+-echo "$as_me:11448: checking for manpage tbl" >&5
++echo "$as_me:11470: checking for manpage tbl" >&5
+ echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6
+ 
+ # Check whether --with-manpage-tbl or --without-manpage-tbl was given.
+@@ -11456,7 +11478,7 @@
+   MANPAGE_TBL=no
+ fi;
+ 
+-echo "$as_me:11459: result: $MANPAGE_TBL" >&5
++echo "$as_me:11481: result: $MANPAGE_TBL" >&5
+ echo "${ECHO_T}$MANPAGE_TBL" >&6
+ 
+ if test "$prefix" = "NONE" ; then
+@@ -11789,7 +11811,7 @@
+ ###############################################################################
+ 
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:11792: checking if you want to build with function extensions" >&5
++echo "$as_me:11814: checking if you want to build with function extensions" >&5
+ echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6
+ 
+ # Check whether --enable-ext-funcs or --disable-ext-funcs was given.
+@@ -11799,7 +11821,7 @@
+ else
+   with_ext_funcs=yes
+ fi;
+-echo "$as_me:11802: result: $with_ext_funcs" >&5
++echo "$as_me:11824: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "x$with_ext_funcs" = xyes ; then
+ 	NCURSES_EXT_FUNCS=1
+@@ -11858,7 +11880,7 @@
+ 	GENERATED_EXT_FUNCS=
+ fi
+ 
+-echo "$as_me:11861: checking if you want to build with SCREEN extensions" >&5
++echo "$as_me:11883: checking if you want to build with SCREEN extensions" >&5
+ echo $ECHO_N "checking if you want to build with SCREEN extensions... $ECHO_C" >&6
+ 
+ # Check whether --enable-sp-funcs or --disable-sp-funcs was given.
+@@ -11868,7 +11890,7 @@
+ else
+   with_sp_funcs=$cf_dft_ext_spfuncs
+ fi;
+-echo "$as_me:11871: result: $with_sp_funcs" >&5
++echo "$as_me:11893: result: $with_sp_funcs" >&5
+ echo "${ECHO_T}$with_sp_funcs" >&6
+ if test "x$with_sp_funcs" = xyes ; then
+ 	NCURSES_SP_FUNCS=1
+@@ -11883,7 +11905,7 @@
+ 	GENERATED_SP_FUNCS=
+ fi
+ 
+-echo "$as_me:11886: checking if you want to build with terminal-driver" >&5
++echo "$as_me:11908: checking if you want to build with terminal-driver" >&5
+ echo $ECHO_N "checking if you want to build with terminal-driver... $ECHO_C" >&6
+ 
+ # Check whether --enable-term-driver or --disable-term-driver was given.
+@@ -11893,7 +11915,7 @@
+ else
+   with_term_driver=no
+ fi;
+-echo "$as_me:11896: result: $with_term_driver" >&5
++echo "$as_me:11918: result: $with_term_driver" >&5
+ echo "${ECHO_T}$with_term_driver" >&6
+ if test "x$with_term_driver" = xyes ; then
+ 
+@@ -11902,19 +11924,19 @@
+ EOF
+ 
+ 	if test "x$with_termlib" != xno ; then
+-		{ { echo "$as_me:11905: error: The term-driver option conflicts with the termlib option" >&5
++		{ { echo "$as_me:11927: error: The term-driver option conflicts with the termlib option" >&5
+ echo "$as_me: error: The term-driver option conflicts with the termlib option" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+ 	if test "x$with_sp_funcs" != xyes ; then
+-		{ { echo "$as_me:11910: error: The term-driver option relies upon sp-funcs" >&5
++		{ { echo "$as_me:11932: error: The term-driver option relies upon sp-funcs" >&5
+ echo "$as_me: error: The term-driver option relies upon sp-funcs" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+ fi
+ 
+ ###   use option --enable-const to turn on use of const beyond that in XSI.
+-echo "$as_me:11917: checking for extended use of const keyword" >&5
++echo "$as_me:11939: checking for extended use of const keyword" >&5
+ echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
+ 
+ # Check whether --enable-const or --disable-const was given.
+@@ -11924,7 +11946,7 @@
+ else
+   with_ext_const=$cf_dft_ext_const
+ fi;
+-echo "$as_me:11927: result: $with_ext_const" >&5
++echo "$as_me:11949: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "x$with_ext_const" = xyes ; then
+@@ -11932,7 +11954,7 @@
+ fi
+ 
+ ###   use option --enable-ext-colors to turn on use of colors beyond 16.
+-echo "$as_me:11935: checking if you want to use extended colors" >&5
++echo "$as_me:11957: checking if you want to use extended colors" >&5
+ echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6
+ 
+ # Check whether --enable-ext-colors or --disable-ext-colors was given.
+@@ -11942,12 +11964,12 @@
+ else
+   with_ext_colors=$cf_dft_ext_colors
+ fi;
+-echo "$as_me:11945: result: $with_ext_colors" >&5
++echo "$as_me:11967: result: $with_ext_colors" >&5
+ echo "${ECHO_T}$with_ext_colors" >&6
+ NCURSES_EXT_COLORS=0
+ if test "x$with_ext_colors" = xyes ; then
+ 	if test "x$with_widec" != xyes ; then
+-		{ echo "$as_me:11950: WARNING: This option applies only to wide-character library" >&5
++		{ echo "$as_me:11972: WARNING: This option applies only to wide-character library" >&5
+ echo "$as_me: WARNING: This option applies only to wide-character library" >&2;}
+ 	else
+ 		# cannot be ABI 5 since it changes sizeof(cchar_t)
+@@ -11957,7 +11979,7 @@
+ 	(5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:11960: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:11982: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -11973,7 +11995,7 @@
+ fi
+ 
+ ###   use option --enable-ext-mouse to modify coding to support 5-button mice
+-echo "$as_me:11976: checking if you want to use extended mouse encoding" >&5
++echo "$as_me:11998: checking if you want to use extended mouse encoding" >&5
+ echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6
+ 
+ # Check whether --enable-ext-mouse or --disable-ext-mouse was given.
+@@ -11983,7 +12005,7 @@
+ else
+   with_ext_mouse=$cf_dft_ext_mouse
+ fi;
+-echo "$as_me:11986: result: $with_ext_mouse" >&5
++echo "$as_me:12008: result: $with_ext_mouse" >&5
+ echo "${ECHO_T}$with_ext_mouse" >&6
+ NCURSES_MOUSE_VERSION=1
+ if test "x$with_ext_mouse" = xyes ; then
+@@ -11994,7 +12016,7 @@
+ 	(5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:11997: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:12019: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -12003,7 +12025,7 @@
+ fi
+ 
+ ###   use option --enable-ext-putwin to turn on extended screendumps
+-echo "$as_me:12006: checking if you want to use extended putwin/screendump" >&5
++echo "$as_me:12028: checking if you want to use extended putwin/screendump" >&5
+ echo $ECHO_N "checking if you want to use extended putwin/screendump... $ECHO_C" >&6
+ 
+ # Check whether --enable-ext-putwin or --disable-ext-putwin was given.
+@@ -12013,7 +12035,7 @@
+ else
+   with_ext_putwin=$cf_dft_ext_putwin
+ fi;
+-echo "$as_me:12016: result: $with_ext_putwin" >&5
++echo "$as_me:12038: result: $with_ext_putwin" >&5
+ echo "${ECHO_T}$with_ext_putwin" >&6
+ if test "x$with_ext_putwin" = xyes ; then
+ 
+@@ -12023,7 +12045,7 @@
+ 
+ fi
+ 
+-echo "$as_me:12026: checking if you want \$NCURSES_NO_PADDING code" >&5
++echo "$as_me:12048: checking if you want \$NCURSES_NO_PADDING code" >&5
+ echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6
+ 
+ # Check whether --enable-no-padding or --disable-no-padding was given.
+@@ -12033,20 +12055,20 @@
+ else
+   with_no_padding=$with_ext_funcs
+ fi;
+-echo "$as_me:12036: result: $with_no_padding" >&5
++echo "$as_me:12058: result: $with_no_padding" >&5
+ echo "${ECHO_T}$with_no_padding" >&6
+ test "x$with_no_padding" = xyes &&
+ cat >>confdefs.h <<\EOF
+ #define NCURSES_NO_PADDING 1
+ EOF
+ 
+-echo "$as_me:12043: checking for ANSI C header files" >&5
++echo "$as_me:12065: 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 12049 "configure"
++#line 12071 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -12054,13 +12076,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:12057: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:12079: \"$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:12063: \$? = $ac_status" >&5
++  echo "$as_me:12085: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12082,7 +12104,7 @@
+ 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 12085 "configure"
++#line 12107 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -12100,7 +12122,7 @@
+ 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 12103 "configure"
++#line 12125 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -12121,7 +12143,7 @@
+   :
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12124 "configure"
++#line 12146 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -12147,15 +12169,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:12150: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12172: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12153: \$? = $ac_status" >&5
++  echo "$as_me:12175: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:12155: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12177: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12158: \$? = $ac_status" >&5
++  echo "$as_me:12180: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -12168,7 +12190,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:12171: result: $ac_cv_header_stdc" >&5
++echo "$as_me:12193: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -12184,28 +12206,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:12187: checking for $ac_header" >&5
++echo "$as_me:12209: 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 12193 "configure"
++#line 12215 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12199: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12221: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12202: \$? = $ac_status" >&5
++  echo "$as_me:12224: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12205: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12227: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12208: \$? = $ac_status" >&5
++  echo "$as_me:12230: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -12215,7 +12237,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:12218: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:12240: 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 <&5
++echo "$as_me:12250: checking for signed char" >&5
+ echo $ECHO_N "checking for signed char... $ECHO_C" >&6
+ if test "${ac_cv_type_signed_char+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12234 "configure"
++#line 12256 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -12246,16 +12268,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12249: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12271: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12252: \$? = $ac_status" >&5
++  echo "$as_me:12274: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12255: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12277: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12258: \$? = $ac_status" >&5
++  echo "$as_me:12280: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -12265,10 +12287,10 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:12268: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:12290: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:12271: checking size of signed char" >&5
++echo "$as_me:12293: checking size of signed char" >&5
+ echo $ECHO_N "checking size of signed char... $ECHO_C" >&6
+ if test "${ac_cv_sizeof_signed_char+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12277,7 +12299,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12280 "configure"
++#line 12302 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -12289,21 +12311,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12292: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12314: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12295: \$? = $ac_status" >&5
++  echo "$as_me:12317: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12298: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12320: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12301: \$? = $ac_status" >&5
++  echo "$as_me:12323: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 12306 "configure"
++#line 12328 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -12315,16 +12337,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12318: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12340: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12321: \$? = $ac_status" >&5
++  echo "$as_me:12343: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12324: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12346: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12327: \$? = $ac_status" >&5
++  echo "$as_me:12349: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -12340,7 +12362,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 12343 "configure"
++#line 12365 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -12352,16 +12374,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12355: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12377: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12358: \$? = $ac_status" >&5
++  echo "$as_me:12380: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12361: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12383: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12364: \$? = $ac_status" >&5
++  echo "$as_me:12386: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -12377,7 +12399,7 @@
+ 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 12380 "configure"
++#line 12402 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -12389,16 +12411,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12392: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12414: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12395: \$? = $ac_status" >&5
++  echo "$as_me:12417: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12398: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12420: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12401: \$? = $ac_status" >&5
++  echo "$as_me:12423: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -12411,12 +12433,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:12414: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:12436: 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 12419 "configure"
++#line 12441 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -12432,15 +12454,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:12435: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12457: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12438: \$? = $ac_status" >&5
++  echo "$as_me:12460: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:12440: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12462: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12443: \$? = $ac_status" >&5
++  echo "$as_me:12465: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -12456,7 +12478,7 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:12459: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:12481: result: $ac_cv_sizeof_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:12492: checking if you want to use signed Boolean array in term.h" >&5
+ echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6
+ 
+ # Check whether --enable-signed-char or --disable-signed-char was given.
+@@ -12477,12 +12499,12 @@
+ else
+   with_signed_char=no
+ fi;
+-echo "$as_me:12480: result: $with_signed_char" >&5
++echo "$as_me:12502: result: $with_signed_char" >&5
+ echo "${ECHO_T}$with_signed_char" >&6
+ test "x$with_signed_char" != xyes && NCURSES_SBOOL="char"
+ 
+ ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
+-echo "$as_me:12485: checking if you want SIGWINCH handler" >&5
++echo "$as_me:12507: checking if you want SIGWINCH handler" >&5
+ echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6
+ 
+ # Check whether --enable-sigwinch or --disable-sigwinch was given.
+@@ -12492,7 +12514,7 @@
+ else
+   with_sigwinch=$with_ext_funcs
+ fi;
+-echo "$as_me:12495: result: $with_sigwinch" >&5
++echo "$as_me:12517: result: $with_sigwinch" >&5
+ echo "${ECHO_T}$with_sigwinch" >&6
+ test "x$with_sigwinch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -12500,7 +12522,7 @@
+ EOF
+ 
+ ###   use option --enable-tcap-names to allow user to define new capabilities
+-echo "$as_me:12503: checking if you want user-definable terminal capabilities like termcap" >&5
++echo "$as_me:12525: checking if you want user-definable terminal capabilities like termcap" >&5
+ echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6
+ 
+ # Check whether --enable-tcap-names or --disable-tcap-names was given.
+@@ -12510,7 +12532,7 @@
+ else
+   with_tcap_names=$with_ext_funcs
+ fi;
+-echo "$as_me:12513: result: $with_tcap_names" >&5
++echo "$as_me:12535: result: $with_tcap_names" >&5
+ echo "${ECHO_T}$with_tcap_names" >&6
+ NCURSES_XNAMES=0
+ test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1
+@@ -12518,7 +12540,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:12521: checking if you want all development code" >&5
++echo "$as_me:12543: checking if you want all development code" >&5
+ echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
+ 
+ # Check whether --with-develop or --without-develop was given.
+@@ -12528,11 +12550,11 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:12531: result: $with_develop" >&5
++echo "$as_me:12553: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+ 
+ ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
+-echo "$as_me:12535: checking if you want hard-tabs code" >&5
++echo "$as_me:12557: checking if you want hard-tabs code" >&5
+ echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6
+ 
+ # Check whether --enable-hard-tabs or --disable-hard-tabs was given.
+@@ -12542,7 +12564,7 @@
+ else
+   enable_hard_tabs=$with_develop
+ fi;
+-echo "$as_me:12545: result: $enable_hard_tabs" >&5
++echo "$as_me:12567: result: $enable_hard_tabs" >&5
+ echo "${ECHO_T}$enable_hard_tabs" >&6
+ test "x$enable_hard_tabs" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -12550,7 +12572,7 @@
+ EOF
+ 
+ ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
+-echo "$as_me:12553: checking if you want limited support for xmc" >&5
++echo "$as_me:12575: checking if you want limited support for xmc" >&5
+ echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6
+ 
+ # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given.
+@@ -12560,7 +12582,7 @@
+ else
+   enable_xmc_glitch=$with_develop
+ fi;
+-echo "$as_me:12563: result: $enable_xmc_glitch" >&5
++echo "$as_me:12585: result: $enable_xmc_glitch" >&5
+ echo "${ECHO_T}$enable_xmc_glitch" >&6
+ test "x$enable_xmc_glitch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -12570,7 +12592,7 @@
+ ###############################################################################
+ # These are just experimental, probably should not be in a package:
+ 
+-echo "$as_me:12573: checking if you do not want to assume colors are white-on-black" >&5
++echo "$as_me:12595: checking if you do not want to assume colors are white-on-black" >&5
+ echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6
+ 
+ # Check whether --enable-assumed-color or --disable-assumed-color was given.
+@@ -12580,7 +12602,7 @@
+ else
+   with_assumed_color=yes
+ fi;
+-echo "$as_me:12583: result: $with_assumed_color" >&5
++echo "$as_me:12605: result: $with_assumed_color" >&5
+ echo "${ECHO_T}$with_assumed_color" >&6
+ test "x$with_assumed_color" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -12588,7 +12610,7 @@
+ EOF
+ 
+ ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
+-echo "$as_me:12591: checking if you want hashmap scrolling-optimization code" >&5
++echo "$as_me:12613: checking if you want hashmap scrolling-optimization code" >&5
+ echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6
+ 
+ # Check whether --enable-hashmap or --disable-hashmap was given.
+@@ -12598,7 +12620,7 @@
+ else
+   with_hashmap=yes
+ fi;
+-echo "$as_me:12601: result: $with_hashmap" >&5
++echo "$as_me:12623: result: $with_hashmap" >&5
+ echo "${ECHO_T}$with_hashmap" >&6
+ test "x$with_hashmap" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -12606,7 +12628,7 @@
+ EOF
+ 
+ ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
+-echo "$as_me:12609: checking if you want colorfgbg code" >&5
++echo "$as_me:12631: checking if you want colorfgbg code" >&5
+ echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6
+ 
+ # Check whether --enable-colorfgbg or --disable-colorfgbg was given.
+@@ -12616,7 +12638,7 @@
+ else
+   with_colorfgbg=no
+ fi;
+-echo "$as_me:12619: result: $with_colorfgbg" >&5
++echo "$as_me:12641: result: $with_colorfgbg" >&5
+ echo "${ECHO_T}$with_colorfgbg" >&6
+ test "x$with_colorfgbg" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -12624,7 +12646,7 @@
+ EOF
+ 
+ ###   use option --enable-interop to turn on use of bindings used for interop
+-echo "$as_me:12627: checking if you want interop bindings" >&5
++echo "$as_me:12649: checking if you want interop bindings" >&5
+ echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6
+ 
+ # Check whether --enable-interop or --disable-interop was given.
+@@ -12634,7 +12656,7 @@
+ else
+   with_exp_interop=$cf_dft_interop
+ fi;
+-echo "$as_me:12637: result: $with_exp_interop" >&5
++echo "$as_me:12659: result: $with_exp_interop" >&5
+ echo "${ECHO_T}$with_exp_interop" >&6
+ 
+ NCURSES_INTEROP_FUNCS=0
+@@ -12643,7 +12665,7 @@
+ # This is still experimental (20080329), but should ultimately be moved to
+ # the script-block --with-normal, etc.
+ 
+-echo "$as_me:12646: checking if you want to link with the pthread library" >&5
++echo "$as_me:12668: checking if you want to link with the pthread library" >&5
+ echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6
+ 
+ # Check whether --with-pthread or --without-pthread was given.
+@@ -12653,27 +12675,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:12656: result: $with_pthread" >&5
++echo "$as_me:12678: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-	echo "$as_me:12660: checking for pthread.h" >&5
++	echo "$as_me:12682: checking for pthread.h" >&5
+ echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
+ if test "${ac_cv_header_pthread_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12666 "configure"
++#line 12688 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:12670: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:12692: \"$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:12676: \$? = $ac_status" >&5
++  echo "$as_me:12698: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12692,7 +12714,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:12695: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:12717: result: $ac_cv_header_pthread_h" >&5
+ echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
+ if test $ac_cv_header_pthread_h = yes; then
+ 
+@@ -12702,7 +12724,7 @@
+ 
+ 	for cf_lib_pthread in pthread c_r
+ 	do
+-	    echo "$as_me:12705: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:12727: checking if we can link with the $cf_lib_pthread library" >&5
+ echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6
+ 	    cf_save_LIBS="$LIBS"
+ 
+@@ -12723,7 +12745,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	    cat >conftest.$ac_ext <<_ACEOF
+-#line 12726 "configure"
++#line 12748 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12740,16 +12762,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12743: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12765: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12746: \$? = $ac_status" >&5
++  echo "$as_me:12768: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12749: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12771: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12752: \$? = $ac_status" >&5
++  echo "$as_me:12774: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   with_pthread=yes
+ else
+@@ -12759,7 +12781,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 	    LIBS="$cf_save_LIBS"
+-	    echo "$as_me:12762: result: $with_pthread" >&5
++	    echo "$as_me:12784: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 	    test "$with_pthread" = yes && break
+ 	done
+@@ -12787,7 +12809,7 @@
+ EOF
+ 
+ 	else
+-	    { { echo "$as_me:12790: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:12812: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -12797,13 +12819,13 @@
+ fi
+ 
+ if test "x$with_pthread" != xno; then
+-	echo "$as_me:12800: checking for pthread_kill" >&5
++	echo "$as_me:12822: checking for pthread_kill" >&5
+ echo $ECHO_N "checking for pthread_kill... $ECHO_C" >&6
+ if test "${ac_cv_func_pthread_kill+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12806 "configure"
++#line 12828 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char pthread_kill (); below.  */
+@@ -12834,16 +12856,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12837: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12859: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12840: \$? = $ac_status" >&5
++  echo "$as_me:12862: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12843: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12865: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12846: \$? = $ac_status" >&5
++  echo "$as_me:12868: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_pthread_kill=yes
+ else
+@@ -12853,11 +12875,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:12856: result: $ac_cv_func_pthread_kill" >&5
++echo "$as_me:12878: result: $ac_cv_func_pthread_kill" >&5
+ echo "${ECHO_T}$ac_cv_func_pthread_kill" >&6
+ if test $ac_cv_func_pthread_kill = yes; then
+ 
+-		echo "$as_me:12860: checking if you want to allow EINTR in wgetch with pthreads" >&5
++		echo "$as_me:12882: checking if you want to allow EINTR in wgetch with pthreads" >&5
+ echo $ECHO_N "checking if you want to allow EINTR in wgetch with pthreads... $ECHO_C" >&6
+ 
+ # Check whether --enable-pthreads-eintr or --disable-pthreads-eintr was given.
+@@ -12867,7 +12889,7 @@
+ else
+   use_pthreads_eintr=no
+ fi;
+-		echo "$as_me:12870: result: $use_pthreads_eintr" >&5
++		echo "$as_me:12892: result: $use_pthreads_eintr" >&5
+ echo "${ECHO_T}$use_pthreads_eintr" >&6
+ 		if test "x$use_pthreads_eintr" = xyes ; then
+ 
+@@ -12878,7 +12900,7 @@
+ 		fi
+ fi
+ 
+-	echo "$as_me:12881: checking if you want to use weak-symbols for pthreads" >&5
++	echo "$as_me:12903: checking if you want to use weak-symbols for pthreads" >&5
+ echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6
+ 
+ # Check whether --enable-weak-symbols or --disable-weak-symbols was given.
+@@ -12888,18 +12910,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-	echo "$as_me:12891: result: $use_weak_symbols" >&5
++	echo "$as_me:12913: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ 	if test "x$use_weak_symbols" = xyes ; then
+ 
+-echo "$as_me:12895: checking if $CC supports weak symbols" >&5
++echo "$as_me:12917: checking if $CC supports weak symbols" >&5
+ echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6
+ if test "${cf_cv_weak_symbols+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12902 "configure"
++#line 12924 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12925,16 +12947,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12928: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12950: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12931: \$? = $ac_status" >&5
++  echo "$as_me:12953: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12934: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12956: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12937: \$? = $ac_status" >&5
++  echo "$as_me:12959: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -12945,7 +12967,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:12948: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:12970: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ 	else
+@@ -12978,7 +13000,7 @@
+ # opaque outside of that, so there is no --enable-opaque option.  We can use
+ # this option without --with-pthreads, but this will be always set for
+ # pthreads.
+-echo "$as_me:12981: checking if you want reentrant code" >&5
++echo "$as_me:13003: checking if you want reentrant code" >&5
+ echo $ECHO_N "checking if you want reentrant code... $ECHO_C" >&6
+ 
+ # Check whether --enable-reentrant or --disable-reentrant was given.
+@@ -12988,7 +13010,7 @@
+ else
+   with_reentrant=no
+ fi;
+-echo "$as_me:12991: result: $with_reentrant" >&5
++echo "$as_me:13013: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "x$with_reentrant" = xyes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -13061,7 +13083,7 @@
+ 	(5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:13064: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:13086: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -13076,7 +13098,7 @@
+ 
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+-	echo "$as_me:13079: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:13101: checking for prefix used to wrap public variables" >&5
+ echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6
+ 
+ # Check whether --with-wrap-prefix or --without-wrap-prefix was given.
+@@ -13086,7 +13108,7 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-	echo "$as_me:13089: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:13111: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ 	NCURSES_WRAP_PREFIX=_nc_
+@@ -13096,7 +13118,7 @@
+ #define NCURSES_WRAP_PREFIX "$NCURSES_WRAP_PREFIX"
+ EOF
+ 
+-echo "$as_me:13099: checking if you want experimental safe-sprintf code" >&5
++echo "$as_me:13121: checking if you want experimental safe-sprintf code" >&5
+ echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6
+ 
+ # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given.
+@@ -13106,7 +13128,7 @@
+ else
+   with_safe_sprintf=no
+ fi;
+-echo "$as_me:13109: result: $with_safe_sprintf" >&5
++echo "$as_me:13131: result: $with_safe_sprintf" >&5
+ echo "${ECHO_T}$with_safe_sprintf" >&6
+ test "x$with_safe_sprintf" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -13116,7 +13138,7 @@
+ ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
+ # when hashmap is used scroll hints are useless
+ if test "$with_hashmap" = no ; then
+-echo "$as_me:13119: checking if you want to experiment without scrolling-hints code" >&5
++echo "$as_me:13141: checking if you want to experiment without scrolling-hints code" >&5
+ echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6
+ 
+ # Check whether --enable-scroll-hints or --disable-scroll-hints was given.
+@@ -13126,7 +13148,7 @@
+ else
+   with_scroll_hints=yes
+ fi;
+-echo "$as_me:13129: result: $with_scroll_hints" >&5
++echo "$as_me:13151: result: $with_scroll_hints" >&5
+ echo "${ECHO_T}$with_scroll_hints" >&6
+ test "x$with_scroll_hints" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -13135,7 +13157,7 @@
+ 
+ fi
+ 
+-echo "$as_me:13138: checking if you want wgetch-events code" >&5
++echo "$as_me:13160: checking if you want wgetch-events code" >&5
+ echo $ECHO_N "checking if you want wgetch-events code... $ECHO_C" >&6
+ 
+ # Check whether --enable-wgetch-events or --disable-wgetch-events was given.
+@@ -13145,7 +13167,7 @@
+ else
+   with_wgetch_events=no
+ fi;
+-echo "$as_me:13148: result: $with_wgetch_events" >&5
++echo "$as_me:13170: result: $with_wgetch_events" >&5
+ echo "${ECHO_T}$with_wgetch_events" >&6
+ test "x$with_wgetch_events" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -13156,7 +13178,7 @@
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+ 
+-echo "$as_me:13159: checking if you want to see long compiling messages" >&5
++echo "$as_me:13181: 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.
+@@ -13190,7 +13212,7 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:13193: result: $enableval" >&5
++echo "$as_me:13215: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+ if test "x$enable_echo" = xyes; then
+@@ -13202,7 +13224,7 @@
+ fi
+ 
+ ###	use option --enable-warnings to turn on all gcc warnings
+-echo "$as_me:13205: checking if you want to see compiler warnings" >&5
++echo "$as_me:13227: checking if you want to see compiler warnings" >&5
+ echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
+ 
+ # Check whether --enable-warnings or --disable-warnings was given.
+@@ -13210,7 +13232,7 @@
+   enableval="$enable_warnings"
+   with_warnings=$enableval
+ fi;
+-echo "$as_me:13213: result: $with_warnings" >&5
++echo "$as_me:13235: result: $with_warnings" >&5
+ echo "${ECHO_T}$with_warnings" >&6
+ 
+ if test "x$with_warnings" = "xyes"; then
+@@ -13222,12 +13244,12 @@
+ if test "$GCC" = yes ; then
+ 	case $host_os in
+ 	(linux*|gnu*)
+-		echo "$as_me:13225: checking if this is really Intel C compiler" >&5
++		echo "$as_me:13247: 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 13230 "configure"
++#line 13252 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -13244,16 +13266,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13247: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13269: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13250: \$? = $ac_status" >&5
++  echo "$as_me:13272: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13253: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13275: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13256: \$? = $ac_status" >&5
++  echo "$as_me:13278: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   INTEL_COMPILER=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -13264,7 +13286,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 		CFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:13267: result: $INTEL_COMPILER" >&5
++		echo "$as_me:13289: result: $INTEL_COMPILER" >&5
+ echo "${ECHO_T}$INTEL_COMPILER" >&6
+ 		;;
+ 	esac
+@@ -13273,12 +13295,12 @@
+ CLANG_COMPILER=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:13276: checking if this is really Clang C compiler" >&5
++	echo "$as_me:13298: 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 13281 "configure"
++#line 13303 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -13295,16 +13317,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13298: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13320: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13301: \$? = $ac_status" >&5
++  echo "$as_me:13323: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13304: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13326: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13307: \$? = $ac_status" >&5
++  echo "$as_me:13329: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   CLANG_COMPILER=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
+@@ -13315,12 +13337,12 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 	CFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:13318: result: $CLANG_COMPILER" >&5
++	echo "$as_me:13340: result: $CLANG_COMPILER" >&5
+ echo "${ECHO_T}$CLANG_COMPILER" >&6
+ fi
+ 
+ cat > conftest.$ac_ext <&5
++	{ echo "$as_me:13362: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="-Wall"
+@@ -13353,12 +13375,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:13356: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:13378: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13359: \$? = $ac_status" >&5
++  echo "$as_me:13381: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:13361: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:13383: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -13367,7 +13389,7 @@
+ 
+ elif test "$GCC" = yes
+ then
+-	{ echo "$as_me:13370: checking for $CC warning options..." >&5
++	{ echo "$as_me:13392: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS=
+@@ -13391,12 +13413,12 @@
+ 		Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:13394: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:13416: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13397: \$? = $ac_status" >&5
++  echo "$as_me:13419: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:13399: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:13421: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case $cf_opt in
+ 			(Wcast-qual)
+@@ -13407,7 +13429,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:13410: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:13432: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -13417,7 +13439,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:13420: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:13442: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -13437,12 +13459,12 @@
+ if test "$GCC" = yes ; then
+ 	case $host_os in
+ 	(linux*|gnu*)
+-		echo "$as_me:13440: checking if this is really Intel C++ compiler" >&5
++		echo "$as_me:13462: 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="$CXXFLAGS"
+ 		CXXFLAGS="$CXXFLAGS -no-gcc"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 13445 "configure"
++#line 13467 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -13459,16 +13481,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13462: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13484: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13465: \$? = $ac_status" >&5
++  echo "$as_me:13487: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13468: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13490: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13471: \$? = $ac_status" >&5
++  echo "$as_me:13493: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   INTEL_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -13479,7 +13501,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 		CXXFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:13482: result: $INTEL_CPLUSPLUS" >&5
++		echo "$as_me:13504: result: $INTEL_CPLUSPLUS" >&5
+ echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
+ 		;;
+ 	esac
+@@ -13488,12 +13510,12 @@
+ CLANG_CPLUSPLUS=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:13491: checking if this is really Clang C++ compiler" >&5
++	echo "$as_me:13513: 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="$CXXFLAGS"
+ 	CXXFLAGS="$CXXFLAGS -Qunused-arguments"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 13496 "configure"
++#line 13518 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -13510,16 +13532,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13513: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13535: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13516: \$? = $ac_status" >&5
++  echo "$as_me:13538: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13519: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13541: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13522: \$? = $ac_status" >&5
++  echo "$as_me:13544: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   CLANG_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
+@@ -13530,7 +13552,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 	CXXFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:13533: result: $CLANG_CPLUSPLUS" >&5
++	echo "$as_me:13555: result: $CLANG_CPLUSPLUS" >&5
+ echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
+ fi
+ 
+@@ -13542,7 +13564,7 @@
+ ac_main_return=return
+ 
+ cat > conftest.$ac_ext <&5
++	{ echo "$as_me:13585: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-Wall"
+@@ -13577,12 +13599,12 @@
+ 		wd981
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:13580: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:13602: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13583: \$? = $ac_status" >&5
++  echo "$as_me:13605: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:13585: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:13607: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		fi
+@@ -13591,7 +13613,7 @@
+ 
+ elif test "$GXX" = yes
+ then
+-	{ echo "$as_me:13594: checking for $CXX warning options..." >&5
++	{ echo "$as_me:13616: checking for $CXX warning options..." >&5
+ echo "$as_me: checking for $CXX warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-W -Wall"
+@@ -13621,16 +13643,16 @@
+ 		Wundef $cf_gxx_extra_warnings Wno-unused
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
+-		if { (eval echo "$as_me:13624: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:13646: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13627: \$? = $ac_status" >&5
++  echo "$as_me:13649: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:13629: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:13651: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		else
+-			test -n "$verbose" && echo "$as_me:13633: result: ... no -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:13655: result: ... no -$cf_opt" >&5
+ echo "${ECHO_T}... no -$cf_opt" >&6
+ 		fi
+ 	done
+@@ -13666,10 +13688,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:13669: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:13691: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > conftest.$ac_ext <&5
++		if { (eval echo "$as_me:13743: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13724: \$? = $ac_status" >&5
++  echo "$as_me:13746: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:13726: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:13748: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case $cf_attribute in
+@@ -13782,7 +13804,7 @@
+ rm -rf conftest*
+ fi
+ 
+-echo "$as_me:13785: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:13807: checking if you want to work around bogus compiler/loader warnings" >&5
+ echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6
+ 
+ # Check whether --enable-string-hacks or --disable-string-hacks was given.
+@@ -13792,7 +13814,7 @@
+ else
+   with_string_hacks=no
+ fi;
+-echo "$as_me:13795: result: $with_string_hacks" >&5
++echo "$as_me:13817: result: $with_string_hacks" >&5
+ echo "${ECHO_T}$with_string_hacks" >&6
+ 
+ if test "x$with_string_hacks" = "xyes"; then
+@@ -13801,15 +13823,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+ 
+-	{ echo "$as_me:13804: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++	{ echo "$as_me:13826: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+ echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;}
+-	echo "$as_me:13806: checking for strlcat" >&5
++	echo "$as_me:13828: checking for strlcat" >&5
+ echo $ECHO_N "checking for strlcat... $ECHO_C" >&6
+ if test "${ac_cv_func_strlcat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 13812 "configure"
++#line 13834 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char strlcat (); below.  */
+@@ -13840,16 +13862,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13843: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13865: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13846: \$? = $ac_status" >&5
++  echo "$as_me:13868: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13849: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13871: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13852: \$? = $ac_status" >&5
++  echo "$as_me:13874: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_strlcat=yes
+ else
+@@ -13859,7 +13881,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:13862: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:13884: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test $ac_cv_func_strlcat = yes; then
+ 
+@@ -13869,7 +13891,7 @@
+ 
+ else
+ 
+-		echo "$as_me:13872: checking for strlcat in -lbsd" >&5
++		echo "$as_me:13894: checking for strlcat in -lbsd" >&5
+ echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_strlcat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13877,7 +13899,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13880 "configure"
++#line 13902 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13896,16 +13918,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13899: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13921: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13902: \$? = $ac_status" >&5
++  echo "$as_me:13924: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13905: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13927: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13908: \$? = $ac_status" >&5
++  echo "$as_me:13930: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -13916,7 +13938,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13919: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:13941: result: $ac_cv_lib_bsd_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6
+ if test $ac_cv_lib_bsd_strlcat = yes; then
+ 
+@@ -13939,23 +13961,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:13942: checking for $ac_header" >&5
++echo "$as_me:13964: 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 13948 "configure"
++#line 13970 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:13952: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:13974: \"$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:13958: \$? = $ac_status" >&5
++  echo "$as_me:13980: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -13974,7 +13996,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:13977: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:13999: 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 <&5
++echo "$as_me:14020: 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 14004 "configure"
++#line 14026 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -14032,16 +14054,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14035: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14057: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14038: \$? = $ac_status" >&5
++  echo "$as_me:14060: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14041: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14063: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14044: \$? = $ac_status" >&5
++  echo "$as_me:14066: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -14051,7 +14073,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:14054: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:14076: 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 <&5
++echo "$as_me:14089: checking if you want to enable runtime assertions" >&5
+ echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
+ 
+ # Check whether --enable-assertions or --disable-assertions was given.
+@@ -14074,7 +14096,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:14077: result: $with_assertions" >&5
++echo "$as_me:14099: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -14090,7 +14112,7 @@
+ 
+ ###	use option --disable-leaks to suppress "permanent" leaks, for testing
+ 
+-echo "$as_me:14093: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:14115: 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.
+@@ -14107,7 +14129,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:14110: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:14132: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case .$with_cflags in
+@@ -14201,23 +14223,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:14204: checking for dmalloc.h" >&5
++	echo "$as_me:14226: 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 14210 "configure"
++#line 14232 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:14214: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:14236: \"$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:14220: \$? = $ac_status" >&5
++  echo "$as_me:14242: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -14236,11 +14258,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:14239: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:14261: 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:14243: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:14265: 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
+@@ -14248,7 +14270,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14251 "configure"
++#line 14273 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -14267,16 +14289,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14270: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14292: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14273: \$? = $ac_status" >&5
++  echo "$as_me:14295: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14276: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14298: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14279: \$? = $ac_status" >&5
++  echo "$as_me:14301: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -14287,7 +14309,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:14290: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:14312: 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 <&5
++echo "$as_me:14327: 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.
+@@ -14319,7 +14341,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:14322: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:14344: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case .$with_cflags in
+@@ -14413,23 +14435,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:14416: checking for dbmalloc.h" >&5
++	echo "$as_me:14438: 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 14422 "configure"
++#line 14444 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:14426: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:14448: \"$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:14432: \$? = $ac_status" >&5
++  echo "$as_me:14454: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -14448,11 +14470,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:14451: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:14473: 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:14455: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:14477: 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
+@@ -14460,7 +14482,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14463 "configure"
++#line 14485 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -14479,16 +14501,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14482: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14504: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14485: \$? = $ac_status" >&5
++  echo "$as_me:14507: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14488: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14510: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14491: \$? = $ac_status" >&5
++  echo "$as_me:14513: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -14499,7 +14521,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:14502: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:14524: 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 <&5
++echo "$as_me:14539: checking if you want to use valgrind for testing" >&5
+ echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
+ 
+ # Check whether --with-valgrind or --without-valgrind was given.
+@@ -14531,7 +14553,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:14534: result: ${with_valgrind:-no}" >&5
++echo "$as_me:14556: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case .$with_cflags in
+@@ -14624,7 +14646,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:14627: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:14649: checking if you want to perform memory-leak testing" >&5
+ echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
+ 
+ # Check whether --enable-leaks or --disable-leaks was given.
+@@ -14634,7 +14656,7 @@
+ else
+   : ${with_no_leaks:=no}
+ fi;
+-echo "$as_me:14637: result: $with_no_leaks" >&5
++echo "$as_me:14659: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$with_no_leaks" = yes ; then
+@@ -14686,7 +14708,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:14689: checking whether to add trace feature to all models" >&5
++echo "$as_me:14711: checking whether to add trace feature to all models" >&5
+ echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
+ 
+ # Check whether --with-trace or --without-trace was given.
+@@ -14696,7 +14718,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:14699: result: $cf_with_trace" >&5
++echo "$as_me:14721: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "x$cf_with_trace" = xyes ; then
+@@ -14786,7 +14808,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:14789: checking if we want to use GNAT projects" >&5
++echo "$as_me:14811: checking if we want to use GNAT projects" >&5
+ echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6
+ 
+ # Check whether --enable-gnat-projects or --disable-gnat-projects was given.
+@@ -14803,7 +14825,7 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:14806: result: $enable_gnat_projects" >&5
++echo "$as_me:14828: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+ 
+ ###	Checks for libraries.
+@@ -14813,13 +14835,13 @@
+ 	LIBS=" -lpsapi $LIBS"
+ 	;;
+ (*)
+-echo "$as_me:14816: checking for gettimeofday" >&5
++echo "$as_me:14838: checking for gettimeofday" >&5
+ echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
+ if test "${ac_cv_func_gettimeofday+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 14822 "configure"
++#line 14844 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char gettimeofday (); below.  */
+@@ -14850,16 +14872,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14853: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14875: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14856: \$? = $ac_status" >&5
++  echo "$as_me:14878: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14859: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14881: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14862: \$? = $ac_status" >&5
++  echo "$as_me:14884: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -14869,7 +14891,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:14872: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:14894: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test $ac_cv_func_gettimeofday = yes; then
+ 
+@@ -14879,7 +14901,7 @@
+ 
+ else
+ 
+-echo "$as_me:14882: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:14904: checking for gettimeofday in -lbsd" >&5
+ echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14887,7 +14909,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14890 "configure"
++#line 14912 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -14906,16 +14928,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14909: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14931: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14912: \$? = $ac_status" >&5
++  echo "$as_me:14934: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14915: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14937: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14918: \$? = $ac_status" >&5
++  echo "$as_me:14940: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -14926,7 +14948,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:14929: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:14951: result: $ac_cv_lib_bsd_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
+ if test $ac_cv_lib_bsd_gettimeofday = yes; then
+ 
+@@ -14956,14 +14978,14 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:14959: checking if -lm needed for math functions" >&5
++echo "$as_me:14981: 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 14966 "configure"
++#line 14988 "configure"
+ #include "confdefs.h"
+ 
+ 	#include 
+@@ -14978,16 +15000,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14981: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15003: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14984: \$? = $ac_status" >&5
++  echo "$as_me:15006: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14987: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15009: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14990: \$? = $ac_status" >&5
++  echo "$as_me:15012: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_need_libm=no
+ else
+@@ -14997,7 +15019,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:15000: result: $cf_cv_need_libm" >&5
++echo "$as_me:15022: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+ if test "$cf_cv_need_libm" = yes
+ then
+@@ -15005,13 +15027,13 @@
+ fi
+ 
+ ###	Checks for header files.
+-echo "$as_me:15008: checking for ANSI C header files" >&5
++echo "$as_me:15030: 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 15014 "configure"
++#line 15036 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -15019,13 +15041,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:15022: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:15044: \"$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:15028: \$? = $ac_status" >&5
++  echo "$as_me:15050: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -15047,7 +15069,7 @@
+ 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 15050 "configure"
++#line 15072 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -15065,7 +15087,7 @@
+ 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 15068 "configure"
++#line 15090 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -15086,7 +15108,7 @@
+   :
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15089 "configure"
++#line 15111 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -15112,15 +15134,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:15115: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15137: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15118: \$? = $ac_status" >&5
++  echo "$as_me:15140: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:15120: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15142: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15123: \$? = $ac_status" >&5
++  echo "$as_me:15145: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -15133,7 +15155,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:15136: result: $ac_cv_header_stdc" >&5
++echo "$as_me:15158: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -15146,13 +15168,13 @@
+ 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:15149: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:15171: 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 15155 "configure"
++#line 15177 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$ac_hdr>
+@@ -15167,16 +15189,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15170: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15192: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15173: \$? = $ac_status" >&5
++  echo "$as_me:15195: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15176: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15198: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15179: \$? = $ac_status" >&5
++  echo "$as_me:15201: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -15186,7 +15208,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:15189: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:15211: 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 <&5
++  echo "$as_me:15224: 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
+@@ -15207,7 +15229,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15210 "configure"
++#line 15232 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -15226,16 +15248,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15229: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15251: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15232: \$? = $ac_status" >&5
++  echo "$as_me:15254: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15235: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15257: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15238: \$? = $ac_status" >&5
++  echo "$as_me:15260: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -15246,14 +15268,14 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:15249: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:15271: 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:15256: checking for opendir in -lx" >&5
++  echo "$as_me:15278: 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
+@@ -15261,7 +15283,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15264 "configure"
++#line 15286 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -15280,16 +15302,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15283: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15305: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15286: \$? = $ac_status" >&5
++  echo "$as_me:15308: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15289: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15311: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15292: \$? = $ac_status" >&5
++  echo "$as_me:15314: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -15300,7 +15322,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:15303: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:15325: 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"
+@@ -15308,13 +15330,13 @@
+ 
+ fi
+ 
+-echo "$as_me:15311: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:15333: 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 15317 "configure"
++#line 15339 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -15330,16 +15352,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15333: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15355: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15336: \$? = $ac_status" >&5
++  echo "$as_me:15358: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15339: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15361: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15342: \$? = $ac_status" >&5
++  echo "$as_me:15364: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -15349,7 +15371,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:15352: result: $ac_cv_header_time" >&5
++echo "$as_me:15374: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -15368,13 +15390,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:15371: checking for regcomp" >&5
++echo "$as_me:15393: checking for regcomp" >&5
+ echo $ECHO_N "checking for regcomp... $ECHO_C" >&6
+ if test "${ac_cv_func_regcomp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15377 "configure"
++#line 15399 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char regcomp (); below.  */
+@@ -15405,16 +15427,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15408: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15430: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15411: \$? = $ac_status" >&5
++  echo "$as_me:15433: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15414: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15436: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15417: \$? = $ac_status" >&5
++  echo "$as_me:15439: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_regcomp=yes
+ else
+@@ -15424,7 +15446,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:15427: result: $ac_cv_func_regcomp" >&5
++echo "$as_me:15449: result: $ac_cv_func_regcomp" >&5
+ echo "${ECHO_T}$ac_cv_func_regcomp" >&6
+ if test $ac_cv_func_regcomp = yes; then
+   cf_regex_func=regcomp
+@@ -15433,7 +15455,7 @@
+ 	for cf_regex_lib in $cf_regex_libs
+ 	do
+ 		as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh`
+-echo "$as_me:15436: checking for regcomp in -l$cf_regex_lib" >&5
++echo "$as_me:15458: checking for regcomp in -l$cf_regex_lib" >&5
+ echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15441,7 +15463,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_regex_lib  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15444 "configure"
++#line 15466 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -15460,16 +15482,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15463: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15485: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15466: \$? = $ac_status" >&5
++  echo "$as_me:15488: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15469: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15491: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15472: \$? = $ac_status" >&5
++  echo "$as_me:15494: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -15480,7 +15502,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:15483: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:15505: 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
+ 
+@@ -15509,13 +15531,13 @@
+ fi
+ 
+ if test "$cf_regex_func" = no ; then
+-	echo "$as_me:15512: checking for compile" >&5
++	echo "$as_me:15534: checking for compile" >&5
+ echo $ECHO_N "checking for compile... $ECHO_C" >&6
+ if test "${ac_cv_func_compile+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15518 "configure"
++#line 15540 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char compile (); below.  */
+@@ -15546,16 +15568,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15549: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15571: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15552: \$? = $ac_status" >&5
++  echo "$as_me:15574: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15555: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15577: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15558: \$? = $ac_status" >&5
++  echo "$as_me:15580: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_compile=yes
+ else
+@@ -15565,13 +15587,13 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:15568: result: $ac_cv_func_compile" >&5
++echo "$as_me:15590: result: $ac_cv_func_compile" >&5
+ echo "${ECHO_T}$ac_cv_func_compile" >&6
+ if test $ac_cv_func_compile = yes; then
+   cf_regex_func=compile
+ else
+ 
+-		echo "$as_me:15574: checking for compile in -lgen" >&5
++		echo "$as_me:15596: checking for compile in -lgen" >&5
+ echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6
+ if test "${ac_cv_lib_gen_compile+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15579,7 +15601,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgen  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15582 "configure"
++#line 15604 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -15598,16 +15620,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15601: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15623: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15604: \$? = $ac_status" >&5
++  echo "$as_me:15626: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15607: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15629: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15610: \$? = $ac_status" >&5
++  echo "$as_me:15632: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gen_compile=yes
+ else
+@@ -15618,7 +15640,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:15621: result: $ac_cv_lib_gen_compile" >&5
++echo "$as_me:15643: result: $ac_cv_lib_gen_compile" >&5
+ echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6
+ if test $ac_cv_lib_gen_compile = yes; then
+ 
+@@ -15646,11 +15668,11 @@
+ fi
+ 
+ if test "$cf_regex_func" = no ; then
+-	{ echo "$as_me:15649: WARNING: cannot find regular expression library" >&5
++	{ echo "$as_me:15671: WARNING: cannot find regular expression library" >&5
+ echo "$as_me: WARNING: cannot find regular expression library" >&2;}
+ fi
+ 
+-echo "$as_me:15653: checking for regular-expression headers" >&5
++echo "$as_me:15675: checking for regular-expression headers" >&5
+ echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
+ if test "${cf_cv_regex_hdrs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15662,7 +15684,7 @@
+ 	for cf_regex_hdr in regexp.h regexpr.h
+ 	do
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 15665 "configure"
++#line 15687 "configure"
+ #include "confdefs.h"
+ #include <$cf_regex_hdr>
+ int
+@@ -15677,16 +15699,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15680: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15702: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15683: \$? = $ac_status" >&5
++  echo "$as_me:15705: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15686: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15708: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15689: \$? = $ac_status" >&5
++  echo "$as_me:15711: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -15703,7 +15725,7 @@
+ 	for cf_regex_hdr in regex.h
+ 	do
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 15706 "configure"
++#line 15728 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$cf_regex_hdr>
+@@ -15721,16 +15743,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15724: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15746: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15727: \$? = $ac_status" >&5
++  echo "$as_me:15749: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15730: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15752: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15733: \$? = $ac_status" >&5
++  echo "$as_me:15755: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -15746,11 +15768,11 @@
+ esac
+ 
+ fi
+-echo "$as_me:15749: result: $cf_cv_regex_hdrs" >&5
++echo "$as_me:15771: result: $cf_cv_regex_hdrs" >&5
+ echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
+ 
+ case $cf_cv_regex_hdrs in
+-	(no)		{ echo "$as_me:15753: WARNING: no regular expression header found" >&5
++	(no)		{ echo "$as_me:15775: WARNING: no regular expression header found" >&5
+ echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
+ 	(regex.h)
+ cat >>confdefs.h <<\EOF
+@@ -15789,23 +15811,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:15792: checking for $ac_header" >&5
++echo "$as_me:15814: 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 15798 "configure"
++#line 15820 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:15802: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:15824: \"$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:15808: \$? = $ac_status" >&5
++  echo "$as_me:15830: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -15824,7 +15846,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:15827: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:15849: 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 <&5
++echo "$as_me:15862: 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 15846 "configure"
++#line 15868 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:15850: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:15872: \"$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:15856: \$? = $ac_status" >&5
++  echo "$as_me:15878: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -15872,7 +15894,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:15875: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:15897: 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 <&5
++echo "$as_me:15907: checking for header declaring getopt variables" >&5
+ echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6
+ if test "${cf_cv_getopt_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15892,7 +15914,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15895 "configure"
++#line 15917 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -15905,16 +15927,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15908: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15930: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15911: \$? = $ac_status" >&5
++  echo "$as_me:15933: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15914: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15936: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15917: \$? = $ac_status" >&5
++  echo "$as_me:15939: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -15926,7 +15948,7 @@
+ done
+ 
+ fi
+-echo "$as_me:15929: result: $cf_cv_getopt_header" >&5
++echo "$as_me:15951: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test $cf_cv_getopt_header != none ; then
+ 
+@@ -15947,7 +15969,7 @@
+ # Note: even non-Posix ISC needs  to declare fd_set
+ if test "x$ISC" = xyes ; then
+ 
+-echo "$as_me:15950: checking for main in -lcposix" >&5
++echo "$as_me:15972: checking for main in -lcposix" >&5
+ echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6
+ if test "${ac_cv_lib_cposix_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15955,7 +15977,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lcposix  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15958 "configure"
++#line 15980 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -15967,16 +15989,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15970: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15992: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15973: \$? = $ac_status" >&5
++  echo "$as_me:15995: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15976: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15998: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15979: \$? = $ac_status" >&5
++  echo "$as_me:16001: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_cposix_main=yes
+ else
+@@ -15987,7 +16009,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:15990: result: $ac_cv_lib_cposix_main" >&5
++echo "$as_me:16012: result: $ac_cv_lib_cposix_main" >&5
+ echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6
+ if test $ac_cv_lib_cposix_main = yes; then
+   cat >>confdefs.h <&5
++	echo "$as_me:16023: checking for bzero in -linet" >&5
+ echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6
+ if test "${ac_cv_lib_inet_bzero+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16006,7 +16028,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-linet  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16009 "configure"
++#line 16031 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16025,16 +16047,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16028: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16050: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16031: \$? = $ac_status" >&5
++  echo "$as_me:16053: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16034: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16056: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16037: \$? = $ac_status" >&5
++  echo "$as_me:16059: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_inet_bzero=yes
+ else
+@@ -16045,7 +16067,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16048: result: $ac_cv_lib_inet_bzero" >&5
++echo "$as_me:16070: result: $ac_cv_lib_inet_bzero" >&5
+ echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6
+ if test $ac_cv_lib_inet_bzero = yes; then
+ 
+@@ -16068,14 +16090,14 @@
+ fi
+ fi
+ 
+-echo "$as_me:16071: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:16093: checking if sys/time.h works with sys/select.h" >&5
+ echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
+ if test "${cf_cv_sys_time_select+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16078 "configure"
++#line 16100 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16095,16 +16117,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16098: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16120: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16101: \$? = $ac_status" >&5
++  echo "$as_me:16123: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:16104: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16126: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16107: \$? = $ac_status" >&5
++  echo "$as_me:16129: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -16116,7 +16138,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16119: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:16141: result: $cf_cv_sys_time_select" >&5
+ echo "${ECHO_T}$cf_cv_sys_time_select" >&6
+ test "$cf_cv_sys_time_select" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -16131,13 +16153,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return=return
+ 
+-echo "$as_me:16134: checking for an ANSI C-conforming const" >&5
++echo "$as_me:16156: checking for an ANSI C-conforming const" >&5
+ echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
+ if test "${ac_cv_c_const+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 16140 "configure"
++#line 16162 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -16195,16 +16217,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16198: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16220: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16201: \$? = $ac_status" >&5
++  echo "$as_me:16223: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:16204: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16226: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16207: \$? = $ac_status" >&5
++  echo "$as_me:16229: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -16214,7 +16236,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:16217: result: $ac_cv_c_const" >&5
++echo "$as_me:16239: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -16224,7 +16246,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16227: checking for inline" >&5
++echo "$as_me:16249: 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
+@@ -16232,7 +16254,7 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 16235 "configure"
++#line 16257 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo () {return 0; }
+@@ -16241,16 +16263,16 @@
+ 
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16244: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16266: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16247: \$? = $ac_status" >&5
++  echo "$as_me:16269: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:16250: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16272: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16253: \$? = $ac_status" >&5
++  echo "$as_me:16275: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -16261,7 +16283,7 @@
+ done
+ 
+ fi
+-echo "$as_me:16264: result: $ac_cv_c_inline" >&5
++echo "$as_me:16286: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -16287,7 +16309,7 @@
+ 		:
+ 	elif test "$GCC" = yes
+ 	then
+-		echo "$as_me:16290: checking if $CC supports options to tune inlining" >&5
++		echo "$as_me:16312: checking if $CC supports options to tune inlining" >&5
+ echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6
+ if test "${cf_cv_gcc_inline+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16296,7 +16318,7 @@
+ 		cf_save_CFLAGS=$CFLAGS
+ 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 16299 "configure"
++#line 16321 "configure"
+ #include "confdefs.h"
+ inline int foo(void) { return 1; }
+ int
+@@ -16308,16 +16330,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16311: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16333: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16314: \$? = $ac_status" >&5
++  echo "$as_me:16336: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:16317: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16339: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16320: \$? = $ac_status" >&5
++  echo "$as_me:16342: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gcc_inline=yes
+ else
+@@ -16329,7 +16351,7 @@
+ 		CFLAGS=$cf_save_CFLAGS
+ 
+ fi
+-echo "$as_me:16332: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:16354: result: $cf_cv_gcc_inline" >&5
+ echo "${ECHO_T}$cf_cv_gcc_inline" >&6
+ 		if test "$cf_cv_gcc_inline" = yes ; then
+ 
+@@ -16415,7 +16437,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:16418: checking for signal global datatype" >&5
++echo "$as_me:16440: checking for signal global datatype" >&5
+ echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6
+ if test "${cf_cv_sig_atomic_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16427,7 +16449,7 @@
+ 		"int"
+ 	do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 16430 "configure"
++#line 16452 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16450,16 +16472,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16453: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16475: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16456: \$? = $ac_status" >&5
++  echo "$as_me:16478: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:16459: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16481: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16462: \$? = $ac_status" >&5
++  echo "$as_me:16484: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -16473,7 +16495,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16476: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:16498: result: $cf_cv_sig_atomic_t" >&5
+ echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
+ test "$cf_cv_sig_atomic_t" != no &&
+ cat >>confdefs.h <&5
++echo "$as_me:16507: checking for type of chtype" >&5
+ echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
+ if test "${cf_cv_typeof_chtype+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16492,7 +16514,7 @@
+   cf_cv_typeof_chtype=long
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 16495 "configure"
++#line 16517 "configure"
+ #include "confdefs.h"
+ 
+ #define WANT_BITS 31
+@@ -16527,15 +16549,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:16530: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16552: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16533: \$? = $ac_status" >&5
++  echo "$as_me:16555: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:16535: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16557: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16538: \$? = $ac_status" >&5
++  echo "$as_me:16560: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_typeof_chtype=`cat cf_test.out`
+ else
+@@ -16550,7 +16572,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16553: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:16575: result: $cf_cv_typeof_chtype" >&5
+ echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:16587: checking if unsigned literals are legal" >&5
+ echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6
+ if test "${cf_cv_unsigned_literals+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 16572 "configure"
++#line 16594 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -16581,16 +16603,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16584: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16606: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16587: \$? = $ac_status" >&5
++  echo "$as_me:16609: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:16590: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16612: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16593: \$? = $ac_status" >&5
++  echo "$as_me:16615: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_unsigned_literals=yes
+ else
+@@ -16602,7 +16624,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16605: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:16627: result: $cf_cv_unsigned_literals" >&5
+ echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
+ 
+ cf_cv_1UL="1"
+@@ -16618,14 +16640,14 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:16621: checking if external errno is declared" >&5
++echo "$as_me:16643: 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 16628 "configure"
++#line 16650 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_STDLIB_H
+@@ -16643,16 +16665,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16646: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16668: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16649: \$? = $ac_status" >&5
++  echo "$as_me:16671: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:16652: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16674: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16655: \$? = $ac_status" >&5
++  echo "$as_me:16677: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_dcl_errno=yes
+ else
+@@ -16663,7 +16685,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:16666: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:16688: result: $cf_cv_dcl_errno" >&5
+ echo "${ECHO_T}$cf_cv_dcl_errno" >&6
+ 
+ if test "$cf_cv_dcl_errno" = no ; then
+@@ -16678,14 +16700,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:16681: checking if external errno exists" >&5
++echo "$as_me:16703: 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 16688 "configure"
++#line 16710 "configure"
+ #include "confdefs.h"
+ 
+ #undef errno
+@@ -16700,16 +16722,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16703: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16725: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16706: \$? = $ac_status" >&5
++  echo "$as_me:16728: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16709: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16731: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16712: \$? = $ac_status" >&5
++  echo "$as_me:16734: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_errno=yes
+ else
+@@ -16720,7 +16742,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:16723: result: $cf_cv_have_errno" >&5
++echo "$as_me:16745: result: $cf_cv_have_errno" >&5
+ echo "${ECHO_T}$cf_cv_have_errno" >&6
+ 
+ if test "$cf_cv_have_errno" = yes ; then
+@@ -16733,7 +16755,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16736: checking if data-only library module links" >&5
++echo "$as_me:16758: checking if data-only library module links" >&5
+ echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
+ if test "${cf_cv_link_dataonly+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16741,20 +16763,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:16769: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16750: \$? = $ac_status" >&5
++  echo "$as_me:16772: \$? = $ac_status" >&5
+   (exit $ac_status); } ; then
+ 		mv conftest.o data.o && \
+ 		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
+ 	fi
+ 	rm -f conftest.$ac_ext data.o
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:16792: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16773: \$? = $ac_status" >&5
++  echo "$as_me:16795: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -16783,7 +16805,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 16786 "configure"
++#line 16808 "configure"
+ #include "confdefs.h"
+ 
+ 	int main()
+@@ -16794,15 +16816,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:16797: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16819: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16800: \$? = $ac_status" >&5
++  echo "$as_me:16822: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:16802: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16824: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16805: \$? = $ac_status" >&5
++  echo "$as_me:16827: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -16817,7 +16839,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16820: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:16842: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -16856,13 +16878,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:16859: checking for $ac_func" >&5
++echo "$as_me:16881: 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 16865 "configure"
++#line 16887 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -16893,16 +16915,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16896: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16918: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16899: \$? = $ac_status" >&5
++  echo "$as_me:16921: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16902: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16924: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16905: \$? = $ac_status" >&5
++  echo "$as_me:16927: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -16912,7 +16934,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:16915: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:16937: 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 <&5
++	{ { echo "$as_me:16949: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ if test "x$with_getcap" = "xyes" ; then
+ 
+-echo "$as_me:16934: checking for terminal-capability database functions" >&5
++echo "$as_me:16956: checking for terminal-capability database functions" >&5
+ echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6
+ if test "${cf_cv_cgetent+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16941 "configure"
++#line 16963 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16958,16 +16980,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16961: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16983: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16964: \$? = $ac_status" >&5
++  echo "$as_me:16986: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16967: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16989: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16970: \$? = $ac_status" >&5
++  echo "$as_me:16992: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cgetent=yes
+ else
+@@ -16978,7 +17000,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:16981: result: $cf_cv_cgetent" >&5
++echo "$as_me:17003: result: $cf_cv_cgetent" >&5
+ echo "${ECHO_T}$cf_cv_cgetent" >&6
+ 
+ if test "$cf_cv_cgetent" = yes
+@@ -16988,14 +17010,14 @@
+ #define HAVE_BSD_CGETENT 1
+ EOF
+ 
+-echo "$as_me:16991: checking if cgetent uses const parameter" >&5
++echo "$as_me:17013: checking if cgetent uses const parameter" >&5
+ echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6
+ if test "${cf_cv_cgetent_const+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16998 "configure"
++#line 17020 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17017,16 +17039,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17020: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17042: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17023: \$? = $ac_status" >&5
++  echo "$as_me:17045: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17026: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17048: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17029: \$? = $ac_status" >&5
++  echo "$as_me:17051: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cgetent_const=yes
+ else
+@@ -17037,7 +17059,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:17040: result: $cf_cv_cgetent_const" >&5
++echo "$as_me:17062: result: $cf_cv_cgetent_const" >&5
+ echo "${ECHO_T}$cf_cv_cgetent_const" >&6
+ 	if test "$cf_cv_cgetent_const" = yes
+ 	then
+@@ -17051,14 +17073,14 @@
+ 
+ fi
+ 
+-echo "$as_me:17054: checking for isascii" >&5
++echo "$as_me:17076: checking for isascii" >&5
+ echo $ECHO_N "checking for isascii... $ECHO_C" >&6
+ if test "${cf_cv_have_isascii+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 17061 "configure"
++#line 17083 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -17070,16 +17092,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17073: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17095: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17076: \$? = $ac_status" >&5
++  echo "$as_me:17098: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17079: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17101: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17082: \$? = $ac_status" >&5
++  echo "$as_me:17104: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_isascii=yes
+ else
+@@ -17090,7 +17112,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:17093: result: $cf_cv_have_isascii" >&5
++echo "$as_me:17115: result: $cf_cv_have_isascii" >&5
+ echo "${ECHO_T}$cf_cv_have_isascii" >&6
+ test "$cf_cv_have_isascii" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -17098,10 +17120,10 @@
+ EOF
+ 
+ if test "$ac_cv_func_sigaction" = yes; then
+-echo "$as_me:17101: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:17123: checking whether sigaction needs _POSIX_SOURCE" >&5
+ echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17104 "configure"
++#line 17126 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17115,16 +17137,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17118: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17140: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17121: \$? = $ac_status" >&5
++  echo "$as_me:17143: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17124: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17146: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17127: \$? = $ac_status" >&5
++  echo "$as_me:17149: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   sigact_bad=no
+ else
+@@ -17132,7 +17154,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17135 "configure"
++#line 17157 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -17147,16 +17169,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17150: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17172: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17153: \$? = $ac_status" >&5
++  echo "$as_me:17175: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17156: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17178: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17159: \$? = $ac_status" >&5
++  echo "$as_me:17181: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   sigact_bad=yes
+ 
+@@ -17172,11 +17194,11 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:17175: result: $sigact_bad" >&5
++echo "$as_me:17197: result: $sigact_bad" >&5
+ echo "${ECHO_T}$sigact_bad" >&6
+ fi
+ 
+-echo "$as_me:17179: checking if nanosleep really works" >&5
++echo "$as_me:17201: checking if nanosleep really works" >&5
+ echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6
+ if test "${cf_cv_func_nanosleep+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17186,7 +17208,7 @@
+   cf_cv_func_nanosleep=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 17189 "configure"
++#line 17211 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17211,15 +17233,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:17214: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17236: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17217: \$? = $ac_status" >&5
++  echo "$as_me:17239: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:17219: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17241: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17222: \$? = $ac_status" >&5
++  echo "$as_me:17244: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_nanosleep=yes
+ else
+@@ -17231,7 +17253,7 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:17234: result: $cf_cv_func_nanosleep" >&5
++echo "$as_me:17256: result: $cf_cv_func_nanosleep" >&5
+ echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
+ 
+ test "$cf_cv_func_nanosleep" = "yes" &&
+@@ -17246,23 +17268,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:17249: checking for $ac_header" >&5
++echo "$as_me:17271: 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 17255 "configure"
++#line 17277 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:17259: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17281: \"$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:17265: \$? = $ac_status" >&5
++  echo "$as_me:17287: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17281,7 +17303,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:17284: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:17306: 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 <&5
++echo "$as_me:17321: 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 17305 "configure"
++#line 17327 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:17309: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17331: \"$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:17315: \$? = $ac_status" >&5
++  echo "$as_me:17337: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17331,7 +17353,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:17334: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:17356: 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 <&5
++	echo "$as_me:17374: 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 17355 "configure"
++#line 17377 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -17364,16 +17386,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17367: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17389: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17370: \$? = $ac_status" >&5
++  echo "$as_me:17392: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17373: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17395: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17376: \$? = $ac_status" >&5
++  echo "$as_me:17398: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   termios_bad=no
+ else
+@@ -17381,7 +17403,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 17384 "configure"
++#line 17406 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -17395,16 +17417,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17398: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17420: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17401: \$? = $ac_status" >&5
++  echo "$as_me:17423: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17404: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17426: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17407: \$? = $ac_status" >&5
++  echo "$as_me:17429: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   termios_bad=unknown
+ else
+@@ -17420,19 +17442,19 @@
+ 
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-	echo "$as_me:17423: result: $termios_bad" >&5
++	echo "$as_me:17445: result: $termios_bad" >&5
+ echo "${ECHO_T}$termios_bad" >&6
+ 	fi
+ fi
+ 
+-echo "$as_me:17428: checking for tcgetattr" >&5
++echo "$as_me:17450: checking for tcgetattr" >&5
+ echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6
+ if test "${cf_cv_have_tcgetattr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17435 "configure"
++#line 17457 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17460,16 +17482,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17463: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17485: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17466: \$? = $ac_status" >&5
++  echo "$as_me:17488: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17469: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17491: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17472: \$? = $ac_status" >&5
++  echo "$as_me:17494: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_tcgetattr=yes
+ else
+@@ -17479,21 +17501,21 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:17482: result: $cf_cv_have_tcgetattr" >&5
++echo "$as_me:17504: result: $cf_cv_have_tcgetattr" >&5
+ echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6
+ test "$cf_cv_have_tcgetattr" = yes &&
+ cat >>confdefs.h <<\EOF
+ #define HAVE_TCGETATTR 1
+ EOF
+ 
+-echo "$as_me:17489: checking for vsscanf function or workaround" >&5
++echo "$as_me:17511: checking for vsscanf function or workaround" >&5
+ echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6
+ if test "${cf_cv_func_vsscanf+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17496 "configure"
++#line 17518 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17509,16 +17531,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17512: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17534: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17515: \$? = $ac_status" >&5
++  echo "$as_me:17537: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17518: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17540: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17521: \$? = $ac_status" >&5
++  echo "$as_me:17543: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_vsscanf=vsscanf
+ else
+@@ -17526,7 +17548,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17529 "configure"
++#line 17551 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17548,16 +17570,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17551: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17573: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17554: \$? = $ac_status" >&5
++  echo "$as_me:17576: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17557: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17579: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17560: \$? = $ac_status" >&5
++  echo "$as_me:17582: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_vsscanf=vfscanf
+ else
+@@ -17565,7 +17587,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17568 "configure"
++#line 17590 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17587,16 +17609,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17590: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17612: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17593: \$? = $ac_status" >&5
++  echo "$as_me:17615: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17596: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17618: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17599: \$? = $ac_status" >&5
++  echo "$as_me:17621: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_vsscanf=_doscan
+ else
+@@ -17611,7 +17633,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:17614: result: $cf_cv_func_vsscanf" >&5
++echo "$as_me:17636: result: $cf_cv_func_vsscanf" >&5
+ echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
+ 
+ case $cf_cv_func_vsscanf in
+@@ -17632,7 +17654,7 @@
+ ;;
+ esac
+ 
+-echo "$as_me:17635: checking for working mkstemp" >&5
++echo "$as_me:17657: checking for working mkstemp" >&5
+ echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
+ if test "${cf_cv_func_mkstemp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17643,7 +17665,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 17646 "configure"
++#line 17668 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17681,15 +17703,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:17684: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17706: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17687: \$? = $ac_status" >&5
++  echo "$as_me:17709: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:17689: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17711: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17692: \$? = $ac_status" >&5
++  echo "$as_me:17714: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -17704,16 +17726,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:17707: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:17729: result: $cf_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
+ if test "x$cf_cv_func_mkstemp" = xmaybe ; then
+-	echo "$as_me:17710: checking for mkstemp" >&5
++	echo "$as_me:17732: checking for mkstemp" >&5
+ echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
+ if test "${ac_cv_func_mkstemp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 17716 "configure"
++#line 17738 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char mkstemp (); below.  */
+@@ -17744,16 +17766,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17747: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17769: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17750: \$? = $ac_status" >&5
++  echo "$as_me:17772: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17753: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17775: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17756: \$? = $ac_status" >&5
++  echo "$as_me:17778: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -17763,7 +17785,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:17766: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:17788: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -17784,21 +17806,21 @@
+ fi
+ 
+ if test "x$cross_compiling" = xyes ; then
+-	{ echo "$as_me:17787: WARNING: cross compiling: assume setvbuf params not reversed" >&5
++	{ echo "$as_me:17809: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+ echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;}
+ else
+-	echo "$as_me:17790: checking whether setvbuf arguments are reversed" >&5
++	echo "$as_me:17812: checking whether setvbuf arguments are reversed" >&5
+ echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6
+ if test "${ac_cv_func_setvbuf_reversed+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:17796: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:17818: 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 17801 "configure"
++#line 17823 "configure"
+ #include "confdefs.h"
+ #include 
+ /* If setvbuf has the reversed format, exit 0. */
+@@ -17815,15 +17837,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:17818: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17840: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17821: \$? = $ac_status" >&5
++  echo "$as_me:17843: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:17823: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17845: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17826: \$? = $ac_status" >&5
++  echo "$as_me:17848: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_setvbuf_reversed=yes
+ else
+@@ -17836,7 +17858,7 @@
+ fi
+ rm -f core core.* *.core
+ fi
+-echo "$as_me:17839: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:17861: result: $ac_cv_func_setvbuf_reversed" >&5
+ echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6
+ if test $ac_cv_func_setvbuf_reversed = yes; then
+ 
+@@ -17847,13 +17869,13 @@
+ fi
+ 
+ fi
+-echo "$as_me:17850: checking for intptr_t" >&5
++echo "$as_me:17872: 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 17856 "configure"
++#line 17878 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17868,16 +17890,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17871: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17893: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17874: \$? = $ac_status" >&5
++  echo "$as_me:17896: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17877: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17899: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17880: \$? = $ac_status" >&5
++  echo "$as_me:17902: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_intptr_t=yes
+ else
+@@ -17887,7 +17909,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:17890: result: $ac_cv_type_intptr_t" >&5
++echo "$as_me:17912: 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
+   :
+@@ -17899,13 +17921,13 @@
+ 
+ fi
+ 
+-echo "$as_me:17902: checking for ssize_t" >&5
++echo "$as_me:17924: 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 17908 "configure"
++#line 17930 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17920,16 +17942,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17923: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17945: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17926: \$? = $ac_status" >&5
++  echo "$as_me:17948: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17929: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17951: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17932: \$? = $ac_status" >&5
++  echo "$as_me:17954: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_ssize_t=yes
+ else
+@@ -17939,7 +17961,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:17942: result: $ac_cv_type_ssize_t" >&5
++echo "$as_me:17964: 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
+   :
+@@ -17951,14 +17973,14 @@
+ 
+ fi
+ 
+-echo "$as_me:17954: checking for type sigaction_t" >&5
++echo "$as_me:17976: checking for type sigaction_t" >&5
+ echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6
+ if test "${cf_cv_type_sigaction+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 17961 "configure"
++#line 17983 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17971,16 +17993,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17974: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17996: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17977: \$? = $ac_status" >&5
++  echo "$as_me:17999: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17980: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18002: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17983: \$? = $ac_status" >&5
++  echo "$as_me:18005: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_type_sigaction=yes
+ else
+@@ -17991,14 +18013,14 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+-echo "$as_me:17994: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:18016: result: $cf_cv_type_sigaction" >&5
+ echo "${ECHO_T}$cf_cv_type_sigaction" >&6
+ test "$cf_cv_type_sigaction" = yes &&
+ cat >>confdefs.h <<\EOF
+ #define HAVE_TYPE_SIGACTION 1
+ EOF
+ 
+-echo "$as_me:18001: checking declaration of size-change" >&5
++echo "$as_me:18023: 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
+@@ -18013,7 +18035,7 @@
+ 	CPPFLAGS="$cf_save_CPPFLAGS"
+ 	test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 18016 "configure"
++#line 18038 "configure"
+ #include "confdefs.h"
+ #include 
+ #ifdef HAVE_TERMIOS_H
+@@ -18057,16 +18079,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18060: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18082: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18063: \$? = $ac_status" >&5
++  echo "$as_me:18085: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18066: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18088: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18069: \$? = $ac_status" >&5
++  echo "$as_me:18091: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_sizechange=yes
+ else
+@@ -18085,7 +18107,7 @@
+ done
+ 
+ fi
+-echo "$as_me:18088: result: $cf_cv_sizechange" >&5
++echo "$as_me:18110: result: $cf_cv_sizechange" >&5
+ echo "${ECHO_T}$cf_cv_sizechange" >&6
+ if test "$cf_cv_sizechange" != no ; then
+ 
+@@ -18103,13 +18125,13 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:18106: checking for memmove" >&5
++echo "$as_me:18128: checking for memmove" >&5
+ echo $ECHO_N "checking for memmove... $ECHO_C" >&6
+ if test "${ac_cv_func_memmove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 18112 "configure"
++#line 18134 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char memmove (); below.  */
+@@ -18140,16 +18162,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18143: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18165: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18146: \$? = $ac_status" >&5
++  echo "$as_me:18168: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18149: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18171: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18152: \$? = $ac_status" >&5
++  echo "$as_me:18174: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_memmove=yes
+ else
+@@ -18159,19 +18181,19 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:18162: result: $ac_cv_func_memmove" >&5
++echo "$as_me:18184: result: $ac_cv_func_memmove" >&5
+ echo "${ECHO_T}$ac_cv_func_memmove" >&6
+ if test $ac_cv_func_memmove = yes; then
+   :
+ else
+ 
+-echo "$as_me:18168: checking for bcopy" >&5
++echo "$as_me:18190: checking for bcopy" >&5
+ echo $ECHO_N "checking for bcopy... $ECHO_C" >&6
+ if test "${ac_cv_func_bcopy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 18174 "configure"
++#line 18196 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char bcopy (); below.  */
+@@ -18202,16 +18224,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18205: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18227: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18208: \$? = $ac_status" >&5
++  echo "$as_me:18230: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18211: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18233: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18214: \$? = $ac_status" >&5
++  echo "$as_me:18236: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_bcopy=yes
+ else
+@@ -18221,11 +18243,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:18224: result: $ac_cv_func_bcopy" >&5
++echo "$as_me:18246: result: $ac_cv_func_bcopy" >&5
+ echo "${ECHO_T}$ac_cv_func_bcopy" >&6
+ if test $ac_cv_func_bcopy = yes; then
+ 
+-	echo "$as_me:18228: checking if bcopy does overlapping moves" >&5
++	echo "$as_me:18250: checking if bcopy does overlapping moves" >&5
+ echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6
+ if test "${cf_cv_good_bcopy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18235,7 +18257,7 @@
+   cf_cv_good_bcopy=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 18238 "configure"
++#line 18260 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -18249,15 +18271,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:18252: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18274: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18255: \$? = $ac_status" >&5
++  echo "$as_me:18277: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:18257: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18279: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18260: \$? = $ac_status" >&5
++  echo "$as_me:18282: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_good_bcopy=yes
+ else
+@@ -18270,7 +18292,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:18273: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:18295: result: $cf_cv_good_bcopy" >&5
+ echo "${ECHO_T}$cf_cv_good_bcopy" >&6
+ 
+ else
+@@ -18297,13 +18319,13 @@
+ for ac_func in posix_openpt
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:18300: checking for $ac_func" >&5
++echo "$as_me:18322: 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 18306 "configure"
++#line 18328 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -18334,16 +18356,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18337: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18359: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18340: \$? = $ac_status" >&5
++  echo "$as_me:18362: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18343: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18365: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18346: \$? = $ac_status" >&5
++  echo "$as_me:18368: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -18353,7 +18375,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:18356: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:18378: 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 <&5
++echo "$as_me:18388: checking if poll really works" >&5
+ echo $ECHO_N "checking if poll really works... $ECHO_C" >&6
+ if test "${cf_cv_working_poll+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18373,7 +18395,7 @@
+   cf_cv_working_poll=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 18376 "configure"
++#line 18398 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -18425,15 +18447,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:18428: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18450: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18431: \$? = $ac_status" >&5
++  echo "$as_me:18453: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:18433: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18455: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18436: \$? = $ac_status" >&5
++  echo "$as_me:18458: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_working_poll=yes
+ else
+@@ -18445,21 +18467,21 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:18448: result: $cf_cv_working_poll" >&5
++echo "$as_me:18470: result: $cf_cv_working_poll" >&5
+ echo "${ECHO_T}$cf_cv_working_poll" >&6
+ test "$cf_cv_working_poll" = "yes" &&
+ cat >>confdefs.h <<\EOF
+ #define HAVE_WORKING_POLL 1
+ EOF
+ 
+-echo "$as_me:18455: checking for va_copy" >&5
++echo "$as_me:18477: checking for va_copy" >&5
+ echo $ECHO_N "checking for va_copy... $ECHO_C" >&6
+ if test "${cf_cv_have_va_copy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18462 "configure"
++#line 18484 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -18476,16 +18498,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18479: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18501: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18482: \$? = $ac_status" >&5
++  echo "$as_me:18504: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18485: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18507: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18488: \$? = $ac_status" >&5
++  echo "$as_me:18510: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_va_copy=yes
+ else
+@@ -18495,7 +18517,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:18498: result: $cf_cv_have_va_copy" >&5
++echo "$as_me:18520: result: $cf_cv_have_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have_va_copy" >&6
+ 
+ test "$cf_cv_have_va_copy" = yes &&
+@@ -18503,14 +18525,14 @@
+ #define HAVE_VA_COPY 1
+ EOF
+ 
+-echo "$as_me:18506: checking for __va_copy" >&5
++echo "$as_me:18528: checking for __va_copy" >&5
+ echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6
+ if test "${cf_cv_have___va_copy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18513 "configure"
++#line 18535 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -18527,16 +18549,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18530: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18552: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18533: \$? = $ac_status" >&5
++  echo "$as_me:18555: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18536: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18558: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18539: \$? = $ac_status" >&5
++  echo "$as_me:18561: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have___va_copy=yes
+ else
+@@ -18546,7 +18568,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:18549: result: $cf_cv_have___va_copy" >&5
++echo "$as_me:18571: result: $cf_cv_have___va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___va_copy" >&6
+ 
+ test "$cf_cv_have___va_copy" = yes &&
+@@ -18554,13 +18576,13 @@
+ #define HAVE___VA_COPY 1
+ EOF
+ 
+-echo "$as_me:18557: checking for pid_t" >&5
++echo "$as_me:18579: 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 18563 "configure"
++#line 18585 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -18575,16 +18597,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18578: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18600: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18581: \$? = $ac_status" >&5
++  echo "$as_me:18603: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18584: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18606: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18587: \$? = $ac_status" >&5
++  echo "$as_me:18609: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_pid_t=yes
+ else
+@@ -18594,7 +18616,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:18597: result: $ac_cv_type_pid_t" >&5
++echo "$as_me:18619: 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
+   :
+@@ -18609,23 +18631,23 @@
+ for ac_header in unistd.h vfork.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18612: checking for $ac_header" >&5
++echo "$as_me:18634: 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 18618 "configure"
++#line 18640 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18622: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:18644: \"$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:18628: \$? = $ac_status" >&5
++  echo "$as_me:18650: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18644,7 +18666,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:18647: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:18669: 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 <&5
++echo "$as_me:18682: 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 18666 "configure"
++#line 18688 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -18694,16 +18716,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18697: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18719: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18700: \$? = $ac_status" >&5
++  echo "$as_me:18722: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18703: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18725: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18706: \$? = $ac_status" >&5
++  echo "$as_me:18728: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -18713,7 +18735,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:18716: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:18738: 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 <&5
++  echo "$as_me:18750: 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
+@@ -18748,15 +18770,15 @@
+       }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:18751: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18773: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18754: \$? = $ac_status" >&5
++  echo "$as_me:18776: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:18756: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18778: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18759: \$? = $ac_status" >&5
++  echo "$as_me:18781: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_fork_works=yes
+ else
+@@ -18768,7 +18790,7 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:18771: result: $ac_cv_func_fork_works" >&5
++echo "$as_me:18793: result: $ac_cv_func_fork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+ 
+ fi
+@@ -18782,12 +18804,12 @@
+       ac_cv_func_fork_works=yes
+       ;;
+   esac
+-  { echo "$as_me:18785: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:18807: 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:18790: checking for working vfork" >&5
++  echo "$as_me:18812: 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
+@@ -18796,7 +18818,7 @@
+   ac_cv_func_vfork_works=cross
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 18799 "configure"
++#line 18821 "configure"
+ #include "confdefs.h"
+ /* Thanks to Paul Eggert for this test.  */
+ #include 
+@@ -18893,15 +18915,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:18896: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18918: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18899: \$? = $ac_status" >&5
++  echo "$as_me:18921: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:18901: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18923: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18904: \$? = $ac_status" >&5
++  echo "$as_me:18926: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_vfork_works=yes
+ else
+@@ -18913,13 +18935,13 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:18916: result: $ac_cv_func_vfork_works" >&5
++echo "$as_me:18938: 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:18922: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:18944: 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
+ 
+@@ -18946,7 +18968,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:18949: checking for openpty in -lutil" >&5
++echo "$as_me:18971: checking for openpty in -lutil" >&5
+ echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
+ if test "${ac_cv_lib_util_openpty+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18954,7 +18976,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18957 "configure"
++#line 18979 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18973,16 +18995,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18976: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18998: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18979: \$? = $ac_status" >&5
++  echo "$as_me:19001: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18982: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19004: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18985: \$? = $ac_status" >&5
++  echo "$as_me:19007: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -18993,7 +19015,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18996: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:19018: result: $ac_cv_lib_util_openpty" >&5
+ echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
+ if test $ac_cv_lib_util_openpty = yes; then
+   cf_cv_lib_util=yes
+@@ -19001,7 +19023,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:19004: checking for openpty header" >&5
++echo "$as_me:19026: checking for openpty header" >&5
+ echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
+ if test "${cf_cv_func_openpty+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19028,7 +19050,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 19031 "configure"
++#line 19053 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -19045,16 +19067,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19048: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19070: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19051: \$? = $ac_status" >&5
++  echo "$as_me:19073: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19054: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19076: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19057: \$? = $ac_status" >&5
++  echo "$as_me:19079: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -19072,7 +19094,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:19075: result: $cf_cv_func_openpty" >&5
++echo "$as_me:19097: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -19142,7 +19164,7 @@
+ 			  cf_save_CPPFLAGS=$CPPFLAGS
+ 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 19145 "configure"
++#line 19167 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -19154,16 +19176,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19157: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19179: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19160: \$? = $ac_status" >&5
++  echo "$as_me:19182: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19163: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19185: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19166: \$? = $ac_status" >&5
++  echo "$as_me:19188: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -19180,7 +19202,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:19183: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:19205: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -19216,7 +19238,7 @@
+ 			if test "$cf_have_libdir" = no ; then
+ 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+ 
+-echo "${as_me:-configure}:19219: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:19241: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -19227,7 +19249,7 @@
+ 	else
+ 		case "$with_hashed_db" in
+ 		(./*|../*|/*)
+-			{ echo "$as_me:19230: WARNING: no such directory $with_hashed_db" >&5
++			{ echo "$as_me:19252: WARNING: no such directory $with_hashed_db" >&5
+ echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
+ 			;;
+ 		(*)
+@@ -19296,7 +19318,7 @@
+ 			  cf_save_CPPFLAGS=$CPPFLAGS
+ 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 19299 "configure"
++#line 19321 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -19308,16 +19330,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19311: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19333: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19314: \$? = $ac_status" >&5
++  echo "$as_me:19336: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19317: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19339: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19320: \$? = $ac_status" >&5
++  echo "$as_me:19342: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -19334,7 +19356,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:19337: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:19359: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -19414,7 +19436,7 @@
+ 			if test "$cf_have_libdir" = no ; then
+ 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+ 
+-echo "${as_me:-configure}:19417: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:19439: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -19431,23 +19453,23 @@
+ 	fi
+ esac
+ 
+-echo "$as_me:19434: checking for db.h" >&5
++echo "$as_me:19456: checking for db.h" >&5
+ echo $ECHO_N "checking for db.h... $ECHO_C" >&6
+ if test "${ac_cv_header_db_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 19440 "configure"
++#line 19462 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:19444: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:19466: \"$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:19450: \$? = $ac_status" >&5
++  echo "$as_me:19472: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -19466,11 +19488,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:19469: result: $ac_cv_header_db_h" >&5
++echo "$as_me:19491: result: $ac_cv_header_db_h" >&5
+ echo "${ECHO_T}$ac_cv_header_db_h" >&6
+ if test $ac_cv_header_db_h = yes; then
+ 
+-echo "$as_me:19473: checking for version of db" >&5
++echo "$as_me:19495: checking for version of db" >&5
+ echo $ECHO_N "checking for version of db... $ECHO_C" >&6
+ if test "${cf_cv_hashed_db_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19481,10 +19503,10 @@
+ for cf_db_version in 1 2 3 4 5 6
+ do
+ 
+-echo "${as_me:-configure}:19484: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me:-configure}:19506: testing checking for db version $cf_db_version ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 19487 "configure"
++#line 19509 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -19514,16 +19536,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19517: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19539: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19520: \$? = $ac_status" >&5
++  echo "$as_me:19542: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19523: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19545: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19526: \$? = $ac_status" >&5
++  echo "$as_me:19548: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_hashed_db_version=$cf_db_version
+@@ -19537,16 +19559,16 @@
+ done
+ 
+ fi
+-echo "$as_me:19540: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:19562: result: $cf_cv_hashed_db_version" >&5
+ echo "${ECHO_T}$cf_cv_hashed_db_version" >&6
+ 
+ if test "$cf_cv_hashed_db_version" = unknown ; then
+-	{ { echo "$as_me:19544: error: Cannot determine version of db" >&5
++	{ { echo "$as_me:19566: error: Cannot determine version of db" >&5
+ echo "$as_me: error: Cannot determine version of db" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+ 
+-echo "$as_me:19549: checking for db libraries" >&5
++echo "$as_me:19571: checking for db libraries" >&5
+ echo $ECHO_N "checking for db libraries... $ECHO_C" >&6
+ if test "${cf_cv_hashed_db_libs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19576,10 +19598,10 @@
+ 
+ 	fi
+ 
+-echo "${as_me:-configure}:19579: testing checking for library "$cf_db_libs" ..." 1>&5
++echo "${as_me:-configure}:19601: testing checking for library "$cf_db_libs" ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 19582 "configure"
++#line 19604 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -19634,16 +19656,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19637: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19659: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19640: \$? = $ac_status" >&5
++  echo "$as_me:19662: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19643: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19665: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19646: \$? = $ac_status" >&5
++  echo "$as_me:19668: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	if test -n "$cf_db_libs" ; then
+@@ -19663,11 +19685,11 @@
+ done
+ 
+ fi
+-echo "$as_me:19666: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:19688: result: $cf_cv_hashed_db_libs" >&5
+ echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6
+ 
+ 	if test "$cf_cv_hashed_db_libs" = unknown ; then
+-		{ { echo "$as_me:19670: error: Cannot determine library for db" >&5
++		{ { echo "$as_me:19692: error: Cannot determine library for db" >&5
+ echo "$as_me: error: Cannot determine library for db" >&2;}
+    { (exit 1); exit 1; }; }
+ 	elif test "$cf_cv_hashed_db_libs" != default ; then
+@@ -19693,7 +19715,7 @@
+ 
+ else
+ 
+-	{ { echo "$as_me:19696: error: Cannot find db.h" >&5
++	{ { echo "$as_me:19718: error: Cannot find db.h" >&5
+ echo "$as_me: error: Cannot find db.h" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -19708,7 +19730,7 @@
+ 
+ # Just in case, check if the C compiler has a bool type.
+ 
+-echo "$as_me:19711: checking if we should include stdbool.h" >&5
++echo "$as_me:19733: checking if we should include stdbool.h" >&5
+ echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
+ 
+ if test "${cf_cv_header_stdbool_h+set}" = set; then
+@@ -19716,7 +19738,7 @@
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 19719 "configure"
++#line 19741 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -19728,23 +19750,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19731: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19753: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19734: \$? = $ac_status" >&5
++  echo "$as_me:19756: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19737: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19759: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19740: \$? = $ac_status" >&5
++  echo "$as_me:19762: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_header_stdbool_h=0
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19747 "configure"
++#line 19769 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -19760,16 +19782,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19763: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19785: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19766: \$? = $ac_status" >&5
++  echo "$as_me:19788: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19769: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19791: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19772: \$? = $ac_status" >&5
++  echo "$as_me:19794: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -19783,13 +19805,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:19786: result: yes" >&5
++then	echo "$as_me:19808: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:19788: result: no" >&5
++else	echo "$as_me:19810: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:19792: checking for builtin bool type" >&5
++echo "$as_me:19814: checking for builtin bool type" >&5
+ echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
+ 
+ if test "${cf_cv_cc_bool_type+set}" = set; then
+@@ -19797,7 +19819,7 @@
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 19800 "configure"
++#line 19822 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19812,16 +19834,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19815: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19837: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19818: \$? = $ac_status" >&5
++  echo "$as_me:19840: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19821: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19843: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19824: \$? = $ac_status" >&5
++  echo "$as_me:19846: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cc_bool_type=1
+ else
+@@ -19834,9 +19856,9 @@
+ fi
+ 
+ if test "$cf_cv_cc_bool_type" = 1
+-then	echo "$as_me:19837: result: yes" >&5
++then	echo "$as_me:19859: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:19839: result: no" >&5
++else	echo "$as_me:19861: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -19853,10 +19875,10 @@
+ 
+ 	cf_save="$LIBS"
+ 	LIBS="$LIBS $CXXLIBS"
+-	echo "$as_me:19856: checking if we already have C++ library" >&5
++	echo "$as_me:19878: checking if we already have C++ library" >&5
+ echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 19859 "configure"
++#line 19881 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -19870,16 +19892,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19873: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19895: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19876: \$? = $ac_status" >&5
++  echo "$as_me:19898: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19879: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19901: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19882: \$? = $ac_status" >&5
++  echo "$as_me:19904: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_have_libstdcpp=yes
+ else
+@@ -19888,7 +19910,7 @@
+ cf_have_libstdcpp=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-	echo "$as_me:19891: result: $cf_have_libstdcpp" >&5
++	echo "$as_me:19913: result: $cf_have_libstdcpp" >&5
+ echo "${ECHO_T}$cf_have_libstdcpp" >&6
+ 	LIBS="$cf_save"
+ 
+@@ -19907,7 +19929,7 @@
+ 			;;
+ 		esac
+ 
+-		echo "$as_me:19910: checking for library $cf_stdcpp_libname" >&5
++		echo "$as_me:19932: checking for library $cf_stdcpp_libname" >&5
+ echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6
+ if test "${cf_cv_libstdcpp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19933,7 +19955,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 19936 "configure"
++#line 19958 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -19947,16 +19969,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19950: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19972: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19953: \$? = $ac_status" >&5
++  echo "$as_me:19975: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19956: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19978: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19959: \$? = $ac_status" >&5
++  echo "$as_me:19981: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_libstdcpp=yes
+ else
+@@ -19968,7 +19990,7 @@
+ 			LIBS="$cf_save"
+ 
+ fi
+-echo "$as_me:19971: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:19993: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ 		test "$cf_cv_libstdcpp" = yes && {
+ cf_add_libs="-l$cf_stdcpp_libname"
+@@ -19990,7 +20012,7 @@
+ 	fi
+ fi
+ 
+-	echo "$as_me:19993: checking whether $CXX understands -c and -o together" >&5
++	echo "$as_me:20015: checking whether $CXX understands -c and -o together" >&5
+ echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6
+ if test "${cf_cv_prog_CXX_c_o+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20005,15 +20027,15 @@
+ # We do the test twice because some compilers refuse to overwrite an
+ # existing .o file with -o, though they will create one.
+ ac_try='$CXX $CXXFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+-if { (eval echo "$as_me:20008: \"$ac_try\"") >&5
++if { (eval echo "$as_me:20030: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20011: \$? = $ac_status" >&5
++  echo "$as_me:20033: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:20013: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:20035: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20016: \$? = $ac_status" >&5
++  echo "$as_me:20038: \$? = $ac_status" >&5
+   (exit $ac_status); };
+ then
+   eval cf_cv_prog_CXX_c_o=yes
+@@ -20024,10 +20046,10 @@
+ 
+ fi
+ if test $cf_cv_prog_CXX_c_o = yes; then
+-  echo "$as_me:20027: result: yes" >&5
++  echo "$as_me:20049: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:20030: result: no" >&5
++  echo "$as_me:20052: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -20047,7 +20069,7 @@
+ 	;;
+ esac
+ if test "$GXX" = yes; then
+-	echo "$as_me:20050: checking for lib$cf_gpp_libname" >&5
++	echo "$as_me:20072: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ 	cf_save="$LIBS"
+ 
+@@ -20068,7 +20090,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 20071 "configure"
++#line 20093 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_gpp_libname/builtin.h>
+@@ -20082,16 +20104,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20085: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20107: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20088: \$? = $ac_status" >&5
++  echo "$as_me:20110: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20091: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20113: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20094: \$? = $ac_status" >&5
++  echo "$as_me:20116: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -20128,7 +20150,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 20131 "configure"
++#line 20153 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20142,16 +20164,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20145: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20167: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20148: \$? = $ac_status" >&5
++  echo "$as_me:20170: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20151: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20173: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20154: \$? = $ac_status" >&5
++  echo "$as_me:20176: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -20184,7 +20206,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 	LIBS="$cf_save"
+-	echo "$as_me:20187: result: $cf_cxx_library" >&5
++	echo "$as_me:20209: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+ 
+@@ -20200,7 +20222,7 @@
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ ac_main_return=return
+-echo "$as_me:20203: checking how to run the C++ preprocessor" >&5
++echo "$as_me:20225: checking how to run the C++ preprocessor" >&5
+ echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
+ if test -z "$CXXCPP"; then
+   if test "${ac_cv_prog_CXXCPP+set}" = set; then
+@@ -20217,18 +20239,18 @@
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 20220 "configure"
++#line 20242 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:20225: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:20247: \"$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:20231: \$? = $ac_status" >&5
++  echo "$as_me:20253: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -20251,17 +20273,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 20254 "configure"
++#line 20276 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:20258: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:20280: \"$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:20264: \$? = $ac_status" >&5
++  echo "$as_me:20286: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -20298,7 +20320,7 @@
+ else
+   ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:20301: result: $CXXCPP" >&5
++echo "$as_me:20323: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -20308,18 +20330,18 @@
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 20311 "configure"
++#line 20333 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:20316: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:20338: \"$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:20322: \$? = $ac_status" >&5
++  echo "$as_me:20344: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -20342,17 +20364,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 20345 "configure"
++#line 20367 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:20349: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:20371: \"$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:20355: \$? = $ac_status" >&5
++  echo "$as_me:20377: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -20380,7 +20402,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:20383: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++  { { echo "$as_me:20405: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -20395,23 +20417,23 @@
+ for ac_header in typeinfo
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20398: checking for $ac_header" >&5
++echo "$as_me:20420: 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 20404 "configure"
++#line 20426 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20408: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:20430: \"$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:20414: \$? = $ac_status" >&5
++  echo "$as_me:20436: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -20430,7 +20452,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:20433: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:20455: 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 <&5
++echo "$as_me:20468: 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 20452 "configure"
++#line 20474 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20456: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:20478: \"$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:20462: \$? = $ac_status" >&5
++  echo "$as_me:20484: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -20478,7 +20500,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:20481: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:20503: 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 <&5
++	echo "$as_me:20514: checking if iostream uses std-namespace" >&5
+ echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 20495 "configure"
++#line 20517 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20509,16 +20531,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20512: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20534: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20515: \$? = $ac_status" >&5
++  echo "$as_me:20537: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20518: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20540: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20521: \$? = $ac_status" >&5
++  echo "$as_me:20543: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_iostream_namespace=yes
+ else
+@@ -20527,7 +20549,7 @@
+ cf_iostream_namespace=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-	echo "$as_me:20530: result: $cf_iostream_namespace" >&5
++	echo "$as_me:20552: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+ 	if test "$cf_iostream_namespace" = yes ; then
+ 
+@@ -20538,7 +20560,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:20541: checking if we should include stdbool.h" >&5
++echo "$as_me:20563: checking if we should include stdbool.h" >&5
+ echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
+ 
+ if test "${cf_cv_header_stdbool_h+set}" = set; then
+@@ -20546,7 +20568,7 @@
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 20549 "configure"
++#line 20571 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -20558,23 +20580,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20561: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20583: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20564: \$? = $ac_status" >&5
++  echo "$as_me:20586: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20567: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20589: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20570: \$? = $ac_status" >&5
++  echo "$as_me:20592: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_header_stdbool_h=0
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 20577 "configure"
++#line 20599 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -20590,16 +20612,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20593: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20615: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20596: \$? = $ac_status" >&5
++  echo "$as_me:20618: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20599: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20621: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20602: \$? = $ac_status" >&5
++  echo "$as_me:20624: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -20613,13 +20635,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:20616: result: yes" >&5
++then	echo "$as_me:20638: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:20618: result: no" >&5
++else	echo "$as_me:20640: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:20622: checking for builtin bool type" >&5
++echo "$as_me:20644: checking for builtin bool type" >&5
+ echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
+ 
+ if test "${cf_cv_builtin_bool+set}" = set; then
+@@ -20627,7 +20649,7 @@
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 20630 "configure"
++#line 20652 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20642,16 +20664,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20645: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20667: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20648: \$? = $ac_status" >&5
++  echo "$as_me:20670: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20651: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20673: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20654: \$? = $ac_status" >&5
++  echo "$as_me:20676: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_builtin_bool=1
+ else
+@@ -20664,13 +20686,13 @@
+ fi
+ 
+ if test "$cf_cv_builtin_bool" = 1
+-then	echo "$as_me:20667: result: yes" >&5
++then	echo "$as_me:20689: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:20669: result: no" >&5
++else	echo "$as_me:20691: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:20673: checking for size of bool" >&5
++echo "$as_me:20695: checking for size of bool" >&5
+ echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
+ if test "${cf_cv_type_of_bool+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20681,7 +20703,7 @@
+   cf_cv_type_of_bool=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 20684 "configure"
++#line 20706 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20723,15 +20745,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:20726: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20748: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20729: \$? = $ac_status" >&5
++  echo "$as_me:20751: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:20731: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20753: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20734: \$? = $ac_status" >&5
++  echo "$as_me:20756: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_type_of_bool=`cat cf_test.out`
+ 		 if test -z "$cf_cv_type_of_bool"; then
+@@ -20749,18 +20771,18 @@
+ fi
+ 
+ 	rm -f cf_test.out
+-echo "$as_me:20752: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:20774: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ if test "$cf_cv_type_of_bool" = unknown ; then
+ 	case .$NCURSES_BOOL in
+ 	(.auto|.) NCURSES_BOOL=unsigned;;
+ 	esac
+-	{ echo "$as_me:20758: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:20780: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+ echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
+ 	cf_cv_type_of_bool=$NCURSES_BOOL
+ fi
+ 
+-echo "$as_me:20763: checking for special defines needed for etip.h" >&5
++echo "$as_me:20785: checking for special defines needed for etip.h" >&5
+ echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6
+ cf_save_CXXFLAGS="$CXXFLAGS"
+ cf_result="none"
+@@ -20778,7 +20800,7 @@
+ 	test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}"
+ 	test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 20781 "configure"
++#line 20803 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20792,16 +20814,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20795: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20817: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20798: \$? = $ac_status" >&5
++  echo "$as_me:20820: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20801: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20823: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20804: \$? = $ac_status" >&5
++  echo "$as_me:20826: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	test -n "$cf_math" && cat >>confdefs.h <&5
++echo "$as_me:20847: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ CXXFLAGS="$cf_save_CXXFLAGS"
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:20830: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:20852: checking if $CXX accepts parameter initialization" >&5
+ echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6
+ if test "${cf_cv_cpp_param_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20844,7 +20866,7 @@
+   cf_cv_cpp_param_init=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 20847 "configure"
++#line 20869 "configure"
+ #include "confdefs.h"
+ 
+ class TEST {
+@@ -20863,15 +20885,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:20866: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20888: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20869: \$? = $ac_status" >&5
++  echo "$as_me:20891: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:20871: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20893: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20874: \$? = $ac_status" >&5
++  echo "$as_me:20896: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cpp_param_init=yes
+ else
+@@ -20890,7 +20912,7 @@
+ ac_main_return=return
+ 
+ fi
+-echo "$as_me:20893: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:20915: result: $cf_cv_cpp_param_init" >&5
+ echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
+ fi
+ test "$cf_cv_cpp_param_init" = yes &&
+@@ -20900,7 +20922,7 @@
+ 
+ if test -n "$CXX"; then
+ 
+-echo "$as_me:20903: checking if $CXX accepts static_cast" >&5
++echo "$as_me:20925: checking if $CXX accepts static_cast" >&5
+ echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6
+ if test "${cf_cv_cpp_static_cast+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20914,7 +20936,7 @@
+ ac_main_return=return
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 20917 "configure"
++#line 20939 "configure"
+ #include "confdefs.h"
+ 
+ class NCursesPanel
+@@ -20958,16 +20980,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20961: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20983: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20964: \$? = $ac_status" >&5
++  echo "$as_me:20986: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20967: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20989: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20970: \$? = $ac_status" >&5
++  echo "$as_me:20992: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cpp_static_cast=yes
+ else
+@@ -20985,7 +21007,7 @@
+ ac_main_return=return
+ 
+ fi
+-echo "$as_me:20988: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:21010: result: $cf_cv_cpp_static_cast" >&5
+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
+ 
+ fi
+@@ -21034,7 +21056,7 @@
+ 	else
+ 		if test "$cf_cv_header_stdbool_h" = 1 ; then
+ 
+-echo "$as_me:21037: checking for size of bool" >&5
++echo "$as_me:21059: checking for size of bool" >&5
+ echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
+ if test "${cf_cv_type_of_bool+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21045,7 +21067,7 @@
+   cf_cv_type_of_bool=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 21048 "configure"
++#line 21070 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21087,15 +21109,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:21090: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21112: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21093: \$? = $ac_status" >&5
++  echo "$as_me:21115: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:21095: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21117: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21098: \$? = $ac_status" >&5
++  echo "$as_me:21120: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_type_of_bool=`cat cf_test.out`
+ 		 if test -z "$cf_cv_type_of_bool"; then
+@@ -21113,25 +21135,25 @@
+ fi
+ 
+ 	rm -f cf_test.out
+-echo "$as_me:21116: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:21138: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ if test "$cf_cv_type_of_bool" = unknown ; then
+ 	case .$NCURSES_BOOL in
+ 	(.auto|.) NCURSES_BOOL=unsigned;;
+ 	esac
+-	{ echo "$as_me:21122: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:21144: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+ echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
+ 	cf_cv_type_of_bool=$NCURSES_BOOL
+ fi
+ 
+ 		else
+-			echo "$as_me:21128: checking for fallback type of bool" >&5
++			echo "$as_me:21150: checking for fallback type of bool" >&5
+ echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
+ 			case "$host_cpu" in
+ 			(i?86)	cf_cv_type_of_bool=char	;;
+ 			(*)	cf_cv_type_of_bool=int	;;
+ 			esac
+-			echo "$as_me:21134: result: $cf_cv_type_of_bool" >&5
++			echo "$as_me:21156: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ 		fi
+ 	fi
+@@ -21160,7 +21182,7 @@
+ 
+ 	if test "$cf_with_ada" != "no" ; then
+ 		if test "$with_libtool" != "no"; then
+-			{ echo "$as_me:21163: WARNING: libtool does not support Ada - disabling feature" >&5
++			{ echo "$as_me:21185: WARNING: libtool does not support Ada - disabling feature" >&5
+ echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
+ 			cf_with_ada=no
+ 		fi
+@@ -21171,7 +21193,7 @@
+ cf_ada_make=gnatmake
+ # Extract the first word of "$cf_ada_make", so it can be a program name with args.
+ set dummy $cf_ada_make; ac_word=$2
+-echo "$as_me:21174: checking for $ac_word" >&5
++echo "$as_me:21196: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_gnat_exists+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21186,7 +21208,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_gnat_exists="yes"
+-echo "$as_me:21189: found $ac_dir/$ac_word" >&5
++echo "$as_me:21211: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -21195,10 +21217,10 @@
+ fi
+ gnat_exists=$ac_cv_prog_gnat_exists
+ if test -n "$gnat_exists"; then
+-  echo "$as_me:21198: result: $gnat_exists" >&5
++  echo "$as_me:21220: result: $gnat_exists" >&5
+ echo "${ECHO_T}$gnat_exists" >&6
+ else
+-  echo "$as_me:21201: result: no" >&5
++  echo "$as_me:21223: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -21207,12 +21229,12 @@
+ 	cf_cv_prog_gnat_correct=no
+ else
+ 
+-echo "$as_me:21210: checking for gnat version" >&5
++echo "$as_me:21232: checking for gnat version" >&5
+ echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
+ cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
+ 	grep '[0-9].[0-9][0-9]*' |\
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+-echo "$as_me:21215: result: $cf_gnat_version" >&5
++echo "$as_me:21237: result: $cf_gnat_version" >&5
+ echo "${ECHO_T}$cf_gnat_version" >&6
+ 
+ case $cf_gnat_version in
+@@ -21220,7 +21242,7 @@
+ 	cf_cv_prog_gnat_correct=yes
+ 	;;
+ (*)
+-	{ echo "$as_me:21223: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
++	{ echo "$as_me:21245: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+ echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
+ 	cf_cv_prog_gnat_correct=no
+ 	;;
+@@ -21228,7 +21250,7 @@
+ 
+ 	# Extract the first word of "m4", so it can be a program name with args.
+ set dummy m4; ac_word=$2
+-echo "$as_me:21231: checking for $ac_word" >&5
++echo "$as_me:21253: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_M4_exists+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21243,7 +21265,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_M4_exists="yes"
+-echo "$as_me:21246: found $ac_dir/$ac_word" >&5
++echo "$as_me:21268: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -21252,10 +21274,10 @@
+ fi
+ M4_exists=$ac_cv_prog_M4_exists
+ if test -n "$M4_exists"; then
+-  echo "$as_me:21255: result: $M4_exists" >&5
++  echo "$as_me:21277: result: $M4_exists" >&5
+ echo "${ECHO_T}$M4_exists" >&6
+ else
+-  echo "$as_me:21258: result: no" >&5
++  echo "$as_me:21280: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -21264,7 +21286,7 @@
+ 		echo Ada95 binding required program m4 not found. Ada95 binding disabled.
+ 	fi
+ 	if test "$cf_cv_prog_gnat_correct" = yes; then
+-		echo "$as_me:21267: checking if GNAT works" >&5
++		echo "$as_me:21289: checking if GNAT works" >&5
+ echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+ 
+ rm -rf conftest* *~conftest*
+@@ -21292,7 +21314,7 @@
+ fi
+ rm -rf conftest* *~conftest*
+ 
+-		echo "$as_me:21295: result: $cf_cv_prog_gnat_correct" >&5
++		echo "$as_me:21317: result: $cf_cv_prog_gnat_correct" >&5
+ echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
+ 	fi
+ fi
+@@ -21301,7 +21323,7 @@
+ 
+  	ADAFLAGS="$ADAFLAGS -gnatpn"
+ 
+-	echo "$as_me:21304: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:21326: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -21318,10 +21340,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:21321: result: $ADAFLAGS" >&5
++	echo "$as_me:21343: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:21324: checking if GNATPREP supports -T option" >&5
++echo "$as_me:21346: checking if GNATPREP supports -T option" >&5
+ echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
+ if test "${cf_cv_gnatprep_opt_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21331,11 +21353,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:21334: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:21356: result: $cf_cv_gnatprep_opt_t" >&5
+ echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
+ test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
+ 
+-echo "$as_me:21338: checking if GNAT supports generics" >&5
++echo "$as_me:21360: checking if GNAT supports generics" >&5
+ echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
+ case $cf_gnat_version in
+ (3.[1-9]*|[4-9].*)
+@@ -21345,7 +21367,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:21348: result: $cf_gnat_generics" >&5
++echo "$as_me:21370: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -21357,7 +21379,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:21360: checking if GNAT supports SIGINT" >&5
++echo "$as_me:21382: checking if GNAT supports SIGINT" >&5
+ echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
+ if test "${cf_cv_gnat_sigint+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21405,7 +21427,7 @@
+ rm -rf conftest* *~conftest*
+ 
+ fi
+-echo "$as_me:21408: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:21430: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test $cf_cv_gnat_sigint = yes ; then
+@@ -21418,7 +21440,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:21421: checking if GNAT supports project files" >&5
++echo "$as_me:21443: checking if GNAT supports project files" >&5
+ echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
+ case $cf_gnat_version in
+ (3.[0-9]*)
+@@ -21478,15 +21500,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:21481: result: $cf_gnat_projects" >&5
++echo "$as_me:21503: result: $cf_gnat_projects" >&5
+ echo "${ECHO_T}$cf_gnat_projects" >&6
+ fi # enable_gnat_projects
+ 
+ if test $cf_gnat_projects = yes
+ then
+-	echo "$as_me:21487: checking if GNAT supports libraries" >&5
++	echo "$as_me:21509: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:21489: result: $cf_gnat_libraries" >&5
++	echo "$as_me:21511: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -21506,7 +21528,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:21509: checking for ada-compiler" >&5
++echo "$as_me:21531: checking for ada-compiler" >&5
+ echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -21517,12 +21539,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:21520: result: $cf_ada_compiler" >&5
++echo "$as_me:21542: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 			cf_ada_package=terminal_interface
+ 
+-echo "$as_me:21525: checking for ada-include" >&5
++echo "$as_me:21547: checking for ada-include" >&5
+ echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -21558,7 +21580,7 @@
+ 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:21561: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:21583: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -21567,10 +21589,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:21570: result: $ADA_INCLUDE" >&5
++echo "$as_me:21592: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:21573: checking for ada-objects" >&5
++echo "$as_me:21595: checking for ada-objects" >&5
+ echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -21606,7 +21628,7 @@
+ 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:21609: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:21631: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -21615,10 +21637,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:21618: result: $ADA_OBJECTS" >&5
++echo "$as_me:21640: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:21621: checking if an Ada95 shared-library should be built" >&5
++echo "$as_me:21643: checking if an Ada95 shared-library should be built" >&5
+ echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -21628,7 +21650,7 @@
+ else
+   with_ada_sharedlib=no
+ fi;
+-echo "$as_me:21631: result: $with_ada_sharedlib" >&5
++echo "$as_me:21653: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ 
+ ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
+@@ -21651,13 +21673,13 @@
+ 
+ # do this "late" to avoid conflict with header-checks
+ if test "x$with_widec" = xyes ; then
+-	echo "$as_me:21654: checking for wchar_t" >&5
++	echo "$as_me:21676: checking for wchar_t" >&5
+ echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6
+ if test "${ac_cv_type_wchar_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 21660 "configure"
++#line 21682 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -21672,16 +21694,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:21675: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21697: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21678: \$? = $ac_status" >&5
++  echo "$as_me:21700: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:21681: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21703: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21684: \$? = $ac_status" >&5
++  echo "$as_me:21706: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_wchar_t=yes
+ else
+@@ -21691,10 +21713,10 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:21694: result: $ac_cv_type_wchar_t" >&5
++echo "$as_me:21716: result: $ac_cv_type_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
+ 
+-echo "$as_me:21697: checking size of wchar_t" >&5
++echo "$as_me:21719: checking size of wchar_t" >&5
+ echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6
+ if test "${ac_cv_sizeof_wchar_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21703,7 +21725,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 21706 "configure"
++#line 21728 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -21715,21 +21737,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:21718: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21740: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21721: \$? = $ac_status" >&5
++  echo "$as_me:21743: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:21724: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21746: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21727: \$? = $ac_status" >&5
++  echo "$as_me:21749: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 21732 "configure"
++#line 21754 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -21741,16 +21763,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:21744: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21766: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21747: \$? = $ac_status" >&5
++  echo "$as_me:21769: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:21750: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21772: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21753: \$? = $ac_status" >&5
++  echo "$as_me:21775: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -21766,7 +21788,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 21769 "configure"
++#line 21791 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -21778,16 +21800,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:21781: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21803: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21784: \$? = $ac_status" >&5
++  echo "$as_me:21806: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:21787: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21809: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21790: \$? = $ac_status" >&5
++  echo "$as_me:21812: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -21803,7 +21825,7 @@
+ 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 21806 "configure"
++#line 21828 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -21815,16 +21837,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:21818: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21840: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21821: \$? = $ac_status" >&5
++  echo "$as_me:21843: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:21824: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21846: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21827: \$? = $ac_status" >&5
++  echo "$as_me:21849: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -21837,12 +21859,12 @@
+ ac_cv_sizeof_wchar_t=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:21840: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:21862: 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 21845 "configure"
++#line 21867 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -21858,15 +21880,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:21861: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21883: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21864: \$? = $ac_status" >&5
++  echo "$as_me:21886: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:21866: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21888: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21869: \$? = $ac_status" >&5
++  echo "$as_me:21891: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_wchar_t=`cat conftest.val`
+ else
+@@ -21882,7 +21904,7 @@
+   ac_cv_sizeof_wchar_t=0
+ fi
+ fi
+-echo "$as_me:21885: result: $ac_cv_sizeof_wchar_t" >&5
++echo "$as_me:21907: result: $ac_cv_sizeof_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:21925: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+ 
+@@ -21942,7 +21964,7 @@
+ test "x$with_widec"     = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
+ test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
+ 
+-echo "$as_me:21945: result: $LIB_SUBSETS" >&5
++echo "$as_me:21967: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+ 
+ ### Construct the list of include-directories to be generated
+@@ -21973,7 +21995,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:21976: checking default library suffix" >&5
++echo "$as_me:21998: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -21984,10 +22006,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:21987: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:22009: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:21990: checking default library-dependency suffix" >&5
++echo "$as_me:22012: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -22045,10 +22067,10 @@
+ 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
+ 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
+ 	fi
+-echo "$as_me:22048: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:22070: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:22051: checking default object directory" >&5
++echo "$as_me:22073: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -22064,11 +22086,11 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:22067: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:22089: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ if test "x$cf_with_cxx" = xyes ; then
+-echo "$as_me:22071: checking c++ library-dependency suffix" >&5
++echo "$as_me:22093: checking c++ library-dependency suffix" >&5
+ echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
+ if test "$with_libtool" != "no"; then
+ 	# libtool thinks it can make c++ shared libraries (perhaps only g++)
+@@ -22136,7 +22158,7 @@
+ 	fi
+ 
+ fi
+-echo "$as_me:22139: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:22161: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+ 
+ fi
+@@ -22312,19 +22334,19 @@
+ 
+ if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
+ then
+-	echo "$as_me:22315: checking if linker supports switching between static/dynamic" >&5
++	echo "$as_me:22337: checking if linker supports switching between static/dynamic" >&5
+ echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6
+ 
+ 	rm -f libconftest.a
+ 	cat >conftest.$ac_ext <
+ int cf_ldflags_static(FILE *fp) { return fflush(fp); }
+ EOF
+-	if { (eval echo "$as_me:22324: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:22346: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22327: \$? = $ac_status" >&5
++  echo "$as_me:22349: \$? = $ac_status" >&5
+   (exit $ac_status); } ; then
+ 		( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null
+ 		( eval $RANLIB libconftest.a ) 2>&5 >/dev/null
+@@ -22335,10 +22357,10 @@
+ 
+ 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 22338 "configure"
++#line 22360 "configure"
+ #include "confdefs.h"
+ 
+-#line 22341 "configure"
++#line 22363 "configure"
+ #include 
+ int cf_ldflags_static(FILE *fp);
+ 
+@@ -22353,16 +22375,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:22356: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22378: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22359: \$? = $ac_status" >&5
++  echo "$as_me:22381: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:22362: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22384: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22365: \$? = $ac_status" >&5
++  echo "$as_me:22387: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	# some linkers simply ignore the -dynamic
+@@ -22385,7 +22407,7 @@
+ 	rm -f libconftest.*
+ 	LIBS="$cf_save_LIBS"
+ 
+-	echo "$as_me:22388: result: $cf_ldflags_static" >&5
++	echo "$as_me:22410: result: $cf_ldflags_static" >&5
+ echo "${ECHO_T}$cf_ldflags_static" >&6
+ 
+ 	if test $cf_ldflags_static != yes
+@@ -22401,7 +22423,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:22404: checking where we will install curses.h" >&5
++echo "$as_me:22426: checking where we will install curses.h" >&5
+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
+ 
+ includesubdir=
+@@ -22411,7 +22433,7 @@
+ then
+ 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
+ fi
+-echo "$as_me:22414: result: ${includedir}${includesubdir}" >&5
++echo "$as_me:22436: result: ${includedir}${includesubdir}" >&5
+ echo "${ECHO_T}${includedir}${includesubdir}" >&6
+ 
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -22419,7 +22441,7 @@
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+-	{ echo "$as_me:22422: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++	{ echo "$as_me:22444: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+ echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
+ fi
+ fi
+@@ -22437,7 +22459,7 @@
+ ### Construct the list of subdirectories for which we'll customize makefiles
+ ### with the appropriate compile-rules.
+ 
+-echo "$as_me:22440: checking for src modules" >&5
++echo "$as_me:22462: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+ 
+ # dependencies and linker-arguments for test-programs
+@@ -22502,7 +22524,7 @@
+ 		fi
+ 	fi
+ done
+-echo "$as_me:22505: result: $cf_cv_src_modules" >&5
++echo "$as_me:22527: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+ 
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+@@ -22719,7 +22741,7 @@
+ 
+ # Extract the first word of "tic", so it can be a program name with args.
+ set dummy tic; ac_word=$2
+-echo "$as_me:22722: checking for $ac_word" >&5
++echo "$as_me:22744: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_TIC_PATH+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22736,7 +22758,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_TIC_PATH="$ac_dir/$ac_word"
+-   echo "$as_me:22739: found $ac_dir/$ac_word" >&5
++   echo "$as_me:22761: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -22748,10 +22770,10 @@
+ TIC_PATH=$ac_cv_path_TIC_PATH
+ 
+ if test -n "$TIC_PATH"; then
+-  echo "$as_me:22751: result: $TIC_PATH" >&5
++  echo "$as_me:22773: result: $TIC_PATH" >&5
+ echo "${ECHO_T}$TIC_PATH" >&6
+ else
+-  echo "$as_me:22754: result: no" >&5
++  echo "$as_me:22776: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -22759,7 +22781,7 @@
+ then
+ 	if test "$TIC_PATH" = unknown
+ 	then
+-		{ echo "$as_me:22762: WARNING: no tic program found for fallbacks" >&5
++		{ echo "$as_me:22784: WARNING: no tic program found for fallbacks" >&5
+ echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
+ 	fi
+ fi
+@@ -22795,7 +22817,7 @@
+ 	(*-D_XOPEN_SOURCE_EXTENDED*)
+ 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
+ 
+-echo "${as_me:-configure}:22798: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
++echo "${as_me:-configure}:22820: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+ 
+ 		CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
+ 		CPPFLAGS=`echo "x$CPPFLAGS" | sed -e  's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'`
+@@ -22806,7 +22828,7 @@
+ 
+ # Help to automatically enable the extended curses features when using either
+ # the *-config or the ".pc" files by adding defines.
+-echo "$as_me:22809: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
++echo "$as_me:22831: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
+ echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6
+ PKG_CFLAGS=
+ for cf_loop1 in $CPPFLAGS_after_XOPEN
+@@ -22822,7 +22844,7 @@
+ 	done
+ 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
+ done
+-echo "$as_me:22825: result: $PKG_CFLAGS" >&5
++echo "$as_me:22847: result: $PKG_CFLAGS" >&5
+ echo "${ECHO_T}$PKG_CFLAGS" >&6
+ 
+ # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
+@@ -22879,7 +22901,7 @@
+ 	cf_filter_syms=$cf_dft_filter_syms
+ 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_version" 1>&6
+ 
+-echo "${as_me:-configure}:22882: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
++echo "${as_me:-configure}:22904: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
+ 
+ fi
+ 
+@@ -22983,7 +23005,7 @@
+ : ${CONFIG_STATUS=./config.status}
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:22986: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:23008: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >$CONFIG_STATUS <<_ACEOF
+ #! $SHELL
+@@ -23159,7 +23181,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:23162: error: ambiguous option: $1
++    { { echo "$as_me:23184: 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;}
+@@ -23178,7 +23200,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:23181: error: unrecognized option: $1
++  -*) { { echo "$as_me:23203: 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;}
+@@ -23297,7 +23319,7 @@
+   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
+   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
+-  *) { { echo "$as_me:23300: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:23322: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -23525,6 +23547,7 @@
+ s,@NCURSES_OK_WINT_T@,$NCURSES_OK_WINT_T,;t t
+ s,@cf_cv_enable_lp64@,$cf_cv_enable_lp64,;t t
+ s,@NCURSES_TPARM_VARARGS@,$NCURSES_TPARM_VARARGS,;t t
++s,@NCURSES_WATTR_MACROS@,$NCURSES_WATTR_MACROS,;t t
+ s,@NCURSES_BOOL@,$NCURSES_BOOL,;t t
+ s,@TERMINFO_CAPS@,$TERMINFO_CAPS,;t t
+ s,@NCURSES_OSPEED@,$NCURSES_OSPEED,;t t
+@@ -23772,7 +23795,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:23775: creating $ac_file" >&5
++    { echo "$as_me:23798: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -23790,7 +23813,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:23793: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:23816: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -23803,7 +23826,7 @@
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+-           { { echo "$as_me:23806: error: cannot find input file: $f" >&5
++           { { echo "$as_me:23829: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -23819,7 +23842,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' $ac_item`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:23822: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:23845: 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;}
+@@ -23828,7 +23851,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' $ac_item`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:23831: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:23854: 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;}
+@@ -23865,7 +23888,7 @@
+             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:23868: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:23891: 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;}
+@@ -23876,7 +23899,7 @@
+     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:23879: WARNING: Some variables may not be substituted:
++      { echo "$as_me:23902: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -23925,7 +23948,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:23928: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:23951: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -23936,7 +23959,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:23939: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:23962: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -23949,7 +23972,7 @@
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+-           { { echo "$as_me:23952: error: cannot find input file: $f" >&5
++           { { echo "$as_me:23975: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -24007,7 +24030,7 @@
+   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:24010: $ac_file is unchanged" >&5
++      { echo "$as_me:24033: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -24352,7 +24375,7 @@
+ 				(cygdll|msysdll|mingw)
+ 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
+ 
+-echo "${as_me:-configure}:24355: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:24378: testing overriding CXX_MODEL to SHARED ..." 1>&5
+ 
+ 					with_shared_cxx=yes
+ 					;;
+Index: configure.in
+Prereq:  1.631 
+--- ncurses-6.0-20161203+/configure.in	2016-06-04 22:47:54.000000000 +0000
++++ ncurses-6.0-20161210/configure.in	2016-12-11 02:17:55.000000000 +0000
+@@ -28,14 +28,14 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: configure.in,v 1.631 2016/06/04 22:47:54 tom Exp $
++dnl $Id: configure.in,v 1.633 2016/12/11 02:17:55 tom Exp $
+ dnl Process this file with autoconf to produce a configure script.
+ dnl
+ dnl See http://invisible-island.net/autoconf/ for additional information.
+ dnl
+ dnl ---------------------------------------------------------------------------
+ AC_PREREQ(2.52.20030208)
+-AC_REVISION($Revision: 1.631 $)
++AC_REVISION($Revision: 1.633 $)
+ AC_INIT(ncurses/base/lib_initscr.c)
+ AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
+ 
+@@ -926,6 +926,21 @@
+ 	with_tic_depends=no
+ fi
+ 
++###   use option --disable-wattr-macros to suppress wattr* macros from curses.h
++AC_MSG_CHECKING(if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition)
++AC_ARG_ENABLE(wattr-macros,
++	[  --disable-wattr-macros  suppress wattr* macros to help with ncurses5/ncurses6 transition],
++	[with_wattr_macros=$enableval],
++	[with_wattr_macros=yes])
++if [[ "x$with_wattr_macros" != xyes ]]; then
++	NCURSES_WATTR_MACROS=0
++	AC_MSG_RESULT(yes)
++else
++	NCURSES_WATTR_MACROS=1
++	AC_MSG_RESULT(no)
++fi
++AC_SUBST(NCURSES_WATTR_MACROS)
++
+ ###   use option --with-bool to override bool's type
+ AC_MSG_CHECKING(for type of bool)
+ AC_ARG_WITH(bool,
+Index: dist.mk
+Prereq:  1.1135 
+--- ncurses-6.0-20161203+/dist.mk	2016-12-03 16:11:11.000000000 +0000
++++ ncurses-6.0-20161210/dist.mk	2016-12-10 12:47:46.000000000 +0000
+@@ -25,7 +25,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1135 2016/12/03 16:11:11 tom Exp $
++# $Id: dist.mk,v 1.1136 2016/12/10 12:47:46 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -37,7 +37,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 0
+-NCURSES_PATCH = 20161203
++NCURSES_PATCH = 20161210
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: include/curses.h.in
+Prereq:  1.243 
+--- ncurses-6.0-20161203+/include/curses.h.in	2016-01-23 22:20:31.000000000 +0000
++++ ncurses-6.0-20161210/include/curses.h.in	2016-12-10 23:56:23.000000000 +0000
+@@ -32,7 +32,7 @@
+  *     and: Thomas E. Dickey                        1996-on                 *
+  ****************************************************************************/
+ 
+-/* $Id: curses.h.in,v 1.243 2016/01/23 22:20:31 tom Exp $ */
++/* $Id: curses.h.in,v 1.244 2016/12/10 23:56:23 tom Exp $ */
+ 
+ #ifndef __NCURSES_H
+ #define __NCURSES_H
+@@ -111,6 +111,15 @@
+ #endif
+ 
+ /*
++ * Definition used to optionally suppress wattr* macros to help with the
++ * transition from ncurses5 to ncurses6 by allowing the header files to
++ * be shared across development packages for ncursesw in both ABIs.
++ */
++#ifndef NCURSES_WATTR_MACROS
++#define NCURSES_WATTR_MACROS @NCURSES_WATTR_MACROS@
++#endif
++
++/*
+  * The reentrant code relies on the opaque setting, but adds features.
+  */
+ #ifndef NCURSES_REENTRANT
+@@ -1153,6 +1162,7 @@
+ #define wattroff(win,at)	wattr_off(win, NCURSES_CAST(attr_t, at), NULL)
+ 
+ #if !NCURSES_OPAQUE
++#if NCURSES_WATTR_MACROS
+ #if NCURSES_WIDECHAR && @NCURSES_EXT_COLORS@
+ #define wattrset(win,at)	((win) \
+ 				  ? ((win)->_color = NCURSES_CAST(int, PAIR_NUMBER(at)), \
+@@ -1165,6 +1175,7 @@
+ 				     OK) \
+ 				  : ERR)
+ #endif
++#endif /* NCURSES_WATTR_MACROS */
+ #endif /* NCURSES_OPAQUE */
+ 
+ #define scroll(win)		wscrl(win,1)
+@@ -1301,6 +1312,7 @@
+ #define slk_attr_on(a,v)		((v) ? ERR : slk_attron(a))
+ 
+ #if !NCURSES_OPAQUE
++#if NCURSES_WATTR_MACROS
+ #if NCURSES_WIDECHAR && @NCURSES_EXT_COLORS@
+ #define wattr_set(win,a,p,opts)		(((win) \
+ 					  ? ((win)->_attrs = ((a) & ~A_COLOR), \
+@@ -1319,6 +1331,7 @@
+ 					 (void)(((p) != (void *)0) ? (*(p) = (NCURSES_PAIRS_T) ((win) ? PAIR_NUMBER((win)->_attrs) : 0)) : OK), \
+ 					 OK)
+ #endif
++#endif /* NCURSES_WATTR_MACROS */
+ #endif /* NCURSES_OPAQUE */
+ 
+ /*
+Index: ncurses/base/MKlib_gen.sh
+Prereq:  1.54 
+--- ncurses-6.0-20161203+/ncurses/base/MKlib_gen.sh	2016-07-09 21:43:05.000000000 +0000
++++ ncurses-6.0-20161210/ncurses/base/MKlib_gen.sh	2016-12-11 00:07:14.000000000 +0000
+@@ -2,7 +2,7 @@
+ #
+ # MKlib_gen.sh -- generate sources from curses.h macro definitions
+ #
+-# ($Id: MKlib_gen.sh,v 1.54 2016/07/09 21:43:05 tom Exp $)
++# ($Id: MKlib_gen.sh,v 1.55 2016/12/11 00:07:14 tom Exp $)
+ #
+ ##############################################################################
+ # Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.                #
+@@ -62,7 +62,7 @@
+ if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
+ if test "${LC_COLLATE+set}"  = set; then LC_COLLATE=C;  export LC_COLLATE;  fi
+ 
+-preprocessor="$1 -DNCURSES_INTERNALS -I../include"
++preprocessor="$1 -DNCURSES_WATTR_MACROS -DNCURSES_INTERNALS -I../include"
+ AWK="$2"
+ USE="$3"
+ 
+Index: package/debian-mingw/changelog
+--- ncurses-6.0-20161203+/package/debian-mingw/changelog	2016-12-03 16:11:11.000000000 +0000
++++ ncurses-6.0-20161210/package/debian-mingw/changelog	2016-12-10 12:47:46.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161203) unstable; urgency=low
++ncurses6 (6.0+20161210) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 03 Dec 2016 11:11:11 -0500
++ -- Thomas E. Dickey   Sat, 10 Dec 2016 07:47:46 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.0-20161203+/package/debian-mingw64/changelog	2016-12-03 16:11:11.000000000 +0000
++++ ncurses-6.0-20161210/package/debian-mingw64/changelog	2016-12-10 12:47:46.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161203) unstable; urgency=low
++ncurses6 (6.0+20161210) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 03 Dec 2016 11:11:11 -0500
++ -- Thomas E. Dickey   Sat, 10 Dec 2016 07:47:46 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.0-20161203+/package/debian/changelog	2016-12-03 16:11:11.000000000 +0000
++++ ncurses-6.0-20161210/package/debian/changelog	2016-12-10 12:47:46.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161203) unstable; urgency=low
++ncurses6 (6.0+20161210) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 03 Dec 2016 11:11:11 -0500
++ -- Thomas E. Dickey   Sat, 10 Dec 2016 07:47:46 -0500
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.187 
+--- ncurses-6.0-20161203+/package/mingw-ncurses.nsi	2016-12-03 16:11:11.000000000 +0000
++++ ncurses-6.0-20161210/package/mingw-ncurses.nsi	2016-12-10 12:47:46.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.187 2016/12/03 16:11:11 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.188 2016/12/10 12:47:46 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "0"
+ !define VERSION_YYYY  "2016"
+-!define VERSION_MMDD  "1203"
++!define VERSION_MMDD  "1210"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.0-20161203+/package/mingw-ncurses.spec	2016-12-03 16:11:11.000000000 +0000
++++ ncurses-6.0-20161210/package/mingw-ncurses.spec	2016-12-10 12:47:46.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.0
+-Release: 20161203
++Release: 20161210
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.0-20161203+/package/ncurses.spec	2016-12-03 16:11:11.000000000 +0000
++++ ncurses-6.0-20161210/package/ncurses.spec	2016-12-10 12:47:46.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.0
+-Release: 20161203
++Release: 20161210
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: test/tput-initc
+--- /dev/null	2016-12-10 12:31:45.835999822 +0000
++++ ncurses-6.0-20161210/test/tput-initc	2016-12-10 23:35:46.000000000 +0000
+@@ -0,0 +1,87 @@
++#!/bin/sh
++##############################################################################
++# Copyright (c) 2016 Free Software Foundation, Inc.                          #
++#                                                                            #
++# Permission is hereby granted, free of charge, to any person obtaining a    #
++# copy of this software and associated documentation files (the "Software"), #
++# to deal in the Software without restriction, including without limitation  #
++# the rights to use, copy, modify, merge, publish, distribute, distribute    #
++# with modifications, sublicense, and/or sell copies of the Software, and to #
++# permit persons to whom the Software is furnished to do so, subject to the  #
++# following conditions:                                                      #
++#                                                                            #
++# The above copyright notice and this permission notice shall be included in #
++# all copies or substantial portions of the Software.                        #
++#                                                                            #
++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,   #
++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL    #
++# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER      #
++# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING    #
++# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER        #
++# DEALINGS IN THE SOFTWARE.                                                  #
++#                                                                            #
++# Except as contained in this notice, the name(s) of the above copyright     #
++# holders shall not be used in advertising or otherwise to promote the sale, #
++# use or other dealings in this Software without prior written               #
++# authorization.                                                             #
++##############################################################################
++# $Id: tput-initc,v 1.1 2016/12/10 23:35:46 tom Exp $
++# Some of the ".dat" files in ncurses' test-directory give r/g/b numbers for
++# default palettes of xterm and Linux console.  This script reads the numbers
++# and (assuming the same or compatible terminal) uses tput to (re)initialize
++# the palette using those numbers.
++
++failed() {
++	printf "?? $*\n" >&2
++	exit 1
++}
++
++if [ $# = 1 ]
++then
++	file=$1
++elif [ $# = 0 ]
++then
++	file=$TERM.dat
++else
++	failed "expected one parameter or none"
++fi
++
++if [ ! -f "$file" ]
++then
++	if [ -f "$file.dat" ]
++	then
++		file="$file.dat"
++	else
++		failed "no such file: $file"
++	fi
++fi
++
++myterm=${file%%.dat}
++colors=$(tput -T $myterm colors 2>/dev/null)
++if [ ${colors:-0} -le 0 ]
++then
++	myterm=${myterm%%-color}
++	colors=$(tput -T $myterm colors 2>/dev/null)
++fi
++if [ ${colors:-0} -le 0 ]
++then
++	failed "terminal $myterm does not support color"
++fi
++
++cat $file |\
++awk -v myterm=$myterm '
++BEGIN { limit=1000; }
++function scaled(n) {
++	return (n * 1000)/limit;
++}
++
++/^scale:[0-9]+/{
++	sub("^scale:","",$0);
++	limit = $0;
++}
++
++/^[0-9]+:/{
++	sub(":","",$1);
++	printf "tput -T%s initc %d %d %d %d\n", myterm, $1,scaled($2),scaled($3),scaled($4);
++}' |sh -
+Index: test/xterm-16color.dat
+Prereq:  1.2 
+--- ncurses-6.0-20161203+/test/xterm-16color.dat	2006-04-22 21:40:00.000000000 +0000
++++ ncurses-6.0-20161210/test/xterm-16color.dat	2016-12-10 22:34:58.000000000 +0000
+@@ -1,5 +1,5 @@
+ ##############################################################################
+-# Copyright (c) 2004,2006 Free Software Foundation, Inc.                     #
++# Copyright (c) 2004-2006,2016 Free Software Foundation, Inc.                #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+ # copy of this software and associated documentation files (the "Software"), #
+@@ -25,7 +25,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: xterm-16color.dat,v 1.2 2006/04/22 21:40:00 tom Exp $
++# $Id: xterm-16color.dat,v 1.3 2016/12/10 22:34:58 tom Exp $
+ # This illustrates the predefined colors for XFree86 xterm's "xterm-16color". 
+ # If you set $TERM to "xterm-88color" (and have xterm compiled to support the
+ # 88-color or 256-color feature), you can use the ncurses 'd' screen to
+@@ -33,13 +33,13 @@
+ # the first 16 colors, and xterm happens to use the same first 16 colors in
+ # the extended color models that support initc.
+ #
+-# The colors shown are for xterm patch #189.
++# The colors shown are for xterm patch #192.
+ scale:255
+ 0:	  0   0   0		black
+ 1:	205   0	  0		red3
+ 2:	  0 205	  0		green3
+ 3:	205 205	  0		yellow3
+-4:	 30 144 255		DodgerBlue1
++4:	  0   0 238		blue2
+ 5:	205   0 205		magenta3
+ 6:	  0 205 205		cyan3
+ 7:	229 229 229 		gray90
+@@ -47,7 +47,7 @@
+ 9:	255   0   0		red
+ 10:	  0 255   0		green
+ 11:	255 255   0		yellow
+-12:	 99 184 255		SteelBlue1
++12:	 92  92 255		customblue
+ 13:	255   0 255		magenta
+ 14:	  0 255 255		cyan
+ 15:	255 255 255		white
+Index: test/xterm-256color.dat
+Prereq:  1.1 
+--- ncurses-6.0-20161203+/test/xterm-256color.dat	2009-10-30 22:33:40.000000000 +0000
++++ ncurses-6.0-20161210/test/xterm-256color.dat	2016-12-10 22:39:28.000000000 +0000
+@@ -1,5 +1,5 @@
+ ##############################################################################
+-# Copyright (c) 2009 Free Software Foundation, Inc.                          #
++# Copyright (c) 2009,2016 Free Software Foundation, Inc.                     #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+ # copy of this software and associated documentation files (the "Software"), #
+@@ -25,7 +25,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: xterm-256color.dat,v 1.1 2009/10/30 22:33:40 tom Exp $
++# $Id: xterm-256color.dat,v 1.2 2016/12/10 22:39:28 tom Exp $
+ # This illustrates the predefined colors for xterm's "xterm-256color" feature.
+ # If you set $TERM to "xterm-256color" (and have xterm compiled to support the
+ # 256-color feature), you can use the ncurses 'd' screen to
+@@ -33,13 +33,13 @@
+ # the first 16 colors, and xterm happens to use the same first 16 colors in
+ # the extended color models that support initc.
+ #
+-# The colors shown are for xterm patch #189.
++# The colors shown are for xterm patch #192.
+ scale:255
+ 0:	  0   0   0		black
+ 1:	205   0	  0		red3
+ 2:	  0 205	  0		green3
+ 3:	205 205	  0		yellow3
+-4:	 30 144 255		DodgerBlue1
++4:	  0   0 238		blue2
+ 5:	205   0 205		magenta3
+ 6:	  0 205 205		cyan3
+ 7:	229 229 229 		gray90
+@@ -47,7 +47,7 @@
+ 9:	255   0   0		red
+ 10:	  0 255   0		green
+ 11:	255 255   0		yellow
+-12:	 99 184 255		SteelBlue1
++12:	 92  92 255		customblue
+ 13:	255   0 255		magenta
+ 14:	  0 255 255		cyan
+ 15:	255 255 255		white
+Index: test/xterm-88color.dat
+Prereq:  1.3 
+--- ncurses-6.0-20161203+/test/xterm-88color.dat	2009-10-30 22:33:56.000000000 +0000
++++ ncurses-6.0-20161210/test/xterm-88color.dat	2016-12-10 23:06:43.000000000 +0000
+@@ -1,5 +1,5 @@
+ ##############################################################################
+-# Copyright (c) 2005-2006,2009 Free Software Foundation, Inc.                #
++# Copyright (c) 2005-2009,2016 Free Software Foundation, Inc.                #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+ # copy of this software and associated documentation files (the "Software"), #
+@@ -25,7 +25,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: xterm-88color.dat,v 1.3 2009/10/30 22:33:56 tom Exp $
++# $Id: xterm-88color.dat,v 1.4 2016/12/10 23:06:43 tom Exp $
+ # This illustrates the predefined colors for xterm's "xterm-88color" feature.
+ # If you set $TERM to "xterm-88color" (and have xterm compiled to support the
+ # 88-color or 256-color feature), you can use the ncurses 'd' screen to
+@@ -33,13 +33,13 @@
+ # the first 16 colors, and xterm happens to use the same first 16 colors in
+ # the extended color models that support initc.
+ #
+-# The colors shown are for xterm patch #189.
++# The colors shown are for xterm patch #192.
+ scale:255
+ 0:	  0   0   0		black
+ 1:	205   0	  0		red3
+ 2:	  0 205	  0		green3
+ 3:	205 205	  0		yellow3
+-4:	 30 144 255		DodgerBlue1
++4:	  0   0 238		blue2
+ 5:	205   0 205		magenta3
+ 6:	  0 205 205		cyan3
+ 7:	229 229 229 		gray90
+@@ -47,7 +47,7 @@
+ 9:	255   0   0		red
+ 10:	  0 255   0		green
+ 11:	255 255   0		yellow
+-12:	 99 184 255		SteelBlue1
++12:	 92  92 255		customblue
+ 13:	255   0 255		magenta
+ 14:	  0 255 255		cyan
+ 15:	255 255 255		white
diff --git a/ncurses-6.0-20161217.patch b/ncurses-6.0-20161217.patch
new file mode 100644
index 0000000..636e2af
--- /dev/null
+++ b/ncurses-6.0-20161217.patch
@@ -0,0 +1,445 @@
+# ncurses 6.0 - patch 20161217 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.0 is at
+# 	ftp.gnu.org:/pub/gnu
+#
+# Patches for ncurses 6.0 can be found at
+# 	ftp://invisible-island.net/ncurses/6.0
+#	http://invisible-mirror.net/archives/ncurses/6.0 
+#
+# ------------------------------------------------------------------------------
+# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20161217.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Dec 18 01:43:10 UTC 2016
+# ------------------------------------------------------------------------------
+# MANIFEST                                 |    1 
+# NEWS                                     |    9 +-
+# VERSION                                  |    2 
+# dist.mk                                  |    4 
+# ncurses-6.0-20161217/test/tput-colorcube |  130 +++++++++++++++++++++++++++++
+# ncurses/tinfo/lib_tputs.c                |    4 
+# package/debian-mingw/changelog           |    4 
+# package/debian-mingw64/changelog         |    4 
+# package/debian/changelog                 |    4 
+# package/mingw-ncurses.nsi                |    4 
+# package/mingw-ncurses.spec               |    2 
+# package/ncurses.spec                     |    2 
+# test/tput-initc                          |   78 ++++++++++++++++-
+# 13 files changed, 228 insertions(+), 20 deletions(-)
+# ------------------------------------------------------------------------------
+Index: MANIFEST
+--- ncurses-6.0-20161210+/MANIFEST	2016-12-11 02:44:18.000000000 +0000
++++ ncurses-6.0-20161217/MANIFEST	2016-12-17 23:39:59.000000000 +0000
+@@ -1174,6 +1174,7 @@
+ ./test/testaddch.c
+ ./test/testcurs.c
+ ./test/testscanw.c
++./test/tput-colorcube
+ ./test/tput-initc
+ ./test/tracemunch
+ ./test/view.c
+Index: NEWS
+Prereq:  1.2708 
+--- ncurses-6.0-20161210+/NEWS	2016-12-11 00:24:06.000000000 +0000
++++ ncurses-6.0-20161217/NEWS	2016-12-17 23:41:02.000000000 +0000
+@@ -25,7 +25,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.2708 2016/12/11 00:24:06 tom Exp $
++-- $Id: NEWS,v 1.2711 2016/12/17 23:41:02 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -45,6 +45,13 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20161217
++	+ add tput-colorcube demo script.
++	+ add -r and -s options to tput-initc demo, to match usage in xterm.
++	+ flush the standard output in _nc_flush for the case where SP is zero,
++	  e.g., when called via putp.  This fixes a scenario where "tput flash"
++	  did not work after changes in 20130112.
++
+ 20161210
+ 	+ add configure script option --disable-wattr-macros for use in cases
+ 	  where one wants to use the same headers for ncurses5/ncurses6
+Index: VERSION
+--- ncurses-6.0-20161210+/VERSION	2016-12-10 12:47:46.000000000 +0000
++++ ncurses-6.0-20161217/VERSION	2016-12-17 16:05:02.000000000 +0000
+@@ -1 +1 @@
+-5:0:9	6.0	20161210
++5:0:9	6.0	20161217
+Index: dist.mk
+Prereq:  1.1136 
+--- ncurses-6.0-20161210+/dist.mk	2016-12-10 12:47:46.000000000 +0000
++++ ncurses-6.0-20161217/dist.mk	2016-12-17 16:05:02.000000000 +0000
+@@ -25,7 +25,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1136 2016/12/10 12:47:46 tom Exp $
++# $Id: dist.mk,v 1.1137 2016/12/17 16:05:02 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -37,7 +37,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 0
+-NCURSES_PATCH = 20161210
++NCURSES_PATCH = 20161217
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: ncurses/tinfo/lib_tputs.c
+Prereq:  1.98 
+--- ncurses-6.0-20161210+/ncurses/tinfo/lib_tputs.c	2016-05-28 21:58:45.000000000 +0000
++++ ncurses-6.0-20161217/ncurses/tinfo/lib_tputs.c	2016-12-17 20:47:21.000000000 +0000
+@@ -51,7 +51,7 @@
+ #include 		/* ospeed */
+ #include 
+ 
+-MODULE_ID("$Id: lib_tputs.c,v 1.98 2016/05/28 21:58:45 tom Exp $")
++MODULE_ID("$Id: lib_tputs.c,v 1.99 2016/12/17 20:47:21 tom Exp $")
+ 
+ NCURSES_EXPORT_VAR(char) PC = 0;              /* used by termcap library */
+ NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0;        /* used by termcap library */
+@@ -141,6 +141,8 @@
+ 		}
+ 	    }
+ 	}
++    } else {
++	fflush(stdout);
+     }
+ }
+ 
+Index: package/debian-mingw/changelog
+--- ncurses-6.0-20161210+/package/debian-mingw/changelog	2016-12-10 12:47:46.000000000 +0000
++++ ncurses-6.0-20161217/package/debian-mingw/changelog	2016-12-17 16:05:02.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161210) unstable; urgency=low
++ncurses6 (6.0+20161217) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 10 Dec 2016 07:47:46 -0500
++ -- Thomas E. Dickey   Sat, 17 Dec 2016 11:05:02 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.0-20161210+/package/debian-mingw64/changelog	2016-12-10 12:47:46.000000000 +0000
++++ ncurses-6.0-20161217/package/debian-mingw64/changelog	2016-12-17 16:05:02.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161210) unstable; urgency=low
++ncurses6 (6.0+20161217) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 10 Dec 2016 07:47:46 -0500
++ -- Thomas E. Dickey   Sat, 17 Dec 2016 11:05:02 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.0-20161210+/package/debian/changelog	2016-12-10 12:47:46.000000000 +0000
++++ ncurses-6.0-20161217/package/debian/changelog	2016-12-17 16:05:02.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161210) unstable; urgency=low
++ncurses6 (6.0+20161217) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 10 Dec 2016 07:47:46 -0500
++ -- Thomas E. Dickey   Sat, 17 Dec 2016 11:05:02 -0500
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.188 
+--- ncurses-6.0-20161210+/package/mingw-ncurses.nsi	2016-12-10 12:47:46.000000000 +0000
++++ ncurses-6.0-20161217/package/mingw-ncurses.nsi	2016-12-17 16:05:02.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.188 2016/12/10 12:47:46 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.189 2016/12/17 16:05:02 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "0"
+ !define VERSION_YYYY  "2016"
+-!define VERSION_MMDD  "1210"
++!define VERSION_MMDD  "1217"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.0-20161210+/package/mingw-ncurses.spec	2016-12-10 12:47:46.000000000 +0000
++++ ncurses-6.0-20161217/package/mingw-ncurses.spec	2016-12-17 16:05:02.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.0
+-Release: 20161210
++Release: 20161217
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.0-20161210+/package/ncurses.spec	2016-12-10 12:47:46.000000000 +0000
++++ ncurses-6.0-20161217/package/ncurses.spec	2016-12-17 16:05:02.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.0
+-Release: 20161210
++Release: 20161217
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: test/tput-colorcube
+--- /dev/null	2016-12-17 11:28:23.787999705 +0000
++++ ncurses-6.0-20161217/test/tput-colorcube	2016-12-17 23:37:37.000000000 +0000
+@@ -0,0 +1,130 @@
++#!/bin/sh
++##############################################################################
++# Copyright (c) 2016 Free Software Foundation, Inc.                          #
++#                                                                            #
++# Permission is hereby granted, free of charge, to any person obtaining a    #
++# copy of this software and associated documentation files (the "Software"), #
++# to deal in the Software without restriction, including without limitation  #
++# the rights to use, copy, modify, merge, publish, distribute, distribute    #
++# with modifications, sublicense, and/or sell copies of the Software, and to #
++# permit persons to whom the Software is furnished to do so, subject to the  #
++# following conditions:                                                      #
++#                                                                            #
++# The above copyright notice and this permission notice shall be included in #
++# all copies or substantial portions of the Software.                        #
++#                                                                            #
++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,   #
++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL    #
++# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER      #
++# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING    #
++# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER        #
++# DEALINGS IN THE SOFTWARE.                                                  #
++#                                                                            #
++# Except as contained in this notice, the name(s) of the above copyright     #
++# holders shall not be used in advertising or otherwise to promote the sale, #
++# use or other dealings in this Software without prior written               #
++# authorization.                                                             #
++##############################################################################
++# $Id: tput-colorcube,v 1.1 2016/12/17 23:37:37 tom Exp $
++# Use this script to print an xterm-style color cube, e.g., as done in
++# the xterm 88colors2.pl and 256colors2.pl scripts.
++
++failed() {
++	printf "?? $*\n" >&2
++	exit 1
++}
++
++newline() {
++	tput op
++	printf "\n"
++}
++
++if [ $# = 1 ]
++then
++	myterm=$1
++elif [ $# = 0 ]
++then
++	myterm=$TERM
++else
++	failed "expected one parameter or none"
++fi
++
++colors=$(tput -T $myterm colors 2>/dev/null)
++if [ ${colors:-0} -le 0 ]
++then
++	myterm=${myterm%%-color}
++	colors=$(tput -T $myterm colors 2>/dev/null)
++fi
++if [ ${colors:-0} -le 0 ]
++then
++	failed "terminal $myterm does not support color"
++fi
++
++printf "System colors:\n"
++
++color=0
++inrow=$colors
++to_do=$colors
++[ $colors -gt 256 ] && colors=256
++[ $inrow  -gt   8 ] && inrow=8
++[ $to_do  -gt  16 ] && to_do=16
++while [ $color -lt $to_do ]
++do
++	[ $color = $inrow ] && newline
++	tput setab $color
++	printf '  '
++	color=$(expr $color + 1)
++done
++newline
++
++[ $colors -le 16 ] && exit
++
++if [ $colors = 256 ]
++then
++	cube=6
++	ramp=232
++elif [ $colors -ge 88 ]
++then
++	cube=4
++	ramp=80
++else
++	exit
++fi
++
++printf "\n"
++printf "Color cube, ${cube}x${cube}x${cube}:\n"
++g=0
++cube2=$(expr $cube \* $cube)
++while [ $g -lt $cube ]
++do
++	r=0
++	while [ $r -lt $cube ]
++	do
++		b=0
++		while [ $b -lt $cube ]
++		do
++			color=$(expr 16 + \( $r \* $cube2 \) + \( $g \* $cube \) + $b)
++			tput setab $color
++			printf '  '
++			b=$(expr $b + 1)
++		done
++		tput op
++		printf ' '
++		r=$(expr $r + 1)
++	done
++	newline
++	g=$(expr $g + 1)
++done
++
++printf "\n"
++printf "Grayscale ramp:\n"
++color=$ramp
++while [ $color -lt $colors ]
++do
++	tput setab $color
++	printf '  '
++	color=$(expr $color + 1)
++done
++newline
++# vi:ts=4 sw=4
+Index: test/tput-initc
+Prereq:  1.1 
+--- ncurses-6.0-20161210+/test/tput-initc	2016-12-10 23:35:46.000000000 +0000
++++ ncurses-6.0-20161217/test/tput-initc	2016-12-17 22:35:05.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: tput-initc,v 1.1 2016/12/10 23:35:46 tom Exp $
++# $Id: tput-initc,v 1.5 2016/12/17 22:35:05 tom Exp $
+ # Some of the ".dat" files in ncurses' test-directory give r/g/b numbers for
+ # default palettes of xterm and Linux console.  This script reads the numbers
+ # and (assuming the same or compatible terminal) uses tput to (re)initialize
+@@ -37,6 +37,40 @@
+ 	exit 1
+ }
+ 
++usage() {
++	cat >&2 <<-EOF
++	usage: $0 [-r] [-s] [palette-data]
++
++	Use this script with a palette data-file to (re)initialize colors with
++	tput.  This script assumes arrangements for 16-, 88- and 256-colors
++	like the xterm 88colors2.pl and 256colors2.pl scripts.
++
++	Options:
++	 -r	reverse palette
++	 -s	reverse system colors (first 16 if more than 16 colors)
++EOF
++	exit 1
++}
++
++opt_r=no
++opt_s=no
++
++while getopts "rs" option "$@"
++do
++	case $option in
++	(r)
++		opt_r=yes
++		;;
++	(s)
++		opt_s=yes
++		;;
++	(*)
++		usage
++		;;
++	esac
++done
++shift $(expr $OPTIND - 1)
++
+ if [ $# = 1 ]
+ then
+ 	file=$1
+@@ -70,8 +104,20 @@
+ fi
+ 
+ cat $file |\
+-awk -v myterm=$myterm '
+-BEGIN { limit=1000; }
++awk	-v opt_r=$opt_r \
++	-v opt_s=$opt_s \
++	-v colors=$colors \
++	-v myterm=$myterm '
++BEGIN {
++	limit = 1000;
++	range = -1;
++	cramp = -1;
++	if ( colors == 88 ) {
++		cramp = 80;
++	} else if ( colors = 256 ) {
++		cramp = 232;
++	}
++}
+ function scaled(n) {
+ 	return (n * 1000)/limit;
+ }
+@@ -83,5 +129,27 @@
+ 
+ /^[0-9]+:/{
+ 	sub(":","",$1);
+-	printf "tput -T%s initc %d %d %d %d\n", myterm, $1,scaled($2),scaled($3),scaled($4);
+-}' |sh -
++	item = $1 + 0;
++	if (range < item) {
++		range = item;
++	}
++	params[$1] = sprintf ("%d %d %d", scaled($2),scaled($3),scaled($4));
++}
++END {
++	for (n = 0; n <= range; ++n) {
++		m = n;
++		if ( opt_r == "yes" ) {
++			if ( colors <= 16 ) {
++				m = range - n;
++			} else if ( ( opt_s == "yes" ) && ( n < 16 ) ) {
++				m = 15 - n;
++			} else if ( n >= cramp ) {
++				m = cramp + colors - 1 - n;
++			} else {
++				m = 16 + cramp - 1 - n;
++			}
++		}
++		printf "tput -T%s initc %d %s\n", myterm, m, params[n];
++	}
++}
++' |sh -
diff --git a/ncurses-6.0-20161224.patch b/ncurses-6.0-20161224.patch
new file mode 100644
index 0000000..228ab77
--- /dev/null
+++ b/ncurses-6.0-20161224.patch
@@ -0,0 +1,1402 @@
+# ncurses 6.0 - patch 20161224 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.0 is at
+# 	ftp.gnu.org:/pub/gnu
+#
+# Patches for ncurses 6.0 can be found at
+# 	ftp://invisible-island.net/ncurses/6.0
+#	http://invisible-mirror.net/archives/ncurses/6.0 
+#
+# ------------------------------------------------------------------------------
+# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20161224.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Dec 25 01:53:57 UTC 2016
+# ------------------------------------------------------------------------------
+# MANIFEST                                  |    2 
+# NEWS                                      |   11 ++
+# VERSION                                   |    2 
+# dist.mk                                   |    4 
+# doc/html/man/adacurses6-config.1.html     |    2 
+# doc/html/man/captoinfo.1m.html            |    2 
+# doc/html/man/clear.1.html                 |    2 
+# doc/html/man/form.3x.html                 |    2 
+# doc/html/man/infocmp.1m.html              |    2 
+# doc/html/man/infotocap.1m.html            |    2 
+# doc/html/man/menu.3x.html                 |    2 
+# doc/html/man/ncurses.3x.html              |    2 
+# doc/html/man/ncurses6-config.1.html       |    2 
+# doc/html/man/panel.3x.html                |    2 
+# doc/html/man/tabs.1.html                  |    2 
+# doc/html/man/terminfo.5.html              |  118 ++++++++++++++++------------
+# doc/html/man/tic.1m.html                  |    2 
+# doc/html/man/toe.1m.html                  |    2 
+# doc/html/man/tput.1.html                  |    2 
+# doc/html/man/tset.1.html                  |    2 
+# form/frm_driver.c                         |    5 -
+# man/terminfo.tail                         |   40 ++++++---
+# ncurses-6.0-20161224/progs/tty_settings.c |  109 +++++++++++++++++++++++++
+# ncurses-6.0-20161224/progs/tty_settings.h |   50 +++++++++++
+# ncurses/tinfo/lib_ttyflags.c              |   36 ++++----
+# ncurses/tinfo/tinfo_driver.c              |   40 +++++++++
+# package/debian-mingw/changelog            |    4 
+# package/debian-mingw64/changelog          |    4 
+# package/debian/changelog                  |    4 
+# package/mingw-ncurses.nsi                 |    4 
+# package/mingw-ncurses.spec                |    2 
+# package/ncurses.spec                      |    2 
+# progs/Makefile.in                         |   11 +-
+# progs/clear.c                             |   16 +++
+# progs/modules                             |   11 +-
+# progs/reset_cmd.c                         |   65 +--------------
+# progs/reset_cmd.h                         |    9 --
+# progs/tput.c                              |   33 ++++---
+# progs/tset.c                              |    9 +-
+# 39 files changed, 415 insertions(+), 206 deletions(-)
+# ------------------------------------------------------------------------------
+Index: MANIFEST
+--- ncurses-6.0-20161217+/MANIFEST	2016-12-17 23:39:59.000000000 +0000
++++ ncurses-6.0-20161224/MANIFEST	2016-12-25 00:18:45.000000000 +0000
+@@ -1064,6 +1064,8 @@
+ ./progs/tput.c
+ ./progs/transform.c
+ ./progs/tset.c
++./progs/tty_settings.c
++./progs/tty_settings.h
+ ./test/Makefile.in
+ ./test/README
+ ./test/aclocal.m4
+Index: NEWS
+Prereq:  1.2711 
+--- ncurses-6.0-20161217+/NEWS	2016-12-17 23:41:02.000000000 +0000
++++ ncurses-6.0-20161224/NEWS	2016-12-24 23:45:38.000000000 +0000
+@@ -25,7 +25,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.2711 2016/12/17 23:41:02 tom Exp $
++-- $Id: NEWS,v 1.2715 2016/12/24 23:45:38 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -45,6 +45,15 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20161224
++	+ correct parmeters for copywin call in _nc_Synchronize_Attributes()
++	  (patch by Leon Winter).
++	+ improve color-handling section in terminfo manual page (prompted by
++	  patch by Mihail Konev).
++	+ modify programs clear, tput and tset to pass the actual tty file
++	  descriptor to setupterm rather than the standard output, making
++	  padding work.
++
+ 20161217
+ 	+ add tput-colorcube demo script.
+ 	+ add -r and -s options to tput-initc demo, to match usage in xterm.
+Index: VERSION
+--- ncurses-6.0-20161217+/VERSION	2016-12-17 16:05:02.000000000 +0000
++++ ncurses-6.0-20161224/VERSION	2016-12-24 13:45:15.000000000 +0000
+@@ -1 +1 @@
+-5:0:9	6.0	20161217
++5:0:9	6.0	20161224
+Index: dist.mk
+Prereq:  1.1137 
+--- ncurses-6.0-20161217+/dist.mk	2016-12-17 16:05:02.000000000 +0000
++++ ncurses-6.0-20161224/dist.mk	2016-12-24 13:45:15.000000000 +0000
+@@ -25,7 +25,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1137 2016/12/17 16:05:02 tom Exp $
++# $Id: dist.mk,v 1.1138 2016/12/24 13:45:15 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -37,7 +37,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 0
+-NCURSES_PATCH = 20161217
++NCURSES_PATCH = 20161224
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/man/adacurses6-config.1.html
+--- ncurses-6.0-20161217+/doc/html/man/adacurses6-config.1.html	2016-12-04 01:10:35.000000000 +0000
++++ ncurses-6.0-20161224/doc/html/man/adacurses6-config.1.html	2016-12-25 00:16:10.000000000 +0000
+@@ -131,7 +131,7 @@
+ 
    SEE ALSO
    +        curses(3x)
+ 
+-       This describes ncurses version 6.0 (patch 20161203).
++       This describes ncurses version 6.0 (patch 20161224).
+ 
+ 
+ 
+Index: doc/html/man/captoinfo.1m.html
+--- ncurses-6.0-20161217+/doc/html/man/captoinfo.1m.html	2016-12-04 01:10:35.000000000 +0000
++++ ncurses-6.0-20161224/doc/html/man/captoinfo.1m.html	2016-12-25 00:16:10.000000000 +0000
+@@ -198,7 +198,7 @@
+ 
    SEE ALSO
    +        infocmp(1m), curses(3x), terminfo(5)
+ 
+-       This describes ncurses version 6.0 (patch 20161203).
++       This describes ncurses version 6.0 (patch 20161224).
+ 
+ 
+ 
    AUTHOR
    +Index: doc/html/man/clear.1.html
+--- ncurses-6.0-20161217+/doc/html/man/clear.1.html	2016-12-04 01:10:35.000000000 +0000
++++ ncurses-6.0-20161224/doc/html/man/clear.1.html	2016-12-25 00:16:10.000000000 +0000
+@@ -135,7 +135,7 @@
+ 
    SEE ALSO
    +        tput(1), terminfo(5)
+ 
+-       This describes ncurses version 6.0 (patch 20161203).
++       This describes ncurses version 6.0 (patch 20161224).
+ 
+ 
+ 
+Index: doc/html/man/form.3x.html
+--- ncurses-6.0-20161217+/doc/html/man/form.3x.html	2016-12-04 01:10:37.000000000 +0000
++++ ncurses-6.0-20161224/doc/html/man/form.3x.html	2016-12-25 00:16:12.000000000 +0000
+@@ -239,7 +239,7 @@
+        curses(3x) and related pages whose names begin "form_" for
+        detailed descriptions of the entry points.
+ 
+-       This describes ncurses version 6.0 (patch 20161203).
++       This describes ncurses version 6.0 (patch 20161224).
+ 
+ 
+ 
+Index: doc/html/man/infocmp.1m.html
+--- ncurses-6.0-20161217+/doc/html/man/infocmp.1m.html	2016-12-04 01:10:38.000000000 +0000
++++ ncurses-6.0-20161224/doc/html/man/infocmp.1m.html	2016-12-25 00:16:13.000000000 +0000
+@@ -478,7 +478,7 @@
+ 
+        http://invisible-island.net/ncurses/tctest.html
+ 
+-       This describes ncurses version 6.0 (patch 20161203).
++       This describes ncurses version 6.0 (patch 20161224).
+ 
+ 
+ 
    AUTHOR
    +Index: doc/html/man/infotocap.1m.html
+--- ncurses-6.0-20161217+/doc/html/man/infotocap.1m.html	2016-12-04 01:10:38.000000000 +0000
++++ ncurses-6.0-20161224/doc/html/man/infotocap.1m.html	2016-12-25 00:16:13.000000000 +0000
+@@ -88,7 +88,7 @@
+ 
    SEE ALSO
    +        curses(3x), tic(1m), infocmp(1m), terminfo(5)
+ 
+-       This describes ncurses version 6.0 (patch 20161203).
++       This describes ncurses version 6.0 (patch 20161224).
+ 
+ 
+ 
    AUTHOR
    +Index: doc/html/man/menu.3x.html
+--- ncurses-6.0-20161217+/doc/html/man/menu.3x.html	2016-12-04 01:10:38.000000000 +0000
++++ ncurses-6.0-20161224/doc/html/man/menu.3x.html	2016-12-25 00:16:13.000000000 +0000
+@@ -217,7 +217,7 @@
+        curses(3x) and related pages whose names begin "menu_" for
+        detailed descriptions of the entry points.
+ 
+-       This describes ncurses version 6.0 (patch 20161203).
++       This describes ncurses version 6.0 (patch 20161224).
+ 
+ 
+ 
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.0-20161217+/doc/html/man/ncurses.3x.html	2016-12-04 01:10:39.000000000 +0000
++++ ncurses-6.0-20161224/doc/html/man/ncurses.3x.html	2016-12-25 00:16:14.000000000 +0000
+@@ -60,7 +60,7 @@
+        sonable optimization.  This implementation is "new curses"
+        (ncurses) and is the approved replacement for 4.4BSD clas-
+        sic  curses,  which has been discontinued.  This describes
+-       ncurses version 6.0 (patch 20161203).
++       ncurses version 6.0 (patch 20161224).
+ 
+        The ncurses library emulates the curses library of  System
+        V  Release  4  UNIX,  and  XPG4 (X/Open Portability Guide)
+Index: doc/html/man/ncurses6-config.1.html
+--- ncurses-6.0-20161217+/doc/html/man/ncurses6-config.1.html	2016-12-04 01:10:39.000000000 +0000
++++ ncurses-6.0-20161224/doc/html/man/ncurses6-config.1.html	2016-12-25 00:16:14.000000000 +0000
+@@ -114,7 +114,7 @@
+ 
    SEE ALSO
    +        curses(3x)
+ 
+-       This describes ncurses version 6.0 (patch 20161203).
++       This describes ncurses version 6.0 (patch 20161224).
+ 
+ 
+ 
+Index: doc/html/man/panel.3x.html
+--- ncurses-6.0-20161217+/doc/html/man/panel.3x.html	2016-12-04 01:10:39.000000000 +0000
++++ ncurses-6.0-20161224/doc/html/man/panel.3x.html	2016-12-25 00:16:14.000000000 +0000
+@@ -208,7 +208,7 @@
+ 
    SEE ALSO
    +        curses(3x), curs_variables(3x),
+ 
+-       This describes ncurses version 6.0 (patch 20161203).
++       This describes ncurses version 6.0 (patch 20161224).
+ 
+ 
+ 
    AUTHOR
    +Index: doc/html/man/tabs.1.html
+--- ncurses-6.0-20161217+/doc/html/man/tabs.1.html	2016-12-04 01:10:39.000000000 +0000
++++ ncurses-6.0-20161224/doc/html/man/tabs.1.html	2016-12-25 00:16:14.000000000 +0000
+@@ -164,7 +164,7 @@
+ 
    SEE ALSO
    +        tset(1), infocmp(1m), curses(3x), terminfo(5).
+ 
+-       This describes ncurses version 6.0 (patch 20161203).
++       This describes ncurses version 6.0 (patch 20161224).
+ 
+ 
+ 
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.0-20161217+/doc/html/man/terminfo.5.html	2016-12-04 01:10:39.000000000 +0000
++++ ncurses-6.0-20161224/doc/html/man/terminfo.5.html	2016-12-25 00:16:15.000000000 +0000
+@@ -33,7 +33,7 @@
+   ****************************************************************************
+   * @Id: terminfo.head,v 1.22 2016/10/15 17:02:31 tom Exp @
+   * Head of terminfo man page ends here
+-  * @Id: terminfo.tail,v 1.74 2016/11/05 21:15:43 Alain.Williams Exp @
++  * @Id: terminfo.tail,v 1.75 2016/12/24 22:54:11 tom Exp @
+   * Beginning of terminfo.tail file
+   * This file is part of ncurses.
+   * See "terminfo.head" for copyright.
+@@ -75,7 +75,7 @@
+        nals by giving a set of capabilities which they  have,  by
+        specifying how to perform screen operations, and by speci-
+        fying padding requirements and  initialization  sequences.
+-       This describes ncurses version 6.0 (patch 20161203).
++       This describes ncurses version 6.0 (patch 20161224).
+ 
+        Entries in terminfo consist of a sequence of `,' separated
+        fields (embedded commas may be escaped with a backslash or
+@@ -2067,41 +2067,57 @@
+ 
+ 
+ 
    Color Handling
    +-       Most  color  terminals are either "Tektronix-like" or "HP-
+-       like".  Tektronix-like terminals have a predefined set  of
+-       N  colors  (where N usually 8), and can set character-cell
+-       foreground and background characters independently, mixing
+-       them  into  N * N  color-pairs.  On HP-like terminals, the
+-       use must set each color pair up separately (foreground and
+-       background  are  not  independently  settable).   Up  to M
+-       color-pairs may be  set  up  from  2*M  different  colors.
+-       ANSI-compatible terminals are Tektronix-like.
++       The  curses  library  functions  init_pair  and init_color
++       manipulate the color pairs and color values  discussed  in
++       this  section (see curs_color(3x) for details on these and
++       related functions).
++
++       Most color terminals are either "Tektronix-like"  or  "HP-
++       like":
++
++       o   Tektronix-like  terminals  have  a predefined set of N
++           colors (where N is usually 8), and can set  character-
++           cell  foreground  and  background  characters indepen-
++           dently, mixing them into N * N color-pairs.
++
++       o   On HP-like terminals, the user  must  set  each  color
++           pair  up separately (foreground and background are not
++           independently settable).  Up to M color-pairs  may  be
++           set  up  from  2*M  different colors.  ANSI-compatible
++           terminals are Tektronix-like.
+ 
+        Some basic color capabilities are independent of the color
+        method.  The numeric capabilities colors and pairs specify
+-       the  maximum numbers of colors and color-pairs that can be
+-       displayed simultaneously.  The op (original  pair)  string
+-       resets  foreground  and background colors to their default
+-       values for the terminal.  The oc string resets all  colors
+-       or  color-pairs  to their default values for the terminal.
+-       Some terminals  (including  many  PC  terminal  emulators)
+-       erase  screen  areas  with  the  current  background color
+-       rather than the power-up default background; these  should
++       the maximum numbers of colors and color-pairs that can  be
++       displayed  simultaneously.   The op (original pair) string
++       resets foreground and background colors to  their  default
++       values  for the terminal.  The oc string resets all colors
++       or color-pairs to their default values for  the  terminal.
++       Some  terminals  (including  many  PC  terminal emulators)
++       erase screen  areas  with  the  current  background  color
++       rather  than the power-up default background; these should
+        have the boolean capability bce.
+ 
+-       To  change the current foreground or background color on a
+-       Tektronix-type terminal, use setaf (set  ANSI  foreground)
+-       and  setab  (set ANSI background) or setf (set foreground)
+-       and setb (set background).  These take one parameter,  the
+-       color  number.   The  SVr4  documentation  describes  only
+-       setaf/setab; the XPG4 draft says  that  "If  the  terminal
+-       supports ANSI escape sequences to set background and fore-
+-       ground, they should be coded as setaf and  setab,  respec-
+-       tively.   If  the terminal supports other escape sequences
+-       to set background and foreground, they should be coded  as
+-       setf and setb, respectively.  The vidputs function and the
+-       refresh  functions  use  setaf  and  setab  if  they   are
+-       defined."
++       While the curses library works with color pairs  (reflect-
++       ing  the  inability  of some devices to set foreground and
++       background colors independently), there are separate capa-
++       bilities for setting these features:
++
++       o   To  change  the current foreground or background color
++           on a Tektronix-type  terminal,  use  setaf  (set  ANSI
++           foreground)  and  setab  (set ANSI background) or setf
++           (set foreground) and  setb  (set  background).   These
++           take  one parameter, the color number.  The SVr4 docu-
++           mentation describes only setaf/setab; the  XPG4  draft
++           says  that  "If  the  terminal  supports  ANSI  escape
++           sequences  to  set  background  and  foreground,  they
++           should be coded as setaf and setab, respectively.
++
++       o   If the terminal supports other escape sequences to set
++           background and foreground, they  should  be  coded  as
++           setf  and  setb,  respectively.   The  vidputs and the
++           refresh functions use the setaf and setab capabilities
++           if they are defined.
+ 
+        The  setaf/setab  and setf/setb capabilities take a single
+        numeric argument each.  Argument values 0-7 of setaf/setab
+@@ -2141,21 +2157,25 @@
+        On an HP-like terminal, use scp with a  color-pair  number
+        parameter to set which color pair is current.
+ 
+-       On  a  Tektronix-like  terminal, the capability ccc may be
+-       present to indicate that colors can be modified.   If  so,
+-       the initc capability will take a color number (0 to colors
+-       - 1)and three more parameters which  describe  the  color.
+-       These three parameters default to being interpreted as RGB
+-       (Red, Green, Blue) values.  If the boolean capability  hls
+-       is present, they are instead as HLS (Hue, Lightness, Satu-
+-       ration) indices.  The ranges are terminal-dependent.
+-
+-       On an HP-like terminal, initp may give  a  capability  for
+-       changing  a  color-pair value.  It will take seven parame-
+-       ters; a color-pair number (0 to max_pairs -  1),  and  two
+-       triples  describing  first  background and then foreground
+-       colors.  These parameters must be (Red,  Green,  Blue)  or
+-       (Hue, Lightness, Saturation) depending on hls.
++       Some terminals allow the color values to be modified:
++
++       o   On  a  Tektronix-like terminal, the capability ccc may
++           be present to indicate that colors  can  be  modified.
++           If  so,  the initc capability will take a color number
++           (0 to colors  -  1)and  three  more  parameters  which
++           describe the color.  These three parameters default to
++           being interpreted as RGB (Red,  Green,  Blue)  values.
++           If  the  boolean  capability  hls is present, they are
++           instead as HLS (Hue, Lightness,  Saturation)  indices.
++           The ranges are terminal-dependent.
++
++       o   On  an  HP-like  terminal, initp may give a capability
++           for changing a color-pair value.  It will  take  seven
++           parameters;  a color-pair number (0 to max_pairs - 1),
++           and two triples describing first background  and  then
++           foreground  colors.   These  parameters  must be (Red,
++           Green, Blue) or (Hue, Lightness, Saturation) depending
++           on hls.
+ 
+        On  some  color terminals, colors collide with highlights.
+        You can register these collisions with the ncv capability.
+@@ -2493,8 +2513,8 @@
+ 
+ 
+ 
    SEE ALSO
    +-       tic(1m),   infocmp(1m),  curses(3x),  printf(3),  term(5).
+-       term_variables(3x).
++       tic(1m),    infocmp(1m),    curses(3x),    curs_color(3x),
++       printf(3), term(5).  term_variables(3x).
+ 
+ 
+ 
    AUTHORS
    +Index: doc/html/man/tic.1m.html
+--- ncurses-6.0-20161217+/doc/html/man/tic.1m.html	2016-12-04 01:10:39.000000000 +0000
++++ ncurses-6.0-20161224/doc/html/man/tic.1m.html	2016-12-25 00:16:15.000000000 +0000
+@@ -401,7 +401,7 @@
+        infocmp(1m),   captoinfo(1m),   infotocap(1m),    toe(1m),
+        curses(3x), term(5).  terminfo(5).
+ 
+-       This describes ncurses version 6.0 (patch 20161203).
++       This describes ncurses version 6.0 (patch 20161224).
+ 
+ 
+ 
    AUTHOR
    +Index: doc/html/man/toe.1m.html
+--- ncurses-6.0-20161217+/doc/html/man/toe.1m.html	2016-12-04 01:10:39.000000000 +0000
++++ ncurses-6.0-20161224/doc/html/man/toe.1m.html	2016-12-25 00:16:15.000000000 +0000
+@@ -117,7 +117,7 @@
+        tic(1m),   infocmp(1m),   captoinfo(1m),    infotocap(1m),
+        curses(3x), terminfo(5).
+ 
+-       This describes ncurses version 6.0 (patch 20161203).
++       This describes ncurses version 6.0 (patch 20161224).
+ 
+ 
+ 
+Index: doc/html/man/tput.1.html
+--- ncurses-6.0-20161217+/doc/html/man/tput.1.html	2016-12-04 01:10:39.000000000 +0000
++++ ncurses-6.0-20161224/doc/html/man/tput.1.html	2016-12-25 00:16:15.000000000 +0000
+@@ -441,7 +441,7 @@
+        clear(1),   stty(1),   tabs(1),   tset(1),    terminfo(5),
+        curs_termcap(3x).
+ 
+-       This describes ncurses version 6.0 (patch 20161203).
++       This describes ncurses version 6.0 (patch 20161224).
+ 
+ 
+ 
+Index: doc/html/man/tset.1.html
+--- ncurses-6.0-20161217+/doc/html/man/tset.1.html	2016-12-04 01:10:39.000000000 +0000
++++ ncurses-6.0-20161224/doc/html/man/tset.1.html	2016-12-25 00:16:15.000000000 +0000
+@@ -387,7 +387,7 @@
+        csh(1),   sh(1),   stty(1),   curs_terminfo(3x),   tty(4),
+        terminfo(5), ttys(5), environ(7)
+ 
+-       This describes ncurses version 6.0 (patch 20161203).
++       This describes ncurses version 6.0 (patch 20161224).
+ 
+ 
+ 
+Index: form/frm_driver.c
+Prereq:  1.119 
+--- ncurses-6.0-20161217+/form/frm_driver.c	2016-10-29 22:30:10.000000000 +0000
++++ ncurses-6.0-20161224/form/frm_driver.c	2016-12-24 22:28:28.000000000 +0000
+@@ -32,7 +32,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: frm_driver.c,v 1.119 2016/10/29 22:30:10 tom Exp $")
++MODULE_ID("$Id: frm_driver.c,v 1.120 2016/12/24 22:28:28 Leon.Winter Exp $")
+ 
+ /*----------------------------------------------------------------------------
+   This is the core module of the form library. It contains the majority
+@@ -1275,7 +1275,8 @@
+ 	      copywin(form->w, formwin,
+ 		      0, 0,
+ 		      field->frow, field->fcol,
+-		      field->rows - 1, field->cols - 1, 0);
++		      field->frow + field->rows - 1,
++		      field->fcol + field->cols - 1, 0);
+ 	      wsyncup(formwin);
+ 	      Buffer_To_Window(field, form->w);
+ 	      SetStatus(field, _NEWTOP);	/* fake refresh to paint all */
+Index: man/terminfo.tail
+Prereq:  1.74 
+--- ncurses-6.0-20161217+/man/terminfo.tail	2016-11-05 21:15:43.000000000 +0000
++++ ncurses-6.0-20161224/man/terminfo.tail	2016-12-24 22:54:11.000000000 +0000
+@@ -1,4 +1,4 @@
+-.\" $Id: terminfo.tail,v 1.74 2016/11/05 21:15:43 Alain.Williams Exp $
++.\" $Id: terminfo.tail,v 1.75 2016/12/24 22:54:11 tom Exp $
+ .\" Beginning of terminfo.tail file
+ .\" This file is part of ncurses.
+ .\" See "terminfo.head" for copyright.
+@@ -1324,16 +1324,24 @@
+ .PP
+ .SS Color Handling
+ .PP
+-Most color terminals are either \*(``Tektronix-like\*('' or \*(``HP-like\*(''.
++The curses library functions \fBinit_pair\fP and \fBinit_color\fP
++manipulate the \fIcolor pairs\fP and \fIcolor values\fP discussed in this
++section
++(see \fBcurs_color\fP(3X) for details on these and related functions).
++.PP
++Most color terminals are either \*(``Tektronix-like\*('' or \*(``HP-like\*('':
++.bP
+ Tektronix-like
+-terminals have a predefined set of N colors (where N usually 8), and can set
++terminals have a predefined set of \fIN\fP colors
++(where \fIN\fP is usually 8),
++and can set
+ character-cell foreground and background characters independently, mixing them
+-into N\ *\ N color-pairs.
+-On HP-like terminals, the use must set each color
++into \fIN\fP\ *\ \fIN\fP color-pairs.
++.bP
++On HP-like terminals, the user must set each color
+ pair up separately (foreground and background are not independently settable).
+-Up to M color-pairs may be set up from 2*M different colors.
+-ANSI-compatible
+-terminals are Tektronix-like.
++Up to \fIM\fP color-pairs may be set up from 2*\fIM\fP different colors.
++ANSI-compatible terminals are Tektronix-like.
+ .PP
+ Some basic color capabilities are independent of the color method.
+ The numeric
+@@ -1349,6 +1357,11 @@
+ than the power-up default background; these should have the boolean capability
+ \fBbce\fR.
+ .PP
++While the curses library works with \fIcolor pairs\fP
++(reflecting the inability of some devices to set foreground
++and background colors independently),
++there are separate capabilities for setting these features:
++.bP
+ To change the current foreground or background color on a Tektronix-type
+ terminal, use \fBsetaf\fR (set ANSI foreground) and \fBsetab\fR (set ANSI
+ background) or \fBsetf\fR (set foreground) and \fBsetb\fR (set background).
+@@ -1357,12 +1370,12 @@
+ only \fBsetaf\fR/\fBsetab\fR; the XPG4 draft says that "If the terminal
+ supports ANSI escape sequences to set background and foreground, they should
+ be coded as \fBsetaf\fR and \fBsetab\fR, respectively.
++.bP
+ If the terminal
+ supports other escape sequences to set background and foreground, they should
+ be coded as \fBsetf\fR and \fBsetb\fR, respectively.
+-The \fBvidputs\fR
+-function and the refresh functions use \fBsetaf\fR and \fBsetab\fR if they are
+-defined."
++The \fBvidputs\fR and the \fBrefresh\fP functions
++use the \fBsetaf\fR and \fBsetab\fR capabilities if they are defined.
+ .PP
+ The \fBsetaf\fR/\fBsetab\fR and \fBsetf\fR/\fBsetb\fR capabilities take a
+ single numeric argument each.
+@@ -1411,6 +1424,8 @@
+ On an HP-like terminal, use \fBscp\fR with a color-pair number parameter to set
+ which color pair is current.
+ .PP
++Some terminals allow the \fIcolor values\fP to be modified:
++.bP
+ On a Tektronix-like terminal, the capability \fBccc\fR may be present to
+ indicate that colors can be modified.
+ If so, the \fBinitc\fR capability will
+@@ -1422,7 +1437,7 @@
+ they are instead as HLS (Hue, Lightness, Saturation) indices.
+ The ranges are
+ terminal-dependent.
+-.PP
++.bP
+ On an HP-like terminal, \fBinitp\fR may give a capability for changing a
+ color-pair value.
+ It will take seven parameters; a color-pair number (0 to
+@@ -1811,6 +1826,7 @@
+ \fB@TIC@\fR(1M),
+ \fB@INFOCMP@\fR(1M),
+ \fBcurses\fR(3X),
++\fBcurs_color\fR(3X),
+ \fBprintf\fR(3),
+ \fBterm\fR(\*n).
+ \fBterm_variables\fR(3X).
+Index: ncurses/tinfo/lib_ttyflags.c
+Prereq:  1.30 
+--- ncurses-6.0-20161217+/ncurses/tinfo/lib_ttyflags.c	2014-04-26 18:47:20.000000000 +0000
++++ ncurses-6.0-20161224/ncurses/tinfo/lib_ttyflags.c	2016-12-24 21:41:24.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2012,2014 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2014,2016 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -41,42 +41,42 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_ttyflags.c,v 1.30 2014/04/26 18:47:20 juergen Exp $")
++MODULE_ID("$Id: lib_ttyflags.c,v 1.31 2016/12/24 21:41:24 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ NCURSES_SP_NAME(_nc_get_tty_mode) (NCURSES_SP_DCLx TTY * buf)
+ {
++    TERMINAL *termp = TerminalOf(SP_PARM);
+     int result = OK;
+ 
+-    if (buf == 0 || SP_PARM == 0) {
++    if (buf == 0 || termp == 0) {
+ 	result = ERR;
+     } else {
+-	TERMINAL *termp = TerminalOf(SP_PARM);
+ 
+-	if (0 == termp) {
+-	    result = ERR;
+-	} else {
+ #ifdef USE_TERM_DRIVER
++	if (SP_PARM != 0) {
+ 	    result = CallDriver_2(SP_PARM, td_sgmode, FALSE, buf);
++	} else {
++	    result = ERR;
++	}
+ #else
+-	    for (;;) {
+-		if (GET_TTY(termp->Filedes, buf) != 0) {
+-		    if (errno == EINTR)
+-			continue;
+-		    result = ERR;
+-		}
+-		break;
++	for (;;) {
++	    if (GET_TTY(termp->Filedes, buf) != 0) {
++		if (errno == EINTR)
++		    continue;
++		result = ERR;
+ 	    }
+-#endif
++	    break;
+ 	}
+-
+-	if (result == ERR)
+-	    memset(buf, 0, sizeof(*buf));
++#endif
+ 
+ 	TR(TRACE_BITS, ("_nc_get_tty_mode(%d): %s",
+ 			termp ? termp->Filedes : -1,
+ 			_nc_trace_ttymode(buf)));
+     }
++    if (result == ERR && buf != 0)
++	memset(buf, 0, sizeof(*buf));
++
+     return (result);
+ }
+ 
+Index: ncurses/tinfo/tinfo_driver.c
+Prereq:  1.41 
+--- ncurses-6.0-20161217+/ncurses/tinfo/tinfo_driver.c	2016-09-10 20:14:56.000000000 +0000
++++ ncurses-6.0-20161224/ncurses/tinfo/tinfo_driver.c	2016-12-24 23:20:08.000000000 +0000
+@@ -34,6 +34,7 @@
+ #include 
+ #define CUR ((TERMINAL*)TCB)->type.
+ #include 
++#include 		/* ospeed */
+ 
+ #if HAVE_NANOSLEEP
+ #include 
+@@ -50,7 +51,7 @@
+ # endif
+ #endif
+ 
+-MODULE_ID("$Id: tinfo_driver.c,v 1.41 2016/09/10 20:14:56 tom Exp $")
++MODULE_ID("$Id: tinfo_driver.c,v 1.43 2016/12/24 23:20:08 tom Exp $")
+ 
+ /*
+  * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,
+@@ -113,6 +114,33 @@
+     return "tinfo";
+ }
+ 
++static void
++get_baudrate(TERMINAL * termp)
++{
++    int my_ospeed;
++    int result;
++    if (GET_TTY(termp->Filedes, &termp->Nttyb) == OK) {
++#ifdef TERMIOS
++	termp->Nttyb.c_oflag &= (unsigned) (~OFLAGS_TABS);
++#else
++	termp->Nttyb.sg_flags &= (unsigned) (~XTABS);
++#endif
++    }
++#ifdef USE_OLD_TTY
++    result = (int) cfgetospeed(&(termp->Nttyb));
++    my_ospeed = (NCURSES_OSPEED) _nc_ospeed(result);
++#else /* !USE_OLD_TTY */
++#ifdef TERMIOS
++    my_ospeed = (NCURSES_OSPEED) cfgetospeed(&(termp->Nttyb));
++#else
++    my_ospeed = (NCURSES_OSPEED) termp->Nttyb.sg_ospeed;
++#endif
++    result = _nc_baudrate(my_ospeed);
++#endif
++    termp->_baudrate = result;
++    ospeed = (NCURSES_OSPEED) my_ospeed;
++}
++
+ #undef SETUP_FAIL
+ #define SETUP_FAIL FALSE
+ 
+@@ -166,6 +194,16 @@
+     if (command_character)
+ 	_nc_tinfo_cmdch(termp, *command_character);
+ 
++    /*
++     * If an application calls setupterm() rather than initscr() or
++     * newterm(), we will not have the def_prog_mode() call in
++     * _nc_setupscreen().  Do it now anyway, so we can initialize the
++     * baudrate.
++     */
++    if (sp == 0 && NC_ISATTY(termp->Filedes)) {
++	get_baudrate(termp);
++    }
++
+     if (generic_type) {
+ 	/*
+ 	 * BSD 4.3's termcap contains mis-typed "gn" for wy99.  Do a sanity
+Index: package/debian-mingw/changelog
+--- ncurses-6.0-20161217+/package/debian-mingw/changelog	2016-12-17 16:05:02.000000000 +0000
++++ ncurses-6.0-20161224/package/debian-mingw/changelog	2016-12-24 13:45:15.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161217) unstable; urgency=low
++ncurses6 (6.0+20161224) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 17 Dec 2016 11:05:02 -0500
++ -- Thomas E. Dickey   Sat, 24 Dec 2016 08:45:15 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.0-20161217+/package/debian-mingw64/changelog	2016-12-17 16:05:02.000000000 +0000
++++ ncurses-6.0-20161224/package/debian-mingw64/changelog	2016-12-24 13:45:15.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161217) unstable; urgency=low
++ncurses6 (6.0+20161224) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 17 Dec 2016 11:05:02 -0500
++ -- Thomas E. Dickey   Sat, 24 Dec 2016 08:45:15 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.0-20161217+/package/debian/changelog	2016-12-17 16:05:02.000000000 +0000
++++ ncurses-6.0-20161224/package/debian/changelog	2016-12-24 13:45:15.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161217) unstable; urgency=low
++ncurses6 (6.0+20161224) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 17 Dec 2016 11:05:02 -0500
++ -- Thomas E. Dickey   Sat, 24 Dec 2016 08:45:15 -0500
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.189 
+--- ncurses-6.0-20161217+/package/mingw-ncurses.nsi	2016-12-17 16:05:02.000000000 +0000
++++ ncurses-6.0-20161224/package/mingw-ncurses.nsi	2016-12-24 13:45:15.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.189 2016/12/17 16:05:02 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.190 2016/12/24 13:45:15 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "0"
+ !define VERSION_YYYY  "2016"
+-!define VERSION_MMDD  "1217"
++!define VERSION_MMDD  "1224"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.0-20161217+/package/mingw-ncurses.spec	2016-12-17 16:05:02.000000000 +0000
++++ ncurses-6.0-20161224/package/mingw-ncurses.spec	2016-12-24 13:45:15.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.0
+-Release: 20161217
++Release: 20161224
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.0-20161217+/package/ncurses.spec	2016-12-17 16:05:02.000000000 +0000
++++ ncurses-6.0-20161224/package/ncurses.spec	2016-12-24 13:45:15.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.0
+-Release: 20161217
++Release: 20161224
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: progs/Makefile.in
+Prereq:  1.99 
+--- ncurses-6.0-20161217+/progs/Makefile.in	2016-10-22 00:13:20.000000000 +0000
++++ ncurses-6.0-20161224/progs/Makefile.in	2016-12-24 17:35:01.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: Makefile.in,v 1.99 2016/10/22 00:13:20 tom Exp $
++# $Id: Makefile.in,v 1.100 2016/12/24 17:35:01 tom Exp $
+ ##############################################################################
+ # Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.                #
+ #                                                                            #
+@@ -251,7 +251,8 @@
+ 
+ DEPS_CLEAR = \
+ 	$(MODEL)/clear$o \
+-	$(MODEL)/clear_cmd$o
++	$(MODEL)/clear_cmd$o \
++	$(MODEL)/tty_settings$o
+ 
+ clear$x: $(DEPS_CLEAR) $(DEPS_CURSES)
+ 	@ECHO_LD@ $(LINK) $(DEPS_CLEAR) $(LDFLAGS_TINFO) -o $@
+@@ -267,7 +268,8 @@
+ 	$(MODEL)/clear_cmd$o \
+ 	$(MODEL)/reset_cmd$o \
+ 	$(MODEL)/tparm_type$o \
+-	$(MODEL)/transform$o
++	$(MODEL)/transform$o \
++	$(MODEL)/tty_settings$o
+ 
+ tput$x: $(DEPS_TPUT) $(DEPS_CURSES) transform.h
+ 	@ECHO_LD@ $(LINK) $(DEPS_TPUT) $(LDFLAGS_TINFO) -o $@
+@@ -282,7 +284,8 @@
+ DEPS_TSET = \
+ 	$(MODEL)/tset$o \
+ 	$(MODEL)/reset_cmd$o \
+-	$(MODEL)/transform$o
++	$(MODEL)/transform$o \
++	$(MODEL)/tty_settings$o
+ 
+ tset$x: $(DEPS_TSET) $(DEPS_CURSES) transform.h
+ 	@ECHO_LD@ $(LINK) $(DEPS_TSET) $(LDFLAGS_TINFO) -o $@
+Index: progs/clear.c
+Prereq:  1.15 
+--- ncurses-6.0-20161217+/progs/clear.c	2016-10-23 00:36:36.000000000 +0000
++++ ncurses-6.0-20161224/progs/clear.c	2016-12-24 19:33:39.000000000 +0000
+@@ -36,17 +36,27 @@
+  * clear.c --  clears the terminal's screen
+  */
+ 
+-#define USE_LIBTINFO 1
++#define USE_LIBTINFO
+ #include 
++#include 
+ 
+-MODULE_ID("$Id: clear.c,v 1.15 2016/10/23 00:36:36 tom Exp $")
++MODULE_ID("$Id: clear.c,v 1.17 2016/12/24 19:33:39 tom Exp $")
++
++const char *_nc_progname = "clear";
+ 
+ int
+ main(
+ 	int argc GCC_UNUSED,
+ 	char *argv[]GCC_UNUSED)
+ {
+-    setupterm((char *) 0, STDOUT_FILENO, (int *) 0);
++    TTY tty_settings;
++    int fd;
++
++    _nc_progname = _nc_rootname(argv[0]);
++
++    fd = save_tty_settings(&tty_settings);
++
++    setupterm((char *) 0, fd, (int *) 0);
+ 
+     ExitProgram((clear_cmd() == ERR)
+ 		? EXIT_FAILURE
+Index: progs/modules
+Prereq:  1.20 
+--- ncurses-6.0-20161217+/progs/modules	2016-10-21 23:15:41.000000000 +0000
++++ ncurses-6.0-20161224/progs/modules	2016-12-24 17:33:59.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: modules,v 1.20 2016/10/21 23:15:41 tom Exp $
++# $Id: modules,v 1.21 2016/12/24 17:33:59 tom Exp $
+ # Program modules (some are in ncurses lib!)
+ ##############################################################################
+ # Copyright (c) 1998-2014,2016 Free Software Foundation, Inc.                #
+@@ -32,17 +32,18 @@
+ #
+ 
+ @ base
+-clear		progs		$(srcdir)	$(HEADER_DEPS)
++clear		progs		$(srcdir)	$(HEADER_DEPS) tty_settings.h
+ tic		progs		$(srcdir)	$(HEADER_DEPS) transform.h $(srcdir)/dump_entry.h $(srcdir)/tparm_type.h
+ toe		progs		$(srcdir)	$(HEADER_DEPS)             $(INCDIR)/hashed_db.h
+ clear_cmd	progs		$(srcdir)	$(HEADER_DEPS) clear_cmd.h
+ dump_entry	progs		$(srcdir)	$(HEADER_DEPS)             $(srcdir)/dump_entry.h ../include/parametrized.h $(INCDIR)/capdefaults.c termsort.c
+ infocmp		progs		$(srcdir)	$(HEADER_DEPS)             $(srcdir)/dump_entry.h
+-reset_cmd	progs		$(srcdir)	$(HEADER_DEPS) reset_cmd.h
++reset_cmd	progs		$(srcdir)	$(HEADER_DEPS) reset_cmd.h tty_settings.h
+ tabs		progs		$(srcdir)	$(HEADER_DEPS)
+ tparm_type	progs		$(srcdir)	$(HEADER_DEPS)             $(srcdir)/tparm_type.h
+-tput		progs		$(srcdir)	$(HEADER_DEPS) transform.h $(srcdir)/dump_entry.h $(srcdir)/tparm_type.h termsort.c reset_cmd.h
+-tset		progs		$(srcdir)	$(HEADER_DEPS) transform.h $(srcdir)/dump_entry.h ../include/termcap.h reset_cmd.h 
++tput		progs		$(srcdir)	$(HEADER_DEPS) transform.h $(srcdir)/dump_entry.h $(srcdir)/tparm_type.h termsort.c reset_cmd.h tty_settings.h
++tset		progs		$(srcdir)	$(HEADER_DEPS) transform.h $(srcdir)/dump_entry.h ../include/termcap.h reset_cmd.h  tty_settings.h
+ transform	progs		$(srcdir)	$(HEADER_DEPS) transform.h
++tty_settings	progs		$(srcdir)	$(HEADER_DEPS) tty_settings.h
+ 
+ # vile:makemode
+Index: progs/reset_cmd.c
+Prereq:  1.9 
+--- ncurses-6.0-20161217+/progs/reset_cmd.c	2016-10-23 01:08:11.000000000 +0000
++++ ncurses-6.0-20161224/progs/reset_cmd.c	2016-12-24 23:20:57.000000000 +0000
+@@ -31,6 +31,7 @@
+  ****************************************************************************/
+ 
+ #include 
++#include 
+ 
+ #include 
+ #include 
+@@ -51,7 +52,7 @@
+ #include 
+ #endif
+ 
+-MODULE_ID("$Id: reset_cmd.c,v 1.9 2016/10/23 01:08:11 tom Exp $")
++MODULE_ID("$Id: reset_cmd.c,v 1.11 2016/12/24 23:20:57 tom Exp $")
+ 
+ /*
+  * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,
+@@ -73,11 +74,8 @@
+ # endif
+ #endif
+ 
+-static int my_fd;
+ static FILE *my_file;
+-static TTY original_settings;
+ 
+-static bool can_restore = FALSE;
+ static bool use_reset = FALSE;	/* invoked as reset */
+ static bool use_init = FALSE;	/* invoked as init */
+ 
+@@ -105,17 +103,6 @@
+ }
+ 
+ static bool
+-get_tty_settings(int fd, TTY * tty_settings)
+-{
+-    bool success = TRUE;
+-    my_fd = fd;
+-    if (fd < 0 || GET_TTY(my_fd, tty_settings) < 0) {
+-	success = FALSE;
+-    }
+-    return success;
+-}
+-
+-static bool
+ cat_file(char *file)
+ {
+     FILE *fp;
+@@ -215,13 +202,9 @@
+  * a child program dies in raw mode.
+  */
+ void
+-reset_tty_settings(TTY * tty_settings)
++reset_tty_settings(int fd, TTY * tty_settings)
+ {
+-#ifdef TERMIOS
+-    tcgetattr(my_fd, tty_settings);
+-#else
+-    stty(my_fd, tty_settings);
+-#endif
++    GET_TTY(fd, tty_settings);
+ 
+ #ifdef TERMIOS
+ #if defined(VDISCARD) && defined(CDISCARD)
+@@ -355,7 +338,7 @@
+ 	);
+ #endif
+ 
+-    SET_TTY(my_fd, tty_settings);
++    SET_TTY(fd, tty_settings);
+ }
+ 
+ /*
+@@ -487,7 +470,7 @@
+ 
+ /* Output startup string. */
+ bool
+-send_init_strings(TTY * old_settings)
++send_init_strings(int fd GCC_UNUSED, TTY * old_settings)
+ {
+     int i;
+     bool need_flush = FALSE;
+@@ -497,7 +480,7 @@
+     if (old_settings != 0 &&
+ 	old_settings->c_oflag & (TAB3 | ONLCR | OCRNL | ONLRET)) {
+ 	old_settings->c_oflag &= (TAB3 | ONLCR | OCRNL | ONLRET);
+-	SET_TTY(my_fd, old_settings);
++	SET_TTY(fd, old_settings);
+     }
+ #endif
+     if (use_reset || use_init) {
+@@ -626,40 +609,6 @@
+     show_tty_change(old_settings, new_settings, "Interrupt", VINTR, CINTR);
+ }
+ 
+-/*
+- * Open a file descriptor on the current terminal, to obtain its settings.
+- * stderr is less likely to be redirected than stdout; try that first.
+- */
+-int
+-save_tty_settings(TTY * tty_settings)
+-{
+-    if (!get_tty_settings(STDERR_FILENO, tty_settings) &&
+-	!get_tty_settings(STDOUT_FILENO, tty_settings) &&
+-	!get_tty_settings(STDIN_FILENO, tty_settings) &&
+-	!get_tty_settings(open("/dev/tty", O_RDWR), tty_settings)) {
+-	failed("terminal attributes");
+-    }
+-    can_restore = TRUE;
+-    original_settings = *tty_settings;
+-    return my_fd;
+-}
+-
+-void
+-restore_tty_settings(void)
+-{
+-    if (can_restore)
+-	SET_TTY(my_fd, &original_settings);
+-}
+-
+-/* Set the modes if they've changed. */
+-void
+-update_tty_settings(TTY * old_settings, TTY * new_settings)
+-{
+-    if (memcmp(new_settings, old_settings, sizeof(TTY))) {
+-	SET_TTY(my_fd, new_settings);
+-    }
+-}
+-
+ #if HAVE_SIZECHANGE
+ /*
+  * Set window size if not set already, but update our copy of the values if the
+Index: progs/reset_cmd.h
+Prereq:  1.6 
+--- ncurses-6.0-20161217+/progs/reset_cmd.h	2016-10-22 23:34:37.000000000 +0000
++++ ncurses-6.0-20161224/progs/reset_cmd.h	2016-12-24 18:08:48.000000000 +0000
+@@ -31,7 +31,7 @@
+  ****************************************************************************/
+ 
+ /*
+- * $Id: reset_cmd.h,v 1.6 2016/10/22 23:34:37 tom Exp $
++ * $Id: reset_cmd.h,v 1.7 2016/12/24 18:08:48 tom Exp $
+  *
+  * Utility functions for resetting terminal.
+  */
+@@ -46,16 +46,13 @@
+ #undef CTRL
+ #define CTRL(x)	((x) & 0x1f)
+ 
+-extern bool send_init_strings(TTY * /* old_settings */);
+-extern int save_tty_settings(TTY * /* tty_settings */);
++extern bool send_init_strings(int /* fd */, TTY * /* old_settings */);
+ extern void print_tty_chars(TTY * /* old_settings */, TTY * /* new_settings */);
+ extern void reset_flush(void);
+ extern void reset_start(FILE * /* fp */, bool /* is_reset */, bool /* is_init */ );
+-extern void reset_tty_settings(TTY * /* tty_settings */);
+-extern void restore_tty_settings(void);
++extern void reset_tty_settings(int /* fd */, TTY * /* tty_settings */);
+ extern void set_control_chars(TTY * /* tty_settings */, int /* erase */, int /* intr */, int /* kill */);
+ extern void set_conversions(TTY * /* tty_settings */);
+-extern void update_tty_settings(TTY * /* old_settings */, TTY * /* new_settings */);
+ 
+ #if HAVE_SIZECHANGE
+ extern void set_window_size(int /* fd */, short * /* high */, short * /* wide */);
+Index: progs/tput.c
+Prereq:  1.63 
+--- ncurses-6.0-20161217+/progs/tput.c	2016-10-23 01:08:28.000000000 +0000
++++ ncurses-6.0-20161224/progs/tput.c	2016-12-24 18:44:32.000000000 +0000
+@@ -48,8 +48,9 @@
+ #include 
+ #endif
+ #include 
++#include 
+ 
+-MODULE_ID("$Id: tput.c,v 1.63 2016/10/23 01:08:28 tom Exp $")
++MODULE_ID("$Id: tput.c,v 1.65 2016/12/24 18:44:32 tom Exp $")
+ 
+ #define PUTS(s)		fputs(s, stdout)
+ 
+@@ -117,7 +118,7 @@
+ }
+ 
+ static int
+-tput_cmd(int argc, char *argv[])
++tput_cmd(int fd, TTY * saved_settings, int argc, char *argv[])
+ {
+     NCURSES_CONST char *name;
+     char *s;
+@@ -128,29 +129,27 @@
+ 
+     name = check_aliases(argv[0], FALSE);
+     if (is_reset || is_init) {
+-	TTY mode, oldmode;
++	TTY oldmode;
+ 
+ 	int terasechar = -1;	/* new erase character */
+ 	int intrchar = -1;	/* new interrupt character */
+ 	int tkillchar = -1;	/* new kill character */
+ 
+-	int my_fd = save_tty_settings(&mode);
+-
+ 	reset_start(stdout, is_reset, is_init);
+-	reset_tty_settings(&mode);
++	reset_tty_settings(fd, saved_settings);
+ 
+ #if HAVE_SIZECHANGE
+-	set_window_size(my_fd, &lines, &columns);
++	set_window_size(fd, &lines, &columns);
+ #else
+-	(void) my_fd;
++	(void) fd;
+ #endif
+-	set_control_chars(&mode, terasechar, intrchar, tkillchar);
+-	set_conversions(&mode);
+-	if (send_init_strings(&oldmode)) {
++	set_control_chars(saved_settings, terasechar, intrchar, tkillchar);
++	set_conversions(saved_settings);
++	if (send_init_strings(fd, &oldmode)) {
+ 	    reset_flush();
+ 	}
+ 
+-	update_tty_settings(&oldmode, &mode);
++	update_tty_settings(&oldmode, saved_settings);
+ 	return 0;
+     }
+ 
+@@ -262,6 +261,8 @@
+     int c;
+     char buf[BUFSIZ];
+     int result = 0;
++    int fd;
++    TTY tty_settings;
+ 
+     prg_name = check_aliases(_nc_rootname(argv[0]), TRUE);
+ 
+@@ -302,13 +303,15 @@
+     if (term == 0 || *term == '\0')
+ 	quit(2, "No value for $TERM and no -T specified");
+ 
+-    if (setupterm(term, STDOUT_FILENO, &errret) != OK && errret <= 0)
++    fd = save_tty_settings(&tty_settings);
++
++    if (setupterm(term, fd, &errret) != OK && errret <= 0)
+ 	quit(3, "unknown terminal \"%s\"", term);
+ 
+     if (cmdline) {
+ 	if ((argc <= 0) && !(is_clear || is_reset || is_init))
+ 	    usage();
+-	ExitProgram(tput_cmd(argc, argv));
++	ExitProgram(tput_cmd(fd, &tty_settings, argc, argv));
+     }
+ 
+     while (fgets(buf, sizeof(buf), stdin) != 0) {
+@@ -329,7 +332,7 @@
+ 	argvec[argnum] = 0;
+ 
+ 	if (argnum != 0
+-	    && tput_cmd(argnum, argvec) != 0) {
++	    && tput_cmd(fd, &tty_settings, argnum, argvec) != 0) {
+ 	    if (result == 0)
+ 		result = 4;	/* will return value >4 */
+ 	    ++result;
+Index: progs/tset.c
+Prereq:  1.113 
+--- ncurses-6.0-20161217+/progs/tset.c	2016-10-22 23:34:47.000000000 +0000
++++ ncurses-6.0-20161224/progs/tset.c	2016-12-24 18:46:42.000000000 +0000
+@@ -88,6 +88,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #if HAVE_GETTTYNAM && HAVE_TTYENT_H
+ #include 
+@@ -96,7 +97,7 @@
+ char *ttyname(int fd);
+ #endif
+ 
+-MODULE_ID("$Id: tset.c,v 1.113 2016/10/22 23:34:47 tom Exp $")
++MODULE_ID("$Id: tset.c,v 1.115 2016/12/24 18:46:42 tom Exp $")
+ 
+ #ifndef environ
+ extern char **environ;
+@@ -627,7 +628,7 @@
+ 	    ttype = askuser(0);
+     }
+     /* Find the terminfo entry.  If it doesn't exist, ask the user. */
+-    while (setupterm((NCURSES_CONST char *) ttype, STDOUT_FILENO, &errret)
++    while (setupterm((NCURSES_CONST char *) ttype, fd, &errret)
+ 	   != OK) {
+ 	if (errret == 0) {
+ 	    (void) fprintf(stderr, "%s: unknown terminal type %s\n",
+@@ -834,7 +835,7 @@
+ 
+     if (same_program(_nc_progname, PROG_RESET)) {
+ 	reset_start(stderr, TRUE, FALSE);
+-	reset_tty_settings(&mode);
++	reset_tty_settings(my_fd, &mode);
+     } else {
+ 	reset_start(stderr, FALSE, FALSE);
+     }
+@@ -852,7 +853,7 @@
+ 	    set_conversions(&mode);
+ 
+ 	    if (!noinit) {
+-		if (send_init_strings(&oldmode)) {
++		if (send_init_strings(my_fd, &oldmode)) {
+ 		    (void) putc('\r', stderr);
+ 		    (void) fflush(stderr);
+ 		    (void) napms(1000);		/* Settle the terminal. */
+Index: progs/tty_settings.c
+--- /dev/null	2016-12-24 13:33:57.595999725 +0000
++++ ncurses-6.0-20161224/progs/tty_settings.c	2016-12-24 19:31:11.000000000 +0000
+@@ -0,0 +1,109 @@
++/****************************************************************************
++ * Copyright (c) 2016 Free Software Foundation, Inc.                        *
++ *                                                                          *
++ * Permission is hereby granted, free of charge, to any person obtaining a  *
++ * copy of this software and associated documentation files (the            *
++ * "Software"), to deal in the Software without restriction, including      *
++ * without limitation the rights to use, copy, modify, merge, publish,      *
++ * distribute, distribute with modifications, sublicense, and/or sell       *
++ * copies of the Software, and to permit persons to whom the Software is    *
++ * furnished to do so, subject to the following conditions:                 *
++ *                                                                          *
++ * The above copyright notice and this permission notice shall be included  *
++ * in all copies or substantial portions of the Software.                   *
++ *                                                                          *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
++ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
++ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
++ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
++ *                                                                          *
++ * Except as contained in this notice, the name(s) of the above copyright   *
++ * holders shall not be used in advertising or otherwise to promote the     *
++ * sale, use or other dealings in this Software without prior written       *
++ * authorization.                                                           *
++ ****************************************************************************/
++
++/****************************************************************************
++ *  Author: Thomas E. Dickey                                                *
++ ****************************************************************************/
++
++#define USE_LIBTINFO
++#include 
++
++#include 
++
++MODULE_ID("$Id: tty_settings.c,v 1.2 2016/12/24 19:31:11 tom Exp $")
++
++static int my_fd;
++static TTY original_settings;
++static bool can_restore = FALSE;
++
++static void
++exit_error(void)
++{
++    restore_tty_settings();
++    (void) fprintf(stderr, "\n");
++    ExitProgram(EXIT_FAILURE);
++    /* NOTREACHED */
++}
++
++static void
++failed(const char *msg)
++{
++    char temp[BUFSIZ];
++
++    _nc_STRCPY(temp, _nc_progname, sizeof(temp));
++    _nc_STRCAT(temp, ": ", sizeof(temp));
++    _nc_STRNCAT(temp, msg, sizeof(temp), sizeof(temp) - strlen(temp) - 2);
++    perror(temp);
++    exit_error();
++    /* NOTREACHED */
++}
++
++static bool
++get_tty_settings(int fd, TTY * tty_settings)
++{
++    bool success = TRUE;
++    my_fd = fd;
++    if (fd < 0 || GET_TTY(my_fd, tty_settings) < 0) {
++	success = FALSE;
++    }
++    return success;
++}
++
++/*
++ * Open a file descriptor on the current terminal, to obtain its settings.
++ * stderr is less likely to be redirected than stdout; try that first.
++ */
++int
++save_tty_settings(TTY * tty_settings)
++{
++    if (!get_tty_settings(STDERR_FILENO, tty_settings) &&
++	!get_tty_settings(STDOUT_FILENO, tty_settings) &&
++	!get_tty_settings(STDIN_FILENO, tty_settings) &&
++	!get_tty_settings(open("/dev/tty", O_RDWR), tty_settings)) {
++	failed("terminal attributes");
++    }
++    can_restore = TRUE;
++    original_settings = *tty_settings;
++    return my_fd;
++}
++
++void
++restore_tty_settings(void)
++{
++    if (can_restore)
++	SET_TTY(my_fd, &original_settings);
++}
++
++/* Set the modes if they've changed. */
++void
++update_tty_settings(TTY * old_settings, TTY * new_settings)
++{
++    if (memcmp(new_settings, old_settings, sizeof(TTY))) {
++	SET_TTY(my_fd, new_settings);
++    }
++}
+Index: progs/tty_settings.h
+--- /dev/null	2016-12-24 13:33:57.595999725 +0000
++++ ncurses-6.0-20161224/progs/tty_settings.h	2016-12-24 18:17:44.000000000 +0000
+@@ -0,0 +1,50 @@
++/****************************************************************************
++ * Copyright (c) 2016 Free Software Foundation, Inc.                        *
++ *                                                                          *
++ * Permission is hereby granted, free of charge, to any person obtaining a  *
++ * copy of this software and associated documentation files (the            *
++ * "Software"), to deal in the Software without restriction, including      *
++ * without limitation the rights to use, copy, modify, merge, publish,      *
++ * distribute, distribute with modifications, sublicense, and/or sell       *
++ * copies of the Software, and to permit persons to whom the Software is    *
++ * furnished to do so, subject to the following conditions:                 *
++ *                                                                          *
++ * The above copyright notice and this permission notice shall be included  *
++ * in all copies or substantial portions of the Software.                   *
++ *                                                                          *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
++ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
++ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
++ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
++ *                                                                          *
++ * Except as contained in this notice, the name(s) of the above copyright   *
++ * holders shall not be used in advertising or otherwise to promote the     *
++ * sale, use or other dealings in this Software without prior written       *
++ * authorization.                                                           *
++ ****************************************************************************/
++
++/****************************************************************************
++ *  Author: Thomas E Dickey                                                 *
++ ****************************************************************************/
++
++/*
++ * $Id: tty_settings.h,v 1.1 2016/12/24 18:17:44 tom Exp $
++ *
++ * Utility functions for saving/restoring terminal settings.
++ */
++#ifndef TTY_SETTINGS_H
++#define TTY_SETTINGS_H 1
++/* *INDENT-OFF* */
++
++#include 
++
++extern int save_tty_settings(TTY * /* tty_settings */ );
++extern void restore_tty_settings(void);
++extern void update_tty_settings(TTY * /* old_settings */, TTY * /* new_settings */ );
++
++/* *INDENT-ON* */
++
++#endif /* TTY_SETTINGS_H */
diff --git a/ncurses-6.0-20161231.patch b/ncurses-6.0-20161231.patch
new file mode 100644
index 0000000..66d3e83
--- /dev/null
+++ b/ncurses-6.0-20161231.patch
@@ -0,0 +1,16453 @@
+# ncurses 6.0 - patch 20161231 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.0 is at
+# 	ftp.gnu.org:/pub/gnu
+#
+# Patches for ncurses 6.0 can be found at
+# 	ftp://invisible-island.net/ncurses/6.0
+#	http://invisible-mirror.net/archives/ncurses/6.0 
+#
+# ------------------------------------------------------------------------------
+# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20161231.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sat Dec 31 23:48:48 UTC 2016
+# ------------------------------------------------------------------------------
+# NEWS                                    |   20 
+# VERSION                                 |    2 
+# aclocal.m4                              |    6 
+# config.guess                            |   12 
+# config.sub                              |   17 
+# configure                               |    2 
+# dist.mk                                 |    4 
+# doc/html/NCURSES-Programming-HOWTO.html |14480 +++++++++++++-----------------
+# doc/html/man/adacurses6-config.1.html   |    2 
+# doc/html/man/captoinfo.1m.html          |    2 
+# doc/html/man/clear.1.html               |   32 
+# doc/html/man/form.3x.html               |    2 
+# doc/html/man/infocmp.1m.html            |    2 
+# doc/html/man/infotocap.1m.html          |    2 
+# doc/html/man/menu.3x.html               |    2 
+# doc/html/man/ncurses.3x.html            |    2 
+# doc/html/man/ncurses6-config.1.html     |    2 
+# doc/html/man/panel.3x.html              |    2 
+# doc/html/man/tabs.1.html                |   66 
+# doc/html/man/terminfo.5.html            |    2 
+# doc/html/man/tic.1m.html                |    2 
+# doc/html/man/toe.1m.html                |    2 
+# doc/html/man/tput.1.html                |    2 
+# doc/html/man/tset.1.html                |    2 
+# man/clear.1                             |   19 
+# man/tabs.1                              |   57 
+# misc/terminfo.src                       |  110 
+# mk-1st.awk                              |    6 
+# ncurses/trace/lib_trace.c               |   23 
+# package/debian-mingw/changelog          |    4 
+# package/debian-mingw64/changelog        |    4 
+# package/debian/changelog                |    4 
+# package/mingw-ncurses.nsi               |    4 
+# package/mingw-ncurses.spec              |    2 
+# package/ncurses.spec                    |    2 
+# progs/Makefile.in                       |    5 
+# progs/tabs.c                            |   27 
+# progs/tic.c                             |    3 
+# 38 files changed, 6876 insertions(+), 8063 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.2715 
+--- ncurses-6.0-20161224+/NEWS	2016-12-24 23:45:38.000000000 +0000
++++ ncurses-6.0-20161231/NEWS	2016-12-31 21:35:53.000000000 +0000
+@@ -25,7 +25,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.2715 2016/12/24 23:45:38 tom Exp $
++-- $Id: NEWS,v 1.2722 2016/12/31 21:35:53 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -45,6 +45,24 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20161231
++	+ fix errata for ncurses-howto (report by Damien Ruscoe).
++	+ fix a few places in configure/build scripts where DESTDIR and rpath
++	  were combined (report by Thomas Klausner).
++	+ merge current st description (report by Harry Gindi) -TD
++	+ modify flash capability for linux and wyse entries to put the delay
++	  between the reverse/normal escapes rather than after -TD
++	+ modify program tabs to pass the actual tty file descriptor to
++	  setupterm rather than the standard output, making padding work
++	  consistently.
++	+ explain in clear's manual page that it writes to stdout.
++	+ add special case for verbose debugging traces of command-line
++	  utilities which write to stderr (cf: 20161126).
++	+ remove a trace with literal escapes from skip_DECSCNM(), added in
++	  20161203.
++	+ update config.guess, config.sub from
++		http://git.savannah.gnu.org/cgit/config.git
++
+ 20161224
+ 	+ correct parmeters for copywin call in _nc_Synchronize_Attributes()
+ 	  (patch by Leon Winter).
+Index: VERSION
+--- ncurses-6.0-20161224+/VERSION	2016-12-24 13:45:15.000000000 +0000
++++ ncurses-6.0-20161231/VERSION	2016-12-31 12:01:55.000000000 +0000
+@@ -1 +1 @@
+-5:0:9	6.0	20161224
++5:0:9	6.0	20161231
+Index: aclocal.m4
+Prereq:  1.801 
+--- ncurses-6.0-20161224+/aclocal.m4	2016-10-08 21:35:33.000000000 +0000
++++ ncurses-6.0-20161231/aclocal.m4	2016-12-31 17:09:35.000000000 +0000
+@@ -28,7 +28,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.801 2016/10/08 21:35:33 tom Exp $
++dnl $Id: aclocal.m4,v 1.803 2016/12/31 17:09:35 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -7251,7 +7251,7 @@
+ fi
+ ])
+ dnl ---------------------------------------------------------------------------
+-dnl CF_WITH_LIBTOOL version: 33 updated: 2015/10/17 19:03:33
++dnl CF_WITH_LIBTOOL version: 34 updated: 2016/12/31 12:04:57
+ dnl ---------------
+ dnl Provide a configure option to incorporate libtool.  Define several useful
+ dnl symbols for the makefile rules.
+@@ -7334,7 +7334,7 @@
+ 		AC_MSG_ERROR(Cannot find libtool)
+ 	fi
+ ])dnl
+-	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} ${LIBTOOL_VERSION} `cut -f1 ${top_srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} $(LIBS) -o'
++	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${libdir} ${LIBTOOL_VERSION} `cut -f1 ${top_srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} $(LIBS) -o'
+ 	LIB_OBJECT='${OBJECTS:.o=.lo}'
+ 	LIB_SUFFIX=.la
+ 	LIB_CLEAN='${LIBTOOL} --mode=clean'
+Index: config.guess
+--- ncurses-6.0-20161224+/config.guess	2016-08-27 14:55:36.000000000 +0000
++++ ncurses-6.0-20161231/config.guess	2016-12-31 17:06:24.000000000 +0000
+@@ -1,8 +1,8 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+-#   Copyright 1992-2016 Free Software Foundation, Inc.
++#   Copyright 1992-2017 Free Software Foundation, Inc.
+ 
+-timestamp='2016-05-15'
++timestamp='2017-01-01'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -50,7 +50,7 @@
+ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+-Copyright 1992-2016 Free Software Foundation, Inc.
++Copyright 1992-2017 Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -1000,6 +1000,9 @@
+ 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+ 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+ 	;;
++    mips64el:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	exit ;;
+     openrisc*:Linux:*:*)
+ 	echo or1k-unknown-linux-${LIBC}
+ 	exit ;;
+@@ -1032,6 +1035,9 @@
+     ppcle:Linux:*:*)
+ 	echo powerpcle-unknown-linux-${LIBC}
+ 	exit ;;
++    riscv32:Linux:*:* | riscv64:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	exit ;;
+     s390:Linux:*:* | s390x:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+ 	exit ;;
+Index: config.sub
+--- ncurses-6.0-20161224+/config.sub	2016-08-27 14:55:36.000000000 +0000
++++ ncurses-6.0-20161231/config.sub	2016-12-31 17:06:24.000000000 +0000
+@@ -1,8 +1,8 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+-#   Copyright 1992-2016 Free Software Foundation, Inc.
++#   Copyright 1992-2017 Free Software Foundation, Inc.
+ 
+-timestamp='2016-08-25'
++timestamp='2017-01-01'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -67,7 +67,7 @@
+ version="\
+ GNU config.sub ($timestamp)
+ 
+-Copyright 1992-2016 Free Software Foundation, Inc.
++Copyright 1992-2017 Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -117,7 +117,7 @@
+   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+   linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+   knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
+-  kopensolaris*-gnu* | \
++  kopensolaris*-gnu* | cloudabi*-eabi* | \
+   storm-chaos* | os2-emx* | rtmk-nova*)
+     os=-$maybe_os
+     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+@@ -301,6 +301,7 @@
+ 	| open8 | or1k | or1knd | or32 \
+ 	| pdp10 | pdp11 | pj | pjl \
+ 	| powerpc | powerpc64 | powerpc64le | powerpcle \
++	| pru \
+ 	| pyramid \
+ 	| riscv32 | riscv64 \
+ 	| rl78 | rx \
+@@ -428,6 +429,7 @@
+ 	| orion-* \
+ 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
++	| pru-* \
+ 	| pyramid-* \
+ 	| riscv32-* | riscv64-* \
+ 	| rl78-* | romp-* | rs6000-* | rx-* \
+@@ -1395,7 +1397,7 @@
+ 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+-	      | -chorusos* | -chorusrdb* | -cegcc* \
++	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
+ 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ 	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+ 	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+@@ -1407,7 +1409,7 @@
+ 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+ 	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
+-	      | -onefs* | -tirtos* | -phoenix*)
++	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
+ 	# Remember, each alternative MUST END IN *, to match a version number.
+ 		;;
+ 	-qnx*)
+@@ -1636,6 +1638,9 @@
+ 	sparc-* | *-sun)
+ 		os=-sunos4.1.1
+ 		;;
++	pru-*)
++		os=-elf
++		;;
+ 	*-be)
+ 		os=-beos
+ 		;;
+Index: configure
+--- ncurses-6.0-20161224+/configure	2016-12-11 02:19:56.000000000 +0000
++++ ncurses-6.0-20161231/configure	2016-12-31 17:10:44.000000000 +0000
+@@ -4957,7 +4957,7 @@
+ echo "$as_me: error: Cannot find libtool" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+-	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} ${LIBTOOL_VERSION} `cut -f1 ${top_srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} $(LIBS) -o'
++	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${libdir} ${LIBTOOL_VERSION} `cut -f1 ${top_srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} $(LIBS) -o'
+ 	LIB_OBJECT='${OBJECTS:.o=.lo}'
+ 	LIB_SUFFIX=.la
+ 	LIB_CLEAN='${LIBTOOL} --mode=clean'
+Index: dist.mk
+Prereq:  1.1138 
+--- ncurses-6.0-20161224+/dist.mk	2016-12-24 13:45:15.000000000 +0000
++++ ncurses-6.0-20161231/dist.mk	2016-12-31 12:01:55.000000000 +0000
+@@ -25,7 +25,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1138 2016/12/24 13:45:15 tom Exp $
++# $Id: dist.mk,v 1.1139 2016/12/31 12:01:55 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -37,7 +37,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 0
+-NCURSES_PATCH = 20161224
++NCURSES_PATCH = 20161231
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/NCURSES-Programming-HOWTO.html
+--- ncurses-6.0-20161224+/doc/html/NCURSES-Programming-HOWTO.html	2014-01-04 23:56:00.000000000 +0000
++++ ncurses-6.0-20161231/doc/html/NCURSES-Programming-HOWTO.html	2016-12-31 21:28:10.000000000 +0000
+@@ -1,1282 +1,844 @@
+-
+- NCURSES Programming HOWTO 
    NCURSES Programming HOWTO
     Pradeep   Padala 
    v1.9, 2005-06-20
    Revision History
    Revision 1.92005-06-20Revised by: ppadala
    The license has been changed to the MIT-style license used
+-        by NCURSES. Note that the programs are also re-licensed under this.
    Revision 1.82005-06-17Revised by: ppadala
    Lots of updates. Added references and perl examples.
+-        Changes to examples. Many grammatical and stylistic changes to the
+-        content. Changes to NCURSES history.
    Revision 1.7.12002-06-25Revised by: ppadala
    Added a README file for building and instructions
+-        for building from source.
    Revision 1.72002-06-25Revised by: ppadala
    Added "Other formats" section and made a lot of fancy 
+-        changes to the programs. Inlining of programs is gone.
    Revision 1.6.12002-02-24Revised by: ppadala
    Removed the old Changelog section, cleaned the makefiles
    Revision 1.62002-02-16Revised by: ppadala
    Corrected a lot of spelling mistakes, added ACS variables
+-        section
    Revision 1.52002-01-05Revised by: ppadala
    Changed structure to present proper TOC
    Revision 1.3.12001-07-26Revised by: ppadala
    Corrected maintainers paragraph, Corrected stable release number
    Revision 1.32001-07-24Revised by: ppadala
    Added copyright notices to main document (LDP license)
+-        and programs (GPL), Corrected
+-        printw_example.
    Revision 1.22001-06-05Revised by: ppadala
    Incorporated ravi's changes. Mainly to introduction, menu, 
+-        form, justforfun sections
    Revision 1.12001-05-22Revised by: ppadala
    Added "a word about window" section, Added scanw_example.
        This document is intended to be an "All in One" guide for programming with 
+-ncurses and its sister libraries. We graduate from a simple "Hello World" 
+-program to more complex form manipulation. No prior experience in ncurses is 
+-assumed. Send comments to this address
+-    
+-    
    Table of Contents
    1. Introduction
    1.1. What is NCURSES?
    1.2. What we can do with NCURSES
    1.3. Where to get it
    1.4. Purpose/Scope of the document
    1.5. About the Programs
    1.6. Other Formats of the document
    1.6.1. Readily available formats from tldp.org
    1.6.2. Building from source
    1.7. Credits
    1.8. Wish List
    1.9. Copyright
    2. Hello World !!!
    2.1. Compiling With the NCURSES Library
    2.2. Dissection
    2.2.1. About initscr()
    2.2.2. The mysterious refresh()
    2.2.3. About endwin()
    3. The Gory Details
    4. Initialization
    4.1. Initialization functions
    4.2. raw() and cbreak()
    4.3. echo() and noecho()
    4.4. keypad()
    4.5. halfdelay()
    4.6. Miscellaneous Initialization functions
    4.7. An Example
    5. A Word about Windows
    6. Output functions
    6.1. addch() class of functions
    6.2. mvaddch(), waddch() and mvwaddch()
    6.3. printw() class of functions
    6.3.1. printw() and mvprintw
    6.3.2. wprintw() and mvwprintw
    6.3.3. vwprintw()
    6.3.4. A Simple printw example
    6.4. addstr() class of functions
    6.5. A word of caution
    7. Input functions
    7.1. getch() class of functions
    7.2. scanw() class of functions
    7.2.1. scanw() and mvscanw
    7.2.2. wscanw() and mvwscanw()
    7.2.3. vwscanw()
    7.3. getstr() class of functions
    7.4. Some examples
    8. Attributes
    8.1. The details
    8.2. attron() vs attrset()
    8.3. attr_get()
    8.4. attr_ functions
    8.5. wattr functions
    8.6. chgat() functions
    9. Windows
    9.1. The basics
    9.2. Let there be a Window !!!
    9.3. Explanation
    9.4. The other stuff in the example
    9.5. Other Border functions
    10. Colors
    10.1. The basics
    10.2. Changing Color Definitions
    10.3. Color Content
    11. Interfacing with the key board
    11.1. The Basics
    11.2. A Simple Key Usage example
    12. Interfacing with the mouse
    12.1. The Basics
    12.2. Getting the events
    12.3. Putting it all Together
    12.4. Miscellaneous Functions
    13. Screen Manipulation
    13.1. getyx() functions
    13.2. Screen Dumping
    13.3. Window Dumping
    14. Miscellaneous features
    14.1. curs_set()
    14.2. Temporarily Leaving Curses mode
    14.3. ACS_ variables
    15. Other libraries
    16. Panel Library
    16.1. The Basics
    16.2. Compiling With the Panels Library
    16.3. Panel Window Browsing
    16.4. Using User Pointers
    16.5. Moving and Resizing Panels
    16.6. Hiding and Showing Panels
    16.7. panel_above() and panel_below() Functions
    17. Menus Library
    17.1. The Basics
    17.2. Compiling With the Menu Library
    17.3. Menu Driver: The work horse of the menu system
    17.4. Menu Windows
    17.5. Scrolling Menus
    17.6. Multi Columnar Menus
    17.7. Multi Valued Menus
    17.8. Menu Options
    17.9. The useful User Pointer
    18. Forms Library
    18.1. The Basics
    18.2. Compiling With the Forms Library
    18.3. Playing with Fields
    18.3.1. Fetching Size and Location of Field
    18.3.2. Moving the field
    18.3.3. Field Justification
    18.3.4. Field Display Attributes
    18.3.5. Field Option Bits
    18.3.6. Field Status
    18.3.7. Field User Pointer
    18.3.8. Variable-Sized Fields
    18.4. Form Windows
    18.5. Field Validation
    18.6. Form Driver: The work horse of the forms system
    18.6.1. Page Navigation Requests
    18.6.2. Inter-Field Navigation Requests
    18.6.3. Intra-Field Navigation Requests
    18.6.4. Scrolling Requests
    18.6.5. Editing Requests
    18.6.6. Order Requests
    18.6.7. Application Commands
    19. Tools and Widget Libraries
    19.1. CDK (Curses Development Kit)
    19.1.1. Widget List
    19.1.2. Some Attractive Features
    19.1.3. Conclusion
    19.2. The dialog
    19.3. Perl Curses Modules CURSES::FORM and CURSES::WIDGETS
    20. Just For Fun !!!
    20.1. The Game of Life
    20.2. Magic Square
    20.3. Towers of Hanoi
    20.4. Queens Puzzle
    20.5. Shuffle
    20.6. Typing Tutor
    21. References
    1. Introduction
    In the olden days of teletype terminals, terminals were away from computers and
+-were connected to them through serial cables. The terminals could be configured
+-by sending a series of bytes. All the capabilities (such as 
+-moving the cursor to a new location, erasing part of the screen, scrolling the 
+-screen, changing modes etc.) of terminals could be accessed through these 
+-series of bytes. These control seeuqnces are usually called escape sequences, 
+-because they start 
+-with an escape(0x1B) character. Even today, with proper emulation, we can send 
+-escape sequences to the emulator and achieve the same effect on a terminal 
+-window.
    Suppose you wanted to print a line in color. Try typing this on your console.
    echo "^[[0;31;40mIn Color"
    The first character is an escape character, which looks like two characters ^ 
+-and [. To be able to print it, you have to press CTRL+V and then the ESC key. 
+-All the others are normal printable characters. You should be able to see the 
+-string "In Color" in red. It stays that way and to revert back to the original 
+-mode type this.
    echo "^[[0;37;40m"
    Now, what do these magic characters mean? Difficult to comprehend? They might
+-even be different for different terminals. So the designers of UNIX invented a 
+-mechanism named termcap. It is a file that
+-lists all the capabilities of a particular terminal, along with the escape
+-sequences needed to achieve a particular effect. In the later years, this was 
+-replaced by terminfo. Without delving too 
+-much into details, this mechanism allows application 
+-programs to query the terminfo database and obtain the control characters to be 
+-sent to a terminal or terminal emulator.
    1.1. What is NCURSES?
     
+-You might be wondering, what the import of all this technical gibberish is.  In
+-the above scenario, every application program is supposed to query the terminfo
+-and perform the necessary stuff (sending control characters etc.).  It soon became
+-difficult to manage this complexity and this gave birth to 'CURSES'.  Curses is
+-a pun on the name "cursor optimization". The Curses library forms a wrapper
+-over working with raw terminal codes, and provides highly flexible and
+-efficient API (Application Programming Interface). It provides functions to
+-move the cursor, create windows, produce colors, play with mouse etc.  The
+-application programs need not worry about the underlying terminal capabilities.
    So what is NCURSES? NCURSES is a clone of the original System V Release 4.0
+-(SVr4) curses. It is a freely distributable library, fully compatible with
+-older version of curses.  In short, it is a library of functions that manages
+-an application's display on character-cell terminals.  In the remainder of the
+-document, the terms curses and ncurses are used interchangeably.  
    A detailed history of NCURSES can be found in the NEWS file from the source
+-distribution. The current package is maintained by 
+-Thomas Dickey.  
+-You can contact the maintainers at bug-ncurses@gnu.org.
    1.2. What we can do with NCURSES
    NCURSES not only creates a wrapper over terminal capabilities, but also gives a
+-robust framework to create nice looking UI (User Interface)s in text mode.  It
+-provides functions to create windows etc.  Its sister libraries panel, menu and
+-form provide an extension to the basic curses library. These libraries usually
+-come along with curses. One can create applications that contain multiple
+-windows, menus, panels and forms. Windows can be managed independently, can
+-provide 'scrollability' and even can be hidden.
     
+-Menus provide the user with an easy command selection option.  Forms allow the
+-creation of easy-to-use data entry and display windows.  Panels extend the
+-capabilities of ncurses to deal with overlapping and stacked windows.
    These are just some of the basic things we can do with ncurses. As we move
+-along, We will see all the capabilities of these libraries. 
    1.3. Where to get it
    All right, now that you know what you can do with ncurses, you must be rearing
+-to get started. NCURSES is usually shipped with your installation. In case
+-you don't have the library or want to compile it on your own, read on.
    Compiling the package 
    NCURSES can be obtained from ftp://ftp.gnu.org/pub/gnu/ncurses/ncurses.tar.gz or any of the ftp 
+-sites mentioned in http://www.gnu.org/order/ftp.html. 
    Read the README and INSTALL files for details on to how to install it. It 
+-usually involves the following operations.
        tar zxvf ncurses<version>.tar.gz  # unzip and untar the archive
++
++
++
++
++  
++
++  NCURSES Programming HOWTO
++  
++
++
++
++  
    
++    
    
++      
    NCURSES
++      Programming HOWTO
    
++
++      
    Pradeep
++      Padala
    
++
++      
    
++        
    
++          
    
++        
    
++      
    
++
++      
    v1.9, 2005-06-20
    
++
++      
    
++        
++          
++            
++          
++
++          
++            
++
++            
++
++            
++          
++
++          
++            
++          
++
++          
++            
++
++            
++
++            
++          
++
++          
++            
++          
++
++          
++            
++
++            
++
++            
++          
++
++          
++            
++          
++
++          
++            
++
++            
++
++            
++          
++
++          
++            
++          
++
++          
++            
++
++            
++
++            
++          
++
++          
++            
++          
++
++          
++            
++
++            
++
++            
++          
++
++          
++            
++          
++
++          
++            
++
++            
++
++            
++          
++
++          
++            
++          
++
++          
++            
++
++            
++
++            
++          
++
++          
++            
++          
++
++          
++            
++
++            
++
++            
++          
++
++          
++            
++          
++
++          
++            
++
++            
++
++            
++          
++
++          
++            
++          
++
++          
++            
++
++            
++
++            
++          
++
++          
++            
++          
++        
    Revision
++            History
    Revision 1.92005-06-20Revised by: ppadala
    The license has been
++            changed to the MIT-style license used by NCURSES. Note
++            that the programs are also re-licensed under this.
    Revision 1.82005-06-17Revised by: ppadala
    Lots of updates. Added
++            references and perl examples. Changes to examples. Many
++            grammatical and stylistic changes to the content.
++            Changes to NCURSES history.
    Revision 1.7.12002-06-25Revised by: ppadala
    Added a README file for
++            building and instructions for building from
++            source.
    Revision 1.72002-06-25Revised by: ppadala
    Added "Other formats"
++            section and made a lot of fancy changes to the
++            programs. Inlining of programs is gone.
    Revision 1.6.12002-02-24Revised by: ppadala
    Removed the old Changelog
++            section, cleaned the makefiles
    Revision 1.62002-02-16Revised by: ppadala
    Corrected a lot of
++            spelling mistakes, added ACS variables section
    Revision 1.52002-01-05Revised by: ppadala
    Changed structure to
++            present proper TOC
    Revision 1.3.12001-07-26Revised by: ppadala
    Corrected maintainers
++            paragraph, Corrected stable release number
    Revision 1.32001-07-24Revised by: ppadala
    Added copyright notices to
++            main document (LDP license) and programs (GPL),
++            Corrected printw_example.
    Revision 1.22001-06-05Revised by: ppadala
    Incorporated ravi's
++            changes. Mainly to introduction, menu, form, justforfun
++            sections
    Revision 1.12001-05-22Revised by: ppadala
    Added "a word about
++            window" section, Added scanw_example.
    
++      
    
++
++      
    
++        
    
++          
++
++          
    This
++          document is intended to be an "All in One" guide for
++          programming with ncurses and its sister libraries. We
++          graduate from a simple "Hello World" program to more
++          complex form manipulation. No prior experience in ncurses
++          is assumed. Send comments to this
++          address
    
++        
    
++      
    
++      
    
++    
    
++
++    
    
++      
    
++        
    Table of Contents
    
++
++        
    1. Introduction
    
++
++        
    
++          
    
++            
    1.1. What is NCURSES?
    
++
++            
    1.2. What we can do with
++            NCURSES
    
++
++            
    1.3. Where to get
++            it
    
++
++            
    1.4. Purpose/Scope of the
++            document
    
++
++            
    1.5. About the
++            Programs
    
++
++            
    1.6. Other Formats of the
++            document
    
++
++            
    
++              
    
++                
    1.6.1. Readily available
++                formats from tldp.org
    
++
++                
    1.6.2. Building from
++                source
    
++              
    
++            
    
++
++            
    1.7. Credits
    
++
++            
    1.8. Wish List
    
++
++            
    1.9. Copyright
    
++          
    
++        
    
++
++        
    2. Hello World !!!
    
++
++        
    
++          
    
++            
    2.1. Compiling With the
++            NCURSES Library
    
++
++            
    2.2. Dissection
    
++
++            
    
++              
    
++                
    2.2.1. About
++                initscr()
    
++
++                
    2.2.2. The mysterious
++                refresh()
    
++
++                
    2.2.3. About
++                endwin()
    
++              
    
++            
    
++          
    
++        
    
++
++        
    3. The Gory Details
    
++
++        
    4. Initialization
    
++
++        
    
++          
    
++            
    4.1. Initialization
++            functions
    
++
++            
    4.2. raw() and
++            cbreak()
    
++
++            
    4.3. echo() and
++            noecho()
    
++
++            
    4.4. keypad()
    
++
++            
    4.5. halfdelay()
    
++
++            
    4.6. Miscellaneous
++            Initialization functions
    
++
++            
    4.7. An Example
    
++          
    
++        
    
++
++        
    5. A Word about
++        Windows
    
++
++        
    6. Output functions
    
++
++        
    
++          
    
++            
    6.1. addch() class of
++            functions
    
++
++            
    6.2. mvaddch(), waddch() and
++            mvwaddch()
    
++
++            
    6.3. printw() class of
++            functions
    
++
++            
    
++              
    
++                
    6.3.1. printw() and
++                mvprintw
    
++
++                
    6.3.2. wprintw()
++                and mvwprintw
    
++
++                
    6.3.3. vwprintw()
    
++
++                
    6.3.4. A Simple
++                printw example
    
++              
    
++            
    
++
++            
    6.4. addstr() class of
++            functions
    
++
++            
    6.5. A word of caution
    
++          
    
++        
    
++
++        
    7. Input functions
    
++
++        
    
++          
    
++            
    7.1. getch() class of
++            functions
    
++
++            
    7.2. scanw() class of
++            functions
    
++
++            
    
++              
    
++                
    7.2.1. scanw() and
++                mvscanw
    
++
++                
    7.2.2. wscanw() and
++                mvwscanw()
    
++
++                
    7.2.3. vwscanw()
    
++              
    
++            
    
++
++            
    7.3. getstr() class of
++            functions
    
++
++            
    7.4. Some examples
    
++          
    
++        
    
++
++        
    8. Attributes
    
++
++        
    
++          
    
++            
    8.1. The details
    
++
++            
    8.2. attron() vs
++            attrset()
    
++
++            
    8.3. attr_get()
    
++
++            
    8.4. attr_ functions
    
++
++            
    8.5. wattr functions
    
++
++            
    8.6. chgat() functions
    
++          
    
++        
    
++
++        
    9. Windows
    
++
++        
    
++          
    
++            
    9.1. The basics
    
++
++            
    9.2. Let there be a Window
++            !!!
    
++
++            
    9.3. Explanation
    
++
++            
    9.4. The other stuff in the
++            example
    
++
++            
    9.5. Other Border
++            functions
    
++          
    
++        
    
++
++        
    10. Colors
    
++
++        
    
++          
    
++            
    10.1. The basics
    
++
++            
    10.2. Changing Color
++            Definitions
    
++
++            
    10.3. Color
++            Content
    
++          
    
++        
    
++
++        
    11. Interfacing with the key
++        board
    
++
++        
    
++          
    
++            
    11.1. The Basics
    
++
++            
    11.2. A Simple Key Usage
++            example
    
++          
    
++        
    
++
++        
    12. Interfacing with the
++        mouse
    
++
++        
    
++          
    
++            
    12.1. The Basics
    
++
++            
    12.2. Getting the
++            events
    
++
++            
    12.3. Putting it all
++            Together
    
++
++            
    12.4. Miscellaneous
++            Functions
    
++          
    
++        
    
++
++        
    13. Screen Manipulation
    
++
++        
    
++          
    
++            
    13.1. getyx() functions
    
++
++            
    13.2. Screen Dumping
    
++
++            
    13.3. Window Dumping
    
++          
    
++        
    
++
++        
    14. Miscellaneous features
    
++
++        
    
++          
    
++            
    14.1. curs_set()
    
++
++            
    14.2. Temporarily Leaving
++            Curses mode
    
++
++            
    14.3. ACS_ variables
    
++          
    
++        
    
++
++        
    15. Other libraries
    
++
++        
    16. Panel Library
    
++
++        
    
++          
    
++            
    16.1. The Basics
    
++
++            
    16.2. Compiling With the
++            Panels Library
    
++
++            
    16.3. Panel Window
++            Browsing
    
++
++            
    16.4. Using User
++            Pointers
    
++
++            
    16.5. Moving and
++            Resizing Panels
    
++
++            
    16.6. Hiding and Showing
++            Panels
    
++
++            
    16.7. panel_above() and
++            panel_below() Functions
    
++          
    
++        
    
++
++        
    17. Menus Library
    
++
++        
    
++          
    
++            
    17.1. The Basics
    
++
++            
    17.2. Compiling With the
++            Menu Library
    
++
++            
    17.3. Menu Driver: The work
++            horse of the menu system
    
++
++            
    17.4. Menu Windows
    
++
++            
    17.5. Scrolling
++            Menus
    
++
++            
    17.6. Multi Columnar
++            Menus
    
++
++            
    17.7. Multi Valued
++            Menus
    
++
++            
    17.8. Menu Options
    
++
++            
    17.9. The useful User
++            Pointer
    
++          
    
++        
    
++
++        
    18. Forms Library
    
++
++        
    
++          
    
++            
    18.1. The Basics
    
++
++            
    18.2. Compiling With the
++            Forms Library
    
++
++            
    18.3. Playing with
++            Fields
    
++
++            
    
++              
    
++                
    18.3.1. Fetching Size and
++                Location of Field
    
++
++                
    18.3.2. Moving the
++                field
    
++
++                
    18.3.3. Field
++                Justification
    
++
++                
    18.3.4. Field
++                Display Attributes
    
++
++                
    18.3.5. Field Option
++                Bits
    
++
++                
    18.3.6. Field
++                Status
    
++
++                
    18.3.7. Field User
++                Pointer
    
++
++                
    18.3.8. Variable-Sized
++                Fields
    
++              
    
++            
    
++
++            
    18.4. Form Windows
    
++
++            
    18.5. Field
++            Validation
    
++
++            
    18.6. Form Driver: The work
++            horse of the forms system
    
++
++            
    
++              
    
++                
    18.6.1. Page Navigation
++                Requests
    
++
++                
    18.6.2. Inter-Field
++                Navigation Requests
    
++
++                
    18.6.3. Intra-Field
++                Navigation Requests
    
++
++                
    18.6.4. Scrolling
++                Requests
    
++
++                
    18.6.5. Editing
++                Requests
    
++
++                
    18.6.6. Order
++                Requests
    
++
++                
    18.6.7. Application
++                Commands
    
++              
    
++            
    
++          
    
++        
    
++
++        
    19. Tools and Widget
++        Libraries
    
++
++        
    
++          
    
++            
    19.1. CDK (Curses Development
++            Kit)
    
++
++            
    
++              
    
++                
    19.1.1. Widget
++                List
    
++
++                
    19.1.2. Some Attractive
++                Features
    
++
++                
    19.1.3. Conclusion
    
++              
    
++            
    
++
++            
    19.2. The dialog
    
++
++            
    19.3. Perl Curses Modules
++            CURSES::FORM and CURSES::WIDGETS
    
++          
    
++        
    
++
++        
    20. Just For Fun !!!
    
++
++        
    
++          
    
++            
    20.1. The Game of
++            Life
    
++
++            
    20.2. Magic Square
    
++
++            
    20.3. Towers of Hanoi
    
++
++            
    20.4. Queens Puzzle
    
++
++            
    20.5. Shuffle
    
++
++            
    20.6. Typing Tutor
    
++          
    
++        
    
++
++        
    21. References
    
++      
    
++    
    
++
++    
    
++      
    1.
++      Introduction
    
++
++      
    In the olden days of teletype terminals, terminals were
++      away from computers and were connected to them through serial
++      cables. The terminals could be configured by sending a series
++      of bytes. All the capabilities (such as moving the cursor to
++      a new location, erasing part of the screen, scrolling the
++      screen, changing modes etc.) of terminals could be accessed
++      through these series of bytes. These control seeuqnces are
++      usually called escape sequences, because they start with an
++      escape(0x1B) character. Even today, with proper emulation, we
++      can send escape sequences to the emulator and achieve the
++      same effect on a terminal window.
    
++
++      
    Suppose you wanted to print a line in color. Try typing
++      this on your console.
    
++      
    ++echo "^[[0;31;40mIn Color"
++
    
++
++      
    The first character is an escape character, which looks
++      like two characters ^ and [. To be able to print it, you have
++      to press CTRL+V and then the ESC key. All the others are
++      normal printable characters. You should be able to see the
++      string "In Color" in red. It stays that way and to revert
++      back to the original mode type this.
    
++      
    ++echo "^[[0;37;40m"
++
    
++
++      
    Now, what do these magic characters mean? Difficult to
++      comprehend? They might even be different for different
++      terminals. So the designers of UNIX invented a mechanism
++      named termcap. It is a file that
++      lists all the capabilities of a particular terminal, along
++      with the escape sequences needed to achieve a particular
++      effect. In the later years, this was replaced by terminfo. Without delving too much into
++      details, this mechanism allows application programs to query
++      the terminfo database and obtain the control characters to be
++      sent to a terminal or terminal emulator.
    
++
++      
    
++        
    
++
++        
    1.1. What is
++        NCURSES?
    
++
++        
    You might be wondering, what the import of all this
++        technical gibberish is. In the above scenario, every
++        application program is supposed to query the terminfo and
++        perform the necessary stuff (sending control characters
++        etc.). It soon became difficult to manage this complexity
++        and this gave birth to 'CURSES'. Curses is a pun on the
++        name "cursor optimization". The Curses library forms a
++        wrapper over working with raw terminal codes, and provides
++        highly flexible and efficient API (Application Programming
++        Interface). It provides functions to move the cursor,
++        create windows, produce colors, play with mouse etc. The
++        application programs need not worry about the underlying
++        terminal capabilities.
    
++
++        
    So what is NCURSES? NCURSES is a clone of the original
++        System V Release 4.0 (SVr4) curses. It is a freely
++        distributable library, fully compatible with older version
++        of curses. In short, it is a library of functions that
++        manages an application's display on character-cell
++        terminals. In the remainder of the document, the terms
++        curses and ncurses are used interchangeably.
    
++
++        
    A detailed history of NCURSES can be found in the NEWS
++        file from the source distribution. The current package is
++        maintained by Thomas Dickey. You can contact the maintainers
++        at bug-ncurses@gnu.org.
    
++      
    
++
++      
    
++        
    
++
++        
    1.2. What we can do with NCURSES
    
++
++        
    NCURSES not only creates a wrapper over terminal
++        capabilities, but also gives a robust framework to create
++        nice looking UI (User Interface)s in text mode. It provides
++        functions to create windows etc. Its sister libraries
++        panel, menu and form provide an extension to the basic
++        curses library. These libraries usually come along with
++        curses. One can create applications that contain multiple
++        windows, menus, panels and forms. Windows can be managed
++        independently, can provide 'scrollability' and even can be
++        hidden.
    
++
++        
    Menus provide the user with an easy command selection
++        option. Forms allow the creation of easy-to-use data entry
++        and display windows. Panels extend the capabilities of
++        ncurses to deal with overlapping and stacked windows.
    
++
++        
    These are just some of the basic things we can do with
++        ncurses. As we move along, We will see all the capabilities
++        of these libraries.
    
++      
    
++
++      
    
++        
    
++
++        
    1.3. Where to get it
    
++
++        
    All right, now that you know what you can do with
++        ncurses, you must be rearing to get started. NCURSES is
++        usually shipped with your installation. In case you don't
++        have the library or want to compile it on your own, read
++        on.
    
++
++        
    Compiling the
++        package
    
++
++        
    NCURSES can be obtained from ftp://ftp.gnu.org/pub/gnu/ncurses/ncurses.tar.gz
++        or any of the ftp sites mentioned in http://www.gnu.org/order/ftp.html.
    
++
++        
    Read the README and INSTALL files for details on to how
++        to install it. It usually involves the following
++        operations.
    
++        
    ++    tar zxvf ncurses<version>.tar.gz  # unzip and untar the archive
+     cd ncurses<version>               # cd to the directory
+     ./configure                             # configure the build according to your 
+                                             # environment
+     make                                    # make it
+     su root                                 # become root
+-    make install                            # install it
    Using the RPM 
    NCURSES RPM can be found and downloaded from http://rpmfind.net . The RPM can be installed with the following 
+-command after becoming root.
        rpm -i <downloaded rpm>
    1.4. Purpose/Scope of the document
    This document is intended to be a "All in One" guide for programming with
+-ncurses and its sister libraries. We graduate from a simple "Hello World"
+-program to more complex form manipulation. No prior experience in ncurses is
+-assumed. The writing is informal, but a lot of detail is provided for
+-each of the examples.
    1.5. About the Programs
    All the programs in the document are available in zipped form
+-here. Unzip and untar it. The directory structure looks like this.
    ncurses
++    make install                            # install it
++
    
++
++        
    Using the
++        RPM
    
++
++        
    NCURSES RPM can be found and downloaded from http://rpmfind.net .
++        The RPM can be installed with the following command after
++        becoming root.
    
++        
    ++    rpm -i <downloaded rpm>
++
    
++      
    
++
++      
    
++        
    
++
++        
    1.4.
++        Purpose/Scope of the document
    
++
++        
    This document is intended to be a "All in One" guide for
++        programming with ncurses and its sister libraries. We
++        graduate from a simple "Hello World" program to more
++        complex form manipulation. No prior experience in ncurses
++        is assumed. The writing is informal, but a lot of detail is
++        provided for each of the examples.
    
++      
    
++
++      
    
++        
    
++
++        
    1.5. About the Programs
    
++
++        
    All the programs in the document are available in zipped
++        form here. Unzip and untar it. The directory
++        structure looks like this.
    
++        
    ++ncurses
+    |
+    |----> JustForFun     -- just for fun programs
+    |----> basics         -- basic programs
+@@ -1290,12 +852,13 @@
+    |                            by Anuradha Ratnaweera)
+    |----> Makefile       -- the top level Makefile
+    |----> README         -- the top level README file. contains instructions
+-   |----> COPYING        -- copyright notice
    The individual directories contain the following files.
    Description of files in each directory
++   |----> COPYING        -- copyright notice
++
    
++
++        
    The individual directories contain the following
++        files.
    
++        
    ++Description of files in each directory
+ --------------------------------------
+ JustForFun
+     |
+@@ -1354,96 +917,86 @@
+     |----> panel_simple.c    -- A simple panel example
+ 
+   perl
+-    |----> 01-10.pl          -- Perl equivalents of first ten example programs
    There is a top level Makefile included in the main directory. It builds all the 
+-files and puts the ready-to-use exes in demo/exe directory. You can also 
+-do selective make by going into the corresponding directory. Each directory 
+-contains a README file explaining the purpose of each c file in the directory.
    For every example, I have included path name for the file relative to the 
+-examples directory. 
     If you prefer browsing individual programs, point your browser to 
+-http://tldp.org/HOWTO/NCURSES-Programming-HOWTO/ncurses_programs/
    All the programs are released under the same license that is used by ncurses
+-(MIT-style). This gives you the ability to do pretty much anything other than
+-claiming them as yours. Feel free to use them in your programs as appropriate.
    1.6. Other Formats of the document
    This howto is also availabe in various other formats on the tldp.org site.
+-Here are the links to other formats of this document.
    1.6.2. Building from source
    If above links are broken or if you want to experiment with sgml read on.
+-
    
    Get both the source and the tar,gzipped programs, available at
++    |----> 01-10.pl          -- Perl equivalents of first ten example programs
++
    
++
++        
    There is a top level Makefile included in the main
++        directory. It builds all the files and puts the
++        ready-to-use exes in demo/exe directory. You can also do
++        selective make by going into the corresponding directory.
++        Each directory contains a README file explaining the
++        purpose of each c file in the directory.
    
++
++        
    For every example, I have included path name for the
++        file relative to the examples directory.
    
++
++        
    If you prefer browsing individual programs, point your
++        browser to http://tldp.org/HOWTO/NCURSES-Programming-HOWTO/ncurses_programs/
    
++
++        
    All the programs are released under the same license
++        that is used by ncurses (MIT-style). This gives you the
++        ability to do pretty much anything other than claiming them
++        as yours. Feel free to use them in your programs as
++        appropriate.
    
++      
    
++
++      
    
++        
    
++
++        
    1.6. Other Formats of the document
    
++
++        
    This howto is also availabe in various other formats on
++        the tldp.org site. Here are the links to other formats of
++        this document.
    
++
++        
    
++          
    
++
++          
    1.6.1. Readily available formats from
++          tldp.org
    
++
++          
++        
    
++
++        
    
++          
    
++
++          
    1.6.2. Building from source
    
++
++          
    If above links are broken or if you want to experiment
++          with sgml read on.
    
++          
    ++
    Get both the source and the tar,gzipped programs, available at
+         http://cvsview.tldp.org/index.cgi/LDP/howto/docbook/
+         NCURSES-HOWTO/NCURSES-Programming-HOWTO.sgml
+         http://cvsview.tldp.org/index.cgi/LDP/howto/docbook/
+@@ -1464,862 +1017,699 @@
+         NCURSES-ONE-BIG-FILE.html
+     for ps, you would use
+         htmldoc --size universal -t ps --firstpage p1 -f <output file name.ps>
+-        NCURSES-ONE-BIG-FILE.html
    See LDP Author guide for more details. If all else failes, mail me at 
+-ppadala@gmail.com
    1.7. Credits
    I thank Sharath and Emre Akbas for
+-helping me with few sections. The introduction was initially written by sharath.
+-I rewrote it with few excerpts taken from his initial work. Emre helped in
+-writing printw and scanw sections.
    Perl equivalents of the example programs are contributed by Anuradha Ratnaweera. 
    Then comes Ravi Parimi, my
+-dearest friend, who has been on this project before even one line was written.
+-He constantly bombarded me with suggestions and patiently reviewed the whole
+-text.  He also checked each program on Linux and Solaris. 
    1.8. Wish List
    This is the wish list, in the order of priority. If you have a wish or you want
+-to work on completing the wish, mail me. 
    • Add examples to last parts of forms section.
    • Prepare a Demo showing all the programs and allow the user to browse through
+-description of each program. Let the user compile and see the program in action.
+-A dialog based interface is preferred.
    • Add debug info. _tracef, _tracemouse stuff.
    • Accessing termcap, terminfo using functions provided by ncurses
+-package.
    • Working on two terminals simultaneously.
    • Add more stuff to miscellaneous section.
    1.9. Copyright
    Copyright © 2001 by Pradeep Padala. 
    Permission is hereby granted, free of charge, to any person obtaining a copy
+-of this software and associated documentation files (the "Software"), to deal
+-in the Software without restriction, including without limitation the rights
+-to use, copy, modify, merge, publish, distribute, distribute with
+-modifications, sublicense, and/or sell copies of the Software, and to permit
+-persons to whom the Software is furnished to do so, subject to the following
+-conditions:
    The above copyright notice and this permission notice shall be included in all
+-copies or substantial portions of the Software.
    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+-ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
    Except as contained in this notice, the name(s) of the above copyright holders
+-shall not be used in advertising or otherwise to promote the sale, use or
+-other dealings in this Software without prior written authorization. 
    2. Hello World !!!
    Welcome to the world of curses. Before we plunge into the library and look into
+-its various features, let's write a simple program and say
+-hello to the world. 
    2.1. Compiling With the NCURSES Library
    To use ncurses library functions, you have to include ncurses.h in your
+-programs. To link the
+-program with ncurses the flag -lncurses should be added.
        #include <ncurses.h>
++        NCURSES-ONE-BIG-FILE.html
++
    
++
++          
    See LDP Author guide for more details. If all else
++          failes, mail me at ppadala@gmail.com
    
++        
    
++      
    
++
++      
    
++        
    
++
++        
    1.7.
++        Credits
    
++
++        
    I thank Sharath and Emre Akbas for helping me with few
++        sections. The introduction was initially written by
++        sharath. I rewrote it with few excerpts taken from his
++        initial work. Emre helped in writing printw and scanw
++        sections.
    
++
++        
    Perl equivalents of the example programs are contributed
++        by Anuradha Ratnaweera.
    
++
++        
    Then comes Ravi Parimi, my dearest friend, who has
++        been on this project before even one line was written. He
++        constantly bombarded me with suggestions and patiently
++        reviewed the whole text. He also checked each program on
++        Linux and Solaris.
    
++      
    
++
++      
    
++        
    
++
++        
    1.8.
++        Wish List
    
++
++        
    This is the wish list, in the order of priority. If you
++        have a wish or you want to work on completing the wish,
++        mail me.
    
++
++        
      
++          
    • 
++            
      Add examples to last parts of forms section.
      
++          
      • 
++
++          
    • 
++            
      Prepare a Demo showing all the programs and allow
++            the user to browse through description of each program.
++            Let the user compile and see the program in action. A
++            dialog based interface is preferred.
      
++          
      • 
++
++          
    • 
++            
      Add debug info. _tracef, _tracemouse stuff.
      
++          
      • 
++
++          
    • 
++            
      Accessing termcap, terminfo using functions provided
++            by ncurses package.
      
++          
      • 
++
++          
    • 
++            
      Working on two terminals simultaneously.
      
++          
      • 
++
++          
    • 
++            
      Add more stuff to miscellaneous section.
      
++          
      • 
++        
    
++      
    
++
++      
    
++        
    
++
++        
    1.9.
++        Copyright
    
++
++        
    Copyright © 2001 by Pradeep Padala.
    
++
++        
    Permission is hereby granted, free of charge, to any
++        person obtaining a copy of this software and associated
++        documentation files (the "Software"), to deal in the
++        Software without restriction, including without limitation
++        the rights to use, copy, modify, merge, publish,
++        distribute, distribute with modifications, sublicense,
++        and/or sell copies of the Software, and to permit persons
++        to whom the Software is furnished to do so, subject to the
++        following conditions:
    
++
++        
    The above copyright notice and this permission notice
++        shall be included in all copies or substantial portions of
++        the Software.
    
++
++        
    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
++        ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
++        THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
++        PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE
++        COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
++        OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
++        SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
    
++
++        
    Except as contained in this notice, the name(s) of the
++        above copyright holders shall not be used in advertising or
++        otherwise to promote the sale, use or other dealings in
++        this Software without prior written authorization.
    
++      
    
++    
    
++
++    
    
++      
    
++
++      
    2.
++      Hello World !!!
    
++
++      
    Welcome to the world of curses. Before we plunge into the
++      library and look into its various features, let's write a
++      simple program and say hello to the world.
    
++
++      
    
++        
    
++
++        
    2.1. Compiling With the NCURSES
++        Library
    
++
++        
    To use ncurses library functions, you have to include
++        ncurses.h in your programs. To link the program with
++        ncurses the flag -lncurses should be added.
    
++        
    ++    #include <ncurses.h>
+     .
+     .
+     .
+ 
+-    compile and link: gcc <program file> -lncurses
    Example 1.  The Hello World !!! Program 
    #include <ncurses.h>
++    compile and link: gcc <program file> -lncurses
++
    
++
++        
    
++          
++
++          
    Example 1. The Hello World !!! Program
    
++          
    ++#include <ncurses.h>
+ 
+ int main()
+-{	
+-	initscr();			/* Start curses mode 		  */
+-	printw("Hello World !!!");	/* Print Hello World		  */
+-	refresh();			/* Print it on to the real screen */
+-	getch();			/* Wait for user input */
+-	endwin();			/* End curses mode		  */
+-
+-	return 0;
+-}
    2.2. Dissection
     
+-The above program prints "Hello World !!!" to the screen and exits. This 
+-program shows how to initialize curses and do screen manipulation and 
+-end curses mode. Let's dissect it line by line. 
    2.2.1. About initscr()
    The function initscr() initializes the terminal in curses mode.  In some 
+-implementations, it clears the screen and presents a blank screen. To do any 
+-screen manipulation using curses package this has to be called first. This
+-function initializes the curses system and allocates memory for our present
+-window (called stdscr) and some other data-structures. Under extreme
+-cases this function might fail due to insufficient memory to allocate memory
+-for curses library's data structures. 
     
+-After this is done, we can do a variety of initializations to customize
+-our curses settings. These details will be explained later .
    2.2.2. The mysterious refresh()
    The next line printw prints the string "Hello World !!!" on to the screen. This
+-function is analogous to normal printf in all respects except that it prints
+-the data on a window called stdscr at the current (y,x) co-ordinates. Since our
+-present co-ordinates are at 0,0 the string is printed at the left hand corner
+-of the window.
    This brings us to that mysterious refresh(). Well, when we called printw 
+-the data is actually written to an imaginary window, which is not updated 
+-on the screen yet. The job of printw is to update a few flags
+-and data structures and write the data to a buffer corresponding to stdscr.
+-In order to show it on the screen, we need to call refresh() and tell the
+-curses system to dump the contents on the screen.
    The philosophy behind all this is to allow the programmer to do multiple updates
+-on the imaginary screen or windows and do a refresh once all his screen update
+-is done. refresh() checks the window and updates only the portion which has been
+-changed. This improves performance and offers greater flexibility too. But, it is
+-sometimes frustrating to beginners. A common mistake committed by beginners is
+-to forget to call refresh() after they did some update through printw() class of
+-functions. I still forget to add it sometimes :-) 
    2.2.3. About endwin()
    And finally don't forget to end the curses mode. Otherwise your terminal might
+-behave strangely after the program quits. endwin() frees the memory taken by 
+-curses sub-system and its data structures and puts the terminal in normal 
+-mode. This function must be called after you are done with the curses mode. 
    3. The Gory Details
    Now that we have seen how to write a simple curses program let's get into the
+-details. There are many functions that help customize what you see on screen and
+-many features which can be put to full use. 
    Here we go...
    4. Initialization
    We now know that to initialize curses system the function initscr() has to be
+-called.  There are functions which can be called after this initialization to
+-customize our curses session. We may ask the curses system to set the terminal
+-in raw mode or initialize color or initialize the mouse etc.. Let's discuss some
+-of the functions that are normally called immediately after initscr();
    4.2. raw() and cbreak()
    Normally the terminal driver buffers the characters a user types until a new
+-line or carriage return is encountered. But most programs require that the
+-characters be available as soon as the user types them. The above two functions
+-are used to disable line buffering. The difference between these two functions
+-is in the way control characters like suspend (CTRL-Z), interrupt and quit
+-(CTRL-C) are passed to the program. In the raw() mode these characters are
+-directly passed to the program without generating a signal. In the
+-cbreak() mode these control characters are
+-interpreted as any other character by the terminal driver. I personally prefer
+-to use raw() as I can exercise greater control over what the user does.
    4.3. echo() and noecho()
     
+-These functions control the echoing of characters typed by the user to the
+-terminal. noecho() switches off echoing. The
+-reason you might want to do this is to gain more control over echoing or to
+-suppress unnecessary echoing while taking input from the user through the
+-getch() etc. functions. Most of the interactive programs call
+-noecho() at initialization and do the echoing
+-of characters in a controlled manner. It gives the programmer the flexibility
+-of echoing characters at any place in the window without updating current (y,x)
+-co-ordinates. 
    4.4. keypad()
    This is my favorite initialization function. It enables the reading of function
+-keys like F1, F2, arrow keys etc. Almost every interactive program enables this,
+-as arrow keys are a major part of any User Interface. Do
+-keypad(stdscr, TRUE)  to enable this feature
+-for the regular screen (stdscr). You will learn more about key management in
+-later sections of this document.
    4.5. halfdelay()
    This function, though not used very often, is a useful one at times.
+-halfdelay()is called to enable the half-delay mode, which is similar to the
+-cbreak() mode in that characters typed are immediately available to program.
+-However, it waits for 'X' tenths of a second for input and then returns ERR, if
+-no input is available. 'X' is the timeout value passed to the function
+-halfdelay(). This function is useful when you want to ask the user for input,
+-and if he doesn't respond with in certain time, we can do some thing else. One
+-possible example is a timeout at the password prompt. 
    4.6. Miscellaneous Initialization functions
    There are few more functions which are called at initialization to
+-customize curses behavior. They are not used as extensively as those mentioned 
+-above. Some of them are explained where appropriate.
    4.7. An Example
    Let's write a program which will clarify the usage of these functions.
    Example 2.  Initialization Function Usage example 
    #include <ncurses.h>
++{       
++        initscr();                      /* Start curses mode              */
++        printw("Hello World !!!");      /* Print Hello World              */
++        refresh();                      /* Print it on to the real screen */
++        getch();                        /* Wait for user input */
++        endwin();                       /* End curses mode                */
++
++        return 0;
++}
++
    
++        
    
++      
    
++
++      
    
++        
    
++
++        
    2.2.
++        Dissection
    
++
++        
    The above program prints "Hello World !!!" to the screen
++        and exits. This program shows how to initialize curses and
++        do screen manipulation and end curses mode. Let's dissect
++        it line by line.
    
++
++        
    
++          
    
++
++          
    2.2.1. About initscr()
    
++
++          
    The function initscr() initializes the terminal in
++          curses mode. In some implementations, it clears the
++          screen and presents a blank screen. To do any screen
++          manipulation using curses package this has to be called
++          first. This function initializes the curses system and
++          allocates memory for our present window (called
++          stdscr) and some other
++          data-structures. Under extreme cases this function might
++          fail due to insufficient memory to allocate memory for
++          curses library's data structures.
    
++
++          
    After this is done, we can do a variety of
++          initializations to customize our curses settings. These
++          details will be explained later .
    
++        
    
++
++        
    
++          
    
++
++          
    2.2.2. The mysterious refresh()
    
++
++          
    The next line printw prints the string "Hello World
++          !!!" on to the screen. This function is analogous to
++          normal printf in all respects except that it prints the
++          data on a window called stdscr at the current (y,x)
++          co-ordinates. Since our present co-ordinates are at 0,0
++          the string is printed at the left hand corner of the
++          window.
    
++
++          
    This brings us to that mysterious refresh(). Well,
++          when we called printw the data is actually written to an
++          imaginary window, which is not updated on the screen yet.
++          The job of printw is to update a few flags and data
++          structures and write the data to a buffer corresponding
++          to stdscr. In order to show it on the screen, we need to
++          call refresh() and tell the curses system to dump the
++          contents on the screen.
    
++
++          
    The philosophy behind all this is to allow the
++          programmer to do multiple updates on the imaginary screen
++          or windows and do a refresh once all his screen update is
++          done. refresh() checks the window and updates only the
++          portion which has been changed. This improves performance
++          and offers greater flexibility too. But, it is sometimes
++          frustrating to beginners. A common mistake committed by
++          beginners is to forget to call refresh() after they did
++          some update through printw() class of functions. I still
++          forget to add it sometimes :-)
    
++        
    
++
++        
    
++          
    
++
++          
    2.2.3. About endwin()
    
++
++          
    And finally don't forget to end the curses mode.
++          Otherwise your terminal might behave strangely after the
++          program quits. endwin() frees the memory taken by curses
++          sub-system and its data structures and puts the terminal
++          in normal mode. This function must be called after you
++          are done with the curses mode.
    
++        
    
++      
    
++    
    
++
++    
    
++      
    
++
++      
    3. The Gory
++      Details
    
++
++      
    Now that we have seen how to write a simple curses program
++      let's get into the details. There are many functions that
++      help customize what you see on screen and many features which
++      can be put to full use.
    
++
++      
    Here we go...
    
++    
    
++
++    
    
++      
    
++
++      
    4.
++      Initialization
    
++
++      
    We now know that to initialize curses system the function
++      initscr() has to be called. There are functions which can be
++      called after this initialization to customize our curses
++      session. We may ask the curses system to set the terminal in
++      raw mode or initialize color or initialize the mouse etc..
++      Let's discuss some of the functions that are normally called
++      immediately after initscr();
    
++
++      
    
++        
    
++
++        
    4.1.
++        Initialization functions
    
++      
    
++
++      
    
++        
    
++
++        
    4.2.
++        raw() and cbreak()
    
++
++        
    Normally the terminal driver buffers the characters a
++        user types until a new line or carriage return is
++        encountered. But most programs require that the characters
++        be available as soon as the user types them. The above two
++        functions are used to disable line buffering. The
++        difference between these two functions is in the way
++        control characters like suspend (CTRL-Z), interrupt and
++        quit (CTRL-C) are passed to the program. In the raw() mode
++        these characters are directly passed to the program without
++        generating a signal. In the cbreak() mode these control characters are
++        interpreted as any other character by the terminal driver.
++        I personally prefer to use raw() as I can exercise greater
++        control over what the user does.
    
++      
    
++
++      
    
++        
    
++
++        
    4.3.
++        echo() and noecho()
    
++
++        
    These functions control the echoing of characters typed
++        by the user to the terminal. noecho() switches off echoing. The reason
++        you might want to do this is to gain more control over
++        echoing or to suppress unnecessary echoing while taking
++        input from the user through the getch() etc. functions.
++        Most of the interactive programs call noecho() at initialization and do the
++        echoing of characters in a controlled manner. It gives the
++        programmer the flexibility of echoing characters at any
++        place in the window without updating current (y,x)
++        co-ordinates.
    
++      
    
++
++      
    
++        
    
++
++        
    4.4.
++        keypad()
    
++
++        
    This is my favorite initialization function. It enables
++        the reading of function keys like F1, F2, arrow keys etc.
++        Almost every interactive program enables this, as arrow
++        keys are a major part of any User Interface. Do keypad(stdscr, TRUE) to enable this feature
++        for the regular screen (stdscr). You will learn more about
++        key management in later sections of this document.
    
++      
    
++
++      
    
++        
    
++
++        
    4.5.
++        halfdelay()
    
++
++        
    This function, though not used very often, is a useful
++        one at times. halfdelay()is called to enable the half-delay
++        mode, which is similar to the cbreak() mode in that
++        characters typed are immediately available to program.
++        However, it waits for 'X' tenths of a second for input and
++        then returns ERR, if no input is available. 'X' is the
++        timeout value passed to the function halfdelay(). This
++        function is useful when you want to ask the user for input,
++        and if he doesn't respond with in certain time, we can do
++        some thing else. One possible example is a timeout at the
++        password prompt.
    
++      
    
++
++      
    
++        
    
++
++        
    4.6.
++        Miscellaneous Initialization functions
    
++
++        
    There are few more functions which are called at
++        initialization to customize curses behavior. They are not
++        used as extensively as those mentioned above. Some of them
++        are explained where appropriate.
    
++      
    
++
++      
    
++        
    
++
++        
    4.7. An
++        Example
    
++
++        
    Let's write a program which will clarify the usage of
++        these functions.
    
++
++        
    
++          
++
++          
    Example 2. Initialization Function Usage
++          example
    
++          
    ++#include <ncurses.h>
+ 
+ int main()
+-{	int ch;
++{       int ch;
++
++        initscr();                      /* Start curses mode            */
++        raw();                          /* Line buffering disabled      */
++        keypad(stdscr, TRUE);           /* We get F1, F2 etc..          */
++        noecho();                       /* Don't echo() while we do getch */
++
++        printw("Type any character to see it in bold\n");
++        ch = getch();                   /* If raw() hadn't been called
++                                         * we have to press enter before it
++                                         * gets to the program          */
++        if(ch == KEY_F(1))              /* Without keypad enabled this will */
++                printw("F1 Key pressed");/*  not get to us either       */
++                                        /* Without noecho() some ugly escape
++                                         * charachters might have been printed
++                                         * on screen                    */
++        else
++        {       printw("The pressed key is ");
++                attron(A_BOLD);
++                printw("%c", ch);
++                attroff(A_BOLD);
++        }
++        refresh();                      /* Print it on to the real screen */
++        getch();                        /* Wait for user input */
++        endwin();                       /* End curses mode                */
++
++        return 0;
++}
++
    
++        
    
++
++        
    This program is self-explanatory. But I used functions
++        which aren't explained yet. The function getch() is used to get a character from
++        user. It is equivalent to normal getchar() except that we can disable the
++        line buffering to avoid <enter> after input. Look for
++        more about getch()and reading keys
++        in the key management section . The
++        functions attron and attroff are used to switch some
++        attributes on and off respectively. In the example I used
++        them to print the character in bold. These functions are
++        explained in detail later.
    
++      
    
++    
    
++
++    
    
++      
    
++
++      
    5.
++      A Word about Windows
    
++
++      
    Before we plunge into the myriad ncurses functions, let me
++      clear few things about windows. Windows are explained in
++      detail in following sections
    
++
++      
    A Window is an imaginary screen defined by curses system.
++      A window does not mean a bordered window which you usually
++      see on Win9X platforms. When curses is initialized, it
++      creates a default window named stdscr which represents your 80x25 (or the
++      size of window in which you are running) screen. If you are
++      doing simple tasks like printing few strings, reading input
++      etc., you can safely use this single window for all of your
++      purposes. You can also create windows and call functions
++      which explicitly work on the specified window.
    
++
++      
    For example, if you call
    
++      
    ++    printw("Hi There !!!");
++    refresh();
++
    
+ 
+-	initscr();			/* Start curses mode 		*/
+-	raw();				/* Line buffering disabled	*/
+-	keypad(stdscr, TRUE);		/* We get F1, F2 etc..		*/
+-	noecho();			/* Don't echo() while we do getch */
+-
+-    	printw("Type any character to see it in bold\n");
+-	ch = getch();			/* If raw() hadn't been called
+-					 * we have to press enter before it
+-					 * gets to the program 		*/
+-	if(ch == KEY_F(1))		/* Without keypad enabled this will */
+-		printw("F1 Key pressed");/*  not get to us either	*/
+-					/* Without noecho() some ugly escape
+-					 * charachters might have been printed
+-					 * on screen			*/
+-	else
+-	{	printw("The pressed key is ");
+-		attron(A_BOLD);
+-		printw("%c", ch);
+-		attroff(A_BOLD);
+-	}
+-	refresh();			/* Print it on to the real screen */
+-    	getch();			/* Wait for user input */
+-	endwin();			/* End curses mode		  */
+-
+-	return 0;
+-}
    This program is self-explanatory. But I used functions which aren't explained
+-yet. The function getch() is used to get a
+-character from user. It is equivalent to normal
+-getchar() except that we can disable the line
+-buffering to avoid <enter> after input. Look for more about
+-getch()and reading keys in the  key management section . The functions attron and attroff 
+-are used to switch some attributes on and off respectively.  In the example I 
+-used them to print the character in bold. These functions are explained in detail
+-later.
    5. A Word about Windows
     
+-Before we plunge into the myriad ncurses functions, let me clear few things
+-about windows. Windows are explained in detail in following  sections 
    A Window is an imaginary screen defined by curses system. A window does not mean
+-a bordered window which you usually see on Win9X platforms. When curses is
+-initialized, it creates a default window named
+-stdscr which represents your 80x25 (or the size
+-of window in which you are running) screen.  If you are doing simple tasks like
+-printing few strings, reading input etc., you can safely use this single window
+-for all of your purposes. You can also create windows and call functions which
+-explicitly work on the specified window.
    For example, if you call
        printw("Hi There !!!");
+-    refresh();
    It prints the string on stdscr at the present cursor position. Similarly the 
+-call to refresh(), works on stdscr only. 
    Say you have created windows then you have to 
+-call a function with a 'w' added to the usual function.
        wprintw(win, "Hi There !!!");
+-    wrefresh(win);
    As you will see in the rest of the document, naming of functions follow the
+-same convention. For each function there usually are three more functions.
        printw(string);        /* Print on stdscr at present cursor position */
++      
    It prints the string on stdscr at the present cursor
++      position. Similarly the call to refresh(), works on stdscr
++      only.
    
++
++      
    Say you have created windows then
++      you have to call a function with a 'w' added to the usual
++      function.
    
++      
    ++    wprintw(win, "Hi There !!!");
++    wrefresh(win);
++
    
++
++      
    As you will see in the rest of the document, naming of
++      functions follow the same convention. For each function there
++      usually are three more functions.
    
++      
    ++    printw(string);        /* Print on stdscr at present cursor position */
+     mvprintw(y, x, string);/* Move to (y, x) then print string     */
+     wprintw(win, string);  /* Print on window win at present cursor position */
+                            /* in the window */
+     mvwprintw(win, y, x, string);   /* Move to (y, x) relative to window */
+-                                    /* co-ordinates and then print         */
    Usually the w-less functions are macros which expand to corresponding w-function
+-with stdscr as the window parameter.
    6. Output functions
    I guess you can't wait any more to see some action. Back to our odyssey of
+-curses functions. Now that curses is initialized, let's interact with
+-world.
    There are three classes of functions which you can use to do output on screen.
+-
    1. addch() class: Print single character with attributes 
    2. printw() class: Print formatted output similar to printf()
    3. addstr() class: Print strings
    These functions can be used interchangeably and it's a matter of style as to
+-which class is used. Let's see each one in detail.
    6.1. addch() class of functions
    These functions put a single character into the current cursor location and
+-advance the position of the cursor. You can give the character to be printed but
+-they usually are used to print a character with some attributes.  Attributes are
+-explained in detail in later  sections  of the
+-document. If a character is associated with an attribute(bold, reverse video
+-etc.), when curses prints the character, it is printed in that attribute.
    In order to combine a character with some attributes, you have two options:
    • By OR'ing a single character with the desired attribute macros. These attribute
+-macros could be found in the header file
+-ncurses.h. For example, you want to print a
+-character ch(of type char) bold and underlined, you would call addch() as below.
+-
          addch(ch | A_BOLD | A_UNDERLINE);
    • By using functions like attrset(),attron(),attroff(). These functions are explained in the Attributes section. Briefly, they manipulate the current attributes of 
+-the given window. Once set, the character printed in the window are associated 
+-with the attributes until it is turned off.
    Additionally, curses provides some special
+-characters for character-based graphics. You can draw tables, horizontal or
+-vertical lines, etc. You can find all avaliable characters in the header file
+-ncurses.h.  Try looking for macros beginning
+-with ACS_ in this file. 
    6.2. mvaddch(), waddch() and mvwaddch()
    mvaddch() is used to move the cursor to a 
+-given point, and then print. Thus, the calls:
+-
        move(row,col);    /* moves the cursor to rowth row and colth column */
+-    addch(ch);
    
+-can be replaced by
+-
        mvaddch(row,col,ch);
    waddch() is similar to
+-addch(), except that it adds a character into
+-the given window. (Note that addch() adds a
+-character into the window stdscr.)
    In a similar fashion mvwaddch() function is
+-used to add a character into the given window at the given coordinates.
    Now, we are familiar with the basic output function
+-addch(). But, if we want to print a string, it
+-would be very annoying to print it character by character. Fortunately,
+-ncurses provides printf-like or
+-puts-like functions.
    6.3. printw() class of functions
    These functions are similar to printf() with
+-the added capability of printing at any position on the screen. 
    6.3.1. printw() and mvprintw
    These two functions work much like printf().
+-mvprintw() can be used to move the cursor to a
+-position and then print. If you want to move the cursor first and then print
+-using printw() function, use
+-move()  first and then use
+-printw() though I see no point why one should
+-avoid using mvprintw(), you have the
+-flexibility to manipulate. 
    6.3.2. wprintw() and mvwprintw
    These two functions are similar to above two except that they print in the 
+-corresponding window given as argument. 
    6.3.3. vwprintw()
    This function is similar to vprintf(). This can
+-be used when variable number of arguments are to be printed.
    6.3.4. A Simple printw example
    Example 3.  A Simple printw example 
    #include <ncurses.h>			/* ncurses.h includes stdio.h */  
+-#include <string.h> 
++                                    /* co-ordinates and then print         */
++
    
++
++      
    Usually the w-less functions are macros which expand to
++      corresponding w-function with stdscr as the window
++      parameter.
    
++    
    
++
++    
    
++      
    
++
++      
    6. Output
++      functions
    
++
++      
    I guess you can't wait any more to see some action. Back
++      to our odyssey of curses functions. Now that curses is
++      initialized, let's interact with world.
    
++
++      
    There are three classes of functions which you can use to
++      do output on screen.
    
++
++      
      
++        
    1. 
++          
      addch() class: Print single character with
++          attributes
      
++        
      2. 
++
++        
    2. 
++          
      printw() class: Print formatted output similar to
++          printf()
      
++        
      3. 
++
++        
    3. 
++          
      addstr() class: Print strings
      
++        
      4. 
++      
    
++
++      
    These functions can be used interchangeably and it's a
++      matter of style as to which class is used. Let's see each one
++      in detail.
    
++
++      
    
++        
    
++
++        
    6.1.
++        addch() class of functions
    
++
++        
    These functions put a single character into the current
++        cursor location and advance the position of the cursor. You
++        can give the character to be printed but they usually are
++        used to print a character with some attributes. Attributes
++        are explained in detail in later sections of the document. If a character is
++        associated with an attribute(bold, reverse video etc.),
++        when curses prints the character, it is printed in that
++        attribute.
    
++
++        
    In order to combine a character with some attributes,
++        you have two options:
    
++
++        
      
++          
    • 
++            
      By OR'ing a single character with the desired
++            attribute macros. These attribute macros could be found
++            in the header file ncurses.h.
++            For example, you want to print a character ch(of type
++            char) bold and underlined, you would call addch() as
++            below.
      
++            
      ++    addch(ch | A_BOLD | A_UNDERLINE);
++
      
++          
      • 
++
++          
    • 
++            
      By using functions like attrset(),attron(),attroff(). These
++            functions are explained in the Attributes section. Briefly, they
++            manipulate the current attributes of the given window.
++            Once set, the character printed in the window are
++            associated with the attributes until it is turned
++            off.
      
++          
      • 
++        
    
++
++        
    Additionally, curses provides
++        some special characters for character-based graphics. You
++        can draw tables, horizontal or vertical lines, etc. You can
++        find all avaliable characters in the header file ncurses.h. Try looking for macros beginning
++        with ACS_ in this file.
    
++      
    
++
++      
    
++        
    
++
++        
    6.2.
++        mvaddch(), waddch() and mvwaddch()
    
++
++        
    mvaddch() is used to move the
++        cursor to a given point, and then print. Thus, the
++        calls:
    
++        
    ++    move(row,col);    /* moves the cursor to rowth row and colth column */
++    addch(ch);
++
    can be replaced by
++        
    ++    mvaddch(row,col,ch);
++
    
++
++        
    waddch() is similar to
++        addch(), except that it adds a
++        character into the given window. (Note that addch() adds a character into the window
++        stdscr.)
    
++
++        
    In a similar fashion mvwaddch()
++        function is used to add a character into the given window
++        at the given coordinates.
    
++
++        
    Now, we are familiar with the basic output function
++        addch(). But, if we want to print
++        a string, it would be very annoying to print it character
++        by character. Fortunately, ncurses
++        provides printf-like or
++        puts-like
++        functions.
    
++      
    
++
++      
    
++        
    
++
++        
    6.3. printw() class of functions
    
++
++        
    These functions are similar to printf() with the added capability of
++        printing at any position on the screen.
    
++
++        
    
++          
    
++
++          
    6.3.1. printw() and mvprintw
    
++
++          
    These two functions work much like printf(). mvprintw() can be used to move the cursor
++          to a position and then print. If you want to move the
++          cursor first and then print using printw() function, use move() first and then use printw() though I see no point why one
++          should avoid using mvprintw(),
++          you have the flexibility to manipulate.
    
++        
    
++
++        
    
++          
    
++
++          
    6.3.2. wprintw() and
++          mvwprintw
    
++
++          
    These two functions are similar to above two except
++          that they print in the corresponding window given as
++          argument.
    
++        
    
++
++        
    
++          
    
++
++          
    6.3.3.
++          vwprintw()
    
++
++          
    This function is similar to vprintf(). This can be used when variable
++          number of arguments are to be printed.
    
++        
    
++
++        
    
++          
    
++
++          
    6.3.4. A Simple printw example
    
++
++          
    
++            
++
++            
    Example 3. A Simple printw example
    
++            
    ++#include <ncurses.h>                   /* ncurses.h includes stdio.h */  
++#include <string.h> 
+  
+ int main()
+ {
+- char mesg[]="Just a string";		/* message to be appeared on the screen */
+- int row,col;				/* to store the number of rows and *
+-					 * the number of colums of the screen */
+- initscr();				/* start the curses mode */
+- getmaxyx(stdscr,row,col);		/* get the number of rows and columns */
++ char mesg[]="Just a string";           /* message to be appeared on the screen */
++ int row,col;                           /* to store the number of rows and *
++                                         * the number of colums of the screen */
++ initscr();                             /* start the curses mode */
++ getmaxyx(stdscr,row,col);              /* get the number of rows and columns */
+  mvprintw(row/2,(col-strlen(mesg))/2,"%s",mesg);
+-                                	/* print the message at the center of the screen */
++                                        /* print the message at the center of the screen */
+  mvprintw(row-2,0,"This screen has %d rows and %d columns\n",row,col);
+  printw("Try resizing your window(if possible) and then run this program again");
+  refresh();
+@@ -2327,302 +1717,231 @@
+  endwin();
+ 
+  return 0;
+-}
    Above program demonstrates how easy it is to use printw. You just feed the coordinates and the message to be appeared
+-on the screen, then it does what you want.
    The above program introduces us to a new function
+-getmaxyx(), a macro defined in
+-ncurses.h. It gives the number of columns and
+-the number of rows in a given window.
+-getmaxyx() does this by updating the variables
+-given to it. Since getmaxyx() is not a function
+-we don't pass pointers to it, we just give two integer variables. 
    6.4. addstr() class of functions
    addstr() is used to put a character string into
+-a given window. This function is similar to calling
+-addch() once for each character in a given
+-string. This is true for all output functions. There are other functions from
+-this family such as mvaddstr(),mvwaddstr() and
+-waddstr(), which obey the naming convention of
+-curses.(e.g. mvaddstr() is similar to the respective calls move() and then
+-addstr().) Another function of this family is addnstr(), which takes an integer
+-parameter(say n) additionally. This function puts at most n characters into the
+-screen. If n is negative, then the entire string will be added. 
    6.5. A word of caution
    All these functions take y co-ordinate first and then x in their arguments.
+-A common mistake by beginners is to pass x,y in that order. If you are
+-doing too many manipulations of (y,x) co-ordinates, think of dividing the
+-screen into windows and manipulate each one separately. Windows are explained
+-in the  windows  section.
    7. Input functions
    Well, printing without taking input, is boring. Let's see functions which
+-allow us to get input from user. These functions also can be divided into
+-three categories.
    1. getch() class: Get a character
    2. scanw() class: Get formatted input
    3. getstr() class: Get strings
    7.1. getch() class of functions
    These functions read a single character from the terminal. But there are several
+-subtle facts to consider. For example if you don't use the function cbreak(),
+-curses will not read your input characters contiguously but will begin read them
+-only after a new line or an EOF is encountered. In order to avoid this, the
+-cbreak() function must used so that characters are immediately available to your
+-program. Another widely used function is noecho(). As the name suggests, when
+-this function is set (used), the characters that are keyed in by the user will
+-not show up on the screen. The two functions cbreak() and noecho() are typical
+-examples of key management.  Functions of this genre are explained in the
+-key management section .
    7.2. scanw() class of functions
    These functions are similar to scanf() with the
+-added capability of getting the input from any location on the screen.
    7.2.1. scanw() and mvscanw
    The usage of these functions is similar to that of
+-sscanf(), where the line to be scanned is
+-provided by wgetstr() function. That is, these
+-functions call to wgetstr() function(explained
+-below) and uses the resulting line for a scan. 
    7.2.2. wscanw() and mvwscanw()
    These are similar to above two functions except that they read from a window,
+-which is supplied as one of the arguments to these functions. 
    7.2.3. vwscanw()
    This function is similar to vscanf(). This can
+-be used when a variable number of arguments are to be scanned.
    7.3. getstr() class of functions
    These functions are used to get strings from the terminal. In essence, this
+-function performs the same task as would be achieved by a series of calls to
+-getch() until a newline, carriage return, or
+-end-of-file is received. The resulting string of characters are pointed to by
+-str, which is a character pointer provided by
+-the user.
    7.4. Some examples
    Example 4.  A Simple scanw example 
    #include <ncurses.h>			/* ncurses.h includes stdio.h */  
+-#include <string.h> 
++}
++
    
++          
    
++
++          
    Above program demonstrates how easy it is to use
++          printw. You just feed the
++          coordinates and the message to be appeared on the screen,
++          then it does what you want.
    
++
++          
    The above program introduces us to a new function
++          getmaxyx(), a macro defined in
++          ncurses.h. It gives the number
++          of columns and the number of rows in a given window.
++          getmaxyx() does this by updating
++          the variables given to it. Since getmaxyx() is not a function we don't pass
++          pointers to it, we just give two integer variables.
    
++        
    
++      
    
++
++      
    
++        
    
++
++        
    6.4. addstr() class of functions
    
++
++        
    addstr() is used to put a
++        character string into a given window. This function is
++        similar to calling addch() once
++        for each character in a given string. This is true for all
++        output functions. There are other functions from this
++        family such as mvaddstr(),mvwaddstr() and waddstr(), which obey the naming convention
++        of curses.(e.g. mvaddstr() is similar to the respective
++        calls move() and then addstr().) Another function of this
++        family is addnstr(), which takes an integer parameter(say
++        n) additionally. This function puts at most n characters
++        into the screen. If n is negative, then the entire string
++        will be added.
    
++      
    
++
++      
    
++        
    
++
++        
    6.5. A
++        word of caution
    
++
++        
    All these functions take y co-ordinate first and then x
++        in their arguments. A common mistake by beginners is to
++        pass x,y in that order. If you are doing too many
++        manipulations of (y,x) co-ordinates, think of dividing the
++        screen into windows and manipulate each one separately.
++        Windows are explained in the windows
++        section.
    
++      
    
++    
    
++
++    
    
++      
    
++
++      
    7. Input
++      functions
    
++
++      
    Well, printing without taking input, is boring. Let's see
++      functions which allow us to get input from user. These
++      functions also can be divided into three categories.
    
++
++      
      
++        
    1. 
++          
      getch() class: Get a character
      
++        
      2. 
++
++        
    2. 
++          
      scanw() class: Get formatted input
      
++        
      3. 
++
++        
    3. 
++          
      getstr() class: Get strings
      
++        
      4. 
++      
    
++
++      
    
++        
    
++
++        
    7.1.
++        getch() class of functions
    
++
++        
    These functions read a single character from the
++        terminal. But there are several subtle facts to consider.
++        For example if you don't use the function cbreak(), curses
++        will not read your input characters contiguously but will
++        begin read them only after a new line or an EOF is
++        encountered. In order to avoid this, the cbreak() function
++        must used so that characters are immediately available to
++        your program. Another widely used function is noecho(). As
++        the name suggests, when this function is set (used), the
++        characters that are keyed in by the user will not show up
++        on the screen. The two functions cbreak() and noecho() are
++        typical examples of key management. Functions of this genre
++        are explained in the key management
++        section .
    
++      
    
++
++      
    
++        
    
++
++        
    7.2.
++        scanw() class of functions
    
++
++        
    These functions are similar to scanf() with the added capability of getting
++        the input from any location on the screen.
    
++
++        
    
++          
    
++
++          
    7.2.1. scanw() and mvscanw
    
++
++          
    The usage of these functions is similar to that of
++          sscanf(), where the line to be
++          scanned is provided by wgetstr()
++          function. That is, these functions call to wgetstr() function(explained below) and
++          uses the resulting line for a scan.
    
++        
    
++
++        
    
++          
    
++
++          
    7.2.2. wscanw() and mvwscanw()
    
++
++          
    These are similar to above two functions except that
++          they read from a window, which is supplied as one of the
++          arguments to these functions.
    
++        
    
++
++        
    
++          
    
++
++          
    7.2.3.
++          vwscanw()
    
++
++          
    This function is similar to vscanf(). This can be used when a variable
++          number of arguments are to be scanned.
    
++        
    
++      
    
++
++      
    
++        
    
++
++        
    7.3. getstr() class of functions
    
++
++        
    These functions are used to get strings from the
++        terminal. In essence, this function performs the same task
++        as would be achieved by a series of calls to getch() until a newline, carriage return, or
++        end-of-file is received. The resulting string of characters
++        are pointed to by str, which is a
++        character pointer provided by the user.
    
++      
    
++
++      
    
++        
    
++
++        
    7.4.
++        Some examples
    
++
++        
    
++          
++
++          
    Example 4. A Simple scanw example
    
++          
    ++#include <ncurses.h>                   /* ncurses.h includes stdio.h */  
++#include <string.h> 
+  
+ int main()
+ {
+- char mesg[]="Enter a string: ";		/* message to be appeared on the screen */
++ char mesg[]="Enter a string: ";                /* message to be appeared on the screen */
+  char str[80];
+- int row,col;				/* to store the number of rows and *
+-					 * the number of colums of the screen */
+- initscr();				/* start the curses mode */
+- getmaxyx(stdscr,row,col);		/* get the number of rows and columns */
++ int row,col;                           /* to store the number of rows and *
++                                         * the number of colums of the screen */
++ initscr();                             /* start the curses mode */
++ getmaxyx(stdscr,row,col);              /* get the number of rows and columns */
+  mvprintw(row/2,(col-strlen(mesg))/2,"%s",mesg);
+-                     		/* print the message at the center of the screen */
++                                /* print the message at the center of the screen */
+  getstr(str);
+  mvprintw(LINES - 2, 0, "You Entered: %s", str);
+  getch();
+  endwin();
+ 
+  return 0;
+-}
    8. Attributes
    We have seen an example of how attributes can be used to print characters with
+-some special effects. Attributes, when set prudently, can present information in
+-an easy, understandable manner. The following program takes a C file as input
+-and prints the file with comments in bold. Scan through the code. 
    Example 5.  A Simple Attributes example 
    /* pager functionality by Joseph Spainhour" <spainhou@bellsouth.net> */
+-#include <ncurses.h>
+-#include <stdlib.h>
++}
++
    
++        
    
++      
    
++    
    
++
++    
    
++      
    
++
++      
    8.
++      Attributes
    
++
++      
    We have seen an example of how attributes can be used to
++      print characters with some special effects. Attributes, when
++      set prudently, can present information in an easy,
++      understandable manner. The following program takes a C file
++      as input and prints the file with comments in bold. Scan
++      through the code.
    
++
++      
    
++        
++
++        
    Example 5. A Simple Attributes example
    
++        
    ++/* pager functionality by Joseph Spainhour" <spainhou@bellsouth.net> */
++#include <ncurses.h>
++#include <stdlib.h>
+ 
+ int main(int argc, char *argv[])
+ { 
+@@ -2633,7 +1952,7 @@
+ 
+   if(argc != 2)
+   {
+-    printf("Usage: %s <a c file name>\n", argv[0]);
++    printf("Usage: %s <a c file name>\n", argv[0]);
+     exit(1);
+   }
+   fp = fopen(argv[1], "r");
+@@ -2642,101 +1961,81 @@
+     perror("Cannot open input file");
+     exit(1);
+   }
+-  initscr();				/* Start curses mode */
+-  getmaxyx(stdscr, row, col);		/* find the boundaries of the screeen */
+-  while((ch = fgetc(fp)) != EOF)	/* read the file till we reach the end */
++  initscr();                            /* Start curses mode */
++  getmaxyx(stdscr, row, col);           /* find the boundaries of the screeen */
++  while((ch = fgetc(fp)) != EOF)        /* read the file till we reach the end */
+   {
+-    getyx(stdscr, y, x);		/* get the current curser position */
+-    if(y == (row - 1))			/* are we are at the end of the screen */
++    getyx(stdscr, y, x);                /* get the current curser position */
++    if(y == (row - 1))                  /* are we are at the end of the screen */
+     {
+-      printw("<-Press Any Key->");	/* tell the user to press a key */
++      printw("<-Press Any Key->");      /* tell the user to press a key */
+       getch();
+-      clear();				/* clear the screen */
+-      move(0, 0);			/* start at the beginning of the screen */
++      clear();                          /* clear the screen */
++      move(0, 0);                       /* start at the beginning of the screen */
+     }
+-    if(prev == '/' && ch == '*')    	/* If it is / and * then only
+-                                     	 * switch bold on */    
++    if(prev == '/' && ch == '*')        /* If it is / and * then only
++                                         * switch bold on */    
+     {
+-      attron(A_BOLD);			/* cut bold on */
+-      getyx(stdscr, y, x);		/* get the current curser position */
+-      move(y, x - 1);			/* back up one space */
+-      printw("%c%c", '/', ch); 		/* The actual printing is done here */
++      attron(A_BOLD);                   /* cut bold on */
++      getyx(stdscr, y, x);              /* get the current curser position */
++      move(y, x - 1);                   /* back up one space */
++      printw("%c%c", '/', ch);          /* The actual printing is done here */
+     }
+     else
+       printw("%c", ch);
+     refresh();
+-    if(prev == '*' && ch == '/')
+-      attroff(A_BOLD);        		/* Switch it off once we got *
+-                                 	 * and then / */
++    if(prev == '*' && ch == '/')
++      attroff(A_BOLD);                  /* Switch it off once we got *
++                                         * and then / */
+     prev = ch;
+   }
+-  endwin();                       	/* End curses mode */
++  endwin();                             /* End curses mode */
+   fclose(fp);
+   return 0;
+-}
     
+-Don't worry about all those initialization and other crap. Concentrate on 
+-the while loop. It reads each character in the file and searches for the 
+-pattern /*. Once it spots the pattern, it switches the BOLD attribute on with 
+- attron() . When we get the pattern */ it is 
+-switched off by  attroff() .
     
+-The above program also introduces us to two useful functions
+-getyx()  and
+-move(). The first function gets the
+-co-ordinates of the present cursor into the variables y, x. Since getyx() is a
+-macro we don't have to pass pointers to variables. The function
+-move() moves the cursor to the co-ordinates
+-given to it. 
     
+-The above program is really a simple one which doesn't do much. On these lines
+-one could write a more useful program which reads a C file, parses it and prints
+-it in different colors. One could even extend it to other languages as well.
    8.1. The details
    Let's get into more details of attributes. The functions attron(), attroff(), attrset() , and their sister functions
+- attr_get() etc..  can be used to switch
+-attributes on/off , get attributes and produce a colorful display.
    The functions attron and attroff take a bit-mask of attributes and switch them 
+-on or off, respectively. The following video attributes, which are defined in 
+-<curses.h> can be passed to these functions. 
        
++}
++
    
++      
    
++
++      
    Don't worry about all those initialization and other crap.
++      Concentrate on the while loop. It reads each character in the
++      file and searches for the pattern /*. Once it spots the
++      pattern, it switches the BOLD attribute on with attron() . When we get the pattern */ it is
++      switched off by attroff() .
    
++
++      
    The above program also introduces us to two useful
++      functions getyx() and move(). The first function gets the
++      co-ordinates of the present cursor into the variables y, x.
++      Since getyx() is a macro we don't have to pass pointers to
++      variables. The function move() moves
++      the cursor to the co-ordinates given to it.
    
++
++      
    The above program is really a simple one which doesn't do
++      much. On these lines one could write a more useful program
++      which reads a C file, parses it and prints it in different
++      colors. One could even extend it to other languages as
++      well.
    
++
++      
    
++        
    
++
++        
    8.1. The details
    
++
++        
    Let's get into more details of attributes. The functions
++        attron(), attroff(), attrset() ,
++        and their sister functions attr_get() etc.. can be used to switch
++        attributes on/off , get attributes and produce a colorful
++        display.
    
++
++        
    The functions attron and attroff take a bit-mask of
++        attributes and switch them on or off, respectively. The
++        following video attributes, which are defined in
++        <curses.h> can be passed to these functions.
    
++        
    ++    
+     A_NORMAL        Normal display (no highlight)
+     A_STANDOUT      Best highlighting mode of the terminal.
+     A_UNDERLINE     Underlining
+@@ -2749,445 +2048,396 @@
+     A_ALTCHARSET    Alternate character set
+     A_CHARTEXT      Bit-mask to extract a character
+     COLOR_PAIR(n)   Color-pair number n 
+-    
     
+-The last one is the most colorful one :-) Colors are explained in the 
+-next sections.
    We can OR(|) any number of above attributes to get a combined effect. If you 
+-wanted reverse video with blinking characters you can use
        attron(A_REVERSE | A_BLINK);
    8.2. attron() vs attrset()
    Then what is the difference between attron() and attrset()? attrset sets the
+-attributes of window whereas attron just switches on the attribute given to it.
+-So attrset() fully overrides whatever attributes the window previously had and
+-sets it to the new attribute(s). Similarly attroff() just switches off the
+-attribute(s) given to it as an argument. This gives us the flexibility of
+-managing attributes easily.But if you use them carelessly you may loose track of
+-what attributes the window has and garble the display. This is especially true
+-while managing menus with colors and highlighting. So decide on a consistent
+-policy and stick to it. You can always use  standend() which is equivalent to  attrset(A_NORMAL) which turns off all attributes and brings you to normal mode.
    8.3. attr_get()
    
The function attr_get() gets the current attributes and color pair of the
+-window. Though we might not use this as often as the above functions, this is
+-useful in scanning areas of screen. Say we wanted to do some complex update on
+-screen and we are not sure what attribute each character is associated with.
+-Then this function can be used with either attrset or attron to produce the
+-desired effect.
    8.4. attr_ functions
    There are series of functions like attr_set(), attr_on etc.. These are similar
+-to above functions except that they take parameters of type
+-attr_t.
    8.5. wattr functions
    For each of the above functions we have a corresponding function with 'w' which
+-operates on a particular window. The above functions operate on stdscr. 
    8.6. chgat() functions
    The function chgat() is listed in the end of the man page curs_attr. It actually
+-is a useful one. This function can be used to set attributes for a group of
+-characters without moving. I mean it !!! without moving the cursor :-) It
+-changes the attributes of a given number of characters starting at the current
+-cursor location.
    We can give -1 as the character count to update till end of line. If you want to
+-change attributes of characters from current position to end of line, just use
+-this.
        chgat(-1, A_REVERSE, 0, NULL);
     
+-This function is useful when changing attributes for characters that are
+-already on the screen. Move to the character from which you want to change and
+-change the attribute. 
    Other functions wchgat(), mvchgat(), wchgat() behave similarly except that the w
+-functions operate on the particular window. The mv functions first move the
+-cursor then perform the work given to them. Actually chgat is a macro which is
+-replaced by a wchgat() with stdscr as the window. Most of the "w-less" functions
+-are macros.
    Example 6.  Chgat() Usage example 
    #include <ncurses.h>
++    
++
    
++
++        
    The last one is the most colorful one :-) Colors are
++        explained in the next
++        sections.
    
++
++        
    We can OR(|) any number of above attributes to get a
++        combined effect. If you wanted reverse video with blinking
++        characters you can use
    
++        
    ++    attron(A_REVERSE | A_BLINK);
++
    
++      
    
++
++      
    
++        
    
++
++        
    8.2. attron() vs attrset()
    
++
++        
    Then what is the difference between attron() and
++        attrset()? attrset sets the attributes of window whereas
++        attron just switches on the attribute given to it. So
++        attrset() fully overrides whatever attributes the window
++        previously had and sets it to the new attribute(s).
++        Similarly attroff() just switches off the attribute(s)
++        given to it as an argument. This gives us the flexibility
++        of managing attributes easily.But if you use them
++        carelessly you may loose track of what attributes the
++        window has and garble the display. This is especially true
++        while managing menus with colors and highlighting. So
++        decide on a consistent policy and stick to it. You can
++        always use standend() which is
++        equivalent to attrset(A_NORMAL)
++        which turns off all attributes and brings you to normal
++        mode.
    
++      
    
++
++      
    
++        
    
++
++        
    8.3.
++        attr_get()
    
++
++        
    The function attr_get() gets the current attributes and
++        color pair of the window. Though we might not use this as
++        often as the above functions, this is useful in scanning
++        areas of screen. Say we wanted to do some complex update on
++        screen and we are not sure what attribute each character is
++        associated with. Then this function can be used with either
++        attrset or attron to produce the desired effect.
    
++      
    
++
++      
    
++        
    
++
++        
    8.4.
++        attr_ functions
    
++
++        
    There are series of functions like attr_set(), attr_on
++        etc.. These are similar to above functions except that they
++        take parameters of type attr_t.
    
++      
    
++
++      
    
++        
    
++
++        
    8.5.
++        wattr functions
    
++
++        
    For each of the above functions we have a corresponding
++        function with 'w' which operates on a particular window.
++        The above functions operate on stdscr.
    
++      
    
++
++      
    
++        
    
++
++        
    8.6. chgat()
++        functions
    
++
++        
    The function chgat() is listed in the end of the man
++        page curs_attr. It actually is a useful one. This function
++        can be used to set attributes for a group of characters
++        without moving. I mean it !!! without moving the cursor :-)
++        It changes the attributes of a given number of characters
++        starting at the current cursor location.
    
++
++        
    We can give -1 as the character count to update till end
++        of line. If you want to change attributes of characters
++        from current position to end of line, just use this.
    
++        
    ++    chgat(-1, A_REVERSE, 0, NULL);
++
    
++
++        
    This function is useful when changing attributes for
++        characters that are already on the screen. Move to the
++        character from which you want to change and change the
++        attribute.
    
++
++        
    Other functions wchgat(), mvchgat(), wchgat() behave
++        similarly except that the w functions operate on the
++        particular window. The mv functions first move the cursor
++        then perform the work given to them. Actually chgat is a
++        macro which is replaced by a wchgat() with stdscr as the
++        window. Most of the "w-less" functions are macros.
    
++
++        
    
++          
++
++          
    Example 6. Chgat() Usage example
    
++          
    ++#include <ncurses.h>
+ 
+ int main(int argc, char *argv[])
+-{	initscr();			/* Start curses mode 		*/
+-	start_color();			/* Start color functionality	*/
+-	
+-	init_pair(1, COLOR_CYAN, COLOR_BLACK);
+-	printw("A Big string which i didn't care to type fully ");
+-	mvchgat(0, 0, -1, A_BLINK, 1, NULL);	
+-	/* 
+-	 * First two parameters specify the position at which to start 
+-	 * Third parameter number of characters to update. -1 means till 
+-	 * end of line
+-	 * Forth parameter is the normal attribute you wanted to give 
+-	 * to the charcter
+-	 * Fifth is the color index. It is the index given during init_pair()
+-	 * use 0 if you didn't want color
+-	 * Sixth one is always NULL 
+-	 */
+-	refresh();
+-    	getch();
+-	endwin();			/* End curses mode		  */
+-	return 0;
+-}
    This example also introduces us to the color world of curses. Colors will be 
+-explained in detail later. Use 0 for no color.
    9. Windows
    Windows form the most important concept in curses. You have seen the standard
+-window stdscr above where all the functions implicitly operated on this window.
+-Now to make design even a simplest GUI, you need to resort to windows.  The main
+-reason you may want to use windows is to manipulate parts of the screen
+-separately, for better efficiency, by updating only the windows that need to be
+-changed and for a better design. I would say the last reason is the most
+-important in going for windows. You should always strive for a better and
+-easy-to-manage design in your programs. If you are writing big, complex GUIs
+-this is of pivotal importance before you start doing anything.
    9.1. The basics
    A Window can be created by calling the function
+-newwin(). It doesn't create any thing on the
+-screen actually. It allocates memory for a structure to manipulate the window
+-and updates the structure with data regarding the window like it's size, beginy,
+-beginx etc.. Hence in curses, a window is just an abstraction of an imaginary
+-window, which can be manipulated independent of other parts of screen. The
+-function newwin() returns a pointer to structure WINDOW, which can be passed to
+-window related functions like wprintw() etc.. Finally the window can be
+-destroyed with delwin(). It will deallocate the memory associated with the
+-window structure.
    9.2. Let there be a Window !!!
    What fun is it, if a window is created and we can't see it. So the fun part
+-begins by displaying the window. The function
+-box() can be used to draw a border around the
+-window. Let's explore these functions in more detail in this example.
    Example 7. Window Border example 
    #include <ncurses.h>
++{       initscr();                      /* Start curses mode            */
++        start_color();                  /* Start color functionality    */
++        
++        init_pair(1, COLOR_CYAN, COLOR_BLACK);
++        printw("A Big string which i didn't care to type fully ");
++        mvchgat(0, 0, -1, A_BLINK, 1, NULL);    
++        /* 
++         * First two parameters specify the position at which to start 
++         * Third parameter number of characters to update. -1 means till 
++         * end of line
++         * Forth parameter is the normal attribute you wanted to give 
++         * to the charcter
++         * Fifth is the color index. It is the index given during init_pair()
++         * use 0 if you didn't want color
++         * Sixth one is always NULL 
++         */
++        refresh();
++        getch();
++        endwin();                       /* End curses mode                */
++        return 0;
++}
++
    
++        
    
++
++        
    This example also introduces us to the color world of
++        curses. Colors will be explained in detail later. Use 0 for
++        no color.
    
++      
    
++    
    
++
++    
    
++      
    
++
++      
    9.
++      Windows
    
++
++      
    Windows form the most important concept in curses. You
++      have seen the standard window stdscr above where all the
++      functions implicitly operated on this window. Now to make
++      design even a simplest GUI, you need to resort to windows.
++      The main reason you may want to use windows is to manipulate
++      parts of the screen separately, for better efficiency, by
++      updating only the windows that need to be changed and for a
++      better design. I would say the last reason is the most
++      important in going for windows. You should always strive for
++      a better and easy-to-manage design in your programs. If you
++      are writing big, complex GUIs this is of pivotal importance
++      before you start doing anything.
    
++
++      
    
++        
    
++
++        
    9.1. The basics
    
++
++        
    A Window can be created by calling the function
++        newwin(). It doesn't create any
++        thing on the screen actually. It allocates memory for a
++        structure to manipulate the window and updates the
++        structure with data regarding the window like it's size,
++        beginy, beginx etc.. Hence in curses, a window is just an
++        abstraction of an imaginary window, which can be
++        manipulated independent of other parts of screen. The
++        function newwin() returns a pointer to structure WINDOW,
++        which can be passed to window related functions like
++        wprintw() etc.. Finally the window can be destroyed with
++        delwin(). It will deallocate the memory associated with the
++        window structure.
    
++      
    
++
++      
    
++        
    
++
++        
    9.2. Let there be a Window !!!
    
++
++        
    What fun is it, if a window is created and we can't see
++        it. So the fun part begins by displaying the window. The
++        function box() can be used to draw
++        a border around the window. Let's explore these functions
++        in more detail in this example.
    
++
++        
    
++          
++
++          
    Example 7. Window Border example
    
++          
    ++#include <ncurses.h>
+ 
+ 
+ WINDOW *create_newwin(int height, int width, int starty, int startx);
+ void destroy_win(WINDOW *local_win);
+ 
+ int main(int argc, char *argv[])
+-{	WINDOW *my_win;
+-	int startx, starty, width, height;
+-	int ch;
+-
+-	initscr();			/* Start curses mode 		*/
+-	cbreak();			/* Line buffering disabled, Pass on
+-					 * everty thing to me 		*/
+-	keypad(stdscr, TRUE);		/* I need that nifty F1 	*/
+-
+-	height = 3;
+-	width = 10;
+-	starty = (LINES - height) / 2;	/* Calculating for a center placement */
+-	startx = (COLS - width) / 2;	/* of the window		*/
+-	printw("Press F1 to exit");
+-	refresh();
+-	my_win = create_newwin(height, width, starty, startx);
+-
+-	while((ch = getch()) != KEY_F(1))
+-	{	switch(ch)
+-		{	case KEY_LEFT:
+-				destroy_win(my_win);
+-				my_win = create_newwin(height, width, starty,--startx);
+-				break;
+-			case KEY_RIGHT:
+-				destroy_win(my_win);
+-				my_win = create_newwin(height, width, starty,++startx);
+-				break;
+-			case KEY_UP:
+-				destroy_win(my_win);
+-				my_win = create_newwin(height, width, --starty,startx);
+-				break;
+-			case KEY_DOWN:
+-				destroy_win(my_win);
+-				my_win = create_newwin(height, width, ++starty,startx);
+-				break;	
+-		}
+-	}
+-		
+-	endwin();			/* End curses mode		  */
+-	return 0;
++{       WINDOW *my_win;
++        int startx, starty, width, height;
++        int ch;
++
++        initscr();                      /* Start curses mode            */
++        cbreak();                       /* Line buffering disabled, Pass on
++                                         * everty thing to me           */
++        keypad(stdscr, TRUE);           /* I need that nifty F1         */
++
++        height = 3;
++        width = 10;
++        starty = (LINES - height) / 2;  /* Calculating for a center placement */
++        startx = (COLS - width) / 2;    /* of the window                */
++        printw("Press F1 to exit");
++        refresh();
++        my_win = create_newwin(height, width, starty, startx);
++
++        while((ch = getch()) != KEY_F(1))
++        {       switch(ch)
++                {       case KEY_LEFT:
++                                destroy_win(my_win);
++                                my_win = create_newwin(height, width, starty,--startx);
++                                break;
++                        case KEY_RIGHT:
++                                destroy_win(my_win);
++                                my_win = create_newwin(height, width, starty,++startx);
++                                break;
++                        case KEY_UP:
++                                destroy_win(my_win);
++                                my_win = create_newwin(height, width, --starty,startx);
++                                break;
++                        case KEY_DOWN:
++                                destroy_win(my_win);
++                                my_win = create_newwin(height, width, ++starty,startx);
++                                break;  
++                }
++        }
++                
++        endwin();                       /* End curses mode                */
++        return 0;
+ }
+ 
+ WINDOW *create_newwin(int height, int width, int starty, int startx)
+-{	WINDOW *local_win;
++{       WINDOW *local_win;
+ 
+-	local_win = newwin(height, width, starty, startx);
+-	box(local_win, 0 , 0);		/* 0, 0 gives default characters 
+-					 * for the vertical and horizontal
+-					 * lines			*/
+-	wrefresh(local_win);		/* Show that box 		*/
++        local_win = newwin(height, width, starty, startx);
++        box(local_win, 0 , 0);          /* 0, 0 gives default characters 
++                                         * for the vertical and horizontal
++                                         * lines                        */
++        wrefresh(local_win);            /* Show that box                */
+ 
+-	return local_win;
++        return local_win;
+ }
+ 
+ void destroy_win(WINDOW *local_win)
+-{	
+-	/* box(local_win, ' ', ' '); : This won't produce the desired
+-	 * result of erasing the window. It will leave it's four corners 
+-	 * and so an ugly remnant of window. 
+-	 */
+-	wborder(local_win, ' ', ' ', ' ',' ',' ',' ',' ',' ');
+-	/* The parameters taken are 
+-	 * 1. win: the window on which to operate
+-	 * 2. ls: character to be used for the left side of the window 
+-	 * 3. rs: character to be used for the right side of the window 
+-	 * 4. ts: character to be used for the top side of the window 
+-	 * 5. bs: character to be used for the bottom side of the window 
+-	 * 6. tl: character to be used for the top left corner of the window 
+-	 * 7. tr: character to be used for the top right corner of the window 
+-	 * 8. bl: character to be used for the bottom left corner of the window 
+-	 * 9. br: character to be used for the bottom right corner of the window
+-	 */
+-	wrefresh(local_win);
+-	delwin(local_win);
+-}
    9.3. Explanation
    Don't scream. I know it's a big example. But I have to explain some important
+-things here :-). This program creates a rectangular window that can be moved 
+-with left, right, up, down arrow keys. It repeatedly creates and destroys
+-windows as user press a key. Don't go beyond the screen limits. Checking for
+-those limits is left as an exercise for the reader. Let's dissect it by line by line.
    The create_newwin() function creates a window
+-with newwin()  and displays a border around it
+-with box. The function  destroy_win() first
+-erases the window from screen by painting a border with ' ' character and then
+-calling delwin() to deallocate memory related
+-to it. Depending on the key the user presses, starty or startx is changed and a
+-new window is created.
    In the destroy_win, as you can see, I used wborder instead of box. The reason is
+-written in the comments (You missed it. I know. Read the code :-)). wborder 
+-draws a border around the window with the characters given to it as the 4 corner
+-points and the 4 lines. To put it clearly, if you have called wborder as below:
+-
        wborder(win, '|', '|', '-', '-', '+', '+', '+', '+');
    it produces some thing like 
        +------------+
++{       
++        /* box(local_win, ' ', ' '); : This won't produce the desired
++         * result of erasing the window. It will leave it's four corners 
++         * and so an ugly remnant of window. 
++         */
++        wborder(local_win, ' ', ' ', ' ',' ',' ',' ',' ',' ');
++        /* The parameters taken are 
++         * 1. win: the window on which to operate
++         * 2. ls: character to be used for the left side of the window 
++         * 3. rs: character to be used for the right side of the window 
++         * 4. ts: character to be used for the top side of the window 
++         * 5. bs: character to be used for the bottom side of the window 
++         * 6. tl: character to be used for the top left corner of the window 
++         * 7. tr: character to be used for the top right corner of the window 
++         * 8. bl: character to be used for the bottom left corner of the window 
++         * 9. br: character to be used for the bottom right corner of the window
++         */
++        wrefresh(local_win);
++        delwin(local_win);
++}
++
    
++        
    
++      
    
++
++      
    
++        
    
++
++        
    9.3. Explanation
    
++
++        
    Don't scream. I know it's a big example. But I have to
++        explain some important things here :-). This program
++        creates a rectangular window that can be moved with left,
++        right, up, down arrow keys. It repeatedly creates and
++        destroys windows as user press a key. Don't go beyond the
++        screen limits. Checking for those limits is left as an
++        exercise for the reader. Let's dissect it by line by
++        line.
    
++
++        
    The create_newwin() function
++        creates a window with newwin() and
++        displays a border around it with box. The function
++        destroy_win() first erases the
++        window from screen by painting a border with ' ' character
++        and then calling delwin() to
++        deallocate memory related to it. Depending on the key the
++        user presses, starty or startx is changed and a new window
++        is created.
    
++
++        
    In the destroy_win, as you can see, I used wborder
++        instead of box. The reason is written in the comments (You
++        missed it. I know. Read the code :-)). wborder draws a
++        border around the window with the characters given to it as
++        the 4 corner points and the 4 lines. To put it clearly, if
++        you have called wborder as below:
    
++        
    ++    wborder(win, '|', '|', '-', '-', '+', '+', '+', '+');
++
    
++
++        
    it produces some thing like
    
++        
    ++    +------------+
+     |            |
+     |            |
+     |            |
+     |            |
+     |            |
+     |            |
+-    +------------+
    9.4. The other stuff in the example
    You can also see in the above examples, that I have used the variables COLS,
+-LINES which are initialized to the screen sizes after initscr(). They can be
+-useful in finding screen dimensions and finding the center co-ordinate of the
+-screen as above. The function getch() as usual
+-gets the key from keyboard and according to the key it does the corresponding
+-work. This type of switch- case is very common in any GUI based programs.
    9.5. Other Border functions
    Above program is grossly inefficient in that with each press of a key, a window
+-is destroyed and another is created. So let's write a more efficient program
+-which uses other border related functions.
    The following program uses mvhline() and
+-mvvline() to achieve similar effect. These two
+-functions are simple. They create a horizontal or vertical line of the specified
+-length at the specified position.
    Example 8.  More border functions
    #include <ncurses.h>
++    +------------+
++
    
++      
    
++
++      
    
++        
    
++
++        
    9.4.
++        The other stuff in the example
    
++
++        
    You can also see in the above examples, that I have used
++        the variables COLS, LINES which are initialized to the
++        screen sizes after initscr(). They can be useful in finding
++        screen dimensions and finding the center co-ordinate of the
++        screen as above. The function getch() as usual gets the key from keyboard
++        and according to the key it does the corresponding work.
++        This type of switch- case is very common in any GUI based
++        programs.
    
++      
    
++
++      
    
++        
    
++
++        
    9.5. Other Border functions
    
++
++        
    Above program is grossly inefficient in that with each
++        press of a key, a window is destroyed and another is
++        created. So let's write a more efficient program which uses
++        other border related functions.
    
++
++        
    The following program uses mvhline() and mvvline() to achieve similar effect. These
++        two functions are simple. They create a horizontal or
++        vertical line of the specified length at the specified
++        position.
    
++
++        
    
++          
++
++          
    Example 8. More border functions
    
++          
    ++#include <ncurses.h>
+ 
+ typedef struct _win_border_struct {
+-	chtype 	ls, rs, ts, bs, 
+-	 	tl, tr, bl, br;
++        chtype  ls, rs, ts, bs, 
++                tl, tr, bl, br;
+ }WIN_BORDER;
+ 
+ typedef struct _WIN_struct {
+ 
+-	int startx, starty;
+-	int height, width;
+-	WIN_BORDER border;
++        int startx, starty;
++        int height, width;
++        WIN_BORDER border;
+ }WIN;
+ 
+ void init_win_params(WIN *p_win);
+@@ -3195,380 +2445,327 @@
+ void create_box(WIN *win, bool flag);
+ 
+ int main(int argc, char *argv[])
+-{	WIN win;
+-	int ch;
++{       WIN win;
++        int ch;
+ 
+-	initscr();			/* Start curses mode 		*/
+-	start_color();			/* Start the color functionality */
+-	cbreak();			/* Line buffering disabled, Pass on
+-					 * everty thing to me 		*/
+-	keypad(stdscr, TRUE);		/* I need that nifty F1 	*/
+-	noecho();
+-	init_pair(1, COLOR_CYAN, COLOR_BLACK);
+-
+-	/* Initialize the window parameters */
+-	init_win_params(&win);
+-	print_win_params(&win);
+-
+-	attron(COLOR_PAIR(1));
+-	printw("Press F1 to exit");
+-	refresh();
+-	attroff(COLOR_PAIR(1));
+-	
+-	create_box(&win, TRUE);
+-	while((ch = getch()) != KEY_F(1))
+-	{	switch(ch)
+-		{	case KEY_LEFT:
+-				create_box(&win, FALSE);
+-				--win.startx;
+-				create_box(&win, TRUE);
+-				break;
+-			case KEY_RIGHT:
+-				create_box(&win, FALSE);
+-				++win.startx;
+-				create_box(&win, TRUE);
+-				break;
+-			case KEY_UP:
+-				create_box(&win, FALSE);
+-				--win.starty;
+-				create_box(&win, TRUE);
+-				break;
+-			case KEY_DOWN:
+-				create_box(&win, FALSE);
+-				++win.starty;
+-				create_box(&win, TRUE);
+-				break;	
+-		}
+-	}
+-	endwin();			/* End curses mode		  */
+-	return 0;
++        initscr();                      /* Start curses mode            */
++        start_color();                  /* Start the color functionality */
++        cbreak();                       /* Line buffering disabled, Pass on
++                                         * everty thing to me           */
++        keypad(stdscr, TRUE);           /* I need that nifty F1         */
++        noecho();
++        init_pair(1, COLOR_CYAN, COLOR_BLACK);
++
++        /* Initialize the window parameters */
++        init_win_params(&win);
++        print_win_params(&win);
++
++        attron(COLOR_PAIR(1));
++        printw("Press F1 to exit");
++        refresh();
++        attroff(COLOR_PAIR(1));
++        
++        create_box(&win, TRUE);
++        while((ch = getch()) != KEY_F(1))
++        {       switch(ch)
++                {       case KEY_LEFT:
++                                create_box(&win, FALSE);
++                                --win.startx;
++                                create_box(&win, TRUE);
++                                break;
++                        case KEY_RIGHT:
++                                create_box(&win, FALSE);
++                                ++win.startx;
++                                create_box(&win, TRUE);
++                                break;
++                        case KEY_UP:
++                                create_box(&win, FALSE);
++                                --win.starty;
++                                create_box(&win, TRUE);
++                                break;
++                        case KEY_DOWN:
++                                create_box(&win, FALSE);
++                                ++win.starty;
++                                create_box(&win, TRUE);
++                                break;  
++                }
++        }
++        endwin();                       /* End curses mode                */
++        return 0;
+ }
+ void init_win_params(WIN *p_win)
+ {
+-	p_win->height = 3;
+-	p_win->width = 10;
+-	p_win->starty = (LINES - p_win->height)/2;	
+-	p_win->startx = (COLS - p_win->width)/2;
+-
+-	p_win->border.ls = '|';
+-	p_win->border.rs = '|';
+-	p_win->border.ts = '-';
+-	p_win->border.bs = '-';
+-	p_win->border.tl = '+';
+-	p_win->border.tr = '+';
+-	p_win->border.bl = '+';
+-	p_win->border.br = '+';
++        p_win->height = 3;
++        p_win->width = 10;
++        p_win->starty = (LINES - p_win->height)/2;      
++        p_win->startx = (COLS - p_win->width)/2;
++
++        p_win->border.ls = '|';
++        p_win->border.rs = '|';
++        p_win->border.ts = '-';
++        p_win->border.bs = '-';
++        p_win->border.tl = '+';
++        p_win->border.tr = '+';
++        p_win->border.bl = '+';
++        p_win->border.br = '+';
+ 
+ }
+ void print_win_params(WIN *p_win)
+ {
+ #ifdef _DEBUG
+-	mvprintw(25, 0, "%d %d %d %d", p_win->startx, p_win->starty, 
+-				p_win->width, p_win->height);
+-	refresh();
++        mvprintw(25, 0, "%d %d %d %d", p_win->startx, p_win->starty, 
++                                p_win->width, p_win->height);
++        refresh();
+ #endif
+ }
+ void create_box(WIN *p_win, bool flag)
+-{	int i, j;
+-	int x, y, w, h;
++{       int i, j;
++        int x, y, w, h;
++
++        x = p_win->startx;
++        y = p_win->starty;
++        w = p_win->width;
++        h = p_win->height;
++
++        if(flag == TRUE)
++        {       mvaddch(y, x, p_win->border.tl);
++                mvaddch(y, x + w, p_win->border.tr);
++                mvaddch(y + h, x, p_win->border.bl);
++                mvaddch(y + h, x + w, p_win->border.br);
++                mvhline(y, x + 1, p_win->border.ts, w - 1);
++                mvhline(y + h, x + 1, p_win->border.bs, w - 1);
++                mvvline(y + 1, x, p_win->border.ls, h - 1);
++                mvvline(y + 1, x + w, p_win->border.rs, h - 1);
++
++        }
++        else
++                for(j = y; j <= y + h; ++j)
++                        for(i = x; i <= x + w; ++i)
++                                mvaddch(j, i, ' ');
++                                
++        refresh();
+ 
+-	x = p_win->startx;
+-	y = p_win->starty;
+-	w = p_win->width;
+-	h = p_win->height;
+-
+-	if(flag == TRUE)
+-	{	mvaddch(y, x, p_win->border.tl);
+-		mvaddch(y, x + w, p_win->border.tr);
+-		mvaddch(y + h, x, p_win->border.bl);
+-		mvaddch(y + h, x + w, p_win->border.br);
+-		mvhline(y, x + 1, p_win->border.ts, w - 1);
+-		mvhline(y + h, x + 1, p_win->border.bs, w - 1);
+-		mvvline(y + 1, x, p_win->border.ls, h - 1);
+-		mvvline(y + 1, x + w, p_win->border.rs, h - 1);
+-
+-	}
+-	else
+-		for(j = y; j <= y + h; ++j)
+-			for(i = x; i <= x + w; ++i)
+-				mvaddch(j, i, ' ');
+-				
+-	refresh();
+-
+-}
    10. Colors
    10.1. The basics
    Life seems dull with no colors. Curses has a nice mechanism to handle colors.
+-Let's get into the thick of the things with a small program.
    Example 9.  A Simple Color example 
    #include <ncurses.h>
++}
++
    
++        
    
++      
    
++    
    
++
++    
    
++      
    
++
++      
    10.
++      Colors
    
++
++      
    
++        
    10.1. The basics
    
++
++        
    Life seems dull with no colors. Curses has a nice
++        mechanism to handle colors. Let's get into the thick of the
++        things with a small program.
    
++
++        
    
++          
++
++          
    Example 9. A Simple Color example
    
++          
    ++#include <ncurses.h>
+ 
+ void print_in_middle(WINDOW *win, int starty, int startx, int width, char *string);
+ int main(int argc, char *argv[])
+-{	initscr();			/* Start curses mode 		*/
+-	if(has_colors() == FALSE)
+-	{	endwin();
+-		printf("Your terminal does not support color\n");
+-		exit(1);
+-	}
+-	start_color();			/* Start color 			*/
+-	init_pair(1, COLOR_RED, COLOR_BLACK);
+-
+-	attron(COLOR_PAIR(1));
+-	print_in_middle(stdscr, LINES / 2, 0, 0, "Viola !!! In color ...");
+-	attroff(COLOR_PAIR(1));
+-    	getch();
+-	endwin();
++{       initscr();                      /* Start curses mode            */
++        if(has_colors() == FALSE)
++        {       endwin();
++                printf("Your terminal does not support color\n");
++                exit(1);
++        }
++        start_color();                  /* Start color                  */
++        init_pair(1, COLOR_RED, COLOR_BLACK);
++
++        attron(COLOR_PAIR(1));
++        print_in_middle(stdscr, LINES / 2, 0, 0, "Viola !!! In color ...");
++        attroff(COLOR_PAIR(1));
++        getch();
++        endwin();
+ }
+ void print_in_middle(WINDOW *win, int starty, int startx, int width, char *string)
+-{	int length, x, y;
+-	float temp;
++{       int length, x, y;
++        float temp;
+ 
+-	if(win == NULL)
+-		win = stdscr;
+-	getyx(win, y, x);
+-	if(startx != 0)
+-		x = startx;
+-	if(starty != 0)
+-		y = starty;
+-	if(width == 0)
+-		width = 80;
+-
+-	length = strlen(string);
+-	temp = (width - length)/ 2;
+-	x = startx + (int)temp;
+-	mvwprintw(win, y, x, "%s", string);
+-	refresh();
++        if(win == NULL)
++                win = stdscr;
++        getyx(win, y, x);
++        if(startx != 0)
++                x = startx;
++        if(starty != 0)
++                y = starty;
++        if(width == 0)
++                width = 80;
++
++        length = strlen(string);
++        temp = (width - length)/ 2;
++        x = startx + (int)temp;
++        mvwprintw(win, y, x, "%s", string);
++        refresh();
+ }
+-
    As you can see, to start using color, you should first call the function
+- start_color(). After that, you can use color
+-capabilities of your terminals using various functions. To find out whether a
+-terminal has color capabilities or not, you can use
+-has_colors() function, which returns FALSE if
+-the terminal does not support color. 
    Curses initializes all the colors supported by terminal when start_color() is
+-called. These can be accessed by the define constants like
+-COLOR_BLACK  etc. Now to actually start using
+-colors, you have to define pairs. Colors are always used in pairs. That means
+-you have to use the function init_pair()  to
+-define the foreground and background for the pair number you give.  After that
+-that pair number can be used as a normal attribute with COLOR_PAIR()function. This may seem to be cumbersome at first.
+-But this elegant solution allows us to manage color pairs very easily. To
+-appreciate it, you have to look into the the source code of "dialog", a utility
+-for displaying dialog boxes from shell scripts. The developers have defined
+-foreground and background combinations for all the colors they might need and
+-initialized at the beginning. This makes it very easy to set attributes just by
+-accessing a pair which we already have defined as a constant.
    The following colors are defined in curses.h.
+-You can use these as parameters for various color functions.
+-
            COLOR_BLACK   0
++
++
    
++        
    
++
++        
    As you can see, to start using color, you should first
++        call the function start_color().
++        After that, you can use color capabilities of your
++        terminals using various functions. To find out whether a
++        terminal has color capabilities or not, you can use
++        has_colors() function, which
++        returns FALSE if the terminal does not support color.
    
++
++        
    Curses initializes all the colors supported by terminal
++        when start_color() is called. These can be accessed by the
++        define constants like COLOR_BLACK
++        etc. Now to actually start using colors, you have to define
++        pairs. Colors are always used in pairs. That means you have
++        to use the function init_pair() to
++        define the foreground and background for the pair number
++        you give. After that that pair number can be used as a
++        normal attribute with COLOR_PAIR()function. This may seem to be
++        cumbersome at first. But this elegant solution allows us to
++        manage color pairs very easily. To appreciate it, you have
++        to look into the the source code of "dialog", a utility for
++        displaying dialog boxes from shell scripts. The developers
++        have defined foreground and background combinations for all
++        the colors they might need and initialized at the
++        beginning. This makes it very easy to set attributes just
++        by accessing a pair which we already have defined as a
++        constant.
    
++
++        
    The following colors are defined in curses.h. You can use these as parameters
++        for various color functions.
    
++        
    ++        COLOR_BLACK   0
+         COLOR_RED     1
+         COLOR_GREEN   2
+         COLOR_YELLOW  3
+         COLOR_BLUE    4
+         COLOR_MAGENTA 5
+         COLOR_CYAN    6
+-        COLOR_WHITE   7
    10.2. Changing Color Definitions
    The function init_color()can be used to change
+-the rgb values for the colors defined by curses initially. Say you wanted to
+-lighten the intensity of red color by a minuscule. Then you can use this
+-function as
        init_color(COLOR_RED, 700, 0, 0);
++        COLOR_WHITE   7
++
    
++      
    
++
++      
    
++        
    
++
++        
    10.2. Changing Color Definitions
    
++
++        
    The function init_color()can be
++        used to change the rgb values for the colors defined by
++        curses initially. Say you wanted to lighten the intensity
++        of red color by a minuscule. Then you can use this function
++        as
    
++        
    ++    init_color(COLOR_RED, 700, 0, 0);
+     /* param 1     : color name
+-     * param 2, 3, 4 : rgb content min = 0, max = 1000 */
    If your terminal cannot change the color definitions, the function returns ERR.
+-The function can_change_color() can be used to
+-find out whether the terminal has the capability of changing color content or
+-not.  The rgb content is scaled from 0 to 1000. Initially RED color is defined
+-with content 1000(r), 0(g), 0(b). 
    10.3. Color Content
    The functions color_content() and
+-pair_content() can be used to find the color
+-content and foreground, background combination for the pair. 
    11. Interfacing with the key board
    11.1. The Basics
    No GUI is complete without a strong user interface and to interact with the
+-user, a curses program should be sensitive to key presses or the mouse actions
+-done by the user. Let's deal with the keys first.
    As you have seen in almost all of the above examples, it's very easy to get key
+-input from the user. A simple way of getting key presses is to use
+-getch() function. The cbreak mode should be
+-enabled to read keys when you are interested in reading individual key hits
+-rather than complete lines of text (which usually end with a carriage return).
+-keypad should be enabled to get the Functions keys, arrow keys etc.  See the
+-initialization section for details.
    getch() returns an integer corresponding to the
+-key pressed. If it is a normal character, the integer value will be equivalent
+-to the character. Otherwise it returns a number which can be matched with the
+-constants defined in curses.h.  For example if
+-the user presses F1, the integer returned is 265. This can be checked using the
+-macro KEY_F() defined in curses.h. This makes reading keys portable and easy to
+-manage.
    For example, if you call getch() like this
        int ch;
+-
+-    ch = getch();
    getch() will wait for the user to press a key, (unless you specified a timeout)
+-and when user presses a key, the corresponding integer is returned. Then you can
+-check the value returned with the constants defined in curses.h to match against
+-the keys you want.
    The following code piece will do that job.
        if(ch == KEY_LEFT)
+-        printw("Left arrow is pressed\n");
    Let's write a small program which creates a menu which can be navigated by up
+-and down arrows.
    11.2. A Simple Key Usage example
    Example 10.  A Simple Key Usage example 
    #include <stdio.h>
+-#include <ncurses.h>
++     * param 2, 3, 4 : rgb content min = 0, max = 1000 */
++
    
++
++        
    If your terminal cannot change the color definitions,
++        the function returns ERR. The function can_change_color() can be used to find out
++        whether the terminal has the capability of changing color
++        content or not. The rgb content is scaled from 0 to 1000.
++        Initially RED color is defined with content 1000(r), 0(g),
++        0(b).
    
++      
    
++
++      
    
++        
    
++
++        
    10.3. Color Content
    
++
++        
    The functions color_content()
++        and pair_content() can be used to
++        find the color content and foreground, background
++        combination for the pair.
    
++      
    
++    
    
++
++    
    
++      
    
++
++      
    11. Interfacing
++      with the key board
    
++
++      
    
++        
    11.1. The Basics
    
++
++        
    No GUI is complete without a strong user interface and
++        to interact with the user, a curses program should be
++        sensitive to key presses or the mouse actions done by the
++        user. Let's deal with the keys first.
    
++
++        
    As you have seen in almost all of the above examples,
++        it's very easy to get key input from the user. A simple way
++        of getting key presses is to use getch() function. The cbreak mode should be
++        enabled to read keys when you are interested in reading
++        individual key hits rather than complete lines of text
++        (which usually end with a carriage return). keypad should
++        be enabled to get the Functions keys, arrow keys etc. See
++        the initialization section for details.
    
++
++        
    getch() returns an integer
++        corresponding to the key pressed. If it is a normal
++        character, the integer value will be equivalent to the
++        character. Otherwise it returns a number which can be
++        matched with the constants defined in curses.h. For example if the user presses
++        F1, the integer returned is 265. This can be checked using
++        the macro KEY_F() defined in curses.h. This makes reading
++        keys portable and easy to manage.
    
++
++        
    For example, if you call getch() like this
    
++        
    ++    int ch;
++
++    ch = getch();
++
    
++
++        
    getch() will wait for the user to press a key, (unless
++        you specified a timeout) and when user presses a key, the
++        corresponding integer is returned. Then you can check the
++        value returned with the constants defined in curses.h to
++        match against the keys you want.
    
++
++        
    The following code piece will do that job.
    
++        
    ++    if(ch == KEY_LEFT)
++        printw("Left arrow is pressed\n");
++
    
++
++        
    Let's write a small program which creates a menu which
++        can be navigated by up and down arrows.
    
++      
    
++
++      
    
++        
    
++
++        
    11.2. A Simple Key Usage example
    
++
++        
    
++          
++
++          
    Example 10. A Simple Key Usage example
    
++          
    ++#include <stdio.h>
++#include <ncurses.h>
+ 
+ #define WIDTH 30
+ #define HEIGHT 10 
+@@ -3577,132 +2774,126 @@
+ int starty = 0;
+ 
+ char *choices[] = { 
+-			"Choice 1",
+-			"Choice 2",
+-			"Choice 3",
+-			"Choice 4",
+-			"Exit",
+-		  };
++                        "Choice 1",
++                        "Choice 2",
++                        "Choice 3",
++                        "Choice 4",
++                        "Exit",
++                  };
+ int n_choices = sizeof(choices) / sizeof(char *);
+ void print_menu(WINDOW *menu_win, int highlight);
+ 
+ int main()
+-{	WINDOW *menu_win;
+-	int highlight = 1;
+-	int choice = 0;
+-	int c;
+-
+-	initscr();
+-	clear();
+-	noecho();
+-	cbreak();	/* Line buffering disabled. pass on everything */
+-	startx = (80 - WIDTH) / 2;
+-	starty = (24 - HEIGHT) / 2;
+-		
+-	menu_win = newwin(HEIGHT, WIDTH, starty, startx);
+-	keypad(menu_win, TRUE);
+-	mvprintw(0, 0, "Use arrow keys to go up and down, Press enter to select a choice");
+-	refresh();
+-	print_menu(menu_win, highlight);
+-	while(1)
+-	{	c = wgetch(menu_win);
+-		switch(c)
+-		{	case KEY_UP:
+-				if(highlight == 1)
+-					highlight = n_choices;
+-				else
+-					--highlight;
+-				break;
+-			case KEY_DOWN:
+-				if(highlight == n_choices)
+-					highlight = 1;
+-				else 
+-					++highlight;
+-				break;
+-			case 10:
+-				choice = highlight;
+-				break;
+-			default:
+-				mvprintw(24, 0, "Charcter pressed is = %3d Hopefully it can be printed as '%c'", c, c);
+-				refresh();
+-				break;
+-		}
+-		print_menu(menu_win, highlight);
+-		if(choice != 0)	/* User did a choice come out of the infinite loop */
+-			break;
+-	}	
+-	mvprintw(23, 0, "You chose choice %d with choice string %s\n", choice, choices[choice - 1]);
+-	clrtoeol();
+-	refresh();
+-	endwin();
+-	return 0;
++{       WINDOW *menu_win;
++        int highlight = 1;
++        int choice = 0;
++        int c;
++
++        initscr();
++        clear();
++        noecho();
++        cbreak();       /* Line buffering disabled. pass on everything */
++        startx = (80 - WIDTH) / 2;
++        starty = (24 - HEIGHT) / 2;
++                
++        menu_win = newwin(HEIGHT, WIDTH, starty, startx);
++        keypad(menu_win, TRUE);
++        mvprintw(0, 0, "Use arrow keys to go up and down, Press enter to select a choice");
++        refresh();
++        print_menu(menu_win, highlight);
++        while(1)
++        {       c = wgetch(menu_win);
++                switch(c)
++                {       case KEY_UP:
++                                if(highlight == 1)
++                                        highlight = n_choices;
++                                else
++                                        --highlight;
++                                break;
++                        case KEY_DOWN:
++                                if(highlight == n_choices)
++                                        highlight = 1;
++                                else 
++                                        ++highlight;
++                                break;
++                        case 10:
++                                choice = highlight;
++                                break;
++                        default:
++                                mvprintw(24, 0, "Charcter pressed is = %3d Hopefully it can be printed as '%c'", c, c);
++                                refresh();
++                                break;
++                }
++                print_menu(menu_win, highlight);
++                if(choice != 0) /* User did a choice come out of the infinite loop */
++                        break;
++        }       
++        mvprintw(23, 0, "You chose choice %d with choice string %s\n", choice, choices[choice - 1]);
++        clrtoeol();
++        refresh();
++        endwin();
++        return 0;
+ }
+ 
+ 
+ void print_menu(WINDOW *menu_win, int highlight)
+ {
+-	int x, y, i;	
++        int x, y, i;    
+ 
+-	x = 2;
+-	y = 2;
+-	box(menu_win, 0, 0);
+-	for(i = 0; i < n_choices; ++i)
+-	{	if(highlight == i + 1) /* High light the present choice */
+-		{	wattron(menu_win, A_REVERSE); 
+-			mvwprintw(menu_win, y, x, "%s", choices[i]);
+-			wattroff(menu_win, A_REVERSE);
+-		}
+-		else
+-			mvwprintw(menu_win, y, x, "%s", choices[i]);
+-		++y;
+-	}
+-	wrefresh(menu_win);
++        x = 2;
++        y = 2;
++        box(menu_win, 0, 0);
++        for(i = 0; i < n_choices; ++i)
++        {       if(highlight == i + 1) /* High light the present choice */
++                {       wattron(menu_win, A_REVERSE); 
++                        mvwprintw(menu_win, y, x, "%s", choices[i]);
++                        wattroff(menu_win, A_REVERSE);
++                }
++                else
++                        mvwprintw(menu_win, y, x, "%s", choices[i]);
++                ++y;
++        }
++        wrefresh(menu_win);
+ }
+-
    12. Interfacing with the mouse
    Now that you have seen how to get keys, lets do the same thing from mouse.
+-Usually each UI allows the user to interact with both keyboard and mouse. 
    12.1. The Basics
    Before you do any thing else, the events you want to receive have to be enabled
+-with mousemask().
        mousemask(  mmask_t newmask,    /* The events you want to listen to */
+-                mmask_t *oldmask)    /* The old events mask                */
    The first parameter to above function is a bit mask of events you would like to 
+-listen. By default, all the events are turned off. The bit mask  ALL_MOUSE_EVENTS can be used to get all the events.
    The following are all the event masks:
        Name            Description
++
++
    
++        
    
++      
    
++    
    
++
++    
    
++      
    
++
++      
    12. Interfacing
++      with the mouse
    
++
++      
    Now that you have seen how to get keys, lets do the same
++      thing from mouse. Usually each UI allows the user to interact
++      with both keyboard and mouse.
    
++
++      
    
++        
    
++
++        
    12.1. The Basics
    
++
++        
    Before you do any thing else, the events you want to
++        receive have to be enabled with mousemask().
    
++        
    ++    mousemask(  mmask_t newmask,    /* The events you want to listen to */
++                mmask_t *oldmask)    /* The old events mask                */
++
    
++
++        
    The first parameter to above function is a bit mask of
++        events you would like to listen. By default, all the events
++        are turned off. The bit mask ALL_MOUSE_EVENTS can be used to get all the
++        events.
    
++
++        
    The following are all the event masks:
    
++        
    ++    Name            Description
+        ---------------------------------------------------------------------
+        BUTTON1_PRESSED          mouse button 1 down
+        BUTTON1_RELEASED         mouse button 1 up
+@@ -3728,85 +2919,72 @@
+        BUTTON_CTRL              control was down during button state change
+        BUTTON_ALT               alt was down during button state change
+        ALL_MOUSE_EVENTS         report all button state changes
+-       REPORT_MOUSE_POSITION    report mouse movement
    12.2. Getting the events
    Once a class of mouse events have been enabled, getch() class of functions
+-return KEY_MOUSE every time some mouse event happens. Then the mouse event can
+-be retrieved with getmouse().
    The code approximately looks like this:
        MEVENT event;
++       REPORT_MOUSE_POSITION    report mouse movement
++
    
++      
    
++
++      
    
++        
    
++
++        
    12.2. Getting the events
    
++
++        
    Once a class of mouse events have been enabled, getch()
++        class of functions return KEY_MOUSE every time some mouse
++        event happens. Then the mouse event can be retrieved with
++        getmouse().
    
++
++        
    The code approximately looks like this:
    
++        
    ++    MEVENT event;
+ 
+     ch = getch();
+     if(ch == KEY_MOUSE)
+         if(getmouse(&event) == OK)
+             .    /* Do some thing with the event */
+             .
+-            .
     
+-getmouse() returns the event into the pointer given to it. It's a structure
+-which contains
        typedef struct
++            .
++
    
++
++        
    getmouse() returns the event into the pointer given to
++        it. It's a structure which contains
    
++        
    ++    typedef struct
+     {
+         short id;         /* ID to distinguish multiple devices */
+         int x, y, z;      /* event coordinates */
+         mmask_t bstate;   /* button state bits */
+-    }    
    The bstate is the main variable we are
+-interested in. It tells the button state of the mouse.
    Then with a code snippet like the following, we can find out what happened.
        if(event.bstate & BUTTON1_PRESSED)
+-        printw("Left Button Pressed");
    12.3. Putting it all Together
    That's pretty much interfacing with mouse. Let's create the same menu and enable
+-mouse interaction. To make things simpler, key handling is removed.
    Example 11.  Access the menu with mouse !!! 
    #include <ncurses.h>
++    }    
++
    
++
++        
    The bstate is the main variable
++        we are interested in. It tells the button state of the
++        mouse.
    
++
++        
    Then with a code snippet like the following, we can find
++        out what happened.
    
++        
    ++    if(event.bstate & BUTTON1_PRESSED)
++        printw("Left Button Pressed");
++
    
++      
    
++
++      
    
++        
    
++
++        
    12.3. Putting it all Together
    
++
++        
    That's pretty much interfacing with mouse. Let's create
++        the same menu and enable mouse interaction. To make things
++        simpler, key handling is removed.
    
++
++        
    
++          
++
++          
    Example 11. Access the menu with mouse !!!
    
++          
    ++#include <ncurses.h>
+ 
+ #define WIDTH 30
+ #define HEIGHT 10 
+@@ -3814,12 +2992,12 @@
+ int startx = 0;
+ int starty = 0;
+ 
+-char *choices[] = { 	"Choice 1",
+-			"Choice 2",
+-			"Choice 3",
+-			"Choice 4",
+-			"Exit",
+-		  };
++char *choices[] = {     "Choice 1",
++                        "Choice 2",
++                        "Choice 3",
++                        "Choice 4",
++                        "Exit",
++                  };
+ 
+ int n_choices = sizeof(choices) / sizeof(char *);
+ 
+@@ -3827,338 +3005,291 @@
+ void report_choice(int mouse_x, int mouse_y, int *p_choice);
+ 
+ int main()
+-{	int c, choice = 0;
+-	WINDOW *menu_win;
+-	MEVENT event;
+-
+-	/* Initialize curses */
+-	initscr();
+-	clear();
+-	noecho();
+-	cbreak();	//Line buffering disabled. pass on everything
+-
+-	/* Try to put the window in the middle of screen */
+-	startx = (80 - WIDTH) / 2;
+-	starty = (24 - HEIGHT) / 2;
+-	
+-	attron(A_REVERSE);
+-	mvprintw(23, 1, "Click on Exit to quit (Works best in a virtual console)");
+-	refresh();
+-	attroff(A_REVERSE);
+-
+-	/* Print the menu for the first time */
+-	menu_win = newwin(HEIGHT, WIDTH, starty, startx);
+-	print_menu(menu_win, 1);
+-	/* Get all the mouse events */
+-	mousemask(ALL_MOUSE_EVENTS, NULL);
+-	
+-	while(1)
+-	{	c = wgetch(menu_win);
+-		switch(c)
+-		{	case KEY_MOUSE:
+-			if(getmouse(&event) == OK)
+-			{	/* When the user clicks left mouse button */
+-				if(event.bstate & BUTTON1_PRESSED)
+-				{	report_choice(event.x + 1, event.y + 1, &choice);
+-					if(choice == -1) //Exit chosen
+-						goto end;
+-					mvprintw(22, 1, "Choice made is : %d String Chosen is \"%10s\"", choice, choices[choice - 1]);
+-					refresh(); 
+-				}
+-			}
+-			print_menu(menu_win, choice);
+-			break;
+-		}
+-	}		
++{       int c, choice = 0;
++        WINDOW *menu_win;
++        MEVENT event;
++
++        /* Initialize curses */
++        initscr();
++        clear();
++        noecho();
++        cbreak();       //Line buffering disabled. pass on everything
++
++        /* Try to put the window in the middle of screen */
++        startx = (80 - WIDTH) / 2;
++        starty = (24 - HEIGHT) / 2;
++        
++        attron(A_REVERSE);
++        mvprintw(23, 1, "Click on Exit to quit (Works best in a virtual console)");
++        refresh();
++        attroff(A_REVERSE);
++
++        /* Print the menu for the first time */
++        menu_win = newwin(HEIGHT, WIDTH, starty, startx);
++        print_menu(menu_win, 1);
++        /* Get all the mouse events */
++        mousemask(ALL_MOUSE_EVENTS, NULL);
++        
++        while(1)
++        {       c = wgetch(menu_win);
++                switch(c)
++                {       case KEY_MOUSE:
++                        if(getmouse(&event) == OK)
++                        {       /* When the user clicks left mouse button */
++                                if(event.bstate & BUTTON1_PRESSED)
++                                {       report_choice(event.x + 1, event.y + 1, &choice);
++                                        if(choice == -1) //Exit chosen
++                                                goto end;
++                                        mvprintw(22, 1, "Choice made is : %d String Chosen is \"%10s\"", choice, choices[choice - 1]);
++                                        refresh(); 
++                                }
++                        }
++                        print_menu(menu_win, choice);
++                        break;
++                }
++        }               
+ end:
+-	endwin();
+-	return 0;
++        endwin();
++        return 0;
+ }
+ 
+ 
+ void print_menu(WINDOW *menu_win, int highlight)
+ {
+-	int x, y, i;	
++        int x, y, i;    
+ 
+-	x = 2;
+-	y = 2;
+-	box(menu_win, 0, 0);
+-	for(i = 0; i < n_choices; ++i)
+-	{	if(highlight == i + 1)
+-		{	wattron(menu_win, A_REVERSE); 
+-			mvwprintw(menu_win, y, x, "%s", choices[i]);
+-			wattroff(menu_win, A_REVERSE);
+-		}
+-		else
+-			mvwprintw(menu_win, y, x, "%s", choices[i]);
+-		++y;
+-	}
+-	wrefresh(menu_win);
++        x = 2;
++        y = 2;
++        box(menu_win, 0, 0);
++        for(i = 0; i < n_choices; ++i)
++        {       if(highlight == i + 1)
++                {       wattron(menu_win, A_REVERSE); 
++                        mvwprintw(menu_win, y, x, "%s", choices[i]);
++                        wattroff(menu_win, A_REVERSE);
++                }
++                else
++                        mvwprintw(menu_win, y, x, "%s", choices[i]);
++                ++y;
++        }
++        wrefresh(menu_win);
+ }
+ 
+ /* Report the choice according to mouse position */
+ void report_choice(int mouse_x, int mouse_y, int *p_choice)
+-{	int i,j, choice;
++{       int i,j, choice;
+ 
+-	i = startx + 2;
+-	j = starty + 3;
+-	
+-	for(choice = 0; choice < n_choices; ++choice)
+-		if(mouse_y == j + choice && mouse_x >= i && mouse_x <= i + strlen(choices[choice]))
+-		{	if(choice == n_choices - 1)
+-				*p_choice = -1;		
+-			else
+-				*p_choice = choice + 1;	
+-			break;
+-		}
+-}
    12.4. Miscellaneous Functions
    The functions mouse_trafo() and wmouse_trafo() can be used to convert to mouse
+-co-ordinates to screen relative co-ordinates. See curs_mouse(3X) man page for details.
    The  mouseinterval  function sets the maximum time (in thousands of a
+-second) that can elapse between press and release events in order for
+-them to be recognized as a click.  This function returns the previous
+-interval value.  The default is one fifth of a second.
    13. Screen Manipulation
    In this section, we will look into some functions, which allow us to manage the
+-screen efficiently and to write some fancy programs. This is especially
+-important in writing games. 
    13.1. getyx() functions
    
The function getyx() can be used to find out
+-the present cursor co-ordinates. It will fill the values of x and y co-ordinates
+-in the arguments given to it. Since getyx() is a macro you don't have to pass
+-the address of the variables. It can be called as
        getyx(win, y, x);
++        i = startx + 2;
++        j = starty + 3;
++        
++        for(choice = 0; choice < n_choices; ++choice)
++                if(mouse_y == j + choice && mouse_x >= i && mouse_x <= i + strlen(choices[choice]))
++                {       if(choice == n_choices - 1)
++                                *p_choice = -1;         
++                        else
++                                *p_choice = choice + 1; 
++                        break;
++                }
++}
++
    
++        
    
++      
    
++
++      
    
++        
    
++
++        
    12.4. Miscellaneous Functions
    
++
++        
    The functions mouse_trafo() and wmouse_trafo() can be
++        used to convert to mouse co-ordinates to screen relative
++        co-ordinates. See curs_mouse(3X) man page for details.
    
++
++        
    The mouseinterval function sets the maximum time (in
++        thousands of a second) that can elapse between press and
++        release events in order for them to be recognized as a
++        click. This function returns the previous interval value.
++        The default is one fifth of a second.
    
++      
    
++    
    
++
++    
    
++      
    
++
++      
    13. Screen
++      Manipulation
    
++
++      
    In this section, we will look into some functions, which
++      allow us to manage the screen efficiently and to write some
++      fancy programs. This is especially important in writing
++      games.
    
++
++      
    
++        
    
++
++        
    13.1. getyx()
++        functions
    
++
++        
    The function getyx() can be
++        used to find out the present cursor co-ordinates. It will
++        fill the values of x and y co-ordinates in the arguments
++        given to it. Since getyx() is a macro you don't have to
++        pass the address of the variables. It can be called as
    
++        
    ++    getyx(win, y, x);
+     /* win: window pointer
+      *   y, x: y, x co-ordinates will be put into this variables 
+-     */
    The function getparyx() gets the beginning co-ordinates of the sub window
+-relative to the main window. This is some times useful to update a sub window.
+-When designing fancy stuff like writing multiple menus, it becomes difficult to
+-store the menu positions, their first option co-ordinates etc. A simple solution
+-to this problem, is to create menus in sub windows and later find the starting
+-co-ordinates of the menus by using getparyx().
    The functions getbegyx() and getmaxyx() store current window's beginning and
+-maximum co-ordinates. These functions are useful in the same way as above in
+-managing the windows and sub windows effectively.
    13.2. Screen Dumping
    While writing games, some times it becomes necessary to store the state of the
+-screen and restore it back to the same state. The function scr_dump() can be
+-used to dump the screen contents to a file given as an argument. Later it can be
+-restored by scr_restore function. These two simple functions can be used
+-effectively to maintain a fast moving game with changing scenarios. 
    13.3. Window Dumping
    To store and restore windows, the functions
+-putwin() and getwin() can be used. putwin() puts
+-the present window state into a file, which can be later restored by
+-getwin().
     
+-The function copywin() can be used to copy a
+-window completely onto another window. It takes the source and destination
+-windows as parameters and according to the rectangle specified, it copies the
+-rectangular region from source to destination window.  It's last parameter
+-specifies whether to overwrite or just overlay the contents on to the
+-destination window. If this argument is true, then the copying is
+-non-destructive.
    14. Miscellaneous features
    Now you know enough features to write a good curses program, with all bells and
+-whistles. There are some miscellaneous functions which are useful in various
+-cases.  Let's go headlong into some of those.
    14.1. curs_set()
    This function can be used to make the cursor invisible. The parameter to this
+-function should be 
        0 : invisible      or
++     */
++
    
++
++        
    The function getparyx() gets the beginning co-ordinates
++        of the sub window relative to the main window. This is some
++        times useful to update a sub window. When designing fancy
++        stuff like writing multiple menus, it becomes difficult to
++        store the menu positions, their first option co-ordinates
++        etc. A simple solution to this problem, is to create menus
++        in sub windows and later find the starting co-ordinates of
++        the menus by using getparyx().
    
++
++        
    The functions getbegyx() and getmaxyx() store current
++        window's beginning and maximum co-ordinates. These
++        functions are useful in the same way as above in managing
++        the windows and sub windows effectively.
    
++      
    
++
++      
    
++        
    
++
++        
    13.2. Screen Dumping
    
++
++        
    While writing games, some times it becomes necessary to
++        store the state of the screen and restore it back to the
++        same state. The function scr_dump() can be used to dump the
++        screen contents to a file given as an argument. Later it
++        can be restored by scr_restore function. These two simple
++        functions can be used effectively to maintain a fast moving
++        game with changing scenarios.
    
++      
    
++
++      
    
++        
    
++
++        
    13.3. Window Dumping
    
++
++        
    To store and restore windows, the functions putwin() and getwin() can be used. putwin() puts the present window state into
++        a file, which can be later restored by getwin().
    
++
++        
    The function copywin() can be
++        used to copy a window completely onto another window. It
++        takes the source and destination windows as parameters and
++        according to the rectangle specified, it copies the
++        rectangular region from source to destination window. It's
++        last parameter specifies whether to overwrite or just
++        overlay the contents on to the destination window. If this
++        argument is true, then the copying is non-destructive.
    
++      
    
++    
    
++
++    
    
++      
    
++
++      
    14. Miscellaneous
++      features
    
++
++      
    Now you know enough features to write a good curses
++      program, with all bells and whistles. There are some
++      miscellaneous functions which are useful in various cases.
++      Let's go headlong into some of those.
    
++
++      
    
++        
    
++
++        
    14.1.
++        curs_set()
    
++
++        
    This function can be used to make the cursor invisible.
++        The parameter to this function should be
    
++        
    ++    0 : invisible      or
+     1 : normal    or
+-    2 : very visible.
    14.2. Temporarily Leaving Curses mode
    Some times you may want to get back to cooked mode (normal line buffering mode)
+-temporarily. In such a case you will first need to save the tty modes with a
+-call to def_prog_mode() and then call
+-endwin() to end the curses mode. This will
+-leave you in the original tty mode. To get back to curses once you are done,
+-call reset_prog_mode() . This function returns
+-the tty to the state stored by def_prog_mode(). Then do refresh(), and you are back to the curses mode. Here
+-is an example showing the sequence of things to be done.
    Example 12.  Temporarily Leaving Curses Mode 
    #include <ncurses.h>
++    2 : very visible.
++
    
++      
    
++
++      
    
++        
    
++
++        
    14.2.
++        Temporarily Leaving Curses mode
    
++
++        
    Some times you may want to get back to cooked mode
++        (normal line buffering mode) temporarily. In such a case
++        you will first need to save the tty modes with a call to
++        def_prog_mode() and then call
++        endwin() to end the curses mode.
++        This will leave you in the original tty mode. To get back
++        to curses once you are done, call reset_prog_mode() . This function returns
++        the tty to the state stored by def_prog_mode(). Then do refresh(), and you
++        are back to the curses mode. Here is an example showing the
++        sequence of things to be done.
    
++
++        
    
++          
++
++          
    Example 12. Temporarily Leaving Curses Mode
    
++          
    ++#include <ncurses.h>
+ 
+ int main()
+-{	
+-	initscr();			/* Start curses mode 		  */
+-	printw("Hello World !!!\n");	/* Print Hello World		  */
+-	refresh();			/* Print it on to the real screen */
+-	def_prog_mode();		/* Save the tty modes		  */
+-	endwin();			/* End curses mode temporarily	  */
+-	system("/bin/sh");		/* Do whatever you like in cooked mode */
+-	reset_prog_mode();		/* Return to the previous tty mode*/
+-					/* stored by def_prog_mode() 	  */
+-	refresh();			/* Do refresh() to restore the	  */
+-					/* Screen contents		  */
+-	printw("Another String\n");	/* Back to curses use the full    */
+-	refresh();			/* capabilities of curses	  */
+-	endwin();			/* End curses mode		  */
+-
+-	return 0;
+-}
    14.3. ACS_ variables
    If you have ever programmed in DOS, you know about those nifty characters in
+-extended character set. They are printable only on some terminals. NCURSES 
+-functions like box() use these characters. All
+-these variables start with ACS meaning alternative character set. You might have 
+-noticed me using these characters in some of the programs above. Here's an example 
+-showing all the characters.
    Example 13.  ACS Variables Example 
    #include <ncurses.h>
++{       
++        initscr();                      /* Start curses mode              */
++        printw("Hello World !!!\n");    /* Print Hello World              */
++        refresh();                      /* Print it on to the real screen */
++        def_prog_mode();                /* Save the tty modes             */
++        endwin();                       /* End curses mode temporarily    */
++        system("/bin/sh");              /* Do whatever you like in cooked mode */
++        reset_prog_mode();              /* Return to the previous tty mode*/
++                                        /* stored by def_prog_mode()      */
++        refresh();                      /* Do refresh() to restore the    */
++                                        /* Screen contents                */
++        printw("Another String\n");     /* Back to curses use the full    */
++        refresh();                      /* capabilities of curses         */
++        endwin();                       /* End curses mode                */
++
++        return 0;
++}
++
    
++        
    
++      
    
++
++      
    
++        
    
++
++        
    14.3. ACS_
++        variables
    
++
++        
    If you have ever programmed in DOS, you know about those
++        nifty characters in extended character set. They are
++        printable only on some terminals. NCURSES functions like
++        box() use these characters. All
++        these variables start with ACS meaning alternative
++        character set. You might have noticed me using these
++        characters in some of the programs above. Here's an example
++        showing all the characters.
    
++
++        
    
++          
++
++          
    Example 13. ACS Variables Example
    
++          
    ++#include <ncurses.h>
+ 
+ int main()
+ {
+@@ -4200,218 +3331,207 @@
+         getch();
+         endwin();
+ 
+-	return 0;
+-}
    15. Other libraries
    Apart from the curses library, there are few text mode libraries, which provide
+-more functionality and a lot of features. The following sections explain three 
+-standard libraries which are usually distributed along with curses. 
    16. Panel Library
    Now that you are proficient in curses, you wanted to do some thing big. You
+-created a lot of overlapping windows to give a professional windows-type look.
+-Unfortunately, it soon becomes difficult to manage these. The multiple
+-refreshes, updates plunge you into a nightmare. The overlapping windows create
+-blotches, whenever you forget to refresh the windows in the proper order. 
    Don't despair. There's an elegant solution provided in panels library. In the
+-words of developers of ncurses 
    When your interface design is such that windows may dive deeper into the
+-visibility stack or pop to the top at runtime, the resulting book-keeping can be
+-tedious and difficult to get right. Hence the panels library.
    If you have lot of overlapping windows, then panels library is the way to go. It
+-obviates the need of doing series of wnoutrefresh(), doupdate() and relieves the
+-burden of doing it correctly(bottom up). The library maintains information about
+-the order of windows, their overlapping and update the screen properly. So why
+-wait? Let's take a close peek into panels.
    16.1. The Basics
    Panel object is a window that is implicitly treated as part of a deck including
+-all other panel objects. The deck is treated as a stack with the top panel being
+-completely visible and the other panels may or may not be obscured according to
+-their positions. So the basic idea is to create a stack of overlapping panels
+-and use panels library to display them correctly. There is a function similar to
+-refresh() which, when called , displays panels in the correct order. Functions
+-are provided to hide or show panels, move panels, change its size etc.. The
+-overlapping problem is managed by the panels library during all the calls to
+-these functions. 
    The general flow of a panel program goes like this:
+-
+-
    1. Create the windows (with newwin()) to be attached to the panels.
    2. Create panels with the chosen visibility order. Stack them up according to the 
+-desired visibility. The function new_panel() is used to created panels.
    3. Call update_panels() to write the panels to the virtual screen in correct
+-visibility order. Do a doupdate() to show it on the screen. 
    4. Mainpulate the panels with show_panel(), hide_panel(), move_panel() etc. Make
+-use of helper functions like panel_hidden() and panel_window(). Make use of user
+-pointer to store custom data for a panel. Use the functions set_panel_userptr()
+-and panel_userptr() to set and get the user pointer for a panel.
    5. When you are done with the panel use del_panel() to delete the panel.
    Let's make the concepts clear, with some programs.  The following is a simple
+-program which creates 3 overlapping panels and shows them on the screen. 
    16.2. Compiling With the Panels Library
    To use panels library functions, you have to include panel.h and to link the
+-program with panels library the flag -lpanel should be added along with
+--lncurses in that order.
        #include <panel.h>
++        return 0;
++}
++
    
++        
    
++      
    
++    
    
++
++    
    
++      
    
++
++      
    15. Other
++      libraries
    
++
++      
    Apart from the curses library, there are few text mode
++      libraries, which provide more functionality and a lot of
++      features. The following sections explain three standard
++      libraries which are usually distributed along with
++      curses.
    
++    
    
++
++    
    
++      
    
++
++      
    16. Panel
++      Library
    
++
++      
    Now that you are proficient in curses, you wanted to do
++      some thing big. You created a lot of overlapping windows to
++      give a professional windows-type look. Unfortunately, it soon
++      becomes difficult to manage these. The multiple refreshes,
++      updates plunge you into a nightmare. The overlapping windows
++      create blotches, whenever you forget to refresh the windows
++      in the proper order.
    
++
++      
    Don't despair. There's an elegant solution provided in
++      panels library. In the words of developers of ncurses
    
++
++      
    When your
++      interface design is such that windows may dive deeper into
++      the visibility stack or pop to the top at runtime, the
++      resulting book-keeping can be tedious and difficult to get
++      right. Hence the panels library.
    
++
++      
    If you have lot of overlapping windows, then panels
++      library is the way to go. It obviates the need of doing
++      series of wnoutrefresh(), doupdate() and relieves the burden
++      of doing it correctly(bottom up). The library maintains
++      information about the order of windows, their overlapping and
++      update the screen properly. So why wait? Let's take a close
++      peek into panels.
    
++
++      
    
++        
    
++
++        
    16.1. The Basics
    
++
++        
    Panel object is a window that is implicitly treated as
++        part of a deck including all other panel objects. The deck
++        is treated as a stack with the top panel being completely
++        visible and the other panels may or may not be obscured
++        according to their positions. So the basic idea is to
++        create a stack of overlapping panels and use panels library
++        to display them correctly. There is a function similar to
++        refresh() which, when called , displays panels in the
++        correct order. Functions are provided to hide or show
++        panels, move panels, change its size etc.. The overlapping
++        problem is managed by the panels library during all the
++        calls to these functions.
    
++
++        
    The general flow of a panel program goes like this:
    
++
++        
      
++          
    1. 
++            
      Create the windows (with newwin()) to be attached to
++            the panels.
      
++          
      2. 
++
++          
    2. 
++            
      Create panels with the chosen visibility order.
++            Stack them up according to the desired visibility. The
++            function new_panel() is used to created panels.
      
++          
      3. 
++
++          
    3. 
++            
      Call update_panels() to write the panels to the
++            virtual screen in correct visibility order. Do a
++            doupdate() to show it on the screen.
      
++          
      4. 
++
++          
    4. 
++            
      Mainpulate the panels with show_panel(),
++            hide_panel(), move_panel() etc. Make use of helper
++            functions like panel_hidden() and panel_window(). Make
++            use of user pointer to store custom data for a panel.
++            Use the functions set_panel_userptr() and
++            panel_userptr() to set and get the user pointer for a
++            panel.
      
++          
      5. 
++
++          
    5. 
++            
      When you are done with the panel use del_panel() to
++            delete the panel.
      
++          
      6. 
++        
    
++
++        
    Let's make the concepts clear, with some programs. The
++        following is a simple program which creates 3 overlapping
++        panels and shows them on the screen.
    
++      
    
++
++      
    
++        
    
++
++        
    16.2. Compiling With the Panels
++        Library
    
++
++        
    To use panels library functions, you have to include
++        panel.h and to link the program with panels library the
++        flag -lpanel should be added along with -lncurses in that
++        order.
    
++        
    ++    #include <panel.h>
+     .
+     .
+     .
+ 
+-    compile and link: gcc <program file> -lpanel -lncurses
    Example 14.  Panel basics
    #include <panel.h>
++    compile and link: gcc <program file> -lpanel -lncurses
++
    
++
++        
    
++          
++
++          
    Example 14. Panel basics
    
++          
    ++#include <panel.h>
+ 
+ int main()
+-{	WINDOW *my_wins[3];
+-	PANEL  *my_panels[3];
+-	int lines = 10, cols = 40, y = 2, x = 4, i;
+-
+-	initscr();
+-	cbreak();
+-	noecho();
+-
+-	/* Create windows for the panels */
+-	my_wins[0] = newwin(lines, cols, y, x);
+-	my_wins[1] = newwin(lines, cols, y + 1, x + 5);
+-	my_wins[2] = newwin(lines, cols, y + 2, x + 10);
+-
+-	/* 
+-	 * Create borders around the windows so that you can see the effect
+-	 * of panels
+-	 */
+-	for(i = 0; i < 3; ++i)
+-		box(my_wins[i], 0, 0);
+-
+-	/* Attach a panel to each window */ 	/* Order is bottom up */
+-	my_panels[0] = new_panel(my_wins[0]); 	/* Push 0, order: stdscr-0 */
+-	my_panels[1] = new_panel(my_wins[1]); 	/* Push 1, order: stdscr-0-1 */
+-	my_panels[2] = new_panel(my_wins[2]); 	/* Push 2, order: stdscr-0-1-2 */
+-
+-	/* Update the stacking order. 2nd panel will be on top */
+-	update_panels();
+-
+-	/* Show it on the screen */
+-	doupdate();
+-	
+-	getch();
+-	endwin();
++{       WINDOW *my_wins[3];
++        PANEL  *my_panels[3];
++        int lines = 10, cols = 40, y = 2, x = 4, i;
++
++        initscr();
++        cbreak();
++        noecho();
++
++        /* Create windows for the panels */
++        my_wins[0] = newwin(lines, cols, y, x);
++        my_wins[1] = newwin(lines, cols, y + 1, x + 5);
++        my_wins[2] = newwin(lines, cols, y + 2, x + 10);
++
++        /* 
++         * Create borders around the windows so that you can see the effect
++         * of panels
++         */
++        for(i = 0; i < 3; ++i)
++                box(my_wins[i], 0, 0);
++
++        /* Attach a panel to each window */     /* Order is bottom up */
++        my_panels[0] = new_panel(my_wins[0]);   /* Push 0, order: stdscr-0 */
++        my_panels[1] = new_panel(my_wins[1]);   /* Push 1, order: stdscr-0-1 */
++        my_panels[2] = new_panel(my_wins[2]);   /* Push 2, order: stdscr-0-1-2 */
++
++        /* Update the stacking order. 2nd panel will be on top */
++        update_panels();
++
++        /* Show it on the screen */
++        doupdate();
++        
++        getch();
++        endwin();
+ }
+-
    As you can see, above program follows a simple flow as explained. The windows
+-are created with newwin() and then they are attached to panels with new_panel().
+-As we attach one panel after another, the stack of panels gets updated. To put
+-them on screen update_panels() and doupdate() are called.
    16.3. Panel Window Browsing
    A slightly complicated example is given below. This program creates 3
+-windows which can be cycled through using tab. Have a look at the code.
    Example 15.  Panel Window Browsing Example 
    #include <panel.h>
++
++
    
++        
    
++
++        
    As you can see, above program follows a simple flow as
++        explained. The windows are created with newwin() and then
++        they are attached to panels with new_panel(). As we attach
++        one panel after another, the stack of panels gets updated.
++        To put them on screen update_panels() and doupdate() are
++        called.
    
++      
    
++
++      
    
++        
    
++
++        
    16.3. Panel Window Browsing
    
++
++        
    A slightly complicated example is given below. This
++        program creates 3 windows which can be cycled through using
++        tab. Have a look at the code.
    
++
++        
    
++          
++
++          
    Example 15. Panel Window Browsing Example
    
++          
    ++#include <panel.h>
+ 
+ #define NLINES 10
+ #define NCOLS 40
+@@ -4421,191 +3541,181 @@
+ void print_in_middle(WINDOW *win, int starty, int startx, int width, char *string, chtype color);
+ 
+ int main()
+-{	WINDOW *my_wins[3];
+-	PANEL  *my_panels[3];
+-	PANEL  *top;
+-	int ch;
+-
+-	/* Initialize curses */
+-	initscr();
+-	start_color();
+-	cbreak();
+-	noecho();
+-	keypad(stdscr, TRUE);
+-
+-	/* Initialize all the colors */
+-	init_pair(1, COLOR_RED, COLOR_BLACK);
+-	init_pair(2, COLOR_GREEN, COLOR_BLACK);
+-	init_pair(3, COLOR_BLUE, COLOR_BLACK);
+-	init_pair(4, COLOR_CYAN, COLOR_BLACK);
+-
+-	init_wins(my_wins, 3);
+-	
+-	/* Attach a panel to each window */ 	/* Order is bottom up */
+-	my_panels[0] = new_panel(my_wins[0]); 	/* Push 0, order: stdscr-0 */
+-	my_panels[1] = new_panel(my_wins[1]); 	/* Push 1, order: stdscr-0-1 */
+-	my_panels[2] = new_panel(my_wins[2]); 	/* Push 2, order: stdscr-0-1-2 */
+-
+-	/* Set up the user pointers to the next panel */
+-	set_panel_userptr(my_panels[0], my_panels[1]);
+-	set_panel_userptr(my_panels[1], my_panels[2]);
+-	set_panel_userptr(my_panels[2], my_panels[0]);
+-
+-	/* Update the stacking order. 2nd panel will be on top */
+-	update_panels();
+-
+-	/* Show it on the screen */
+-	attron(COLOR_PAIR(4));
+-	mvprintw(LINES - 2, 0, "Use tab to browse through the windows (F1 to Exit)");
+-	attroff(COLOR_PAIR(4));
+-	doupdate();
+-
+-	top = my_panels[2];
+-	while((ch = getch()) != KEY_F(1))
+-	{	switch(ch)
+-		{	case 9:
+-				top = (PANEL *)panel_userptr(top);
+-				top_panel(top);
+-				break;
+-		}
+-		update_panels();
+-		doupdate();
+-	}
+-	endwin();
+-	return 0;
++{       WINDOW *my_wins[3];
++        PANEL  *my_panels[3];
++        PANEL  *top;
++        int ch;
++
++        /* Initialize curses */
++        initscr();
++        start_color();
++        cbreak();
++        noecho();
++        keypad(stdscr, TRUE);
++
++        /* Initialize all the colors */
++        init_pair(1, COLOR_RED, COLOR_BLACK);
++        init_pair(2, COLOR_GREEN, COLOR_BLACK);
++        init_pair(3, COLOR_BLUE, COLOR_BLACK);
++        init_pair(4, COLOR_CYAN, COLOR_BLACK);
++
++        init_wins(my_wins, 3);
++        
++        /* Attach a panel to each window */     /* Order is bottom up */
++        my_panels[0] = new_panel(my_wins[0]);   /* Push 0, order: stdscr-0 */
++        my_panels[1] = new_panel(my_wins[1]);   /* Push 1, order: stdscr-0-1 */
++        my_panels[2] = new_panel(my_wins[2]);   /* Push 2, order: stdscr-0-1-2 */
++
++        /* Set up the user pointers to the next panel */
++        set_panel_userptr(my_panels[0], my_panels[1]);
++        set_panel_userptr(my_panels[1], my_panels[2]);
++        set_panel_userptr(my_panels[2], my_panels[0]);
++
++        /* Update the stacking order. 2nd panel will be on top */
++        update_panels();
++
++        /* Show it on the screen */
++        attron(COLOR_PAIR(4));
++        mvprintw(LINES - 2, 0, "Use tab to browse through the windows (F1 to Exit)");
++        attroff(COLOR_PAIR(4));
++        doupdate();
++
++        top = my_panels[2];
++        while((ch = getch()) != KEY_F(1))
++        {       switch(ch)
++                {       case 9:
++                                top = (PANEL *)panel_userptr(top);
++                                top_panel(top);
++                                break;
++                }
++                update_panels();
++                doupdate();
++        }
++        endwin();
++        return 0;
+ }
+ 
+ /* Put all the windows */
+ void init_wins(WINDOW **wins, int n)
+-{	int x, y, i;
+-	char label[80];
++{       int x, y, i;
++        char label[80];
+ 
+-	y = 2;
+-	x = 10;
+-	for(i = 0; i < n; ++i)
+-	{	wins[i] = newwin(NLINES, NCOLS, y, x);
+-		sprintf(label, "Window Number %d", i + 1);
+-		win_show(wins[i], label, i + 1);
+-		y += 3;
+-		x += 7;
+-	}
++        y = 2;
++        x = 10;
++        for(i = 0; i < n; ++i)
++        {       wins[i] = newwin(NLINES, NCOLS, y, x);
++                sprintf(label, "Window Number %d", i + 1);
++                win_show(wins[i], label, i + 1);
++                y += 3;
++                x += 7;
++        }
+ }
+ 
+ /* Show the window with a border and a label */
+ void win_show(WINDOW *win, char *label, int label_color)
+-{	int startx, starty, height, width;
++{       int startx, starty, height, width;
+ 
+-	getbegyx(win, starty, startx);
+-	getmaxyx(win, height, width);
++        getbegyx(win, starty, startx);
++        getmaxyx(win, height, width);
+ 
+-	box(win, 0, 0);
+-	mvwaddch(win, 2, 0, ACS_LTEE); 
+-	mvwhline(win, 2, 1, ACS_HLINE, width - 2); 
+-	mvwaddch(win, 2, width - 1, ACS_RTEE); 
+-	
+-	print_in_middle(win, 1, 0, width, label, COLOR_PAIR(label_color));
++        box(win, 0, 0);
++        mvwaddch(win, 2, 0, ACS_LTEE); 
++        mvwhline(win, 2, 1, ACS_HLINE, width - 2); 
++        mvwaddch(win, 2, width - 1, ACS_RTEE); 
++        
++        print_in_middle(win, 1, 0, width, label, COLOR_PAIR(label_color));
+ }
+ 
+ void print_in_middle(WINDOW *win, int starty, int startx, int width, char *string, chtype color)
+-{	int length, x, y;
+-	float temp;
++{       int length, x, y;
++        float temp;
+ 
+-	if(win == NULL)
+-		win = stdscr;
+-	getyx(win, y, x);
+-	if(startx != 0)
+-		x = startx;
+-	if(starty != 0)
+-		y = starty;
+-	if(width == 0)
+-		width = 80;
+-
+-	length = strlen(string);
+-	temp = (width - length)/ 2;
+-	x = startx + (int)temp;
+-	wattron(win, color);
+-	mvwprintw(win, y, x, "%s", string);
+-	wattroff(win, color);
+-	refresh();
+-}
    16.4. Using User Pointers
    In the above example I used user pointers to find out the next window in the
+-cycle.  We can attach custom information to the panel by specifying a user
+-pointer, which can point to any information you want to store. In this case I
+-stored the pointer to the next panel in the cycle. User pointer for a panel can
+-be set with the function  set_panel_userptr().
+-It can be accessed using the function panel_userptr() which will return the user pointer for the panel given as
+-argument. After finding the next panel in the cycle It's brought to the top by
+-the function top_panel().  This function brings the panel given as argument to
+-the top of the panel stack.  
    16.5. Moving and Resizing Panels
    The function move_panel() can be used to move a
+-panel to the desired location. It does not change the position of the panel in
+-the stack. Make sure that you use move_panel() instead mvwin() on the window
+-associated with the panel.
    Resizing a panel is slightly complex.  There is no straight forward function
+-just to resize the window associated with a panel. A solution to resize a panel
+-is to create a new window with the desired sizes, change the window associated
+-with the panel using replace_panel(). Don't forget to delete the old window. The
+-window associated with a panel can be found by using the function
+-panel_window().
    The following program shows these concepts, in supposedly simple program. You
+-can cycle through the window with <TAB> as usual. To resize or move the
+-active panel press 'r' for resize 'm' for moving. Then use arrow keys to resize
+-or move it to the desired way and press enter to end your resizing or moving.
+-This example makes use of user data to get the required data to do the
+-operations. 
    Example 16.  Panel Moving and Resizing example 
    #include <panel.h>
++        if(win == NULL)
++                win = stdscr;
++        getyx(win, y, x);
++        if(startx != 0)
++                x = startx;
++        if(starty != 0)
++                y = starty;
++        if(width == 0)
++                width = 80;
++
++        length = strlen(string);
++        temp = (width - length)/ 2;
++        x = startx + (int)temp;
++        wattron(win, color);
++        mvwprintw(win, y, x, "%s", string);
++        wattroff(win, color);
++        refresh();
++}
++
    
++        
    
++      
    
++
++      
    
++        
    
++
++        
    16.4. Using User Pointers
    
++
++        
    In the above example I used user pointers to find out
++        the next window in the cycle. We can attach custom
++        information to the panel by specifying a user pointer,
++        which can point to any information you want to store. In
++        this case I stored the pointer to the next panel in the
++        cycle. User pointer for a panel can be set with the
++        function set_panel_userptr(). It
++        can be accessed using the function panel_userptr() which will return the user
++        pointer for the panel given as argument. After finding the
++        next panel in the cycle It's brought to the top by the
++        function top_panel(). This function brings the panel given
++        as argument to the top of the panel stack.
    
++      
    
++
++      
    
++        
    
++
++        
    16.5. Moving and Resizing Panels
    
++
++        
    The function move_panel() can
++        be used to move a panel to the desired location. It does
++        not change the position of the panel in the stack. Make
++        sure that you use move_panel() instead mvwin() on the
++        window associated with the panel.
    
++
++        
    Resizing a panel is slightly complex. There is no
++        straight forward function just to resize the window
++        associated with a panel. A solution to resize a panel is to
++        create a new window with the desired sizes, change the
++        window associated with the panel using replace_panel().
++        Don't forget to delete the old window. The window
++        associated with a panel can be found by using the function
++        panel_window().
    
++
++        
    The following program shows these concepts, in
++        supposedly simple program. You can cycle through the window
++        with <TAB> as usual. To resize or move the active
++        panel press 'r' for resize 'm' for moving. Then use arrow
++        keys to resize or move it to the desired way and press
++        enter to end your resizing or moving. This example makes
++        use of user data to get the required data to do the
++        operations.
    
++
++        
    
++          
++
++          
    Example 16. Panel Moving and Resizing
++          example
    
++          
    ++#include <panel.h>
+ 
+ typedef struct _PANEL_DATA {
+-	int x, y, w, h;
+-	char label[80]; 
+-	int label_color;
+-	PANEL *next;
++        int x, y, w, h;
++        char label[80]; 
++        int label_color;
++        PANEL *next;
+ }PANEL_DATA;
+ 
+ #define NLINES 10
+@@ -4617,289 +3727,284 @@
+ void set_user_ptrs(PANEL **panels, int n);
+ 
+ int main()
+-{	WINDOW *my_wins[3];
+-	PANEL  *my_panels[3];
+-	PANEL_DATA  *top;
+-	PANEL *stack_top;
+-	WINDOW *temp_win, *old_win;
+-	int ch;
+-	int newx, newy, neww, newh;
+-	int size = FALSE, move = FALSE;
+-
+-	/* Initialize curses */
+-	initscr();
+-	start_color();
+-	cbreak();
+-	noecho();
+-	keypad(stdscr, TRUE);
+-
+-	/* Initialize all the colors */
+-	init_pair(1, COLOR_RED, COLOR_BLACK);
+-	init_pair(2, COLOR_GREEN, COLOR_BLACK);
+-	init_pair(3, COLOR_BLUE, COLOR_BLACK);
+-	init_pair(4, COLOR_CYAN, COLOR_BLACK);
+-
+-	init_wins(my_wins, 3);
+-	
+-	/* Attach a panel to each window */ 	/* Order is bottom up */
+-	my_panels[0] = new_panel(my_wins[0]); 	/* Push 0, order: stdscr-0 */
+-	my_panels[1] = new_panel(my_wins[1]); 	/* Push 1, order: stdscr-0-1 */
+-	my_panels[2] = new_panel(my_wins[2]); 	/* Push 2, order: stdscr-0-1-2 */
+-
+-	set_user_ptrs(my_panels, 3);
+-	/* Update the stacking order. 2nd panel will be on top */
+-	update_panels();
+-
+-	/* Show it on the screen */
+-	attron(COLOR_PAIR(4));
+-	mvprintw(LINES - 3, 0, "Use 'm' for moving, 'r' for resizing");
+-	mvprintw(LINES - 2, 0, "Use tab to browse through the windows (F1 to Exit)");
+-	attroff(COLOR_PAIR(4));
+-	doupdate();
+-
+-	stack_top = my_panels[2];
+-	top = (PANEL_DATA *)panel_userptr(stack_top);
+-	newx = top->x;
+-	newy = top->y;
+-	neww = top->w;
+-	newh = top->h;
+-	while((ch = getch()) != KEY_F(1))
+-	{	switch(ch)
+-		{	case 9:		/* Tab */
+-				top = (PANEL_DATA *)panel_userptr(stack_top);
+-				top_panel(top->next);
+-				stack_top = top->next;
+-				top = (PANEL_DATA *)panel_userptr(stack_top);
+-				newx = top->x;
+-				newy = top->y;
+-				neww = top->w;
+-				newh = top->h;
+-				break;
+-			case 'r':	/* Re-Size*/
+-				size = TRUE;
+-				attron(COLOR_PAIR(4));
+-				mvprintw(LINES - 4, 0, "Entered Resizing :Use Arrow Keys to resize and press <ENTER> to end resizing");
+-				refresh();
+-				attroff(COLOR_PAIR(4));
+-				break;
+-			case 'm':	/* Move */
+-				attron(COLOR_PAIR(4));
+-				mvprintw(LINES - 4, 0, "Entered Moving: Use Arrow Keys to Move and press <ENTER> to end moving");
+-				refresh();
+-				attroff(COLOR_PAIR(4));
+-				move = TRUE;
+-				break;
+-			case KEY_LEFT:
+-				if(size == TRUE)
+-				{	--newx;
+-					++neww;
+-				}
+-				if(move == TRUE)
+-					--newx;
+-				break;
+-			case KEY_RIGHT:
+-				if(size == TRUE)
+-				{	++newx;
+-					--neww;
+-				}
+-				if(move == TRUE)
+-					++newx;
+-				break;
+-			case KEY_UP:
+-				if(size == TRUE)
+-				{	--newy;
+-					++newh;
+-				}
+-				if(move == TRUE)
+-					--newy;
+-				break;
+-			case KEY_DOWN:
+-				if(size == TRUE)
+-				{	++newy;
+-					--newh;
+-				}
+-				if(move == TRUE)
+-					++newy;
+-				break;
+-			case 10:	/* Enter */
+-				move(LINES - 4, 0);
+-				clrtoeol();
+-				refresh();
+-				if(size == TRUE)
+-				{	old_win = panel_window(stack_top);
+-					temp_win = newwin(newh, neww, newy, newx);
+-					replace_panel(stack_top, temp_win);
+-					win_show(temp_win, top->label, top->label_color); 
+-					delwin(old_win);
+-					size = FALSE;
+-				}
+-				if(move == TRUE)
+-				{	move_panel(stack_top, newy, newx);
+-					move = FALSE;
+-				}
+-				break;
+-			
+-		}
+-		attron(COLOR_PAIR(4));
+-		mvprintw(LINES - 3, 0, "Use 'm' for moving, 'r' for resizing");
+-	    	mvprintw(LINES - 2, 0, "Use tab to browse through the windows (F1 to Exit)");
+-	    	attroff(COLOR_PAIR(4));
+-	        refresh();	
+-		update_panels();
+-		doupdate();
+-	}
+-	endwin();
+-	return 0;
++{       WINDOW *my_wins[3];
++        PANEL  *my_panels[3];
++        PANEL_DATA  *top;
++        PANEL *stack_top;
++        WINDOW *temp_win, *old_win;
++        int ch;
++        int newx, newy, neww, newh;
++        int size = FALSE, move = FALSE;
++
++        /* Initialize curses */
++        initscr();
++        start_color();
++        cbreak();
++        noecho();
++        keypad(stdscr, TRUE);
++
++        /* Initialize all the colors */
++        init_pair(1, COLOR_RED, COLOR_BLACK);
++        init_pair(2, COLOR_GREEN, COLOR_BLACK);
++        init_pair(3, COLOR_BLUE, COLOR_BLACK);
++        init_pair(4, COLOR_CYAN, COLOR_BLACK);
++
++        init_wins(my_wins, 3);
++        
++        /* Attach a panel to each window */     /* Order is bottom up */
++        my_panels[0] = new_panel(my_wins[0]);   /* Push 0, order: stdscr-0 */
++        my_panels[1] = new_panel(my_wins[1]);   /* Push 1, order: stdscr-0-1 */
++        my_panels[2] = new_panel(my_wins[2]);   /* Push 2, order: stdscr-0-1-2 */
++
++        set_user_ptrs(my_panels, 3);
++        /* Update the stacking order. 2nd panel will be on top */
++        update_panels();
++
++        /* Show it on the screen */
++        attron(COLOR_PAIR(4));
++        mvprintw(LINES - 3, 0, "Use 'm' for moving, 'r' for resizing");
++        mvprintw(LINES - 2, 0, "Use tab to browse through the windows (F1 to Exit)");
++        attroff(COLOR_PAIR(4));
++        doupdate();
++
++        stack_top = my_panels[2];
++        top = (PANEL_DATA *)panel_userptr(stack_top);
++        newx = top->x;
++        newy = top->y;
++        neww = top->w;
++        newh = top->h;
++        while((ch = getch()) != KEY_F(1))
++        {       switch(ch)
++                {       case 9:         /* Tab */
++                                top = (PANEL_DATA *)panel_userptr(stack_top);
++                                top_panel(top->next);
++                                stack_top = top->next;
++                                top = (PANEL_DATA *)panel_userptr(stack_top);
++                                newx = top->x;
++                                newy = top->y;
++                                neww = top->w;
++                                newh = top->h;
++                                break;
++                        case 'r':       /* Re-Size*/
++                                size = TRUE;
++                                attron(COLOR_PAIR(4));
++                                mvprintw(LINES - 4, 0, "Entered Resizing :Use Arrow Keys to resize and press <ENTER> to end resizing");
++                                refresh();
++                                attroff(COLOR_PAIR(4));
++                                break;
++                        case 'm':       /* Move */
++                                attron(COLOR_PAIR(4));
++                                mvprintw(LINES - 4, 0, "Entered Moving: Use Arrow Keys to Move and press <ENTER> to end moving");
++                                refresh();
++                                attroff(COLOR_PAIR(4));
++                                move = TRUE;
++                                break;
++                        case KEY_LEFT:
++                                if(size == TRUE)
++                                {       --newx;
++                                        ++neww;
++                                }
++                                if(move == TRUE)
++                                        --newx;
++                                break;
++                        case KEY_RIGHT:
++                                if(size == TRUE)
++                                {       ++newx;
++                                        --neww;
++                                }
++                                if(move == TRUE)
++                                        ++newx;
++                                break;
++                        case KEY_UP:
++                                if(size == TRUE)
++                                {       --newy;
++                                        ++newh;
++                                }
++                                if(move == TRUE)
++                                        --newy;
++                                break;
++                        case KEY_DOWN:
++                                if(size == TRUE)
++                                {       ++newy;
++                                        --newh;
++                                }
++                                if(move == TRUE)
++                                        ++newy;
++                                break;
++                        case 10:        /* Enter */
++                                move(LINES - 4, 0);
++                                clrtoeol();
++                                refresh();
++                                if(size == TRUE)
++                                {       old_win = panel_window(stack_top);
++                                        temp_win = newwin(newh, neww, newy, newx);
++                                        replace_panel(stack_top, temp_win);
++                                        win_show(temp_win, top->label, top->label_color); 
++                                        delwin(old_win);
++                                        size = FALSE;
++                                }
++                                if(move == TRUE)
++                                {       move_panel(stack_top, newy, newx);
++                                        move = FALSE;
++                                }
++                                break;
++                        
++                }
++                attron(COLOR_PAIR(4));
++                mvprintw(LINES - 3, 0, "Use 'm' for moving, 'r' for resizing");
++                mvprintw(LINES - 2, 0, "Use tab to browse through the windows (F1 to Exit)");
++                attroff(COLOR_PAIR(4));
++                refresh();      
++                update_panels();
++                doupdate();
++        }
++        endwin();
++        return 0;
+ }
+ 
+ /* Put all the windows */
+ void init_wins(WINDOW **wins, int n)
+-{	int x, y, i;
+-	char label[80];
++{       int x, y, i;
++        char label[80];
+ 
+-	y = 2;
+-	x = 10;
+-	for(i = 0; i < n; ++i)
+-	{	wins[i] = newwin(NLINES, NCOLS, y, x);
+-		sprintf(label, "Window Number %d", i + 1);
+-		win_show(wins[i], label, i + 1);
+-		y += 3;
+-		x += 7;
+-	}
++        y = 2;
++        x = 10;
++        for(i = 0; i < n; ++i)
++        {       wins[i] = newwin(NLINES, NCOLS, y, x);
++                sprintf(label, "Window Number %d", i + 1);
++                win_show(wins[i], label, i + 1);
++                y += 3;
++                x += 7;
++        }
+ }
+ 
+ /* Set the PANEL_DATA structures for individual panels */
+ void set_user_ptrs(PANEL **panels, int n)
+-{	PANEL_DATA *ptrs;
+-	WINDOW *win;
+-	int x, y, w, h, i;
+-	char temp[80];
+-	
+-	ptrs = (PANEL_DATA *)calloc(n, sizeof(PANEL_DATA));
+-
+-	for(i = 0;i < n; ++i)
+-	{	win = panel_window(panels[i]);
+-		getbegyx(win, y, x);
+-		getmaxyx(win, h, w);
+-		ptrs[i].x = x;
+-		ptrs[i].y = y;
+-		ptrs[i].w = w;
+-		ptrs[i].h = h;
+-		sprintf(temp, "Window Number %d", i + 1);
+-		strcpy(ptrs[i].label, temp);
+-		ptrs[i].label_color = i + 1;
+-		if(i + 1 == n)
+-			ptrs[i].next = panels[0];
+-		else
+-			ptrs[i].next = panels[i + 1];
+-		set_panel_userptr(panels[i], &ptrs[i]);
+-	}
++{       PANEL_DATA *ptrs;
++        WINDOW *win;
++        int x, y, w, h, i;
++        char temp[80];
++        
++        ptrs = (PANEL_DATA *)calloc(n, sizeof(PANEL_DATA));
++
++        for(i = 0;i < n; ++i)
++        {       win = panel_window(panels[i]);
++                getbegyx(win, y, x);
++                getmaxyx(win, h, w);
++                ptrs[i].x = x;
++                ptrs[i].y = y;
++                ptrs[i].w = w;
++                ptrs[i].h = h;
++                sprintf(temp, "Window Number %d", i + 1);
++                strcpy(ptrs[i].label, temp);
++                ptrs[i].label_color = i + 1;
++                if(i + 1 == n)
++                        ptrs[i].next = panels[0];
++                else
++                        ptrs[i].next = panels[i + 1];
++                set_panel_userptr(panels[i], &ptrs[i]);
++        }
+ }
+ 
+ /* Show the window with a border and a label */
+ void win_show(WINDOW *win, char *label, int label_color)
+-{	int startx, starty, height, width;
++{       int startx, starty, height, width;
+ 
+-	getbegyx(win, starty, startx);
+-	getmaxyx(win, height, width);
++        getbegyx(win, starty, startx);
++        getmaxyx(win, height, width);
+ 
+-	box(win, 0, 0);
+-	mvwaddch(win, 2, 0, ACS_LTEE); 
+-	mvwhline(win, 2, 1, ACS_HLINE, width - 2); 
+-	mvwaddch(win, 2, width - 1, ACS_RTEE); 
+-	
+-	print_in_middle(win, 1, 0, width, label, COLOR_PAIR(label_color));
++        box(win, 0, 0);
++        mvwaddch(win, 2, 0, ACS_LTEE); 
++        mvwhline(win, 2, 1, ACS_HLINE, width - 2); 
++        mvwaddch(win, 2, width - 1, ACS_RTEE); 
++        
++        print_in_middle(win, 1, 0, width, label, COLOR_PAIR(label_color));
+ }
+ 
+ void print_in_middle(WINDOW *win, int starty, int startx, int width, char *string, chtype color)
+-{	int length, x, y;
+-	float temp;
++{       int length, x, y;
++        float temp;
+ 
+-	if(win == NULL)
+-		win = stdscr;
+-	getyx(win, y, x);
+-	if(startx != 0)
+-		x = startx;
+-	if(starty != 0)
+-		y = starty;
+-	if(width == 0)
+-		width = 80;
+-
+-	length = strlen(string);
+-	temp = (width - length)/ 2;
+-	x = startx + (int)temp;
+-	wattron(win, color);
+-	mvwprintw(win, y, x, "%s", string);
+-	wattroff(win, color);
+-	refresh();
+-}
    Concentrate on the main while loop. Once it finds out the type of key pressed,
+-it takes appropriate action. If 'r' is pressed resizing mode is started. After
+-this the new sizes are updated as the user presses the arrow keys. When the user
+-presses <ENTER> present selection ends and panel is resized by using the
+-concept explained.  While in resizing mode the program doesn't show how the
+-window is getting resized.  It's left as an exercise to the reader to print a
+-dotted border while it gets resized to a new position. 
    When the user presses 'm' the move mode starts. This is a bit simpler than
+-resizing.  As the arrow keys are pressed the new position is updated and
+-pressing of <ENTER> causes the panel to be moved by calling the function
+-move_panel().
    In this program the user data which is represented as PANEL_DATA, plays very
+-important role in finding the associated information with a panel. As written in
+-the comments, the PANEL_DATA stores the panel sizes, label, label color and a
+-pointer to the next panel in the cycle.
    16.6. Hiding and Showing Panels
    A Panel can be hidden by using the function hide_panel(). This function merely
+-removes it form the stack of panels, thus hiding it on the screen once you do
+-update_panels() and doupdate(). It doesn't destroy the PANEL structure
+-associated with the hidden panel.  It can be shown again by using the
+-show_panel() function.
    The following program shows the hiding of panels. Press 'a' or 'b' or 'c' to
+-show or hide first, second and third windows respectively. It uses a user data
+-with a small variable hide, which keeps track of whether the window is hidden or
+-not. For some reason the function
+-panel_hidden() which tells whether a panel is
+-hidden or not is not working.  A bug report was also presented by Michael Andres
+- here
    Example 17.  Panel Hiding and Showing example 
    #include <panel.h>
++        if(win == NULL)
++                win = stdscr;
++        getyx(win, y, x);
++        if(startx != 0)
++                x = startx;
++        if(starty != 0)
++                y = starty;
++        if(width == 0)
++                width = 80;
++
++        length = strlen(string);
++        temp = (width - length)/ 2;
++        x = startx + (int)temp;
++        wattron(win, color);
++        mvwprintw(win, y, x, "%s", string);
++        wattroff(win, color);
++        refresh();
++}
++
    
++        
    
++
++        
    Concentrate on the main while loop. Once it finds out
++        the type of key pressed, it takes appropriate action. If
++        'r' is pressed resizing mode is started. After this the new
++        sizes are updated as the user presses the arrow keys. When
++        the user presses <ENTER> present selection ends and
++        panel is resized by using the concept explained. While in
++        resizing mode the program doesn't show how the window is
++        getting resized. It's left as an exercise to the reader to
++        print a dotted border while it gets resized to a new
++        position.
    
++
++        
    When the user presses 'm' the move mode starts. This is
++        a bit simpler than resizing. As the arrow keys are pressed
++        the new position is updated and pressing of <ENTER>
++        causes the panel to be moved by calling the function
++        move_panel().
    
++
++        
    In this program the user data which is represented as
++        PANEL_DATA, plays very important role in finding the
++        associated information with a panel. As written in the
++        comments, the PANEL_DATA stores the panel sizes, label,
++        label color and a pointer to the next panel in the
++        cycle.
    
++      
    
++
++      
    
++        
    
++
++        
    16.6. Hiding and Showing Panels
    
++
++        
    A Panel can be hidden by using the function
++        hide_panel(). This function merely removes it form the
++        stack of panels, thus hiding it on the screen once you do
++        update_panels() and doupdate(). It doesn't destroy the
++        PANEL structure associated with the hidden panel. It can be
++        shown again by using the show_panel() function.
    
++
++        
    The following program shows the hiding of panels. Press
++        'a' or 'b' or 'c' to show or hide first, second and third
++        windows respectively. It uses a user data with a small
++        variable hide, which keeps track of whether the window is
++        hidden or not. For some reason the function panel_hidden() which tells whether a panel
++        is hidden or not is not working. A bug report was also
++        presented by Michael Andres here
    
++
++        
    
++          
++
++          
    Example 17. Panel Hiding and Showing
++          example
    
++          
    ++#include <panel.h>
+ 
+ typedef struct _PANEL_DATA {
+-	int hide;	/* TRUE if panel is hidden */
++        int hide;       /* TRUE if panel is hidden */
+ }PANEL_DATA;
+ 
+ #define NLINES 10
+@@ -4910,292 +4015,279 @@
+ void print_in_middle(WINDOW *win, int starty, int startx, int width, char *string, chtype color);
+ 
+ int main()
+-{	WINDOW *my_wins[3];
+-	PANEL  *my_panels[3];
+-	PANEL_DATA panel_datas[3];
+-	PANEL_DATA *temp;
+-	int ch;
+-
+-	/* Initialize curses */
+-	initscr();
+-	start_color();
+-	cbreak();
+-	noecho();
+-	keypad(stdscr, TRUE);
+-
+-	/* Initialize all the colors */
+-	init_pair(1, COLOR_RED, COLOR_BLACK);
+-	init_pair(2, COLOR_GREEN, COLOR_BLACK);
+-	init_pair(3, COLOR_BLUE, COLOR_BLACK);
+-	init_pair(4, COLOR_CYAN, COLOR_BLACK);
+-
+-	init_wins(my_wins, 3);
+-	
+-	/* Attach a panel to each window */ 	/* Order is bottom up */
+-	my_panels[0] = new_panel(my_wins[0]); 	/* Push 0, order: stdscr-0 */
+-	my_panels[1] = new_panel(my_wins[1]); 	/* Push 1, order: stdscr-0-1 */
+-	my_panels[2] = new_panel(my_wins[2]); 	/* Push 2, order: stdscr-0-1-2 */
+-
+-	/* Initialize panel datas saying that nothing is hidden */
+-	panel_datas[0].hide = FALSE;
+-	panel_datas[1].hide = FALSE;
+-	panel_datas[2].hide = FALSE;
+-
+-	set_panel_userptr(my_panels[0], &panel_datas[0]);
+-	set_panel_userptr(my_panels[1], &panel_datas[1]);
+-	set_panel_userptr(my_panels[2], &panel_datas[2]);
+-
+-	/* Update the stacking order. 2nd panel will be on top */
+-	update_panels();
+-
+-	/* Show it on the screen */
+-	attron(COLOR_PAIR(4));
+-	mvprintw(LINES - 3, 0, "Show or Hide a window with 'a'(first window)  'b'(Second Window)  'c'(Third Window)");
+-	mvprintw(LINES - 2, 0, "F1 to Exit");
+-
+-	attroff(COLOR_PAIR(4));
+-	doupdate();
+-	
+-	while((ch = getch()) != KEY_F(1))
+-	{	switch(ch)
+-		{	case 'a':			
+-				temp = (PANEL_DATA *)panel_userptr(my_panels[0]);
+-				if(temp->hide == FALSE)
+-				{	hide_panel(my_panels[0]);
+-					temp->hide = TRUE;
+-				}
+-				else
+-				{	show_panel(my_panels[0]);
+-					temp->hide = FALSE;
+-				}
+-				break;
+-			case 'b':
+-				temp = (PANEL_DATA *)panel_userptr(my_panels[1]);
+-				if(temp->hide == FALSE)
+-				{	hide_panel(my_panels[1]);
+-					temp->hide = TRUE;
+-				}
+-				else
+-				{	show_panel(my_panels[1]);
+-					temp->hide = FALSE;
+-				}
+-				break;
+-			case 'c':
+-				temp = (PANEL_DATA *)panel_userptr(my_panels[2]);
+-				if(temp->hide == FALSE)
+-				{	hide_panel(my_panels[2]);
+-					temp->hide = TRUE;
+-				}
+-				else
+-				{	show_panel(my_panels[2]);
+-					temp->hide = FALSE;
+-				}
+-				break;
+-		}
+-		update_panels();
+-		doupdate();
+-	}
+-	endwin();
+-	return 0;
++{       WINDOW *my_wins[3];
++        PANEL  *my_panels[3];
++        PANEL_DATA panel_datas[3];
++        PANEL_DATA *temp;
++        int ch;
++
++        /* Initialize curses */
++        initscr();
++        start_color();
++        cbreak();
++        noecho();
++        keypad(stdscr, TRUE);
++
++        /* Initialize all the colors */
++        init_pair(1, COLOR_RED, COLOR_BLACK);
++        init_pair(2, COLOR_GREEN, COLOR_BLACK);
++        init_pair(3, COLOR_BLUE, COLOR_BLACK);
++        init_pair(4, COLOR_CYAN, COLOR_BLACK);
++
++        init_wins(my_wins, 3);
++        
++        /* Attach a panel to each window */     /* Order is bottom up */
++        my_panels[0] = new_panel(my_wins[0]);   /* Push 0, order: stdscr-0 */
++        my_panels[1] = new_panel(my_wins[1]);   /* Push 1, order: stdscr-0-1 */
++        my_panels[2] = new_panel(my_wins[2]);   /* Push 2, order: stdscr-0-1-2 */
++
++        /* Initialize panel datas saying that nothing is hidden */
++        panel_datas[0].hide = FALSE;
++        panel_datas[1].hide = FALSE;
++        panel_datas[2].hide = FALSE;
++
++        set_panel_userptr(my_panels[0], &panel_datas[0]);
++        set_panel_userptr(my_panels[1], &panel_datas[1]);
++        set_panel_userptr(my_panels[2], &panel_datas[2]);
++
++        /* Update the stacking order. 2nd panel will be on top */
++        update_panels();
++
++        /* Show it on the screen */
++        attron(COLOR_PAIR(4));
++        mvprintw(LINES - 3, 0, "Show or Hide a window with 'a'(first window)  'b'(Second Window)  'c'(Third Window)");
++        mvprintw(LINES - 2, 0, "F1 to Exit");
++
++        attroff(COLOR_PAIR(4));
++        doupdate();
++        
++        while((ch = getch()) != KEY_F(1))
++        {       switch(ch)
++                {       case 'a':                       
++                                temp = (PANEL_DATA *)panel_userptr(my_panels[0]);
++                                if(temp->hide == FALSE)
++                                {       hide_panel(my_panels[0]);
++                                        temp->hide = TRUE;
++                                }
++                                else
++                                {       show_panel(my_panels[0]);
++                                        temp->hide = FALSE;
++                                }
++                                break;
++                        case 'b':
++                                temp = (PANEL_DATA *)panel_userptr(my_panels[1]);
++                                if(temp->hide == FALSE)
++                                {       hide_panel(my_panels[1]);
++                                        temp->hide = TRUE;
++                                }
++                                else
++                                {       show_panel(my_panels[1]);
++                                        temp->hide = FALSE;
++                                }
++                                break;
++                        case 'c':
++                                temp = (PANEL_DATA *)panel_userptr(my_panels[2]);
++                                if(temp->hide == FALSE)
++                                {       hide_panel(my_panels[2]);
++                                        temp->hide = TRUE;
++                                }
++                                else
++                                {       show_panel(my_panels[2]);
++                                        temp->hide = FALSE;
++                                }
++                                break;
++                }
++                update_panels();
++                doupdate();
++        }
++        endwin();
++        return 0;
+ }
+ 
+ /* Put all the windows */
+ void init_wins(WINDOW **wins, int n)
+-{	int x, y, i;
+-	char label[80];
++{       int x, y, i;
++        char label[80];
+ 
+-	y = 2;
+-	x = 10;
+-	for(i = 0; i < n; ++i)
+-	{	wins[i] = newwin(NLINES, NCOLS, y, x);
+-		sprintf(label, "Window Number %d", i + 1);
+-		win_show(wins[i], label, i + 1);
+-		y += 3;
+-		x += 7;
+-	}
++        y = 2;
++        x = 10;
++        for(i = 0; i < n; ++i)
++        {       wins[i] = newwin(NLINES, NCOLS, y, x);
++                sprintf(label, "Window Number %d", i + 1);
++                win_show(wins[i], label, i + 1);
++                y += 3;
++                x += 7;
++        }
+ }
+ 
+ /* Show the window with a border and a label */
+ void win_show(WINDOW *win, char *label, int label_color)
+-{	int startx, starty, height, width;
++{       int startx, starty, height, width;
+ 
+-	getbegyx(win, starty, startx);
+-	getmaxyx(win, height, width);
++        getbegyx(win, starty, startx);
++        getmaxyx(win, height, width);
+ 
+-	box(win, 0, 0);
+-	mvwaddch(win, 2, 0, ACS_LTEE); 
+-	mvwhline(win, 2, 1, ACS_HLINE, width - 2); 
+-	mvwaddch(win, 2, width - 1, ACS_RTEE); 
+-	
+-	print_in_middle(win, 1, 0, width, label, COLOR_PAIR(label_color));
++        box(win, 0, 0);
++        mvwaddch(win, 2, 0, ACS_LTEE); 
++        mvwhline(win, 2, 1, ACS_HLINE, width - 2); 
++        mvwaddch(win, 2, width - 1, ACS_RTEE); 
++        
++        print_in_middle(win, 1, 0, width, label, COLOR_PAIR(label_color));
+ }
+ 
+ void print_in_middle(WINDOW *win, int starty, int startx, int width, char *string, chtype color)
+-{	int length, x, y;
+-	float temp;
++{       int length, x, y;
++        float temp;
+ 
+-	if(win == NULL)
+-		win = stdscr;
+-	getyx(win, y, x);
+-	if(startx != 0)
+-		x = startx;
+-	if(starty != 0)
+-		y = starty;
+-	if(width == 0)
+-		width = 80;
+-
+-	length = strlen(string);
+-	temp = (width - length)/ 2;
+-	x = startx + (int)temp;
+-	wattron(win, color);
+-	mvwprintw(win, y, x, "%s", string);
+-	wattroff(win, color);
+-	refresh();
+-}
    16.7. panel_above() and panel_below() Functions
    The functions panel_above() and
+-panel_below() can be used to find out the panel
+-above and below a panel. If the argument to these functions is NULL, then they
+-return a pointer to bottom panel and top panel respectively.
    17. Menus Library
    The menus library provides a nice extension to basic curses, through which you
+-can create menus. It provides a set of functions to create menus. But they have
+-to be customized to give a nicer look, with colors etc. Let's get into the
+-details.
    A menu is a screen display that assists the user to choose some subset of a
+-given set of items. To put it simple, a menu is a collection of items from which
+-one or more items can be chosen. Some readers might not be aware of multiple
+-item selection capability.  Menu library provides functionality to write menus
+-from which the user can chose more than one item as the preferred choice. This
+-is dealt with in a later section. Now it is time for some rudiments.
    17.1. The Basics
    To create menus, you first create items, and then post the menu to the display.
+-After that, all the processing of user responses is done in an elegant function
+-menu_driver() which is the work horse of any menu program. 
    The general flow of control of a menu program looks like this.
+-
    1. Initialize curses
    2. Create items using new_item(). You can specify a name and description for the
+-items.
    3. Create the menu with new_menu() by specifying the items to be attached with.
    4. Post the menu with menu_post() and refresh the screen.
    5. Process the user requests with a loop and do necessary updates to menu with
+-menu_driver.
    6. Unpost the menu with menu_unpost()
    7. Free the memory allocated to menu by free_menu()
    8. Free the memory allocated to the items with free_item() 
    9. End curses 
    Let's see a program which prints a simple menu and updates the current selection
+-with up, down arrows. 
    17.2. Compiling With the Menu Library
    To use menu library functions, you have to include menu.h and to link the
+-program with menu library the flag -lmenu should be added along with -lncurses
+-in that order.
        #include <menu.h>
++        if(win == NULL)
++                win = stdscr;
++        getyx(win, y, x);
++        if(startx != 0)
++                x = startx;
++        if(starty != 0)
++                y = starty;
++        if(width == 0)
++                width = 80;
++
++        length = strlen(string);
++        temp = (width - length)/ 2;
++        x = startx + (int)temp;
++        wattron(win, color);
++        mvwprintw(win, y, x, "%s", string);
++        wattroff(win, color);
++        refresh();
++}
++
    
++        
    
++      
    
++
++      
    
++        
    
++
++        
    16.7. panel_above() and panel_below()
++        Functions
    
++
++        
    The functions panel_above() and
++        panel_below() can be used to find
++        out the panel above and below a panel. If the argument to
++        these functions is NULL, then they return a pointer to
++        bottom panel and top panel respectively.
    
++      
    
++    
    
++
++    
    
++      
    
++
++      
    17. Menus
++      Library
    
++
++      
    The menus library provides a nice extension to basic
++      curses, through which you can create menus. It provides a set
++      of functions to create menus. But they have to be customized
++      to give a nicer look, with colors etc. Let's get into the
++      details.
    
++
++      
    A menu is a screen display that assists the user to choose
++      some subset of a given set of items. To put it simple, a menu
++      is a collection of items from which one or more items can be
++      chosen. Some readers might not be aware of multiple item
++      selection capability. Menu library provides functionality to
++      write menus from which the user can chose more than one item
++      as the preferred choice. This is dealt with in a later
++      section. Now it is time for some rudiments.
    
++
++      
    
++        
    
++
++        
    17.1. The Basics
    
++
++        
    To create menus, you first create items, and then post
++        the menu to the display. After that, all the processing of
++        user responses is done in an elegant function menu_driver()
++        which is the work horse of any menu program.
    
++
++        
    The general flow of control of a menu program looks like
++        this.
    
++
++        
      
++          
    1. 
++            
      Initialize curses
      
++          
      2. 
++
++          
    2. 
++            
      Create items using new_item(). You can specify a
++            name and description for the items.
      
++          
      3. 
++
++          
    3. 
++            
      Create the menu with new_menu() by specifying the
++            items to be attached with.
      
++          
      4. 
++
++          
    4. 
++            
      Post the menu with menu_post() and refresh the
++            screen.
      
++          
      5. 
++
++          
    5. 
++            
      Process the user requests with a loop and do
++            necessary updates to menu with menu_driver.
      
++          
      6. 
++
++          
    6. 
++            
      Unpost the menu with menu_unpost()
      
++          
      7. 
++
++          
    7. 
++            
      Free the memory allocated to menu by free_menu()
      
++          
      8. 
++
++          
    8. 
++            
      Free the memory allocated to the items with
++            free_item()
      
++          
      9. 
++
++          
    9. 
++            
      End curses
      
++          
      10. 
++        
    
++
++        
    Let's see a program which prints a simple menu and
++        updates the current selection with up, down arrows.
    
++      
    
++
++      
    
++        
    
++
++        
    17.2. Compiling With the Menu
++        Library
    
++
++        
    To use menu library functions, you have to include
++        menu.h and to link the program with menu library the flag
++        -lmenu should be added along with -lncurses in that
++        order.
    
++        
    ++    #include <menu.h>
+     .
+     .
+     .
+ 
+-    compile and link: gcc <program file> -lmenu -lncurses
    Example 18. Menu Basics 
    #include <curses.h>
+-#include <menu.h>
++    compile and link: gcc <program file> -lmenu -lncurses
++
    
++
++        
    
++          
++
++          
    Example 18. Menu Basics
    
++          
    ++#include <curses.h>
++#include <menu.h>
+ 
+ #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+-#define CTRLD 	4
++#define CTRLD   4
+ 
+ char *choices[] = {
+                         "Choice 1",
+@@ -5206,64 +4298,67 @@
+                   };
+ 
+ int main()
+-{	ITEM **my_items;
+-	int c;				
+-	MENU *my_menu;
+-	int n_choices, i;
+-	ITEM *cur_item;
+-	
+-	
+-	initscr();
+-	cbreak();
+-	noecho();
+-	keypad(stdscr, TRUE);
+-	
+-	n_choices = ARRAY_SIZE(choices);
+-	my_items = (ITEM **)calloc(n_choices + 1, sizeof(ITEM *));
+-
+-	for(i = 0; i < n_choices; ++i)
+-	        my_items[i] = new_item(choices[i], choices[i]);
+-	my_items[n_choices] = (ITEM *)NULL;
+-
+-	my_menu = new_menu((ITEM **)my_items);
+-	mvprintw(LINES - 2, 0, "F1 to Exit");
+-	post_menu(my_menu);
+-	refresh();
+-
+-	while((c = getch()) != KEY_F(1))
+-	{   switch(c)
+-	    {	case KEY_DOWN:
+-		        menu_driver(my_menu, REQ_DOWN_ITEM);
+-				break;
+-			case KEY_UP:
+-				menu_driver(my_menu, REQ_UP_ITEM);
+-				break;
+-		}
+-	}	
+-
+-	free_item(my_items[0]);
+-	free_item(my_items[1]);
+-	free_menu(my_menu);
+-	endwin();
++{       ITEM **my_items;
++        int c;                          
++        MENU *my_menu;
++        int n_choices, i;
++        ITEM *cur_item;
++        
++        
++        initscr();
++        cbreak();
++        noecho();
++        keypad(stdscr, TRUE);
++        
++        n_choices = ARRAY_SIZE(choices);
++        my_items = (ITEM **)calloc(n_choices + 1, sizeof(ITEM *));
++
++        for(i = 0; i < n_choices; ++i)
++                my_items[i] = new_item(choices[i], choices[i]);
++        my_items[n_choices] = (ITEM *)NULL;
++
++        my_menu = new_menu((ITEM **)my_items);
++        mvprintw(LINES - 2, 0, "F1 to Exit");
++        post_menu(my_menu);
++        refresh();
++
++        while((c = getch()) != KEY_F(1))
++        {   switch(c)
++            {   case KEY_DOWN:
++                        menu_driver(my_menu, REQ_DOWN_ITEM);
++                                break;
++                        case KEY_UP:
++                                menu_driver(my_menu, REQ_UP_ITEM);
++                                break;
++                }
++        }       
++
++        free_item(my_items[0]);
++        free_item(my_items[1]);
++        free_menu(my_menu);
++        endwin();
+ }
+-	
    This program demonstrates the basic concepts involved in creating a menu using
+-menus library.  First we create the items using new_item() and then attach them
+-to the menu with new_menu() function. After posting the menu and refreshing the
+-screen, the main processing loop starts. It reads user input and takes
+-corresponding action. The function menu_driver() is the main work horse of the
+-menu system. The second parameter to this function tells what's to be done with
+-the menu. According to the parameter, menu_driver() does the corresponding task.
+-The value can be either a menu navigational request, an ascii character, or a
+-KEY_MOUSE special key associated with a mouse event.
    The menu_driver accepts following navigational requests. 
+-
    
     REQ_LEFT_ITEM         Move left to an item.
++        
++
    
++        
    
++
++        
    This program demonstrates the basic concepts involved in
++        creating a menu using menus library. First we create the
++        items using new_item() and then attach them to the menu
++        with new_menu() function. After posting the menu and
++        refreshing the screen, the main processing loop starts. It
++        reads user input and takes corresponding action. The
++        function menu_driver() is the main work horse of the menu
++        system. The second parameter to this function tells what's
++        to be done with the menu. According to the parameter,
++        menu_driver() does the corresponding task. The value can be
++        either a menu navigational request, an ascii character, or
++        a KEY_MOUSE special key associated with a mouse event.
    
++
++        
    The menu_driver accepts following navigational
++        requests.
    
++        
    ++
     REQ_LEFT_ITEM         Move left to an item.
+      REQ_RIGHT_ITEM      Move right to an item.
+      REQ_UP_ITEM         Move up to an item.
+      REQ_DOWN_ITEM       Move down to an item.
+@@ -5279,144 +4374,116 @@
+      REQ_CLEAR_PATTERN     Clear the menu pattern buffer.
+      REQ_BACK_PATTERN      Delete the previous character from the pattern buffer.
+      REQ_NEXT_MATCH     Move to the next item matching the pattern match.
+-     REQ_PREV_MATCH     Move to the previous item matching the pattern match.
    Don't get overwhelmed by the number of options. We will see them slowly one
+-after another. The options of interest in this example are REQ_UP_ITEM and
+-REQ_DOWN_ITEM.  These two options when passed to menu_driver, menu driver
+-updates the current item to one item up or down respectively.
    17.3. Menu Driver: The work horse of the menu system
    As you have seen in the above example, menu_driver plays an important role in
+-updating the menu. It is very important to understand various options it takes
+-and what they do.  As explained above, the second parameter to menu_driver() can
+-be either a navigational request, a printable character or a KEY_MOUSE key.
+-Let's dissect the different navigational requests.
    • REQ_LEFT_ITEM and REQ_RIGHT_ITEM
      A Menu can be displayed with multiple columns for more than one item. This can
+-be done by using the menu_format()function.
+-When a multi columnar menu is displayed these requests cause the menu driver to
+-move the current selection to left or right.
    • REQ_UP_ITEM and REQ_DOWN_ITEM  
      These two options you have seen in the above example. These options when given,
+-makes the menu_driver to move the current selection to an item up or down.
    •  REQ_SCR_* options 
      The four options REQ_SCR_ULINE, REQ_SCR_DLINE, REQ_SCR_DPAGE, REQ_SCR_UPAGE are
+-related to scrolling. If all the items in the menu cannot be displayed in the
+-menu sub window, then the menu is scrollable. These requests can be given to the
+-menu_driver to do the scrolling either one line up, down or one page down or up
+-respectively. 
    • REQ_FIRST_ITEM, REQ_LAST_ITEM, REQ_NEXT_ITEM and
+-REQ_PREV_ITEM  
      These requests are self explanatory.
    •  REQ_TOGGLE_ITEM 
      This request when given, toggles the present selection. This option is to be
+-used only in a multi valued menu. So to use this request the option O_ONEVALUE
+-must be off. This option can be made off or on with set_menu_opts().
    •  Pattern Requests 
      Every menu has an associated pattern buffer, which is used to find the nearest
+-match to the ascii characters entered by the user. Whenever ascii characters are
+-given to menu_driver, it puts in to the pattern buffer. It also tries to find
+-the nearest match to the pattern in the items list and moves current selection
+-to that item. The request REQ_CLEAR_PATTERN clears the pattern buffer. The
+-request REQ_BACK_PATTERN deletes the previous character in the pattern buffer.
+-In case the pattern matches more than one item then the matched items can be
+-cycled through REQ_NEXT_MATCH and REQ_PREV_MATCH which move the current
+-selection to the next and previous matches respectively.
    •  Mouse Requests
      In case of KEY_MOUSE requests, according to the mouse position an action is
+-taken accordingly. The action to be taken is explained in the man page as, 
             If  the  second argument is the KEY_MOUSE special key, the
++     REQ_PREV_MATCH     Move to the previous item matching the pattern match.
++
      
++
++        
      Don't get overwhelmed by the number of options. We will
++        see them slowly one after another. The options of interest
++        in this example are REQ_UP_ITEM and REQ_DOWN_ITEM. These
++        two options when passed to menu_driver, menu driver updates
++        the current item to one item up or down respectively.
      
++      
    
++
++      
    
++        
    
++
++        
    17.3. Menu Driver: The work horse of the menu
++        system
    
++
++        
    As you have seen in the above example, menu_driver plays
++        an important role in updating the menu. It is very
++        important to understand various options it takes and what
++        they do. As explained above, the second parameter to
++        menu_driver() can be either a navigational request, a
++        printable character or a KEY_MOUSE key. Let's dissect the
++        different navigational requests.
    
++
++        
      
++          
    • 
++            
      REQ_LEFT_ITEM and
++            REQ_RIGHT_ITEM
      
++
++            
      A Menu can be displayed with multiple columns for
++            more than one item. This can be done by using the
++            menu_format()function. When a
++            multi columnar menu is displayed these requests cause
++            the menu driver to move the current selection to left
++            or right.
      
++          
      • 
++
++          
    • 
++            
      REQ_UP_ITEM and REQ_DOWN_ITEM
      
++
++            
      These two options you have seen in the above
++            example. These options when given, makes the
++            menu_driver to move the current selection to an item up
++            or down.
      
++          
      • 
++
++          
    • 
++            
      REQ_SCR_*
++            options
      
++
++            
      The four options REQ_SCR_ULINE, REQ_SCR_DLINE,
++            REQ_SCR_DPAGE, REQ_SCR_UPAGE are related to scrolling.
++            If all the items in the menu cannot be displayed in the
++            menu sub window, then the menu is scrollable. These
++            requests can be given to the menu_driver to do the
++            scrolling either one line up, down or one page down or
++            up respectively.
      
++          
      • 
++
++          
    • 
++            
      REQ_FIRST_ITEM, REQ_LAST_ITEM, REQ_NEXT_ITEM
++            and REQ_PREV_ITEM
      
++
++            
      These requests are self explanatory.
      
++          
      • 
++
++          
    • 
++            
      REQ_TOGGLE_ITEM
      
++
++            
      This request when given, toggles the present
++            selection. This option is to be used only in a multi
++            valued menu. So to use this request the option
++            O_ONEVALUE must be off. This option can be made off or
++            on with set_menu_opts().
      
++          
      • 
++
++          
    • 
++            
      Pattern
++            Requests
      
++
++            
      Every menu has an associated pattern buffer, which
++            is used to find the nearest match to the ascii
++            characters entered by the user. Whenever ascii
++            characters are given to menu_driver, it puts in to the
++            pattern buffer. It also tries to find the nearest match
++            to the pattern in the items list and moves current
++            selection to that item. The request REQ_CLEAR_PATTERN
++            clears the pattern buffer. The request REQ_BACK_PATTERN
++            deletes the previous character in the pattern buffer.
++            In case the pattern matches more than one item then the
++            matched items can be cycled through REQ_NEXT_MATCH and
++            REQ_PREV_MATCH which move the current selection to the
++            next and previous matches respectively.
      
++          
      • 
++
++          
    • 
++            
      Mouse
++            Requests
      
++
++            
      In case of KEY_MOUSE requests, according to the
++            mouse position an action is taken accordingly. The
++            action to be taken is explained in the man page as,
      
++            
      ++       If  the  second argument is the KEY_MOUSE special key, the
+        associated mouse event is translated into one of the above
+        pre-defined  requests.   Currently only clicks in the user
+        window (e.g. inside the menu display area or  the  decora­
+@@ -5428,49 +4495,42 @@
+        generated, if you doubleclick a REQ_SCR_DPAGE is generated
+        and  if  you  tripleclick a REQ_LAST_ITEM is generated. If
+        you click at an item inside the display area of the  menu,
+-       the menu cursor is positioned to that item.
    Each of the above requests will be explained in the following lines with several
+-examples whenever appropriate.
    17.4. Menu Windows
    Every menu created is associated with a window and a sub window. The menu window
+-displays any title or border associated with the menu. The menu sub window
+-displays the menu items currently available for selection. But we didn't specify
+-any window or sub window in the simple example. When a window is not specified,
+-stdscr is taken as the main window, and then menu system calculates the sub
+-window size required for the display of items. Then items are displayed in the
+-calculated sub window. So let's play with these windows and display a menu with
+-a border and a title.
    Example 19.  Menu Windows Usage example 
    #include <menu.h>
++       the menu cursor is positioned to that item.
++
    
++          
++        
++
++        
    Each of the above requests will be explained in the
++        following lines with several examples whenever
++        appropriate.
    
++      
    
++
++      
    
++        
    
++
++        
    17.4. Menu Windows
    
++
++        
    Every menu created is associated with a window and a sub
++        window. The menu window displays any title or border
++        associated with the menu. The menu sub window displays the
++        menu items currently available for selection. But we didn't
++        specify any window or sub window in the simple example.
++        When a window is not specified, stdscr is taken as the main
++        window, and then menu system calculates the sub window size
++        required for the display of items. Then items are displayed
++        in the calculated sub window. So let's play with these
++        windows and display a menu with a border and a title.
    
++
++        
    
++          
++
++          
    Example 19. Menu Windows Usage example
    
++          
    ++#include <menu.h>
+ 
+ #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+-#define CTRLD 	4
++#define CTRLD   4
+ 
+ char *choices[] = {
+                         "Choice 1",
+@@ -5483,403 +4543,395 @@
+ void print_in_middle(WINDOW *win, int starty, int startx, int width, char *string, chtype color);
+ 
+ int main()
+-{	ITEM **my_items;
+-	int c;				
+-	MENU *my_menu;
++{       ITEM **my_items;
++        int c;                          
++        MENU *my_menu;
+         WINDOW *my_menu_win;
+         int n_choices, i;
+-	
+-	/* Initialize curses */
+-	initscr();
+-	start_color();
++        
++        /* Initialize curses */
++        initscr();
++        start_color();
+         cbreak();
+         noecho();
+-	keypad(stdscr, TRUE);
+-	init_pair(1, COLOR_RED, COLOR_BLACK);
++        keypad(stdscr, TRUE);
++        init_pair(1, COLOR_RED, COLOR_BLACK);
+ 
+-	/* Create items */
++        /* Create items */
+         n_choices = ARRAY_SIZE(choices);
+         my_items = (ITEM **)calloc(n_choices, sizeof(ITEM *));
+-        for(i = 0; i < n_choices; ++i)
++        for(i = 0; i < n_choices; ++i)
+                 my_items[i] = new_item(choices[i], choices[i]);
+ 
+-	/* Crate menu */
+-	my_menu = new_menu((ITEM **)my_items);
++        /* Crate menu */
++        my_menu = new_menu((ITEM **)my_items);
+ 
+-	/* Create the window to be associated with the menu */
++        /* Create the window to be associated with the menu */
+         my_menu_win = newwin(10, 40, 4, 4);
+         keypad(my_menu_win, TRUE);
+      
+-	/* Set main window and sub window */
++        /* Set main window and sub window */
+         set_menu_win(my_menu, my_menu_win);
+         set_menu_sub(my_menu, derwin(my_menu_win, 6, 38, 3, 1));
+ 
+-	/* Set menu mark to the string " * " */
++        /* Set menu mark to the string " * " */
+         set_menu_mark(my_menu, " * ");
+ 
+-	/* Print a border around the main window and print a title */
++        /* Print a border around the main window and print a title */
+         box(my_menu_win, 0, 0);
+-	print_in_middle(my_menu_win, 1, 0, 40, "My Menu", COLOR_PAIR(1));
+-	mvwaddch(my_menu_win, 2, 0, ACS_LTEE);
+-	mvwhline(my_menu_win, 2, 1, ACS_HLINE, 38);
+-	mvwaddch(my_menu_win, 2, 39, ACS_RTEE);
+-	mvprintw(LINES - 2, 0, "F1 to exit");
+-	refresh();
++        print_in_middle(my_menu_win, 1, 0, 40, "My Menu", COLOR_PAIR(1));
++        mvwaddch(my_menu_win, 2, 0, ACS_LTEE);
++        mvwhline(my_menu_win, 2, 1, ACS_HLINE, 38);
++        mvwaddch(my_menu_win, 2, 39, ACS_RTEE);
++        mvprintw(LINES - 2, 0, "F1 to exit");
++        refresh();
+         
+-	/* Post the menu */
+-	post_menu(my_menu);
+-	wrefresh(my_menu_win);
+-
+-	while((c = wgetch(my_menu_win)) != KEY_F(1))
+-	{       switch(c)
+-	        {	case KEY_DOWN:
+-				menu_driver(my_menu, REQ_DOWN_ITEM);
+-				break;
+-			case KEY_UP:
+-				menu_driver(my_menu, REQ_UP_ITEM);
+-				break;
+-		}
++        /* Post the menu */
++        post_menu(my_menu);
++        wrefresh(my_menu_win);
++
++        while((c = wgetch(my_menu_win)) != KEY_F(1))
++        {       switch(c)
++                {       case KEY_DOWN:
++                                menu_driver(my_menu, REQ_DOWN_ITEM);
++                                break;
++                        case KEY_UP:
++                                menu_driver(my_menu, REQ_UP_ITEM);
++                                break;
++                }
+                 wrefresh(my_menu_win);
+-	}	
++        }       
+ 
+-	/* Unpost and free all the memory taken up */
++        /* Unpost and free all the memory taken up */
+         unpost_menu(my_menu);
+         free_menu(my_menu);
+-        for(i = 0; i < n_choices; ++i)
++        for(i = 0; i < n_choices; ++i)
+                 free_item(my_items[i]);
+-	endwin();
++        endwin();
+ }
+ 
+ void print_in_middle(WINDOW *win, int starty, int startx, int width, char *string, chtype color)
+-{	int length, x, y;
+-	float temp;
++{       int length, x, y;
++        float temp;
+ 
+-	if(win == NULL)
+-		win = stdscr;
+-	getyx(win, y, x);
+-	if(startx != 0)
+-		x = startx;
+-	if(starty != 0)
+-		y = starty;
+-	if(width == 0)
+-		width = 80;
+-
+-	length = strlen(string);
+-	temp = (width - length)/ 2;
+-	x = startx + (int)temp;
+-	wattron(win, color);
+-	mvwprintw(win, y, x, "%s", string);
+-	wattroff(win, color);
+-	refresh();
+-}
    This example creates a menu with a title, border, a fancy line separating title
+-and the items. As you can see, in order to attach a window to a menu the
+-function set_menu_win() has to be used. Then we attach the sub window also. This
+-displays the items in the sub window.  You can also set the mark string which
+-gets displayed to the left of the selected item with set_menu_mark().
    17.5. Scrolling Menus
    If the sub window given for a window is not big enough to show all the items,
+-then the menu will be scrollable. When you are on the last item in the present
+-list, if you send REQ_DOWN_ITEM, it gets translated into REQ_SCR_DLINE and the
+-menu scrolls by one item.  You can manually give REQ_SCR_ operations to do
+-scrolling. Let's see how it can be done.
    Example 20.  Scrolling Menus example 
    #include <curses.h>
+-#include <menu.h>
++        if(win == NULL)
++                win = stdscr;
++        getyx(win, y, x);
++        if(startx != 0)
++                x = startx;
++        if(starty != 0)
++                y = starty;
++        if(width == 0)
++                width = 80;
++
++        length = strlen(string);
++        temp = (width - length)/ 2;
++        x = startx + (int)temp;
++        wattron(win, color);
++        mvwprintw(win, y, x, "%s", string);
++        wattroff(win, color);
++        refresh();
++}
++
    
++        
    
++
++        
    This example creates a menu with a title, border, a
++        fancy line separating title and the items. As you can see,
++        in order to attach a window to a menu the function
++        set_menu_win() has to be used. Then we attach the sub
++        window also. This displays the items in the sub window. You
++        can also set the mark string which gets displayed to the
++        left of the selected item with set_menu_mark().
    
++      
    
++
++      
    
++        
    
++
++        
    17.5. Scrolling Menus
    
++
++        
    If the sub window given for a window is not big enough
++        to show all the items, then the menu will be scrollable.
++        When you are on the last item in the present list, if you
++        send REQ_DOWN_ITEM, it gets translated into REQ_SCR_DLINE
++        and the menu scrolls by one item. You can manually give
++        REQ_SCR_ operations to do scrolling. Let's see how it can
++        be done.
    
++
++        
    
++          
++
++          
    Example 20. Scrolling Menus example
    
++          
    ++#include <curses.h>
++#include <menu.h>
+ 
+ #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+-#define CTRLD 	4
++#define CTRLD   4
+ 
+ char *choices[] = {
+                         "Choice 1",
+                         "Choice 2",
+                         "Choice 3",
+                         "Choice 4",
+-			"Choice 5",
+-			"Choice 6",
+-			"Choice 7",
+-			"Choice 8",
+-			"Choice 9",
+-			"Choice 10",
++                        "Choice 5",
++                        "Choice 6",
++                        "Choice 7",
++                        "Choice 8",
++                        "Choice 9",
++                        "Choice 10",
+                         "Exit",
+                         (char *)NULL,
+                   };
+ void print_in_middle(WINDOW *win, int starty, int startx, int width, char *string, chtype color);
+ 
+ int main()
+-{	ITEM **my_items;
+-	int c;				
+-	MENU *my_menu;
++{       ITEM **my_items;
++        int c;                          
++        MENU *my_menu;
+         WINDOW *my_menu_win;
+         int n_choices, i;
+-	
+-	/* Initialize curses */
+-	initscr();
+-	start_color();
++        
++        /* Initialize curses */
++        initscr();
++        start_color();
+         cbreak();
+         noecho();
+-	keypad(stdscr, TRUE);
+-	init_pair(1, COLOR_RED, COLOR_BLACK);
+-	init_pair(2, COLOR_CYAN, COLOR_BLACK);
++        keypad(stdscr, TRUE);
++        init_pair(1, COLOR_RED, COLOR_BLACK);
++        init_pair(2, COLOR_CYAN, COLOR_BLACK);
+ 
+-	/* Create items */
++        /* Create items */
+         n_choices = ARRAY_SIZE(choices);
+         my_items = (ITEM **)calloc(n_choices, sizeof(ITEM *));
+-        for(i = 0; i < n_choices; ++i)
++        for(i = 0; i < n_choices; ++i)
+                 my_items[i] = new_item(choices[i], choices[i]);
+ 
+-	/* Crate menu */
+-	my_menu = new_menu((ITEM **)my_items);
++        /* Crate menu */
++        my_menu = new_menu((ITEM **)my_items);
+ 
+-	/* Create the window to be associated with the menu */
++        /* Create the window to be associated with the menu */
+         my_menu_win = newwin(10, 40, 4, 4);
+         keypad(my_menu_win, TRUE);
+      
+-	/* Set main window and sub window */
++        /* Set main window and sub window */
+         set_menu_win(my_menu, my_menu_win);
+         set_menu_sub(my_menu, derwin(my_menu_win, 6, 38, 3, 1));
+-	set_menu_format(my_menu, 5, 1);
+-			
+-	/* Set menu mark to the string " * " */
++        set_menu_format(my_menu, 5, 1);
++                        
++        /* Set menu mark to the string " * " */
+         set_menu_mark(my_menu, " * ");
+ 
+-	/* Print a border around the main window and print a title */
++        /* Print a border around the main window and print a title */
+         box(my_menu_win, 0, 0);
+-	print_in_middle(my_menu_win, 1, 0, 40, "My Menu", COLOR_PAIR(1));
+-	mvwaddch(my_menu_win, 2, 0, ACS_LTEE);
+-	mvwhline(my_menu_win, 2, 1, ACS_HLINE, 38);
+-	mvwaddch(my_menu_win, 2, 39, ACS_RTEE);
++        print_in_middle(my_menu_win, 1, 0, 40, "My Menu", COLOR_PAIR(1));
++        mvwaddch(my_menu_win, 2, 0, ACS_LTEE);
++        mvwhline(my_menu_win, 2, 1, ACS_HLINE, 38);
++        mvwaddch(my_menu_win, 2, 39, ACS_RTEE);
+         
+-	/* Post the menu */
+-	post_menu(my_menu);
+-	wrefresh(my_menu_win);
+-	
+-	attron(COLOR_PAIR(2));
+-	mvprintw(LINES - 2, 0, "Use PageUp and PageDown to scoll down or up a page of items");
+-	mvprintw(LINES - 1, 0, "Arrow Keys to navigate (F1 to Exit)");
+-	attroff(COLOR_PAIR(2));
+-	refresh();
+-
+-	while((c = wgetch(my_menu_win)) != KEY_F(1))
+-	{       switch(c)
+-	        {	case KEY_DOWN:
+-				menu_driver(my_menu, REQ_DOWN_ITEM);
+-				break;
+-			case KEY_UP:
+-				menu_driver(my_menu, REQ_UP_ITEM);
+-				break;
+-			case KEY_NPAGE:
+-				menu_driver(my_menu, REQ_SCR_DPAGE);
+-				break;
+-			case KEY_PPAGE:
+-				menu_driver(my_menu, REQ_SCR_UPAGE);
+-				break;
+-		}
++        /* Post the menu */
++        post_menu(my_menu);
++        wrefresh(my_menu_win);
++        
++        attron(COLOR_PAIR(2));
++        mvprintw(LINES - 2, 0, "Use PageUp and PageDown to scoll down or up a page of items");
++        mvprintw(LINES - 1, 0, "Arrow Keys to navigate (F1 to Exit)");
++        attroff(COLOR_PAIR(2));
++        refresh();
++
++        while((c = wgetch(my_menu_win)) != KEY_F(1))
++        {       switch(c)
++                {       case KEY_DOWN:
++                                menu_driver(my_menu, REQ_DOWN_ITEM);
++                                break;
++                        case KEY_UP:
++                                menu_driver(my_menu, REQ_UP_ITEM);
++                                break;
++                        case KEY_NPAGE:
++                                menu_driver(my_menu, REQ_SCR_DPAGE);
++                                break;
++                        case KEY_PPAGE:
++                                menu_driver(my_menu, REQ_SCR_UPAGE);
++                                break;
++                }
+                 wrefresh(my_menu_win);
+-	}	
++        }       
+ 
+-	/* Unpost and free all the memory taken up */
++        /* Unpost and free all the memory taken up */
+         unpost_menu(my_menu);
+         free_menu(my_menu);
+-        for(i = 0; i < n_choices; ++i)
++        for(i = 0; i < n_choices; ++i)
+                 free_item(my_items[i]);
+-	endwin();
++        endwin();
+ }
+ 
+ void print_in_middle(WINDOW *win, int starty, int startx, int width, char *string, chtype color)
+-{	int length, x, y;
+-	float temp;
++{       int length, x, y;
++        float temp;
+ 
+-	if(win == NULL)
+-		win = stdscr;
+-	getyx(win, y, x);
+-	if(startx != 0)
+-		x = startx;
+-	if(starty != 0)
+-		y = starty;
+-	if(width == 0)
+-		width = 80;
+-
+-	length = strlen(string);
+-	temp = (width - length)/ 2;
+-	x = startx + (int)temp;
+-	wattron(win, color);
+-	mvwprintw(win, y, x, "%s", string);
+-	wattroff(win, color);
+-	refresh();
+-}
    This program is self-explanatory. In this example the number of choices has been
+-increased to ten, which is larger than our sub window size which can hold 6
+-items.  This message has to be explicitly conveyed to the menu system with the
+-function set_menu_format(). In here we specify the number of rows and columns we
+-want to be displayed for a single page. We can specify any number of items to be
+-shown, in the rows variables, if it is less than the height of the sub window.
+-If the key pressed by the user is a PAGE UP or PAGE DOWN, the menu is scrolled a
+-page due to the requests (REQ_SCR_DPAGE and REQ_SCR_UPAGE) given to
+-menu_driver().
    17.6. Multi Columnar Menus
    In the above example you have seen how to use the function set_menu_format(). I
+-didn't mention what the cols variable (third parameter) does. Well, If your sub
+-window is wide enough, you can opt to display more than one item per row. This
+-can be specified in the cols variable. To make things simpler, the following
+-example doesn't show descriptions for the items.
    Example 21.  Milt Columnar Menus Example 
    #include <curses.h>
+-#include <menu.h>
++        if(win == NULL)
++                win = stdscr;
++        getyx(win, y, x);
++        if(startx != 0)
++                x = startx;
++        if(starty != 0)
++                y = starty;
++        if(width == 0)
++                width = 80;
++
++        length = strlen(string);
++        temp = (width - length)/ 2;
++        x = startx + (int)temp;
++        wattron(win, color);
++        mvwprintw(win, y, x, "%s", string);
++        wattroff(win, color);
++        refresh();
++}
++
    
++        
    
++
++        
    This program is self-explanatory. In this example the
++        number of choices has been increased to ten, which is
++        larger than our sub window size which can hold 6 items.
++        This message has to be explicitly conveyed to the menu
++        system with the function set_menu_format(). In here we
++        specify the number of rows and columns we want to be
++        displayed for a single page. We can specify any number of
++        items to be shown, in the rows variables, if it is less
++        than the height of the sub window. If the key pressed by
++        the user is a PAGE UP or PAGE DOWN, the menu is scrolled a
++        page due to the requests (REQ_SCR_DPAGE and REQ_SCR_UPAGE)
++        given to menu_driver().
    
++      
    
++
++      
    
++        
    
++
++        
    17.6. Multi Columnar Menus
    
++
++        
    In the above example you have seen how to use the
++        function set_menu_format(). I didn't mention what the cols
++        variable (third parameter) does. Well, If your sub window
++        is wide enough, you can opt to display more than one item
++        per row. This can be specified in the cols variable. To
++        make things simpler, the following example doesn't show
++        descriptions for the items.
    
++
++        
    
++          
++
++          
    Example 21. Milt Columnar Menus Example
    
++          
    ++#include <curses.h>
++#include <menu.h>
+ 
+ #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+-#define CTRLD 	4
++#define CTRLD   4
+ 
+ char *choices[] = {
+                         "Choice 1", "Choice 2", "Choice 3", "Choice 4", "Choice 5",
+-			"Choice 6", "Choice 7", "Choice 8", "Choice 9", "Choice 10",
+-			"Choice 11", "Choice 12", "Choice 13", "Choice 14", "Choice 15",
+-			"Choice 16", "Choice 17", "Choice 18", "Choice 19", "Choice 20",
++                        "Choice 6", "Choice 7", "Choice 8", "Choice 9", "Choice 10",
++                        "Choice 11", "Choice 12", "Choice 13", "Choice 14", "Choice 15",
++                        "Choice 16", "Choice 17", "Choice 18", "Choice 19", "Choice 20",
+                         "Exit",
+                         (char *)NULL,
+                   };
+ 
+ int main()
+-{	ITEM **my_items;
+-	int c;				
+-	MENU *my_menu;
++{       ITEM **my_items;
++        int c;                          
++        MENU *my_menu;
+         WINDOW *my_menu_win;
+         int n_choices, i;
+-	
+-	/* Initialize curses */
+-	initscr();
+-	start_color();
++        
++        /* Initialize curses */
++        initscr();
++        start_color();
+         cbreak();
+         noecho();
+-	keypad(stdscr, TRUE);
+-	init_pair(1, COLOR_RED, COLOR_BLACK);
+-	init_pair(2, COLOR_CYAN, COLOR_BLACK);
++        keypad(stdscr, TRUE);
++        init_pair(1, COLOR_RED, COLOR_BLACK);
++        init_pair(2, COLOR_CYAN, COLOR_BLACK);
+ 
+-	/* Create items */
++        /* Create items */
+         n_choices = ARRAY_SIZE(choices);
+         my_items = (ITEM **)calloc(n_choices, sizeof(ITEM *));
+-        for(i = 0; i < n_choices; ++i)
++        for(i = 0; i < n_choices; ++i)
+                 my_items[i] = new_item(choices[i], choices[i]);
+ 
+-	/* Crate menu */
+-	my_menu = new_menu((ITEM **)my_items);
++        /* Crate menu */
++        my_menu = new_menu((ITEM **)my_items);
+ 
+-	/* Set menu option not to show the description */
+-	menu_opts_off(my_menu, O_SHOWDESC);
++        /* Set menu option not to show the description */
++        menu_opts_off(my_menu, O_SHOWDESC);
+ 
+-	/* Create the window to be associated with the menu */
++        /* Create the window to be associated with the menu */
+         my_menu_win = newwin(10, 70, 4, 4);
+         keypad(my_menu_win, TRUE);
+      
+-	/* Set main window and sub window */
++        /* Set main window and sub window */
+         set_menu_win(my_menu, my_menu_win);
+         set_menu_sub(my_menu, derwin(my_menu_win, 6, 68, 3, 1));
+-	set_menu_format(my_menu, 5, 3);
+-	set_menu_mark(my_menu, " * ");
++        set_menu_format(my_menu, 5, 3);
++        set_menu_mark(my_menu, " * ");
+ 
+-	/* Print a border around the main window and print a title */
++        /* Print a border around the main window and print a title */
+         box(my_menu_win, 0, 0);
+-	
+-	attron(COLOR_PAIR(2));
+-	mvprintw(LINES - 3, 0, "Use PageUp and PageDown to scroll");
+-	mvprintw(LINES - 2, 0, "Use Arrow Keys to navigate (F1 to Exit)");
+-	attroff(COLOR_PAIR(2));
+-	refresh();
+-
+-	/* Post the menu */
+-	post_menu(my_menu);
+-	wrefresh(my_menu_win);
+-	
+-	while((c = wgetch(my_menu_win)) != KEY_F(1))
+-	{       switch(c)
+-	        {	case KEY_DOWN:
+-				menu_driver(my_menu, REQ_DOWN_ITEM);
+-				break;
+-			case KEY_UP:
+-				menu_driver(my_menu, REQ_UP_ITEM);
+-				break;
+-			case KEY_LEFT:
+-				menu_driver(my_menu, REQ_LEFT_ITEM);
+-				break;
+-			case KEY_RIGHT:
+-				menu_driver(my_menu, REQ_RIGHT_ITEM);
+-				break;
+-			case KEY_NPAGE:
+-				menu_driver(my_menu, REQ_SCR_DPAGE);
+-				break;
+-			case KEY_PPAGE:
+-				menu_driver(my_menu, REQ_SCR_UPAGE);
+-				break;
+-		}
++        
++        attron(COLOR_PAIR(2));
++        mvprintw(LINES - 3, 0, "Use PageUp and PageDown to scroll");
++        mvprintw(LINES - 2, 0, "Use Arrow Keys to navigate (F1 to Exit)");
++        attroff(COLOR_PAIR(2));
++        refresh();
++
++        /* Post the menu */
++        post_menu(my_menu);
++        wrefresh(my_menu_win);
++        
++        while((c = wgetch(my_menu_win)) != KEY_F(1))
++        {       switch(c)
++                {       case KEY_DOWN:
++                                menu_driver(my_menu, REQ_DOWN_ITEM);
++                                break;
++                        case KEY_UP:
++                                menu_driver(my_menu, REQ_UP_ITEM);
++                                break;
++                        case KEY_LEFT:
++                                menu_driver(my_menu, REQ_LEFT_ITEM);
++                                break;
++                        case KEY_RIGHT:
++                                menu_driver(my_menu, REQ_RIGHT_ITEM);
++                                break;
++                        case KEY_NPAGE:
++                                menu_driver(my_menu, REQ_SCR_DPAGE);
++                                break;
++                        case KEY_PPAGE:
++                                menu_driver(my_menu, REQ_SCR_UPAGE);
++                                break;
++                }
+                 wrefresh(my_menu_win);
+-	}	
++        }       
+ 
+-	/* Unpost and free all the memory taken up */
++        /* Unpost and free all the memory taken up */
+         unpost_menu(my_menu);
+         free_menu(my_menu);
+-        for(i = 0; i < n_choices; ++i)
++        for(i = 0; i < n_choices; ++i)
+                 free_item(my_items[i]);
+-	endwin();
+-}
    Watch the function call to set_menu_format(). It specifies the number of columns
+-to be 3, thus displaying 3 items per row. We have also switched off the showing
+-descriptions with the function menu_opts_off(). There are couple of functions
+-set_menu_opts(),  menu_opts_on() and menu_opts() which can be used to manipulate
+-menu options. The following menu options can be specified.
           O_ONEVALUE
++        endwin();
++}
++
    
++        
    
++
++        
    Watch the function call to set_menu_format(). It
++        specifies the number of columns to be 3, thus displaying 3
++        items per row. We have also switched off the showing
++        descriptions with the function menu_opts_off(). There are
++        couple of functions set_menu_opts(), menu_opts_on() and
++        menu_opts() which can be used to manipulate menu options.
++        The following menu options can be specified.
    
++        
    ++       O_ONEVALUE
+             Only one item can be selected for this menu.
+ 
+        O_SHOWDESC
+@@ -5898,684 +4950,666 @@
+ 
+        O_NONCYCLIC
+             Don't   wrap   around  next-item  and  previous-item,
+-            requests to the other end of the menu.
    All options are on by default. You can switch specific attributes on or off with
+-menu_opts_on() and menu_opts_off() functions. You can also use set_menu_opts()
+-to directly specify the options. The argument to this function should be a OR ed
+-value of some of those above constants. The function menu_opts() can be used to
+-find out a menu's present options. 
    17.7. Multi Valued Menus
    You might be wondering what if you switch off the option O_ONEVALUE. Then the
+-menu becomes multi-valued. That means you can select more than one item. This
+-brings us to the request REQ_TOGGLE_ITEM. Let's see it in action.
    Example 22.  Multi Valued Menus example 
    #include <curses.h>
+-#include <menu.h>
++            requests to the other end of the menu.
++
    
++
++        
    All options are on by default. You can switch specific
++        attributes on or off with menu_opts_on() and
++        menu_opts_off() functions. You can also use set_menu_opts()
++        to directly specify the options. The argument to this
++        function should be a OR ed value of some of those above
++        constants. The function menu_opts() can be used to find out
++        a menu's present options.
    
++      
    
++
++      
    
++        
    
++
++        
    17.7. Multi Valued Menus
    
++
++        
    You might be wondering what if you switch off the option
++        O_ONEVALUE. Then the menu becomes multi-valued. That means
++        you can select more than one item. This brings us to the
++        request REQ_TOGGLE_ITEM. Let's see it in action.
    
++
++        
    
++          
++
++          
    Example 22. Multi Valued Menus example
    
++          
    ++#include <curses.h>
++#include <menu.h>
+ 
+ #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+-#define CTRLD 	4
++#define CTRLD   4
+ 
+ char *choices[] = {
+                         "Choice 1",
+                         "Choice 2",
+                         "Choice 3",
+                         "Choice 4",
+-			"Choice 5",
+-			"Choice 6",
+-			"Choice 7",
++                        "Choice 5",
++                        "Choice 6",
++                        "Choice 7",
+                         "Exit",
+                   };
+ 
+ int main()
+-{	ITEM **my_items;
+-	int c;				
+-	MENU *my_menu;
++{       ITEM **my_items;
++        int c;                          
++        MENU *my_menu;
+         int n_choices, i;
+-	ITEM *cur_item;
+-	
+-	/* Initialize curses */	
+-	initscr();
++        ITEM *cur_item;
++        
++        /* Initialize curses */ 
++        initscr();
+         cbreak();
+         noecho();
+-	keypad(stdscr, TRUE);
++        keypad(stdscr, TRUE);
+ 
+-	/* Initialize items */
++        /* Initialize items */
+         n_choices = ARRAY_SIZE(choices);
+         my_items = (ITEM **)calloc(n_choices + 1, sizeof(ITEM *));
+-        for(i = 0; i < n_choices; ++i)
++        for(i = 0; i < n_choices; ++i)
+                 my_items[i] = new_item(choices[i], choices[i]);
+-	my_items[n_choices] = (ITEM *)NULL;
++        my_items[n_choices] = (ITEM *)NULL;
++
++        my_menu = new_menu((ITEM **)my_items);
+ 
+-	my_menu = new_menu((ITEM **)my_items);
++        /* Make the menu multi valued */
++        menu_opts_off(my_menu, O_ONEVALUE);
+ 
+-	/* Make the menu multi valued */
+-	menu_opts_off(my_menu, O_ONEVALUE);
++        mvprintw(LINES - 3, 0, "Use <SPACE> to select or unselect an item.");
++        mvprintw(LINES - 2, 0, "<ENTER> to see presently selected items(F1 to Exit)");
++        post_menu(my_menu);
++        refresh();
+ 
+-	mvprintw(LINES - 3, 0, "Use <SPACE> to select or unselect an item.");
+-	mvprintw(LINES - 2, 0, "<ENTER> to see presently selected items(F1 to Exit)");
+-	post_menu(my_menu);
+-	refresh();
+-
+-	while((c = getch()) != KEY_F(1))
+-	{       switch(c)
+-	        {	case KEY_DOWN:
+-				menu_driver(my_menu, REQ_DOWN_ITEM);
+-				break;
+-			case KEY_UP:
+-				menu_driver(my_menu, REQ_UP_ITEM);
+-				break;
+-			case ' ':
+-				menu_driver(my_menu, REQ_TOGGLE_ITEM);
+-				break;
+-			case 10:	/* Enter */
+-			{	char temp[200];
+-				ITEM **items;
+-
+-				items = menu_items(my_menu);
+-				temp[0] = '\0';
+-				for(i = 0; i < item_count(my_menu); ++i)
+-					if(item_value(items[i]) == TRUE)
+-					{	strcat(temp, item_name(items[i]));
+-						strcat(temp, " ");
+-					}
+-				move(20, 0);
+-				clrtoeol();
+-				mvprintw(20, 0, temp);
+-				refresh();
+-			}
+-			break;
+-		}
+-	}	
++        while((c = getch()) != KEY_F(1))
++        {       switch(c)
++                {       case KEY_DOWN:
++                                menu_driver(my_menu, REQ_DOWN_ITEM);
++                                break;
++                        case KEY_UP:
++                                menu_driver(my_menu, REQ_UP_ITEM);
++                                break;
++                        case ' ':
++                                menu_driver(my_menu, REQ_TOGGLE_ITEM);
++                                break;
++                        case 10:        /* Enter */
++                        {       char temp[200];
++                                ITEM **items;
++
++                                items = menu_items(my_menu);
++                                temp[0] = '\0';
++                                for(i = 0; i < item_count(my_menu); ++i)
++                                        if(item_value(items[i]) == TRUE)
++                                        {       strcat(temp, item_name(items[i]));
++                                                strcat(temp, " ");
++                                        }
++                                move(20, 0);
++                                clrtoeol();
++                                mvprintw(20, 0, temp);
++                                refresh();
++                        }
++                        break;
++                }
++        }       
+ 
+-	free_item(my_items[0]);
++        free_item(my_items[0]);
+         free_item(my_items[1]);
+-	free_menu(my_menu);
+-	endwin();
++        free_menu(my_menu);
++        endwin();
+ }
+-	
    Whew, A lot of new functions. Let's take them one after another. Firstly, the
+-REQ_TOGGLE_ITEM.  In a multi-valued menu, the user should be allowed to select
+-or un select more than one item. The request REQ_TOGGLE_ITEM toggles the present
+-selection. In this case when space is pressed REQ_TOGGLE_ITEM request is sent to
+-menu_driver to achieve the result.
    Now when the user presses <ENTER> we show the items he presently selected.
+-First we find out the items associated with the menu using the function
+-menu_items(). Then we loop through the items to find out if the item is selected
+-or not. The function item_value() returns TRUE if an item is selected. The
+-function item_count() returns the number of items in the menu. The item name can
+-be found with item_name(). You can also find the description associated with an
+-item using item_description().
    17.8. Menu Options
    Well, by this time you must be itching for some difference in your menu, with
+-lots of functionality. I know. You want Colors !!!. You want to create nice
+-menus similar to those text mode dos games. The functions
+-set_menu_fore() and set_menu_back() can be used to change the attribute of the
+-selected item and unselected item. The names are misleading. They don't change
+-menu's foreground or background which would have been useless. 
    The function set_menu_grey() can be used to set the display attribute for the
+-non-selectable items in the menu. This brings us to the interesting option for
+-an item the one and only O_SELECTABLE. We can turn it off by the function
+-item_opts_off() and after that that item is not selectable. It's like a grayed
+-item in those fancy windows menus. Let's put these concepts in practice with
+-this example
    Example 23.  Menu Options example 
    #include <menu.h>
++        
++
    
++        
    
++
++        
    Whew, A lot of new functions. Let's take them one after
++        another. Firstly, the REQ_TOGGLE_ITEM. In a multi-valued
++        menu, the user should be allowed to select or un select
++        more than one item. The request REQ_TOGGLE_ITEM toggles the
++        present selection. In this case when space is pressed
++        REQ_TOGGLE_ITEM request is sent to menu_driver to achieve
++        the result.
    
++
++        
    Now when the user presses <ENTER> we show the
++        items he presently selected. First we find out the items
++        associated with the menu using the function menu_items().
++        Then we loop through the items to find out if the item is
++        selected or not. The function item_value() returns TRUE if
++        an item is selected. The function item_count() returns the
++        number of items in the menu. The item name can be found
++        with item_name(). You can also find the description
++        associated with an item using item_description().
    
++      
    
++
++      
    
++        
    
++
++        
    17.8. Menu
++        Options
    
++
++        
    Well, by this time you must be itching for some
++        difference in your menu, with lots of functionality. I
++        know. You want Colors !!!. You want to create nice menus
++        similar to those text mode dos
++        games. The functions set_menu_fore() and
++        set_menu_back() can be used to change the attribute of the
++        selected item and unselected item. The names are
++        misleading. They don't change menu's foreground or
++        background which would have been useless.
    
++
++        
    The function set_menu_grey() can be used to set the
++        display attribute for the non-selectable items in the menu.
++        This brings us to the interesting option for an item the
++        one and only O_SELECTABLE. We can turn it off by the
++        function item_opts_off() and after that that item is not
++        selectable. It's like a grayed item in those fancy windows
++        menus. Let's put these concepts in practice with this
++        example
    
++
++        
    
++          
++
++          
    Example 23. Menu Options example
    
++          
    ++#include <menu.h>
+ 
+ #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+-#define CTRLD 	4
++#define CTRLD   4
+ 
+ char *choices[] = {
+                         "Choice 1",
+                         "Choice 2",
+                         "Choice 3",
+                         "Choice 4",
+-			"Choice 5",
+-			"Choice 6",
+-			"Choice 7",
++                        "Choice 5",
++                        "Choice 6",
++                        "Choice 7",
+                         "Exit",
+                   };
+ 
+ int main()
+-{	ITEM **my_items;
+-	int c;				
+-	MENU *my_menu;
++{       ITEM **my_items;
++        int c;                          
++        MENU *my_menu;
+         int n_choices, i;
+-	ITEM *cur_item;
+-	
+-	/* Initialize curses */	
+-	initscr();
+-	start_color();
++        ITEM *cur_item;
++        
++        /* Initialize curses */ 
++        initscr();
++        start_color();
+         cbreak();
+         noecho();
+-	keypad(stdscr, TRUE);
+-	init_pair(1, COLOR_RED, COLOR_BLACK);
+-	init_pair(2, COLOR_GREEN, COLOR_BLACK);
+-	init_pair(3, COLOR_MAGENTA, COLOR_BLACK);
++        keypad(stdscr, TRUE);
++        init_pair(1, COLOR_RED, COLOR_BLACK);
++        init_pair(2, COLOR_GREEN, COLOR_BLACK);
++        init_pair(3, COLOR_MAGENTA, COLOR_BLACK);
+ 
+-	/* Initialize items */
++        /* Initialize items */
+         n_choices = ARRAY_SIZE(choices);
+         my_items = (ITEM **)calloc(n_choices + 1, sizeof(ITEM *));
+-        for(i = 0; i < n_choices; ++i)
++        for(i = 0; i < n_choices; ++i)
+                 my_items[i] = new_item(choices[i], choices[i]);
+-	my_items[n_choices] = (ITEM *)NULL;
+-	item_opts_off(my_items[3], O_SELECTABLE);
+-	item_opts_off(my_items[6], O_SELECTABLE);
+-
+-	/* Create menu */
+-	my_menu = new_menu((ITEM **)my_items);
+-
+-	/* Set fore ground and back ground of the menu */
+-	set_menu_fore(my_menu, COLOR_PAIR(1) | A_REVERSE);
+-	set_menu_back(my_menu, COLOR_PAIR(2));
+-	set_menu_grey(my_menu, COLOR_PAIR(3));
+-
+-	/* Post the menu */
+-	mvprintw(LINES - 3, 0, "Press <ENTER> to see the option selected");
+-	mvprintw(LINES - 2, 0, "Up and Down arrow keys to naviage (F1 to Exit)");
+-	post_menu(my_menu);
+-	refresh();
+-
+-	while((c = getch()) != KEY_F(1))
+-	{       switch(c)
+-	        {	case KEY_DOWN:
+-				menu_driver(my_menu, REQ_DOWN_ITEM);
+-				break;
+-			case KEY_UP:
+-				menu_driver(my_menu, REQ_UP_ITEM);
+-				break;
+-			case 10: /* Enter */
+-				move(20, 0);
+-				clrtoeol();
+-				mvprintw(20, 0, "Item selected is : %s", 
+-						item_name(current_item(my_menu)));
+-				pos_menu_cursor(my_menu);
+-				break;
+-		}
+-	}	
+-	unpost_menu(my_menu);
+-	for(i = 0; i < n_choices; ++i)
+-		free_item(my_items[i]);
+-	free_menu(my_menu);
+-	endwin();
++        my_items[n_choices] = (ITEM *)NULL;
++        item_opts_off(my_items[3], O_SELECTABLE);
++        item_opts_off(my_items[6], O_SELECTABLE);
++
++        /* Create menu */
++        my_menu = new_menu((ITEM **)my_items);
++
++        /* Set fore ground and back ground of the menu */
++        set_menu_fore(my_menu, COLOR_PAIR(1) | A_REVERSE);
++        set_menu_back(my_menu, COLOR_PAIR(2));
++        set_menu_grey(my_menu, COLOR_PAIR(3));
++
++        /* Post the menu */
++        mvprintw(LINES - 3, 0, "Press <ENTER> to see the option selected");
++        mvprintw(LINES - 2, 0, "Up and Down arrow keys to naviage (F1 to Exit)");
++        post_menu(my_menu);
++        refresh();
++
++        while((c = getch()) != KEY_F(1))
++        {       switch(c)
++                {       case KEY_DOWN:
++                                menu_driver(my_menu, REQ_DOWN_ITEM);
++                                break;
++                        case KEY_UP:
++                                menu_driver(my_menu, REQ_UP_ITEM);
++                                break;
++                        case 10: /* Enter */
++                                move(20, 0);
++                                clrtoeol();
++                                mvprintw(20, 0, "Item selected is : %s", 
++                                                item_name(current_item(my_menu)));
++                                pos_menu_cursor(my_menu);
++                                break;
++                }
++        }       
++        unpost_menu(my_menu);
++        for(i = 0; i < n_choices; ++i)
++                free_item(my_items[i]);
++        free_menu(my_menu);
++        endwin();
+ }
+-	
    17.9. The useful User Pointer
    We can associate a user pointer with each item in the menu. It works the same
+-way as user pointer in panels. It's not touched by menu system. You can store
+-any thing you like in that. I usually use it to store the function to be
+-executed when the menu option is chosen (It's selected and may be the user
+-pressed <ENTER>);
    Example 24.  Menu User Pointer Usage 
    #include <curses.h>
+-#include <menu.h>
++        
++
    
++        
    
++      
    
++
++      
    
++        
    
++
++        
    17.9. The useful User Pointer
    
++
++        
    We can associate a user pointer with each item in the
++        menu. It works the same way as user pointer in panels. It's
++        not touched by menu system. You can store any thing you
++        like in that. I usually use it to store the function to be
++        executed when the menu option is chosen (It's selected and
++        may be the user pressed <ENTER>);
    
++
++        
    
++          
++
++          
    Example 24. Menu User Pointer Usage
    
++          
    ++#include <curses.h>
++#include <menu.h>
+ 
+ #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+-#define CTRLD 	4
++#define CTRLD   4
+ 
+ char *choices[] = {
+                         "Choice 1",
+                         "Choice 2",
+                         "Choice 3",
+                         "Choice 4",
+-			"Choice 5",
+-			"Choice 6",
+-			"Choice 7",
++                        "Choice 5",
++                        "Choice 6",
++                        "Choice 7",
+                         "Exit",
+                   };
+ void func(char *name);
+ 
+ int main()
+-{	ITEM **my_items;
+-	int c;				
+-	MENU *my_menu;
++{       ITEM **my_items;
++        int c;                          
++        MENU *my_menu;
+         int n_choices, i;
+-	ITEM *cur_item;
+-	
+-	/* Initialize curses */	
+-	initscr();
+-	start_color();
++        ITEM *cur_item;
++        
++        /* Initialize curses */ 
++        initscr();
++        start_color();
+         cbreak();
+         noecho();
+-	keypad(stdscr, TRUE);
+-	init_pair(1, COLOR_RED, COLOR_BLACK);
+-	init_pair(2, COLOR_GREEN, COLOR_BLACK);
+-	init_pair(3, COLOR_MAGENTA, COLOR_BLACK);
++        keypad(stdscr, TRUE);
++        init_pair(1, COLOR_RED, COLOR_BLACK);
++        init_pair(2, COLOR_GREEN, COLOR_BLACK);
++        init_pair(3, COLOR_MAGENTA, COLOR_BLACK);
+ 
+-	/* Initialize items */
++        /* Initialize items */
+         n_choices = ARRAY_SIZE(choices);
+         my_items = (ITEM **)calloc(n_choices + 1, sizeof(ITEM *));
+-        for(i = 0; i < n_choices; ++i)
+-	{       my_items[i] = new_item(choices[i], choices[i]);
+-		/* Set the user pointer */
+-		set_item_userptr(my_items[i], func);
+-	}
+-	my_items[n_choices] = (ITEM *)NULL;
+-
+-	/* Create menu */
+-	my_menu = new_menu((ITEM **)my_items);
+-
+-	/* Post the menu */
+-	mvprintw(LINES - 3, 0, "Press <ENTER> to see the option selected");
+-	mvprintw(LINES - 2, 0, "Up and Down arrow keys to naviage (F1 to Exit)");
+-	post_menu(my_menu);
+-	refresh();
+-
+-	while((c = getch()) != KEY_F(1))
+-	{       switch(c)
+-	        {	case KEY_DOWN:
+-				menu_driver(my_menu, REQ_DOWN_ITEM);
+-				break;
+-			case KEY_UP:
+-				menu_driver(my_menu, REQ_UP_ITEM);
+-				break;
+-			case 10: /* Enter */
+-			{	ITEM *cur;
+-				void (*p)(char *);
+-
+-				cur = current_item(my_menu);
+-				p = item_userptr(cur);
+-				p((char *)item_name(cur));
+-				pos_menu_cursor(my_menu);
+-				break;
+-			}
+-			break;
+-		}
+-	}	
+-	unpost_menu(my_menu);
+-	for(i = 0; i < n_choices; ++i)
+-		free_item(my_items[i]);
+-	free_menu(my_menu);
+-	endwin();
++        for(i = 0; i < n_choices; ++i)
++        {       my_items[i] = new_item(choices[i], choices[i]);
++                /* Set the user pointer */
++                set_item_userptr(my_items[i], func);
++        }
++        my_items[n_choices] = (ITEM *)NULL;
++
++        /* Create menu */
++        my_menu = new_menu((ITEM **)my_items);
++
++        /* Post the menu */
++        mvprintw(LINES - 3, 0, "Press <ENTER> to see the option selected");
++        mvprintw(LINES - 2, 0, "Up and Down arrow keys to naviage (F1 to Exit)");
++        post_menu(my_menu);
++        refresh();
++
++        while((c = getch()) != KEY_F(1))
++        {       switch(c)
++                {       case KEY_DOWN:
++                                menu_driver(my_menu, REQ_DOWN_ITEM);
++                                break;
++                        case KEY_UP:
++                                menu_driver(my_menu, REQ_UP_ITEM);
++                                break;
++                        case 10: /* Enter */
++                        {       ITEM *cur;
++                                void (*p)(char *);
++
++                                cur = current_item(my_menu);
++                                p = item_userptr(cur);
++                                p((char *)item_name(cur));
++                                pos_menu_cursor(my_menu);
++                                break;
++                        }
++                        break;
++                }
++        }       
++        unpost_menu(my_menu);
++        for(i = 0; i < n_choices; ++i)
++                free_item(my_items[i]);
++        free_menu(my_menu);
++        endwin();
+ }
+ 
+ void func(char *name)
+-{	move(20, 0);
+-	clrtoeol();
+-	mvprintw(20, 0, "Item selected is : %s", name);
+-}	
    18. Forms Library
    Well. If you have seen those forms on web pages which take input from users and
+-do various kinds of things, you might be wondering how would any one create such
+-forms in text mode display. It's quite difficult to write those nifty forms in
+-plain ncurses. Forms library tries to provide a basic frame work to build and
+-maintain forms with ease. It has lot of features(functions) which manage
+-validation, dynamic expansion of fields etc.. Let's see it in full flow.
    A form is a collection of fields; each field can be either a label(static text)
+-or a data-entry location. The forms also library provides functions to divide
+-forms into multiple pages. 
    18.1. The Basics
    Forms are created in much the same way as menus. First the fields related to the
+-form are created with new_field(). You can set options for the fields, so that
+-they can be displayed with some fancy attributes, validated before the field
+-looses focus etc.. Then the fields are attached to form. After this, the form
+-can be posted to display and is ready to receive inputs. On the similar lines to
+-menu_driver(), the form is manipulated with form_driver(). We can send requests
+-to form_driver to move focus to a certain field, move cursor to end of the field
+-etc..  After the user enters values in the fields and validation done, form can
+-be unposted and memory allocated can be freed.
    The general flow of control of a forms program looks like this.
+-
+-
    1. Initialize curses
    2. Create fields using new_field(). You can specify the height and
+-width of the field, and its position on the form.
    3. Create the forms with new_form() by specifying the fields to be
+-attached with.
    4. Post the form with form_post() and refresh the screen.
    5. Process the user requests with a loop and do necessary updates
+-to form with form_driver.
    6. Unpost the menu with form_unpost()
    7. Free the memory allocated to menu by free_form()
    8. Free the memory allocated to the items with free_field()
    9. End curses
    As you can see, working with forms library is much similar to handling menu
+-library.  The following examples will explore various aspects of form
+-processing. Let's start the journey with a simple example.  first.
    18.2. Compiling With the Forms Library
    To use forms library functions, you have to include form.h and to link the
+-program with forms library the flag -lform should be added along with -lncurses
+-in that order.
        #include <form.h>
++{       move(20, 0);
++        clrtoeol();
++        mvprintw(20, 0, "Item selected is : %s", name);
++}       
++
    
++        
    
++      
    
++    
    
++
++    
    
++      
    
++
++      
    18. Forms
++      Library
    
++
++      
    Well. If you have seen those forms on web pages which take
++      input from users and do various kinds of things, you might be
++      wondering how would any one create such forms in text mode
++      display. It's quite difficult to write those nifty forms in
++      plain ncurses. Forms library tries to provide a basic frame
++      work to build and maintain forms with ease. It has lot of
++      features(functions) which manage validation, dynamic
++      expansion of fields etc.. Let's see it in full flow.
    
++
++      
    A form is a collection of fields; each field can be either
++      a label(static text) or a data-entry location. The forms also
++      library provides functions to divide forms into multiple
++      pages.
    
++
++      
    
++        
    
++
++        
    18.1. The Basics
    
++
++        
    Forms are created in much the same way as menus. First
++        the fields related to the form are created with
++        new_field(). You can set options for the fields, so that
++        they can be displayed with some fancy attributes, validated
++        before the field looses focus etc.. Then the fields are
++        attached to form. After this, the form can be posted to
++        display and is ready to receive inputs. On the similar
++        lines to menu_driver(), the form is manipulated with
++        form_driver(). We can send requests to form_driver to move
++        focus to a certain field, move cursor to end of the field
++        etc.. After the user enters values in the fields and
++        validation done, form can be unposted and memory allocated
++        can be freed.
    
++
++        
    The general flow of control of a forms program looks
++        like this.
    
++
++        
      
++          
    1. 
++            
      Initialize curses
      
++          
      2. 
++
++          
    2. 
++            
      Create fields using new_field(). You can specify the
++            height and width of the field, and its position on the
++            form.
      
++          
      3. 
++
++          
    3. 
++            
      Create the forms with new_form() by specifying the
++            fields to be attached with.
      
++          
      4. 
++
++          
    4. 
++            
      Post the form with form_post() and refresh the
++            screen.
      
++          
      5. 
++
++          
    5. 
++            
      Process the user requests with a loop and do
++            necessary updates to form with form_driver.
      
++          
      6. 
++
++          
    6. 
++            
      Unpost the menu with form_unpost()
      
++          
      7. 
++
++          
    7. 
++            
      Free the memory allocated to menu by free_form()
      
++          
      8. 
++
++          
    8. 
++            
      Free the memory allocated to the items with
++            free_field()
      
++          
      9. 
++
++          
    9. 
++            
      End curses
      
++          
      10. 
++        
    
++
++        
    As you can see, working with forms library is much
++        similar to handling menu library. The following examples
++        will explore various aspects of form processing. Let's
++        start the journey with a simple example. first.
    
++      
    
++
++      
    
++        
    
++
++        
    18.2. Compiling With the Forms
++        Library
    
++
++        
    To use forms library functions, you have to include
++        form.h and to link the program with forms library the flag
++        -lform should be added along with -lncurses in that
++        order.
    
++        
    ++    #include <form.h>
+     .
+     .
+     .
+ 
+-    compile and link: gcc <program file> -lform -lncurses
    Example 25.  Forms Basics 
    #include <form.h>
++    compile and link: gcc <program file> -lform -lncurses
++
    
++
++        
    
++          
++
++          
    Example 25. Forms Basics
    
++          
    ++#include <form.h>
+ 
+ int main()
+-{	FIELD *field[3];
+-	FORM  *my_form;
+-	int ch;
+-	
+-	/* Initialize curses */
+-	initscr();
+-	cbreak();
+-	noecho();
+-	keypad(stdscr, TRUE);
+-
+-	/* Initialize the fields */
+-	field[0] = new_field(1, 10, 4, 18, 0, 0);
+-	field[1] = new_field(1, 10, 6, 18, 0, 0);
+-	field[2] = NULL;
+-
+-	/* Set field options */
+-	set_field_back(field[0], A_UNDERLINE); 	/* Print a line for the option 	*/
+-	field_opts_off(field[0], O_AUTOSKIP);  	/* Don't go to next field when this */
+-						/* Field is filled up 		*/
+-	set_field_back(field[1], A_UNDERLINE); 
+-	field_opts_off(field[1], O_AUTOSKIP);
+-
+-	/* Create the form and post it */
+-	my_form = new_form(field);
+-	post_form(my_form);
+-	refresh();
+-	
+-	mvprintw(4, 10, "Value 1:");
+-	mvprintw(6, 10, "Value 2:");
+-	refresh();
+-
+-	/* Loop through to get user requests */
+-	while((ch = getch()) != KEY_F(1))
+-	{	switch(ch)
+-		{	case KEY_DOWN:
+-				/* Go to next field */
+-				form_driver(my_form, REQ_NEXT_FIELD);
+-				/* Go to the end of the present buffer */
+-				/* Leaves nicely at the last character */
+-				form_driver(my_form, REQ_END_LINE);
+-				break;
+-			case KEY_UP:
+-				/* Go to previous field */
+-				form_driver(my_form, REQ_PREV_FIELD);
+-				form_driver(my_form, REQ_END_LINE);
+-				break;
+-			default:
+-				/* If this is a normal character, it gets */
+-				/* Printed				  */	
+-				form_driver(my_form, ch);
+-				break;
+-		}
+-	}
+-
+-	/* Un post form and free the memory */
+-	unpost_form(my_form);
+-	free_form(my_form);
+-	free_field(field[0]);
+-	free_field(field[1]); 
+-
+-	endwin();
+-	return 0;
+-}
    Above example is pretty straight forward. It creates two fields with
+-new_field().  new_field() takes height, width,
+-starty, startx, number of offscreen rows and number of additional working
+-buffers. The fifth argument number of offscreen rows specifies how much of the
+-field to be shown. If it is zero, the entire field is always displayed otherwise
+-the form will be scrollable when the user accesses not displayed parts of the
+-field.  The forms library allocates one buffer per field to store the data user
+-enters. Using the last parameter to new_field() we can specify it to allocate
+-some additional buffers.  These can be used for any purpose you like.
    After creating the fields, back ground attribute of both of them is set to an
+-underscore with set_field_back(). The AUTOSKIP option is turned off using
+-field_opts_off().  If this option is turned on, focus will move to the next
+-field in the form once the active field is filled up completely.
    After attaching the fields to the form, it is posted. Here on, user inputs are
+-processed in the while loop, by making corresponding requests to form_driver.
+-The details of all the requests to the form_driver() are explained later.
    18.3. Playing with Fields
    Each form field is associated with a lot of attributes. They can be manipulated
+-to get the required effect and to have fun !!!. So why wait? 
    18.3.1. Fetching Size and Location of Field
    The parameters we have given at the time of creation of a field can be retrieved
+-with field_info(). It returns height, width, starty, startx, number of offscreen
+-rows, and number of additional buffers into the parameters given to it. It is a
+-sort of inverse of new_field().
    int field_info(     FIELD *field,              /* field from which to fetch */
++{       FIELD *field[3];
++        FORM  *my_form;
++        int ch;
++        
++        /* Initialize curses */
++        initscr();
++        cbreak();
++        noecho();
++        keypad(stdscr, TRUE);
++
++        /* Initialize the fields */
++        field[0] = new_field(1, 10, 4, 18, 0, 0);
++        field[1] = new_field(1, 10, 6, 18, 0, 0);
++        field[2] = NULL;
++
++        /* Set field options */
++        set_field_back(field[0], A_UNDERLINE);  /* Print a line for the option  */
++        field_opts_off(field[0], O_AUTOSKIP);   /* Don't go to next field when this */
++                                                /* Field is filled up           */
++        set_field_back(field[1], A_UNDERLINE); 
++        field_opts_off(field[1], O_AUTOSKIP);
++
++        /* Create the form and post it */
++        my_form = new_form(field);
++        post_form(my_form);
++        refresh();
++        
++        mvprintw(4, 10, "Value 1:");
++        mvprintw(6, 10, "Value 2:");
++        refresh();
++
++        /* Loop through to get user requests */
++        while((ch = getch()) != KEY_F(1))
++        {       switch(ch)
++                {       case KEY_DOWN:
++                                /* Go to next field */
++                                form_driver(my_form, REQ_NEXT_FIELD);
++                                /* Go to the end of the present buffer */
++                                /* Leaves nicely at the last character */
++                                form_driver(my_form, REQ_END_LINE);
++                                break;
++                        case KEY_UP:
++                                /* Go to previous field */
++                                form_driver(my_form, REQ_PREV_FIELD);
++                                form_driver(my_form, REQ_END_LINE);
++                                break;
++                        default:
++                                /* If this is a normal character, it gets */
++                                /* Printed                                */    
++                                form_driver(my_form, ch);
++                                break;
++                }
++        }
++
++        /* Un post form and free the memory */
++        unpost_form(my_form);
++        free_form(my_form);
++        free_field(field[0]);
++        free_field(field[1]); 
++
++        endwin();
++        return 0;
++}
++
    
++        
    
++
++        
    Above example is pretty straight forward. It creates two
++        fields with new_field().
++        new_field() takes height, width, starty, startx, number of
++        offscreen rows and number of additional working buffers.
++        The fifth argument number of offscreen rows specifies how
++        much of the field to be shown. If it is zero, the entire
++        field is always displayed otherwise the form will be
++        scrollable when the user accesses not displayed parts of
++        the field. The forms library allocates one buffer per field
++        to store the data user enters. Using the last parameter to
++        new_field() we can specify it to allocate some additional
++        buffers. These can be used for any purpose you like.
    
++
++        
    After creating the fields, back ground attribute of both
++        of them is set to an underscore with set_field_back(). The
++        AUTOSKIP option is turned off using field_opts_off(). If
++        this option is turned on, focus will move to the next field
++        in the form once the active field is filled up
++        completely.
    
++
++        
    After attaching the fields to the form, it is posted.
++        Here on, user inputs are processed in the while loop, by
++        making corresponding requests to form_driver. The details
++        of all the requests to the form_driver() are explained
++        later.
    
++      
    
++
++      
    
++        
    
++
++        
    18.3. Playing with Fields
    
++
++        
    Each form field is associated with a lot of attributes.
++        They can be manipulated to get the required effect and to
++        have fun !!!. So why wait?
    
++
++        
    
++          
    
++
++          
    18.3.1. Fetching Size and Location of
++          Field
    
++
++          
    The parameters we have given at the time of creation
++          of a field can be retrieved with field_info(). It returns
++          height, width, starty, startx, number of offscreen rows,
++          and number of additional buffers into the parameters
++          given to it. It is a sort of inverse of new_field().
    
++          
    ++int field_info(     FIELD *field,              /* field from which to fetch */
+                     int *height, *int width,   /* field size */ 
+                     int *top, int *left,       /* upper left corner */
+                     int *offscreen,            /* number of offscreen rows */
+-                    int *nbuf);                /* number of working buffers */
    18.3.2. Moving the field
    The location of the field can be moved to a different position with
+-move_field().
    int move_field(    FIELD *field,              /* field to alter */
+-                   int top, int left);        /* new upper-left corner */
    As usual, the changed position can be queried with field_infor().
    18.3.3. Field Justification
    The justification to be done for the field can be fixed using the function
+-set_field_just().
        int set_field_just(FIELD *field,          /* field to alter */
++                    int *nbuf);                /* number of working buffers */
++
    
++        
    
++
++        
    
++          
    
++
++          
    18.3.2. Moving the field
    
++
++          
    The location of the field can be moved to a different
++          position with move_field().
    
++          
    ++int move_field(    FIELD *field,              /* field to alter */
++                   int top, int left);        /* new upper-left corner */
++
    
++
++          
    As usual, the changed position can be queried with
++          field_infor().
    
++        
    
++
++        
    
++          
    
++
++          
    18.3.3. Field Justification
    
++
++          
    The justification to be done for the field can be
++          fixed using the function set_field_just().
    
++          
    ++    int set_field_just(FIELD *field,          /* field to alter */
+                int justmode);         /* mode to set */
+-    int field_just(FIELD *field);          /* fetch justify mode of field */
    The justification mode valued accepted and returned by these functions are 
+-NO_JUSTIFICATION, JUSTIFY_RIGHT, JUSTIFY_LEFT, or JUSTIFY_CENTER.
    18.3.4. Field Display Attributes
    As you have seen, in the above example, display attribute for the fields can be
+-set with set_field_fore() and setfield_back(). These functions set foreground
+-and background attribute of the fields. You can also specify a pad character
+-which will be filled in the unfilled portion of the field. The pad character is
+-set with a call to set_field_pad(). Default pad value is a space. The functions
+-field_fore(), field_back, field_pad() can be used to query the present
+-foreground, background attributes and pad character for the field. The following
+-list gives the usage of functions.
    
int set_field_fore(FIELD *field,        /* field to alter */
++    int field_just(FIELD *field);          /* fetch justify mode of field */
++
    
++
++          
    The justification mode valued accepted and returned by
++          these functions are NO_JUSTIFICATION, JUSTIFY_RIGHT,
++          JUSTIFY_LEFT, or JUSTIFY_CENTER.
    
++        
    
++
++        
    
++          
    
++
++          
    18.3.4. Field Display
++          Attributes
    
++
++          
    As you have seen, in the above example, display
++          attribute for the fields can be set with set_field_fore()
++          and setfield_back(). These functions set foreground and
++          background attribute of the fields. You can also specify
++          a pad character which will be filled in the unfilled
++          portion of the field. The pad character is set with a
++          call to set_field_pad(). Default pad value is a space.
++          The functions field_fore(), field_back, field_pad() can
++          be used to query the present foreground, background
++          attributes and pad character for the field. The following
++          list gives the usage of functions.
    
++          
    ++
int set_field_fore(FIELD *field,        /* field to alter */
+                    chtype attr);        /* attribute to set */ 
+ 
+ chtype field_fore(FIELD *field);        /* field to query */
+@@ -6591,127 +5625,124 @@
+                   int pad);             /* pad character to set */ 
+ 
+ chtype field_pad(FIELD *field);         /* field to query */  
+-                                        /* returns present pad character */
    Though above functions seem quite simple, using colors with set_field_fore() may
+-be frustrating in the beginning. Let me first explain about foreground and
+-background attributes of a field. The foreground attribute is associated with
+-the character. That means a character in the field is printed with the attribute
+-you have set with set_field_fore(). Background attribute is the attribute used
+-to fill background of field, whether any character is there or not.  So what
+-about colors? Since colors are always defined in pairs, what is the right way to
+-display colored fields? Here's an example clarifying color attributes.
    Example 26.  Form Attributes example 
    #include <form.h>
++                                        /* returns present pad character */
++
    
++
++          
    Though above functions seem quite simple, using colors
++          with set_field_fore() may be frustrating in the
++          beginning. Let me first explain about foreground and
++          background attributes of a field. The foreground
++          attribute is associated with the character. That means a
++          character in the field is printed with the attribute you
++          have set with set_field_fore(). Background attribute is
++          the attribute used to fill background of field, whether
++          any character is there or not. So what about colors?
++          Since colors are always defined in pairs, what is the
++          right way to display colored fields? Here's an example
++          clarifying color attributes.
    
++
++          
    
++            
++
++            
    Example 26. Form Attributes example
    
++            
    ++#include <form.h>
+ 
+ int main()
+-{	FIELD *field[3];
+-	FORM  *my_form;
+-	int ch;
+-	
+-	/* Initialize curses */
+-	initscr();
+-	start_color();
+-	cbreak();
+-	noecho();
+-	keypad(stdscr, TRUE);
+-
+-	/* Initialize few color pairs */
+-	init_pair(1, COLOR_WHITE, COLOR_BLUE);
+-	init_pair(2, COLOR_WHITE, COLOR_BLUE);
+-
+-	/* Initialize the fields */
+-	field[0] = new_field(1, 10, 4, 18, 0, 0);
+-	field[1] = new_field(1, 10, 6, 18, 0, 0);
+-	field[2] = NULL;
+-
+-	/* Set field options */
+-	set_field_fore(field[0], COLOR_PAIR(1));/* Put the field with blue background */
+-	set_field_back(field[0], COLOR_PAIR(2));/* and white foreground (characters */
+-						/* are printed in white 	*/
+-	field_opts_off(field[0], O_AUTOSKIP);  	/* Don't go to next field when this */
+-						/* Field is filled up 		*/
+-	set_field_back(field[1], A_UNDERLINE); 
+-	field_opts_off(field[1], O_AUTOSKIP);
+-
+-	/* Create the form and post it */
+-	my_form = new_form(field);
+-	post_form(my_form);
+-	refresh();
+-	
+-	set_current_field(my_form, field[0]); /* Set focus to the colored field */
+-	mvprintw(4, 10, "Value 1:");
+-	mvprintw(6, 10, "Value 2:");
+-	mvprintw(LINES - 2, 0, "Use UP, DOWN arrow keys to switch between fields");
+-	refresh();
+-
+-	/* Loop through to get user requests */
+-	while((ch = getch()) != KEY_F(1))
+-	{	switch(ch)
+-		{	case KEY_DOWN:
+-				/* Go to next field */
+-				form_driver(my_form, REQ_NEXT_FIELD);
+-				/* Go to the end of the present buffer */
+-				/* Leaves nicely at the last character */
+-				form_driver(my_form, REQ_END_LINE);
+-				break;
+-			case KEY_UP:
+-				/* Go to previous field */
+-				form_driver(my_form, REQ_PREV_FIELD);
+-				form_driver(my_form, REQ_END_LINE);
+-				break;
+-			default:
+-				/* If this is a normal character, it gets */
+-				/* Printed				  */	
+-				form_driver(my_form, ch);
+-				break;
+-		}
+-	}
+-
+-	/* Un post form and free the memory */
+-	unpost_form(my_form);
+-	free_form(my_form);
+-	free_field(field[0]);
+-	free_field(field[1]); 
+-
+-	endwin();
+-	return 0;
+-}
    Play with the color pairs and try to understand the foreground and background
+-attributes. In my programs using color attributes, I usually set only the
+-background with set_field_back(). Curses simply doesn't allow defining
+-individual color attributes. 
    18.3.5. Field Option Bits
    There is also a large collection of field option bits you can set to control
+-various aspects of forms processing. You can manipulate them with these
+-functions:
    int set_field_opts(FIELD *field,          /* field to alter */
++{       FIELD *field[3];
++        FORM  *my_form;
++        int ch;
++        
++        /* Initialize curses */
++        initscr();
++        start_color();
++        cbreak();
++        noecho();
++        keypad(stdscr, TRUE);
++
++        /* Initialize few color pairs */
++        init_pair(1, COLOR_WHITE, COLOR_BLUE);
++        init_pair(2, COLOR_WHITE, COLOR_BLUE);
++
++        /* Initialize the fields */
++        field[0] = new_field(1, 10, 4, 18, 0, 0);
++        field[1] = new_field(1, 10, 6, 18, 0, 0);
++        field[2] = NULL;
++
++        /* Set field options */
++        set_field_fore(field[0], COLOR_PAIR(1));/* Put the field with blue background */
++        set_field_back(field[0], COLOR_PAIR(2));/* and white foreground (characters */
++                                                /* are printed in white         */
++        field_opts_off(field[0], O_AUTOSKIP);   /* Don't go to next field when this */
++                                                /* Field is filled up           */
++        set_field_back(field[1], A_UNDERLINE); 
++        field_opts_off(field[1], O_AUTOSKIP);
++
++        /* Create the form and post it */
++        my_form = new_form(field);
++        post_form(my_form);
++        refresh();
++        
++        set_current_field(my_form, field[0]); /* Set focus to the colored field */
++        mvprintw(4, 10, "Value 1:");
++        mvprintw(6, 10, "Value 2:");
++        mvprintw(LINES - 2, 0, "Use UP, DOWN arrow keys to switch between fields");
++        refresh();
++
++        /* Loop through to get user requests */
++        while((ch = getch()) != KEY_F(1))
++        {       switch(ch)
++                {       case KEY_DOWN:
++                                /* Go to next field */
++                                form_driver(my_form, REQ_NEXT_FIELD);
++                                /* Go to the end of the present buffer */
++                                /* Leaves nicely at the last character */
++                                form_driver(my_form, REQ_END_LINE);
++                                break;
++                        case KEY_UP:
++                                /* Go to previous field */
++                                form_driver(my_form, REQ_PREV_FIELD);
++                                form_driver(my_form, REQ_END_LINE);
++                                break;
++                        default:
++                                /* If this is a normal character, it gets */
++                                /* Printed                                */    
++                                form_driver(my_form, ch);
++                                break;
++                }
++        }
++
++        /* Un post form and free the memory */
++        unpost_form(my_form);
++        free_form(my_form);
++        free_field(field[0]);
++        free_field(field[1]); 
++
++        endwin();
++        return 0;
++}
++
    
++          
    
++
++          
    Play with the color pairs and try to understand the
++          foreground and background attributes. In my programs
++          using color attributes, I usually set only the background
++          with set_field_back(). Curses simply doesn't allow
++          defining individual color attributes.
    
++        
    
++
++        
    
++          
    
++
++          
    18.3.5. Field Option Bits
    
++
++          
    There is also a large collection of field option bits
++          you can set to control various aspects of forms
++          processing. You can manipulate them with these
++          functions:
    
++          
    ++int set_field_opts(FIELD *field,          /* field to alter */
+                    int attr);             /* attribute to set */ 
+ 
+ int field_opts_on(FIELD *field,           /* field to alter */
+@@ -6720,134 +5751,140 @@
+ int field_opts_off(FIELD *field,          /* field to alter */
+                   int attr);              /* attributes to turn off */ 
+ 
+-int field_opts(FIELD *field);             /* field to query */ 
    The function set_field_opts() can be used to directly set attributes of a field
+-or you can choose to switch a few attributes on and off with field_opts_on() and
+-field_opts_off() selectively. Anytime you can query the attributes of a field
+-with field_opts(). The following is the list of available options. By default,
+-all options are on.
    O_VISIBLE
    Controls whether the field is visible on the screen.  Can be used
+-during form processing to hide or pop up fields depending on the value
+-of parent fields.
    O_ACTIVE
    Controls whether the field is active during forms processing (i.e.
+-visited by form navigation keys).  Can be used to make labels or derived
+-fields with buffer values alterable by the forms application, not the user.
    O_PUBLIC
    Controls whether data is displayed during field entry.  If this option is
+-turned off on a field, the library will accept and edit data in that field,
+-but it will not be displayed and the visible field cursor will not move.
+-You can turn off the O_PUBLIC bit to define password fields.
    O_EDIT
    Controls whether the field's data can be modified.  When this option is
+-off, all editing requests except REQ_PREV_CHOICE and REQ_NEXT_CHOICEwill 
+-fail.  Such read-only fields may be useful for help messages.
    O_WRAP
    Controls word-wrapping in multi-line fields.  Normally, when any
+-character of a (blank-separated) word reaches the end of the current line, the
+-entire word is wrapped to the next line (assuming there is one).  When this
+-option is off, the word will be split across the line break.
    O_BLANK
    Controls field blanking.  When this option is on, entering a character at
+-the first field position erases the entire field (except for the just-entered
+-character).
    O_AUTOSKIP
    Controls automatic skip to next field when this one fills.  Normally,
+-when the forms user tries to type more data into a field than will fit,
+-the editing location jumps to next field.  When this option is off, the
+-user's cursor will hang at the end of the field.  This option is ignored
+-in dynamic fields that have not reached their size limit.
    O_NULLOK
    Controls whether validation is applied to
+-blank fields.  Normally, it is not; the user can leave a field blank
+-without invoking the usual validation check on exit.  If this option is
+-off on a field, exit from it will invoke a validation check.
    O_PASSOK
    Controls whether validation occurs on every exit, or only after
+-the field is modified.  Normally the latter is true.  Setting O_PASSOK
+-may be useful if your field's validation function may change during
+-forms processing.
    O_STATIC
    Controls whether the field is fixed to its initial dimensions.  If you
+-turn this off, the field becomes dynamic and will
+-stretch to fit entered data.
    A field's options cannot be changed while the field is currently selected.
+-However, options may be changed on posted fields that are not current. 
    The option values are bit-masks and can be composed with logical-or in
+-the obvious way. You have seen the usage of switching off O_AUTOSKIP option.
+-The following example clarifies usage of some more options. Other options
+-are explained where appropriate.
    Example 27.  Field Options Usage example 
    #include <form.h>
++int field_opts(FIELD *field);             /* field to query */ 
++
    
++
++          
    The function set_field_opts() can be used to directly
++          set attributes of a field or you can choose to switch a
++          few attributes on and off with field_opts_on() and
++          field_opts_off() selectively. Anytime you can query the
++          attributes of a field with field_opts(). The following is
++          the list of available options. By default, all options
++          are on.
    
++
++          
    
++            
    
++              
    O_VISIBLE
    
++
++              
    
++                
    Controls whether the field is visible on the
++                screen. Can be used during form processing to hide
++                or pop up fields depending on the value of parent
++                fields.
    
++              
    
++
++              
    O_ACTIVE
    
++
++              
    
++                
    Controls whether the field is active during
++                forms processing (i.e. visited by form navigation
++                keys). Can be used to make labels or derived fields
++                with buffer values alterable by the forms
++                application, not the user.
    
++              
    
++
++              
    O_PUBLIC
    
++
++              
    
++                
    Controls whether data is displayed during field
++                entry. If this option is turned off on a field, the
++                library will accept and edit data in that field,
++                but it will not be displayed and the visible field
++                cursor will not move. You can turn off the O_PUBLIC
++                bit to define password fields.
    
++              
    
++
++              
    O_EDIT
    
++
++              
    
++                
    Controls whether the field's data can be
++                modified. When this option is off, all editing
++                requests except REQ_PREV_CHOICE and REQ_NEXT_CHOICEwill fail. Such
++                read-only fields may be useful for help
++                messages.
    
++              
    
++
++              
    O_WRAP
    
++
++              
    
++                
    Controls word-wrapping in multi-line fields.
++                Normally, when any character of a (blank-separated)
++                word reaches the end of the current line, the
++                entire word is wrapped to the next line (assuming
++                there is one). When this option is off, the word
++                will be split across the line break.
    
++              
    
++
++              
    O_BLANK
    
++
++              
    
++                
    Controls field blanking. When this option is on,
++                entering a character at the first field position
++                erases the entire field (except for the
++                just-entered character).
    
++              
    
++
++              
    O_AUTOSKIP
    
++
++              
    
++                
    Controls automatic skip to next field when this
++                one fills. Normally, when the forms user tries to
++                type more data into a field than will fit, the
++                editing location jumps to next field. When this
++                option is off, the user's cursor will hang at the
++                end of the field. This option is ignored in dynamic
++                fields that have not reached their size limit.
    
++              
    
++
++              
    O_NULLOK
    
++
++              
    
++                
    Controls whether validation is applied to blank
++                fields. Normally, it is not; the user can leave a
++                field blank without invoking the usual validation
++                check on exit. If this option is off on a field,
++                exit from it will invoke a validation check.
    
++              
    
++
++              
    O_PASSOK
    
++
++              
    
++                
    Controls whether validation occurs on every
++                exit, or only after the field is modified. Normally
++                the latter is true. Setting O_PASSOK may be useful
++                if your field's validation function may change
++                during forms processing.
    
++              
    
++
++              
    O_STATIC
    
++
++              
    
++                
    Controls whether the field is fixed to its
++                initial dimensions. If you turn this off, the field
++                becomes dynamic and will stretch to fit entered
++                data.
    
++              
    
++            
    
++          
    
++
++          
    A field's options cannot be changed while the field is
++          currently selected. However, options may be changed on
++          posted fields that are not current.
    
++
++          
    The option values are bit-masks and can be composed
++          with logical-or in the obvious way. You have seen the
++          usage of switching off O_AUTOSKIP option. The following
++          example clarifies usage of some more options. Other
++          options are explained where appropriate.
    
++
++          
    
++            
++
++            
    Example 27. Field Options Usage example
    
++            
    ++#include <form.h>
+ 
+ #define STARTX 15
+ #define STARTY 4
+@@ -6856,1476 +5893,1204 @@
+ #define N_FIELDS 3
+ 
+ int main()
+-{	FIELD *field[N_FIELDS];
+-	FORM  *my_form;
+-	int ch, i;
+-	
+-	/* Initialize curses */
+-	initscr();
+-	cbreak();
+-	noecho();
+-	keypad(stdscr, TRUE);
+-
+-	/* Initialize the fields */
+-	for(i = 0; i < N_FIELDS - 1; ++i)
+-		field[i] = new_field(1, WIDTH, STARTY + i * 2, STARTX, 0, 0);
+-	field[N_FIELDS - 1] = NULL;
+-
+-	/* Set field options */
+-	set_field_back(field[1], A_UNDERLINE); 	/* Print a line for the option 	*/
+-	
+-	field_opts_off(field[0], O_ACTIVE); /* This field is a static label */
+-	field_opts_off(field[1], O_PUBLIC); /* This filed is like a password field*/
+-	field_opts_off(field[1], O_AUTOSKIP); /* To avoid entering the same field */
+-					      /* after last character is entered */
+-	
+-	/* Create the form and post it */
+-	my_form = new_form(field);
+-	post_form(my_form);
+-	refresh();
+-	
+-	set_field_just(field[0], JUSTIFY_CENTER); /* Center Justification */
+-	set_field_buffer(field[0], 0, "This is a static Field"); 
+-						  /* Initialize the field  */
+-	mvprintw(STARTY, STARTX - 10, "Field 1:");
+-	mvprintw(STARTY + 2, STARTX - 10, "Field 2:");
+-	refresh();
+-
+-	/* Loop through to get user requests */
+-	while((ch = getch()) != KEY_F(1))
+-	{	switch(ch)
+-		{	case KEY_DOWN:
+-				/* Go to next field */
+-				form_driver(my_form, REQ_NEXT_FIELD);
+-				/* Go to the end of the present buffer */
+-				/* Leaves nicely at the last character */
+-				form_driver(my_form, REQ_END_LINE);
+-				break;
+-			case KEY_UP:
+-				/* Go to previous field */
+-				form_driver(my_form, REQ_PREV_FIELD);
+-				form_driver(my_form, REQ_END_LINE);
+-				break;
+-			default:
+-				/* If this is a normal character, it gets */
+-				/* Printed				  */	
+-				form_driver(my_form, ch);
+-				break;
+-		}
+-	}
+-
+-	/* Un post form and free the memory */
+-	unpost_form(my_form);
+-	free_form(my_form);
+-	free_field(field[0]);
+-	free_field(field[1]); 
+-
+-	endwin();
+-	return 0;
+-}
    This example, though useless, shows the usage of options. If used properly, they
+-can present information very effectively in a form. The second field being not
+-O_PUBLIC, does not show the characters you are typing.
    18.3.6. Field Status
    The field status specifies whether the field has got edited or not. It is
+-initially set to FALSE and when user enters something and the data buffer gets
+-modified it becomes TRUE. So a field's status can be queried to find out whether
+-it has been modified or not. The following functions can assist in those
+-operations.
    int set_field_status(FIELD *field,      /* field to alter */
++{       FIELD *field[N_FIELDS];
++        FORM  *my_form;
++        int ch, i;
++        
++        /* Initialize curses */
++        initscr();
++        cbreak();
++        noecho();
++        keypad(stdscr, TRUE);
++
++        /* Initialize the fields */
++        for(i = 0; i < N_FIELDS - 1; ++i)
++                field[i] = new_field(1, WIDTH, STARTY + i * 2, STARTX, 0, 0);
++        field[N_FIELDS - 1] = NULL;
++
++        /* Set field options */
++        set_field_back(field[1], A_UNDERLINE);  /* Print a line for the option  */
++        
++        field_opts_off(field[0], O_ACTIVE); /* This field is a static label */
++        field_opts_off(field[1], O_PUBLIC); /* This filed is like a password field*/
++        field_opts_off(field[1], O_AUTOSKIP); /* To avoid entering the same field */
++                                              /* after last character is entered */
++        
++        /* Create the form and post it */
++        my_form = new_form(field);
++        post_form(my_form);
++        refresh();
++        
++        set_field_just(field[0], JUSTIFY_CENTER); /* Center Justification */
++        set_field_buffer(field[0], 0, "This is a static Field"); 
++                                                  /* Initialize the field  */
++        mvprintw(STARTY, STARTX - 10, "Field 1:");
++        mvprintw(STARTY + 2, STARTX - 10, "Field 2:");
++        refresh();
++
++        /* Loop through to get user requests */
++        while((ch = getch()) != KEY_F(1))
++        {       switch(ch)
++                {       case KEY_DOWN:
++                                /* Go to next field */
++                                form_driver(my_form, REQ_NEXT_FIELD);
++                                /* Go to the end of the present buffer */
++                                /* Leaves nicely at the last character */
++                                form_driver(my_form, REQ_END_LINE);
++                                break;
++                        case KEY_UP:
++                                /* Go to previous field */
++                                form_driver(my_form, REQ_PREV_FIELD);
++                                form_driver(my_form, REQ_END_LINE);
++                                break;
++                        default:
++                                /* If this is a normal character, it gets */
++                                /* Printed                                */    
++                                form_driver(my_form, ch);
++                                break;
++                }
++        }
++
++        /* Un post form and free the memory */
++        unpost_form(my_form);
++        free_form(my_form);
++        free_field(field[0]);
++        free_field(field[1]); 
++
++        endwin();
++        return 0;
++}
++
    
++          
    
++
++          
    This example, though useless, shows the usage of
++          options. If used properly, they can present information
++          very effectively in a form. The second field being not
++          O_PUBLIC, does not show the characters you are
++          typing.
    
++        
    
++
++        
    
++          
    
++
++          
    18.3.6. Field Status
    
++
++          
    The field status specifies whether the field has got
++          edited or not. It is initially set to FALSE and when user
++          enters something and the data buffer gets modified it
++          becomes TRUE. So a field's status can be queried to find
++          out whether it has been modified or not. The following
++          functions can assist in those operations.
    
++          
    ++int set_field_status(FIELD *field,      /* field to alter */
+                    int status);         /* status to set */
+ 
+-int field_status(FIELD *field);         /* fetch status of field */
    It's better to check the field's status only after after leaving the field, as
+-data buffer might not have been updated yet as the validation is still due. To
+-guarantee that right status is returned, call field_status() either (1) in the
+-field's exit validation check routine, (2) from the field's or form's
+-initialization or termination hooks, or (3) just after a REQ_VALIDATION request
+-has been processed by the forms driver
    18.3.7. Field User Pointer
    Every field structure contains one pointer that can be used by the user for
+-various purposes. It is not touched by forms library and can be used for any
+-purpose by the user. The following functions set and fetch user pointer.
    int set_field_userptr(FIELD *field,   
++int field_status(FIELD *field);         /* fetch status of field */
++
    
++
++          
    It's better to check the field's status only after
++          after leaving the field, as data buffer might not have
++          been updated yet as the validation is still due. To
++          guarantee that right status is returned, call
++          field_status() either (1) in the field's exit validation
++          check routine, (2) from the field's or form's
++          initialization or termination hooks, or (3) just after a
++          REQ_VALIDATION request has been processed by the forms
++          driver
    
++        
    
++
++        
    
++          
    
++
++          
    18.3.7. Field User Pointer
    
++
++          
    Every field structure contains one pointer that can be
++          used by the user for various purposes. It is not touched
++          by forms library and can be used for any purpose by the
++          user. The following functions set and fetch user
++          pointer.
    
++          
    ++int set_field_userptr(FIELD *field,   
+            char *userptr);      /* the user pointer you wish to associate */
+                                 /* with the field    */
+ 
+-char *field_userptr(FIELD *field);      /* fetch user pointer of the field */
    18.3.8. Variable-Sized Fields
    If you want a dynamically changing field with variable width, this is the
+-feature you want to put to full use. This will allow the user to enter more data
+-than the original size of the field and let the field grow. According to the
+-field orientation it will scroll horizontally or vertically to incorporate the
+-new data.
    To make a field dynamically growable, the option O_STATIC should be turned off.
+-This can be done with a 
+-
        field_opts_off(field_pointer, O_STATIC);
    But it's usually not advisable to allow a field to grow infinitely. You can set
+-a maximum limit to the growth of the field with 
+-
    int set_max_field(FIELD *field,    /* Field on which to operate */
+-                  int max_growth); /* maximum growth allowed for the field */
    The field info for a dynamically growable field can be retrieved by 
+-
    int dynamic_field_info( FIELD *field,     /* Field on which to operate */
++char *field_userptr(FIELD *field);      /* fetch user pointer of the field */
++
    
++        
    
++
++        
    
++          
    
++
++          
    18.3.8. Variable-Sized
++          Fields
    
++
++          
    If you want a dynamically changing field with variable
++          width, this is the feature you want to put to full use.
++          This will allow the user to enter more data than the
++          original size of the field and let the field grow.
++          According to the field orientation it will scroll
++          horizontally or vertically to incorporate the new
++          data.
    
++
++          
    To make a field dynamically growable, the option
++          O_STATIC should be turned off. This can be done with
++          a
    
++          
    ++    field_opts_off(field_pointer, O_STATIC);
++
    
++
++          
    But it's usually not advisable to allow a field to
++          grow infinitely. You can set a maximum limit to the
++          growth of the field with
    
++          
    ++int set_max_field(FIELD *field,    /* Field on which to operate */
++                  int max_growth); /* maximum growth allowed for the field */
++
    
++
++          
    The field info for a dynamically growable field can be
++          retrieved by
    
++          
    ++int dynamic_field_info( FIELD *field,     /* Field on which to operate */
+             int   *prows,     /* number of rows will be filled in this */
+             int   *pcols,     /* number of columns will be filled in this*/
+             int   *pmax)      /* maximum allowable growth will be filled */
+-                              /* in this */
    
+-Though field_info work as usual, it is advisable to use this function to get the
+-proper attributes of a dynamically growable field.
    Recall the library routine new_field; a new field created with height set to one
+-will be defined to be a one line field. A new field created with height greater
+-than one will be defined to be a multi line field. 
    A one line field with O_STATIC turned off (dynamically growable field)  will
+-contain a single fixed row, but the number of columns can increase if the user
+-enters more data than the initial field will hold. The number of columns
+-displayed will remain fixed and the additional data will scroll horizontally. 
    A multi line field with O_STATIC turned off (dynamically growable field) will
+-contain a fixed number of columns, but the number of rows can increase if the
+-user enters more data than the initial field will hold. The number of rows
+-displayed will remain fixed and the additional data will scroll vertically.
    The above two paragraphs pretty much describe a dynamically growable field's 
+-behavior. The way other parts of forms library behaves is described below:
    1. The field option O_AUTOSKIP will be ignored if the option O_STATIC is off and
+-there is no maximum growth specified for the field. Currently, O_AUTOSKIP
+-generates an automatic REQ_NEXT_FIELD form driver request when the user types in
+-the last character position of a field. On a growable field with no maximum
+-growth specified, there is no last character position. If a maximum growth is
+-specified, the O_AUTOSKIP option will work as normal if the field has grown to
+-its maximum size. 
    2. The field justification will be ignored if the option O_STATIC is off.
+-Currently, set_field_just can be used to JUSTIFY_LEFT, JUSTIFY_RIGHT,
+-JUSTIFY_CENTER the contents of a one line field. A growable one line field will,
+-by definition, grow and scroll horizontally and may contain more data than can
+-be justified. The return from field_just will be unchanged. 
    3. The overloaded form driver request REQ_NEW_LINE will operate the same way
+-regardless of the O_NL_OVERLOAD form option if the field option O_STATIC is off
+-and there is no maximum growth specified for the field. Currently, if the form
+-option O_NL_OVERLOAD is on, REQ_NEW_LINE implicitly generates a REQ_NEXT_FIELD
+-if called from the last line of a field. If a field can grow without bound,
+-there is no last line, so REQ_NEW_LINE will never implicitly generate a
+-REQ_NEXT_FIELD. If a maximum growth limit is specified and the O_NL_OVERLOAD
+-form option is on, REQ_NEW_LINE will only implicitly generate REQ_NEXT_FIELD if
+-the field has grown to its maximum size and the user is on the last line. 
    4. The library call dup_field will work as usual; it will duplicate the field,
+-including the current buffer size and contents of the field being duplicated.
+-Any specified maximum growth will also be duplicated. 
    5. The library call link_field will work as usual; it will duplicate all field
+-attributes and share buffers with the field being linked. If the O_STATIC field
+-option is subsequently changed by a field sharing buffers, how the system reacts
+-to an attempt to enter more data into the field than the buffer will currently
+-hold will depend on the setting of the option in the current field. 
    6. The library call field_info will work as usual; the variable nrow will contain
+-the value of the original call to new_field. The user should use
+-dynamic_field_info, described above, to query the current size of the buffer.
    Some of the above points make sense only after explaining form driver. We will
+-be looking into that in next few sections.
    18.4. Form Windows
    The form windows concept is pretty much similar to menu windows. Every form is
+-associated with a main window and a sub window. The form main window displays
+-any title or border associated or whatever the user wishes. Then the sub window
+-contains all the fields and displays them according to their position. This
+-gives the flexibility of manipulating fancy form displaying very easily. 
    Since this is pretty much similar to menu windows, I am providing an example
+-with out much explanation. The functions are similar and they work the same way.
    Example 28.  Form Windows Example 
    #include <form.h>
++                              /* in this */
++
    Though field_info work as usual, it is advisable to use this
++function to get the proper attributes of a dynamically growable
++field.
++
++          
    Recall the library routine new_field; a new field
++          created with height set to one will be defined to be a
++          one line field. A new field created with height greater
++          than one will be defined to be a multi line field.
    
++
++          
    A one line field with O_STATIC turned off (dynamically
++          growable field) will contain a single fixed row, but the
++          number of columns can increase if the user enters more
++          data than the initial field will hold. The number of
++          columns displayed will remain fixed and the additional
++          data will scroll horizontally.
    
++
++          
    A multi line field with O_STATIC turned off
++          (dynamically growable field) will contain a fixed number
++          of columns, but the number of rows can increase if the
++          user enters more data than the initial field will hold.
++          The number of rows displayed will remain fixed and the
++          additional data will scroll vertically.
    
++
++          
    The above two paragraphs pretty much describe a
++          dynamically growable field's behavior. The way other
++          parts of forms library behaves is described below:
    
++
++          
      
++            
    1. 
++              
      The field option O_AUTOSKIP will be ignored if the
++              option O_STATIC is off and there is no maximum growth
++              specified for the field. Currently, O_AUTOSKIP
++              generates an automatic REQ_NEXT_FIELD form driver
++              request when the user types in the last character
++              position of a field. On a growable field with no
++              maximum growth specified, there is no last character
++              position. If a maximum growth is specified, the
++              O_AUTOSKIP option will work as normal if the field
++              has grown to its maximum size.
      
++            
      2. 
++
++            
    2. 
++              
      The field justification will be ignored if the
++              option O_STATIC is off. Currently, set_field_just can
++              be used to JUSTIFY_LEFT, JUSTIFY_RIGHT,
++              JUSTIFY_CENTER the contents of a one line field. A
++              growable one line field will, by definition, grow and
++              scroll horizontally and may contain more data than
++              can be justified. The return from field_just will be
++              unchanged.
      
++            
      3. 
++
++            
    3. 
++              
      The overloaded form driver request REQ_NEW_LINE
++              will operate the same way regardless of the
++              O_NL_OVERLOAD form option if the field option
++              O_STATIC is off and there is no maximum growth
++              specified for the field. Currently, if the form
++              option O_NL_OVERLOAD is on, REQ_NEW_LINE implicitly
++              generates a REQ_NEXT_FIELD if called from the last
++              line of a field. If a field can grow without bound,
++              there is no last line, so REQ_NEW_LINE will never
++              implicitly generate a REQ_NEXT_FIELD. If a maximum
++              growth limit is specified and the O_NL_OVERLOAD form
++              option is on, REQ_NEW_LINE will only implicitly
++              generate REQ_NEXT_FIELD if the field has grown to its
++              maximum size and the user is on the last line.
      
++            
      4. 
++
++            
    4. 
++              
      The library call dup_field will work as usual; it
++              will duplicate the field, including the current
++              buffer size and contents of the field being
++              duplicated. Any specified maximum growth will also be
++              duplicated.
      
++            
      5. 
++
++            
    5. 
++              
      The library call link_field will work as usual; it
++              will duplicate all field attributes and share buffers
++              with the field being linked. If the O_STATIC field
++              option is subsequently changed by a field sharing
++              buffers, how the system reacts to an attempt to enter
++              more data into the field than the buffer will
++              currently hold will depend on the setting of the
++              option in the current field.
      
++            
      6. 
++
++            
    6. 
++              
      The library call field_info will work as usual;
++              the variable nrow will contain the value of the
++              original call to new_field. The user should use
++              dynamic_field_info, described above, to query the
++              current size of the buffer.
      
++            
      7. 
++          
    
++
++          
    Some of the above points make sense only after
++          explaining form driver. We will be looking into that in
++          next few sections.
    
++        
    
++      
    
++
++      
    
++        
    
++
++        
    18.4. Form Windows
    
++
++        
    The form windows concept is pretty much similar to menu
++        windows. Every form is associated with a main window and a
++        sub window. The form main window displays any title or
++        border associated or whatever the user wishes. Then the sub
++        window contains all the fields and displays them according
++        to their position. This gives the flexibility of
++        manipulating fancy form displaying very easily.
    
++
++        
    Since this is pretty much similar to menu windows, I am
++        providing an example with out much explanation. The
++        functions are similar and they work the same way.
    
++
++        
    
++          
++
++          
    Example 28. Form Windows Example
    
++          
    ++#include <form.h>
+ 
+ void print_in_middle(WINDOW *win, int starty, int startx, int width, char *string, chtype color);
+ 
+ int main()
+ {
+-	FIELD *field[3];
+-	FORM  *my_form;
+-	WINDOW *my_form_win;
+-	int ch, rows, cols;
+-	
+-	/* Initialize curses */
+-	initscr();
+-	start_color();
+-	cbreak();
+-	noecho();
+-	keypad(stdscr, TRUE);
+-
+-	/* Initialize few color pairs */
+-   	init_pair(1, COLOR_RED, COLOR_BLACK);
+-
+-	/* Initialize the fields */
+-	field[0] = new_field(1, 10, 6, 1, 0, 0);
+-	field[1] = new_field(1, 10, 8, 1, 0, 0);
+-	field[2] = NULL;
+-
+-	/* Set field options */
+-	set_field_back(field[0], A_UNDERLINE);
+-	field_opts_off(field[0], O_AUTOSKIP); /* Don't go to next field when this */
+-					      /* Field is filled up 		*/
+-	set_field_back(field[1], A_UNDERLINE); 
+-	field_opts_off(field[1], O_AUTOSKIP);
+-	
+-	/* Create the form and post it */
+-	my_form = new_form(field);
+-	
+-	/* Calculate the area required for the form */
+-	scale_form(my_form, &rows, &cols);
++        FIELD *field[3];
++        FORM  *my_form;
++        WINDOW *my_form_win;
++        int ch, rows, cols;
++        
++        /* Initialize curses */
++        initscr();
++        start_color();
++        cbreak();
++        noecho();
++        keypad(stdscr, TRUE);
+ 
+-	/* Create the window to be associated with the form */
++        /* Initialize few color pairs */
++        init_pair(1, COLOR_RED, COLOR_BLACK);
++
++        /* Initialize the fields */
++        field[0] = new_field(1, 10, 6, 1, 0, 0);
++        field[1] = new_field(1, 10, 8, 1, 0, 0);
++        field[2] = NULL;
++
++        /* Set field options */
++        set_field_back(field[0], A_UNDERLINE);
++        field_opts_off(field[0], O_AUTOSKIP); /* Don't go to next field when this */
++                                              /* Field is filled up             */
++        set_field_back(field[1], A_UNDERLINE); 
++        field_opts_off(field[1], O_AUTOSKIP);
++        
++        /* Create the form and post it */
++        my_form = new_form(field);
++        
++        /* Calculate the area required for the form */
++        scale_form(my_form, &rows, &cols);
++
++        /* Create the window to be associated with the form */
+         my_form_win = newwin(rows + 4, cols + 4, 4, 4);
+         keypad(my_form_win, TRUE);
+ 
+-	/* Set main window and sub window */
++        /* Set main window and sub window */
+         set_form_win(my_form, my_form_win);
+         set_form_sub(my_form, derwin(my_form_win, rows, cols, 2, 2));
+ 
+-	/* Print a border around the main window and print a title */
++        /* Print a border around the main window and print a title */
+         box(my_form_win, 0, 0);
+-	print_in_middle(my_form_win, 1, 0, cols + 4, "My Form", COLOR_PAIR(1));
+-	
+-	post_form(my_form);
+-	wrefresh(my_form_win);
+-
+-	mvprintw(LINES - 2, 0, "Use UP, DOWN arrow keys to switch between fields");
+-	refresh();
+-
+-	/* Loop through to get user requests */
+-	while((ch = wgetch(my_form_win)) != KEY_F(1))
+-	{	switch(ch)
+-		{	case KEY_DOWN:
+-				/* Go to next field */
+-				form_driver(my_form, REQ_NEXT_FIELD);
+-				/* Go to the end of the present buffer */
+-				/* Leaves nicely at the last character */
+-				form_driver(my_form, REQ_END_LINE);
+-				break;
+-			case KEY_UP:
+-				/* Go to previous field */
+-				form_driver(my_form, REQ_PREV_FIELD);
+-				form_driver(my_form, REQ_END_LINE);
+-				break;
+-			default:
+-				/* If this is a normal character, it gets */
+-				/* Printed				  */	
+-				form_driver(my_form, ch);
+-				break;
+-		}
+-	}
+-
+-	/* Un post form and free the memory */
+-	unpost_form(my_form);
+-	free_form(my_form);
+-	free_field(field[0]);
+-	free_field(field[1]); 
++        print_in_middle(my_form_win, 1, 0, cols + 4, "My Form", COLOR_PAIR(1));
++        
++        post_form(my_form);
++        wrefresh(my_form_win);
+ 
+-	endwin();
+-	return 0;
++        mvprintw(LINES - 2, 0, "Use UP, DOWN arrow keys to switch between fields");
++        refresh();
++
++        /* Loop through to get user requests */
++        while((ch = wgetch(my_form_win)) != KEY_F(1))
++        {       switch(ch)
++                {       case KEY_DOWN:
++                                /* Go to next field */
++                                form_driver(my_form, REQ_NEXT_FIELD);
++                                /* Go to the end of the present buffer */
++                                /* Leaves nicely at the last character */
++                                form_driver(my_form, REQ_END_LINE);
++                                break;
++                        case KEY_UP:
++                                /* Go to previous field */
++                                form_driver(my_form, REQ_PREV_FIELD);
++                                form_driver(my_form, REQ_END_LINE);
++                                break;
++                        default:
++                                /* If this is a normal character, it gets */
++                                /* Printed                                */    
++                                form_driver(my_form, ch);
++                                break;
++                }
++        }
++
++        /* Un post form and free the memory */
++        unpost_form(my_form);
++        free_form(my_form);
++        free_field(field[0]);
++        free_field(field[1]); 
++
++        endwin();
++        return 0;
+ }
+ 
+ void print_in_middle(WINDOW *win, int starty, int startx, int width, char *string, chtype color)
+-{	int length, x, y;
+-	float temp;
++{       int length, x, y;
++        float temp;
+ 
+-	if(win == NULL)
+-		win = stdscr;
+-	getyx(win, y, x);
+-	if(startx != 0)
+-		x = startx;
+-	if(starty != 0)
+-		y = starty;
+-	if(width == 0)
+-		width = 80;
+-
+-	length = strlen(string);
+-	temp = (width - length)/ 2;
+-	x = startx + (int)temp;
+-	wattron(win, color);
+-	mvwprintw(win, y, x, "%s", string);
+-	wattroff(win, color);
+-	refresh();
+-}
    18.5. Field Validation
    By default, a field will accept any data input by the user. It is possible to
+-attach validation to the field. Then any attempt by the user to leave the field,
+-while it contains data that doesn't match the validation type will fail. Some
+-validation types also have a character-validity check for each time a character
+-is entered in the field.
    Validation can be attached to a field with the following function.
+-
    int set_field_type(FIELD *field,          /* field to alter */
++        if(win == NULL)
++                win = stdscr;
++        getyx(win, y, x);
++        if(startx != 0)
++                x = startx;
++        if(starty != 0)
++                y = starty;
++        if(width == 0)
++                width = 80;
++
++        length = strlen(string);
++        temp = (width - length)/ 2;
++        x = startx + (int)temp;
++        wattron(win, color);
++        mvwprintw(win, y, x, "%s", string);
++        wattroff(win, color);
++        refresh();
++}
++
    
++        
    
++      
    
++
++      
    
++        
    
++
++        
    18.5. Field Validation
    
++
++        
    By default, a field will accept any data input by the
++        user. It is possible to attach validation to the field.
++        Then any attempt by the user to leave the field, while it
++        contains data that doesn't match the validation type will
++        fail. Some validation types also have a character-validity
++        check for each time a character is entered in the
++        field.
    
++
++        
    Validation can be attached to a field with the following
++        function.
    
++        
    ++int set_field_type(FIELD *field,          /* field to alter */
+                    FIELDTYPE *ftype,      /* type to associate */
+-                   ...);                  /* additional arguments*/
    
+-Once set, the validation type for a field can be queried with
+-
    FIELDTYPE *field_type(FIELD *field);      /* field to query */
    The form driver validates the data in a field only when data is entered by the
+-end-user. Validation does not occur when 
    • the application program changes the field value by calling set_field_buffer. 
    • linked field values are changed indirectly -- by changing the field to which
+-they are linked
    The following are the pre-defined validation types. You can also specify custom
+-validation, though it's a bit tricky and cumbersome.
    TYPE_ALPHA
    This field type accepts alphabetic data; no blanks, no digits, no special
+-characters (this is checked at character-entry time).  It is set up with: 
    int set_field_type(FIELD *field,          /* field to alter */
++                   ...);                  /* additional arguments*/
++
    Once set, the validation type for a field can be queried with
++        
    ++FIELDTYPE *field_type(FIELD *field);      /* field to query */
++
    
++
++        
    The form driver validates the data in a field only when
++        data is entered by the end-user. Validation does not occur
++        when
    
++
++        
      
++          
    • 
++            
      the application program changes the field value by
++            calling set_field_buffer.
      
++          
      • 
++
++          
    • 
++            
      linked field values are changed indirectly -- by
++            changing the field to which they are linked
      
++          
      • 
++        
    
++
++        
    The following are the pre-defined validation types. You
++        can also specify custom validation, though it's a bit
++        tricky and cumbersome.
    
++
++        
    TYPE_ALPHA
    
++
++        
    This field type accepts alphabetic data; no blanks, no
++        digits, no special characters (this is checked at
++        character-entry time). It is set up with:
    
++        
    ++int set_field_type(FIELD *field,          /* field to alter */
+                    TYPE_ALPHA,            /* type to associate */
+-                   int width);            /* maximum width of field */
    The width argument sets a minimum width of data. The user has to enter at-least
+-width number of characters before he can leave the field. Typically
+-you'll want to set this to the field width; if it's greater than the
+-field width, the validation check will always fail.  A minimum width
+-of zero makes field completion optional. 
    TYPE_ALNUM
    This field type accepts alphabetic data and digits; no blanks, no special
+-characters (this is checked at character-entry time).  It is set up with: 
    int set_field_type(FIELD *field,          /* field to alter */
++                   int width);            /* minimum width of field */
++
    
++
++        
    The width argument sets a minimum width of data. The
++        user has to enter at-least width number of characters
++        before he can leave the field. Typically you'll want to set
++        this to the field width; if it's greater than the field
++        width, the validation check will always fail. A minimum
++        width of zero makes field completion optional.
    
++
++        
    TYPE_ALNUM
    
++
++        
    This field type accepts alphabetic data and digits; no
++        blanks, no special characters (this is checked at
++        character-entry time). It is set up with:
    
++        
    ++int set_field_type(FIELD *field,          /* field to alter */
+                    TYPE_ALNUM,            /* type to associate */
+-                   int width);            /* maximum width of field */
    The width argument sets a minimum width of data.  As with
+-TYPE_ALPHA, typically you'll want to set this to the field width; if it's
+-greater than the field width, the validation check will always fail.  A
+-minimum width of zero makes field completion optional. 
    TYPE_ENUM
    This type allows you to restrict a field's values to be among a specified
+-set of string values (for example, the two-letter postal codes for U.S.
+-states).  It is set up with: 
    int set_field_type(FIELD *field,          /* field to alter */
++                   int width);            /* minimum width of field */
++
    
++
++        
    The width argument sets a minimum width of data. As with
++        TYPE_ALPHA, typically you'll want to set this to the field
++        width; if it's greater than the field width, the validation
++        check will always fail. A minimum width of zero makes field
++        completion optional.
    
++
++        
    TYPE_ENUM
    
++
++        
    This type allows you to restrict a field's values to be
++        among a specified set of string values (for example, the
++        two-letter postal codes for U.S. states). It is set up
++        with:
    
++        
    ++int set_field_type(FIELD *field,          /* field to alter */
+                    TYPE_ENUM,             /* type to associate */
+                    char **valuelist;      /* list of possible values */
+                    int checkcase;         /* case-sensitive? */
+-                   int checkunique);      /* must specify uniquely? */
    The valuelist parameter must point at a NULL-terminated list of
+-valid strings.  The checkcase argument, if true, makes comparison
+-with the string case-sensitive. 
    When the user exits a TYPE_ENUM field, the validation procedure tries to
+-complete the data in the buffer to a valid entry.  If a complete choice string
+-has been entered, it is of course valid.  But it is also possible to enter a
+-prefix of a valid string and have it completed for you. 
    By default, if you enter such a prefix and it matches more than one value
+-in the string list, the prefix will be completed to the first matching
+-value.  But the checkunique argument, if true, requires prefix
+-matches to be unique in order to be valid. 
    The REQ_NEXT_CHOICE and REQ_PREV_CHOICE input requests can be particularly
+-useful with these fields. 
    TYPE_INTEGER
    This field type accepts an integer.  It is set up as follows: 
    int set_field_type(FIELD *field,          /* field to alter */
++                   int checkunique);      /* must specify uniquely? */
++
    
++
++        
    The valuelist parameter must point at a NULL-terminated
++        list of valid strings. The checkcase argument, if true,
++        makes comparison with the string case-sensitive.
    
++
++        
    When the user exits a TYPE_ENUM field, the validation
++        procedure tries to complete the data in the buffer to a
++        valid entry. If a complete choice string has been entered,
++        it is of course valid. But it is also possible to enter a
++        prefix of a valid string and have it completed for you.
    
++
++        
    By default, if you enter such a prefix and it matches
++        more than one value in the string list, the prefix will be
++        completed to the first matching value. But the checkunique
++        argument, if true, requires prefix matches to be unique in
++        order to be valid.
    
++
++        
    The REQ_NEXT_CHOICE and REQ_PREV_CHOICE input requests
++        can be particularly useful with these fields.
    
++
++        
    TYPE_INTEGER
    
++
++        
    This field type accepts an integer. It is set up as
++        follows:
    
++        
    ++int set_field_type(FIELD *field,          /* field to alter */
+                    TYPE_INTEGER,          /* type to associate */
+                    int padding,           /* # places to zero-pad to */
+-                   int vmin, int vmax);   /* valid range */
    Valid characters consist of an optional leading minus and digits.
+-The range check is performed on exit.  If the range maximum is less
+-than or equal to the minimum, the range is ignored. 
    If the value passes its range check, it is padded with as many leading
+-zero digits as necessary to meet the padding argument. 
    A TYPE_INTEGER value buffer can conveniently be interpreted with the C library 
+-function atoi(3).
    TYPE_NUMERIC
    This field type accepts a decimal number.  It is set up as follows: 
    int set_field_type(FIELD *field,          /* field to alter */
++                   int vmin, int vmax);   /* valid range */
++
    
++
++        
    Valid characters consist of an optional leading minus
++        and digits. The range check is performed on exit. If the
++        range maximum is less than or equal to the minimum, the
++        range is ignored.
    
++
++        
    If the value passes its range check, it is padded with
++        as many leading zero digits as necessary to meet the
++        padding argument.
    
++
++        
    A TYPE_INTEGER value buffer can conveniently be
++        interpreted with the C library function atoi(3).
    
++
++        
    TYPE_NUMERIC
    
++
++        
    This field type accepts a decimal number. It is set up
++        as follows:
    
++        
    ++int set_field_type(FIELD *field,          /* field to alter */
+                    TYPE_NUMERIC,          /* type to associate */
+                    int padding,           /* # places of precision */
+-                   int vmin, int vmax);   /* valid range */
    Valid characters consist of an optional leading minus and digits. possibly
+-including a decimal point.  The range check is performed on exit.  If the
+-range maximum is less than or equal to the minimum, the range is
+-ignored. 
    If the value passes its range check, it is padded with as many trailing
+-zero digits as necessary to meet the padding argument. 
    A TYPE_NUMERIC value buffer can conveniently be interpreted with the C library 
+-function atof(3).
    TYPE_REGEXP
    This field type accepts data matching a regular expression.  It is set up
+-as follows: 
    int set_field_type(FIELD *field,          /* field to alter */
++                   int vmin, int vmax);   /* valid range */
++
    
++
++        
    Valid characters consist of an optional leading minus
++        and digits. possibly including a decimal point. The range
++        check is performed on exit. If the range maximum is less
++        than or equal to the minimum, the range is ignored.
    
++
++        
    If the value passes its range check, it is padded with
++        as many trailing zero digits as necessary to meet the
++        padding argument.
    
++
++        
    A TYPE_NUMERIC value buffer can conveniently be
++        interpreted with the C library function atof(3).
    
++
++        
    TYPE_REGEXP
    
++
++        
    This field type accepts data matching a regular
++        expression. It is set up as follows:
    
++        
    ++int set_field_type(FIELD *field,          /* field to alter */
+                    TYPE_REGEXP,           /* type to associate */
+-                   char *regexp);         /* expression to match */
    The syntax for regular expressions is that of regcomp(3).
+-The check for regular-expression match is performed on exit.
    18.6. Form Driver: The work horse of the forms system
    As in the menu system, form_driver() plays a very important role in forms
+-system.  All types of requests to forms system should be funneled through
+-form_driver().
    int form_driver(FORM *form,     /* form on which to operate     */
+-                int request)    /* form request code         */
    As you have seen some of the examples above, you have to be in a loop looking
+-for user input and then decide whether it's a field data or a form request. The
+-form requests are then passed to form_driver() to do the work.
    The requests roughly can be divided into following categories. Different
+-requests and their usage is explained below:
    18.6.1. Page Navigation Requests
    These requests cause page-level moves through the form, triggering display of a
+-new form screen. A form can be made of multiple pages. If you have a big form
+-with lot of fields and logical sections, then you can divide the form into
+-pages. The function set_new_page() to set a new page at the field specified.
    int set_new_page(FIELD *field,/* Field at which page break to be set or unset */
+-         bool new_page_flag); /* should be TRUE to put a break */
    The following requests allow you to move to different pages
    • REQ_NEXT_PAGE Move to the next form page.
    • REQ_PREV_PAGE Move to the previous
+-form page.
    • REQ_FIRST_PAGE Move to the first form page.
    • REQ_LAST_PAGE Move to the last form page. 
    These requests treat the list as cyclic; that is, REQ_NEXT_PAGE from the
+-last page goes to the first, and REQ_PREV_PAGE from the first page goes to
+-the last.
    18.6.2. Inter-Field Navigation Requests
    These requests handle navigation between fields on the same page.
    • REQ_NEXT_FIELD 
+-    Move to next field.  
    • REQ_PREV_FIELD
+-    Move to previous field.  
    • REQ_FIRST_FIELD
+-    Move to the first field. 
    • REQ_LAST_FIELD 
+-    Move to the last field. 
    • REQ_SNEXT_FIELD
+-    Move to sorted next field. 
    • REQ_SPREV_FIELD 
+-    Move to sorted previous field. 
    • REQ_SFIRST_FIELD
+-    Move to the sorted first field. 
    • REQ_SLAST_FIELD
+-    Move to the sorted last field. 
    • REQ_LEFT_FIELD
+-    Move left to field.  
    • REQ_RIGHT_FIELD
+-    Move right to field. 
    • REQ_UP_FIELD
+-    Move up to field.  
    • REQ_DOWN_FIELD
+-    Move down to field. 
    These requests treat the list of fields on a page as cyclic; that is,
+-REQ_NEXT_FIELD from the last field goes to the first, and REQ_PREV_FIELD
+-from the first field goes to the last. The order of the fields for these
+-(and the REQ_FIRST_FIELD and REQ_LAST_FIELD requests) is simply the order of
+-the field pointers in the form array (as set up by new_form() or
+-set_form_fields()
    It is also possible to traverse the fields as if they had been sorted in
+-screen-position order, so the sequence goes left-to-right and top-to-bottom.
+-To do this, use the second group of four sorted-movement requests.
    Finally, it is possible to move between fields using visual directions up,
+-down, right, and left. To accomplish this, use the third group of four
+-requests. Note, however, that the position of a form for purposes of these
+-requests is its upper-left corner.
    For example, suppose you have a multi-line field B, and two single-line
+-fields A and C on the same line with B, with A to the left of B and C to the
+-right of B. A REQ_MOVE_RIGHT from A will go to B only if A, B, and C all
+-share the same first line; otherwise it will skip over B to C.
    18.6.3. Intra-Field Navigation Requests
    These requests drive movement of the edit cursor within the currently
+-selected field.
    • REQ_NEXT_CHAR
+-    Move to next character.  
    • REQ_PREV_CHAR 
+-    Move to previous character.  
    • REQ_NEXT_LINE 
+-    Move to next line.  
    • REQ_PREV_LINE 
+-    Move to previous line.  
    • REQ_NEXT_WORD 
+-    Move to next word. 
    • REQ_PREV_WORD
+-    Move to previous word. 
    • REQ_BEG_FIELD
+-    Move to beginning of field. 
    • REQ_END_FIELD
+-    Move to end of field. 
    • REQ_BEG_LINE
+-    Move to beginning of line. 
    • REQ_END_LINE
+-    Move to end of line.  
    • REQ_LEFT_CHAR 
+-    Move left in field. 
    • REQ_RIGHT_CHAR
+-    Move right in field.  
    • REQ_UP_CHAR
+-    Move up in field. 
    • REQ_DOWN_CHAR 
+-    Move down in field. 
    Each word is separated from the previous and next characters by whitespace.
+-The commands to move to beginning and end of line or field look for the
+-first or last non-pad character in their ranges.
    18.6.4. Scrolling Requests
    Fields that are dynamic and have grown and fields explicitly created with
+-offscreen rows are scrollable. One-line fields scroll horizontally;
+-multi-line fields scroll vertically. Most scrolling is triggered by editing
+-and intra-field movement (the library scrolls the field to keep the cursor
+-visible). It is possible to explicitly request scrolling with the following
+-requests:
    • REQ_SCR_FLINE
+-    Scroll vertically forward a line.  
    • REQ_SCR_BLINE 
+-    Scroll vertically backward a line.  
    • REQ_SCR_FPAGE 
+-    Scroll vertically forward a page.  
    • REQ_SCR_BPAGE
+-    Scroll vertically backward a page. 
    • REQ_SCR_FHPAGE
+-    Scroll vertically forward half a page. 
    • REQ_SCR_BHPAGE
+-    Scroll vertically backward half a page. 
    • REQ_SCR_FCHAR
+-    Scroll horizontally forward a character. 
    • REQ_SCR_BCHAR
+-    Scroll horizontally backward a character. 
    • REQ_SCR_HFLINE
+-    Scroll horizontally one field width forward. 
    • REQ_SCR_HBLINE
+-    Scroll horizontally one field width backward. 
    • REQ_SCR_HFHALF
+-    Scroll horizontally one half field width forward. 
    • REQ_SCR_HBHALF
+-    Scroll horizontally one half field width backward. 
    For scrolling purposes, a page of a field is the height of its visible part.
    18.6.5. Editing Requests
    When you pass the forms driver an ASCII character, it is treated as a
+-request to add the character to the field's data buffer. Whether this is an
+-insertion or a replacement depends on the field's edit mode (insertion is
+-the default.
    The following requests support editing the field and changing the edit mode:
    • REQ_INS_MODE 
+-    Set insertion mode. 
    • REQ_OVL_MODE 
+-    Set overlay mode. 
    • REQ_NEW_LINE 
+-    New line request (see below for explanation). 
    • REQ_INS_CHAR
+-    Insert space at character location.  
    • REQ_INS_LINE
+-    Insert blank line at character location.  
    • REQ_DEL_CHAR
+-    Delete character at cursor.  
    • REQ_DEL_PREV 
+-    Delete previous word at cursor. 
    • REQ_DEL_LINE
+-    Delete line at cursor. 
    • REQ_DEL_WORD
+-    Delete word at cursor. 
    • REQ_CLR_EOL
+-    Clear to end of line. 
    • REQ_CLR_EOF
+-    Clear to end of field. 
    • REQ_CLR_FIELD
+-    Clear entire field. 
    The behavior of the REQ_NEW_LINE and REQ_DEL_PREV requests is complicated
+-and partly controlled by a pair of forms options. The special cases are
+-triggered when the cursor is at the beginning of a field, or on the last
+-line of the field.
    First, we consider REQ_NEW_LINE:
    The normal behavior of REQ_NEW_LINE in insert mode is to break the current
+-line at the position of the edit cursor, inserting the portion of the
+-current line after the cursor as a new line following the current and moving
+-the cursor to the beginning of that new line (you may think of this as
+-inserting a newline in the field buffer).
    The normal behavior of REQ_NEW_LINE in overlay mode is to clear the current
+-line from the position of the edit cursor to end of line. The cursor is then
+-moved to the beginning of the next line.
    However, REQ_NEW_LINE at the beginning of a field, or on the last line of a
+-field, instead does a REQ_NEXT_FIELD. O_NL_OVERLOAD option is off, this
+-special action is disabled.
    Now, let us consider REQ_DEL_PREV:
    The normal behavior of REQ_DEL_PREV is to delete the previous character. If
+-insert mode is on, and the cursor is at the start of a line, and the text on
+-that line will fit on the previous one, it instead appends the contents of
+-the current line to the previous one and deletes the current line (you may
+-think of this as deleting a newline from the field buffer).
    However, REQ_DEL_PREV at the beginning of a field is instead treated as a
+-REQ_PREV_FIELD.
    If the O_BS_OVERLOAD option is off, this special action is disabled and the
+-forms driver just returns E_REQUEST_DENIED.
    18.6.6. Order Requests
    If the type of your field is ordered, and has associated functions for
+-getting the next and previous values of the type from a given value, there
+-are requests that can fetch that value into the field buffer:
    • REQ_NEXT_CHOICE 
+-    Place the successor value of the current value in the buffer. 
+-    
    • REQ_PREV_CHOICE 
+-    Place the predecessor value of the current value in the buffer.
+-    
    Of the built-in field types, only TYPE_ENUM has built-in successor and
+-predecessor functions. When you define a field type of your own (see Custom
+-Validation Types), you can associate our own ordering functions.
    18.6.7. Application Commands
    Form requests are represented as integers above the curses value greater than
+-KEY_MAX and less than or equal to the constant MAX_COMMAND.  A value within this
+-range gets ignored by form_driver(). So this can be used for any purpose by the
+-application. It can be treated as an application specific action and take
+-corresponding action.
    19. Tools and Widget Libraries
     
+-Now that you have seen the capabilities of ncurses and its sister libraries, you
+-are rolling your sleeves up and gearing for a project that heavily manipulates
+-screen. But wait..  It can be pretty difficult to write and maintain complex GUI
+-widgets in plain ncurses or even with the additional libraries. There are some
+-ready-to-use tools and widget libraries that can be used instead of writing your
+-own widgets. You can use some of them, get ideas from the code, or even extend
+-them.
    19.1. CDK (Curses Development Kit)
    In the author's words 
     
+-CDK stands for 'Curses Development Kit' and it currently contains 21 ready
+-to use widgets which facilitate the speedy development of full screen
+-curses programs. 
    The kit provides some useful widgets, which can be used in your programs
+-directly. It's pretty well written and the documentation is very good. The
+-examples in the examples directory can be a good place to start for beginners.
+-The CDK can be downloaded from http://invisible-island.net/cdk/
+-. Follow the instructions in 
+-README file to install it.
    19.1.1. Widget List
    The following is the list of widgets provided with cdk and their description.
    Widget Type           Quick Description
++                   char *regexp);         /* expression to match */
++
    
++
++        
    The syntax for regular expressions is that of
++        regcomp(3). The check for regular-expression match is
++        performed on exit.
    
++      
    
++
++      
    
++        
    
++
++        
    18.6. Form Driver: The work horse of the forms
++        system
    
++
++        
    As in the menu system, form_driver() plays a very
++        important role in forms system. All types of requests to
++        forms system should be funneled through form_driver().
    
++        
    ++int form_driver(FORM *form,     /* form on which to operate     */
++                int request)    /* form request code         */
++
    
++
++        
    As you have seen some of the examples above, you have to
++        be in a loop looking for user input and then decide whether
++        it's a field data or a form request. The form requests are
++        then passed to form_driver() to do the work.
    
++
++        
    The requests roughly can be divided into following
++        categories. Different requests and their usage is explained
++        below:
    
++
++        
    
++          
    
++
++          
    18.6.1. Page Navigation Requests
    
++
++          
    These requests cause page-level moves through the
++          form, triggering display of a new form screen. A form can
++          be made of multiple pages. If you have a big form with
++          lot of fields and logical sections, then you can divide
++          the form into pages. The function set_new_page() to set a
++          new page at the field specified.
    
++          
    ++int set_new_page(FIELD *field,/* Field at which page break to be set or unset */
++         bool new_page_flag); /* should be TRUE to put a break */
++
    
++
++          
    The following requests allow you to move to different
++          pages
    
++
++          
      
++            
    • 
++              
      REQ_NEXT_PAGE Move to the next
++              form page.
      
++            
      • 
++
++            
    • 
++              
      REQ_PREV_PAGE Move to the
++              previous form page.
      
++            
      • 
++
++            
    • 
++              
      REQ_FIRST_PAGE Move to the
++              first form page.
      
++            
      • 
++
++            
    • 
++              
      REQ_LAST_PAGE Move to the last
++              form page.
      
++            
      • 
++          
    
++
++          
    These requests treat the list as cyclic; that is,
++          REQ_NEXT_PAGE from the last page goes to the first, and
++          REQ_PREV_PAGE from the first page goes to the last.
    
++        
    
++
++        
    
++          
    
++
++          
    18.6.2. Inter-Field Navigation
++          Requests
    
++
++          
    These requests handle navigation between fields on the
++          same page.
    
++
++          
      
++            
    • 
++              
      REQ_NEXT_FIELD Move to next
++              field.
      
++            
      • 
++
++            
    • 
++              
      REQ_PREV_FIELD Move to previous
++              field.
      
++            
      • 
++
++            
    • 
++              
      REQ_FIRST_FIELD Move to the
++              first field.
      
++            
      • 
++
++            
    • 
++              
      REQ_LAST_FIELD Move to the last
++              field.
      
++            
      • 
++
++            
    • 
++              
      REQ_SNEXT_FIELD Move to sorted
++              next field.
      
++            
      • 
++
++            
    • 
++              
      REQ_SPREV_FIELD Move to sorted
++              previous field.
      
++            
      • 
++
++            
    • 
++              
      REQ_SFIRST_FIELD Move to the
++              sorted first field.
      
++            
      • 
++
++            
    • 
++              
      REQ_SLAST_FIELD Move to the
++              sorted last field.
      
++            
      • 
++
++            
    • 
++              
      REQ_LEFT_FIELD Move left to
++              field.
      
++            
      • 
++
++            
    • 
++              
      REQ_RIGHT_FIELD Move right to
++              field.
      
++            
      • 
++
++            
    • 
++              
      REQ_UP_FIELD Move up to
++              field.
      
++            
      • 
++
++            
    • 
++              
      REQ_DOWN_FIELD Move down to
++              field.
      
++            
      • 
++          
    
++
++          
    These requests treat the list of fields on a page as
++          cyclic; that is, REQ_NEXT_FIELD from the last field goes
++          to the first, and REQ_PREV_FIELD from the first field
++          goes to the last. The order of the fields for these (and
++          the REQ_FIRST_FIELD and REQ_LAST_FIELD requests) is
++          simply the order of the field pointers in the form array
++          (as set up by new_form() or set_form_fields()
    
++
++          
    It is also possible to traverse the fields as if they
++          had been sorted in screen-position order, so the sequence
++          goes left-to-right and top-to-bottom. To do this, use the
++          second group of four sorted-movement requests.
    
++
++          
    Finally, it is possible to move between fields using
++          visual directions up, down, right, and left. To
++          accomplish this, use the third group of four requests.
++          Note, however, that the position of a form for purposes
++          of these requests is its upper-left corner.
    
++
++          
    For example, suppose you have a multi-line field B,
++          and two single-line fields A and C on the same line with
++          B, with A to the left of B and C to the right of B. A
++          REQ_MOVE_RIGHT from A will go to B only if A, B, and C
++          all share the same first line; otherwise it will skip
++          over B to C.
    
++        
    
++
++        
    
++          
    
++
++          
    18.6.3. Intra-Field Navigation
++          Requests
    
++
++          
    These requests drive movement of the edit cursor
++          within the currently selected field.
    
++
++          
      
++            
    • 
++              
      REQ_NEXT_CHAR Move to next
++              character.
      
++            
      • 
++
++            
    • 
++              
      REQ_PREV_CHAR Move to previous
++              character.
      
++            
      • 
++
++            
    • 
++              
      REQ_NEXT_LINE Move to next
++              line.
      
++            
      • 
++
++            
    • 
++              
      REQ_PREV_LINE Move to previous
++              line.
      
++            
      • 
++
++            
    • 
++              
      REQ_NEXT_WORD Move to next
++              word.
      
++            
      • 
++
++            
    • 
++              
      REQ_PREV_WORD Move to previous
++              word.
      
++            
      • 
++
++            
    • 
++              
      REQ_BEG_FIELD Move to beginning
++              of field.
      
++            
      • 
++
++            
    • 
++              
      REQ_END_FIELD Move to end of
++              field.
      
++            
      • 
++
++            
    • 
++              
      REQ_BEG_LINE Move to beginning
++              of line.
      
++            
      • 
++
++            
    • 
++              
      REQ_END_LINE Move to end of
++              line.
      
++            
      • 
++
++            
    • 
++              
      REQ_LEFT_CHAR Move left in
++              field.
      
++            
      • 
++
++            
    • 
++              
      REQ_RIGHT_CHAR Move right in
++              field.
      
++            
      • 
++
++            
    • 
++              
      REQ_UP_CHAR Move up in
++              field.
      
++            
      • 
++
++            
    • 
++              
      REQ_DOWN_CHAR Move down in
++              field.
      
++            
      • 
++          
    
++
++          
    Each word is separated from the previous and next
++          characters by whitespace. The commands to move to
++          beginning and end of line or field look for the first or
++          last non-pad character in their ranges.
    
++        
    
++
++        
    
++          
    
++
++          
    18.6.4. Scrolling Requests
    
++
++          
    Fields that are dynamic and have grown and fields
++          explicitly created with offscreen rows are scrollable.
++          One-line fields scroll horizontally; multi-line fields
++          scroll vertically. Most scrolling is triggered by editing
++          and intra-field movement (the library scrolls the field
++          to keep the cursor visible). It is possible to explicitly
++          request scrolling with the following requests:
    
++
++          
      
++            
    • 
++              
      REQ_SCR_FLINE Scroll vertically
++              forward a line.
      
++            
      • 
++
++            
    • 
++              
      REQ_SCR_BLINE Scroll vertically
++              backward a line.
      
++            
      • 
++
++            
    • 
++              
      REQ_SCR_FPAGE Scroll vertically
++              forward a page.
      
++            
      • 
++
++            
    • 
++              
      REQ_SCR_BPAGE Scroll vertically
++              backward a page.
      
++            
      • 
++
++            
    • 
++              
      REQ_SCR_FHPAGE Scroll
++              vertically forward half a page.
      
++            
      • 
++
++            
    • 
++              
      REQ_SCR_BHPAGE Scroll
++              vertically backward half a page.
      
++            
      • 
++
++            
    • 
++              
      REQ_SCR_FCHAR Scroll
++              horizontally forward a character.
      
++            
      • 
++
++            
    • 
++              
      REQ_SCR_BCHAR Scroll
++              horizontally backward a character.
      
++            
      • 
++
++            
    • 
++              
      REQ_SCR_HFLINE Scroll
++              horizontally one field width forward.
      
++            
      • 
++
++            
    • 
++              
      REQ_SCR_HBLINE Scroll
++              horizontally one field width backward.
      
++            
      • 
++
++            
    • 
++              
      REQ_SCR_HFHALF Scroll
++              horizontally one half field width forward.
      
++            
      • 
++
++            
    • 
++              
      REQ_SCR_HBHALF Scroll
++              horizontally one half field width backward.
      
++            
      • 
++          
    
++
++          
    For scrolling purposes, a page of a field is the
++          height of its visible part.
    
++        
    
++
++        
    
++          
    
++
++          
    18.6.5.
++          Editing Requests
    
++
++          
    When you pass the forms driver an ASCII character, it
++          is treated as a request to add the character to the
++          field's data buffer. Whether this is an insertion or a
++          replacement depends on the field's edit mode (insertion
++          is the default.
    
++
++          
    The following requests support editing the field and
++          changing the edit mode:
    
++
++          
      
++            
    • 
++              
      REQ_INS_MODE Set insertion
++              mode.
      
++            
      • 
++
++            
    • 
++              
      REQ_OVL_MODE Set overlay
++              mode.
      
++            
      • 
++
++            
    • 
++              
      REQ_NEW_LINE New line request
++              (see below for explanation).
      
++            
      • 
++
++            
    • 
++              
      REQ_INS_CHAR Insert space at
++              character location.
      
++            
      • 
++
++            
    • 
++              
      REQ_INS_LINE Insert blank line
++              at character location.
      
++            
      • 
++
++            
    • 
++              
      REQ_DEL_CHAR Delete character
++              at cursor.
      
++            
      • 
++
++            
    • 
++              
      REQ_DEL_PREV Delete previous
++              word at cursor.
      
++            
      • 
++
++            
    • 
++              
      REQ_DEL_LINE Delete line at
++              cursor.
      
++            
      • 
++
++            
    • 
++              
      REQ_DEL_WORD Delete word at
++              cursor.
      
++            
      • 
++
++            
    • 
++              
      REQ_CLR_EOL Clear to end of
++              line.
      
++            
      • 
++
++            
    • 
++              
      REQ_CLR_EOF Clear to end of
++              field.
      
++            
      • 
++
++            
    • 
++              
      REQ_CLR_FIELD Clear entire
++              field.
      
++            
      • 
++          
    
++
++          
    The behavior of the REQ_NEW_LINE and REQ_DEL_PREV
++          requests is complicated and partly controlled by a pair
++          of forms options. The special cases are triggered when
++          the cursor is at the beginning of a field, or on the last
++          line of the field.
    
++
++          
    First, we consider REQ_NEW_LINE:
    
++
++          
    The normal behavior of REQ_NEW_LINE in insert mode is
++          to break the current line at the position of the edit
++          cursor, inserting the portion of the current line after
++          the cursor as a new line following the current and moving
++          the cursor to the beginning of that new line (you may
++          think of this as inserting a newline in the field
++          buffer).
    
++
++          
    The normal behavior of REQ_NEW_LINE in overlay mode is
++          to clear the current line from the position of the edit
++          cursor to end of line. The cursor is then moved to the
++          beginning of the next line.
    
++
++          
    However, REQ_NEW_LINE at the beginning of a field, or
++          on the last line of a field, instead does a
++          REQ_NEXT_FIELD. O_NL_OVERLOAD option is off, this special
++          action is disabled.
    
++
++          
    Now, let us consider REQ_DEL_PREV:
    
++
++          
    The normal behavior of REQ_DEL_PREV is to delete the
++          previous character. If insert mode is on, and the cursor
++          is at the start of a line, and the text on that line will
++          fit on the previous one, it instead appends the contents
++          of the current line to the previous one and deletes the
++          current line (you may think of this as deleting a newline
++          from the field buffer).
    
++
++          
    However, REQ_DEL_PREV at the beginning of a field is
++          instead treated as a REQ_PREV_FIELD.
    
++
++          
    If the O_BS_OVERLOAD option is off, this special
++          action is disabled and the forms driver just returns
++          E_REQUEST_DENIED.
    
++        
    
++
++        
    
++          
    
++
++          
    18.6.6. Order Requests
    
++
++          
    If the type of your field is ordered, and has
++          associated functions for getting the next and previous
++          values of the type from a given value, there are requests
++          that can fetch that value into the field buffer:
    
++
++          
      
++            
    • 
++              
      REQ_NEXT_CHOICE Place the
++              successor value of the current value in the
++              buffer.
      
++            
      • 
++
++            
    • 
++              
      REQ_PREV_CHOICE Place the
++              predecessor value of the current value in the
++              buffer.
      
++            
      • 
++          
    
++
++          
    Of the built-in field types, only TYPE_ENUM has
++          built-in successor and predecessor functions. When you
++          define a field type of your own (see Custom Validation
++          Types), you can associate our own ordering functions.
    
++        
    
++
++        
    
++          
    
++
++          
    18.6.7. Application Commands
    
++
++          
    Form requests are represented as integers above the
++          curses value greater than KEY_MAX and less than or equal
++          to the constant MAX_COMMAND. A value within this range
++          gets ignored by form_driver(). So this can be used for
++          any purpose by the application. It can be treated as an
++          application specific action and take corresponding
++          action.
    
++        
    
++      
    
++    
    
++
++    
    
++      
    
++
++      
    19. Tools and
++      Widget Libraries
    
++
++      
    Now that you have seen the capabilities of ncurses and its
++      sister libraries, you are rolling your sleeves up and gearing
++      for a project that heavily manipulates screen. But wait.. It
++      can be pretty difficult to write and maintain complex GUI
++      widgets in plain ncurses or even with the additional
++      libraries. There are some ready-to-use tools and widget
++      libraries that can be used instead of writing your own
++      widgets. You can use some of them, get ideas from the code,
++      or even extend them.
    
++
++      
    
++        
    
++
++        
    19.1. CDK (Curses
++        Development Kit)
    
++
++        
    In the author's words
    
++
++        
    CDK stands
++        for 'Curses Development Kit' and it currently contains 21
++        ready to use widgets which facilitate the speedy
++        development of full screen curses programs.
    
++
++        
    The kit provides some useful widgets, which can be used
++        in your programs directly. It's pretty well written and the
++        documentation is very good. The examples in the examples
++        directory can be a good place to start for beginners. The
++        CDK can be downloaded from http://invisible-island.net/cdk/ . Follow the
++        instructions in README file to install it.
    
++
++        
    
++          
    
++
++          
    19.1.1. Widget List
    
++
++          
    The following is the list of widgets provided with cdk
++          and their description.
    
++          
    ++Widget Type           Quick Description
+ ===========================================================================
+ Alphalist             Allows a user to select from a list of words, with
+                       the ability to narrow the search list by typing in a
+@@ -8368,346 +7133,283 @@
+                       dates and phone numbers.
+ Viewer                This is a file/information viewer. Very useful
+                       when you need to display loads of information.
+-===========================================================================
    A few of the widgets are modified by Thomas Dickey in recent versions.
    19.1.2. Some Attractive Features
    Apart from making our life easier with readily usable widgets, cdk solves one
+-frustrating problem with printing multi colored strings, justified strings
+-elegantly.  Special formatting tags can be embedded in the strings which are
+-passed to CDK functions. For Example
    If the string
    "</B/1>This line should have a yellow foreground and a blue
+-background.<!1>"
    given as a parameter to newCDKLabel(), it prints the line with yellow foreground
+-and blue background. There are other tags available for justifying string,
+-embedding special drawing characters etc.. Please refer to the man page
+-cdk_display(3X) for details. The man page explains the usage with nice examples.
    19.1.3. Conclusion
    All in all, CDK is a well-written package of widgets, which if used properly can
+-form a strong frame work for developing complex GUI.
    19.2. The dialog
    Long long ago, in September 1994, when few people knew linux, Jeff Tranter wrote
+-an article on dialog in Linux Journal. He starts the article with these words..
    Linux is based on the Unix operating system, but also features a number of
+-unique and useful kernel features and application programs that often go beyond
+-what is available under Unix. One little-known gem is "dialog", a utility for
+-creating professional-looking dialog boxes from within shell scripts. This
+-article presents a tutorial introduction to the dialog utility, and shows
+-examples of how and where it can be used
     
+-As he explains, dialog is a real gem in making professional-looking dialog boxes
+-with ease. It creates a variety of dialog boxes, menus, check lists etc.. It is
+-usually installed by default. If not, you can download it from Thomas Dickey's site. 
    The above-mentioned article gives a very good overview of its uses and
+-capabilites.  The man page has more details. It can be used in variety of
+-situations. One good example is building of linux kernel in text mode. Linux
+-kernel uses a modified version of dialog tailored for its needs. 
    dialog was initially designed to be used with shell scripts. If you want to use
+-its functionality in a c program, then you can use libdialog. The documentation
+-regarding this is sparse. Definitive reference is the dialog.h header file which
+-comes with the library. You may need to hack here and there to get the required
+-output. The source is easily customizable. I have used it on a number of
+-occasions by modifying the code.
    19.3. Perl Curses Modules CURSES::FORM and CURSES::WIDGETS
    The perl module Curses, Curses::Form and Curses::Widgets give access to curses
+-from perl.  If you have curses and basic perl is installed, you can get these
+-modules from  CPAN
+-All Modules page.  Get the three zipped modules in the Curses category.
+-Once installed you can use these modules from perl scripts like any other
+-module. For more information on perl modules see perlmod man page. The above
+-modules come with good documentation and they have some demo scripts to test the
+-functionality. Though the widgets provided are very rudimentary, these modules
+-provide good access to curses library from perl.
    Some of my code examples are converted to perl by Anuradha Ratnaweera and they
+-are available in the perl directory.
     
+-For more information see man pages Curses(3) , Curses::Form(3) and
+-Curses::Widgets(3).  These pages are installed only when the above modules are
+-acquired and installed.
    20. Just For Fun !!!
    This section contains few programs written by me just for fun. They don't
+-signify a better programming practice or the best way of using ncurses. They are
+-provided here so as to allow beginners to get ideas and add more programs to
+-this section.  If you have written a couple of nice, simple programs in curses
+-and want them to included here, contact me.
    20.1. The Game of Life
    Game of life is a wonder of math. In 
+-Paul Callahan's words
    The Game of Life (or simply Life) is not a game in the conventional sense. There
++===========================================================================
++
    
++
++          
    A few of the widgets are modified by Thomas Dickey in
++          recent versions.
    
++        
    
++
++        
    
++          
    
++
++          
    19.1.2. Some Attractive Features
    
++
++          
    Apart from making our life easier with readily usable
++          widgets, cdk solves one frustrating problem with printing
++          multi colored strings, justified strings elegantly.
++          Special formatting tags can be embedded in the strings
++          which are passed to CDK functions. For Example
    
++
++          
    If the string
    
++          
    ++"</B/1>This line should have a yellow foreground and a blue
++background.<!1>"
++
    
++
++          
    given as a parameter to newCDKLabel(), it prints the
++          line with yellow foreground and blue background. There
++          are other tags available for justifying string, embedding
++          special drawing characters etc.. Please refer to the man
++          page cdk_display(3X) for details. The man page explains
++          the usage with nice examples.
    
++        
    
++
++        
    
++          
    
++
++          
    19.1.3. Conclusion
    
++
++          
    All in all, CDK is a well-written package of widgets,
++          which if used properly can form a strong frame work for
++          developing complex GUI.
    
++        
    
++      
    
++
++      
    
++        
    
++
++        
    19.2. The
++        dialog
    
++
++        
    Long long ago, in September 1994, when few people knew
++        linux, Jeff Tranter wrote an article on dialog in Linux Journal. He
++        starts the article with these words..
    
++
++        
    Linux is
++        based on the Unix operating system, but also features a
++        number of unique and useful kernel features and application
++        programs that often go beyond what is available under Unix.
++        One little-known gem is "dialog", a utility for creating
++        professional-looking dialog boxes from within shell
++        scripts. This article presents a tutorial introduction to
++        the dialog utility, and shows examples of how and where it
++        can be used
    
++
++        
    As he explains, dialog is a real gem in making
++        professional-looking dialog boxes with ease. It creates a
++        variety of dialog boxes, menus, check lists etc.. It is
++        usually installed by default. If not, you can download it
++        from Thomas Dickey's site.
    
++
++        
    The above-mentioned article gives a very good overview
++        of its uses and capabilites. The man page has more details.
++        It can be used in variety of situations. One good example
++        is building of linux kernel in text mode. Linux kernel uses
++        a modified version of dialog tailored for its needs.
    
++
++        
    dialog was initially designed to be used with shell
++        scripts. If you want to use its functionality in a c
++        program, then you can use libdialog. The documentation
++        regarding this is sparse. Definitive reference is the
++        dialog.h header file which comes with the library. You may
++        need to hack here and there to get the required output. The
++        source is easily customizable. I have used it on a number
++        of occasions by modifying the code.
    
++      
    
++
++      
    
++        
    
++
++        
    19.3. Perl Curses Modules CURSES::FORM and
++        CURSES::WIDGETS
    
++
++        
    The perl module Curses, Curses::Form and Curses::Widgets
++        give access to curses from perl. If you have curses and
++        basic perl is installed, you can get these modules from
++        CPAN All Modules page. Get the three
++        zipped modules in the Curses category. Once installed you
++        can use these modules from perl scripts like any other
++        module. For more information on perl modules see perlmod
++        man page. The above modules come with good documentation
++        and they have some demo scripts to test the functionality.
++        Though the widgets provided are very rudimentary, these
++        modules provide good access to curses library from
++        perl.
    
++
++        
    Some of my code examples are converted to perl by
++        Anuradha Ratnaweera and they are available in the
++        perl directory.
    
++
++        
    For more information see man pages Curses(3) ,
++        Curses::Form(3) and Curses::Widgets(3). These pages are
++        installed only when the above modules are acquired and
++        installed.
    
++      
    
++    
    
++
++    
    
++      
    
++
++      
    20.
++      Just For Fun !!!
    
++
++      
    This section contains few programs written by me just for
++      fun. They don't signify a better programming practice or the
++      best way of using ncurses. They are provided here so as to
++      allow beginners to get ideas and add more programs to this
++      section. If you have written a couple of nice, simple
++      programs in curses and want them to included here, contact
++      me.
    
++
++      
    
++        
    
++
++        
    20.1. The Game of Life
    
++
++        
    Game of life is a wonder of math. In Paul Callahan's words
    
++        
    ++The Game of Life (or simply Life) is not a game in the conventional sense. There
+ are no players, and no winning or losing. Once the "pieces" are placed in the
+ starting position, the rules determine everything that happens later.
+ Nevertheless, Life is full of surprises! In most cases, it is impossible to look
+ at a starting position (or pattern) and see what will happen in the future. The
+-only way to find out is to follow the rules of the game.
    This program starts with a simple inverted U pattern and shows how wonderful
+-life works. There is a lot of room for improvement in the program. You can let
+-the user enter pattern of his choice or even take input from a file. You can
+-also change rules and play with a lot of variations. Search on google for interesting information on game
+-of life.
    File Path: JustForFun/life.c
    20.2. Magic Square
    Magic Square, another wonder of math, is very simple to understand but very
+-difficult to make. In a magic square sum of the numbers in each row, each column
+-is equal.  Even diagnol sum can be equal. There are many variations which have
+-special properties.
    This program creates a simple magic square of odd order.
    File Path: JustForFun/magic.c
    20.3. Towers of Hanoi
    The famous towers of hanoi solver. The aim of the game is to move the disks on
+-the first peg to last peg, using middle peg as a temporary stay. The catch is
+-not to place a larger disk over a small disk at any time.
    File Path: JustForFun/hanoi.c
    20.4. Queens Puzzle
    The objective of the famous N-Queen puzzle is to put N queens on a N X N chess
+-board without attacking each other. 
    This program solves it with a simple backtracking technique.
    File Path: JustForFun/queens.c
    20.5. Shuffle
    A fun game, if you have time to kill. 
    File Path: JustForFun/shuffle.c
    20.6. Typing Tutor
    A simple typing tutor, I created more out of need than for ease of use. If you
+-know how to put your fingers correctly on the keyboard, but lack practice, this
+-can be helpful. 
    File Path: JustForFun/tt.c
    21. References
    
+\ No newline at end of file
++only way to find out is to follow the rules of the game.
++
    
++
++        
    This program starts with a simple inverted U pattern and
++        shows how wonderful life works. There is a lot of room for
++        improvement in the program. You can let the user enter
++        pattern of his choice or even take input from a file. You
++        can also change rules and play with a lot of variations.
++        Search on google for interesting information on game of
++        life.
    
++
++        
    File Path:
++        JustForFun/life.c
    
++      
++
++      
    
++        
    
++
++        
    20.2. Magic
++        Square
    
++
++        
    Magic Square, another wonder of math, is very simple to
++        understand but very difficult to make. In a magic square
++        sum of the numbers in each row, each column is equal. Even
++        diagnol sum can be equal. There are many variations which
++        have special properties.
    
++
++        
    This program creates a simple magic square of odd
++        order.
    
++
++        
    File Path:
++        JustForFun/magic.c
    
++      
    
++
++      
    
++        
    
++
++        
    20.3. Towers
++        of Hanoi
    
++
++        
    The famous towers of hanoi solver. The aim of the game
++        is to move the disks on the first peg to last peg, using
++        middle peg as a temporary stay. The catch is not to place a
++        larger disk over a small disk at any time.
    
++
++        
    File Path:
++        JustForFun/hanoi.c
    
++      
    
++
++      
    
++        
    
++
++        
    20.4. Queens
++        Puzzle
    
++
++        
    The objective of the famous N-Queen puzzle is to put N
++        queens on a N X N chess board without attacking each
++        other.
    
++
++        
    This program solves it with a simple backtracking
++        technique.
    
++
++        
    File Path:
++        JustForFun/queens.c
    
++      
    
++
++      
    
++        
    
++
++        
    20.5.
++        Shuffle
    
++
++        
    A fun game, if you have time to kill.
    
++
++        
    File Path:
++        JustForFun/shuffle.c
    
++      
    
++
++      
    
++        
    
++
++        
    20.6. Typing
++        Tutor
    
++
++        
    A simple typing tutor, I created more out of need than
++        for ease of use. If you know how to put your fingers
++        correctly on the keyboard, but lack practice, this can be
++        helpful.
    
++
++        
    File Path:
++        JustForFun/tt.c
    
++      
    
++    
++
++    
    
++      
    
++
++      
    21.
++      References
    
++
++      
++    
    
++  
++
++
+Index: doc/html/man/adacurses6-config.1.html
+--- ncurses-6.0-20161224+/doc/html/man/adacurses6-config.1.html	2016-12-25 00:16:10.000000000 +0000
++++ ncurses-6.0-20161231/doc/html/man/adacurses6-config.1.html	2016-12-31 21:41:33.000000000 +0000
+@@ -131,7 +131,7 @@
+

    SEE ALSO

    +        curses(3x)
+ 
+-       This describes ncurses version 6.0 (patch 20161224).
++       This describes ncurses version 6.0 (patch 20161231).
+ 
+ 
+ 
+Index: doc/html/man/captoinfo.1m.html
+--- ncurses-6.0-20161224+/doc/html/man/captoinfo.1m.html	2016-12-25 00:16:10.000000000 +0000
++++ ncurses-6.0-20161231/doc/html/man/captoinfo.1m.html	2016-12-31 21:41:33.000000000 +0000
+@@ -198,7 +198,7 @@
+

    SEE ALSO

    +        infocmp(1m), curses(3x), terminfo(5)
+ 
+-       This describes ncurses version 6.0 (patch 20161224).
++       This describes ncurses version 6.0 (patch 20161231).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/clear.1.html
+--- ncurses-6.0-20161224+/doc/html/man/clear.1.html	2016-12-25 00:16:10.000000000 +0000
++++ ncurses-6.0-20161231/doc/html/man/clear.1.html	2016-12-31 21:41:33.000000000 +0000
+@@ -26,7 +26,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: clear.1,v 1.14 2016/11/19 21:30:46 tom Exp @
++  * @Id: clear.1,v 1.16 2016/12/31 16:09:34 tom Exp @
+   * these would be fallbacks for DS/DE,
+   * but groff changed the meaning of the macros.
+ -->
+@@ -59,11 +59,19 @@
+        clear  clears  your  screen if this is possible, including
+        its scrollback buffer (if the extended "E3" capability  is
+        defined).  clear looks in the environment for the terminal
+-       type and then in the terminfo database to determine how to
+-       clear the screen.
++       type given by the environment variable TERM, and  then  in
++       the  terminfo  database  to  determine  how  to  clear the
++       screen.
++
++       clear writes to the standard output.  You can redirect the
++       standard output to a file (which prevents clear from actu-
++       ally clearing the screen), and later cat the file  to  the
++       screen, clearing it at that point.
+ 
+        clear  ignores  any  command-line  parameters  that may be
+-       present.
++       present.  The  analogous  "tput  clear"  has  command-line
++       parameters  including  -T for overriding the TERM environ-
++       ment variable.
+ 
+ 
+

    HISTORY

    +@@ -73,13 +81,15 @@
+        AT&T  adapted a different BSD program (tset) to make a new
+        command (tput), and used this to replace the clear command
+        with a shell script which calls tput clear, e.g.,
+-           /usr/bin/tput ${1:+-T$1} clear 2> /dev/null
+-           exit
++
++         /usr/bin/tput ${1:+-T$1} clear 2> /dev/null
++         exit
+ 
+        In 1989, when Keith Bostic revised the BSD tput command to
+        make it similar to the AT&T tput, he added a shell  script
+        for the clear command:
+-           exec tput clear
++
++         exec tput clear
+ 
+        The  remainder  of  the script in each case is a copyright
+        notice.
+@@ -93,10 +103,12 @@
+            dard control sequence for clearing the screen.  Rather
+            than  clearing  just  the  visible  part of the screen
+            using
+-               printf '\033[2J'
++
++             printf '\033[2J'
+ 
+            one could clear the scrollback using
+-               printf '\033[3J'
++
++             printf '\033[3J'
+ 
+            This is documented in XTerm  Control  Sequences  as  a
+            feature originating with xterm.
+@@ -135,7 +147,7 @@
+

    SEE ALSO

    +        tput(1), terminfo(5)
+ 
+-       This describes ncurses version 6.0 (patch 20161224).
++       This describes ncurses version 6.0 (patch 20161231).
+ 
+ 
+ 
+Index: doc/html/man/form.3x.html
+--- ncurses-6.0-20161224+/doc/html/man/form.3x.html	2016-12-25 00:16:12.000000000 +0000
++++ ncurses-6.0-20161231/doc/html/man/form.3x.html	2016-12-31 21:41:36.000000000 +0000
+@@ -239,7 +239,7 @@
+        curses(3x) and related pages whose names begin "form_" for
+        detailed descriptions of the entry points.
+ 
+-       This describes ncurses version 6.0 (patch 20161224).
++       This describes ncurses version 6.0 (patch 20161231).
+ 
+ 
+ 
+Index: doc/html/man/infocmp.1m.html
+--- ncurses-6.0-20161224+/doc/html/man/infocmp.1m.html	2016-12-25 00:16:13.000000000 +0000
++++ ncurses-6.0-20161231/doc/html/man/infocmp.1m.html	2016-12-31 21:41:36.000000000 +0000
+@@ -478,7 +478,7 @@
+ 
+        http://invisible-island.net/ncurses/tctest.html
+ 
+-       This describes ncurses version 6.0 (patch 20161224).
++       This describes ncurses version 6.0 (patch 20161231).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/infotocap.1m.html
+--- ncurses-6.0-20161224+/doc/html/man/infotocap.1m.html	2016-12-25 00:16:13.000000000 +0000
++++ ncurses-6.0-20161231/doc/html/man/infotocap.1m.html	2016-12-31 21:41:36.000000000 +0000
+@@ -88,7 +88,7 @@
+

    SEE ALSO

    +        curses(3x), tic(1m), infocmp(1m), terminfo(5)
+ 
+-       This describes ncurses version 6.0 (patch 20161224).
++       This describes ncurses version 6.0 (patch 20161231).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/menu.3x.html
+--- ncurses-6.0-20161224+/doc/html/man/menu.3x.html	2016-12-25 00:16:13.000000000 +0000
++++ ncurses-6.0-20161231/doc/html/man/menu.3x.html	2016-12-31 21:41:37.000000000 +0000
+@@ -217,7 +217,7 @@
+        curses(3x) and related pages whose names begin "menu_" for
+        detailed descriptions of the entry points.
+ 
+-       This describes ncurses version 6.0 (patch 20161224).
++       This describes ncurses version 6.0 (patch 20161231).
+ 
+ 
+ 
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.0-20161224+/doc/html/man/ncurses.3x.html	2016-12-25 00:16:14.000000000 +0000
++++ ncurses-6.0-20161231/doc/html/man/ncurses.3x.html	2016-12-31 21:41:37.000000000 +0000
+@@ -60,7 +60,7 @@
+        sonable optimization.  This implementation is "new curses"
+        (ncurses) and is the approved replacement for 4.4BSD clas-
+        sic  curses,  which has been discontinued.  This describes
+-       ncurses version 6.0 (patch 20161224).
++       ncurses version 6.0 (patch 20161231).
+ 
+        The ncurses library emulates the curses library of  System
+        V  Release  4  UNIX,  and  XPG4 (X/Open Portability Guide)
+Index: doc/html/man/ncurses6-config.1.html
+--- ncurses-6.0-20161224+/doc/html/man/ncurses6-config.1.html	2016-12-25 00:16:14.000000000 +0000
++++ ncurses-6.0-20161231/doc/html/man/ncurses6-config.1.html	2016-12-31 21:41:37.000000000 +0000
+@@ -114,7 +114,7 @@
+

    SEE ALSO

    +        curses(3x)
+ 
+-       This describes ncurses version 6.0 (patch 20161224).
++       This describes ncurses version 6.0 (patch 20161231).
+ 
+ 
+ 
+Index: doc/html/man/panel.3x.html
+--- ncurses-6.0-20161224+/doc/html/man/panel.3x.html	2016-12-25 00:16:14.000000000 +0000
++++ ncurses-6.0-20161231/doc/html/man/panel.3x.html	2016-12-31 21:41:37.000000000 +0000
+@@ -208,7 +208,7 @@
+

    SEE ALSO

    +        curses(3x), curs_variables(3x),
+ 
+-       This describes ncurses version 6.0 (patch 20161224).
++       This describes ncurses version 6.0 (patch 20161231).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/tabs.1.html
+--- ncurses-6.0-20161224+/doc/html/man/tabs.1.html	2016-12-25 00:16:14.000000000 +0000
++++ ncurses-6.0-20161231/doc/html/man/tabs.1.html	2016-12-31 21:41:37.000000000 +0000
+@@ -26,7 +26,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: tabs.1,v 1.14 2016/10/22 19:54:35 tom Exp @
++  * @Id: tabs.1,v 1.15 2016/12/31 16:07:39 tom Exp @
+ -->
+ 
+ 
+@@ -60,7 +60,12 @@
+        clear/set tab-stops.  The terminal should be configured to
+        use hard tabs, e.g.,
+ 
+-              stty tab0
++         stty tab0
++
++       Like  clear(1),  tabs  writes to the standard output.  You
++       can redirect the standard output to a file (which prevents
++       tabs  from  actually changing the tabstops), and later cat
++       the file to the screen, setting tabstops at that point.
+ 
+ 
+

    OPTIONS

    +@@ -68,32 +73,32 @@
+

    General Options

    +        -Tname
+             Tell tabs which terminal type to use.  If this option
+-            is not given, tabs will  use  the  $TERM  environment
+-            variable.   If  that  is  not  set,  it  will use the
++            is  not  given,  tabs  will use the $TERM environment
++            variable.  If that  is  not  set,  it  will  use  the
+             ansi+tabs entry.
+ 
+-       -d   The debugging option shows a ruler line, followed  by
+-            two  data  lines.   The  first  data  line  shows the
++       -d   The  debugging option shows a ruler line, followed by
++            two data  lines.   The  first  data  line  shows  the
+             expected tab-stops marked with asterisks.  The second
+-            data  line  shows  the  actual tab-stops, marked with
++            data line shows the  actual  tab-stops,  marked  with
+             asterisks.
+ 
+-       -n   This option tells tabs to check the options  and  run
+-            any  debugging option, but not to modify the terminal
++       -n   This  option  tells tabs to check the options and run
++            any debugging option, but not to modify the  terminal
+             settings.
+ 
+        -V   reports the version of ncurses which was used in this
+             program, and exits.
+ 
+-       The  tabs  program  processes  a single list of tab stops.
+-       The last option to be processed which defines  a  list  is
++       The tabs program processes a single  list  of  tab  stops.
++       The  last  option  to be processed which defines a list is
+        the one that determines the list to be processed.
+ 
+ 
+

    Implicit Lists

    +-       Use  a  single number as an option, e.g., "-5" to set tabs
+-       at the given interval (in this case  1,  6,  11,  16,  21,
+-       etc.).   Tabs  are  repeated up to the right margin of the
++       Use a single number as an option, e.g., "-5" to  set  tabs
++       at  the  given  interval  (in  this case 1, 6, 11, 16, 21,
++       etc.).  Tabs are repeated up to the right  margin  of  the
+        screen.
+ 
+        Use "-0" to clear all tabs.
+@@ -102,17 +107,18 @@
+ 
+ 
+

    Explicit Lists

    +-       An explicit list can be defined after  the  options  (this
+-       does  not  use  a "-").  The values in the list must be in
++       An  explicit  list  can be defined after the options (this
++       does not use a "-").  The values in the list  must  be  in
+        increasing numeric order, and greater than zero.  They are
+        separated by a comma or a blank, for example,
+ 
+-              tabs 1,6,11,16,21
+-              tabs 1 6 11 16 21
+-       Use  a  '+'  to treat a number as an increment relative to
++         tabs 1,6,11,16,21
++         tabs 1 6 11 16 21
++
++       Use a "+" to treat a number as an  increment  relative  to
+        the previous value, e.g.,
+ 
+-              tabs 1,+5,+5,+5,+5
++         tabs 1,+5,+5,+5,+5
+ 
+        which is equivalent to the 1,6,11,16,21 example.
+ 
+@@ -140,31 +146,31 @@
+ 
+ 
+

    PORTABILITY

    +-       IEEE Std 1003.1/The Open Group  Base Specifications  Issue
++       IEEE  Std 1003.1/The Open Group  Base Specifications Issue
+        7 (POSIX.1-2008) describes a tabs utility.  However
+ 
+-       o   This  standard  describes a +m option, to set a termi-
+-           nal's left-margin.  Very few of  the  entries  in  the
++       o   This standard describes a +m option, to set  a  termi-
++           nal's  left-margin.   Very  few  of the entries in the
+            terminal database provide this capability.
+ 
+-       o   There  is  no counterpart in X/Open Curses Issue 7 for
++       o   There is no counterpart in X/Open Curses Issue  7  for
+            this utility, unlike tput(1).
+ 
+-       The -d (debug) and -n (no-op) options are  extensions  not
++       The  -d  (debug) and -n (no-op) options are extensions not
+        provided by other implementations.
+ 
+-       Documentation  for other implementations states that there
+-       is a limit on the number of tab stops.  While some  termi-
++       Documentation for other implementations states that  there
++       is  a limit on the number of tab stops.  While some termi-
+        nals may not accept an arbitrary number of tab stops, this
+-       implementation will attempt to set tab  stops  up  to  the
+-       right  margin  of the screen, if the given list happens to
++       implementation  will  attempt  to  set tab stops up to the
++       right margin of the screen, if the given list  happens  to
+        be that long.
+ 
+ 
+

    SEE ALSO

    +        tset(1), infocmp(1m), curses(3x), terminfo(5).
+ 
+-       This describes ncurses version 6.0 (patch 20161224).
++       This describes ncurses version 6.0 (patch 20161231).
+ 
+ 
+ 
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.0-20161224+/doc/html/man/terminfo.5.html	2016-12-25 00:16:15.000000000 +0000
++++ ncurses-6.0-20161231/doc/html/man/terminfo.5.html	2016-12-31 21:41:38.000000000 +0000
+@@ -75,7 +75,7 @@
+        nals by giving a set of capabilities which they  have,  by
+        specifying how to perform screen operations, and by speci-
+        fying padding requirements and  initialization  sequences.
+-       This describes ncurses version 6.0 (patch 20161224).
++       This describes ncurses version 6.0 (patch 20161231).
+ 
+        Entries in terminfo consist of a sequence of `,' separated
+        fields (embedded commas may be escaped with a backslash or
+Index: doc/html/man/tic.1m.html
+--- ncurses-6.0-20161224+/doc/html/man/tic.1m.html	2016-12-25 00:16:15.000000000 +0000
++++ ncurses-6.0-20161231/doc/html/man/tic.1m.html	2016-12-31 21:41:38.000000000 +0000
+@@ -401,7 +401,7 @@
+        infocmp(1m),   captoinfo(1m),   infotocap(1m),    toe(1m),
+        curses(3x), term(5).  terminfo(5).
+ 
+-       This describes ncurses version 6.0 (patch 20161224).
++       This describes ncurses version 6.0 (patch 20161231).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/toe.1m.html
+--- ncurses-6.0-20161224+/doc/html/man/toe.1m.html	2016-12-25 00:16:15.000000000 +0000
++++ ncurses-6.0-20161231/doc/html/man/toe.1m.html	2016-12-31 21:41:38.000000000 +0000
+@@ -117,7 +117,7 @@
+        tic(1m),   infocmp(1m),   captoinfo(1m),    infotocap(1m),
+        curses(3x), terminfo(5).
+ 
+-       This describes ncurses version 6.0 (patch 20161224).
++       This describes ncurses version 6.0 (patch 20161231).
+ 
+ 
+ 
+Index: doc/html/man/tput.1.html
+--- ncurses-6.0-20161224+/doc/html/man/tput.1.html	2016-12-25 00:16:15.000000000 +0000
++++ ncurses-6.0-20161231/doc/html/man/tput.1.html	2016-12-31 21:41:38.000000000 +0000
+@@ -441,7 +441,7 @@
+        clear(1),   stty(1),   tabs(1),   tset(1),    terminfo(5),
+        curs_termcap(3x).
+ 
+-       This describes ncurses version 6.0 (patch 20161224).
++       This describes ncurses version 6.0 (patch 20161231).
+ 
+ 
+ 
+Index: doc/html/man/tset.1.html
+--- ncurses-6.0-20161224+/doc/html/man/tset.1.html	2016-12-25 00:16:15.000000000 +0000
++++ ncurses-6.0-20161231/doc/html/man/tset.1.html	2016-12-31 21:41:38.000000000 +0000
+@@ -387,7 +387,7 @@
+        csh(1),   sh(1),   stty(1),   curs_terminfo(3x),   tty(4),
+        terminfo(5), ttys(5), environ(7)
+ 
+-       This describes ncurses version 6.0 (patch 20161224).
++       This describes ncurses version 6.0 (patch 20161231).
+ 
+ 
+ 
+Index: man/clear.1
+Prereq:  1.14 
+--- ncurses-6.0-20161224+/man/clear.1	2016-11-19 21:30:46.000000000 +0000
++++ ncurses-6.0-20161231/man/clear.1	2016-12-31 16:09:34.000000000 +0000
+@@ -26,13 +26,15 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: clear.1,v 1.14 2016/11/19 21:30:46 tom Exp $
++.\" $Id: clear.1,v 1.16 2016/12/31 16:09:34 tom Exp $
+ .TH @CLEAR@ 1 ""
+ .\" these would be fallbacks for DS/DE,
+ .\" but groff changed the meaning of the macros.
+ .de NS
+-.sp .5
+-.in +4
++.ie \n(.sp
++.el    .sp .5
++.ie \n(.in +4
++.el    .in +2
+ .nf
+ .ft C			\" Courier
+ ..
+@@ -57,10 +59,19 @@
+ .SH DESCRIPTION
+ \fB@CLEAR@\fR clears your screen if this is possible,
+ including its scrollback buffer (if the extended \*(``E3\*('' capability is defined).
+-\fB@CLEAR@\fR looks in the environment for the terminal type and then in the
++\fB@CLEAR@\fR looks in the environment for the terminal type
++given by the environment variable \fBTERM\fP,
++and then in the
+ \fBterminfo\fR database to determine how to clear the screen.
+ .PP
++\fB@CLEAR@\fR writes to the standard output.
++You can redirect the standard output to a file (which prevents
++\fB@CLEAR@\fR from actually clearing the screen),
++and later \fBcat\fP the file to the screen, clearing it at that point.
++.PP
+ \fB@CLEAR@\fR ignores any command-line parameters that may be present.
++The analogous \*(``\fB@TPUT@\fP clear\*('' has command-line parameters
++including \fB\-T\fP for overriding the \fBTERM\fP environment variable.
+ .SH HISTORY
+ A \fBclear\fP command appeared in 2.79BSD dated February 24, 1979.
+ Later that was provided in Unix 8th edition (1985).
+Index: man/tabs.1
+Prereq:  1.14 
+--- ncurses-6.0-20161224+/man/tabs.1	2016-10-22 19:54:35.000000000 +0000
++++ ncurses-6.0-20161231/man/tabs.1	2016-12-31 16:07:39.000000000 +0000
+@@ -26,12 +26,29 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tabs.1,v 1.14 2016/10/22 19:54:35 tom Exp $
++.\" $Id: tabs.1,v 1.15 2016/12/31 16:07:39 tom Exp $
+ .TH @TABS@ 1 ""
+ .ds n 5
++.ie \n(.g .ds `` \(lq
++.el       .ds `` ``
++.ie \n(.g .ds '' \(rq
++.el       .ds '' ''
+ .de bP
+ .IP \(bu 4
+ ..
++.de NS
++.ie \n(.sp
++.el    .sp .5
++.ie \n(.in +4
++.el    .in +2
++.nf
++.ft C			\" Courier
++..
++.de NE
++.fi
++.ft R
++.in -4
++..
+ .SH NAME
+ \fB@TABS@\fR \- set tabs on a terminal
+ .SH SYNOPSIS
+@@ -42,10 +59,14 @@
+ This uses the terminfo \fIclear_all_tabs\fP and \fIset_tab\fP capabilities.
+ If either is absent, \fB@TABS@\fP is unable to clear/set tab-stops.
+ The terminal should be configured to use hard tabs, e.g.,
+-.sp
+-.RS
++.NS
+ stty tab0
+-.RE
++.NE
++.PP
++Like \fB@CLEAR@\fR(1), \fB@TABS@\fR writes to the standard output.
++You can redirect the standard output to a file (which prevents
++\fB@TABS@\fR from actually changing the tabstops),
++and later \fBcat\fP the file to the screen, setting tabstops at that point.
+ .SH OPTIONS
+ .SS General Options
+ .TP 5
+@@ -71,29 +92,31 @@
+ The last option to be processed which defines a list is the one that
+ determines the list to be processed.
+ .SS Implicit Lists
+-Use a single number as an option, e.g., "\fB\-5\fP" to set tabs at the given
++Use a single number as an option, e.g., \*(``\fB\-5\fP\*('' to set tabs at the given
+ interval (in this case 1, 6, 11, 16, 21, etc.).  Tabs are repeated up to
+ the right margin of the screen.
+ .PP
+-Use "\fB\-0\fP" to clear all tabs.
++Use \*(``\fB\-0\fP\*('' to clear all tabs.
+ .PP
+-Use "\fB\-8\fP" to set tabs to the standard interval.
++Use \*(``\fB\-8\fP\*('' to set tabs to the standard interval.
+ .SS Explicit Lists
+-An explicit list can be defined after the options (this does not use a "\-").
+-The values in the list must be in increasing numeric order, and greater than
+-zero.  They are separated by a comma or a blank, for example,
+-.sp
+-.RS
++An explicit list can be defined after the options
++(this does not use a \*(``\-\*('').
++The values in the list must be in increasing numeric order,
++and greater than zero.
++They are separated by a comma or a blank, for example,
++.NS
+ tabs 1,6,11,16,21
+ .br
+ tabs 1 6 11 16 21
+-.RE
+-Use a '+' to treat a number as an increment relative to the previous value,
++.NE
++.PP
++Use a \*(``+\*('' to treat a number as an increment relative to the previous value,
+ e.g.,
+-.sp
+-.RS
++.NS
+ tabs 1,+5,+5,+5,+5
+-.RE
++.NE
++.PP
+ which is equivalent to the 1,6,11,16,21 example.
+ .SS Predefined Tab-Stops
+ X/Open defines several predefined lists of tab stops.
+Index: misc/terminfo.src
+--- ncurses-6.0-20161224+/misc/terminfo.src	2016-11-27 01:39:42.000000000 +0000
++++ ncurses-6.0-20161231/misc/terminfo.src	2016-12-31 22:04:20.000000000 +0000
+@@ -6,8 +6,8 @@
+ # Report bugs and new terminal descriptions to
+ #	bug-ncurses@gnu.org
+ #
+-#	$Revision: 1.578 $
+-#	$Date: 2016/11/27 01:39:42 $
++#	$Revision: 1.581 $
++#	$Date: 2016/12/31 22:04:20 $
+ #
+ # The original header is preserved below for reference.  It is noted that there
+ # is a "newer" version which differs in some cosmetic details (but actually
+@@ -1688,7 +1688,7 @@
+ 	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
+ 	cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P,
+ 	dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J,
+-	el=\E[K, el1=\E[1K, flash=\E[?5h\E[?5l$<200/>, home=\E[H,
++	el=\E[K, el1=\E[1K, flash=\E[?5h$<200/>\E[?5l, home=\E[H,
+ 	hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@,
+ 	il=\E[%p1%dL, il1=\E[L, ind=^J, kb2=\E[G, kbs=\177,
+ 	kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+@@ -5827,10 +5827,17 @@
+ # Reviewed st 0.5:
+ # implements control-modifier, but not control-shift for special keys
+ # implements alt-modifier, but not alt-shift for special keys
++#
++# Reviewed st 0.6:
++#	http://git.suckless.org/st/log/st.info
++# Tmux unofficial extensions, see TERMINFO EXTENSIONS in tmux(1)
++# still has no function keys past kf36 (no combinations of modifiers)
++# no application keypad mode, e.g, kent.
+ st|stterm| simpleterm 0.4.1,
+-	am, bce, eo, hs, mir, msgr, xenl,
+-	colors#8, cols#80, it#8, lines#24, ncv#3, pairs#64,
+-	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
++	am, bce, hs, mir, msgr, npc, xenl, Tc, XT,
++	colors#8, cols#80, it#8, lines#24, pairs#64,
++	acsc=+C\,D-A.B0E``aaffgghFiGjjkkllmmnnooppqqrrssttuuvvwwxxyy
++	     zz{{||}}~~,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
+ 	clear=\E[H\E[2J, cnorm=\E[?12l\E[?25h, cr=^M,
+ 	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
+@@ -5841,46 +5848,49 @@
+ 	enacs=\E)0, flash=\E[?5h$<100/>\E[?5l, fsl=^G, home=\E[H,
+ 	hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
+ 	il=\E[%p1%dL, il1=\E[L, ind=^J, indn=\E[%p1%dS,
+-	is2=\E[4l\E>\E[?1034l, kDC=\E[3;2~, kEND=\E[1;2F,
+-	kHOM=\E[1;2H, kIC=\E[2;2~, kLFT=\E[1;2D, kNXT=\E[6;2~,
+-	kPRV=\E[5;2~, kRIT=\E[1;2C, ka1=\E[1~, ka3=\E[5~, kb2=\EOu,
+-	kbs=\177, kc1=\E[4~, kc3=\E[6~, kcbt=\E[Z, kclr=\E[3;5~,
+-	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+-	kdch1=\E[3~, kdl1=\E[3;2~, ked=\E[1;5F, kel=\E[1;2F,
+-	kend=\E[4~, kent=\EOM, kf1=\EOP, kf10=\E[21~, kf11=\E[23~,
+-	kf12=\E[24~, kf13=\E[1;2P, kf14=\E[1;2Q, kf15=\E[1;2R,
+-	kf16=\E[1;2S, kf17=\E[15;2~, kf18=\E[17;2~,
+-	kf19=\E[18;2~, kf2=\EOQ, kf20=\E[19;2~, kf21=\E[20;2~,
+-	kf22=\E[21;2~, kf23=\E[23;2~, kf24=\E[24;2~,
+-	kf25=\E[1;5P, kf26=\E[1;5Q, kf27=\E[1;5R, kf28=\E[1;5S,
+-	kf29=\E[15;5~, kf3=\EOR, kf30=\E[17;5~, kf31=\E[18;5~,
+-	kf32=\E[19;5~, kf33=\E[20;5~, kf34=\E[21;5~,
+-	kf35=\E[23;5~, kf36=\E[24;5~, kf37=\E[1;6P, kf38=\E[1;6Q,
+-	kf39=\E[1;6R, kf4=\EOS, kf40=\E[1;6S, kf41=\E[15;6~,
+-	kf42=\E[17;6~, kf43=\E[18;6~, kf44=\E[19;6~,
+-	kf45=\E[20;6~, kf46=\E[21;6~, kf47=\E[23;6~,
+-	kf48=\E[24;6~, kf49=\E[1;3P, kf5=\E[15~, kf50=\E[1;3Q,
+-	kf51=\E[1;3R, kf52=\E[1;3S, kf53=\E[15;3~, kf54=\E[17;3~,
++	invis=\E[8m, is2=\E[4l\E>\E[?1034l, kDC=\E[3;2~,
++	kEND=\E[1;2F, kHOM=\E[1;2H, kIC=\E[2;2~, kLFT=\E[1;2D,
++	kNXT=\E[6;2~, kPRV=\E[5;2~, kRIT=\E[1;2C, ka1=\E[1~,
++	ka3=\E[5~, kb2=\EOu, kbs=\177, kc1=\E[4~, kc3=\E[6~,
++	kcbt=\E[Z, kclr=\E[3;5~, kcub1=\EOD, kcud1=\EOB,
++	kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kdl1=\E[3;2~,
++	ked=\E[1;5F, kel=\E[1;2F, kend=\E[4~, kent=\EOM, kf1=\EOP,
++	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[1;2P,
++	kf14=\E[1;2Q, kf15=\E[1;2R, kf16=\E[1;2S, kf17=\E[15;2~,
++	kf18=\E[17;2~, kf19=\E[18;2~, kf2=\EOQ, kf20=\E[19;2~,
++	kf21=\E[20;2~, kf22=\E[21;2~, kf23=\E[23;2~,
++	kf24=\E[24;2~, kf25=\E[1;5P, kf26=\E[1;5Q, kf27=\E[1;5R,
++	kf28=\E[1;5S, kf29=\E[15;5~, kf3=\EOR, kf30=\E[17;5~,
++	kf31=\E[18;5~, kf32=\E[19;5~, kf33=\E[20;5~,
++	kf34=\E[21;5~, kf35=\E[23;5~, kf36=\E[24;5~,
++	kf37=\E[1;6P, kf38=\E[1;6Q, kf39=\E[1;6R, kf4=\EOS,
++	kf40=\E[1;6S, kf41=\E[15;6~, kf42=\E[17;6~,
++	kf43=\E[18;6~, kf44=\E[19;6~, kf45=\E[20;6~,
++	kf46=\E[21;6~, kf47=\E[23;6~, kf48=\E[24;6~,
++	kf49=\E[1;3P, kf5=\E[15~, kf50=\E[1;3Q, kf51=\E[1;3R,
++	kf52=\E[1;3S, kf53=\E[15;3~, kf54=\E[17;3~,
+ 	kf55=\E[18;3~, kf56=\E[19;3~, kf57=\E[20;3~,
+ 	kf58=\E[21;3~, kf59=\E[23;3~, kf6=\E[17~, kf60=\E[24;3~,
+ 	kf61=\E[1;4P, kf62=\E[1;4Q, kf63=\E[1;4R, kf7=\E[18~,
+ 	kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kich1=\E[2~,
+ 	kil1=\E[2;5~, kind=\E[1;2B, kmous=\E[M, knp=\E[6~,
+-	kpp=\E[5~, kri=\E[1;2A, krmir=\E[2;2~, op=\E[39;49m,
+-	rc=\E8, rev=\E[7m, ri=\EM, ritm=\E[23m, rmacs=\E(B,
+-	rmcup=\E[?1049l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m,
+-	rmul=\E[m, rs1=\Ec, rs2=\E[4l\E>\E[?1034l, sc=\E7,
+-	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
++	kpp=\E[5~, kri=\E[1;2A, krmir=\E[2;2~, mc0=\E[i, mc4=\E[4i,
++	mc5=\E[5i, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM,
++	ritm=\E[23m, rmacs=\E(B, rmcup=\E[?1049l, rmir=\E[4l,
++	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
++	rs2=\E[4l\E>\E[?1034l, sc=\E7, setab=\E[4%p1%dm,
++	setaf=\E[3%p1%dm,
+ 	setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
+ 	     %=%t3%e%p1%d%;m,
+ 	setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
+ 	     %=%t3%e%p1%d%;m,
+ 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
+-	    %t;7%;%?%p4%t;5%;m,
++	    %t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
+ 	sgr0=\E[0m, sitm=\E[3m, smacs=\E(0, smcup=\E[?1049h,
+ 	smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
+ 	tbc=\E[3g, tsl=\E]0;, u6=\E[%i%d;%dR, u7=\E[6n,
+-	u8=\E[?1;2c, u9=\E[c, vpa=\E[%i%p1%dd,
++	u8=\E[?1;2c, u9=\E[c, vpa=\E[%i%p1%dd, Se=\E[2 q,
++	Ss=\E[%p1%d q,
+ #
+ # st-0.1.1
+ #
+@@ -5929,7 +5939,8 @@
+ # terminal wants to use TERM=stterm-256color, but that is longer than 14
+ # characters, making the choice nonportable.
+ st-256color|stterm-256color|simpleterm with 256 colors,
+-	use=xterm+256color, use=st,
++	ccc@,
++	initc@, oc@, use=xterm+256color, use=st,
+ 
+ #### TERMINATOR
+ # https://code.google.com/p/jessies/
+@@ -10641,7 +10652,7 @@
+ 	dch1=\E[P$<3>, dim=\E[0t\E[2m, dl=\E[%p1%dM$<1*>,
+ 	dl1=\E[M, dsl=\E[>\,\001\001\E[>-\001\001,
+ 	ech=\E[%p1%dX, ed=\E[J$<30>, el=\E[K$<3>, el1=\E[1K$<3>,
+-	enacs=\E)0, flash=\E[30h\E\,\E[30l$<250>, fsl=^A,
++	enacs=\E)0, flash=\E[30h\E\,$<250/>\E[30l, fsl=^A,
+ 	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH,
+ 	ich=\E[%p1%d@$<1*>, il=\E[%p1%dL$<2*>, il1=\E[L$<2>,
+ 	ind=\n$<2>, ip=$<1>,
+@@ -10713,7 +10724,7 @@
+ 	dch=\E[%p1%dP$<3*>, dch1=\E[P$<3>, dim=\E[2m,
+ 	dl=\E[%p1%dM$<3*>, dl1=\E[M$<3>, dsl=\E[40l,
+ 	ech=\E[%p1%dX, ed=\E[J$<110>, el=\E[K$<1>, el1=\E[1K,
+-	enacs=\E)0, flash=\E[30h\E\,\E[30l$<300>,
++	enacs=\E)0, flash=\E[30h\E\,$<300/>\E[30l,
+ 	fsl=\E[1;24r\E8, home=\E[H, ht=\011$<1>, hts=\EH,
+ 	ich=\E[%p1%d@$<4*>, il=\E[%p1%dL$<5*>, il1=\E[L$<5>,
+ 	ind=\n$<3>, invis=\E[8m, ip=$<3>, is1=\E[62;1"p\E[?5W,
+@@ -10738,12 +10749,12 @@
+ #
+ #	Wyse 85 with visual bell.
+ wy85-vb|wyse85-vb|wyse 85 with visible bell,
+-	bel@, flash=\E[30h\E\,\E[30l$<300>, use=wy85,
++	bel@, flash=\E[30h\E\,$<300/>\E[30l, use=wy85,
+ #
+ #	Wyse 85 in 132-column mode.
+ wy85-w|wyse85-w|wyse 85 in 132-column mode,
+ 	cols#132, wsl#132,
+-	rs2=\E[35h\E[?3h$<70>, use=wy85,
++	rs2=\E[35h$<70/>\E[?3h, use=wy85,
+ #
+ #	Wyse 85 in 132-column mode with visual bell.
+ wy85-wvb|wyse85-wvb|wyse 85 with visible bell 132-columns,
+@@ -10771,7 +10782,7 @@
+ 	dch=\E[%p1%dP$<3*>, dch1=\E[P$<3>, dim=\E[2m,
+ 	dl=\E[%p1%dM$<3*>, dl1=\E[M$<3>, dsl=\E[40l,
+ 	ech=\E[%p1%dX, ed=\E[J$<110>, el=\E[K$<1>, el1=\E[1K,
+-	enacs=\E)0, flash=\E[30h\E\,\E[30l$<300>,
++	enacs=\E)0, flash=\E[30h\E\,$<300/>\E[30l,
+ 	fsl=\E[1;24r\E8, home=\E[H, ht=\011$<1>, hts=\EH,
+ 	ich=\E[%p1%d@$<4*>, il=\E[%p1%dL$<5*>, il1=\E[L$<5>,
+ 	ind=\n$<3>, invis=\E[8m, ip=$<3>, is1=\E[62;1"p\E[?5W,
+@@ -10819,7 +10830,7 @@
+ 	dim=\E[2m, dl=\E[%p1%dM$<2*>, dl1=\E[M$<2>,
+ 	dsl=\E7\E[99;0H\E[K\E8, ech=\E[%p1%dX, ed=\E[J$<40>,
+ 	el=\E[K, el1=\E[1K, enacs=\E)0,
+-	flash=\E[30h\E\,\E[30l$<100>, fsl=\E[1;24r\E8,
++	flash=\E[30h\E\,$<100/>\E[30l, fsl=\E[1;24r\E8,
+ 	home=\E[H, hpa=\E[%i%p1%d`, ht=^I, hts=\EH,
+ 	ich=\E[%p1%d@$<2>, il=\E[%p1%dL$<3*>, il1=\E[L$<3>,
+ 	ind=\n$<2>, invis=\E[8m, ip=$<4>, is1=\E[?5W,
+@@ -10999,7 +11010,7 @@
+ 	dclk=\E[31h, dim=\E[2m, dl=\E[%p1%dM$<2*>, dl1=\E[M$<2>,
+ 	dsl=\E[40l, ech=\E[%p1%dX$<.1*>, ed=\E[J$<40>,
+ 	el=\E[K$<10>, el1=\E[1K$<12>, enacs=\E)0,
+-	flash=\E[30h\E\,\E[30l$<300>, fsl=\E[1;24r\E8,
++	flash=\E[30h\E\,$<300/>\E[30l, fsl=\E[1;24r\E8,
+ 	home=\E[H, hpa=\E[%i%p1%d`, ht=\011$<1>, hts=\EH,
+ 	ich=\E[%p1%d@$<1*>, il=\E[%p1%dL$<2*>, il1=\E[L$<2>,
+ 	ind=\n$<2>,
+@@ -11071,7 +11082,7 @@
+ #
+ #	Wyse 370 in 132-column mode with visual bell.
+ wy370-wvb|Wyse 370 with visible bell 132-columns,
+-	flash=\E[30h\E\,\E[30l$<300>, use=wy370-w,
++	flash=\E[30h\E\,$<300/>\E[30l, use=wy370-w,
+ wy370-rv|Wyse 370 reverse video,
+ 	rs3=\E[32h\E[?5h, use=wy370,
+ #
+@@ -11193,7 +11204,7 @@
+ #
+ #       Wyse 520 with visual bell.
+ wy520-vb|wyse520-vb|wyse 520 with visible bell,
+-	flash=\E[30h\E\,\E[30l$<100>, use=wy520,
++	flash=\E[30h\E\,$<100/>\E[30l, use=wy520,
+ #
+ #       Wyse 520 in 132-column mode.
+ wy520-w|wyse520-w|wyse 520 in 132-column mode,
+@@ -11203,7 +11214,7 @@
+ #
+ #       Wyse 520 in 132-column mode with visual bell.
+ wy520-wvb|wyse520-wvb|wyse 520 with visible bell 132-columns,
+-	flash=\E[30h\E\,\E[30l$<100>, use=wy520-w,
++	flash=\E[30h\E\,$<100/>\E[30l, use=wy520-w,
+ #
+ #
+ #       Wyse 520 emulating a vt420 7 bit mode.
+@@ -11229,7 +11240,7 @@
+ #
+ #       Wyse 520 with visual bell.
+ wy520-epc-vb|wyse520-pc-vb|wyse 520 with visible bell and EPC keyboard,
+-	flash=\E[30h\E\,\E[30l$<100>, use=wy520-epc,
++	flash=\E[30h\E\,$<100/>\E[30l, use=wy520-epc,
+ #
+ #       Wyse 520 in 132-column mode.
+ wy520-epc-w|wyse520-epc-w|wyse 520 in 132-column mode with EPC keyboard,
+@@ -11239,7 +11250,7 @@
+ #
+ #       Wyse 520 in 132-column mode with visual bell.
+ wy520-epc-wvb|wyse520-p-wvb|wyse 520 with visible bell 132-columns and EPC keyboard,
+-	flash=\E[30h\E\,\E[30l$<100>, use=wy520-epc-w,
++	flash=\E[30h\E\,$<100/>\E[30l, use=wy520-epc-w,
+ #
+ #       Wyse 520 in 80-column, 36 lines
+ wy520-36|wyse520-36|wyse 520 with 36 data lines,
+@@ -24866,4 +24877,11 @@
+ #	  entry, to avoid conflict with the user-defined mapping.  The reset
+ #	  feature will use ISO-8859-1 in any case (Mikulas Patocka).
+ #
++# 2016-12-30
++#	+ merge current st description (report by Harry Gindi) -TD
++#
++# 2016-12-31
++#	+ modify flash capability for linux and wyse entries to put the delay
++#	  between the reverse/normal escapes rather than after -TD
++#
+ ######## SHANTIH!  SHANTIH!  SHANTIH!
+Index: mk-1st.awk
+Prereq:  1.98 
+--- ncurses-6.0-20161224+/mk-1st.awk	2014-12-20 23:54:22.000000000 +0000
++++ ncurses-6.0-20161231/mk-1st.awk	2016-12-31 17:04:34.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: mk-1st.awk,v 1.98 2014/12/20 23:54:22 tom Exp $
++# $Id: mk-1st.awk,v 1.99 2016/12/31 17:04:34 tom Exp $
+ ##############################################################################
+-# Copyright (c) 1998-2012,2013 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2014,2016 Free Software Foundation, Inc.                #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+ # copy of this software and associated documentation files (the "Software"), #
+@@ -448,7 +448,7 @@
+ 				}
+ 				printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) $(%s) \\\n", CC_NAME, CC_FLAG;
+ 				printf "\t\t-o %s $(%s_OBJS:$o=.lo) \\\n", lib_name, OBJS;
+-				printf "\t\t-rpath $(DESTDIR)$(libdir) \\\n";
++				printf "\t\t-rpath $(libdir) \\\n";
+ 				printf "\t\t%s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(%s) $(LDFLAGS)\n", libtool_version, which_list;
+ 				print  ""
+ 				print  "install \\"
+Index: ncurses/trace/lib_trace.c
+Prereq:  1.84 
+--- ncurses-6.0-20161224+/ncurses/trace/lib_trace.c	2016-11-27 02:35:17.000000000 +0000
++++ ncurses-6.0-20161231/ncurses/trace/lib_trace.c	2016-12-31 13:50:06.000000000 +0000
+@@ -47,7 +47,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_trace.c,v 1.84 2016/11/27 02:35:17 tom Exp $")
++MODULE_ID("$Id: lib_trace.c,v 1.85 2016/12/31 13:50:06 tom Exp $")
+ 
+ NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */
+ 
+@@ -156,6 +156,13 @@
+     bool after = FALSE;
+     unsigned doit = _nc_tracing;
+     int save_err = errno;
++    FILE *fp = MyFP;
++
++#ifdef TRACE
++    /* verbose-trace in the command-line utilities relies on this */
++    if (fp == 0 && _nc_tracing >= DEBUG_LEVEL(1))
++	fp = stderr;
++#endif
+ 
+     if (strlen(fmt) >= sizeof(Called) - 1) {
+ 	if (!strncmp(fmt, Called, sizeof(Called) - 1)) {
+@@ -173,7 +180,7 @@
+ 	}
+     }
+ 
+-    if (doit != 0 && MyFP != 0) {
++    if (doit != 0 && fp != 0) {
+ #ifdef USE_PTHREADS
+ 	/*
+ 	 * TRACE_ICALLS is "really" needed to show normal use with threaded
+@@ -188,19 +195,19 @@
+ 	if ((pthread_self))
+ # endif
+ #ifdef __MINGW32__
+-	    fprintf(MyFP, "%#lx:", (long) (intptr_t) pthread_self().p);
++	    fprintf(fp, "%#lx:", (long) (intptr_t) pthread_self().p);
+ #else
+-	    fprintf(MyFP, "%#lx:", (long) (intptr_t) pthread_self());
++	    fprintf(fp, "%#lx:", (long) (intptr_t) pthread_self());
+ #endif
+ #endif
+ 	if (before || after) {
+ 	    int n;
+ 	    for (n = 1; n < MyLevel; n++)
+-		fputs("+ ", MyFP);
++		fputs("+ ", fp);
+ 	}
+-	vfprintf(MyFP, fmt, ap);
+-	fputc('\n', MyFP);
+-	fflush(MyFP);
++	vfprintf(fp, fmt, ap);
++	fputc('\n', fp);
++	fflush(fp);
+     }
+ 
+     if (after && MyLevel)
+Index: package/debian-mingw/changelog
+--- ncurses-6.0-20161224+/package/debian-mingw/changelog	2016-12-24 13:45:15.000000000 +0000
++++ ncurses-6.0-20161231/package/debian-mingw/changelog	2016-12-31 12:01:55.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161224) unstable; urgency=low
++ncurses6 (6.0+20161231) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 24 Dec 2016 08:45:15 -0500
++ -- Thomas E. Dickey   Sat, 31 Dec 2016 07:01:56 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.0-20161224+/package/debian-mingw64/changelog	2016-12-24 13:45:15.000000000 +0000
++++ ncurses-6.0-20161231/package/debian-mingw64/changelog	2016-12-31 12:01:55.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161224) unstable; urgency=low
++ncurses6 (6.0+20161231) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 24 Dec 2016 08:45:15 -0500
++ -- Thomas E. Dickey   Sat, 31 Dec 2016 07:01:56 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.0-20161224+/package/debian/changelog	2016-12-24 13:45:15.000000000 +0000
++++ ncurses-6.0-20161231/package/debian/changelog	2016-12-31 12:01:55.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161224) unstable; urgency=low
++ncurses6 (6.0+20161231) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 24 Dec 2016 08:45:15 -0500
++ -- Thomas E. Dickey   Sat, 31 Dec 2016 07:01:56 -0500
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.190 
+--- ncurses-6.0-20161224+/package/mingw-ncurses.nsi	2016-12-24 13:45:15.000000000 +0000
++++ ncurses-6.0-20161231/package/mingw-ncurses.nsi	2016-12-31 12:01:55.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.190 2016/12/24 13:45:15 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.191 2016/12/31 12:01:55 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "0"
+ !define VERSION_YYYY  "2016"
+-!define VERSION_MMDD  "1224"
++!define VERSION_MMDD  "1231"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.0-20161224+/package/mingw-ncurses.spec	2016-12-24 13:45:15.000000000 +0000
++++ ncurses-6.0-20161231/package/mingw-ncurses.spec	2016-12-31 12:01:55.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.0
+-Release: 20161224
++Release: 20161231
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.0-20161224+/package/ncurses.spec	2016-12-24 13:45:15.000000000 +0000
++++ ncurses-6.0-20161231/package/ncurses.spec	2016-12-31 12:01:55.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.0
+-Release: 20161224
++Release: 20161231
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: progs/Makefile.in
+Prereq:  1.100 
+--- ncurses-6.0-20161224+/progs/Makefile.in	2016-12-24 17:35:01.000000000 +0000
++++ ncurses-6.0-20161231/progs/Makefile.in	2016-12-31 15:05:18.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: Makefile.in,v 1.100 2016/12/24 17:35:01 tom Exp $
++# $Id: Makefile.in,v 1.101 2016/12/31 15:05:18 tom Exp $
+ ##############################################################################
+ # Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.                #
+ #                                                                            #
+@@ -258,7 +258,8 @@
+ 	@ECHO_LD@ $(LINK) $(DEPS_CLEAR) $(LDFLAGS_TINFO) -o $@
+ 
+ DEPS_TABS = \
+-	$(MODEL)/tabs$o
++	$(MODEL)/tabs$o \
++	$(MODEL)/tty_settings$o
+ 
+ tabs$x: $(DEPS_TABS) $(DEPS_TABS)
+ 	@ECHO_LD@ $(LINK) $(DEPS_TABS) $(LDFLAGS_TINFO) -o $@
+Index: progs/tabs.c
+Prereq:  1.37 
+--- ncurses-6.0-20161224+/progs/tabs.c	2015-07-04 21:14:42.000000000 +0000
++++ ncurses-6.0-20161231/progs/tabs.c	2016-12-31 15:10:52.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2008-2013,2015 Free Software Foundation, Inc.              *
++ * Copyright (c) 2008-2015,2016 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -36,12 +36,13 @@
+ 
+ #define USE_LIBTINFO
+ #include 
++#include 
+ 
+-MODULE_ID("$Id: tabs.c,v 1.37 2015/07/04 21:14:42 tom Exp $")
++MODULE_ID("$Id: tabs.c,v 1.38 2016/12/31 15:10:52 tom Exp $")
+ 
+ static void usage(void) GCC_NORETURN;
+ 
+-static char *prg_name;
++const char *_nc_progname;
+ static int max_cols;
+ 
+ static void
+@@ -103,7 +104,7 @@
+ 	    if (n > 0 && result[n] <= result[n - 1]) {
+ 		fprintf(stderr,
+ 			"%s: tab-stops are not in increasing order: %d %d\n",
+-			prg_name, value, result[n - 1]);
++			_nc_progname, value, result[n - 1]);
+ 		free(result);
+ 		result = 0;
+ 		break;
+@@ -308,17 +309,17 @@
+ 		if (!(isdigit(ch) || ch == ',' || ch == '+')) {
+ 		    fprintf(stderr,
+ 			    "%s: unexpected character found '%c'\n",
+-			    prg_name, ch);
++			    _nc_progname, ch);
+ 		    result = FALSE;
+ 		    break;
+ 		}
+ 	    }
+ 	} else {
+-	    fprintf(stderr, "%s: trailing comma found '%s'\n", prg_name, tab_list);
++	    fprintf(stderr, "%s: trailing comma found '%s'\n", _nc_progname, tab_list);
+ 	    result = FALSE;
+ 	}
+     } else {
+-	fprintf(stderr, "%s: no tab-list given\n", prg_name);
++	fprintf(stderr, "%s: no tab-list given\n", _nc_progname);
+ 	result = FALSE;
+     }
+     return result;
+@@ -381,8 +382,12 @@
+     NCURSES_CONST char *term_name = 0;
+     char *append = 0;
+     const char *tab_list = 0;
++    TTY tty_settings;
++    int fd;
+ 
+-    prg_name = _nc_rootname(argv[0]);
++    _nc_progname = _nc_rootname(argv[0]);
++
++    fd = save_tty_settings(&tty_settings);
+ 
+     if ((term_name = getenv("TERM")) == 0)
+ 	term_name = "ansi+tabs";
+@@ -506,18 +511,18 @@
+ 	}
+     }
+ 
+-    setupterm(term_name, STDOUT_FILENO, (int *) 0);
++    setupterm(term_name, fd, (int *) 0);
+ 
+     max_cols = (columns > 0) ? columns : 80;
+ 
+     if (!VALID_STRING(clear_all_tabs)) {
+ 	fprintf(stderr,
+ 		"%s: terminal type '%s' cannot reset tabs\n",
+-		prg_name, term_name);
++		_nc_progname, term_name);
+     } else if (!VALID_STRING(set_tab)) {
+ 	fprintf(stderr,
+ 		"%s: terminal type '%s' cannot set tabs\n",
+-		prg_name, term_name);
++		_nc_progname, term_name);
+     } else if (legal_tab_list(tab_list)) {
+ 	int *list = decode_tabs(tab_list);
+ 
+Index: progs/tic.c
+Prereq:  1.229 
+--- ncurses-6.0-20161224+/progs/tic.c	2016-12-04 02:12:38.000000000 +0000
++++ ncurses-6.0-20161231/progs/tic.c	2016-12-31 12:24:00.000000000 +0000
+@@ -48,7 +48,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: tic.c,v 1.229 2016/12/04 02:12:38 tom Exp $")
++MODULE_ID("$Id: tic.c,v 1.230 2016/12/31 12:24:00 tom Exp $")
+ 
+ #define STDIN_NAME ""
+ 
+@@ -1826,7 +1826,6 @@
+     *flag = -1;
+     if (value != 0) {
+ 	int skip = csi_length(value);
+-	fprintf(stderr, "test %d:%s\n", skip, value);
+ 	if (skip > 0 &&
+ 	    value[skip++] == '?' &&
+ 	    value[skip++] == '5') {
diff --git a/ncurses-6.0-20170107.patch b/ncurses-6.0-20170107.patch
new file mode 100644
index 0000000..3845d69
--- /dev/null
+++ b/ncurses-6.0-20170107.patch
@@ -0,0 +1,6071 @@
+# ncurses 6.0 - patch 20170107 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.0 is at
+# 	ftp.gnu.org:/pub/gnu
+#
+# Patches for ncurses 6.0 can be found at
+# 	ftp://invisible-island.net/ncurses/6.0
+#	http://invisible-mirror.net/archives/ncurses/6.0 
+#
+# ------------------------------------------------------------------------------
+# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20170107.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Jan  8 01:40:29 UTC 2017
+# ------------------------------------------------------------------------------
+# Ada95/package/debian/copyright        |    4 
+# COPYING                               |    4 
+# NEWS                                  |   21 
+# VERSION                               |    2 
+# dist.mk                               |    6 
+# doc/html/man/adacurses6-config.1.html |    2 
+# doc/html/man/captoinfo.1m.html        |    2 
+# doc/html/man/clear.1.html             |    2 
+# doc/html/man/curs_add_wch.3x.html     |   22 
+# doc/html/man/curs_addch.3x.html       |   16 
+# doc/html/man/curs_attr.3x.html        |    6 
+# doc/html/man/curs_color.3x.html       |    6 
+# doc/html/man/curs_get_wstr.3x.html    |   18 
+# doc/html/man/curs_getch.3x.html       |    4 
+# doc/html/man/curs_getstr.3x.html      |    6 
+# doc/html/man/curs_initscr.3x.html     |   22 
+# doc/html/man/curs_inopts.3x.html      |   60 -
+# doc/html/man/curs_kernel.3x.html      |    6 
+# doc/html/man/curs_memleaks.3x.html    |   27 
+# doc/html/man/curs_mouse.3x.html       |   10 
+# doc/html/man/curs_move.3x.html        |   10 
+# doc/html/man/curs_outopts.3x.html     |    6 
+# doc/html/man/curs_pad.3x.html         |   10 
+# doc/html/man/curs_print.3x.html       |    4 
+# doc/html/man/curs_printw.3x.html      |    6 
+# doc/html/man/curs_scr_dump.3x.html    |   12 
+# doc/html/man/curs_sp_funcs.3x.html    |    4 
+# doc/html/man/curs_termcap.3x.html     |    8 
+# doc/html/man/curs_trace.3x.html       |    6 
+# doc/html/man/curs_util.3x.html        |  178 ++---
+# doc/html/man/curs_variables.3x.html   |    2 
+# doc/html/man/form.3x.html             |    2 
+# doc/html/man/form_driver.3x.html      |    6 
+# doc/html/man/form_post.3x.html        |    6 
+# doc/html/man/form_variables.3x.html   |    2 
+# doc/html/man/infocmp.1m.html          |    2 
+# doc/html/man/infotocap.1m.html        |    2 
+# doc/html/man/menu.3x.html             |    2 
+# doc/html/man/menu_driver.3x.html      |    8 
+# doc/html/man/menu_post.3x.html        |    6 
+# doc/html/man/ncurses.3x.html          |   20 
+# doc/html/man/ncurses6-config.1.html   |    2 
+# doc/html/man/panel.3x.html            |    2 
+# doc/html/man/resizeterm.3x.html       |   10 
+# doc/html/man/tabs.1.html              |    2 
+# doc/html/man/term.5.html              |   10 
+# doc/html/man/term_variables.3x.html   |   35 -
+# doc/html/man/terminfo.5.html          | 1028 ++++++++++++++++----------------
+# doc/html/man/tic.1m.html              |    2 
+# doc/html/man/toe.1m.html              |    2 
+# doc/html/man/tput.1.html              |  277 +++++---
+# doc/html/man/tset.1.html              |  192 +++--
+# man/curs_add_wch.3x                   |    6 
+# man/curs_addch.3x                     |    8 
+# man/curs_attr.3x                      |    6 
+# man/curs_color.3x                     |    6 
+# man/curs_get_wstr.3x                  |    6 
+# man/curs_getstr.3x                    |    6 
+# man/curs_initscr.3x                   |   10 
+# man/curs_inopts.3x                    |   14 
+# man/curs_kernel.3x                    |    6 
+# man/curs_memleaks.3x                  |    6 
+# man/curs_mouse.3x                     |    8 
+# man/curs_move.3x                      |    6 
+# man/curs_outopts.3x                   |    6 
+# man/curs_pad.3x                       |    6 
+# man/curs_print.3x                     |    6 
+# man/curs_printw.3x                    |    6 
+# man/curs_scr_dump.3x                  |    6 
+# man/curs_termcap.3x                   |    6 
+# man/curs_trace.3x                     |    6 
+# man/curs_util.3x                      |   47 -
+# man/form_post.3x                      |    6 
+# man/manhtml.aliases                   |   14 
+# man/menu_driver.3x                    |    6 
+# man/menu_post.3x                      |    6 
+# man/ncurses.3x                        |    8 
+# man/resizeterm.3x                     |    6 
+# man/term.5                            |    6 
+# man/term_variables.3x                 |    8 
+# man/terminfo.tail                     |    8 
+# man/tput.1                            |   91 ++
+# man/tset.1                            |   61 +
+# ncurses/base/MKlib_gen.sh             |    7 
+# ncurses/curses.priv.h                 |   13 
+# ncurses/tinfo/MKfallback.sh           |    8 
+# ncurses/tinfo/lib_data.c              |    9 
+# ncurses/tinfo/lib_setup.c             |   29 
+# ncurses/tinfo/tinfo_driver.c          |    6 
+# ncurses/widechar/lib_key_name.c       |   15 
+# package/debian-mingw/changelog        |    4 
+# package/debian-mingw/copyright        |    4 
+# package/debian-mingw64/changelog      |    4 
+# package/debian-mingw64/copyright      |    4 
+# package/debian/changelog              |    4 
+# package/debian/copyright              |    4 
+# package/mingw-ncurses.nsi             |    6 
+# package/mingw-ncurses.spec            |    2 
+# package/ncurses.spec                  |    2 
+# progs/tput.c                          |   12 
+# progs/tset.c                          |    6 
+# test/package/debian-mingw/copyright   |    4 
+# test/package/debian-mingw64/copyright |    4 
+# test/package/debian/copyright         |    4 
+# 104 files changed, 1458 insertions(+), 1200 deletions(-)
+# ------------------------------------------------------------------------------
+Index: Ada95/package/debian/copyright
+--- ncurses-6.0-20161231+/Ada95/package/debian/copyright	2016-01-02 20:24:37.000000000 +0000
++++ ncurses-6.0-20170107/Ada95/package/debian/copyright	2017-01-08 00:35:15.000000000 +0000
+@@ -4,11 +4,11 @@
+ 
+ -------------------------------------------------------------------------------
+ Files: *
+-Copyright: 1998-2015,2016 Free Software Foundation, Inc.
++Copyright: 1998-2016,2017 Free Software Foundation, Inc.
+ Licence: X11
+ 
+ Files: aclocal.m4 package
+-Copyright: 2010-2015,2016 by Thomas E. Dickey
++Copyright: 2010-2016,2017 by Thomas E. Dickey
+ Licence: X11
+ 
+     Permission is hereby granted, free of charge, to any person obtaining a
+Index: COPYING
+Prereq:  1.4 
+--- ncurses-6.0-20161231+/COPYING	2016-01-02 20:24:37.000000000 +0000
++++ ncurses-6.0-20170107/COPYING	2017-01-08 00:33:50.000000000 +0000
+@@ -1,4 +1,4 @@
+-Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.
++Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the
+@@ -25,4 +25,4 @@
+ authorization.
+ 
+ -- vile:txtmode fc=72
+--- $Id: COPYING,v 1.4 2016/01/02 20:24:37 tom Exp $
++-- $Id: COPYING,v 1.5 2017/01/08 00:33:50 tom Exp $
+Index: NEWS
+Prereq:  1.2722 
+--- ncurses-6.0-20161231+/NEWS	2016-12-31 21:35:53.000000000 +0000
++++ ncurses-6.0-20170107/NEWS	2017-01-07 22:49:11.000000000 +0000
+@@ -1,5 +1,5 @@
+ -------------------------------------------------------------------------------
+--- Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.               --
++-- Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.               --
+ --                                                                           --
+ -- Permission is hereby granted, free of charge, to any person obtaining a   --
+ -- copy of this software and associated documentation files (the             --
+@@ -25,7 +25,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.2722 2016/12/31 21:35:53 tom Exp $
++-- $Id: NEWS,v 1.2732 2017/01/07 22:49:11 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -45,6 +45,23 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20170107
++	+ amend changes for tput to reset tty modes to "sane" if the program
++	  is run as "reset", like tset.  Likewise, ensure that tset sends
++	  either reset- or init-strings.
++	+ improve manual page descriptions of tput init/reset and tset/reset,
++	  to make it easier to see how they are similar and different.
++	+ move a static result from key_name() to _nc_globals
++	+ modify _nc_get_screensize to allow for use_env() and use_tioctl()
++	  state to be per-screen when sp-funcs are configured, better matching
++	  the behavior when using the term-driver configuration.
++	+ improve cross-references in manual pages for often used functions
++	+ move SCREEN field for use_tioctl() data before the ncursesw fields,
++	  and limit that to the sp-funcs configuration to improve termlib
++	  compatibility (cf:  20120714).
++	+ correct order of initialization for traces in use_env() and
++	  use_tioctl() versus first trace calls.
++
+ 20161231
+ 	+ fix errata for ncurses-howto (report by Damien Ruscoe).
+ 	+ fix a few places in configure/build scripts where DESTDIR and rpath
+Index: VERSION
+--- ncurses-6.0-20161231+/VERSION	2016-12-31 12:01:55.000000000 +0000
++++ ncurses-6.0-20170107/VERSION	2017-01-07 15:27:12.000000000 +0000
+@@ -1 +1 @@
+-5:0:9	6.0	20161231
++5:0:9	6.0	20170107
+Index: dist.mk
+Prereq:  1.1139 
+--- ncurses-6.0-20161231+/dist.mk	2016-12-31 12:01:55.000000000 +0000
++++ ncurses-6.0-20170107/dist.mk	2017-01-07 15:27:12.000000000 +0000
+@@ -1,5 +1,5 @@
+ ##############################################################################
+-# Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.                #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+ # copy of this software and associated documentation files (the "Software"), #
+@@ -25,7 +25,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1139 2016/12/31 12:01:55 tom Exp $
++# $Id: dist.mk,v 1.1141 2017/01/07 15:27:12 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -37,7 +37,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 0
+-NCURSES_PATCH = 20161231
++NCURSES_PATCH = 20170107
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/man/adacurses6-config.1.html
+--- ncurses-6.0-20161231+/doc/html/man/adacurses6-config.1.html	2016-12-31 21:41:33.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/adacurses6-config.1.html	2017-01-07 20:05:39.000000000 +0000
+@@ -131,7 +131,7 @@
+

    SEE ALSO

    +        curses(3x)
+ 
+-       This describes ncurses version 6.0 (patch 20161231).
++       This describes ncurses version 6.0 (patch 20170107).
+ 
+ 
+ 
+Index: doc/html/man/captoinfo.1m.html
+--- ncurses-6.0-20161231+/doc/html/man/captoinfo.1m.html	2016-12-31 21:41:33.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/captoinfo.1m.html	2017-01-07 20:05:39.000000000 +0000
+@@ -198,7 +198,7 @@
+

    SEE ALSO

    +        infocmp(1m), curses(3x), terminfo(5)
+ 
+-       This describes ncurses version 6.0 (patch 20161231).
++       This describes ncurses version 6.0 (patch 20170107).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/clear.1.html
+--- ncurses-6.0-20161231+/doc/html/man/clear.1.html	2016-12-31 21:41:33.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/clear.1.html	2017-01-07 20:05:39.000000000 +0000
+@@ -147,7 +147,7 @@
+

    SEE ALSO

    +        tput(1), terminfo(5)
+ 
+-       This describes ncurses version 6.0 (patch 20161231).
++       This describes ncurses version 6.0 (patch 20170107).
+ 
+ 
+ 
+Index: doc/html/man/curs_add_wch.3x.html
+--- ncurses-6.0-20161231+/doc/html/man/curs_add_wch.3x.html	2016-01-30 19:24:51.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/curs_add_wch.3x.html	2017-01-07 20:43:25.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -91,20 +91,20 @@
+ 
+

    echo_wchar

    +        The echo_wchar function is functionally  equivalent  to  a
+-       call to add_wch followed by a call to refresh.  Similarly,
+-       the wecho_wchar is functionally equivalent to  a  call  to
+-       wadd_wch  followed  by  a call to wrefresh.  The knowledge
+-       that only a single character is being output is taken into
+-       consideration and, for non-control characters, a consider-
+-       able performance gain might be seen by  using  the  *echo*
+-       functions instead of their equivalents.
++       call  to add_wch followed by a call to refresh(3x).  Simi-
++       larly, the wecho_wchar is  functionally  equivalent  to  a
++       call  to  wadd_wch  followed  by  a call to wrefresh.  The
++       knowledge that only a single character is being output  is
++       taken  into consideration and, for non-control characters,
++       a considerable performance gain might be seen by using the
++       *echo* functions instead of their equivalents.
+ 
+ 
+

    Line Graphics

    +-       Like  curs_addch(3x),  addch_wch  accepts symbols which make it
++       Like  addch(3x),  addch_wch  accepts symbols which make it
+        simple to draw lines and  other  frequently  used  special
+        characters.   These  symbols  correspond to the same VT100
+-       line-drawing set as curs_addch(3x).
++       line-drawing set as addch(3x).
+ 
+        Name              Unicode    Default   Description
+        ----------------------------------------------------------------
+Index: doc/html/man/curs_addch.3x.html
+--- ncurses-6.0-20161231+/doc/html/man/curs_addch.3x.html	2016-01-30 19:24:51.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/curs_addch.3x.html	2017-01-07 20:43:25.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -109,7 +109,7 @@
+        Video attributes can be combined with a character argument
+        passed to addch or related functions by logical-ORing them
+        into  the  character.   (Thus, text, including attributes,
+-       can be copied from one place to  another  using  inch  and
++       can be copied from one place to another using inch(3x) and
+        addch.)   See  the curs_attr(3x) page for values of prede-
+        fined video attribute constants that can be usefully OR'ed
+        into characters.
+@@ -117,11 +117,11 @@
+ 
+

    Echoing characters

    +        The  echochar  and  wechochar routines are equivalent to a
+-       call to addch followed by a call to refresh, or a call  to
+-       waddch followed by a call to wrefresh.  The knowledge that
+-       only a single character is being output is used  and,  for
+-       non-control  characters,  a  considerable performance gain
+-       may be seen by  using  these  routines  instead  of  their
++       call to addch followed by a call to refresh(3x), or a call
++       to  waddch  followed by a call to wrefresh.  The knowledge
++       that only a single character is being output is used  and,
++       for  non-control  characters,  a  considerable performance
++       gain may be seen by using these routines instead of  their
+        equivalents.
+ 
+ 
+Index: doc/html/man/curs_attr.3x.html
+--- ncurses-6.0-20161231+/doc/html/man/curs_attr.3x.html	2016-10-15 23:12:20.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/curs_attr.3x.html	2017-01-07 20:05:39.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -66,13 +66,13 @@
+ 
+

    DESCRIPTION

    +        The  effect  of get_wstr is as though a series of calls to
+-       get_wch were made, until a newline, other end-of-line,  or
+-       end-of-file condition is processed.  An end-of-file condi-
+-       tion is represented by WEOF, as defined in <wchar.h>.  The
+-       newline  and end-of-line conditions are represented by the
+-       \n wchar_t value.  In all instances, the end of the string
+-       is  terminated  by a null wchar_t.  The routine places re-
+-       sulting values in the area pointed to by wstr.
++       get_wch(3x) were made, until a newline, other end-of-line,
++       or  end-of-file  condition  is  processed.  An end-of-file
++       condition is represented by WEOF, as defined in <wchar.h>.
++       The  newline and end-of-line conditions are represented by
++       the \n wchar_t value.  In all instances, the  end  of  the
++       string  is  terminated  by  a  null  wchar_t.  The routine
++       places resulting values in the area pointed to by wstr.
+ 
+        The user's erase and kill characters are interpreted.   If
+        keypad   mode   is   on   for  the  window,  KEY_LEFT  and
+Index: doc/html/man/curs_getch.3x.html
+--- ncurses-6.0-20161231+/doc/html/man/curs_getch.3x.html	2016-10-15 23:12:20.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/curs_getch.3x.html	2017-01-07 20:43:26.000000000 +0000
+@@ -266,13 +266,13 @@
+        real key:
+ 
+        o   KEY_RESIZE is returned when the  SIGWINCH  signal  has
+-           been  detected  (see  curs_initscr(3x) and resizeterm(3x)).
++           been  detected  (see  initscr(3x) and resizeterm(3x)).
+            This code is returned whether or not keypad  has  been
+            enabled.
+ 
+        o   KEY_MOUSE    is   returned   for   mouse-events   (see
+            curs_mouse(3x)).  This code relies upon whether or not
+-           keypad(3x) has been enabled, because (e.g., with xterm
++           keypad(3x) has been enabled, because (e.g., with xterm
+            mouse prototocol) ncurses must read escape  sequences,
+            just like a function key.
+ 
+Index: doc/html/man/curs_getstr.3x.html
+--- ncurses-6.0-20161231+/doc/html/man/curs_getstr.3x.html	2016-01-30 19:24:52.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/curs_getstr.3x.html	2017-01-07 20:43:26.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -117,7 +117,7 @@
+        Issue 4.  They  read  single-byte  characters  only.   The
+        standard  does  not define any error conditions.  This im-
+        plementation returns ERR if the window pointer is null, or
+-       if the lower-level wgetch call returns an ERR.
++       if the lower-level wgetch(3x) call returns an ERR.
+ 
+        SVr3  and early SVr4 curses implementations did not reject
+        function keys; the SVr4.0 documentation claimed that "spe-
+Index: doc/html/man/curs_initscr.3x.html
+--- ncurses-6.0-20161231+/doc/html/man/curs_initscr.3x.html	2016-10-15 23:12:20.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/curs_initscr.3x.html	2017-01-07 20:43:26.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -66,16 +66,16 @@
+

    initscr

    +        initscr is normally the first curses routine to call  when
+        initializing  a program.  A few special routines sometimes
+-       need to be called before it; these are  slk_init,  filter,
+-       ripoffline,  use_env.  For multiple-terminal applications,
+-       newterm may be called before initscr.
++       need to be called before it; these are slk_init(3x),  fil-
++       ter,  ripoffline, use_env.  For multiple-terminal applica-
++       tions, newterm may be called before initscr.
+ 
+        The initscr code determines the terminal type and initial-
+        izes  all curses data structures.  initscr also causes the
+-       first call to refresh to clear the screen.  If errors  oc-
+-       cur,  initscr writes an appropriate error message to stan-
+-       dard error and exits; otherwise, a pointer is returned  to
+-       stdscr.
++       first call to refresh(3x) to clear the screen.  If  errors
++       occur,  initscr  writes  an  appropriate  error message to
++       standard error and exits; otherwise, a pointer is returned
++       to stdscr.
+ 
+ 
+

    newterm

    +@@ -115,8 +115,8 @@
+ 
+        o   resets the terminal into the proper non-visual mode.
+ 
+-       Calling refresh or doupdate after a temporary escape caus-
+-       es the program to resume visual mode.
++       Calling  refresh(3x)  or doupdate after a temporary escape
++       causes the program to resume visual mode.
+ 
+ 
+

    isendwin

    +Index: doc/html/man/curs_inopts.3x.html
+--- ncurses-6.0-20161231+/doc/html/man/curs_inopts.3x.html	2016-10-22 20:13:53.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/curs_inopts.3x.html	2017-01-07 20:43:26.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -103,14 +103,14 @@
+ 
+

    echo/noecho

    +        The  echo  and  noecho routines control whether characters
+-       typed by the user are echoed by getch as they  are  typed.
+-       Echoing by the tty driver is always disabled, but initial-
+-       ly getch is in echo mode, so characters typed are  echoed.
+-       Authors  of  most  interactive programs prefer to do their
+-       own echoing in a controlled area of the screen, or not  to
+-       echo  at  all,  so they disable echoing by calling noecho.
+-       [See curs_getch(3x) for a discussion of how these routines
+-       interact with cbreak and nocbreak.]
++       typed by the user are echoed  by  getch(3x)  as  they  are
++       typed.   Echoing by the tty driver is always disabled, but
++       initially getch is in echo mode, so characters  typed  are
++       echoed.  Authors of most interactive programs prefer to do
++       their own echoing in a controlled area of the  screen,  or
++       not  to  echo  at  all, so they disable echoing by calling
++       noecho.  [See curs_getch(3x) for a discussion of how these
++       routines interact with cbreak and nocbreak.]
+ 
+ 
+

    halfdelay

    +@@ -138,15 +138,15 @@
+

    keypad

    +        The  keypad option enables the keypad of the user's termi-
+        nal.  If enabled (bf is TRUE), the user can press a  func-
+-       tion  key (such as an arrow key) and wgetch returns a sin-
+-       gle value representing the function key, as  in  KEY_LEFT.
+-       If  disabled (bf is FALSE), curses does not treat function
+-       keys specially and the program has to interpret the escape
+-       sequences  itself.   If  the keypad in the terminal can be
+-       turned on (made to transmit) and off (made to work  local-
+-       ly),  turning on this option causes the terminal keypad to
+-       be turned on when wgetch is called.  The default value for
+-       keypad is FALSE.
++       tion  key  (such as an arrow key) and wgetch(3x) returns a
++       single  value  representing  the  function  key,   as   in
++       KEY_LEFT.   If  disabled  (bf  is  FALSE), curses does not
++       treat function keys specially and the program has  to  in-
++       terpret the escape sequences itself.  If the keypad in the
++       terminal can be turned on (made to transmit) and off (made
++       to work locally), turning on this option causes the termi-
++       nal keypad to be turned on when wgetch(3x) is called.  The
++       default value for keypad is FALSE.
+ 
+ 
+

    meta

    +@@ -169,9 +169,9 @@
+        If  no input is ready, getch returns ERR.  If disabled (bf
+        is FALSE), getch waits until a key is pressed.
+ 
+-       While interpreting an input escape sequence, wgetch sets a
+-       timer  while  waiting  for the next character.  If notime-
+-       out(win, TRUE) is called,  then  wgetch  does  not  set  a
++       While interpreting an input  escape  sequence,  wgetch(3x)
++       sets a timer while waiting for the next character.  If no-
++       timeout(win, TRUE) is called, then wgetch does not  set  a
+        timer.  The purpose of the timeout is to differentiate be-
+        tween sequences received from a  function  key  and  those
+        typed by a user.
+@@ -215,14 +215,14 @@
+        The  curses  library  does "line-breakout optimization" by
+        looking for  typeahead  periodically  while  updating  the
+        screen.   If  input is found, and it is coming from a tty,
+-       the current update is postponed until refresh or  doupdate
+-       is  called again.  This allows faster response to commands
+-       typed in advance.  Normally, the input FILE pointer passed
+-       to  newterm,  or  stdin in the case that initscr was used,
+-       will be used to do this typeahead checking.  The typeahead
+-       routine  specifies  that  the  file descriptor fd is to be
+-       used to check for typeahead instead.  If fd is -1, then no
+-       typeahead checking is done.
++       the current update is postponed until refresh(3x) or doup-
++       date is called again.  This allows faster response to com-
++       mands typed in advance.  Normally, the input FILE  pointer
++       passed  to  newterm, or stdin in the case that initscr was
++       used, will be used to do this typeahead checking.  The ty-
++       peahead  routine  specifies that the file descriptor fd is
++       to be used to check for typeahead instead.  If fd  is  -1,
++       then no typeahead checking is done.
+ 
+ 
+

    RETURN VALUE

    +Index: doc/html/man/curs_kernel.3x.html
+--- ncurses-6.0-20161231+/doc/html/man/curs_kernel.3x.html	2016-10-15 23:12:21.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/curs_kernel.3x.html	2017-01-07 20:43:27.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -85,7 +85,7 @@
+

    reset_prog_mode, reset_shell_mode

    +        The reset_prog_mode and reset_shell_mode routines  restore
+        the  terminal  to "program" (in curses) or "shell" (out of
+-       curses) state.  These are  done  automatically  by  endwin
++       curses) state.  These are done automatically by endwin(3x)
+        and,  after  an  endwin, by doupdate, so they normally are
+        not called.
+ 
+Index: doc/html/man/curs_memleaks.3x.html
+--- ncurses-6.0-20161231+/doc/html/man/curs_memleaks.3x.html	2016-01-30 19:24:53.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/curs_memleaks.3x.html	2017-01-07 20:05:40.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -67,17 +67,18 @@
+ 
+        Any  implementation of curses must not free the memory as-
+        sociated with a screen, since (even after calling endwin),
+-       it  must be available for use in the next call to refresh.
+-       There are also chunks of memory held for performance  rea-
+-       sons.   That  makes it hard to analyze curses applications
+-       for memory leaks.  To work around this, one  can  build  a
+-       debugging version of the ncurses library which frees those
+-       chunks which it can, and provides these functions to  free
+-       all of the memory allocated by the ncurses library.
+-
+-       The  _nc_free_and_exit function is the preferred one since
+-       some of the memory which is freed may be required for  the
+-       application  to  continue  running.   Its parameter is the
++       it  must  be  available  for  use  in the next call to re-
++       fresh(3x).  There are also chunks of memory held for  per-
++       formance  reasons.   That  makes it hard to analyze curses
++       applications for memory leaks.  To work around  this,  one
++       can build a debugging version of the ncurses library which
++       frees those chunks which it can, and provides these  func-
++       tions  to  free all of the memory allocated by the ncurses
++       library.
++
++       The _nc_free_and_exit function is the preferred one  since
++       some  of the memory which is freed may be required for the
++       application to continue running.   Its  parameter  is  the
+        code to pass to the exit routine.
+ 
+ 
+Index: doc/html/man/curs_mouse.3x.html
+--- ncurses-6.0-20161231+/doc/html/man/curs_mouse.3x.html	2016-01-30 19:24:53.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/curs_mouse.3x.html	2017-01-07 20:43:27.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -77,7 +77,7 @@
+

    DESCRIPTION

    +        These  functions provide an interface to mouse events from
+        ncurses(3x).  Mouse events are  represented  by  KEY_MOUSE
+-       pseudo-key values in the wgetch input stream.
++       pseudo-key values in the wgetch(3x) input stream.
+ 
+ 
+

    mousemask

    +@@ -178,8 +178,8 @@
+        stdscr-relative coordinates are not  always  identical  to
+        window-relative  coordinates  due  to the mechanism to re-
+        serve lines on top or bottom of the screen for other  pur-
+-       poses  (see  the  ripoffline and slk_init calls, for exam-
+-       ple).
++       poses  (see the ripoffline and slk_init(3x) calls, for ex-
++       ample).
+ 
+        o   If the parameter to_screen is TRUE, the  pointers  pY,
+            pX must reference the coordinates of a location inside
+Index: doc/html/man/curs_move.3x.html
+--- ncurses-6.0-20161231+/doc/html/man/curs_move.3x.html	2016-01-30 19:24:53.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/curs_move.3x.html	2017-01-07 20:43:27.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -59,9 +59,9 @@
+

    DESCRIPTION

    +        These  routines move the cursor associated with the window
+        to line y and column x.  This routine does  not  move  the
+-       physical  cursor  of the terminal until refresh is called.
+-       The position specified is relative to the upper  left-hand
+-       corner of the window, which is (0,0).
++       physical  cursor  of  the  terminal  until  refresh(3x) is
++       called.  The position specified is relative to  the  upper
++       left-hand corner of the window, which is (0,0).
+ 
+ 
+

    RETURN VALUE

    +Index: doc/html/man/curs_outopts.3x.html
+--- ncurses-6.0-20161231+/doc/html/man/curs_outopts.3x.html	2016-10-15 23:12:21.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/curs_outopts.3x.html	2017-01-07 20:43:27.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -69,7 +69,7 @@
+        These routines set options that change the style of output
+        within  curses.   All  options are initially FALSE, unless
+        otherwise stated.  It is not necessary to turn  these  op-
+-       tions off before calling endwin.
++       tions off before calling endwin(3x).
+ 
+ 
+

    clearok

    +Index: doc/html/man/curs_pad.3x.html
+--- ncurses-6.0-20161231+/doc/html/man/curs_pad.3x.html	2016-01-30 19:24:53.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/curs_pad.3x.html	2017-01-07 20:43:27.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -114,9 +114,9 @@
+ 
+

    pechochar

    +        The pechochar routine is functionally equivalent to a call
+-       to  addch  followed by a call to refresh, a call to waddch
+-       followed by a call to wrefresh, or a call to  waddch  fol-
+-       lowed  by  a  call to prefresh.  The knowledge that only a
++       to addch followed by a call to refresh(3x), a call to wad-
++       dch followed by a call to wrefresh, or a  call  to  waddch
++       followed by a call to prefresh.  The knowledge that only a
+        single character is being output is taken into  considera-
+        tion  and, for non-control characters, a considerable per-
+        formance gain might be seen by using  these  routines  in-
+Index: doc/html/man/curs_print.3x.html
+--- ncurses-6.0-20161231+/doc/html/man/curs_print.3x.html	2016-01-30 19:24:53.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/curs_print.3x.html	2017-01-07 20:05:40.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_printw.3x.html
+--- ncurses-6.0-20161231+/doc/html/man/curs_printw.3x.html	2016-01-30 19:24:53.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/curs_printw.3x.html	2017-01-07 20:05:40.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -105,7 +105,7 @@
+ 
+ 
+

    SEE ALSO

    +-       curses(3x), printf(3), vprintf(3)
++       curses(3x), printf(3), vprintf(3).
+ 
+ 
+ 
+Index: doc/html/man/curs_scr_dump.3x.html
+--- ncurses-6.0-20161231+/doc/html/man/curs_scr_dump.3x.html	2016-01-30 19:24:53.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/curs_scr_dump.3x.html	2017-01-07 20:43:27.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -75,10 +75,10 @@
+        of the screen on this information rather than clearing the
+        screen  and starting from scratch.  scr_init is used after
+        initscr or a system call to share the screen with  another
+-       process  which  has done a scr_dump after its endwin call.
+-       The data is declared invalid if the terminfo  capabilities
+-       rmcup and nrrmc exist; also if the terminal has been writ-
+-       ten to since the preceding scr_dump call.
++       process  which  has  done  a scr_dump after its endwin(3x)
++       call.  The data is declared invalid if the terminfo  capa-
++       bilities  rmcup  and nrrmc exist; also if the terminal has
++       been written to since the preceding scr_dump call.
+ 
+        The scr_set routine is a combination  of  scr_restore  and
+        scr_init.   It  tells  the program that the information in
+Index: doc/html/man/curs_sp_funcs.3x.html
+--- ncurses-6.0-20161231+/doc/html/man/curs_sp_funcs.3x.html	2016-01-30 19:24:54.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/curs_sp_funcs.3x.html	2017-01-07 20:43:27.000000000 +0000
+@@ -218,7 +218,7 @@
+        new_prescr
+             when creating a new screen, the library  uses  static
+             variables   which   have   been   preset,   e.g.,  by
+-            curs_util(3x), curs_util(3x), etc.  With the screen-point-
++            use_env(3x), filter(3x), etc.  With the screen-point-
+             er extension, there are situations where it must cre-
+             ate a current screen before  the  unextended  library
+             does.   The new_prescr function is used internally to
+@@ -253,7 +253,7 @@
+        NCURSES_OUTC
+             This  is  a  function-pointer type used for the cases
+             where a function  passes  characters  to  the  output
+-            stream, e.g., curs_terminfo(3x).
++            stream, e.g., vidputs(3x).
+ 
+ 
+

    PORTABILITY

    +Index: doc/html/man/curs_termcap.3x.html
+--- ncurses-6.0-20161231+/doc/html/man/curs_termcap.3x.html	2016-03-27 00:09:25.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/curs_termcap.3x.html	2017-01-07 20:43:27.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -155,8 +155,8 @@
+            case, the first parameter is merely a placeholder.
+ 
+        o   Normally the ncurses library is compiled with terminfo
+-           support.  In that case, tgoto uses tparm (a more capa-
+-           ble formatter).
++           support.   In  that case, tgoto uses tparm(3x) (a more
++           capable formatter).
+ 
+        The tputs routine is described  on  the  curs_terminfo(3x)
+        manual page.  It can retrieve capabilities by either term-
+Index: doc/html/man/curs_trace.3x.html
+--- ncurses-6.0-20161231+/doc/html/man/curs_trace.3x.html	2016-12-04 01:10:37.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/curs_trace.3x.html	2017-01-07 20:43:27.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -123,7 +123,7 @@
+             trace user and system times of updates.
+ 
+        TRACE_TPUTS
+-            trace tputs calls.
++            trace tputs(3x) calls.
+ 
+        TRACE_UPDATE
+             trace update actions, old & new screens.
+Index: doc/html/man/curs_util.3x.html
+--- ncurses-6.0-20161231+/doc/html/man/curs_util.3x.html	2016-01-30 19:24:54.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/curs_util.3x.html	2017-01-07 20:43:27.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -92,11 +92,11 @@
+        o   DEL (character 127) is displayed as ^?.
+ 
+        o   Values above 128 are either meta  characters  (if  the
+-           screen  has  not been initialized, or if meta has been
+-           called with a TRUE parameter), shown in the M-X  nota-
+-           tion,  or  are displayed as themselves.  In the latter
+-           case, the values may not be  printable;  this  follows
+-           the X/Open specification.
++           screen  has  not  been initialized, or if meta(3x) has
++           been called with a TRUE parameter), shown in  the  M-X
++           notation, or are displayed as themselves.  In the lat-
++           ter case, the values may not be printable;  this  fol-
++           lows the X/Open specification.
+ 
+        o   Values  above  256  may  be  the names of the names of
+            function keys.
+@@ -133,7 +133,7 @@
+        screen size).  It modifies the way ncurses treats environ-
+        ment variables when determining the screen size.
+ 
+-       o   Normally ncurses looks first at the terminal  database
++       o   Normally ncurses looks first at the terminal  database
+            for the screen size.
+ 
+            If  use_env  was  called  with FALSE for parameter, it
+@@ -145,12 +145,12 @@
+            the terminal database.
+ 
+        o   Finally  (unless use_env was called with FALSE parame-
+-           ter), ncurses examines the LINES or  COLUMNS  environ-
++           ter), ncurses examines the LINES or  COLUMNS  environ-
+            ment variables, using a value in those to override the
+            results from the operating system  or  terminal  data-
+            base.
+ 
+-           Ncurses  also  updates  the screen size in response to
++           Ncurses  also  updates  the screen size in response to
+            SIGWINCH, unless overridden by the  LINES  or  COLUMNS
+            environment variables,
+ 
+@@ -159,17 +159,17 @@
+        The  use_tioctl  routine, if used, should be called before
+        initscr or newterm are called (because those  compute  the
+        screen  size).  After use_tioctl is called with TRUE as an
+-       argument, ncurses modifies the last step in  its  computa-
++       argument, ncurses modifies the last step in  its  computa-
+        tion of screen size as follows:
+ 
+        o   checks  if the LINES and COLUMNS environment variables
+            are set to a number greater than zero.
+ 
+-       o   for each, ncurses updates the  corresponding  environ-
++       o   for each, ncurses updates the  corresponding  environ-
+            ment  variable with the value that it has obtained via
+            operating system call or from the terminal database.
+ 
+-       o   ncurses re-fetches the value of the environment  vari-
++       o   ncurses re-fetches the value of the environment  vari-
+            ables  so  that  it is still the environment variables
+            which set the screen size.
+ 
+@@ -181,16 +181,16 @@
+ 
+ 
+ 
+-     TRUE      FALSE        This  is  the default behavior.  ncurses
++     TRUE      FALSE        This  is  the default behavior.  ncurses
+                             uses operating system calls unless over-
+                             ridden by $LINES or $COLUMNS environment
+                             variables.
+-     TRUE      TRUE         ncurses  updates  $LINES  and   $COLUMNS
++     TRUE      TRUE         ncurses  updates  $LINES  and   $COLUMNS
+                             based on operating system calls.
+-     FALSE     TRUE         ncurses ignores $LINES and $COLUMNS, us-
++     FALSE     TRUE         ncurses ignores $LINES and $COLUMNS, us-
+                             es  operating  system  calls  to  obtain
+                             size.
+-     FALSE     FALSE        ncurses  relies on the terminal database
++     FALSE     FALSE        ncurses  relies on the terminal database
+                             to determine size.
+ 
+ 
+@@ -249,11 +249,8 @@
+                returns an error if the terminal was not  initial-
+                ized.
+ 
+-          meta returns  an error if the terminal was not initial-
+-               ized.
+-
+           putwin
+-               returns an error if the  associated  fwrite  calls
++               returns  an  error  if the associated fwrite calls
+                return an error.
+ 
+ 
+@@ -261,118 +258,126 @@
+ 
+

    filter

    +        The SVr4 documentation describes the action of filter only
+-       in the vaguest terms.  The  description  here  is  adapted
+-       from  the  XSI Curses standard (which erroneously fails to
++       in  the  vaguest  terms.   The description here is adapted
++       from the XSI Curses standard (which erroneously  fails  to
+        describe the disabling of cuu).
+ 
+ 
+

    keyname

    +-       The keyname function may return the names of  user-defined
+-       string  capabilities which are defined in the terminfo en-
+-       try via the -x option of tic.  This  implementation  auto-
+-       matically  assigns  at  run-time  keycodes to user-defined
+-       strings which begin  with  "k".   The  keycodes  start  at
+-       KEY_MAX,  but  are not guaranteed to be the same value for
+-       different runs because user-defined codes are merged  from
+-       all  terminal  descriptions  which  have been loaded.  The
+-       use_extended_names function controls whether this data  is
+-       loaded  when  the  terminal description is read by the li-
++       The  keyname function may return the names of user-defined
++       string capabilities which are defined in the terminfo  en-
++       try  via  the -x option of tic.  This implementation auto-
++       matically assigns at  run-time  keycodes  to  user-defined
++       strings  which  begin  with  "k".   The  keycodes start at
++       KEY_MAX, but are not guaranteed to be the same  value  for
++       different  runs because user-defined codes are merged from
++       all terminal descriptions which  have  been  loaded.   The
++       use_extended_names  function controls whether this data is
++       loaded when the terminal description is read  by  the  li-
+        brary.
+ 
+ 
+

    nofilter/use_tioctl

    +-       The nofilter  and  use_tioctl  routines  are  specific  to
+-       ncurses.   They  were  not  supported on Version 7, BSD or
++       The  nofilter  and  use_tioctl  routines  are  specific to
++       ncurses.  They were not supported on  Version  7,  BSD  or
+        System V implementations.  It is recommended that any code
+-       depending  on  ncurses  extensions  be  conditioned  using
++       depending  on  ncurses  extensions  be  conditioned  using
+        NCURSES_VERSION.
+ 
+ 
+

    putwin/getwin

    +-       The putwin and getwin functions have several  issues  with
++       The  putwin  and getwin functions have several issues with
+        portability:
+ 
+-       o   The  files  written and read by these functions use an
+-           implementation-specific format.  Although  the  format
+-           is  an obvious target for standardization, it has been
++       o   The files written and read by these functions  use  an
++           implementation-specific  format.   Although the format
++           is an obvious target for standardization, it has  been
+            overlooked.
+ 
+            Interestingly enough, according to the copyright dates
+            in Solaris source, the functions (along with scr_init,
+-           etc.) originated with the  University  of  California,
+-           Berkeley  (in  1982) and were later (in 1988) incorpo-
+-           rated into SVr4.  Oddly, there are no  such  functions
++           etc.)  originated  with  the University of California,
++           Berkeley (in 1982) and were later (in  1988)  incorpo-
++           rated  into  SVr4.  Oddly, there are no such functions
+            in the 4.3BSD curses sources.
+ 
+-       o   Most  implementations  simply  dump  the binary WINDOW
+-           structure to the file.   These  include  SVr4  curses,
+-           NetBSD  and  PDCurses,  as  well as older ncurses ver-
+-           sions.  This implementation (as  well  as  the  X/Open
+-           variant  of  Solaris  curses, dated 1995) uses textual
++       o   Most implementations simply  dump  the  binary  WINDOW
++           structure  to  the  file.   These include SVr4 curses,
++           NetBSD and PDCurses, as well  as  older  ncurses  ver-
++           sions.   This  implementation  (as  well as the X/Open
++           variant of Solaris curses, dated  1995)  uses  textual
+            dumps.
+ 
+-           The implementations which use binary dumps use  block-
+-           I/O  (the fwrite and fread functions).  Those that use
+-           textual dumps use buffered-I/O.   A  few  applications
++           The  implementations which use binary dumps use block-
++           I/O (the fwrite and fread functions).  Those that  use
++           textual  dumps  use  buffered-I/O.  A few applications
+            may happen to write extra data in the file using these
+-           functions.  Doing that can run  into  problems  mixing
+-           block-  and buffered-I/O.  This implementation reduces
+-           the problem on writes by flushing the output.   Howev-
+-           er,  reading  from  a file written using mixed schemes
++           functions.   Doing  that  can run into problems mixing
++           block- and buffered-I/O.  This implementation  reduces
++           the  problem on writes by flushing the output.  Howev-
++           er, reading from a file written  using  mixed  schemes
+            may not be successful.
+ 
+ 
+

    unctrl/wunctrl

    +-       The XSI Curses standard, Issue  4  describes  these  func-
+-       tions.   It  states  that unctrl and wunctrl will return a
+-       null pointer if unsuccessful, but does not define any  er-
++       The  XSI  Curses  standard,  Issue 4 describes these func-
++       tions.  It states that unctrl and wunctrl  will  return  a
++       null  pointer if unsuccessful, but does not define any er-
+        ror conditions.  This implementation checks for three cas-
+        es:
+ 
+-       o   the parameter is a 7-bit US-ASCII code.  This  is  the
++       o   the  parameter  is a 7-bit US-ASCII code.  This is the
+            case that X/Open Curses documented.
+ 
+        o   the parameter is in the range 128-159, i.e., a C1 con-
+-           trol code.  If use_legacy_coding has been called  with
+-           a  2  parameter, unctrl returns the parameter, i.e., a
+-           one-character string with the parameter as  the  first
+-           character.   Otherwise,  it  returns "~@", "~A", etc.,
++           trol  code.  If use_legacy_coding has been called with
++           a 2 parameter, unctrl returns the parameter,  i.e.,  a
++           one-character  string  with the parameter as the first
++           character.  Otherwise, it returns  "~@",  "~A",  etc.,
+            analogous to "^@", "^A", C0 controls.
+ 
+-           X/Open Curses does not document whether unctrl can  be
+-           called  before  initializing curses.  This implementa-
+-           tion permits that, and returns the "~@", etc.,  values
++           X/Open  Curses does not document whether unctrl can be
++           called before initializing curses.   This  implementa-
++           tion  permits that, and returns the "~@", etc., values
+            in that case.
+ 
+-       o   parameter  values  outside the 0 to 255 range.  unctrl
++       o   parameter values outside the 0 to 255  range.   unctrl
+            returns a null pointer.
+ 
+-       The strings returned by unctrl in this implementation  are
+-       determined  at  compile time, showing C1 controls from the
+-       upper-128 codes with a `~' prefix rather than `^'.   Other
+-       implementations  have different conventions.  For example,
+-       they may show both sets of control  characters  with  `^',
+-       and  strip the parameter to 7 bits.  Or they may ignore C1
+-       controls and treat all of the upper-128  codes  as  print-
++       The  strings returned by unctrl in this implementation are
++       determined at compile time, showing C1 controls  from  the
++       upper-128  codes with a `~' prefix rather than `^'.  Other
++       implementations have different conventions.  For  example,
++       they  may  show  both sets of control characters with `^',
++       and strip the parameter to 7 bits.  Or they may ignore  C1
++       controls  and  treat  all of the upper-128 codes as print-
+        able.  This implementation uses 8 bits but does not modify
+        the string to reflect locale.  The use_legacy_coding func-
+        tion allows the caller to change the output of unctrl.
+ 
+-       Likewise,  the  meta  function allows the caller to change
+-       the output of keyname, i.e., it determines whether to  use
+-       the `M-' prefix for "meta" keys (codes in the range 128 to
+-       255).  Both use_legacy_coding and meta succeed only  after
+-       curses  is  initialized.   X/Open Curses does not document
+-       the treatment of codes 128 to 159.  When treating them  as
+-       "meta"  keys  (or if keyname is called before initializing
+-       curses),  this  implementation  returns  strings   "M-^@",
+-       "M-^A", etc.
++       Likewise, the  meta(3x)  function  allows  the  caller  to
++       change  the output of keyname, i.e., it determines whether
++       to use the `M-' prefix for "meta" keys (codes in the range
++       128 to 255).  Both use_legacy_coding and meta succeed only
++       after curses is initialized.  X/Open Curses does not docu-
++       ment  the  treatment  of  codes 128 to 159.  When treating
++       them as "meta" keys (or if keyname is called  before  ini-
++       tializing  curses),  this  implementation  returns strings
++       "M-^@", "M-^A", etc.
++
++
++

    use_env/use_tioctl

    ++       If ncurses is configured to provide the  sp-functions  ex-
++       tension, the state of use_env and use_tioctl may be updat-
++       ed before creating  each  screen  rather  than  once  only
++       (curs_sp_funcs(3x)).   This feature of use_env is not pro-
++       vided by other implementation of curses.
+ 
+ 
+

    SEE ALSO

    +-       legacy_coding(3x), curses(3x), curs_initscr(3x), curs_ker-
+-       nel(3x),  curs_scr_dump(3x),   curs_variables(3x),   lega-
+-       cy_coding(3x).
++       legacy_coding(3x), curses(3x), curs_initscr(3x),  curs_in-
++       opts(3x),        curs_kernel(3x),       curs_scr_dump(3x),
++       curs_sp_funcs(3x), curs_variables(3x), legacy_coding(3x).
+ 
+ 
+ 
+@@ -402,6 +407,7 @@
+ 
  • nofilter/use_tioctl
    • 
+ 
  • putwin/getwin
    • 
+ 
  • unctrl/wunctrl
    • 
++
  • use_env/use_tioctl
    • 
+ 
+ 
+ 
  • SEE ALSO
    • 
+Index: doc/html/man/curs_variables.3x.html
+--- ncurses-6.0-20161231+/doc/html/man/curs_variables.3x.html	2016-01-30 19:24:54.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/curs_variables.3x.html	2017-01-07 20:43:28.000000000 +0000
+@@ -138,7 +138,7 @@
+ 
+

    NOTES

    +        The   curses   library   is   initialized   using   either
+-       curs_initscr(3x), or curs_initscr(3x).
++       initscr(3x), or newterm(3x).
+ 
+        If  curses  is  configured to use separate curses/terminfo
+        libraries, most of these variables reside  in  the  curses
+Index: doc/html/man/form.3x.html
+--- ncurses-6.0-20161231+/doc/html/man/form.3x.html	2016-12-31 21:41:36.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/form.3x.html	2017-01-07 20:05:41.000000000 +0000
+@@ -239,7 +239,7 @@
+        curses(3x) and related pages whose names begin "form_" for
+        detailed descriptions of the entry points.
+ 
+-       This describes ncurses version 6.0 (patch 20161231).
++       This describes ncurses version 6.0 (patch 20170107).
+ 
+ 
+ 
+Index: doc/html/man/form_driver.3x.html
+--- ncurses-6.0-20161231+/doc/html/man/form_driver.3x.html	2016-12-04 01:10:37.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/form_driver.3x.html	2017-01-07 20:43:28.000000000 +0000
+@@ -66,7 +66,7 @@
+        o   The input is a form  navigation  request.   Navigation
+            request codes are constants defined in <form.h>, which
+            are  distinct  from  the  key-  and  character   codes
+-           returned by wgetch(3x).
++           returned by wgetch(3x).
+ 
+        o   The input is a printable character.  Printable charac-
+            ters (which must  be  positive,  less  than  256)  are
+@@ -79,7 +79,7 @@
+

    form_driver_w

    +        This extension simplifies the use  of  the  forms  library
+        using  wide characters.  The input is either a key code (a
+-       request) or a wide character returned by get_wch(3x).  The
++       request) or a wide character returned by get_wch(3x).  The
+        type  must  be  passed  as  well, to enable the library to
+        determine whether the parameter is a wide character  or  a
+        request.
+@@ -274,7 +274,7 @@
+

    SEE ALSO

    +        curses(3x),        form(3x),        form_field_buffer(3x),
+        form_field_validation(3x),  form_fieldtype(3x), form_vari-
+-       ables(3x), curs_getch(3x).
++       ables(3x), getch(3x).
+ 
+ 
+

    NOTES

    +Index: doc/html/man/form_post.3x.html
+--- ncurses-6.0-20161231+/doc/html/man/form_post.3x.html	2016-01-30 19:24:56.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/form_post.3x.html	2017-01-07 20:43:28.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -60,7 +60,7 @@
+

    DESCRIPTION

    +        The function post_form displays a form to  its  associated
+        subwindow.   To trigger physical display of the subwindow,
+-       use  refresh  or  some  equivalent  curses  routine   (the
++       use refresh(3x) or some  equivalent  curses  routine  (the
+        implicit  doupdate  triggered  by  an curses input request
+        will do).
+ 
+Index: doc/html/man/form_variables.3x.html
+--- ncurses-6.0-20161231+/doc/html/man/form_variables.3x.html	2016-01-30 19:24:56.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/form_variables.3x.html	2017-01-07 20:43:28.000000000 +0000
+@@ -65,7 +65,7 @@
+ 
+

    DESCRIPTION

    +        These  are  building blocks for the form library, defining
+-       fields that can be created using form_fieldtype(3x).   Each
++       fields that can be created using set_fieldtype(3x).   Each
+        provides  functions  for  field- and character-validation,
+        according to the given datatype.
+ 
+Index: doc/html/man/infocmp.1m.html
+--- ncurses-6.0-20161231+/doc/html/man/infocmp.1m.html	2016-12-31 21:41:36.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/infocmp.1m.html	2017-01-07 20:05:42.000000000 +0000
+@@ -478,7 +478,7 @@
+ 
+        http://invisible-island.net/ncurses/tctest.html
+ 
+-       This describes ncurses version 6.0 (patch 20161231).
++       This describes ncurses version 6.0 (patch 20170107).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/infotocap.1m.html
+--- ncurses-6.0-20161231+/doc/html/man/infotocap.1m.html	2016-12-31 21:41:36.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/infotocap.1m.html	2017-01-07 20:05:42.000000000 +0000
+@@ -88,7 +88,7 @@
+

    SEE ALSO

    +        curses(3x), tic(1m), infocmp(1m), terminfo(5)
+ 
+-       This describes ncurses version 6.0 (patch 20161231).
++       This describes ncurses version 6.0 (patch 20170107).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/menu.3x.html
+--- ncurses-6.0-20161231+/doc/html/man/menu.3x.html	2016-12-31 21:41:37.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/menu.3x.html	2017-01-07 20:05:42.000000000 +0000
+@@ -217,7 +217,7 @@
+        curses(3x) and related pages whose names begin "menu_" for
+        detailed descriptions of the entry points.
+ 
+-       This describes ncurses version 6.0 (patch 20161231).
++       This describes ncurses version 6.0 (patch 20170107).
+ 
+ 
+ 
+Index: doc/html/man/menu_driver.3x.html
+--- ncurses-6.0-20161231+/doc/html/man/menu_driver.3x.html	2016-01-30 19:24:56.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/menu_driver.3x.html	2017-01-07 20:43:29.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -62,7 +62,7 @@
+        o   The  input  is  a form navigation request.  Navigation
+            request codes are constants defined in <form.h>, which
+            are   distinct  from  the  key-  and  character  codes
+-           returned by wgetch.
++           returned by wgetch(3x).
+ 
+        o   The input is a printable character.  Printable charac-
+            ters  (which  must  be  positive,  less  than 256) are
+@@ -218,7 +218,7 @@
+ 
+ 
+

    SEE ALSO

    +-       curses(3x), menu(3x), curs_getch(3x).
++       curses(3x), menu(3x), getch(3x).
+ 
+ 
+

    NOTES

    +Index: doc/html/man/menu_post.3x.html
+--- ncurses-6.0-20161231+/doc/html/man/menu_post.3x.html	2016-10-15 23:12:23.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/menu_post.3x.html	2017-01-07 20:43:29.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -60,7 +60,7 @@
+

    DESCRIPTION

    +        The function post_menu displays a menu to  its  associated
+        subwindow.   To trigger physical display of the subwindow,
+-       use  refresh  or  some  equivalent  curses  routine   (the
++       use refresh(3x) or some  equivalent  curses  routine  (the
+        implicit  doupdate  triggered  by  an curses input request
+        will do). post_menu resets the  selection  status  of  all
+        items.
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.0-20161231+/doc/html/man/ncurses.3x.html	2016-12-31 21:41:37.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/ncurses.3x.html	2017-01-07 20:43:29.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -60,7 +60,7 @@
+        sonable optimization.  This implementation is "new curses"
+        (ncurses) and is the approved replacement for 4.4BSD clas-
+        sic  curses,  which has been discontinued.  This describes
+-       ncurses version 6.0 (patch 20161231).
++       ncurses version 6.0 (patch 20170107).
+ 
+        The ncurses library emulates the curses library of  System
+        V  Release  4  UNIX,  and  XPG4 (X/Open Portability Guide)
+@@ -108,7 +108,7 @@
+ 
+        The function initscr or newterm must be called to initial-
+        ize the library before any of the other routines that deal
+-       with windows and screens are  used.   The  routine  endwin
++       with windows and screens are used.  The routine endwin(3x)
+        must be called before exiting.
+ 
+        To  get  character-at-a-time  input  without echoing (most
+@@ -153,12 +153,12 @@
+        names beginning with w, allowing the  user  to  specify  a
+        window.  The routines not beginning with w affect stdscr.
+ 
+-       After  using  routines  to manipulate a window, refresh is
+-       called, telling curses to make the user's CRT screen  look
+-       like  stdscr.   The characters in a window are actually of
+-       type chtype, (character and attribute data) so that  other
+-       information  about  the  character may also be stored with
+-       each character.
++       After  using  routines to manipulate a window, refresh(3x)
++       is called, telling curses to make the  user's  CRT  screen
++       look like stdscr.  The characters in a window are actually
++       of type chtype, (character and  attribute  data)  so  that
++       other  information  about the character may also be stored
++       with each character.
+ 
+        Special windows  called  pads  may  also  be  manipulated.
+        These are windows which are not constrained to the size of
+Index: doc/html/man/ncurses6-config.1.html
+--- ncurses-6.0-20161231+/doc/html/man/ncurses6-config.1.html	2016-12-31 21:41:37.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/ncurses6-config.1.html	2017-01-07 20:05:43.000000000 +0000
+@@ -114,7 +114,7 @@
+

    SEE ALSO

    +        curses(3x)
+ 
+-       This describes ncurses version 6.0 (patch 20161231).
++       This describes ncurses version 6.0 (patch 20170107).
+ 
+ 
+ 
+Index: doc/html/man/panel.3x.html
+--- ncurses-6.0-20161231+/doc/html/man/panel.3x.html	2016-12-31 21:41:37.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/panel.3x.html	2017-01-07 20:05:43.000000000 +0000
+@@ -208,7 +208,7 @@
+

    SEE ALSO

    +        curses(3x), curs_variables(3x),
+ 
+-       This describes ncurses version 6.0 (patch 20161231).
++       This describes ncurses version 6.0 (patch 20170107).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/resizeterm.3x.html
+--- ncurses-6.0-20161231+/doc/html/man/resizeterm.3x.html	2016-01-30 19:24:58.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/resizeterm.3x.html	2017-01-07 20:43:30.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -112,7 +112,7 @@
+ 
+        o   on receipt of a SIGWINCH, the handler sets a flag
+ 
+-       o   which is tested in wgetch and doupdate,
++       o   which is tested in wgetch(3x) and doupdate,
+ 
+        o   in turn, calling the resizeterm function,
+ 
+@@ -138,9 +138,9 @@
+

    PORTABILITY

    +        It is possible to resize the screen with SVr4 curses, by
+ 
+-       o   exiting curses with endwin(3x) and
++       o   exiting curses with endwin(3x) and
+ 
+-       o   resuming using refresh(3x).
++       o   resuming using refresh(3x).
+ 
+        Doing that clears the screen and is visually distracting.
+ 
+Index: doc/html/man/tabs.1.html
+--- ncurses-6.0-20161231+/doc/html/man/tabs.1.html	2016-12-31 21:41:37.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/tabs.1.html	2017-01-07 20:05:43.000000000 +0000
+@@ -170,7 +170,7 @@
+

    SEE ALSO

    +        tset(1), infocmp(1m), curses(3x), terminfo(5).
+ 
+-       This describes ncurses version 6.0 (patch 20161231).
++       This describes ncurses version 6.0 (patch 20170107).
+ 
+ 
+ 
+Index: doc/html/man/term.5.html
+--- ncurses-6.0-20161231+/doc/html/man/term.5.html	2016-10-22 20:13:56.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/term.5.html	2017-01-07 20:43:30.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -95,9 +95,9 @@
+        made.
+ 
+        The  compiled  file  is  created with the tic program, and
+-       read by the routine setupterm.  The file is  divided  into
+-       six parts: the header, terminal names, boolean flags, num-
+-       bers, strings, and string table.
++       read by the routine setupterm(3x).  The  file  is  divided
++       into six parts: the header, terminal names, boolean flags,
++       numbers, strings, and string table.
+ 
+        The header section begins the file.  This section contains
+        six  short  integers in the format described below.  These
+Index: doc/html/man/term_variables.3x.html
+--- ncurses-6.0-20161231+/doc/html/man/term_variables.3x.html	2016-01-30 19:24:58.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/term_variables.3x.html	2017-01-07 20:43:30.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -105,17 +105,17 @@
+

    Current Terminal Data

    +        After  initializing the curses or terminfo interfaces, the
+        cur_term contains data describing  the  current  terminal.
+-       This variable is also set as a side-effect of curs_initscr(3x)
+-       and curs_initscr(3x).
++       This variable is also set as a side-effect of set_term(3x)
++       and delscreen(3x).
+ 
+        It is possible to save a value of cur_term for  subsequent
+        use  as  a  parameter  to  set_term, for switching between
+        screens.  Alternatively, one can  save  the  return  value
+-       from newterm or setupterm to reuse in set_term.
++       from newterm or setupterm(3x) to reuse in set_term.
+ 
+ 
+

    Terminfo Names

    +-       The  tic(1m)  and infocmp(1m) programs use lookup tables for
++       The  tic(1)  and infocmp(1) programs use lookup tables for
+        the long and short names of terminfo capabilities, as well
+        as  the  corresponding  names  for  termcap  capabilities.
+        These are available to other  applications,  although  the
+@@ -134,39 +134,40 @@
+ 
+

    Terminal Type

    +        On  initialization  of  the curses or terminfo interfaces,
+-       setupterm copies the terminal name to the array ttytype.
++       setupterm(3x) copies the terminal name to the  array  tty-
++       type.
+ 
+ 
+

    Terminfo Names

    +        In addition to the variables, <term.h> also defines a sym-
+-       bol  for each terminfo capability long name.  These are in
++       bol for each terminfo capability long name.  These are  in
+        terms of the symbol CUR, which is defined
+ 
+        #define CUR cur_term->type.
+ 
+        These symbols provide a faster method of accessing termin-
+-       fo capabilities than using tigetstr(3x), etc.
++       fo capabilities than using tigetstr(3x), etc.
+ 
+ 
+

    NOTES

    +-       The  low-level  terminfo  interface  is  initialized using
+-       curs_terminfo(3x).  The upper-level curses interface uses  the
++       The low-level  terminfo  interface  is  initialized  using
++       setupterm(3x).   The upper-level curses interface uses the
+        low-level terminfo interface, internally.
+ 
+ 
+

    PORTABILITY

    +-       X/Open  Curses  does  not describe any of these except for
+-       cur_term.  (The inclusion of cur_term  appears  to  be  an
++       X/Open Curses does not describe any of  these  except  for
++       cur_term.   (The  inclusion  of  cur_term appears to be an
+        oversight, since other comparable low-level information is
+        omitted by X/Open).
+ 
+        Other implementations may have comparable variables.  Some
+-       implementations  provide the variables in their libraries,
++       implementations provide the variables in their  libraries,
+        but omit them from the header files.
+ 
+-       All implementations which provide terminfo interfaces  add
+-       definitions  as  described  in the Terminfo Names section.
+-       Most, but not all, base the definition upon  the  cur_term
++       All  implementations which provide terminfo interfaces add
++       definitions as described in the  Terminfo  Names  section.
++       Most,  but  not all, base the definition upon the cur_term
+        variable.
+ 
+ 
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.0-20161231+/doc/html/man/terminfo.5.html	2016-12-31 21:41:38.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/terminfo.5.html	2017-01-07 20:43:30.000000000 +0000
+@@ -33,7 +33,7 @@
+   ****************************************************************************
+   * @Id: terminfo.head,v 1.22 2016/10/15 17:02:31 tom Exp @
+   * Head of terminfo man page ends here
+-  * @Id: terminfo.tail,v 1.75 2016/12/24 22:54:11 tom Exp @
++  * @Id: terminfo.tail,v 1.76 2017/01/07 18:32:49 tom Exp @
+   * Beginning of terminfo.tail file
+   * This file is part of ncurses.
+   * See "terminfo.head" for copyright.
+@@ -75,7 +75,7 @@
+        nals by giving a set of capabilities which they  have,  by
+        specifying how to perform screen operations, and by speci-
+        fying padding requirements and  initialization  sequences.
+-       This describes ncurses version 6.0 (patch 20161231).
++       This describes ncurses version 6.0 (patch 20170107).
+ 
+        Entries in terminfo consist of a sequence of `,' separated
+        fields (embedded commas may be escaped with a backslash or
+@@ -1167,8 +1167,8 @@
+ 
+        A  delay  in  milliseconds may appear anywhere in a string
+        capability, enclosed in $<..> brackets, as in  el=\EK$<5>,
+-       and  padding  characters  are supplied by tputs to provide
+-       this delay.
++       and  padding  characters are supplied by tputs(3x) to pro-
++       vide this delay.
+ 
+        o   The delay must be a number with at  most  one  decimal
+            place of precision; it may be followed by suffixes "*"
+@@ -1379,9 +1379,10 @@
+             The  terms  "static"  and  "dynamic"  are misleading.
+             Historically, these are simply two different sets  of
+             variables,  whose  values are not reset between calls
+-            to tparm.  However, that fact is  not  documented  in
+-            other  implementations.  Relying on it will adversely
+-            impact portability to other implementations.
++            to tparm(3x).  However, that fact is  not  documented
++            in   other   implementations.   Relying  on  it  will
++            adversely impact  portability  to  other  implementa-
++            tions.
+ 
+        %'c' char constant c
+ 
+@@ -1404,16 +1405,16 @@
+             logical AND and OR operations (for conditionals)
+ 
+        %!, %~
+-            unary   operations   (logical  and  bit  complement):
++            unary  operations  (logical  and   bit   complement):
+             push(op pop())
+ 
+        %i   add 1 to first two parameters (for ANSI terminals)
+ 
+        %? expr %t thenpart %e elsepart %;
+-            This forms  an  if-then-else.   The  %e  elsepart  is
+-            optional.   Usually  the  %? expr part pushes a value
+-            onto the stack, and %t pops it from the stack,  test-
+-            ing  if it is nonzero (true).  If it is zero (false),
++            This  forms  an  if-then-else.   The  %e  elsepart is
++            optional.  Usually the %? expr part  pushes  a  value
++            onto  the stack, and %t pops it from the stack, test-
++            ing if it is nonzero (true).  If it is zero  (false),
+             control passes to the %e (else) part.
+ 
+             It is possible to form else-if's a la Algol 68:
+@@ -1422,221 +1423,221 @@
+             where ci are conditions, bi are bodies.
+ 
+             Use the -f option of tic or infocmp to see the struc-
+-            ture  of if-then-else's.  Some strings, e.g., sgr can
++            ture of if-then-else's.  Some strings, e.g., sgr  can
+             be very complicated when written on one line.  The -f
+-            option  splits  the  string into lines with the parts
++            option splits the string into lines  with  the  parts
+             indented.
+ 
+        Binary operations are in postfix form with the operands in
+-       the  usual  order.   That  is,  to  get  x-5 one would use
+-       "%gx%{5}%-".  %P and %g variables  are  persistent  across
++       the usual order.  That  is,  to  get  x-5  one  would  use
++       "%gx%{5}%-".   %P  and  %g variables are persistent across
+        escape-string evaluations.
+ 
+        Consider the HP2645, which, to get to row 3 and column 12,
+-       needs to be sent \E&a12c03Y  padded  for  6  milliseconds.
+-       Note  that  the  order of the rows and columns is inverted
+-       here, and that the row and column are printed as two  dig-
++       needs  to  be  sent  \E&a12c03Y padded for 6 milliseconds.
++       Note that the order of the rows and  columns  is  inverted
++       here,  and that the row and column are printed as two dig-
+        its.  Thus its cup capability is "cup=6\E&%p2%2dc%p1%2dY".
+ 
+        The Microterm ACT-IV needs the current row and column sent
+-       preceded by a ^T, with the row and column  simply  encoded
+-       in  binary,  "cup=^T%p1%c%p2%c".  Terminals which use "%c"
+-       need to be able to backspace the  cursor  (cub1),  and  to
++       preceded  by  a ^T, with the row and column simply encoded
++       in binary, "cup=^T%p1%c%p2%c".  Terminals which  use  "%c"
++       need  to  be  able  to backspace the cursor (cub1), and to
+        move the cursor up one line on the screen (cuu1).  This is
+-       necessary because it is not always safe to transmit \n  ^D
+-       and  \r,  as  the system may change or discard them.  (The
+-       library routines dealing with terminfo set  tty  modes  so
++       necessary  because it is not always safe to transmit \n ^D
++       and \r, as the system may change or  discard  them.   (The
++       library  routines  dealing  with terminfo set tty modes so
+        that tabs are never expanded, so \t is safe to send.  This
+        turns out to be essential for the Ann Arbor 4080.)
+ 
+        A final example is the LSI ADM-3a, which uses row and col-
+        umn  offset  by  a  blank  character,  thus  "cup=\E=%p1%'
+-       '%+%c%p2%' '%+%c".  After sending "\E=", this  pushes  the
+-       first  parameter, pushes the ASCII value for a space (32),
+-       adds them (pushing the sum on the stack in  place  of  the
+-       two  previous  values) and outputs that value as a charac-
+-       ter.  Then the same is  done  for  the  second  parameter.
++       '%+%c%p2%'  '%+%c".   After sending "\E=", this pushes the
++       first parameter, pushes the ASCII value for a space  (32),
++       adds  them  (pushing  the sum on the stack in place of the
++       two previous values) and outputs that value as  a  charac-
++       ter.   Then  the  same  is  done for the second parameter.
+        More complex arithmetic is possible using the stack.
+ 
+ 
+

    Cursor Motions

    +        If the terminal has a fast way to home the cursor (to very
+-       upper left corner of screen) then this  can  be  given  as
+-       home;  similarly  a fast way of getting to the lower left-
+-       hand corner can be given as ll; this may involve going  up
+-       with  cuu1  from  the  home position, but a program should
+-       never do this itself (unless ll does) because it can  make
+-       no  assumption about the effect of moving up from the home
+-       position.  Note that the home  position  is  the  same  as
++       upper  left  corner  of  screen) then this can be given as
++       home; similarly a fast way of getting to the  lower  left-
++       hand  corner can be given as ll; this may involve going up
++       with cuu1 from the home position,  but  a  program  should
++       never  do this itself (unless ll does) because it can make
++       no assumption about the effect of moving up from the  home
++       position.   Note  that  the  home  position is the same as
+        addressing to (0,0): to the top left corner of the screen,
+-       not of memory.  (Thus, the \EH sequence  on  HP  terminals
++       not  of  memory.   (Thus, the \EH sequence on HP terminals
+        cannot be used for home.)
+ 
+        If the terminal has row or column absolute cursor address-
+-       ing, these can be given as single  parameter  capabilities
++       ing,  these  can be given as single parameter capabilities
+        hpa (horizontal position absolute) and vpa (vertical posi-
+        tion absolute).  Sometimes these are shorter than the more
+-       general  two  parameter  sequence (as with the hp2645) and
++       general two parameter sequence (as with  the  hp2645)  and
+        can be used in preference to cup.  If there are parameter-
+-       ized  local  motions  (e.g.,  move  n spaces to the right)
++       ized local motions (e.g., move  n  spaces  to  the  right)
+        these can be given as cud, cub, cuf, and cuu with a single
+-       parameter  indicating  how many spaces to move.  These are
+-       primarily useful if the terminal does not have  cup,  such
++       parameter indicating how many spaces to move.   These  are
++       primarily  useful  if the terminal does not have cup, such
+        as the TEKTRONIX 4025.
+ 
+        If the terminal needs to be in a special mode when running
+        a program that uses these capabilities, the codes to enter
+-       and  exit this mode can be given as smcup and rmcup.  This
+-       arises, for example, from terminals like the Concept  with
+-       more  than  one  page of memory.  If the terminal has only
+-       memory relative cursor addressing and not screen  relative
++       and exit this mode can be given as smcup and rmcup.   This
++       arises,  for example, from terminals like the Concept with
++       more than one page of memory.  If the  terminal  has  only
++       memory  relative cursor addressing and not screen relative
+        cursor addressing, a one screen-sized window must be fixed
+-       into the terminal for cursor addressing to work  properly.
++       into  the terminal for cursor addressing to work properly.
+        This is also used for the TEKTRONIX 4025, where smcup sets
+-       the command character to be the one used by terminfo.   If
+-       the  smcup  sequence  will not restore the screen after an
++       the  command character to be the one used by terminfo.  If
++       the smcup sequence will not restore the  screen  after  an
+        rmcup sequence is output (to the state prior to outputting
+        rmcup), specify nrrmc.
+ 
+ 
+

    Area Clears

    +        If the terminal can clear from the current position to the
+-       end of the line, leaving the  cursor  where  it  is,  this
++       end  of  the  line,  leaving  the cursor where it is, this
+        should be given as el.  If the terminal can clear from the
+-       beginning of the line to the current  position  inclusive,
+-       leaving  the  cursor  where it is, this should be given as
+-       el1.  If the terminal can clear from the current  position
+-       to  the  end  of the display, then this should be given as
+-       ed.  Ed is only defined from the first column of  a  line.
+-       (Thus,  it can be simulated by a request to delete a large
++       beginning  of  the line to the current position inclusive,
++       leaving the cursor where it is, this should  be  given  as
++       el1.   If the terminal can clear from the current position
++       to the end of the display, then this should  be  given  as
++       ed.   Ed  is only defined from the first column of a line.
++       (Thus, it can be simulated by a request to delete a  large
+        number of lines, if a true ed is not available.)
+ 
+ 
+

    Insert/delete line and vertical motions

    +-       If the terminal can open a new blank line before the  line
+-       where  the cursor is, this should be given as il1; this is
+-       done only from the first position of a line.   The  cursor
++       If  the terminal can open a new blank line before the line
++       where the cursor is, this should be given as il1; this  is
++       done  only  from the first position of a line.  The cursor
+        must then appear on the newly blank line.  If the terminal
+-       can delete the line which the  cursor  is  on,  then  this
+-       should  be  given as dl1; this is done only from the first
+-       position on the line to be deleted.  Versions of  il1  and
+-       dl1  which  take  a  single parameter and insert or delete
++       can  delete  the  line  which  the cursor is on, then this
++       should be given as dl1; this is done only from  the  first
++       position  on  the line to be deleted.  Versions of il1 and
++       dl1 which take a single parameter  and  insert  or  delete
+        that many lines can be given as il and dl.
+ 
+-       If the terminal has a settable scrolling region (like  the
+-       vt100)  the  command to set this can be described with the
+-       csr capability, which takes two parameters:  the  top  and
++       If  the terminal has a settable scrolling region (like the
++       vt100) the command to set this can be described  with  the
++       csr  capability,  which  takes two parameters: the top and
+        bottom lines of the scrolling region.  The cursor position
+        is, alas, undefined after using this command.
+ 
+-       It is possible to get the effect of insert or delete  line
++       It  is possible to get the effect of insert or delete line
+        using csr on a properly chosen region; the sc and rc (save
+-       and restore cursor) commands may be  useful  for  ensuring
+-       that  your  synthesized insert/delete string does not move
+-       the cursor.  (Note that the ncurses(3x) library does  this
+-       synthesis   automatically,   so   you   need  not  compose
++       and  restore  cursor)  commands may be useful for ensuring
++       that your synthesized insert/delete string does  not  move
++       the  cursor.  (Note that the ncurses(3x) library does this
++       synthesis  automatically,  so   you   need   not   compose
+        insert/delete strings for an entry with csr).
+ 
+        Yet another way to construct insert and delete might be to
+-       use  a  combination  of index with the memory-lock feature
+-       found on some terminals (like the HP-700/90 series,  which
++       use a combination of index with  the  memory-lock  feature
++       found  on some terminals (like the HP-700/90 series, which
+        however also has insert/delete).
+ 
+-       Inserting  lines  at  the  top or bottom of the screen can
+-       also be done using ri or ind on many terminals  without  a
+-       true  insert/delete line, and is often faster even on ter-
++       Inserting lines at the top or bottom  of  the  screen  can
++       also  be  done using ri or ind on many terminals without a
++       true insert/delete line, and is often faster even on  ter-
+        minals with those features.
+ 
+-       The boolean non_dest_scroll_region should be set  if  each
+-       scrolling  window  is effectively a view port on a screen-
+-       sized canvas.  To  test  for  this  capability,  create  a
+-       scrolling  region in the middle of the screen, write some-
+-       thing to the bottom line, move the cursor to  the  top  of
++       The  boolean  non_dest_scroll_region should be set if each
++       scrolling window is effectively a view port on  a  screen-
++       sized  canvas.   To  test  for  this  capability, create a
++       scrolling region in the middle of the screen, write  some-
++       thing  to  the  bottom line, move the cursor to the top of
+        the region, and do ri followed by dl1 or ind.  If the data
+-       scrolled off the bottom  of  the  region  by  the  ri  re-
+-       appears,  then scrolling is non-destructive.  System V and
+-       XSI Curses expect that ind, ri, indn, and rin  will  simu-
+-       late  destructive  scrolling; their documentation cautions
+-       you not to define csr unless this is  true.   This  curses
++       scrolled  off  the  bottom  of  the  region  by the ri re-
++       appears, then scrolling is non-destructive.  System V  and
++       XSI  Curses  expect that ind, ri, indn, and rin will simu-
++       late destructive scrolling; their  documentation  cautions
++       you  not  to  define csr unless this is true.  This curses
+        implementation is more liberal and will do explicit erases
+        after scrolling if ndsrc is defined.
+ 
+        If the terminal has the ability to define a window as part
+-       of  memory,  which all commands affect, it should be given
++       of memory, which all commands affect, it should  be  given
+        as the parameterized string wind.  The four parameters are
+-       the  starting  and ending lines in memory and the starting
++       the starting and ending lines in memory and  the  starting
+        and ending columns in memory, in that order.
+ 
+-       If the terminal can retain display memory above, then  the
+-       da  capability  should  be given; if display memory can be
+-       retained below, then db should be given.   These  indicate
+-       that  deleting  a  line  or  scrolling may bring non-blank
+-       lines up from below or that scrolling  back  with  ri  may
++       If  the terminal can retain display memory above, then the
++       da capability should be given; if display  memory  can  be
++       retained  below,  then db should be given.  These indicate
++       that deleting a line  or  scrolling  may  bring  non-blank
++       lines  up  from  below  or that scrolling back with ri may
+        bring down non-blank lines.
+ 
+ 
+

    Insert/Delete Character

    +-       There  are  two  basic kinds of intelligent terminals with
+-       respect to insert/delete character which can be  described
+-       using  terminfo.   The most common insert/delete character
+-       operations affect only the characters on the current  line
+-       and  shift  characters  off  the  end of the line rigidly.
+-       Other terminals, such as the Concept 100  and  the  Perkin
+-       Elmer  Owl,  make  a distinction between typed and untyped
+-       blanks on the screen, shifting upon an  insert  or  delete
+-       only  to  an  untyped  blank on the screen which is either
++       There are two basic kinds of  intelligent  terminals  with
++       respect  to insert/delete character which can be described
++       using terminfo.  The most common  insert/delete  character
++       operations  affect only the characters on the current line
++       and shift characters off the  end  of  the  line  rigidly.
++       Other  terminals,  such  as the Concept 100 and the Perkin
++       Elmer Owl, make a distinction between  typed  and  untyped
++       blanks  on  the  screen, shifting upon an insert or delete
++       only to an untyped blank on the  screen  which  is  either
+        eliminated, or expanded to two untyped blanks.
+ 
+-       You can determine the kind of terminal you have by  clear-
+-       ing  the  screen  and then typing text separated by cursor
+-       motions.  Type "abc    def"  using  local  cursor  motions
+-       (not  spaces) between the "abc" and the "def".  Then posi-
+-       tion the cursor before the "abc" and put the  terminal  in
+-       insert  mode.  If typing characters causes the rest of the
+-       line to shift rigidly and characters to fall off the  end,
++       You  can determine the kind of terminal you have by clear-
++       ing the screen and then typing text  separated  by  cursor
++       motions.   Type  "abc    def"  using  local cursor motions
++       (not spaces) between the "abc" and the "def".  Then  posi-
++       tion  the  cursor before the "abc" and put the terminal in
++       insert mode.  If typing characters causes the rest of  the
++       line  to shift rigidly and characters to fall off the end,
+        then your terminal does not distinguish between blanks and
+-       untyped positions.  If the "abc" shifts over to the  "def"
+-       which  then  move  together  around the end of the current
+-       line and onto the next as you insert, you have the  second
++       untyped  positions.  If the "abc" shifts over to the "def"
++       which then move together around the  end  of  the  current
++       line  and onto the next as you insert, you have the second
+        type of terminal, and should give the capability in, which
+        stands for "insert null".
+ 
+-       While these are two  logically  separate  attributes  (one
+-       line  versus multi-line insert mode, and special treatment
+-       of untyped spaces) we have seen no terminals whose  insert
++       While  these  are  two  logically separate attributes (one
++       line versus multi-line insert mode, and special  treatment
++       of  untyped spaces) we have seen no terminals whose insert
+        mode cannot be described with the single attribute.
+ 
+-       Terminfo  can describe both terminals which have an insert
++       Terminfo can describe both terminals which have an  insert
+        mode, and terminals which send a simple sequence to open a
+-       blank  position  on  the  current  line.  Give as smir the
+-       sequence to get  into  insert  mode.   Give  as  rmir  the
+-       sequence  to  leave  insert  mode.   Now  give as ich1 any
++       blank position on the current  line.   Give  as  smir  the
++       sequence  to  get  into  insert  mode.   Give  as rmir the
++       sequence to leave insert  mode.   Now  give  as  ich1  any
+        sequence needed to be sent just before sending the charac-
+-       ter  to  be  inserted.   Most terminals with a true insert
+-       mode will not give ich1; terminals which send  a  sequence
++       ter to be inserted.  Most terminals  with  a  true  insert
++       mode  will  not give ich1; terminals which send a sequence
+        to open a screen position should give it here.
+ 
+-       If  your terminal has both, insert mode is usually prefer-
+-       able to ich1.   Technically,  you  should  not  give  both
+-       unless  the  terminal actually requires both to be used in
+-       combination.  Accordingly,  some  non-curses  applications
+-       get  confused  if both are present; the symptom is doubled
++       If your terminal has both, insert mode is usually  prefer-
++       able  to  ich1.   Technically,  you  should  not give both
++       unless the terminal actually requires both to be  used  in
++       combination.   Accordingly,  some  non-curses applications
++       get confused if both are present; the symptom  is  doubled
+        characters in an update using insert.  This requirement is
+        now rare; most ich sequences do not require previous smir,
+        and most smir insert modes do not require ich1 before each
+-       character.   Therefore,  the  new  curses actually assumes
+-       this is the case and uses either rmir/smir or ich/ich1  as
++       character.  Therefore, the  new  curses  actually  assumes
++       this  is the case and uses either rmir/smir or ich/ich1 as
+        appropriate (but not both).  If you have to write an entry
+-       to be used under new curses for a terminal old  enough  to
++       to  be  used under new curses for a terminal old enough to
+        need both, include the rmir/smir sequences in ich1.
+ 
+        If post insert padding is needed, give this as a number of
+-       milliseconds in ip (a string option).  Any other  sequence
+-       which  may  need  to  be  sent after an insert of a single
++       milliseconds  in ip (a string option).  Any other sequence
++       which may need to be sent after  an  insert  of  a  single
+        character may also be given in ip.  If your terminal needs
+        both to be placed into an "insert mode" and a special code
+-       to precede each inserted character,  then  both  smir/rmir
+-       and  ich1  can  be  given, and both will be used.  The ich
++       to  precede  each  inserted character, then both smir/rmir
++       and ich1 can be given, and both will  be  used.   The  ich
+        capability, with one parameter, n, will repeat the effects
+        of ich1 n times.
+ 
+@@ -1644,62 +1645,62 @@
+        in insert mode, give this as a number of milliseconds pad-
+        ding in rmp.
+ 
+-       It  is  occasionally  necessary  to  move  around while in
+-       insert mode to delete characters on the same  line  (e.g.,
+-       if  there is a tab after the insertion position).  If your
+-       terminal allows motion while in insert mode you  can  give
+-       the  capability  mir  to  speed up inserting in this case.
+-       Omitting mir  will  affect  only  speed.   Some  terminals
++       It is occasionally  necessary  to  move  around  while  in
++       insert  mode  to delete characters on the same line (e.g.,
++       if there is a tab after the insertion position).  If  your
++       terminal  allows  motion while in insert mode you can give
++       the capability mir to speed up  inserting  in  this  case.
++       Omitting  mir  will  affect  only  speed.   Some terminals
+        (notably Datamedia's) must not have mir because of the way
+        their insert mode works.
+ 
+-       Finally, you can specify dch1 to delete a  single  charac-
+-       ter,  dch  with  one parameter, n, to delete n characters,
+-       and delete mode by giving smdc and rmdc to enter and  exit
+-       delete  mode  (any mode the terminal needs to be placed in
++       Finally,  you  can specify dch1 to delete a single charac-
++       ter, dch with one parameter, n, to  delete  n  characters,
++       and  delete mode by giving smdc and rmdc to enter and exit
++       delete mode (any mode the terminal needs to be  placed  in
+        for dch1 to work).
+ 
+-       A command to erase n characters (equivalent to  outputting
+-       n  blanks  without  moving the cursor) can be given as ech
++       A  command to erase n characters (equivalent to outputting
++       n blanks without moving the cursor) can be  given  as  ech
+        with one parameter.
+ 
+ 
+

    Highlighting, Underlining, and Visible Bells

    +        If  your  terminal  has  one  or  more  kinds  of  display
+-       attributes,  these  can be represented in a number of dif-
++       attributes, these can be represented in a number  of  dif-
+        ferent ways.  You should choose one display form as stand-
+        out mode, representing a good, high contrast, easy-on-the-
+-       eyes, format for highlighting  error  messages  and  other
+-       attention  getters.   (If you have a choice, reverse video
+-       plus half-bright is good, or reverse  video  alone.)   The
+-       sequences  to  enter  and  exit standout mode are given as
+-       smso and rmso, respectively.  If the code to  change  into
+-       or  out of standout mode leaves one or even two blank spa-
+-       ces on the screen, as the TVI 912  and  Teleray  1061  do,
++       eyes,  format  for  highlighting  error messages and other
++       attention getters.  (If you have a choice,  reverse  video
++       plus  half-bright  is  good, or reverse video alone.)  The
++       sequences to enter and exit standout  mode  are  given  as
++       smso  and  rmso, respectively.  If the code to change into
++       or out of standout mode leaves one or even two blank  spa-
++       ces  on  the  screen,  as the TVI 912 and Teleray 1061 do,
+        then xmc should be given to tell how many spaces are left.
+ 
+-       Codes  to  begin  underlining  and  end underlining can be
+-       given as smul and rmul respectively.  If the terminal  has
+-       a  code  to  underline  the current character and move the
++       Codes to begin underlining  and  end  underlining  can  be
++       given  as smul and rmul respectively.  If the terminal has
++       a code to underline the current  character  and  move  the
+        cursor one space to the right, such as the Microterm Mime,
+        this can be given as uc.
+ 
+-       Other  capabilities  to  enter  various highlighting modes
+-       include blink (blinking) bold (bold or extra  bright)  dim
+-       (dim  or  half-bright)  invis (blanking or invisible text)
+-       prot (protected) rev (reverse video) sgr0  (turn  off  all
+-       attribute  modes)  smacs  (enter  alternate  character set
+-       mode) and  rmacs  (exit  alternate  character  set  mode).
+-       Turning  on  any of these modes singly may or may not turn
++       Other capabilities to  enter  various  highlighting  modes
++       include  blink  (blinking) bold (bold or extra bright) dim
++       (dim or half-bright) invis (blanking  or  invisible  text)
++       prot  (protected)  rev  (reverse video) sgr0 (turn off all
++       attribute modes)  smacs  (enter  alternate  character  set
++       mode)  and  rmacs  (exit  alternate  character  set mode).
++       Turning on any of these modes singly may or may  not  turn
+        off other modes.
+ 
+-       If there is a sequence to set  arbitrary  combinations  of
+-       modes,  this should be given as sgr (set attributes), tak-
+-       ing 9 parameters.  Each parameter is either 0 or  nonzero,
++       If  there  is  a sequence to set arbitrary combinations of
++       modes, this should be given as sgr (set attributes),  tak-
++       ing  9 parameters.  Each parameter is either 0 or nonzero,
+        as the corresponding attribute is on or off.  The 9 param-
+-       eters are, in order: standout, underline, reverse,  blink,
+-       dim,  bold,  blank, protect, alternate character set.  Not
+-       all modes need be supported by sgr, only those  for  which
++       eters  are, in order: standout, underline, reverse, blink,
++       dim, bold, blank, protect, alternate character  set.   Not
++       all  modes  need be supported by sgr, only those for which
+        corresponding separate attribute commands exist.
+ 
+        For example, the DEC vt220 supports most of the modes:
+@@ -1717,22 +1718,22 @@
+         p8                   protect          not used
+         p9                   altcharset       ^O (off) ^N (on)
+ 
+-       We  begin each escape sequence by turning off any existing
+-       modes, since there is no quick way  to  determine  whether
++       We begin each escape sequence by turning off any  existing
++       modes,  since  there  is no quick way to determine whether
+        they are active.  Standout is set up to be the combination
+-       of reverse and bold.  The vt220  terminal  has  a  protect
+-       mode,  though  it  is  not commonly used in sgr because it
+-       protects characters on the screen  from  the  host's  era-
+-       sures.   The  altcharset mode also is different in that it
+-       is either ^O or ^N, depending on whether it is off or  on.
+-       If  all  modes  are  turned  on, the resulting sequence is
++       of  reverse  and  bold.   The vt220 terminal has a protect
++       mode, though it is not commonly used  in  sgr  because  it
++       protects  characters  on  the  screen from the host's era-
++       sures.  The altcharset mode also is different in  that  it
++       is  either ^O or ^N, depending on whether it is off or on.
++       If all modes are turned  on,  the  resulting  sequence  is
+        \E[0;1;4;5;7;8m^N.
+ 
+-       Some sequences are common to different modes.   For  exam-
+-       ple,  ;7  is output when either p1 or p3 is true, that is,
++       Some  sequences  are common to different modes.  For exam-
++       ple, ;7 is output when either p1 or p3 is true,  that  is,
+        if either standout or reverse modes are turned on.
+ 
+-       Writing out the above sequences, along with  their  depen-
++       Writing  out  the above sequences, along with their depen-
+        dencies yields
+ 
+       sequence             when to output      terminfo translation
+@@ -1751,62 +1752,62 @@
+            sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p4%t;5%;
+                %?%p1%p3%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 
+-       Remember  that  if  you specify sgr, you must also specify
+-       sgr0.  Also, some implementations rely on sgr being  given
+-       if  sgr0  is, Not all terminfo entries necessarily have an
+-       sgr string, however.  Many terminfo  entries  are  derived
+-       from  termcap  entries which have no sgr string.  The only
+-       drawback to adding an sgr  string  is  that  termcap  also
+-       assumes  that  sgr0  does not exit alternate character set
++       Remember that if you specify sgr, you  must  also  specify
++       sgr0.   Also, some implementations rely on sgr being given
++       if sgr0 is, Not all terminfo entries necessarily  have  an
++       sgr  string,  however.   Many terminfo entries are derived
++       from termcap entries which have no sgr string.   The  only
++       drawback  to  adding  an  sgr  string is that termcap also
++       assumes that sgr0 does not exit  alternate  character  set
+        mode.
+ 
+-       Terminals with the "magic  cookie"  glitch  (xmc)  deposit
++       Terminals  with  the  "magic  cookie" glitch (xmc) deposit
+        special   "cookies"   when   they   receive   mode-setting
+-       sequences, which affect the display algorithm rather  than
+-       having  extra  bits  for  each character.  Some terminals,
+-       such as the HP 2621,  automatically  leave  standout  mode
+-       when  they  move to a new line or the cursor is addressed.
+-       Programs using standout mode  should  exit  standout  mode
+-       before  moving the cursor or sending a newline, unless the
+-       msgr capability, asserting that it  is  safe  to  move  in
++       sequences,  which affect the display algorithm rather than
++       having extra bits for  each  character.   Some  terminals,
++       such  as  the  HP  2621, automatically leave standout mode
++       when they move to a new line or the cursor  is  addressed.
++       Programs  using  standout  mode  should exit standout mode
++       before moving the cursor or sending a newline, unless  the
++       msgr  capability,  asserting  that  it  is safe to move in
+        standout mode, is present.
+ 
+-       If  the terminal has a way of flashing the screen to indi-
+-       cate an error quietly (a bell replacement) then  this  can
++       If the terminal has a way of flashing the screen to  indi-
++       cate  an  error quietly (a bell replacement) then this can
+        be given as flash; it must not move the cursor.
+ 
+-       If  the  cursor  needs to be made more visible than normal
++       If the cursor needs to be made more  visible  than  normal
+        when it is not on the bottom line (to make, for example, a
+-       non-blinking  underline  into  an  easier to find block or
++       non-blinking underline into an easier  to  find  block  or
+        blinking underline) give this sequence as cvvis.  If there
+-       is  a  way  to  make the cursor completely invisible, give
++       is a way to make the  cursor  completely  invisible,  give
+        that as civis.  The capability cnorm should be given which
+        undoes the effects of both of these modes.
+ 
+        If your terminal correctly generates underlined characters
+-       (with no special codes needed) even  though  it  does  not
+-       overstrike,  then you should give the capability ul.  If a
+-       character overstriking another leaves both  characters  on
++       (with  no  special  codes  needed) even though it does not
++       overstrike, then you should give the capability ul.  If  a
++       character  overstriking  another leaves both characters on
+        the screen, specify the capability os.  If overstrikes are
+-       erasable with a blank, then this should  be  indicated  by
++       erasable  with  a  blank, then this should be indicated by
+        giving eo.
+ 
+ 
+

    Keypad and Function Keys

    +        If the terminal has a keypad that transmits codes when the
+-       keys are pressed, this information  can  be  given.   Note
++       keys  are  pressed,  this  information can be given.  Note
+        that it is not possible to handle terminals where the key-
+        pad only works in local (this applies, for example, to the
+-       unshifted  HP  2621  keys).   If  the keypad can be set to
+-       transmit or not transmit, give these  codes  as  smkx  and
++       unshifted HP 2621 keys).  If the  keypad  can  be  set  to
++       transmit  or  not  transmit,  give these codes as smkx and
+        rmkx.  Otherwise the keypad is assumed to always transmit.
+ 
+-       The  codes  sent by the left arrow, right arrow, up arrow,
+-       down arrow, and home keys can be given  as  kcub1,  kcuf1,
+-       kcuu1,  kcud1, and khome respectively.  If there are func-
+-       tion keys such as f0, f1, ..., f10, the  codes  they  send
+-       can  be  given as kf0, kf1, ..., kf10.  If these keys have
+-       labels other than the default f0 through f10,  the  labels
++       The codes sent by the left arrow, right arrow,  up  arrow,
++       down  arrow,  and  home keys can be given as kcub1, kcuf1,
++       kcuu1, kcud1, and khome respectively.  If there are  func-
++       tion  keys  such  as f0, f1, ..., f10, the codes they send
++       can be given as kf0, kf1, ..., kf10.  If these  keys  have
++       labels  other  than the default f0 through f10, the labels
+        can be given as lf0, lf1, ..., lf10.
+ 
+        The codes transmitted by certain other special keys can be
+@@ -1846,60 +1847,60 @@
+ 
+        o   khts (set a tab stop in this column).
+ 
+-       In addition, if the keypad has a 3  by  3  array  of  keys
+-       including  the four arrow keys, the other five keys can be
++       In  addition,  if  the  keypad  has a 3 by 3 array of keys
++       including the four arrow keys, the other five keys can  be
+        given as ka1, ka3, kb2, kc1, and kc3.  These keys are use-
+-       ful  when  the  effects  of  a  3 by 3 directional pad are
++       ful when the effects of a  3  by  3  directional  pad  are
+        needed.
+ 
+-       Strings to program function keys can be  given  as  pfkey,
+-       pfloc,  and pfx.  A string to program screen labels should
+-       be specified as pln.  Each  of  these  strings  takes  two
+-       parameters:  the function key number to program (from 0 to
+-       10) and the string to program it with.  Function key  num-
+-       bers  out  of  this  range may program undefined keys in a
+-       terminal dependent manner.   The  difference  between  the
+-       capabilities  is  that pfkey causes pressing the given key
+-       to be the same as the user typing the given string;  pfloc
++       Strings  to  program  function keys can be given as pfkey,
++       pfloc, and pfx.  A string to program screen labels  should
++       be  specified  as  pln.   Each  of these strings takes two
++       parameters: the function key number to program (from 0  to
++       10)  and the string to program it with.  Function key num-
++       bers out of this range may program  undefined  keys  in  a
++       terminal  dependent  manner.   The  difference between the
++       capabilities is that pfkey causes pressing the  given  key
++       to  be the same as the user typing the given string; pfloc
+        causes the string to be executed by the terminal in local;
+-       and pfx causes the string to be transmitted  to  the  com-
++       and  pfx  causes  the string to be transmitted to the com-
+        puter.
+ 
+        The capabilities nlab, lw and lh define the number of pro-
+-       grammable screen labels and their width  and  height.   If
+-       there  are  commands  to  turn the labels on and off, give
+-       them in smln and rmln.  smln is normally output after  one
++       grammable  screen  labels  and their width and height.  If
++       there are commands to turn the labels  on  and  off,  give
++       them  in smln and rmln.  smln is normally output after one
+        or more pln sequences to make sure that the change becomes
+        visible.
+ 
+ 
+

    Tabs and Initialization

    +-       If the terminal has hardware tabs, the command to  advance
+-       to  the  next tab stop can be given as ht (usually control
++       If  the terminal has hardware tabs, the command to advance
++       to the next tab stop can be given as ht  (usually  control
+        I).  A "back-tab" command which moves leftward to the pre-
+-       ceding  tab  stop  can be given as cbt.  By convention, if
+-       the teletype modes indicate that tabs are  being  expanded
+-       by  the  computer  rather than being sent to the terminal,
+-       programs should not  use  ht  or  cbt  even  if  they  are
+-       present,  since  the user may not have the tab stops prop-
+-       erly set.  If the terminal has  hardware  tabs  which  are
+-       initially  set every n spaces when the terminal is powered
+-       up, the numeric parameter it is given, showing the  number
+-       of  spaces  the tabs are set to.  This is normally used by
+-       the tset command to determine whether to set the mode  for
+-       hardware  tab expansion, and whether to set the tab stops.
+-       If the terminal has tab stops that can be  saved  in  non-
+-       volatile  memory, the terminfo description can assume that
++       ceding tab stop can be given as cbt.   By  convention,  if
++       the  teletype  modes indicate that tabs are being expanded
++       by the computer rather than being sent  to  the  terminal,
++       programs  should  not  use  ht  or  cbt  even  if they are
++       present, since the user may not have the tab  stops  prop-
++       erly  set.   If  the  terminal has hardware tabs which are
++       initially set every n spaces when the terminal is  powered
++       up,  the numeric parameter it is given, showing the number
++       of spaces the tabs are set to.  This is normally  used  by
++       the  tset command to determine whether to set the mode for
++       hardware tab expansion, and whether to set the tab  stops.
++       If  the  terminal  has tab stops that can be saved in non-
++       volatile memory, the terminfo description can assume  that
+        they are properly set.
+ 
+-       Other capabilities include is1, is2, and is3,  initializa-
+-       tion  strings  for the terminal, iprog, the path name of a
+-       program to be run to initialize the terminal, and if,  the
+-       name  of  a  file  containing long initialization strings.
+-       These strings are expected to set the terminal into  modes
+-       consistent  with  the  rest  of  the terminfo description.
++       Other  capabilities include is1, is2, and is3, initializa-
++       tion strings for the terminal, iprog, the path name  of  a
++       program  to be run to initialize the terminal, and if, the
++       name of a file  containing  long  initialization  strings.
++       These  strings are expected to set the terminal into modes
++       consistent with the  rest  of  the  terminfo  description.
+        They are normally sent to the terminal, by the init option
+-       of  the  tput  program,  each time the user logs in.  They
++       of the tput program, each time the  user  logs  in.   They
+        will be printed in the following order:
+ 
+               run the program
+@@ -1919,107 +1920,107 @@
+               and finally
+                      output is3.
+ 
+-       Most initialization is done with  is2.   Special  terminal
++       Most  initialization  is  done with is2.  Special terminal
+        modes can be set up without duplicating strings by putting
+-       the common sequences in is2 and special cases in  is1  and
++       the  common  sequences in is2 and special cases in is1 and
+        is3.
+ 
+        A set of sequences that does a harder reset from a totally
+        unknown state can be given as rs1, rs2, rf and rs3, analo-
+-       gous  to  is1  ,  is2  ,  if  and is3 respectively.  These
+-       strings are output by the reset  program,  which  is  used
+-       when  the terminal gets into a wedged state.  Commands are
+-       normally placed in rs1, rs2 rs3 and rf only if  they  pro-
+-       duce  annoying effects on the screen and are not necessary
+-       when logging in.  For example,  the  command  to  set  the
+-       vt100  into  80-column mode would normally be part of is2,
+-       but it causes an annoying glitch of the screen and is  not
+-       normally  needed  since the terminal is usually already in
++       gous to is1 ,  is2  ,  if  and  is3  respectively.   These
++       strings  are  output  by  the reset program, which is used
++       when the terminal gets into a wedged state.  Commands  are
++       normally  placed  in rs1, rs2 rs3 and rf only if they pro-
++       duce annoying effects on the screen and are not  necessary
++       when  logging  in.   For  example,  the command to set the
++       vt100 into 80-column mode would normally be part  of  is2,
++       but  it causes an annoying glitch of the screen and is not
++       normally needed since the terminal is usually  already  in
+        80 column mode.
+ 
+        The reset program writes strings including iprog, etc., in
+-       the  same  order  as  the  init  program, using rs1, etc.,
++       the same order as  the  init  program,  using  rs1,  etc.,
+        instead of is1, etc.  If any of rs1, rs2, rs3, or rf reset
+-       capability  strings  are  missing, the reset program falls
++       capability strings are missing, the  reset  program  falls
+        back  upon  the  corresponding  initialization  capability
+        string.
+ 
+        If there are commands to set and clear tab stops, they can
+-       be given as tbc (clear all tab stops) and hts (set  a  tab
+-       stop  in the current column of every row).  If a more com-
+-       plex sequence is needed  to  set  the  tabs  than  can  be
+-       described  by  this,  the sequence can be placed in is2 or
++       be  given  as tbc (clear all tab stops) and hts (set a tab
++       stop in the current column of every row).  If a more  com-
++       plex  sequence  is  needed  to  set  the  tabs than can be
++       described by this, the sequence can be placed  in  is2  or
+        if.
+ 
+ 
+

    Delays and Padding

    +-       Many older and slower  terminals  do  not  support  either
++       Many  older  and  slower  terminals  do not support either
+        XON/XOFF or DTR handshaking, including hard copy terminals
+-       and some very archaic CRTs (including,  for  example,  DEC
+-       VT100s).   These may require padding characters after cer-
++       and  some  very  archaic CRTs (including, for example, DEC
++       VT100s).  These may require padding characters after  cer-
+        tain cursor motions and screen changes.
+ 
+        If the terminal uses xon/xoff handshaking for flow control
+-       (that  is, it automatically emits ^S back to the host when
++       (that is, it automatically emits ^S back to the host  when
+        its input buffers are close to full), set xon.  This capa-
+-       bility  suppresses  the emission of padding.  You can also
+-       set it for memory-mapped console devices effectively  that
+-       do  not  have  a  speed limit.  Padding information should
+-       still be included so that routines can make  better  deci-
++       bility suppresses the emission of padding.  You  can  also
++       set  it for memory-mapped console devices effectively that
++       do not have a speed  limit.   Padding  information  should
++       still  be  included so that routines can make better deci-
+        sions about relative costs, but actual pad characters will
+        not be transmitted.
+ 
+-       If pb (padding baud rate) is given, padding is  suppressed
+-       at  baud rates below the value of pb.  If the entry has no
+-       padding baud rate, then whether padding is emitted or  not
++       If  pb (padding baud rate) is given, padding is suppressed
++       at baud rates below the value of pb.  If the entry has  no
++       padding  baud rate, then whether padding is emitted or not
+        is completely controlled by xon.
+ 
+-       If  the terminal requires other than a null (zero) charac-
+-       ter as a pad, then this can be given  as  pad.   Only  the
++       If the terminal requires other than a null (zero)  charac-
++       ter  as  a  pad,  then this can be given as pad.  Only the
+        first character of the pad string is used.
+ 
+ 
+

    Status Lines

    +-       Some  terminals  have  an extra "status line" which is not
+-       normally used by software (and thus  not  counted  in  the
++       Some terminals have an extra "status line"  which  is  not
++       normally  used  by  software  (and thus not counted in the
+        terminal's lines capability).
+ 
+-       The  simplest  case  is  a  status  line  which is cursor-
+-       addressable but not part of the main scrolling  region  on
+-       the  screen;  the  Heathkit  H19 has a status line of this
+-       kind, as would a 24-line VT100 with  a  23-line  scrolling
+-       region  set up on initialization.  This situation is indi-
++       The simplest case  is  a  status  line  which  is  cursor-
++       addressable  but  not part of the main scrolling region on
++       the screen; the Heathkit H19 has a  status  line  of  this
++       kind,  as  would  a 24-line VT100 with a 23-line scrolling
++       region set up on initialization.  This situation is  indi-
+        cated by the hs capability.
+ 
+        Some terminals with status lines need special sequences to
+-       access  the  status  line.   These  may  be expressed as a
++       access the status line.   These  may  be  expressed  as  a
+        string with single parameter tsl which takes the cursor to
+-       a  given zero-origin column on the status line.  The capa-
++       a given zero-origin column on the status line.  The  capa-
+        bility fsl must return to the main-screen cursor positions
+-       before  the  last  tsl.   You may need to embed the string
+-       values of sc (save cursor) and rc (restore cursor) in  tsl
++       before the last tsl.  You may need  to  embed  the  string
++       values  of sc (save cursor) and rc (restore cursor) in tsl
+        and fsl to accomplish this.
+ 
+-       The  status  line is normally assumed to be the same width
+-       as the width of the terminal.  If this is untrue, you  can
++       The status line is normally assumed to be the  same  width
++       as  the width of the terminal.  If this is untrue, you can
+        specify it with the numeric capability wsl.
+ 
+-       A  command to erase or blank the status line may be speci-
++       A command to erase or blank the status line may be  speci-
+        fied as dsl.
+ 
+-       The  boolean  capability  eslok  specifies   that   escape
++       The   boolean   capability  eslok  specifies  that  escape
+        sequences, tabs, etc., work ordinarily in the status line.
+ 
+-       The  ncurses  implementation does not yet use any of these
+-       capabilities.  They are documented here in case they  ever
++       The ncurses implementation does not yet use any  of  these
++       capabilities.   They are documented here in case they ever
+        become important.
+ 
+ 
+

    Line Graphics

    +-       Many  terminals  have  alternate character sets useful for
+-       forms-drawing.  Terminfo and curses build in  support  for
+-       the  drawing  characters supported by the VT100, with some
+-       characters from the AT&T  4410v1  added.   This  alternate
++       Many terminals have alternate character  sets  useful  for
++       forms-drawing.   Terminfo  and curses build in support for
++       the drawing characters supported by the VT100,  with  some
++       characters  from  the  AT&T  4410v1 added.  This alternate
+        character set may be specified by the acsc capability.
+ 
+        Glyph                       ACS           Ascii     VT100
+@@ -2057,74 +2058,74 @@
+        upper right corner          ACS_URCORNER  +         k
+        vertical line               ACS_VLINE     |         x
+ 
+-       The  best  way to define a new device's graphics set is to
+-       add a column to a copy of this table  for  your  terminal,
+-       giving   the   character   which   (when  emitted  between
+-       smacs/rmacs switches) will be rendered as the  correspond-
+-       ing  graphic.  Then read off the VT100/your terminal char-
+-       acter pairs right to left in sequence;  these  become  the
++       The best way to define a new device's graphics set  is  to
++       add  a  column  to a copy of this table for your terminal,
++       giving  the  character   which   (when   emitted   between
++       smacs/rmacs  switches) will be rendered as the correspond-
++       ing graphic.  Then read off the VT100/your terminal  char-
++       acter  pairs  right  to left in sequence; these become the
+        ACSC string.
+ 
+ 
+

    Color Handling

    +-       The  curses  library  functions  init_pair  and init_color
+-       manipulate the color pairs and color values  discussed  in
+-       this  section (see curs_color(3x) for details on these and
++       The curses  library  functions  init_pair  and  init_color
++       manipulate  the  color pairs and color values discussed in
++       this section (see curs_color(3x) for details on these  and
+        related functions).
+ 
+-       Most color terminals are either "Tektronix-like"  or  "HP-
++       Most  color  terminals are either "Tektronix-like" or "HP-
+        like":
+ 
+-       o   Tektronix-like  terminals  have  a predefined set of N
+-           colors (where N is usually 8), and can set  character-
+-           cell  foreground  and  background  characters indepen-
++       o   Tektronix-like terminals have a predefined  set  of  N
++           colors  (where N is usually 8), and can set character-
++           cell foreground  and  background  characters  indepen-
+            dently, mixing them into N * N color-pairs.
+ 
+-       o   On HP-like terminals, the user  must  set  each  color
+-           pair  up separately (foreground and background are not
+-           independently settable).  Up to M color-pairs  may  be
+-           set  up  from  2*M  different colors.  ANSI-compatible
++       o   On  HP-like  terminals,  the  user must set each color
++           pair up separately (foreground and background are  not
++           independently  settable).   Up to M color-pairs may be
++           set up from  2*M  different  colors.   ANSI-compatible
+            terminals are Tektronix-like.
+ 
+        Some basic color capabilities are independent of the color
+        method.  The numeric capabilities colors and pairs specify
+-       the maximum numbers of colors and color-pairs that can  be
+-       displayed  simultaneously.   The op (original pair) string
+-       resets foreground and background colors to  their  default
+-       values  for the terminal.  The oc string resets all colors
+-       or color-pairs to their default values for  the  terminal.
+-       Some  terminals  (including  many  PC  terminal emulators)
+-       erase screen  areas  with  the  current  background  color
+-       rather  than the power-up default background; these should
++       the  maximum numbers of colors and color-pairs that can be
++       displayed simultaneously.  The op (original  pair)  string
++       resets  foreground  and background colors to their default
++       values for the terminal.  The oc string resets all  colors
++       or  color-pairs  to their default values for the terminal.
++       Some terminals  (including  many  PC  terminal  emulators)
++       erase  screen  areas  with  the  current  background color
++       rather than the power-up default background; these  should
+        have the boolean capability bce.
+ 
+-       While the curses library works with color pairs  (reflect-
+-       ing  the  inability  of some devices to set foreground and
++       While  the curses library works with color pairs (reflect-
++       ing the inability of some devices to  set  foreground  and
+        background colors independently), there are separate capa-
+        bilities for setting these features:
+ 
+-       o   To  change  the current foreground or background color
+-           on a Tektronix-type  terminal,  use  setaf  (set  ANSI
+-           foreground)  and  setab  (set ANSI background) or setf
+-           (set foreground) and  setb  (set  background).   These
+-           take  one parameter, the color number.  The SVr4 docu-
+-           mentation describes only setaf/setab; the  XPG4  draft
++       o   To change the current foreground or  background  color
++           on  a  Tektronix-type  terminal,  use  setaf (set ANSI
++           foreground) and setab (set ANSI  background)  or  setf
++           (set  foreground)  and  setb  (set background).  These
++           take one parameter, the color number.  The SVr4  docu-
++           mentation  describes  only setaf/setab; the XPG4 draft
+            says  that  "If  the  terminal  supports  ANSI  escape
+            sequences  to  set  background  and  foreground,  they
+            should be coded as setaf and setab, respectively.
+ 
+        o   If the terminal supports other escape sequences to set
+-           background and foreground, they  should  be  coded  as
+-           setf  and  setb,  respectively.   The  vidputs and the
+-           refresh functions use the setaf and setab capabilities
+-           if they are defined.
++           background  and  foreground,  they  should be coded as
++           setf and setb,  respectively.   The  vidputs  and  the
++           refresh(3x) functions use the setaf and setab capabil-
++           ities if they are defined.
+ 
+-       The  setaf/setab  and setf/setb capabilities take a single
++       The setaf/setab and setf/setb capabilities take  a  single
+        numeric argument each.  Argument values 0-7 of setaf/setab
+-       are  portably defined as follows (the middle column is the
++       are portably defined as follows (the middle column is  the
+        symbolic #define available in the header for the curses or
+-       ncurses  libraries).  The terminal hardware is free to map
+-       these as it likes, but  the  RGB  values  indicate  normal
++       ncurses libraries).  The terminal hardware is free to  map
++       these  as  it  likes,  but  the RGB values indicate normal
+        locations in color space.
+ 
+              Color       #define       Value       RGB
+@@ -2135,9 +2136,10 @@
+              blue      COLOR_BLUE        4     0,0,max
+              magenta   COLOR_MAGENTA     5     max,0,max
+              cyan      COLOR_CYAN        6     0,max,max
++
+              white     COLOR_WHITE       7     max,max,max
+ 
+-       The  argument  values of setf/setb historically correspond
++       The argument values of setf/setb  historically  correspond
+        to a different mapping, i.e.,
+ 
+              Color       #define       Value       RGB
+@@ -2151,36 +2153,36 @@
+              white     COLOR_WHITE       7     max,max,max
+ 
+        It is important to not confuse the two sets of color capa-
+-       bilities;  otherwise  red/blue will be interchanged on the
++       bilities; otherwise red/blue will be interchanged  on  the
+        display.
+ 
+-       On an HP-like terminal, use scp with a  color-pair  number
++       On  an  HP-like terminal, use scp with a color-pair number
+        parameter to set which color pair is current.
+ 
+        Some terminals allow the color values to be modified:
+ 
+-       o   On  a  Tektronix-like terminal, the capability ccc may
+-           be present to indicate that colors  can  be  modified.
+-           If  so,  the initc capability will take a color number
+-           (0 to colors  -  1)and  three  more  parameters  which
++       o   On a Tektronix-like terminal, the capability  ccc  may
++           be  present  to  indicate that colors can be modified.
++           If so, the initc capability will take a  color  number
++           (0  to  colors  -  1)and  three  more parameters which
+            describe the color.  These three parameters default to
+-           being interpreted as RGB (Red,  Green,  Blue)  values.
+-           If  the  boolean  capability  hls is present, they are
+-           instead as HLS (Hue, Lightness,  Saturation)  indices.
++           being  interpreted  as  RGB (Red, Green, Blue) values.
++           If the boolean capability hls  is  present,  they  are
++           instead  as  HLS (Hue, Lightness, Saturation) indices.
+            The ranges are terminal-dependent.
+ 
+-       o   On  an  HP-like  terminal, initp may give a capability
+-           for changing a color-pair value.  It will  take  seven
+-           parameters;  a color-pair number (0 to max_pairs - 1),
+-           and two triples describing first background  and  then
+-           foreground  colors.   These  parameters  must be (Red,
++       o   On an HP-like terminal, initp may  give  a  capability
++           for  changing  a color-pair value.  It will take seven
++           parameters; a color-pair number (0 to max_pairs -  1),
++           and  two  triples describing first background and then
++           foreground colors.  These  parameters  must  be  (Red,
+            Green, Blue) or (Hue, Lightness, Saturation) depending
+            on hls.
+ 
+-       On  some  color terminals, colors collide with highlights.
++       On some color terminals, colors collide  with  highlights.
+        You can register these collisions with the ncv capability.
+-       This  is a bit-mask of attributes not to be used when col-
+-       ors are enabled.  The correspondence with  the  attributes
++       This is a bit-mask of attributes not to be used when  col-
++       ors  are  enabled.  The correspondence with the attributes
+        understood by curses is as follows:
+ 
+           Attribute              Bit   Decimal      Set by
+@@ -2201,210 +2203,210 @@
+           A_VERTICAL             14    16384        sgr1
+           A_ITALIC               15    32768        sitm
+ 
+-       For  example,  on  many  IBM  PC  consoles,  the underline
+-       attribute collides with the foreground color blue  and  is
+-       not  available  in  color  mode.  These should have an ncv
++       For example,  on  many  IBM  PC  consoles,  the  underline
++       attribute  collides  with the foreground color blue and is
++       not available in color mode.  These  should  have  an  ncv
+        capability of 2.
+ 
+-       SVr4 curses does nothing with ncv, ncurses  recognizes  it
++       SVr4  curses  does nothing with ncv, ncurses recognizes it
+        and optimizes the output in favor of colors.
+ 
+ 
+

    Miscellaneous

    +-       If  the terminal requires other than a null (zero) charac-
+-       ter as a pad, then this can be given  as  pad.   Only  the
+-       first  character of the pad string is used.  If the termi-
++       If the terminal requires other than a null (zero)  charac-
++       ter  as  a  pad,  then this can be given as pad.  Only the
++       first character of the pad string is used.  If the  termi-
+        nal does not have a pad character, specify npc.  Note that
+-       ncurses  implements  the  termcap-compatible  PC variable;
+-       though the application may set  this  value  to  something
+-       other  than  a  null,  ncurses will test npc first and use
++       ncurses implements  the  termcap-compatible  PC  variable;
++       though  the  application  may  set this value to something
++       other than a null, ncurses will test  npc  first  and  use
+        napms if the terminal has no pad character.
+ 
+-       If the terminal can move up or down half a line, this  can
+-       be  indicated  with  hu  (half-line  up) and hd (half-line
++       If  the terminal can move up or down half a line, this can
++       be indicated with hu  (half-line  up)  and  hd  (half-line
+        down).  This is primarily useful for superscripts and sub-
+-       scripts  on  hard-copy terminals.  If a hard-copy terminal
+-       can eject to the next page (form feed), give  this  as  ff
++       scripts on hard-copy terminals.  If a  hard-copy  terminal
++       can  eject  to  the next page (form feed), give this as ff
+        (usually control L).
+ 
+-       If  there is a command to repeat a given character a given
+-       number of times (to save time transmitting a large  number
+-       of  identical  characters)  this can be indicated with the
+-       parameterized string rep.   The  first  parameter  is  the
+-       character  to  be repeated and the second is the number of
+-       times to repeat it.  Thus, tparm(repeat_char, 'x', 10)  is
++       If there is a command to repeat a given character a  given
++       number  of times (to save time transmitting a large number
++       of identical characters) this can be  indicated  with  the
++       parameterized  string  rep.   The  first  parameter is the
++       character to be repeated and the second is the  number  of
++       times  to repeat it.  Thus, tparm(repeat_char, 'x', 10) is
+        the same as "xxxxxxxxxx".
+ 
+-       If  the terminal has a settable command character, such as
+-       the TEKTRONIX 4025, this can be indicated with  cmdch.   A
++       If the terminal has a settable command character, such  as
++       the  TEKTRONIX  4025, this can be indicated with cmdch.  A
+        prototype command character is chosen which is used in all
+-       capabilities.  This character is given in the cmdch  capa-
+-       bility  to  identify it.  The following convention is sup-
+-       ported on some UNIX systems:  The  environment  is  to  be
+-       searched  for a CC variable, and if found, all occurrences
++       capabilities.   This character is given in the cmdch capa-
++       bility to identify it.  The following convention  is  sup-
++       ported  on  some  UNIX  systems:  The environment is to be
++       searched for a CC variable, and if found, all  occurrences
+        of the prototype character are replaced with the character
+        in the environment variable.
+ 
+-       Terminal  descriptions  that  do  not represent a specific
++       Terminal descriptions that do  not  represent  a  specific
+        kind of known terminal, such as switch, dialup, patch, and
+-       network,  should  include  the  gn (generic) capability so
+-       that programs can complain that they do not  know  how  to
+-       talk  to the terminal.  (This capability does not apply to
+-       virtual  terminal  descriptions  for  which   the   escape
++       network, should include the  gn  (generic)  capability  so
++       that  programs  can  complain that they do not know how to
++       talk to the terminal.  (This capability does not apply  to
++       virtual   terminal   descriptions  for  which  the  escape
+        sequences are known.)
+ 
+-       If  the  terminal  has  a "meta key" which acts as a shift
+-       key, setting the 8th bit  of  any  character  transmitted,
+-       this  fact  can be indicated with km.  Otherwise, software
++       If the terminal has a "meta key" which  acts  as  a  shift
++       key,  setting  the  8th  bit of any character transmitted,
++       this fact can be indicated with km.   Otherwise,  software
+        will assume that the 8th bit is parity and it will usually
+-       be  cleared.  If strings exist to turn this "meta mode" on
++       be cleared.  If strings exist to turn this "meta mode"  on
+        and off, they can be given as smm and rmm.
+ 
+-       If the terminal has more lines of memory than will fit  on
+-       the  screen  at once, the number of lines of memory can be
+-       indicated with lm.  A value of  lm#0  indicates  that  the
++       If  the terminal has more lines of memory than will fit on
++       the screen at once, the number of lines of memory  can  be
++       indicated  with  lm.   A  value of lm#0 indicates that the
+        number of lines is not fixed, but that there is still more
+        memory than fits on the screen.
+ 
+        If the terminal is one of those supported by the UNIX vir-
+-       tual  terminal  protocol, the terminal number can be given
++       tual terminal protocol, the terminal number can  be  given
+        as vt.
+ 
+        Media copy strings which control an auxiliary printer con-
+        nected to the terminal can be given as mc0: print the con-
+-       tents of the screen, mc4: turn off the printer,  and  mc5:
+-       turn  on  the  printer.   When the printer is on, all text
+-       sent to the terminal will be sent to the printer.   It  is
++       tents  of  the screen, mc4: turn off the printer, and mc5:
++       turn on the printer.  When the printer  is  on,  all  text
++       sent  to  the terminal will be sent to the printer.  It is
+        undefined whether the text is also displayed on the termi-
+        nal screen when the printer is on.  A variation mc5p takes
+        one parameter, and leaves the printer on for as many char-
+-       acters as the value  of  the  parameter,  then  turns  the
+-       printer  off.   The  parameter should not exceed 255.  All
++       acters  as  the  value  of  the  parameter, then turns the
++       printer off.  The parameter should not  exceed  255.   All
+        text,  including  mc4,  is  transparently  passed  to  the
+        printer while an mc5p is in effect.
+ 
+ 
+

    Glitches and Braindamage

    +-       Hazeltine  terminals, which do not allow "~" characters to
++       Hazeltine terminals, which do not allow "~" characters  to
+        be displayed should indicate hz.
+ 
+        Terminals which ignore a line-feed immediately after an am
+        wrap, such as the Concept and vt100, should indicate xenl.
+ 
+-       If  el  is  required  to  get  rid of standout (instead of
+-       merely writing normal text on top of it),  xhp  should  be
++       If el is required to  get  rid  of  standout  (instead  of
++       merely  writing  normal  text on top of it), xhp should be
+        given.
+ 
+-       Teleray  terminals,  where  tabs turn all characters moved
+-       over to blanks, should  indicate  xt  (destructive  tabs).
+-       Note:    the    variable    indicating    this    is   now
+-       "dest_tabs_magic_smso"; in older  versions,  it  was  tel-
++       Teleray terminals, where tabs turn  all  characters  moved
++       over  to  blanks,  should  indicate xt (destructive tabs).
++       Note:   the    variable    indicating    this    is    now
++       "dest_tabs_magic_smso";  in  older  versions,  it was tel-
+        eray_glitch.  This glitch is also taken to mean that it is
+-       not possible to position the cursor on  top  of  a  "magic
+-       cookie",  that to erase standout mode it is instead neces-
++       not  possible  to  position  the cursor on top of a "magic
++       cookie", that to erase standout mode it is instead  neces-
+        sary to use delete and insert line.  The ncurses implemen-
+        tation ignores this glitch.
+ 
+-       The  Beehive Superbee, which is unable to correctly trans-
+-       mit the escape or control C characters, has xsb,  indicat-
+-       ing  that the f1 key is used for escape and f2 for control
+-       C.  (Only certain Superbees have this  problem,  depending
+-       on  the  ROM.)  Note that in older terminfo versions, this
+-       capability  was  called  "beehive_glitch";   it   is   now
++       The Beehive Superbee, which is unable to correctly  trans-
++       mit  the escape or control C characters, has xsb, indicat-
++       ing that the f1 key is used for escape and f2 for  control
++       C.   (Only  certain Superbees have this problem, depending
++       on the ROM.)  Note that in older terminfo  versions,  this
++       capability   was   called   "beehive_glitch";  it  is  now
+        "no_esc_ctl_c".
+ 
+-       Other  specific  terminal  problems  may  be  corrected by
++       Other specific  terminal  problems  may  be  corrected  by
+        adding more capabilities of the form xx.
+ 
+ 
+

    Similar Terminals

    +        If there are two very similar terminals, one (the variant)
+-       can  be  defined  as  being just like the other (the base)
+-       with certain exceptions.  In the definition of  the  vari-
+-       ant,  the string capability use can be given with the name
+-       of the base terminal.  The capabilities given  before  use
+-       override  those  in  the base type named by use.  If there
+-       are multiple use capabilities, they are merged in  reverse
+-       order.   That is, the rightmost use reference is processed
+-       first, then the one to its left, and so forth.   Capabili-
+-       ties  given explicitly in the entry override those brought
++       can be defined as being just like  the  other  (the  base)
++       with  certain  exceptions.  In the definition of the vari-
++       ant, the string capability use can be given with the  name
++       of  the  base terminal.  The capabilities given before use
++       override those in the base type named by  use.   If  there
++       are  multiple use capabilities, they are merged in reverse
++       order.  That is, the rightmost use reference is  processed
++       first,  then the one to its left, and so forth.  Capabili-
++       ties given explicitly in the entry override those  brought
+        in by use references.
+ 
+        A capability can be canceled by placing xx@ to the left of
+-       the  use  reference that imports it, where xx is the capa-
++       the use reference that imports it, where xx is  the  capa-
+        bility.  For example, the entry
+ 
+               2621-nl, smkx@, rmkx@, use=2621,
+ 
+-       defines a 2621-nl that does not  have  the  smkx  or  rmkx
+-       capabilities,  and hence does not turn on the function key
+-       labels when in visual mode.  This is useful for  different
++       defines  a  2621-nl  that  does  not have the smkx or rmkx
++       capabilities, and hence does not turn on the function  key
++       labels  when in visual mode.  This is useful for different
+        modes for a terminal, or for different user preferences.
+ 
+ 
+

    Pitfalls of Long Entries

    +-       Long  terminfo  entries  are  unlikely to be a problem; to
+-       date, no entry has even  approached  terminfo's  4096-byte
++       Long terminfo entries are unlikely to  be  a  problem;  to
++       date,  no  entry  has even approached terminfo's 4096-byte
+        string-table maximum.  Unfortunately, the termcap transla-
+        tions are much more strictly limited (to 1023 bytes), thus
+-       termcap  translations  of  long terminfo entries can cause
++       termcap translations of long terminfo  entries  can  cause
+        problems.
+ 
+-       The man pages for 4.3BSD and  older  versions  of  tgetent
+-       instruct  the  user to allocate a 1024-byte buffer for the
+-       termcap entry.  The  entry  gets  null-terminated  by  the
++       The  man  pages  for  4.3BSD and older versions of tgetent
++       instruct the user to allocate a 1024-byte buffer  for  the
++       termcap  entry.   The  entry  gets  null-terminated by the
+        termcap library, so that makes the maximum safe length for
+-       a termcap entry 1k-1 (1023) bytes.  Depending on what  the
+-       application  and  the termcap library being used does, and
+-       where in the termcap file the terminal type  that  tgetent
++       a  termcap entry 1k-1 (1023) bytes.  Depending on what the
++       application and the termcap library being used  does,  and
++       where  in  the termcap file the terminal type that tgetent
+        is searching for is, several bad things can happen.
+ 
+-       Some  termcap libraries print a warning message or exit if
+-       they find an entry that's longer than 1023  bytes;  others
+-       do  not;  others truncate the entries to 1023 bytes.  Some
++       Some termcap libraries print a warning message or exit  if
++       they  find  an entry that's longer than 1023 bytes; others
++       do not; others truncate the entries to 1023  bytes.   Some
+        application programs allocate more than the recommended 1K
+        for the termcap entry; others do not.
+ 
+        Each termcap entry has two important sizes associated with
+        it: before "tc" expansion, and after "tc" expansion.  "tc"
+-       is  the  capability that tacks on another termcap entry to
+-       the end of the current one, to add  on  its  capabilities.
+-       If  a termcap entry does not use the "tc" capability, then
++       is the capability that tacks on another termcap  entry  to
++       the  end  of  the current one, to add on its capabilities.
++       If a termcap entry does not use the "tc" capability,  then
+        of course the two lengths are the same.
+ 
+-       The "before tc expansion" length  is  the  most  important
+-       one,  because it affects more than just users of that par-
+-       ticular terminal.  This is the length of the entry  as  it
++       The  "before  tc  expansion"  length is the most important
++       one, because it affects more than just users of that  par-
++       ticular  terminal.   This is the length of the entry as it
+        exists in /etc/termcap, minus the backslash-newline pairs,
+-       which tgetent strips out while reading it.   Some  termcap
+-       libraries  strip  off  the final newline, too (GNU termcap
++       which  tgetent  strips out while reading it.  Some termcap
++       libraries strip off the final newline,  too  (GNU  termcap
+        does not).  Now suppose:
+ 
+-       o   a termcap entry before expansion  is  more  than  1023
++       o   a  termcap  entry  before  expansion is more than 1023
+            bytes long,
+ 
+        o   and the application has only allocated a 1k buffer,
+ 
+-       o   and  the  termcap  library (like the one in BSD/OS 1.1
+-           and GNU) reads the whole entry  into  the  buffer,  no
+-           matter  what  its length, to see if it is the entry it
++       o   and the termcap library (like the one  in  BSD/OS  1.1
++           and  GNU)  reads  the  whole entry into the buffer, no
++           matter what its length, to see if it is the  entry  it
+            wants,
+ 
+-       o   and tgetent is searching  for  a  terminal  type  that
+-           either  is the long entry, appears in the termcap file
+-           after the long entry, or does not appear in  the  file
+-           at  all (so that tgetent has to search the whole term-
++       o   and  tgetent  is  searching  for  a terminal type that
++           either is the long entry, appears in the termcap  file
++           after  the  long entry, or does not appear in the file
++           at all (so that tgetent has to search the whole  term-
+            cap file).
+ 
+        Then tgetent will overwrite memory, perhaps its stack, and
+-       probably  core dump the program.  Programs like telnet are
+-       particularly vulnerable; modern telnets pass along  values
+-       like  the  terminal  type  automatically.  The results are
+-       almost as undesirable with a termcap library,  like  SunOS
++       probably core dump the program.  Programs like telnet  are
++       particularly  vulnerable; modern telnets pass along values
++       like the terminal type  automatically.   The  results  are
++       almost  as  undesirable with a termcap library, like SunOS
+        4.1.3 and Ultrix 4.4, that prints warning messages when it
+-       reads an overly long termcap entry.  If a termcap  library
+-       truncates  long  entries,  like OSF/1 3.0, it is immune to
+-       dying here but will return incorrect data for  the  termi-
++       reads  an overly long termcap entry.  If a termcap library
++       truncates long entries, like OSF/1 3.0, it  is  immune  to
++       dying  here  but will return incorrect data for the termi-
+        nal.
+ 
+        The "after tc expansion" length will have a similar effect
+@@ -2414,27 +2416,27 @@
+        while searching.
+ 
+        In summary, a termcap entry that is longer than 1023 bytes
+-       can cause, on various combinations  of  termcap  libraries
+-       and  applications,  a  core  dump,  warnings, or incorrect
+-       operation.  If it is too long even before "tc"  expansion,
++       can  cause,  on  various combinations of termcap libraries
++       and applications, a  core  dump,  warnings,  or  incorrect
++       operation.   If it is too long even before "tc" expansion,
+        it will have this effect even for users of some other ter-
+-       minal types and users whose TERM variable does not have  a
++       minal  types and users whose TERM variable does not have a
+        termcap entry.
+ 
+        When in -C (translate to termcap) mode, the ncurses imple-
+        mentation of tic(1m) issues warning messages when the pre-
+-       tc  length  of  a termcap translation is too long.  The -c
+-       (check) option also checks resolved (after  tc  expansion)
++       tc length of a termcap translation is too  long.   The  -c
++       (check)  option  also checks resolved (after tc expansion)
+        lengths.
+ 
+ 
+

    Binary Compatibility

    +-       It  is not wise to count on portability of binary terminfo
+-       entries between commercial UNIX versions.  The problem  is
+-       that  there  are  at least two versions of terminfo (under
++       It is not wise to count on portability of binary  terminfo
++       entries  between commercial UNIX versions.  The problem is
++       that there are at least two versions  of  terminfo  (under
+        HP-UX and AIX) which diverged from System V terminfo after
+-       SVr1,  and have added extension capabilities to the string
+-       table that (in the binary format) collide  with  System  V
++       SVr1, and have added extension capabilities to the  string
++       table  that  (in  the binary format) collide with System V
+        and XSI Curses extensions.
+ 
+ 
+@@ -2442,66 +2444,66 @@
+        Searching for terminal descriptions in $HOME/.terminfo and
+        TERMINFO_DIRS is not supported by older implementations.
+ 
+-       Some SVr4 curses  implementations,  and  all  previous  to
+-       SVr4,  do not interpret the %A and %O operators in parame-
++       Some  SVr4  curses  implementations,  and  all previous to
++       SVr4, do not interpret the %A and %O operators in  parame-
+        ter strings.
+ 
+-       SVr4/XPG4 do not specify whether  msgr  licenses  movement
+-       while  in an alternate-character-set mode (such modes may,
+-       among other things, map CR and NL to  characters  that  do
+-       not  trigger  local  motions).  The ncurses implementation
+-       ignores msgr in ALTCHARSET mode.  This raises  the  possi-
+-       bility  that  an  XPG4  implementation making the opposite
+-       interpretation may need terminfo entries made for  ncurses
++       SVr4/XPG4  do  not  specify whether msgr licenses movement
++       while in an alternate-character-set mode (such modes  may,
++       among  other  things,  map CR and NL to characters that do
++       not trigger local motions).   The  ncurses  implementation
++       ignores  msgr  in ALTCHARSET mode.  This raises the possi-
++       bility that an XPG4  implementation  making  the  opposite
++       interpretation  may need terminfo entries made for ncurses
+        to have msgr turned off.
+ 
+-       The  ncurses  library handles insert-character and insert-
++       The ncurses library handles insert-character  and  insert-
+        character modes in a slightly non-standard way to get bet-
+-       ter  update  efficiency.   See the Insert/Delete Character
++       ter update efficiency.  See  the  Insert/Delete  Character
+        subsection above.
+ 
+-       The  parameter  substitutions  for  set_clock   and   dis-
+-       play_clock  are  not  documented in SVr4 or the XSI Curses
++       The   parameter   substitutions  for  set_clock  and  dis-
++       play_clock are not documented in SVr4 or  the  XSI  Curses
+        standard.  They are deduced from the documentation for the
+        AT&T 505 terminal.
+ 
+-       Be  careful  assigning  the kmous capability.  The ncurses
+-       wants to interpret it as KEY_MOUSE, for use  by  terminals
+-       and  emulators  like  xterm that can return mouse-tracking
++       Be careful assigning the kmous  capability.   The  ncurses
++       wants  to  interpret it as KEY_MOUSE, for use by terminals
++       and emulators like xterm that  can  return  mouse-tracking
+        information in the keyboard-input stream.
+ 
+        X/Open Curses does not mention italics.  Portable applica-
+-       tions  must  assume  that  numeric capabilities are signed
+-       16-bit values.  This  includes  the  no_color_video  (ncv)
+-       capability.   The  32768  mask value used for italics with
+-       ncv can be confused with an absent or cancelled  ncv.   If
+-       italics  should  work with colors, then the ncv value must
++       tions must assume that  numeric  capabilities  are  signed
++       16-bit  values.   This  includes  the no_color_video (ncv)
++       capability.  The 32768 mask value used  for  italics  with
++       ncv  can  be confused with an absent or cancelled ncv.  If
++       italics should work with colors, then the ncv  value  must
+        be specified, even if it is zero.
+ 
+-       Different commercial ports of terminfo and curses  support
+-       different  subsets of the XSI Curses standard and (in some
++       Different  commercial ports of terminfo and curses support
++       different subsets of the XSI Curses standard and (in  some
+        cases) different extension sets.  Here is a summary, accu-
+        rate as of October 1995:
+ 
+        SVR4, Solaris, ncurses -- These support all SVr4 capabili-
+        ties.
+ 
+-       SGI --  Supports  the  SVr4  set,  adds  one  undocumented
++       SGI  --  Supports  the  SVr4  set,  adds  one undocumented
+        extended string capability (set_pglen).
+ 
+-       SVr1,  Ultrix -- These support a restricted subset of ter-
+-       minfo capabilities.  The booleans end with  xon_xoff;  the
+-       numerics  with  width_status_line;  and  the  strings with
++       SVr1, Ultrix -- These support a restricted subset of  ter-
++       minfo  capabilities.   The booleans end with xon_xoff; the
++       numerics with  width_status_line;  and  the  strings  with
+        prtr_non.
+ 
+-       HP/UX -- Supports  the  SVr1  subset,  plus  the  SVr[234]
++       HP/UX  --  Supports  the  SVr1  subset,  plus the SVr[234]
+        numerics num_labels, label_height, label_width, plus func-
+-       tion keys 11 through 63,  plus  plab_norm,  label_on,  and
++       tion  keys  11  through  63, plus plab_norm, label_on, and
+        label_off, plus some incompatible extensions in the string
+        table.
+ 
+-       AIX -- Supports the SVr1 subset,  plus  function  keys  11
+-       through  63,  plus  a  number of incompatible string table
++       AIX  --  Supports  the  SVr1 subset, plus function keys 11
++       through 63, plus a number  of  incompatible  string  table
+        extensions.
+ 
+        OSF -- Supports both the SVr4 set and the AIX extensions.
+@@ -2518,7 +2520,7 @@
+ 
+ 
+

    AUTHORS

    +-       Zeyd M. Ben-Halim, Eric  S.  Raymond,  Thomas  E.  Dickey.
++       Zeyd  M.  Ben-Halim,  Eric  S.  Raymond, Thomas E. Dickey.
+        Based on pcurses by Pavel Curtis.
+ 
+ 
+Index: doc/html/man/tic.1m.html
+--- ncurses-6.0-20161231+/doc/html/man/tic.1m.html	2016-12-31 21:41:38.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/tic.1m.html	2017-01-07 20:05:43.000000000 +0000
+@@ -401,7 +401,7 @@
+        infocmp(1m),   captoinfo(1m),   infotocap(1m),    toe(1m),
+        curses(3x), term(5).  terminfo(5).
+ 
+-       This describes ncurses version 6.0 (patch 20161231).
++       This describes ncurses version 6.0 (patch 20170107).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/toe.1m.html
+--- ncurses-6.0-20161231+/doc/html/man/toe.1m.html	2016-12-31 21:41:38.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/toe.1m.html	2017-01-07 20:05:43.000000000 +0000
+@@ -117,7 +117,7 @@
+        tic(1m),   infocmp(1m),   captoinfo(1m),    infotocap(1m),
+        curses(3x), terminfo(5).
+ 
+-       This describes ncurses version 6.0 (patch 20161231).
++       This describes ncurses version 6.0 (patch 20170107).
+ 
+ 
+ 
+Index: doc/html/man/tput.1.html
+--- ncurses-6.0-20161231+/doc/html/man/tput.1.html	2016-12-31 21:41:38.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/tput.1.html	2017-01-07 23:09:13.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -107,7 +107,7 @@
+ 
+               Again, tput uses a table and the presence of param-
+               eters  in  its  input  to  decide  whether  to  use
+-              tparm(3x), and how to interpret the parameters.
++              tparm(3x), and how to interpret the parameters.
+ 
+        -V     reports the version of ncurses which  was  used  in
+               this program, and exits.
+@@ -126,7 +126,7 @@
+               Most  parameters  are numbers.  Only a few terminfo
+               capabilities require string parameters; tput uses a
+               table to decide which to pass as strings.  Normally
+-              tput uses tparm(3x) to  perform  the  substitution.
++              tput uses tparm(3x) to  perform  the  substitution.
+               If no parameters are given for the capability, tput
+               writes the string without performing the  substitu-
+               tion.
+@@ -135,30 +135,72 @@
+               for the user's terminal exists (see -Ttype, above),
+               the following will occur:
+ 
+-              (1)  if   present,  the  terminal's  initialization
+-                   strings will be output as detailed in the ter-
+-                   minfo(5) section on Tabs and Initialization,
++              (1)  first,  tput  retrieves  the  current terminal
++                   mode settings for your terminal.  It does this
++                   by successively testing
++
++                   o   the standard error,
++
++                   o   standard output,
++
++                   o   standard input and
++
++                   o   ultimately "/dev/tty"
+ 
+-              (2)  any  delays  (e.g.,  newline) specified in the
+-                   entry will be set in the tty driver,
++                   to obtain terminal settings.  Having retrieved
++                   these  settings,  tput  remembers  which  file
++                   descriptor to use when updating settings.
+ 
+-              (3)  tabs  expansion  will  be  turned  on  or  off
+-                   according  to  the specification in the entry,
+-                   and
++              (2)  if the window size cannot be obtained from the
++                   operating system, but the terminal description
++                   (or environment, e.g., LINES and COLUMNS vari-
++                   ables specify this), update the operating sys-
++                   tem's notion of the window size.
+ 
+-              (4)  if tabs are not expanded, standard  tabs  will
+-                   be set (every 8 spaces).
++              (3)  the terminal modes will be updated:
++
++                   o   any  delays  (e.g.,  newline) specified in
++                       the entry will be set in the tty driver,
++
++                   o   tabs expansion will be turned  on  or  off
++                       according  to  the  specification  in  the
++                       entry, and
++
++                   o   if tabs are not  expanded,  standard  tabs
++                       will be set (every 8 spaces).
++
++              (4)  if   present,  the  terminal's  initialization
++                   strings will be output as detailed in the ter-
++                   minfo(5) section on Tabs and Initialization,
++
++              (5)  output is flushed.
+ 
+               If an entry does not contain the information needed
+               for any of these  activities,  that  activity  will
+               silently be skipped.
+ 
+-       reset  Instead  of putting out initialization strings, the
+-              terminal's reset strings will be output if  present
+-              (rs1,  rs2, rs3, rf).  If the reset strings are not
+-              present, but initialization strings are,  the  ini-
+-              tialization  strings  will  be  output.  Otherwise,
+-              reset acts identically to init.
++       reset  This is similar to init, with two differences:
++
++              (1)  before  any other initialization, the terminal
++                   modes will be reset to a "sane" state:
++
++                   o   set cooked and echo modes,
++
++                   o   turn off cbreak and raw modes,
++
++                   o   turn on newline translation and
++
++                   o   reset  any  unset  special  characters  to
++                       their default values
++
++              (2)  Instead of putting out initialization strings,
++                   the terminal's reset strings will be output if
++                   present  (rs1,  rs2,  rs3,  rf).  If the reset
++                   strings are not  present,  but  initialization
++                   strings  are,  the initialization strings will
++                   be output.
++
++              Otherwise, reset acts identically to init.
+ 
+        longname
+               If the terminfo database is present  and  an  entry
+@@ -194,22 +236,39 @@
+            because of this  difference  with  resetting  terminal
+            modes and special characters.
+ 
++       With  the  changes made for ncurses 6.1, the reset feature
++       of the two programs is (mostly) the same.  A  few  differ-
++       ences remain:
++
++       o   The  tset  program waits one second when resetting, in
++           case it happens to be a hardware terminal.
++
++       o   The two programs  write  the  terminal  initialization
++           strings  to  different  streams  (i.e.,.  the standard
++           error for tset and the standard output for tput).
++
++           Note:  although  these  programs  write  to  different
++           streams,  redirecting their output to a file will cap-
++           ture only part of their actions.  The changes  to  the
++           terminal  modes  are  not  affected by redirecting the
++           output.
++
+        If tput is invoked by a link named init, this has the same
+-       effect as tput init.  Again, you are less  likely  to  use
+-       that  link  because  another program named init has a more
++       effect  as  tput  init.  Again, you are less likely to use
++       that link because another program named init  has  a  more
+        well-established use.
+ 
+ 
+

    EXAMPLES

    +        tput init
+             Initialize the terminal according to the type of ter-
+-            minal  in the environmental variable TERM.  This com-
+-            mand should be included in everyone's .profile  after
++            minal in the environmental variable TERM.  This  com-
++            mand  should be included in everyone's .profile after
+             the environmental variable TERM has been exported, as
+             illustrated on the profile(5) manual page.
+ 
+        tput -T5620 reset
+-            Reset an AT&T 5620 terminal, overriding the  type  of
++            Reset  an  AT&T 5620 terminal, overriding the type of
+             terminal in the environmental variable TERM.
+ 
+        tput cup 0 0
+@@ -230,16 +289,16 @@
+        bold=`tput smso` offbold=`tput rmso`
+             Set the shell variables bold, to begin stand-out mode
+             sequence, and offbold, to end standout mode sequence,
+-            for the current terminal.  This might be followed  by
+-            a  prompt:  echo  "${bold}Please  type  in your name:
++            for  the current terminal.  This might be followed by
++            a prompt: echo  "${bold}Please  type  in  your  name:
+             ${offbold}\c"
+ 
+        tput hc
+-            Set exit code to indicate if the current terminal  is
++            Set  exit code to indicate if the current terminal is
+             a hard copy terminal.
+ 
+        tput cup 23 4
+-            Send  the sequence to move the cursor to row 23, col-
++            Send the sequence to move the cursor to row 23,  col-
+             umn 4.
+ 
+        tput cup
+@@ -247,8 +306,8 @@
+             parameters substituted.
+ 
+        tput longname
+-            Print  the  long  name from the terminfo database for
+-            the type of terminal specified in  the  environmental
++            Print the long name from the  terminfo  database  for
++            the  type  of terminal specified in the environmental
+             variable TERM.
+ 
+             tput -S <<!
+@@ -257,10 +316,10 @@
+             > bold
+             > !
+ 
+-            This  example shows tput processing several capabili-
+-            ties in one invocation.  It clears the screen,  moves
+-            the  cursor  to  position  10,  10  and turns on bold
+-            (extra bright) mode.  The list is  terminated  by  an
++            This example shows tput processing several  capabili-
++            ties  in one invocation.  It clears the screen, moves
++            the cursor to position  10,  10  and  turns  on  bold
++            (extra  bright)  mode.   The list is terminated by an
+             exclamation mark (!) on a line by itself.
+ 
+ 
+@@ -270,44 +329,44 @@
+ 
+        /usr/share/tabset/*
+               tab settings for some terminals, in a format appro-
+-              priate  to  be  output  to  the  terminal   (escape
+-              sequences  that  set  margins  and  tabs); for more
+-              information, see the Tabs and Initialization,  sec-
++              priate   to  be  output  to  the  terminal  (escape
++              sequences that set  margins  and  tabs);  for  more
++              information,  see the Tabs and Initialization, sec-
+               tion of terminfo(5)
+ 
+ 
+

    EXIT CODES

    +        If the -S option is used, tput checks for errors from each
+-       line, and if any errors are found, will set the exit  code
+-       to  4  plus the number of lines with errors.  If no errors
+-       are found, the exit code is 0.   No  indication  of  which
++       line,  and if any errors are found, will set the exit code
++       to 4 plus the number of lines with errors.  If  no  errors
++       are  found,  the  exit  code is 0.  No indication of which
+        line failed can be given so exit code 1 will never appear.
+-       Exit codes 2, 3, and 4 retain their usual  interpretation.
++       Exit  codes 2, 3, and 4 retain their usual interpretation.
+        If the -S option is not used, the exit code depends on the
+        type of capname:
+ 
+           boolean
+                  a value of 0 is set for TRUE and 1 for FALSE.
+ 
+-          string a value of 0 is set if the  capname  is  defined
+-                 for  this terminal type (the value of capname is
+-                 returned on standard output); a value  of  1  is
+-                 set  if capname is not defined for this terminal
++          string a  value  of  0 is set if the capname is defined
++                 for this terminal type (the value of capname  is
++                 returned  on  standard  output); a value of 1 is
++                 set if capname is not defined for this  terminal
+                  type (nothing is written to standard output).
+ 
+           integer
+-                 a value of 0 is always set, whether or not  cap-
+-                 name  is  defined  for  this  terminal type.  To
+-                 determine if capname is defined for this  termi-
+-                 nal  type,  the user must test the value written
+-                 to standard output.  A value of  -1  means  that
++                 a  value of 0 is always set, whether or not cap-
++                 name is defined  for  this  terminal  type.   To
++                 determine  if capname is defined for this termi-
++                 nal type, the user must test the  value  written
++                 to  standard  output.   A value of -1 means that
+                  capname is not defined for this terminal type.
+ 
+-          other  reset  or init may fail to find their respective
+-                 files.  In that case, the exit code is set to  4
++          other  reset or init may fail to find their  respective
++                 files.   In that case, the exit code is set to 4
+                  + errno.
+ 
+-       Any  other  exit code indicates an error; see the DIAGNOS-
++       Any other exit code indicates an error; see  the  DIAGNOS-
+        TICS section.
+ 
+ 
+@@ -317,8 +376,8 @@
+ 
+        exit code   error message
+        ---------------------------------------------------------------------
+-       0           (capname  is a numeric variable that is not specified in
+-                   the terminfo(5) database for this  terminal  type,  e.g.
++       0           (capname is a numeric variable that is not specified  in
++                   the  terminfo(5)  database  for this terminal type, e.g.
+                    tput -T450 lines and tput -T2621 xmc)
+        1           no error message is printed, see the EXIT CODES section.
+        2           usage error
+@@ -329,119 +388,119 @@
+ 
+ 
+

    HISTORY

    +-       The  tput command was begun by Bill Joy in 1980.  The ini-
++       The tput command was begun by Bill Joy in 1980.  The  ini-
+        tial version only cleared the screen.
+ 
+-       AT&T System V provided a  different  tput  command,  whose
+-       init  and  reset  subcommands (more than half the program)
++       AT&T  System  V  provided  a different tput command, whose
++       init and reset  subcommands (more than half  the  program)
+        were incorporated from the reset feature of BSD tset writ-
+-       ten  by  Eric Allman.  Later the corresponding source code
+-       for reset was removed from the BSD  tset  (in  June  1993,
++       ten by Eric Allman.  Later the corresponding  source  code
++       for  reset  was  removed  from the BSD tset (in June 1993,
+        released in 4.4BSD-Lite a year later).
+ 
+-       Keith  Bostic replaced the BSD tput command in 1989 with a
+-       new implementation based on  the  AT&T  System  V  program
+-       tput.   Like  the  AT&T program, Bostic's version accepted
+-       some parameters named for  terminfo  capabilities  (clear,
+-       init,  longname  and reset).  However (because he had only
+-       termcap available), it accepted termcap  names  for  other
+-       capabilities.   Also, Bostic's BSD tput did not modify the
++       Keith Bostic replaced the BSD tput command in 1989 with  a
++       new  implementation  based  on  the  AT&T System V program
++       tput.  Like the AT&T program,  Bostic's  version  accepted
++       some  parameters  named  for terminfo capabilities (clear,
++       init, longname and reset).  However (because he  had  only
++       termcap  available),  it  accepted termcap names for other
++       capabilities.  Also, Bostic's BSD tput did not modify  the
+        terminal I/O modes as the earlier BSD tset had done.
+ 
+-       At the same  time,  Bostic  added  a  shell  script  named
++       At  the  same  time,  Bostic  added  a  shell script named
+        "clear", which used tput to clear the screen.
+ 
+-       Both  of  these  appeared in 4.4BSD, becoming the "modern"
++       Both of these appeared in 4.4BSD,  becoming  the  "modern"
+        BSD implementation of tput.
+ 
+ 
+

    PORTABILITY

    +-       This implementation of tput differs from AT&T tput in  two
++       This  implementation of tput differs from AT&T tput in two
+        important areas:
+ 
+        o   tput capname writes to the standard output.  That need
+-           not be a regular terminal.  However,  the  subcommands
+-           which  manipulate terminal modes may not use the stan-
++           not  be  a regular terminal.  However, the subcommands
++           which manipulate terminal modes may not use the  stan-
+            dard output.
+ 
+-           The AT&T implementation's init and reset commands  use
++           The  AT&T implementation's init and reset commands use
+            the BSD (4.1c) tset source, which manipulates terminal
+-           modes.  It successively tries standard  output,  stan-
+-           dard  error,  standard  input  before  falling back to
++           modes.   It  successively tries standard output, stan-
++           dard error, standard  input  before  falling  back  to
+            "/dev/tty" and finally just assumes a 1200Bd terminal.
+            When updating terminal modes, it ignores errors.
+ 
+-           Until  changes  made  after  ncurses 6.0, tput did not
++           Until changes made after ncurses  6.0,  tput  did  not
+            modify  terminal  modes.   tput  now  uses  a  similar
+-           scheme,  using  functions  shared with tset (and ulti-
+-           mately based on the 4.4BSD tset).  If it is  not  able
+-           to  open  a terminal, e.g., when running in cron, tput
++           scheme, using functions shared with  tset  (and  ulti-
++           mately  based  on the 4.4BSD tset).  If it is not able
++           to open a terminal, e.g., when running in  cron,  tput
+            will return an error.
+ 
+-       o   AT&T tput guesses the type of its capname operands  by
++       o   AT&T  tput guesses the type of its capname operands by
+            seeing if all of the characters are numeric, or not.
+ 
+            Most implementations which provide support for capname
+-           operands use the tparm function to  expand  parameters
++           operands  use  the tparm function to expand parameters
+            in it.  That function expects a mixture of numeric and
+-           string parameters, requiring tput to know  which  type
++           string  parameters,  requiring tput to know which type
+            to use.
+ 
+-           This  implementation  uses  a  table  to determine the
++           This implementation uses  a  table  to  determine  the
+            parameter types for the standard capname operands, and
+-           an  internal  library  function to analyze nonstandard
++           an internal library function  to  analyze  nonstandard
+            capname operands.
+ 
+-       The longname and -S options, and  the  parameter-substitu-
+-       tion  features used in the cup example, were not supported
+-       in BSD curses before 4.3reno (1989) or in AT&T/USL  curses
++       The  longname  and -S options, and the parameter-substitu-
++       tion features used in the cup example, were not  supported
++       in  BSD curses before 4.3reno (1989) or in AT&T/USL curses
+        before SVr4 (1988).
+ 
+-       IEEE  Std 1003.1/The Open Group  Base Specifications Issue
+-       7 (POSIX.1-2008) documents only the  operands  for  clear,
+-       init  and reset.  There are a few interesting observations
++       IEEE Std 1003.1/The Open Group  Base Specifications  Issue
++       7  (POSIX.1-2008)  documents  only the operands for clear,
++       init and reset.  There are a few interesting  observations
+        to make regarding that:
+ 
+-       o   In this implementation, clear is part of  the  capname
++       o   In  this  implementation, clear is part of the capname
+            support.  The others (init and longname) do not corre-
+            spond to terminal capabilities.
+ 
+-       o   Other implementations of tput  on  SVr4-based  systems
+-           such  as  Solaris,  IRIX64  and HPUX as well as others
+-           such as AIX and Tru64 provide support for capname  op-
++       o   Other  implementations  of  tput on SVr4-based systems
++           such as Solaris, IRIX64 and HPUX  as  well  as  others
++           such  as AIX and Tru64 provide support for capname op-
+            erands.
+ 
+-       o   A  few  platforms  such  as  FreeBSD recognize termcap
+-           names rather than terminfo capability names  in  their
+-           respective  tput  commands.  Since 2010, NetBSD's tput
+-           uses terminfo names.  Before that, it  (like  FreeBSD)
++       o   A few platforms  such  as  FreeBSD  recognize  termcap
++           names  rather  than terminfo capability names in their
++           respective tput commands.  Since 2010,  NetBSD's  tput
++           uses  terminfo  names.  Before that, it (like FreeBSD)
+            recognized termcap names.
+ 
+-       Because  (apparently)  all  of  the certified Unix systems
+-       support the full set of capability  names,  the  reasoning
++       Because (apparently) all of  the  certified  Unix  systems
++       support  the  full  set of capability names, the reasoning
+        for documenting only a few may not be apparent.
+ 
+        o   X/Open Curses Issue 7 documents tput differently, with
+-           capname and the other features used in this  implemen-
++           capname  and the other features used in this implemen-
+            tation.
+ 
+-       o   That  is,  there  are two standards for tput: POSIX (a
+-           subset) and X/Open Curses (the  full  implementation).
+-           POSIX  documents a subset to avoid the complication of
+-           including X/Open Curses and the terminal  capabilities
++       o   That is, there are two standards for  tput:  POSIX  (a
++           subset)  and  X/Open Curses (the full implementation).
++           POSIX documents a subset to avoid the complication  of
++           including  X/Open Curses and the terminal capabilities
+            database.
+ 
+        o   While it is certainly possible to write a tput program
+            without using curses, none of the systems which have a
+-           curses  implementation  provide  a  tput utility which
++           curses implementation provide  a  tput  utility  which
+            does not provide the capname feature.
+ 
+ 
+

    SEE ALSO

    +-       clear(1),   stty(1),   tabs(1),   tset(1),    terminfo(5),
++       clear(1),    stty(1),   tabs(1),   tset(1),   terminfo(5),
+        curs_termcap(3x).
+ 
+-       This describes ncurses version 6.0 (patch 20161231).
++       This describes ncurses version 6.0 (patch 20170107).
+ 
+ 
+ 
+Index: doc/html/man/tset.1.html
+--- ncurses-6.0-20161231+/doc/html/man/tset.1.html	2016-12-31 21:41:38.000000000 +0000
++++ ncurses-6.0-20170107/doc/html/man/tset.1.html	2017-01-07 23:09:13.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -99,35 +99,66 @@
+        ("?"), the user is prompted for confirmation of the termi-
+        nal  type.   An  empty  response  confirms  the  type, or,
+        another type can be entered to specify a new  type.   Once
+-       the  terminal type has been determined, the terminfo entry
+-       for the terminal is retrieved.  If no  terminfo  entry  is
+-       found  for the type, the user is prompted for another ter-
+-       minal type.
+-
+-       Once the terminfo entry is  retrieved,  the  window  size,
+-       backspace,  interrupt and line kill characters (among many
+-       other things) are set and the terminal and tab initializa-
+-       tion  strings  are  sent  to  the  standard  error output.
+-       Finally, if the erase, interrupt and line kill  characters
+-       have  changed,  or  are  not  set to their default values,
+-       their values are displayed to the standard error output.
++       the  terminal  type  has  been  determined,  the  terminal
++       description for the terminal is retrieved.  If no terminal
++       description  is  found  for the type, the user is prompted
++       for another terminal type.
++
++       Once the terminal description is retrieved,
++
++       o   if the "-w" option is enabled,  tset  may  update  the
++           terminal's window size.
++
++           If the window size cannot be obtained from the operat-
++           ing system, but the terminal description (or  environ-
++           ment, e.g., LINES and COLUMNS variables specify this),
++           use this to set the operating system's notion  of  the
++           window size.
++
++       o   if  the  "-c" option is enabled, the backspace, inter-
++           rupt  and  line  kill  characters  (among  many  other
++           things) are set
++
++       o   unless  the  "-I"  option is enabled, the terminal and
++           tab initialization strings are sent  to  the  standard
++           error  output,  and  tset  waits one second (in case a
++           hardware reset was issued).
++
++       o   Finally, if the erase, interrupt and line kill charac-
++           ters  have  changed,  or  are not set to their default
++           values, their values are  displayed  to  the  standard
++           error output.
+ 
+ 
+

    reset - reinitialization

    +-       When invoked as reset, tset sets cooked  and  echo  modes,
+-       turns  off cbreak and raw modes, turns on newline transla-
+-       tion and resets any  unset  special  characters  to  their
+-       default  values  before  doing the terminal initialization
+-       described above.  This is  useful  after  a  program  dies
+-       leaving  a  terminal  in an abnormal state.  Note, you may
+-       have to type
+-
+-           <LF>reset<LF>
+-
+-       (the line-feed character is normally control-J) to get the
+-       terminal to work, as carriage-return may no longer work in
+-       the abnormal state.  Also, the  terminal  will  often  not
+-       echo the command.
++       When  invoked  as  reset,  tset sets the terminal modes to
++       "sane" values:
++
++       o   sets cooked and echo modes,
++
++       o   turns off cbreak and raw modes,
++
++       o   turns on newline translation and
++
++       o   resets any unset special characters to  their  default
++           values
++
++       before  doing the terminal initialization described above.
++       Also,  rather  than  using  the  terminal   initialization
++       strings, it uses the terminal reset strings.
++
++       The reset command is useful after a program dies leaving a
++       terminal in an abnormal state:
++
++       o   you may have to type
++
++               <LF>reset<LF>
++
++           (the line-feed character is normally control-J) to get
++           the terminal to work, as carriage-return may no longer
++           work in the abnormal state.
++
++       o   Also, the terminal will often not echo the command.
+ 
+ 
+

    OPTIONS

    +@@ -144,51 +175,51 @@
+ 
+        -k   Set the line kill character to ch.
+ 
+-       -m   Specify a mapping from a port  type  to  a  terminal.
++       -m   Specify  a  mapping  from  a port type to a terminal.
+             See the section TERMINAL TYPE MAPPING for more infor-
+             mation.
+ 
+-       -Q   Do not display any values for  the  erase,  interrupt
++       -Q   Do  not  display  any values for the erase, interrupt
+             and line kill characters.  Normally tset displays the
+-            values for control characters which differ  from  the
++            values  for  control characters which differ from the
+             system's default values.
+ 
+-       -q   The  terminal  type is displayed to the standard out-
+-            put, and the terminal is not initialized in any  way.
++       -q   The terminal type is displayed to the  standard  out-
++            put,  and the terminal is not initialized in any way.
+             The option "-" by itself is equivalent but archaic.
+ 
+        -r   Print the terminal type to the standard error output.
+ 
+-       -s   Print  the  sequence  of shell commands to initialize
++       -s   Print the sequence of shell  commands  to  initialize
+             the environment variable TERM to the standard output.
+             See the section SETTING THE ENVIRONMENT for details.
+ 
+        -V   reports the version of ncurses which was used in this
+             program, and exits.
+ 
+-       -w   Resize the window  to  match  the  size  deduced  via
+-            setupterm.   Normally  this  has  no  effect,  unless
++       -w   Resize  the  window  to  match  the  size deduced via
++            setupterm(3x).  Normally this has no  effect,  unless
+             setupterm is not able to detect the window size.
+ 
+        The arguments for the -e, -i, and -k options may either be
+-       entered  as  actual characters or by using the "hat" nota-
++       entered as actual characters or by using the  "hat"  nota-
+        tion, i.e., control-h may be specified as "^H" or "^h".
+ 
+        If neither -c or -w is given, both options are assumed.
+ 
+ 
+

    SETTING THE ENVIRONMENT

    +-       It is often desirable  to  enter  the  terminal  type  and
+-       information  about  the  terminal's  capabilities into the
++       It  is  often  desirable  to  enter  the terminal type and
++       information about the  terminal's  capabilities  into  the
+        shell's environment.  This is done using the -s option.
+ 
+        When the -s option is specified, the commands to enter the
+-       information  into  the  shell's environment are written to
+-       the standard output.  If the SHELL environmental  variable
+-       ends  in  "csh", the commands are for csh, otherwise, they
+-       are for sh.  Note, the csh  commands  set  and  unset  the
+-       shell  variable  noglob,  leaving it unset.  The following
+-       line in the .login or .profile files will  initialize  the
++       information into the shell's environment  are  written  to
++       the  standard output.  If the SHELL environmental variable
++       ends in "csh", the commands are for csh,  otherwise,  they
++       are  for  sh.   Note,  the  csh commands set and unset the
++       shell variable noglob, leaving it  unset.   The  following
++       line  in  the .login or .profile files will initialize the
+        environment correctly:
+ 
+            eval `tset -s options ... `
+@@ -197,74 +228,75 @@
+

    TERMINAL TYPE MAPPING

    +        When the terminal is not hardwired into the system (or the
+        current system information is incorrect) the terminal type
+-       derived  from the /etc/ttys file or the TERM environmental
+-       variable is often something generic like network,  dialup,
+-       or  unknown.   When tset is used in a startup script it is
+-       often desirable to provide information about the  type  of
++       derived from the /etc/ttys file or the TERM  environmental
++       variable  is often something generic like network, dialup,
++       or unknown.  When tset is used in a startup script  it  is
++       often  desirable  to provide information about the type of
+        terminal used on such ports.
+ 
+-       The  -m options maps from some set of conditions to a ter-
+-       minal type, that is, to tell tset "If I'm on this port  at
+-       a  particular speed, guess that I'm on that kind of termi-
++       The -m options maps from some set of conditions to a  ter-
++       minal  type, that is, to tell tset "If I'm on this port at
++       a particular speed, guess that I'm on that kind of  termi-
+        nal".
+ 
+        The argument to the -m option consists of an optional port
+        type, an optional operator, an optional baud rate specifi-
+-       cation, an optional colon (":") character and  a  terminal
+-       type.   The port type is a string (delimited by either the
++       cation,  an  optional colon (":") character and a terminal
++       type.  The port type is a string (delimited by either  the
+        operator or the colon character).  The operator may be any
+-       combination  of  ">", "<", "@", and "!"; ">" means greater
+-       than, "<" means less than, "@"  means  equal  to  and  "!"
++       combination of ">", "<", "@", and "!"; ">"  means  greater
++       than,  "<"  means  less  than,  "@" means equal to and "!"
+        inverts the sense of the test.  The baud rate is specified
+        as a number and is compared with the speed of the standard
+-       error  output (which should be the control terminal).  The
++       error output (which should be the control terminal).   The
+        terminal type is a string.
+ 
+        If the terminal type is not specified on the command line,
+-       the  -m mappings are applied to the terminal type.  If the
+-       port type and baud rate match the  mapping,  the  terminal
+-       type  specified  in the mapping replaces the current type.
+-       If more than one mapping is specified, the first  applica-
++       the -m mappings are applied to the terminal type.  If  the
++       port  type  and  baud rate match the mapping, the terminal
++       type specified in the mapping replaces the  current  type.
++       If  more than one mapping is specified, the first applica-
+        ble mapping is used.
+ 
+-       For    example,    consider    the    following   mapping:
++       For   example,    consider    the    following    mapping:
+        dialup>9600:vt100.  The port type is dialup , the operator
+-       is  >, the baud rate specification is 9600, and the termi-
++       is >, the baud rate specification is 9600, and the  termi-
+        nal type is vt100.  The result of this mapping is to spec-
+        ify that if the terminal type is dialup, and the baud rate
+-       is greater than 9600 baud, a terminal type of  vt100  will
++       is  greater  than 9600 baud, a terminal type of vt100 will
+        be used.
+ 
+        If no baud rate is specified, the terminal type will match
+        any baud rate.  If no port type is specified, the terminal
+-       type   will   match   any  port  type.   For  example,  -m
++       type  will  match  any  port  type.    For   example,   -m
+        dialup:vt100  -m  :?xterm  will  cause  any  dialup  port,
+        regardless of baud rate, to match the terminal type vt100,
+-       and any non-dialup port type to match  the  terminal  type
+-       ?xterm.   Note,  because of the leading question mark, the
+-       user will be queried on a default port as to whether  they
++       and  any  non-dialup  port type to match the terminal type
++       ?xterm.  Note, because of the leading question  mark,  the
++       user  will be queried on a default port as to whether they
+        are actually using an xterm terminal.
+ 
+-       No  whitespace  characters  are permitted in the -m option
+-       argument.  Also, to avoid problems  with  meta-characters,
+-       it  is  suggested  that  the  entire -m option argument be
+-       placed within single quote characters, and that csh  users
+-       insert  a backslash character ("\") before any exclamation
++       No whitespace characters are permitted in  the  -m  option
++       argument.   Also,  to avoid problems with meta-characters,
++       it is suggested that the  entire  -m  option  argument  be
++       placed  within single quote characters, and that csh users
++       insert a backslash character ("\") before any  exclamation
+        marks ("!").
+ 
+ 
+

    HISTORY

    +-       A reset command appeared in 2BSD (1979), written  by  Kurt
++       A  reset  command appeared in 2BSD (1979), written by Kurt
+        Shoens.
+ 
+-       A  separate tset command was provided in 2BSD by Eric All-
+-       man.  While the oldest published source (from  1979)  pro-
+-       vides  both programs, Allman's comments in the 2BSD source
++       A separate tset command was provided in 2BSD by Eric  All-
++       man.   While  the oldest published source (from 1979) pro-
++       vides both programs, Allman's comments in the 2BSD  source
+        code indicate that he began work in October 1977, continu-
+        ing development over the next few years.
+ 
+-       In  1980,  Eric  Allman modified tset to provide a "reset"
+-       feature when the program was invoked as reset.
++       In September 1980, Eric Allman modified tset to provide  a
++       "reset"  feature  when  the  program was invoked as reset.
++       This version appeared in 4.1cBSD, late in 1982.
+ 
+        The ncurses implementation was lightly  adapted  from  the
+        4.4BSD  sources for a terminfo environment by Eric S. Ray-
+@@ -387,7 +419,7 @@
+        csh(1),   sh(1),   stty(1),   curs_terminfo(3x),   tty(4),
+        terminfo(5), ttys(5), environ(7)
+ 
+-       This describes ncurses version 6.0 (patch 20161231).
++       This describes ncurses version 6.0 (patch 20170107).
+ 
+ 
+ 
+Index: man/curs_add_wch.3x
+Prereq:  1.16 
+--- ncurses-6.0-20161231+/man/curs_add_wch.3x	2015-07-20 23:44:56.000000000 +0000
++++ ncurses-6.0-20170107/man/curs_add_wch.3x	2017-01-07 19:25:15.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 2001-2012,2015 Free Software Foundation, Inc.              *
++.\" Copyright (c) 2001-2015,2017 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_add_wch.3x,v 1.16 2015/07/20 23:44:56 tom Exp $
++.\" $Id: curs_add_wch.3x,v 1.17 2017/01/07 19:25:15 tom Exp $
+ .TH curs_add_wch 3X ""
+ .de bP
+ .IP \(bu 4
+@@ -90,7 +90,7 @@
+ function is functionally equivalent to a call to
+ \fBadd_wch\fP
+ followed by a call to
+-\fBrefresh\fP.
++\fBrefresh\fP(3X).
+ Similarly, the
+ \fBwecho_wchar\fP
+ is functionally equivalent to a call to
+Index: man/curs_addch.3x
+Prereq:  1.37 
+--- ncurses-6.0-20161231+/man/curs_addch.3x	2015-09-05 21:13:25.000000000 +0000
++++ ncurses-6.0-20170107/man/curs_addch.3x	2017-01-07 19:25:15.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2015,2017 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addch.3x,v 1.37 2015/09/05 21:13:25 tom Exp $
++.\" $Id: curs_addch.3x,v 1.38 2017/01/07 19:25:15 tom Exp $
+ .TH curs_addch 3X ""
+ .de bP
+ .IP \(bu 4
+@@ -95,13 +95,13 @@
+ Video attributes can be combined with a character argument passed to
+ \fBaddch\fR or related functions by logical-ORing them into the character.
+ (Thus, text, including attributes, can be copied from one place to another
+-using \fBinch\fR and \fBaddch\fR.)  See the \fBcurs_attr\fR(3X) page for
++using \fBinch\fR(3X) and \fBaddch\fR.)  See the \fBcurs_attr\fR(3X) page for
+ values of predefined video attribute constants that can be usefully OR'ed
+ into characters.
+ .SS Echoing characters
+ .PP
+ The \fBechochar\fR and \fBwechochar\fR routines are equivalent to a call to
+-\fBaddch\fR followed by a call to \fBrefresh\fR, or a call to \fBwaddch\fR
++\fBaddch\fR followed by a call to \fBrefresh\fR(3X), or a call to \fBwaddch\fR
+ followed by a call to \fBwrefresh\fR.  The knowledge that only a single
+ character is being output is used and, for non-control characters, a
+ considerable performance gain may be seen by using these routines instead of
+Index: man/curs_attr.3x
+Prereq:  1.48 
+--- ncurses-6.0-20161231+/man/curs_attr.3x	2016-10-15 17:09:05.000000000 +0000
++++ ncurses-6.0-20170107/man/curs_attr.3x	2017-01-07 19:25:15.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_attr.3x,v 1.48 2016/10/15 17:09:05 tom Exp $
++.\" $Id: curs_attr.3x,v 1.49 2017/01/07 19:25:15 tom Exp $
+ .TH curs_attr 3X ""
+ .de bP
+ .IP \(bu 4
+@@ -186,7 +186,7 @@
+ .PP
+ In these functions,
+ the color \fIpair\fP argument is a color-pair index
+-(as in the first argument of \fIinit_pair\fR, see \fBcurs_color\fR(3X)).
++(as in the first argument of \fBinit_pair\fR, see \fBcurs_color\fR(3X)).
+ The \fBopts\fR argument is not
+ presently used, but is reserved for the future (leave it \fBNULL\fR).
+ .\" ---------------------------------------------------------------------------
+Index: man/curs_color.3x
+Prereq:  1.45 
+--- ncurses-6.0-20161231+/man/curs_color.3x	2016-10-15 17:10:19.000000000 +0000
++++ ncurses-6.0-20170107/man/curs_color.3x	2017-01-07 19:57:48.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_color.3x,v 1.45 2016/10/15 17:10:19 tom Exp $
++.\" $Id: curs_color.3x,v 1.46 2017/01/07 19:57:48 tom Exp $
+ .TH curs_color 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -323,7 +323,7 @@
+ returns an error if the color table cannot be allocated.
+ .RE
+ .SH NOTES
+-In the \fIncurses\fR implementation, there is a separate color activation flag,
++In the \fBncurses\fR implementation, there is a separate color activation flag,
+ color palette, color pairs table, and associated COLORS and COLOR_PAIRS counts
+ for each screen; the \fBstart_color\fR function only affects the current
+ screen.
+Index: man/curs_get_wstr.3x
+Prereq:  1.9 
+--- ncurses-6.0-20161231+/man/curs_get_wstr.3x	2012-11-03 23:03:59.000000000 +0000
++++ ncurses-6.0-20170107/man/curs_get_wstr.3x	2017-01-07 19:25:15.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 2002-2010,2012 Free Software Foundation, Inc.              *
++.\" Copyright (c) 2002-2012,2017 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_get_wstr.3x,v 1.9 2012/11/03 23:03:59 tom Exp $
++.\" $Id: curs_get_wstr.3x,v 1.10 2017/01/07 19:25:15 tom Exp $
+ .TH curs_get_wstr 3X ""
+ .na
+ .hy 0
+@@ -66,7 +66,7 @@
+ \fBget_wstr\fR
+ is as though a series of calls
+ to
+-\fBget_wch\fR
++\fBget_wch\fR(3X)
+ were made, until a newline, other end-of-line, or end-of-file condition is processed.
+ An end-of-file condition is represented by \fBWEOF\fR, as defined in \fB\fR.
+ The newline and end-of-line conditions are represented by the \fB\\n\fR \fBwchar_t\fR value.
+Index: man/curs_getstr.3x
+Prereq:  1.19 
+--- ncurses-6.0-20161231+/man/curs_getstr.3x	2010-12-04 18:36:44.000000000 +0000
++++ ncurses-6.0-20170107/man/curs_getstr.3x	2017-01-07 19:25:15.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2005,2010 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2010,2017 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_getstr.3x,v 1.19 2010/12/04 18:36:44 tom Exp $
++.\" $Id: curs_getstr.3x,v 1.20 2017/01/07 19:25:15 tom Exp $
+ .TH curs_getstr 3X ""
+ .na
+ .hy 0
+@@ -105,7 +105,7 @@
+ They read single-byte characters only.
+ The standard does not define any error conditions.
+ This implementation returns ERR if the window pointer is null,
+-or if the lower-level \fBwgetch\fR call returns an ERR.
++or if the lower-level \fBwgetch\fR(3X) call returns an ERR.
+ .PP
+ SVr3 and early SVr4 curses implementations did not reject function keys;
+ the SVr4.0 documentation claimed that "special keys" (such as function
+Index: man/curs_initscr.3x
+Prereq:  1.25 
+--- ncurses-6.0-20161231+/man/curs_initscr.3x	2016-10-15 17:02:31.000000000 +0000
++++ ncurses-6.0-20170107/man/curs_initscr.3x	2017-01-07 19:25:15.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_initscr.3x,v 1.25 2016/10/15 17:02:31 tom Exp $
++.\" $Id: curs_initscr.3x,v 1.26 2017/01/07 19:25:15 tom Exp $
+ .TH curs_initscr 3X ""
+ .de bP
+ .IP \(bu 4
+@@ -66,14 +66,14 @@
+ \fBinitscr\fR is normally the first \fBcurses\fR routine to call when
+ initializing a program.
+ A few special routines sometimes need to be called before it;
+-these are \fBslk_init\fR, \fBfilter\fR, \fBripoffline\fR,
++these are \fBslk_init\fR(3X), \fBfilter\fR, \fBripoffline\fR,
+ \fBuse_env\fR.
+ For multiple-terminal applications,
+ \fBnewterm\fR may be called before \fBinitscr\fR.
+ .PP
+ The initscr code determines the terminal type and initializes all \fBcurses\fR
+ data structures.
+-\fBinitscr\fR also causes the first call to \fBrefresh\fR to clear the screen.
++\fBinitscr\fR also causes the first call to \fBrefresh\fR(3X) to clear the screen.
+ If errors occur, \fBinitscr\fR writes an appropriate error
+ message to standard error and exits;
+ otherwise, a pointer is returned to \fBstdscr\fR.
+@@ -115,7 +115,7 @@
+ resets the terminal into
+ the proper non-visual mode.
+ .PP
+-Calling \fBrefresh\fR or \fBdoupdate\fR after a
++Calling \fBrefresh\fR(3X) or \fBdoupdate\fR after a
+ temporary escape causes the program to resume visual mode.
+ .SS isendwin
+ .PP
+Index: man/curs_inopts.3x
+Prereq:  1.23 
+--- ncurses-6.0-20161231+/man/curs_inopts.3x	2016-10-22 19:54:35.000000000 +0000
++++ ncurses-6.0-20170107/man/curs_inopts.3x	2017-01-07 19:25:15.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_inopts.3x,v 1.23 2016/10/22 19:54:35 tom Exp $
++.\" $Id: curs_inopts.3x,v 1.24 2017/01/07 19:25:15 tom Exp $
+ .TH curs_inopts 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -123,7 +123,7 @@
+ .SS echo/noecho
+ .PP
+ The \fBecho\fR and \fBnoecho\fR routines control whether characters typed by
+-the user are echoed by \fBgetch\fR as they are typed.
++the user are echoed by \fBgetch\fR(3X) as they are typed.
+ Echoing by the tty
+ driver is always disabled, but initially \fBgetch\fR is in echo mode, so
+ characters typed are echoed.
+@@ -163,7 +163,7 @@
+ The \fBkeypad\fR option enables the keypad of the user's terminal.
+ If
+ enabled (\fIbf\fR is \fBTRUE\fR), the user can press a function key
+-(such as an arrow key) and \fBwgetch\fR returns a single value
++(such as an arrow key) and \fBwgetch\fR(3X) returns a single value
+ representing the function key, as in \fBKEY_LEFT\fR.
+ If disabled
+ (\fIbf\fR is \fBFALSE\fR), \fBcurses\fR does not treat function keys
+@@ -171,7 +171,7 @@
+ itself.
+ If the keypad in the terminal can be turned on (made to
+ transmit) and off (made to work locally), turning on this option
+-causes the terminal keypad to be turned on when \fBwgetch\fR is
++causes the terminal keypad to be turned on when \fBwgetch\fR(3X) is
+ called.
+ The default value for keypad is \fBFALSE\fP.
+ .\"
+@@ -200,7 +200,7 @@
+ If disabled
+ (\fIbf\fR is \fBFALSE\fR), \fBgetch\fR waits until a key is pressed.
+ .PP
+-While interpreting an input escape sequence, \fBwgetch\fR sets a timer
++While interpreting an input escape sequence, \fBwgetch\fR(3X) sets a timer
+ while waiting for the next character.
+ If \fBnotimeout(\fR\fIwin\fR,
+ \fBTRUE\fR) is called, then \fBwgetch\fR does not set a timer.
+@@ -255,7 +255,7 @@
+ by looking for typeahead periodically while updating the screen.
+ If input is found, and it is coming from a tty,
+ the current update is postponed until
+-\fBrefresh\fR or \fBdoupdate\fR is called again.
++\fBrefresh\fR(3X) or \fBdoupdate\fR is called again.
+ This allows faster response to commands typed in advance.
+ Normally, the input FILE
+ pointer passed to \fBnewterm\fR, or \fBstdin\fR in the case that
+Index: man/curs_kernel.3x
+Prereq:  1.21 
+--- ncurses-6.0-20161231+/man/curs_kernel.3x	2016-10-15 16:42:55.000000000 +0000
++++ ncurses-6.0-20170107/man/curs_kernel.3x	2017-01-07 19:25:15.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.                        *
++.\" Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_kernel.3x,v 1.21 2016/10/15 16:42:55 tom Exp $
++.\" $Id: curs_kernel.3x,v 1.22 2017/01/07 19:25:15 tom Exp $
+ .de bP
+ .IP \(bu 4
+ ..
+@@ -88,7 +88,7 @@
+ .PP
+ The \fBreset_prog_mode\fR and \fBreset_shell_mode\fR routines restore
+ the terminal to "program" (in \fBcurses\fR) or "shell" (out of
+-\fBcurses\fR) state.  These are done automatically by \fBendwin\fR
++\fBcurses\fR) state.  These are done automatically by \fBendwin\fR(3X)
+ and, after an \fBendwin\fR, by \fBdoupdate\fR, so they normally are
+ not called.
+ .SS resetty, savetty
+Index: man/curs_memleaks.3x
+Prereq:  1.3 
+--- ncurses-6.0-20161231+/man/curs_memleaks.3x	2010-12-04 18:40:45.000000000 +0000
++++ ncurses-6.0-20170107/man/curs_memleaks.3x	2017-01-07 19:25:15.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 2008,2010 Free Software Foundation, Inc.                   *
++.\" Copyright (c) 2008-2010,2017 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_memleaks.3x,v 1.3 2010/12/04 18:40:45 tom Exp $
++.\" $Id: curs_memleaks.3x,v 1.4 2017/01/07 19:25:15 tom Exp $
+ .TH curs_memleaks 3X ""
+ .na
+ .hy 0
+@@ -50,7 +50,7 @@
+ .PP
+ Any implementation of curses must not free the memory associated with
+ a screen, since (even after calling \fBendwin\fP), it must be available
+-for use in the next call to \fBrefresh\fP.
++for use in the next call to \fBrefresh\fP(3X).
+ There are also chunks of memory held for performance reasons.
+ That makes it hard to analyze curses applications for memory leaks.
+ To work around this, one can build a debugging version of the ncurses
+Index: man/curs_mouse.3x
+Prereq:  1.42 
+--- ncurses-6.0-20161231+/man/curs_mouse.3x	2015-07-21 09:27:39.000000000 +0000
++++ ncurses-6.0-20170107/man/curs_mouse.3x	2017-01-07 19:25:15.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2015,2017 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_mouse.3x,v 1.42 2015/07/21 09:27:39 tom Exp $
++.\" $Id: curs_mouse.3x,v 1.43 2017/01/07 19:25:15 tom Exp $
+ .de bP
+ .IP \(bu 4
+ ..
+@@ -77,7 +77,7 @@
+ These functions provide an interface to mouse events from
+ \fBncurses\fR(3X).
+ Mouse events are represented by \fBKEY_MOUSE\fR
+-pseudo-key values in the \fBwgetch\fR input stream.
++pseudo-key values in the \fBwgetch\fR(3X) input stream.
+ .SS mousemask
+ .PP
+ To make mouse events visible, use the \fBmousemask\fR function.
+@@ -177,7 +177,7 @@
+ The resulting stdscr-relative coordinates are not always identical
+ to window-relative coordinates due to the mechanism to reserve lines on top
+ or bottom of the screen for other purposes
+-(see the \fBripoffline\fP and \fBslk_init\fR calls, for example).
++(see the \fBripoffline\fP and \fBslk_init\fR(3X) calls, for example).
+ .bP
+ If the parameter \fBto_screen\fR is \fBTRUE\fR, the pointers
+ \fBpY, pX\fR must reference the coordinates of a location
+Index: man/curs_move.3x
+Prereq:  1.14 
+--- ncurses-6.0-20161231+/man/curs_move.3x	2010-12-04 18:40:45.000000000 +0000
++++ ncurses-6.0-20170107/man/curs_move.3x	2017-01-07 19:25:15.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2010,2017 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_move.3x,v 1.14 2010/12/04 18:40:45 tom Exp $
++.\" $Id: curs_move.3x,v 1.15 2017/01/07 19:25:15 tom Exp $
+ .TH curs_move 3X ""
+ .na
+ .hy 0
+@@ -45,7 +45,7 @@
+ .SH DESCRIPTION
+ These routines move the cursor associated with the window to line \fIy\fR and
+ column \fIx\fR.  This routine does not move the physical cursor of the terminal
+-until \fBrefresh\fR is called.  The position specified is relative to the upper
++until \fBrefresh\fR(3X) is called.  The position specified is relative to the upper
+ left-hand corner of the window, which is (0,0).
+ .SH RETURN VALUE
+ These routines return \fBERR\fR upon failure and OK (SVr4
+Index: man/curs_outopts.3x
+Prereq:  1.27 
+--- ncurses-6.0-20161231+/man/curs_outopts.3x	2016-10-15 17:02:31.000000000 +0000
++++ ncurses-6.0-20170107/man/curs_outopts.3x	2017-01-07 19:25:15.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_outopts.3x,v 1.27 2016/10/15 17:02:31 tom Exp $
++.\" $Id: curs_outopts.3x,v 1.28 2017/01/07 19:25:15 tom Exp $
+ .TH curs_outopts 3X ""
+ .na
+ .hy 0
+@@ -70,7 +70,7 @@
+ These routines set options that change the style of output within
+ \fBcurses\fR.
+ All options are initially \fBFALSE\fR, unless otherwise stated.
+-It is not necessary to turn these options off before calling \fBendwin\fR.
++It is not necessary to turn these options off before calling \fBendwin\fR(3X).
+ .SS clearok
+ .PP
+ If \fBclearok\fR is called with \fBTRUE\fR as argument, the next
+Index: man/curs_pad.3x
+Prereq:  1.18 
+--- ncurses-6.0-20161231+/man/curs_pad.3x	2015-07-21 08:58:44.000000000 +0000
++++ ncurses-6.0-20170107/man/curs_pad.3x	2017-01-07 19:25:15.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2015,2017 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_pad.3x,v 1.18 2015/07/21 08:58:44 tom Exp $
++.\" $Id: curs_pad.3x,v 1.19 2017/01/07 19:25:15 tom Exp $
+ .TH curs_pad 3X ""
+ .na
+ .hy 0
+@@ -110,7 +110,7 @@
+ .SS pechochar
+ .PP
+ The \fBpechochar\fR routine is functionally equivalent to a call to \fBaddch\fR
+-followed by a call to \fBrefresh\fR, a call to \fBwaddch\fR followed by a call
++followed by a call to \fBrefresh\fR(3X), a call to \fBwaddch\fR followed by a call
+ to \fBwrefresh\fR, or a call to \fBwaddch\fR followed by a call to
+ \fBprefresh\fR.
+ The knowledge that only a single character is being output is
+Index: man/curs_print.3x
+Prereq:  1.10 
+--- ncurses-6.0-20161231+/man/curs_print.3x	2010-12-04 18:40:45.000000000 +0000
++++ ncurses-6.0-20170107/man/curs_print.3x	2017-01-07 17:33:15.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2010,2017 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_print.3x,v 1.10 2010/12/04 18:40:45 tom Exp $
++.\" $Id: curs_print.3x,v 1.11 2017/01/07 17:33:15 tom Exp $
+ .TH curs_print 3X ""
+ .SH NAME
+ \fBmcprint\fR \- ship binary data to printer
+@@ -65,4 +65,4 @@
+ Padding in the \fBmc5p\fR, \fBmc4\fR and \fBmc5\fR capabilities will not be
+ interpreted.
+ .SH SEE ALSO
+-\fBcurses\fR(3X)\fR
++\fBcurses\fR(3X)
+Index: man/curs_printw.3x
+Prereq:  1.20 
+--- ncurses-6.0-20161231+/man/curs_printw.3x	2010-12-04 18:40:45.000000000 +0000
++++ ncurses-6.0-20170107/man/curs_printw.3x	2017-01-07 17:33:45.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2010,2017 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_printw.3x,v 1.20 2010/12/04 18:40:45 tom Exp $
++.\" $Id: curs_printw.3x,v 1.21 2017/01/07 17:33:45 tom Exp $
+ .TH curs_printw 3X ""
+ .na
+ .hy 0
+@@ -89,4 +89,4 @@
+ This implementation uses \fB\fR for both, because that header
+ is included in \fB.
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBprintf\fR(3), \fBvprintf(3)\fR
++\fBcurses\fR(3X), \fBprintf\fR(3), \fBvprintf\fR(3).
+Index: man/curs_scr_dump.3x
+Prereq:  1.9 
+--- ncurses-6.0-20161231+/man/curs_scr_dump.3x	2010-12-04 18:40:45.000000000 +0000
++++ ncurses-6.0-20170107/man/curs_scr_dump.3x	2017-01-07 19:25:15.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2010,2017 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_scr_dump.3x,v 1.9 2010/12/04 18:40:45 tom Exp $
++.\" $Id: curs_scr_dump.3x,v 1.10 2017/01/07 19:25:15 tom Exp $
+ .TH curs_scr_dump 3X ""
+ .na
+ .hy 0
+@@ -64,7 +64,7 @@
+ than clearing the screen and starting from scratch.  \fBscr_init\fR is used
+ after \fBinitscr\fR or a \fBsystem\fR call to share
+ the screen with another process which has done a \fBscr_dump\fR after its
+-\fBendwin\fR call.  The data is declared invalid if the terminfo capabilities
++\fBendwin\fR(3X) call.  The data is declared invalid if the terminfo capabilities
+ \fBrmcup\fR and \fBnrrmc\fR exist; also if the terminal has been written to
+ since the preceding \fBscr_dump\fR call.
+ .PP
+Index: man/curs_termcap.3x
+Prereq:  1.32 
+--- ncurses-6.0-20161231+/man/curs_termcap.3x	2016-03-19 22:52:25.000000000 +0000
++++ ncurses-6.0-20170107/man/curs_termcap.3x	2017-01-07 19:25:15.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_termcap.3x,v 1.32 2016/03/19 22:52:25 tom Exp $
++.\" $Id: curs_termcap.3x,v 1.33 2017/01/07 19:25:15 tom Exp $
+ .TH curs_termcap 3X ""
+ .de bP
+ .IP \(bu 4
+@@ -165,7 +165,7 @@
+ In that case, the first parameter is merely a placeholder.
+ .bP
+ Normally the ncurses library is compiled with terminfo support.
+-In that case, \fBtgoto\fP uses \fBtparm\fP (a more capable formatter).
++In that case, \fBtgoto\fP uses \fBtparm\fP(3X) (a more capable formatter).
+ .PP
+ The \fBtputs\fR routine is described on the \fBcurs_terminfo\fR(3X) manual
+ page.  It can retrieve capabilities by either termcap or terminfo name.
+Index: man/curs_trace.3x
+Prereq:  1.16 
+--- ncurses-6.0-20161231+/man/curs_trace.3x	2016-12-03 23:53:23.000000000 +0000
++++ ncurses-6.0-20170107/man/curs_trace.3x	2017-01-07 18:45:42.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 2000-2015,2016 Free Software Foundation, Inc.              *
++.\" Copyright (c) 2000-2016,2017 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_trace.3x,v 1.16 2016/12/03 23:53:23 tom Exp $
++.\" $Id: curs_trace.3x,v 1.17 2017/01/07 18:45:42 tom Exp $
+ .de bP
+ .IP \(bu 4
+ ..
+@@ -119,7 +119,7 @@
+ trace user and system times of updates.
+ .TP 5
+ .B TRACE_TPUTS
+-trace \fBtputs\fP calls.
++trace \fBtputs\fP(3X) calls.
+ .TP 5
+ .B TRACE_UPDATE
+ trace update actions, old & new screens.
+Index: man/curs_util.3x
+Prereq:  1.43 
+--- ncurses-6.0-20161231+/man/curs_util.3x	2015-06-06 23:36:27.000000000 +0000
++++ ncurses-6.0-20170107/man/curs_util.3x	2017-01-07 19:35:54.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2013,2015 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2015,2017 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_util.3x,v 1.43 2015/06/06 23:36:27 tom Exp $
++.\" $Id: curs_util.3x,v 1.46 2017/01/07 19:35:54 tom Exp $
+ .TH curs_util 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -103,7 +103,7 @@
+ .bP
+ Values above 128 are either meta characters
+ (if the screen has not been initialized,
+-or if \fBmeta\fP has been called with a \fBTRUE\fP parameter),
++or if \fBmeta\fP(3X) has been called with a \fBTRUE\fP parameter),
+ shown in the \fBM\-\fR\fIX\fR notation,
+ or are displayed as themselves.
+ In the latter case, the values may not be printable;
+@@ -144,7 +144,7 @@
+ It modifies the way \fBncurses\fP treats environment variables
+ when determining the screen size.
+ .bP
+-Normally ncurses looks first at the terminal database for the screen size.
++Normally \fBncurses\fP looks first at the terminal database for the screen size.
+ .IP
+ If \fBuse_env\fP was called with \fBFALSE\fP for parameter,
+ it stops here unless
+@@ -155,11 +155,11 @@
+ it overrides the values from the terminal database.
+ .bP
+ Finally (unless \fBuse_env\fP was called with \fBFALSE\fP parameter),
+-ncurses examines the \fBLINES\fR or \fBCOLUMNS\fR environment variables,
++\fBncurses\fP examines the \fBLINES\fR or \fBCOLUMNS\fR environment variables,
+ using a value in those to override the results
+ from the operating system or terminal database.
+ .IP
+-Ncurses also updates the screen size in response to SIGWINCH,
++\fBNcurses\fP also updates the screen size in response to SIGWINCH,
+ unless overridden by the \fBLINES\fR or \fBCOLUMNS\fR environment variables,
+ .SS use_tioctl
+ .PP
+@@ -167,16 +167,16 @@
+ should be called before \fBinitscr\fR or \fBnewterm\fR are called
+ (because those compute the screen size).
+ After \fBuse_tioctl\fR is called with \fBTRUE\fR as an argument,
+-ncurses modifies the last step in its computation of screen size as follows:
++\fBncurses\fP modifies the last step in its computation of screen size as follows:
+ .bP
+ checks if the \fBLINES\fR and \fBCOLUMNS\fR environment variables
+ are set to a number greater than zero.
+ .bP
+-for each, ncurses updates the corresponding environment variable
++for each, \fBncurses\fP updates the corresponding environment variable
+ with the value that it has obtained via operating system call
+ or from the terminal database.
+ .bP
+-ncurses re-fetches the value of the environment variables so that
++\fBncurses\fP re-fetches the value of the environment variables so that
+ it is still the environment variables which set the screen size.
+ .PP
+ The \fBuse_env\fP and \fBuse_tioctl\fP routines combine as
+@@ -189,17 +189,17 @@
+ \fIuse_env\fR/\fIuse_tioctl\fR/\fISummary\fR
+ TRUE/FALSE/T{
+ This is the default behavior.
+-ncurses uses operating system calls
++\fBncurses\fP uses operating system calls
+ unless overridden by $LINES or $COLUMNS environment variables.
+ T}
+ TRUE/TRUE/T{
+-ncurses updates $LINES and $COLUMNS based on operating system calls.
++\fBncurses\fP updates $LINES and $COLUMNS based on operating system calls.
+ T}
+ FALSE/TRUE/T{
+-ncurses ignores $LINES and $COLUMNS, uses operating system calls to obtain size.
++\fBncurses\fP ignores $LINES and $COLUMNS, uses operating system calls to obtain size.
+ T}
+ FALSE/FALSE/T{
+-ncurses relies on the terminal database to determine size.
++\fBncurses\fP relies on the terminal database to determine size.
+ T}
+ .TE
+ .SS putwin/getwin
+@@ -257,9 +257,6 @@
+ \fBflushinp\fR
+ returns an error if the terminal was not initialized.
+ .TP 5
+-\fBmeta\fR
+-returns an error if the terminal was not initialized.
+-.TP 5
+ \fBputwin\fP
+ returns an error if the associated \fBfwrite\fP calls return an error.
+ .RE
+@@ -284,9 +281,9 @@
+ loaded when the terminal description is read by the library.
+ .SS nofilter/use_tioctl
+ .PP
+-The \fBnofilter\fP and \fBuse_tioctl\fP routines are specific to ncurses.
++The \fBnofilter\fP and \fBuse_tioctl\fP routines are specific to \fBncurses\fP.
+ They were not supported on Version 7, BSD or System V implementations.
+-It is recommended that any code depending on ncurses extensions
++It is recommended that any code depending on \fBncurses\fP extensions
+ be conditioned using NCURSES_VERSION.
+ .SS putwin/getwin
+ .PP
+@@ -305,7 +302,7 @@
+ Oddly, there are no such functions in the 4.3BSD curses sources.
+ .bP
+ Most implementations simply dump the binary \fBWINDOW\fP structure to the file.
+-These include SVr4 curses, NetBSD and PDCurses, as well as older ncurses versions.
++These include SVr4 curses, NetBSD and PDCurses, as well as older \fBncurses\fP versions.
+ This implementation (as well as the X/Open variant of Solaris curses, dated 1995)
+ uses textual dumps.
+ .IP
+@@ -355,7 +352,7 @@
+ The \fBuse_legacy_coding\fP function allows the caller to
+ change the output of \fBunctrl\fP.
+ .PP
+-Likewise, the \fBmeta\fP function allows the caller to change the
++Likewise, the \fBmeta\fP(3X) function allows the caller to change the
+ output of \fBkeyname\fP, i.e.,
+ it determines whether to use the `M\-' prefix
+ for \*(``meta\*('' keys (codes in the range 128 to 255).
+@@ -365,11 +362,21 @@
+ When treating them as \*(``meta\*('' keys
+ (or if \fBkeyname\fP is called before initializing curses),
+ this implementation returns strings \*(``M\-^@\*('', \*(``M\-^A\*('', etc.
++.SS use_env/use_tioctl
++.PP
++If \fBncurses\fP is configured to provide the sp-functions extension,
++the state of \fBuse_env\fP and \fBuse_tioctl\fP may be updated before
++creating each \fIscreen\fP rather than once only
++(\fBcurs_sp_funcs\fR(3X)).
++This feature of \fBuse_env\fP
++is not provided by other implementation of curses.
+ .SH SEE ALSO
+ \fBlegacy_coding\fR(3X),
+ \fBcurses\fR(3X),
+ \fBcurs_initscr\fR(3X),
++\fBcurs_inopts\fR(3X),
+ \fBcurs_kernel\fR(3X),
+ \fBcurs_scr_dump\fR(3X),
++\fBcurs_sp_funcs\fR(3X),
+ \fBcurs_variables\fR(3X),
+ \fBlegacy_coding\fR(3X).
+Index: man/form_post.3x
+Prereq:  1.10 
+--- ncurses-6.0-20161231+/man/form_post.3x	2015-12-05 20:41:37.000000000 +0000
++++ ncurses-6.0-20170107/man/form_post.3x	2017-01-07 19:25:15.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2010,2017 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_post.3x,v 1.10 2015/12/05 20:41:37 jmc Exp $
++.\" $Id: form_post.3x,v 1.11 2017/01/07 19:25:15 tom Exp $
+ .TH form_post 3X ""
+ .SH NAME
+ \fBpost_form\fR,
+@@ -41,7 +41,7 @@
+ .br
+ .SH DESCRIPTION
+ The function \fBpost_form\fR displays a form to its associated subwindow.  To
+-trigger physical display of the subwindow, use \fBrefresh\fR or some equivalent
++trigger physical display of the subwindow, use \fBrefresh\fR(3X) or some equivalent
+ \fBcurses\fR routine (the implicit \fBdoupdate\fR triggered by an \fBcurses\fR
+ input request will do).
+ .PP
+Index: man/manhtml.aliases
+Prereq:  1.1 
+--- ncurses-6.0-20161231+/man/manhtml.aliases	2013-12-21 21:44:52.000000000 +0000
++++ ncurses-6.0-20170107/man/manhtml.aliases	2017-01-07 20:28:43.000000000 +0000
+@@ -1,16 +1,28 @@
+-# $Id: manhtml.aliases,v 1.1 2013/12/21 21:44:52 tom Exp $
++# $Id: manhtml.aliases,v 1.5 2017/01/07 20:28:43 tom Exp $
+ # Items in this list will be linked to the corresponding manpages by man2html
+ addch(3X)		curs_addch(3X)
+ delscreen(3X)		curs_initscr(3X)
++endwin(3X)		curs_initscr(3X)
+ filter(3X)		curs_util(3X)
+ form_fieldtype(3X)	form_fieldtype(3X)
++get_wch(3X)		curs_get_wch(3X)
+ getch(3X)		curs_getch(3X)
++inch(3X)		curs_inch(3X)
+ infocmp(1)		infocmp(1M)
+ initscr(3X)		curs_initscr(3X)
++is_scrollok(3X)		curs_opaque(3X)
++keypad(3X)		curs_inopts(3X)
++meta(3X)		curs_inopts(3X)
+ newterm(3X)		curs_initscr(3X)
++refresh(3X)		curs_refresh(3X)
+ set_fieldtype(3X)	form_fieldtype(3X)
+ set_term(3X)		curs_initscr(3X)
+ setupterm(3X)		curs_terminfo(3X)
++slk_init(3X)		curs_slk(3X)
+ tic(1)			tic(1M)
++tigetstr(3X)		curs_terminfo(3X)
++tparm(3X)		curs_terminfo(3X)
++tputs(3X)		curs_terminfo(3X)
+ use_env(3X)		curs_util(3X)
+ vidputs(3X)		curs_terminfo(3X)
++wgetch(3X)		curs_getch(3X)
+Index: man/menu_driver.3x
+Prereq:  1.20 
+--- ncurses-6.0-20161231+/man/menu_driver.3x	2010-12-04 18:38:55.000000000 +0000
++++ ncurses-6.0-20170107/man/menu_driver.3x	2017-01-07 19:25:15.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2008,2010 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2010,2017 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_driver.3x,v 1.20 2010/12/04 18:38:55 tom Exp $
++.\" $Id: menu_driver.3x,v 1.21 2017/01/07 19:25:15 tom Exp $
+ .TH menu_driver 3X ""
+ .de bP
+ .IP \(bu 4
+@@ -44,7 +44,7 @@
+ .bP
+ The input is a form navigation request.
+ Navigation request codes are constants defined in \fB\fP,
+-which are distinct from the key- and character codes returned by \fBwgetch\fP.
++which are distinct from the key- and character codes returned by \fBwgetch\fP(3X).
+ .bP
+ The input is a printable character.
+ Printable characters (which must be positive, less than 256) are
+Index: man/menu_post.3x
+Prereq:  1.13 
+--- ncurses-6.0-20161231+/man/menu_post.3x	2016-10-15 17:02:31.000000000 +0000
++++ ncurses-6.0-20170107/man/menu_post.3x	2017-01-07 19:25:15.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_post.3x,v 1.13 2016/10/15 17:02:31 tom Exp $
++.\" $Id: menu_post.3x,v 1.14 2017/01/07 19:25:15 tom Exp $
+ .TH menu_post 3X ""
+ .SH NAME
+ \fBpost_menu\fR,
+@@ -41,7 +41,7 @@
+ .br
+ .SH DESCRIPTION
+ The function \fBpost_menu\fR displays a menu to its associated subwindow.  To
+-trigger physical display of the subwindow, use \fBrefresh\fR or some equivalent
++trigger physical display of the subwindow, use \fBrefresh\fR(3X) or some equivalent
+ \fBcurses\fR routine (the implicit \fBdoupdate\fR triggered by an \fBcurses\fR
+ input request will do). \fBpost_menu\fR resets the selection status of all items.
+ .PP
+Index: man/ncurses.3x
+Prereq:  1.124 
+--- ncurses-6.0-20161231+/man/ncurses.3x	2015-08-08 14:57:51.000000000 +0000
++++ ncurses-6.0-20170107/man/ncurses.3x	2017-01-07 19:25:15.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2015,2017 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: ncurses.3x,v 1.124 2015/08/08 14:57:51 tom Exp $
++.\" $Id: ncurses.3x,v 1.125 2017/01/07 19:25:15 tom Exp $
+ .hy 0
+ .TH ncurses 3X ""
+ .ie \n(.g .ds `` \(lq
+@@ -99,7 +99,7 @@
+ must be called to initialize the library
+ before any of the other routines that deal with windows
+ and screens are used.
+-The routine \fBendwin\fR must be called before exiting.
++The routine \fBendwin\fR(3X) must be called before exiting.
+ .PP
+ To get character-at-a-time input without echoing (most
+ interactive, screen oriented programs want this), the following
+@@ -146,7 +146,7 @@
+ The routines not beginning
+ with \fBw\fR affect \fBstdscr\fR.
+ .PP
+-After using routines to manipulate a window, \fBrefresh\fR is called,
++After using routines to manipulate a window, \fBrefresh\fR(3X) is called,
+ telling \fBcurses\fR to make the user's CRT screen look like
+ \fBstdscr\fR.
+ The characters in a window are actually of type
+Index: man/resizeterm.3x
+Prereq:  1.21 
+--- ncurses-6.0-20161231+/man/resizeterm.3x	2015-09-26 19:55:32.000000000 +0000
++++ ncurses-6.0-20170107/man/resizeterm.3x	2017-01-07 19:25:15.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2013,2015 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2015,2017 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -28,7 +28,7 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1996-on
+ .\"
+-.\" $Id: resizeterm.3x,v 1.21 2015/09/26 19:55:32 tom Exp $
++.\" $Id: resizeterm.3x,v 1.22 2017/01/07 19:25:15 tom Exp $
+ .TH resizeterm 3X ""
+ .de bP
+ .IP \(bu 4
+@@ -87,7 +87,7 @@
+ .bP
+ on receipt of a SIGWINCH, the handler sets a flag
+ .bP
+-which is tested in \fBwgetch\fP and \fBdoupdate\fP,
++which is tested in \fBwgetch\fP(3X) and \fBdoupdate\fP,
+ .bP
+ in turn, calling the \fBresizeterm\fR function,
+ .bP
+Index: man/term.5
+Prereq:  1.24 
+--- ncurses-6.0-20161231+/man/term.5	2016-10-22 19:55:01.000000000 +0000
++++ ncurses-6.0-20170107/man/term.5	2017-01-07 18:45:42.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: term.5,v 1.24 2016/10/22 19:55:01 tom Exp $
++.\" $Id: term.5,v 1.25 2017/01/07 18:45:42 tom Exp $
+ .TH term 5
+ .ds n 5
+ .ds d @TERMINFO@
+@@ -74,7 +74,7 @@
+ or sign extension are made.
+ .PP
+ The compiled file is created with the \fB@TIC@\fP program,
+-and read by the routine \fBsetupterm\fP.
++and read by the routine \fBsetupterm\fP(3X).
+ The file is divided into six parts:
+ the header,
+ terminal names,
+Index: man/term_variables.3x
+Prereq:  1.7 
+--- ncurses-6.0-20161231+/man/term_variables.3x	2015-12-05 18:43:25.000000000 +0000
++++ ncurses-6.0-20170107/man/term_variables.3x	2017-01-07 19:25:15.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 2011-2013,2015 Free Software Foundation, Inc.              *
++.\" Copyright (c) 2011-2015,2017 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: term_variables.3x,v 1.7 2015/12/05 18:43:25 tom Exp $
++.\" $Id: term_variables.3x,v 1.8 2017/01/07 19:25:15 tom Exp $
+ .TH term_variables 3X ""
+ .ds n 5
+ .na
+@@ -110,7 +110,7 @@
+ It is possible to save a value of \fBcur_term\fP for subsequent
+ use as a parameter to \fBset_term\fP, for switching between screens.
+ Alternatively, one can save the return value from \fBnewterm\fP
+-or \fBsetupterm\fP to reuse in \fBset_term\fP.
++or \fBsetupterm\fP(3X) to reuse in \fBset_term\fP.
+ .SS Terminfo Names
+ The \fB@TIC@\fP(1) and \fB@INFOCMP@\fP(1) programs use lookup tables for
+ the long and short names of terminfo capabilities,
+@@ -136,7 +136,7 @@
+ .\"
+ .SS Terminal Type
+ On initialization of the curses or terminfo interfaces,
+-\fBsetupterm\fP copies the terminal name to the array \fBttytype\fP.
++\fBsetupterm\fP(3X) copies the terminal name to the array \fBttytype\fP.
+ .\"
+ .SS Terminfo Names
+ .PP
+Index: man/terminfo.tail
+Prereq:  1.75 
+--- ncurses-6.0-20161231+/man/terminfo.tail	2016-12-24 22:54:11.000000000 +0000
++++ ncurses-6.0-20170107/man/terminfo.tail	2017-01-07 18:32:49.000000000 +0000
+@@ -1,4 +1,4 @@
+-.\" $Id: terminfo.tail,v 1.75 2016/12/24 22:54:11 tom Exp $
++.\" $Id: terminfo.tail,v 1.76 2017/01/07 18:32:49 tom Exp $
+ .\" Beginning of terminfo.tail file
+ .\" This file is part of ncurses.
+ .\" See "terminfo.head" for copyright.
+@@ -157,7 +157,7 @@
+ .PP
+ A delay in milliseconds may appear anywhere in a string capability, enclosed in
+ $<..> brackets, as in \fBel\fP=\eEK$<5>,
+-and padding characters are supplied by \fBtputs\fP
++and padding characters are supplied by \fBtputs\fP(3X)
+ to provide this delay.
+ .bP
+ The delay must be a number with at most one decimal
+@@ -434,7 +434,7 @@
+ .IP
+ The terms "static" and "dynamic" are misleading.
+ Historically, these are simply two different sets of variables,
+-whose values are not reset between calls to \fBtparm\fP.
++whose values are not reset between calls to \fBtparm\fP(3X).
+ However, that fact is not documented in other implementations.
+ Relying on it will adversely impact portability to other implementations.
+ .TP
+@@ -1374,7 +1374,7 @@
+ If the terminal
+ supports other escape sequences to set background and foreground, they should
+ be coded as \fBsetf\fR and \fBsetb\fR, respectively.
+-The \fBvidputs\fR and the \fBrefresh\fP functions
++The \fBvidputs\fR and the \fBrefresh\fP(3X) functions
+ use the \fBsetaf\fR and \fBsetab\fR capabilities if they are defined.
+ .PP
+ The \fBsetaf\fR/\fBsetab\fR and \fBsetf\fR/\fBsetb\fR capabilities take a
+Index: man/tput.1
+Prereq:  1.46 
+--- ncurses-6.0-20161231+/man/tput.1	2016-10-22 19:57:25.000000000 +0000
++++ ncurses-6.0-20170107/man/tput.1	2017-01-07 23:03:28.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2012,2016 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tput.1,v 1.46 2016/10/22 19:57:25 tom Exp $
++.\" $Id: tput.1,v 1.50 2017/01/07 23:03:28 tom Exp $
+ .TH @TPUT@ 1 ""
+ .ds d @TERMINFO@
+ .ds n 1
+@@ -133,32 +133,83 @@
+ .RS
+ .TP 5
+ (1)
+-if present, the terminal's initialization strings will be
+-output as detailed in the \fBterminfo\fR(5) section on
+-.IR "Tabs and Initialization" ,
++first, \fB@TPUT@\fR retrieves the current terminal mode settings
++for your terminal.
++It does this by successively testing
++.RS
++.bP
++the standard error,
++.bP
++standard output,
++.bP
++standard input and
++.bP
++ultimately \*(lq/dev/tty\*(rq
++.RE
++.IP
++to obtain terminal settings.
++Having retrieved these settings, \fB@TPUT@\fP remembers which
++file descriptor to use when updating settings.
+ .TP
+ (2)
+-any delays (e.g., newline) specified in the entry will
+-be set in the tty driver,
++if the window size cannot be obtained from the operating system,
++but the terminal description (or environment, e.g., \fBLINES\fP
++and \fBCOLUMNS\fP variables specify this),
++update the operating system's notion of the window size.
+ .TP
+ (3)
++the terminal modes will be updated:
++.RS
++.bP
++any delays (e.g., newline) specified in the entry will
++be set in the tty driver,
++.bP
+ tabs expansion will be turned on or off according to
+ the specification in the entry, and
+-.TP
+-(4)
++.bP
+ if tabs are not expanded,
+ standard tabs will be set (every 8 spaces).
+ .RE
++.TP
++(4)
++if present, the terminal's initialization strings will be
++output as detailed in the \fBterminfo\fR(5) section on
++.IR "Tabs and Initialization" ,
++.TP
++(5)
++output is flushed.
++.RE
+ .IP
+ If an entry does not
+ contain the information needed for any of these activities,
+ that activity will silently be skipped.
+ .TP
+ \fBreset\fR
+-Instead of putting out initialization strings, the terminal's
+-reset strings will be output if present (\fBrs1\fR, \fBrs2\fR, \fBrs3\fR, \fBrf\fR).
+-If the reset strings are not present, but initialization
+-strings are, the initialization strings will be output.
++This is similar to \fBinit\fP, with two differences:
++.RS
++.TP 5
++(1)
++before any other initialization,
++the terminal modes will be reset to a \*(``sane\*('' state:
++.RS
++.bP
++set cooked and echo modes,
++.bP
++turn off cbreak and raw modes,
++.bP
++turn on newline translation and
++.bP
++reset any unset special characters to their default values
++.RE
++.TP 5
++(2)
++Instead of putting out \fIinitialization\fP strings, the terminal's
++\fIreset\fP strings will be output if present
++(\fBrs1\fR, \fBrs2\fR, \fBrs3\fR, \fBrf\fR).
++If the \fIreset\fP strings are not present, but \fIinitialization\fP
++strings are, the \fIinitialization\fP strings will be output.
++.RE
++.IP
+ Otherwise, \fBreset\fR acts identically to \fBinit\fR.
+ .TP
+ \fBlongname\fR
+@@ -188,6 +239,20 @@
+ The \fBreset\fP program is usually an alias for \fB@TSET@\fP,
+ because of this difference with resetting terminal modes and special characters.
+ .PP
++With the changes made for ncurses 6.1, the \fIreset\fP feature of the
++two programs is (mostly) the same.  A few differences remain:
++.bP
++The \fB@TSET@\fP program waits one second when resetting,
++in case it happens to be a hardware terminal.
++.bP
++The two programs write the terminal initialization strings
++to different streams (i.e.,. the standard error for \fB@TSET@\fP and the
++standard output for \fB@TPUT@\fP).
++.IP
++\fBNote:\fP although these programs write to different streams,
++redirecting their output to a file will capture only part of their actions.
++The changes to the terminal modes are not affected by redirecting the output.
++.PP
+ If \fB@TPUT@\fR is invoked by a link named \fBinit\fR, this has the
+ same effect as \fB@TPUT@ init\fR.
+ Again, you are less likely to use that link because another program
+Index: man/tset.1
+Prereq:  1.43 
+--- ncurses-6.0-20161231+/man/tset.1	2016-08-06 23:16:39.000000000 +0000
++++ ncurses-6.0-20170107/man/tset.1	2017-01-07 22:59:51.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2013,2016 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tset.1,v 1.43 2016/08/06 23:16:39 tom Exp $
++.\" $Id: tset.1,v 1.47 2017/01/07 22:59:51 tom Exp $
+ .TH @TSET@ 1 ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -83,29 +83,61 @@
+ Then, if the terminal type begins with a question mark (\*(``?\*(''), the
+ user is prompted for confirmation of the terminal type.  An empty
+ response confirms the type, or, another type can be entered to specify
+-a new type.  Once the terminal type has been determined, the terminfo
+-entry for the terminal is retrieved.  If no terminfo entry is found
++a new type.
++Once the terminal type has been determined,
++the terminal description for the terminal is retrieved.
++If no terminal description is found
+ for the type, the user is prompted for another terminal type.
+ .PP
+-Once the terminfo entry is retrieved, the window size, backspace, interrupt
+-and line kill characters (among many other things) are set and the terminal
+-and tab initialization strings are sent to the standard error output.
++Once the terminal description is retrieved,
++.bP
++if the \*(``\fB\-w\fP\*('' option is enabled, \fB@TSET@\fP may update
++the terminal's window size.
++.IP
++If the window size cannot be obtained from the operating system,
++but the terminal description (or environment, e.g., \fBLINES\fP
++and \fBCOLUMNS\fP variables specify this),
++use this to set the operating system's notion of the window size.
++.bP
++if the \*(``\fB\-c\fP\*('' option is enabled,
++the backspace, interrupt and line kill characters (among many other things) are set
++.bP
++unless the \*(``\fB\-I\fP\*('' option is enabled,
++the terminal
++and tab \fIinitialization\fP strings are sent to the standard error output,
++and \fB@TSET@\fP waits one second (in case a hardware reset was issued).
++.bP
+ Finally, if the erase, interrupt and line kill characters have changed,
+ or are not set to their default values, their values are displayed to the
+ standard error output.
+ .SS reset - reinitialization
+ .PP
+-When invoked as \fB@RESET@\fR, \fB@TSET@\fR sets cooked and echo modes,
+-turns off cbreak and raw modes, turns on newline translation and
+-resets any unset special characters to their default values before
+-doing the terminal initialization described above.  This is useful
+-after a program dies leaving a terminal in an abnormal state.  Note,
++When invoked as \fB@RESET@\fR, \fB@TSET@\fR sets the terminal
++modes to \*(``sane\*('' values:
++.bP
++sets cooked and echo modes,
++.bP
++turns off cbreak and raw modes,
++.bP
++turns on newline translation and
++.bP
++resets any unset special characters to their default values
++.PP
++before
++doing the terminal initialization described above.
++Also, rather than using the terminal \fIinitialization\fP strings,
++it uses the terminal \fIreset\fP strings.
++.PP
++The \fB@RESET@\fP command is useful
++after a program dies leaving a terminal in an abnormal state:
++.bP
+ you may have to type
+ .sp
+     \fI\fP\fB@RESET@\fP\fI\fP
+ .sp
+ (the line-feed character is normally control-J) to get the terminal
+ to work, as carriage-return may no longer work in the abnormal state.
++.bP
+ Also, the terminal will often not echo the command.
+ .SH OPTIONS 
+ .PP
+@@ -156,7 +188,7 @@
+ reports the version of ncurses which was used in this program, and exits.
+ .TP
+ .B \-w
+-Resize the window to match the size deduced via \fBsetupterm\fP.
++Resize the window to match the size deduced via \fBsetupterm\fP(3X).
+ Normally this has no effect,
+ unless \fBsetupterm\fP is not able to detect the window size.
+ .PP
+@@ -250,8 +282,9 @@
+ that he began work in October 1977,
+ continuing development over the next few years.
+ .PP
+-In 1980, Eric Allman modified \fBtset\fP to provide a \*(lqreset\*(rq
++In September 1980, Eric Allman modified \fBtset\fP to provide a \*(lqreset\*(rq
+ feature when the program was invoked as \fBreset\fP.
++This version appeared in 4.1cBSD, late in 1982.
+ .PP
+ The \fBncurses\fR implementation
+ was lightly adapted from the 4.4BSD sources for a terminfo environment by Eric
+Index: ncurses/base/MKlib_gen.sh
+Prereq:  1.55 
+--- ncurses-6.0-20161231+/ncurses/base/MKlib_gen.sh	2016-12-11 00:07:14.000000000 +0000
++++ ncurses-6.0-20170107/ncurses/base/MKlib_gen.sh	2017-01-07 16:02:47.000000000 +0000
+@@ -2,10 +2,10 @@
+ #
+ # MKlib_gen.sh -- generate sources from curses.h macro definitions
+ #
+-# ($Id: MKlib_gen.sh,v 1.55 2016/12/11 00:07:14 tom Exp $)
++# ($Id: MKlib_gen.sh,v 1.56 2017/01/07 16:02:47 tom Exp $)
+ #
+ ##############################################################################
+-# Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.                #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+ # copy of this software and associated documentation files (the "Software"), #
+@@ -399,9 +399,10 @@
+ 
+ cat >$AW2 <
+Index: ncurses/tinfo/lib_data.c
+Prereq:  1.68 
+--- ncurses-6.0-20161231+/ncurses/tinfo/lib_data.c	2016-11-21 23:29:14.000000000 +0000
++++ ncurses-6.0-20170107/ncurses/tinfo/lib_data.c	2017-01-07 19:51:37.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2013,2016 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -42,7 +42,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_data.c,v 1.68 2016/11/21 23:29:14 tom Exp $")
++MODULE_ID("$Id: lib_data.c,v 1.69 2017/01/07 19:51:37 tom Exp $")
+ 
+ /*
+  * OS/2's native linker complains if we don't initialize public data when
+@@ -204,6 +204,9 @@
+ #if USE_PTHREADS_EINTR
+     0,				/* read_thread */
+ #endif
++#if USE_WIDEC_SUPPORT
++    CHARS_0s,			/* key_name */
++#endif
+ };
+ 
+ #define STACK_FRAME_0	{ { 0 }, 0 }
+@@ -371,7 +374,7 @@
+     if ((pthread_sigmask))
+ 	return pthread_sigmask(how, newmask, oldmask);
+     else
+-	return (sigprocmask)(how, newmask, oldmask);
++	return (sigprocmask) (how, newmask, oldmask);
+ }
+ #endif
+ #endif /* USE_PTHREADS */
+Index: ncurses/tinfo/lib_setup.c
+Prereq:  1.167 
+--- ncurses-6.0-20161231+/ncurses/tinfo/lib_setup.c	2016-09-10 20:07:30.000000000 +0000
++++ ncurses-6.0-20170107/ncurses/tinfo/lib_setup.c	2017-01-07 16:50:16.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -48,7 +48,7 @@
+ #include 
+ #endif
+ 
+-MODULE_ID("$Id: lib_setup.c,v 1.167 2016/09/10 20:07:30 tom Exp $")
++MODULE_ID("$Id: lib_setup.c,v 1.170 2017/01/07 16:50:16 tom Exp $")
+ 
+ /****************************************************************************
+  *
+@@ -220,9 +220,9 @@
+ NCURSES_EXPORT(void)
+ NCURSES_SP_NAME(use_env) (NCURSES_SP_DCLx bool f)
+ {
++    START_TRACE();
+     T((T_CALLED("use_env(%p,%d)"), (void *) SP_PARM, (int) f));
+ #if NCURSES_SP_FUNCS
+-    START_TRACE();
+     if (IsPreScreen(SP_PARM)) {
+ 	SP_PARM->_use_env = f;
+     }
+@@ -235,11 +235,11 @@
+ NCURSES_EXPORT(void)
+ NCURSES_SP_NAME(use_tioctl) (NCURSES_SP_DCLx bool f)
+ {
++    START_TRACE();
+     T((T_CALLED("use_tioctl(%p,%d)"), (void *) SP_PARM, (int) f));
+ #if NCURSES_SP_FUNCS
+-    START_TRACE();
+     if (IsPreScreen(SP_PARM)) {
+-	SP_PARM->_use_tioctl = f;
++	SP_PARM->use_tioctl = f;
+     }
+ #else
+     _nc_prescreen.use_tioctl = f;
+@@ -251,8 +251,8 @@
+ NCURSES_EXPORT(void)
+ use_env(bool f)
+ {
+-    T((T_CALLED("use_env(%d)"), (int) f));
+     START_TRACE();
++    T((T_CALLED("use_env(%d)"), (int) f));
+     _nc_prescreen.use_env = f;
+     returnVoid;
+ }
+@@ -260,8 +260,8 @@
+ NCURSES_EXPORT(void)
+ use_tioctl(bool f)
+ {
+-    T((T_CALLED("use_tioctl(%d)"), (int) f));
+     START_TRACE();
++    T((T_CALLED("use_tioctl(%d)"), (int) f));
+     _nc_prescreen.use_tioctl = f;
+     returnVoid;
+ }
+@@ -297,6 +297,8 @@
+ #else /* !USE_TERM_DRIVER */
+     TERMINAL *termp = cur_term;
+     int my_tabsize;
++    bool useEnv = _nc_prescreen.use_env;
++    bool useTioctl = _nc_prescreen.use_tioctl;
+ 
+     /* figure out the size of the screen */
+     T(("screen size: terminfo lines = %d columns = %d", lines, columns));
+@@ -304,7 +306,14 @@
+     *linep = (int) lines;
+     *colp = (int) columns;
+ 
+-    if (_nc_prescreen.use_env || _nc_prescreen.use_tioctl) {
++#if NCURSES_SP_FUNCS
++    if (sp) {
++	useEnv = sp->_use_env;
++	useTioctl = sp->use_tioctl;
++    }
++#endif
++
++    if (useEnv || useTioctl) {
+ #ifdef __EMX__
+ 	{
+ 	    int screendata[2];
+@@ -338,10 +347,10 @@
+ 	}
+ #endif /* HAVE_SIZECHANGE */
+ 
+-	if (_nc_prescreen.use_env) {
++	if (useEnv) {
+ 	    int value;
+ 
+-	    if (_nc_prescreen.use_tioctl) {
++	    if (useTioctl) {
+ 		/*
+ 		 * If environment variables are used, update them.
+ 		 */
+Index: ncurses/tinfo/tinfo_driver.c
+Prereq:  1.43 
+--- ncurses-6.0-20161231+/ncurses/tinfo/tinfo_driver.c	2016-12-24 23:20:08.000000000 +0000
++++ ncurses-6.0-20170107/ncurses/tinfo/tinfo_driver.c	2017-01-07 16:34:52.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2008-2015,2016 Free Software Foundation, Inc.              *
++ * Copyright (c) 2008-2016,2017 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -51,7 +51,7 @@
+ # endif
+ #endif
+ 
+-MODULE_ID("$Id: tinfo_driver.c,v 1.43 2016/12/24 23:20:08 tom Exp $")
++MODULE_ID("$Id: tinfo_driver.c,v 1.44 2017/01/07 16:34:52 tom Exp $")
+ 
+ /*
+  * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,
+@@ -397,7 +397,7 @@
+ 
+     if (sp) {
+ 	useEnv = sp->_use_env;
+-	useTioctl = sp->_use_tioctl;
++	useTioctl = sp->use_tioctl;
+     } else {
+ 	useEnv = _nc_prescreen.use_env;
+ 	useTioctl = _nc_prescreen.use_tioctl;
+Index: ncurses/widechar/lib_key_name.c
+Prereq:  1.3 
+--- ncurses-6.0-20161231+/ncurses/widechar/lib_key_name.c	2008-10-11 20:15:14.000000000 +0000
++++ ncurses-6.0-20170107/ncurses/widechar/lib_key_name.c	2017-01-07 19:50:17.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2007 Free Software Foundation, Inc.                        *
++ * Copyright (c) 2007,2017 Free Software Foundation, Inc.                   *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -35,7 +35,9 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_key_name.c,v 1.3 2008/10/11 20:15:14 tom Exp $")
++MODULE_ID("$Id: lib_key_name.c,v 1.4 2017/01/07 19:50:17 tom Exp $")
++
++#define MyData _nc_globals.key_name
+ 
+ NCURSES_EXPORT(NCURSES_CONST char *)
+ key_name(wchar_t c)
+@@ -44,19 +46,16 @@
+     wchar_t *my_wchars;
+     size_t len;
+ 
+-    /* FIXME: move to _nc_globals */
+-    static char result[MB_LEN_MAX + 1];
+-
+     memset(&my_cchar, 0, sizeof(my_cchar));
+     my_cchar.chars[0] = c;
+     my_cchar.chars[1] = L'\0';
+ 
+     my_wchars = wunctrl(&my_cchar);
+-    len = wcstombs(result, my_wchars, sizeof(result) - 1);
++    len = wcstombs(MyData, my_wchars, sizeof(MyData) - 1);
+     if (isEILSEQ(len) || (len == 0)) {
+ 	return 0;
+     }
+ 
+-    result[len] = '\0';
+-    return result;
++    MyData[len] = '\0';
++    return MyData;
+ }
+Index: package/debian-mingw/changelog
+--- ncurses-6.0-20161231+/package/debian-mingw/changelog	2016-12-31 12:01:55.000000000 +0000
++++ ncurses-6.0-20170107/package/debian-mingw/changelog	2017-01-07 15:27:12.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161231) unstable; urgency=low
++ncurses6 (6.0+20170107) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 31 Dec 2016 07:01:56 -0500
++ -- Thomas E. Dickey   Sat, 07 Jan 2017 10:27:12 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw/copyright
+--- ncurses-6.0-20161231+/package/debian-mingw/copyright	2016-01-02 20:24:37.000000000 +0000
++++ ncurses-6.0-20170107/package/debian-mingw/copyright	2017-01-08 00:35:15.000000000 +0000
+@@ -5,11 +5,11 @@
+ 
+ -------------------------------------------------------------------------------
+ Files: *
+-Copyright: 1998-2015,2016 Free Software Foundation, Inc.
++Copyright: 1998-2016,2017 Free Software Foundation, Inc.
+ Licence: X11
+ 
+ Files: aclocal.m4 package
+-Copyright: 1996-2015,2016 by Thomas E. Dickey
++Copyright: 1996-2016,2017 by Thomas E. Dickey
+ Licence: X11
+ 
+ Files: doc/html/NCURSES-Programming-HOWTO.html
+Index: package/debian-mingw64/changelog
+--- ncurses-6.0-20161231+/package/debian-mingw64/changelog	2016-12-31 12:01:55.000000000 +0000
++++ ncurses-6.0-20170107/package/debian-mingw64/changelog	2017-01-07 15:27:12.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161231) unstable; urgency=low
++ncurses6 (6.0+20170107) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 31 Dec 2016 07:01:56 -0500
++ -- Thomas E. Dickey   Sat, 07 Jan 2017 10:27:12 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/copyright
+--- ncurses-6.0-20161231+/package/debian-mingw64/copyright	2016-01-02 20:24:37.000000000 +0000
++++ ncurses-6.0-20170107/package/debian-mingw64/copyright	2017-01-08 00:35:15.000000000 +0000
+@@ -5,11 +5,11 @@
+ 
+ -------------------------------------------------------------------------------
+ Files: *
+-Copyright: 1998-2015,2016 Free Software Foundation, Inc.
++Copyright: 1998-2016,2017 Free Software Foundation, Inc.
+ Licence: X11
+ 
+ Files: aclocal.m4 package
+-Copyright: 1996-2015,2016 by Thomas E. Dickey
++Copyright: 1996-2016,2017 by Thomas E. Dickey
+ Licence: X11
+ 
+ Files: doc/html/NCURSES-Programming-HOWTO.html
+Index: package/debian/changelog
+--- ncurses-6.0-20161231+/package/debian/changelog	2016-12-31 12:01:55.000000000 +0000
++++ ncurses-6.0-20170107/package/debian/changelog	2017-01-07 15:27:12.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20161231) unstable; urgency=low
++ncurses6 (6.0+20170107) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 31 Dec 2016 07:01:56 -0500
++ -- Thomas E. Dickey   Sat, 07 Jan 2017 10:27:12 -0500
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/debian/copyright
+--- ncurses-6.0-20161231+/package/debian/copyright	2016-01-02 20:24:37.000000000 +0000
++++ ncurses-6.0-20170107/package/debian/copyright	2017-01-08 00:35:15.000000000 +0000
+@@ -5,11 +5,11 @@
+ 
+ -------------------------------------------------------------------------------
+ Files: *
+-Copyright: 1998-2015,2016 Free Software Foundation, Inc.
++Copyright: 1998-2016,2017 Free Software Foundation, Inc.
+ Licence: X11
+ 
+ Files: aclocal.m4 package
+-Copyright: 1996-2015,2016 by Thomas E. Dickey
++Copyright: 1996-2016,2017 by Thomas E. Dickey
+ Licence: X11
+ 
+ Files: doc/html/NCURSES-Programming-HOWTO.html
+Index: package/mingw-ncurses.nsi
+Prereq:  1.191 
+--- ncurses-6.0-20161231+/package/mingw-ncurses.nsi	2016-12-31 12:01:55.000000000 +0000
++++ ncurses-6.0-20170107/package/mingw-ncurses.nsi	2017-01-07 15:27:12.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.191 2016/12/31 12:01:55 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.192 2017/01/07 15:27:12 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -9,8 +9,8 @@
+ 
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "0"
+-!define VERSION_YYYY  "2016"
+-!define VERSION_MMDD  "1231"
++!define VERSION_YYYY  "2017"
++!define VERSION_MMDD  "0107"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.0-20161231+/package/mingw-ncurses.spec	2016-12-31 12:01:55.000000000 +0000
++++ ncurses-6.0-20170107/package/mingw-ncurses.spec	2017-01-07 15:27:12.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.0
+-Release: 20161231
++Release: 20170107
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.0-20161231+/package/ncurses.spec	2016-12-31 12:01:55.000000000 +0000
++++ ncurses-6.0-20170107/package/ncurses.spec	2017-01-07 15:27:12.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.0
+-Release: 20161231
++Release: 20170107
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: progs/tput.c
+Prereq:  1.65 
+--- ncurses-6.0-20161231+/progs/tput.c	2016-12-24 18:44:32.000000000 +0000
++++ ncurses-6.0-20170107/progs/tput.c	2017-01-07 23:08:24.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -50,7 +50,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: tput.c,v 1.65 2016/12/24 18:44:32 tom Exp $")
++MODULE_ID("$Id: tput.c,v 1.68 2017/01/07 23:08:24 tom Exp $")
+ 
+ #define PUTS(s)		fputs(s, stdout)
+ 
+@@ -135,8 +135,12 @@
+ 	int intrchar = -1;	/* new interrupt character */
+ 	int tkillchar = -1;	/* new kill character */
+ 
+-	reset_start(stdout, is_reset, is_init);
+-	reset_tty_settings(fd, saved_settings);
++	if (is_reset) {
++	    reset_start(stdout, TRUE, FALSE);
++	    reset_tty_settings(fd, saved_settings);
++	} else {
++	    reset_start(stdout, FALSE, TRUE);
++	}
+ 
+ #if HAVE_SIZECHANGE
+ 	set_window_size(fd, &lines, &columns);
+Index: progs/tset.c
+Prereq:  1.115 
+--- ncurses-6.0-20161231+/progs/tset.c	2016-12-24 18:46:42.000000000 +0000
++++ ncurses-6.0-20170107/progs/tset.c	2017-01-07 22:48:20.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -97,7 +97,7 @@
+ char *ttyname(int fd);
+ #endif
+ 
+-MODULE_ID("$Id: tset.c,v 1.115 2016/12/24 18:46:42 tom Exp $")
++MODULE_ID("$Id: tset.c,v 1.116 2017/01/07 22:48:20 tom Exp $")
+ 
+ #ifndef environ
+ extern char **environ;
+@@ -837,7 +837,7 @@
+ 	reset_start(stderr, TRUE, FALSE);
+ 	reset_tty_settings(my_fd, &mode);
+     } else {
+-	reset_start(stderr, FALSE, FALSE);
++	reset_start(stderr, FALSE, TRUE);
+     }
+ 
+     ttype = get_termcap_entry(my_fd, *argv);
+Index: test/package/debian-mingw/copyright
+--- ncurses-6.0-20161231+/test/package/debian-mingw/copyright	2016-01-02 20:24:37.000000000 +0000
++++ ncurses-6.0-20170107/test/package/debian-mingw/copyright	2017-01-08 00:35:15.000000000 +0000
+@@ -4,11 +4,11 @@
+ 
+ -------------------------------------------------------------------------------
+ Files: *
+-Copyright: 1998-2015,2016 Free Software Foundation, Inc.
++Copyright: 1998-2016,2017 Free Software Foundation, Inc.
+ Licence: X11
+ 
+ Files: aclocal.m4 package
+-Copyright: 2003-2015,2016 by Thomas E. Dickey
++Copyright: 2003-2016,2017 by Thomas E. Dickey
+ Licence: X11
+ 
+     Permission is hereby granted, free of charge, to any person obtaining a
+Index: test/package/debian-mingw64/copyright
+--- ncurses-6.0-20161231+/test/package/debian-mingw64/copyright	2016-01-02 20:24:37.000000000 +0000
++++ ncurses-6.0-20170107/test/package/debian-mingw64/copyright	2017-01-08 00:35:15.000000000 +0000
+@@ -4,11 +4,11 @@
+ 
+ -------------------------------------------------------------------------------
+ Files: *
+-Copyright: 1998-2015,2016 Free Software Foundation, Inc.
++Copyright: 1998-2016,2017 Free Software Foundation, Inc.
+ Licence: X11
+ 
+ Files: aclocal.m4 package
+-Copyright: 2003-2015,2016 by Thomas E. Dickey
++Copyright: 2003-2016,2017 by Thomas E. Dickey
+ Licence: X11
+ 
+     Permission is hereby granted, free of charge, to any person obtaining a
+Index: test/package/debian/copyright
+--- ncurses-6.0-20161231+/test/package/debian/copyright	2016-01-02 20:24:37.000000000 +0000
++++ ncurses-6.0-20170107/test/package/debian/copyright	2017-01-08 00:35:15.000000000 +0000
+@@ -4,11 +4,11 @@
+ 
+ -------------------------------------------------------------------------------
+ Files: *
+-Copyright: 1998-2015,2016 Free Software Foundation, Inc.
++Copyright: 1998-2016,2017 Free Software Foundation, Inc.
+ Licence: X11
+ 
+ Files: aclocal.m4 package
+-Copyright: 2003-2015,2016 by Thomas E. Dickey
++Copyright: 2003-2016,2017 by Thomas E. Dickey
+ Licence: X11
+ 
+     Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/ncurses-6.0-20170114.patch b/ncurses-6.0-20170114.patch
new file mode 100644
index 0000000..7327320
--- /dev/null
+++ b/ncurses-6.0-20170114.patch
@@ -0,0 +1,959 @@
+# ncurses 6.0 - patch 20170114 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.0 is at
+# 	ftp.gnu.org:/pub/gnu
+#
+# Patches for ncurses 6.0 can be found at
+# 	ftp://invisible-island.net/ncurses/6.0
+#	http://invisible-mirror.net/archives/ncurses/6.0 
+#
+# ------------------------------------------------------------------------------
+# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20170114.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Jan 15 01:42:56 UTC 2017
+# ------------------------------------------------------------------------------
+# NEWS                                  |   10 +++++++-
+# VERSION                               |    2 -
+# dist.mk                               |    4 +--
+# doc/html/man/adacurses6-config.1.html |    2 -
+# doc/html/man/captoinfo.1m.html        |    2 -
+# doc/html/man/clear.1.html             |    2 -
+# doc/html/man/curs_trace.3x.html       |   27 +++++++++++++++++++++-
+# doc/html/man/form.3x.html             |    2 -
+# doc/html/man/infocmp.1m.html          |   14 +++++++----
+# doc/html/man/infotocap.1m.html        |    2 -
+# doc/html/man/menu.3x.html             |    2 -
+# doc/html/man/ncurses.3x.html          |    2 -
+# doc/html/man/ncurses6-config.1.html   |    2 -
+# doc/html/man/panel.3x.html            |    2 -
+# doc/html/man/tabs.1.html              |    2 -
+# doc/html/man/terminfo.5.html          |    2 -
+# doc/html/man/tic.1m.html              |   20 +++++++++-------
+# doc/html/man/toe.1m.html              |   19 +++++++++-------
+# doc/html/man/tput.1.html              |    8 ++----
+# doc/html/man/tset.1.html              |   38 ++++++++++++++++++++++----------
+# man/curs_trace.3x                     |   21 ++++++++++++++++-
+# man/infocmp.1m                        |    9 +++++--
+# man/manhtml.aliases                   |   29 +++++++++++++++++++++++-
+# man/tic.1m                            |    6 +++--
+# man/toe.1m                            |    6 +++--
+# man/tput.1                            |    5 ----
+# man/tset.1                            |   30 +++++++++++++++++++++----
+# ncurses/curses.priv.h                 |    3 +-
+# ncurses/tinfo/lib_data.c              |    3 +-
+# ncurses/trace/lib_trace.c             |    8 ++++--
+# package/debian-mingw/changelog        |    4 +--
+# package/debian-mingw64/changelog      |    4 +--
+# package/debian/changelog              |    4 +--
+# package/mingw-ncurses.nsi             |    4 +--
+# package/mingw-ncurses.spec            |    2 -
+# package/ncurses.spec                  |    2 -
+# 36 files changed, 217 insertions(+), 87 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.2732 
+--- ncurses-6.0-20170107+/NEWS	2017-01-07 22:49:11.000000000 +0000
++++ ncurses-6.0-20170114/NEWS	2017-01-14 20:59:06.000000000 +0000
+@@ -25,7 +25,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.2732 2017/01/07 22:49:11 tom Exp $
++-- $Id: NEWS,v 1.2735 2017/01/14 20:59:06 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -45,6 +45,14 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20170114
++	+ improve discussion of early history of tset/reset programs.
++	+ clarify in manual pages that the optional verbose option level is
++	  available only when ncurses is configured for tracing.
++	+ amend change from 20161231 to avoid writing traces to the standard
++	  error after initializing the trace feature using the environment
++	  variable.
++
+ 20170107
+ 	+ amend changes for tput to reset tty modes to "sane" if the program
+ 	  is run as "reset", like tset.  Likewise, ensure that tset sends
+Index: VERSION
+--- ncurses-6.0-20170107+/VERSION	2017-01-07 15:27:12.000000000 +0000
++++ ncurses-6.0-20170114/VERSION	2017-01-14 15:30:30.000000000 +0000
+@@ -1 +1 @@
+-5:0:9	6.0	20170107
++5:0:9	6.0	20170114
+Index: dist.mk
+Prereq:  1.1141 
+--- ncurses-6.0-20170107+/dist.mk	2017-01-07 15:27:12.000000000 +0000
++++ ncurses-6.0-20170114/dist.mk	2017-01-14 15:30:30.000000000 +0000
+@@ -25,7 +25,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1141 2017/01/07 15:27:12 tom Exp $
++# $Id: dist.mk,v 1.1142 2017/01/14 15:30:30 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -37,7 +37,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 0
+-NCURSES_PATCH = 20170107
++NCURSES_PATCH = 20170114
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/man/adacurses6-config.1.html
+--- ncurses-6.0-20170107+/doc/html/man/adacurses6-config.1.html	2017-01-07 20:05:39.000000000 +0000
++++ ncurses-6.0-20170114/doc/html/man/adacurses6-config.1.html	2017-01-14 22:55:32.000000000 +0000
+@@ -131,7 +131,7 @@
+

    SEE ALSO

    +        curses(3x)
+ 
+-       This describes ncurses version 6.0 (patch 20170107).
++       This describes ncurses version 6.0 (patch 20170114).
+ 
+ 
+ 
+Index: doc/html/man/captoinfo.1m.html
+--- ncurses-6.0-20170107+/doc/html/man/captoinfo.1m.html	2017-01-07 20:05:39.000000000 +0000
++++ ncurses-6.0-20170114/doc/html/man/captoinfo.1m.html	2017-01-14 22:55:32.000000000 +0000
+@@ -198,7 +198,7 @@
+

    SEE ALSO

    +        infocmp(1m), curses(3x), terminfo(5)
+ 
+-       This describes ncurses version 6.0 (patch 20170107).
++       This describes ncurses version 6.0 (patch 20170114).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/clear.1.html
+--- ncurses-6.0-20170107+/doc/html/man/clear.1.html	2017-01-07 20:05:39.000000000 +0000
++++ ncurses-6.0-20170114/doc/html/man/clear.1.html	2017-01-14 22:55:32.000000000 +0000
+@@ -147,7 +147,7 @@
+

    SEE ALSO

    +        tput(1), terminfo(5)
+ 
+-       This describes ncurses version 6.0 (patch 20170107).
++       This describes ncurses version 6.0 (patch 20170114).
+ 
+ 
+ 
+Index: doc/html/man/curs_trace.3x.html
+--- ncurses-6.0-20170107+/doc/html/man/curs_trace.3x.html	2017-01-07 20:43:27.000000000 +0000
++++ ncurses-6.0-20170114/doc/html/man/curs_trace.3x.html	2017-01-14 22:55:35.000000000 +0000
+@@ -26,7 +26,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_trace.3x,v 1.17 2017/01/07 18:45:42 tom Exp @
++  * @Id: curs_trace.3x,v 1.18 2017/01/14 19:46:40 tom Exp @
+ -->
+ 
+ 
+@@ -182,6 +182,30 @@
+            use_env, use_extended_names, use_tioctl
+ 
+ 
++

    Command-line Utilities

    ++       The command-line utilities such as tic(1) provide  a  ver-
++       bose  option which extends the set of messages written us-
++       ing the trace function.  Both of these (-v and trace)  use
++       the same variable (_nc_tracing), which determines the mes-
++       sages which are written.
++
++       Because the command-line utilities may call initialization
++       functions   such  as  setupterm,  tgetent  or  use_extend-
++       ed_names, some of their debugging output may  be  directed
++       to  the  trace file if the NCURSES_TRACE environment vari-
++       able is set:
++
++       o   messages produced in the utility are  written  to  the
++           standard error.
++
++       o   messages  produced by the underlying library are writ-
++           ten to trace.
++
++       If ncurses is built without tracing, none  of  the  latter
++       are  produced,  and  fewer diagnostics are provided by the
++       command-line utilities.
++
++
+

    RETURN VALUE

    +        Routines which return a value are designed to be  used  as
+        parameters to the _tracef routine.
+@@ -215,6 +239,7 @@
+ 
  • Functions
    • 
+ 
  • Trace Parameter
    • 
+ 
  • Initialization
    • 
++
  • Command-line Utilities
    • 
+ 
+ 
+ 
  • RETURN VALUE
    • 
+Index: doc/html/man/form.3x.html
+--- ncurses-6.0-20170107+/doc/html/man/form.3x.html	2017-01-07 20:05:41.000000000 +0000
++++ ncurses-6.0-20170114/doc/html/man/form.3x.html	2017-01-14 22:55:35.000000000 +0000
+@@ -239,7 +239,7 @@
+        curses(3x) and related pages whose names begin "form_" for
+        detailed descriptions of the entry points.
+ 
+-       This describes ncurses version 6.0 (patch 20170107).
++       This describes ncurses version 6.0 (patch 20170114).
+ 
+ 
+ 
+Index: doc/html/man/infocmp.1m.html
+--- ncurses-6.0-20170107+/doc/html/man/infocmp.1m.html	2017-01-07 20:05:42.000000000 +0000
++++ ncurses-6.0-20170114/doc/html/man/infocmp.1m.html	2017-01-14 22:55:36.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -438,8 +438,12 @@
+             program, and exits.
+ 
+        -v n prints out tracing information on standard  error  as
+-            the  program runs.  Higher values of n induce greater
+-            verbosity.
++            the program runs.
++
++            The  optional  parameter  n is a number from 1 to 10,
++            inclusive, indicating the desired level of detail  of
++            information.   If  ncurses  is  built without tracing
++            support, the optional parameter is ignored.
+ 
+        -W   By itself, the -w option will not force long  strings
+             to be wrapped.  Use the -W option to do this.
+@@ -478,7 +482,7 @@
+ 
+        http://invisible-island.net/ncurses/tctest.html
+ 
+-       This describes ncurses version 6.0 (patch 20170107).
++       This describes ncurses version 6.0 (patch 20170114).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/infotocap.1m.html
+--- ncurses-6.0-20170107+/doc/html/man/infotocap.1m.html	2017-01-07 20:05:42.000000000 +0000
++++ ncurses-6.0-20170114/doc/html/man/infotocap.1m.html	2017-01-14 22:55:36.000000000 +0000
+@@ -88,7 +88,7 @@
+

    SEE ALSO

    +        curses(3x), tic(1m), infocmp(1m), terminfo(5)
+ 
+-       This describes ncurses version 6.0 (patch 20170107).
++       This describes ncurses version 6.0 (patch 20170114).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/menu.3x.html
+--- ncurses-6.0-20170107+/doc/html/man/menu.3x.html	2017-01-07 20:05:42.000000000 +0000
++++ ncurses-6.0-20170114/doc/html/man/menu.3x.html	2017-01-14 22:55:36.000000000 +0000
+@@ -217,7 +217,7 @@
+        curses(3x) and related pages whose names begin "menu_" for
+        detailed descriptions of the entry points.
+ 
+-       This describes ncurses version 6.0 (patch 20170107).
++       This describes ncurses version 6.0 (patch 20170114).
+ 
+ 
+ 
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.0-20170107+/doc/html/man/ncurses.3x.html	2017-01-07 20:43:29.000000000 +0000
++++ ncurses-6.0-20170114/doc/html/man/ncurses.3x.html	2017-01-14 22:55:37.000000000 +0000
+@@ -60,7 +60,7 @@
+        sonable optimization.  This implementation is "new curses"
+        (ncurses) and is the approved replacement for 4.4BSD clas-
+        sic  curses,  which has been discontinued.  This describes
+-       ncurses version 6.0 (patch 20170107).
++       ncurses version 6.0 (patch 20170114).
+ 
+        The ncurses library emulates the curses library of  System
+        V  Release  4  UNIX,  and  XPG4 (X/Open Portability Guide)
+Index: doc/html/man/ncurses6-config.1.html
+--- ncurses-6.0-20170107+/doc/html/man/ncurses6-config.1.html	2017-01-07 20:05:43.000000000 +0000
++++ ncurses-6.0-20170114/doc/html/man/ncurses6-config.1.html	2017-01-14 22:55:37.000000000 +0000
+@@ -114,7 +114,7 @@
+

    SEE ALSO

    +        curses(3x)
+ 
+-       This describes ncurses version 6.0 (patch 20170107).
++       This describes ncurses version 6.0 (patch 20170114).
+ 
+ 
+ 
+Index: doc/html/man/panel.3x.html
+--- ncurses-6.0-20170107+/doc/html/man/panel.3x.html	2017-01-07 20:05:43.000000000 +0000
++++ ncurses-6.0-20170114/doc/html/man/panel.3x.html	2017-01-14 22:55:37.000000000 +0000
+@@ -208,7 +208,7 @@
+

    SEE ALSO

    +        curses(3x), curs_variables(3x),
+ 
+-       This describes ncurses version 6.0 (patch 20170107).
++       This describes ncurses version 6.0 (patch 20170114).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/tabs.1.html
+--- ncurses-6.0-20170107+/doc/html/man/tabs.1.html	2017-01-07 20:05:43.000000000 +0000
++++ ncurses-6.0-20170114/doc/html/man/tabs.1.html	2017-01-14 22:55:37.000000000 +0000
+@@ -170,7 +170,7 @@
+

    SEE ALSO

    +        tset(1), infocmp(1m), curses(3x), terminfo(5).
+ 
+-       This describes ncurses version 6.0 (patch 20170107).
++       This describes ncurses version 6.0 (patch 20170114).
+ 
+ 
+ 
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.0-20170107+/doc/html/man/terminfo.5.html	2017-01-07 20:43:30.000000000 +0000
++++ ncurses-6.0-20170114/doc/html/man/terminfo.5.html	2017-01-14 22:55:37.000000000 +0000
+@@ -75,7 +75,7 @@
+        nals by giving a set of capabilities which they  have,  by
+        specifying how to perform screen operations, and by speci-
+        fying padding requirements and  initialization  sequences.
+-       This describes ncurses version 6.0 (patch 20170107).
++       This describes ncurses version 6.0 (patch 20170114).
+ 
+        Entries in terminfo consist of a sequence of `,' separated
+        fields (embedded commas may be escaped with a backslash or
+Index: doc/html/man/tic.1m.html
+--- ncurses-6.0-20170107+/doc/html/man/tic.1m.html	2017-01-07 20:05:43.000000000 +0000
++++ ncurses-6.0-20170114/doc/html/man/tic.1m.html	2017-01-14 22:55:37.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -277,12 +277,14 @@
+             program, and exits.
+ 
+        -vn  specifies  that  (verbose) output be written to stan-
+-            dard error trace information showing tic's  progress.
+-            The  optional  parameter  n is a number from 1 to 10,
+-            inclusive, indicating the desired level of detail  of
+-            information.   If  n is omitted, the default level is
+-            1.  If n is specified and greater than 1,  the  level
+-            of detail is increased.
++            dard error trace information showing tic's progress.
++
++            The optional parameter n is a number from  1  to  10,
++            inclusive,  indicating the desired level of detail of
++            information.  If ncurses  is  built  without  tracing
++            support,  the optional parameter is ignored.  If n is
++            omitted, the default level is 1.  If n  is  specified
++            and greater than 1, the level of detail is increased.
+ 
+             The debug flag levels are as follows:
+ 
+@@ -401,7 +403,7 @@
+        infocmp(1m),   captoinfo(1m),   infotocap(1m),    toe(1m),
+        curses(3x), term(5).  terminfo(5).
+ 
+-       This describes ncurses version 6.0 (patch 20170107).
++       This describes ncurses version 6.0 (patch 20170114).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/toe.1m.html
+--- ncurses-6.0-20170107+/doc/html/man/toe.1m.html	2017-01-07 20:05:43.000000000 +0000
++++ ncurses-6.0-20170114/doc/html/man/toe.1m.html	2017-01-14 22:55:37.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -100,11 +100,14 @@
+               depend on it, followed by a newline.
+ 
+        -vn    specifies that (verbose) output be written to stan-
+-              dard  error,  showing toe's progress.  The optional
+-              parameter n is a number from 1 to  10,  interpreted
+-              as for tic(1m).
++              dard error, showing toe's progress.
+ 
+-       -V     reports  the  version  of ncurses which was used in
++              The  optional parameter n is a number from 1 to 10,
++              interpreted as for tic(1m).  If  ncurses  is  built
++              without  tracing support, the optional parameter is
++              ignored.
++
++       -V     reports the version of ncurses which  was  used  in
+               this program, and exits.
+ 
+ 
+@@ -114,10 +117,10 @@
+ 
+ 
+

    SEE ALSO

    +-       tic(1m),   infocmp(1m),   captoinfo(1m),    infotocap(1m),
++       tic(1m),    infocmp(1m),   captoinfo(1m),   infotocap(1m),
+        curses(3x), terminfo(5).
+ 
+-       This describes ncurses version 6.0 (patch 20170107).
++       This describes ncurses version 6.0 (patch 20170114).
+ 
+ 
+ 
+Index: doc/html/man/tput.1.html
+--- ncurses-6.0-20170107+/doc/html/man/tput.1.html	2017-01-07 23:09:13.000000000 +0000
++++ ncurses-6.0-20170114/doc/html/man/tput.1.html	2017-01-14 22:55:37.000000000 +0000
+@@ -27,7 +27,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: tput.1,v 1.50 2017/01/07 23:03:28 tom Exp @
++  * @Id: tput.1,v 1.51 2017/01/14 20:49:40 tom Exp @
+ -->
+ 
+ 
+@@ -394,9 +394,7 @@
+        AT&T  System  V  provided  a different tput command, whose
+        init and reset  subcommands (more than half  the  program)
+        were incorporated from the reset feature of BSD tset writ-
+-       ten by Eric Allman.  Later the corresponding  source  code
+-       for  reset  was  removed  from the BSD tset (in June 1993,
+-       released in 4.4BSD-Lite a year later).
++       ten by Eric Allman.
+ 
+        Keith Bostic replaced the BSD tput command in 1989 with  a
+        new  implementation  based  on  the  AT&T System V program
+@@ -500,7 +498,7 @@
+        clear(1),    stty(1),   tabs(1),   tset(1),   terminfo(5),
+        curs_termcap(3x).
+ 
+-       This describes ncurses version 6.0 (patch 20170107).
++       This describes ncurses version 6.0 (patch 20170114).
+ 
+ 
+ 
+Index: doc/html/man/tset.1.html
+--- ncurses-6.0-20170107+/doc/html/man/tset.1.html	2017-01-07 23:09:13.000000000 +0000
++++ ncurses-6.0-20170114/doc/html/man/tset.1.html	2017-01-14 22:55:37.000000000 +0000
+@@ -26,7 +26,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: tset.1,v 1.47 2017/01/07 22:59:51 tom Exp @
++  * @Id: tset.1,v 1.48 2017/01/14 20:55:07 tom Exp @
+ -->
+ 
+ 
+@@ -285,18 +285,34 @@
+ 
+ 
+

    HISTORY

    +-       A  reset  command appeared in 2BSD (1979), written by Kurt
+-       Shoens.
++       A  reset command appeared in 2BSD (April 1979), written by
++       Kurt Shoens.  This program set the erase and kill  charac-
++       ters  to  ^H  (backspace) and @ respectively.  Mark Horton
++       improved that in 3BSD (October 1979), adding  intr,  quit,
++       start/stop and eof characters as well as changing the pro-
++       gram to avoid modifying any user settings.
++
++       Later in 4.1BSD (December 1980), Mark Horton added a  call
++       to  the  tset  program  using the -I and -Q options, i.e.,
++       using that to improve  the  terminal  modes.   With  those
++       options,  that  version  of  reset did not use the termcap
++       database.
+ 
+        A separate tset command was provided in 2BSD by Eric  All-
+        man.   While  the oldest published source (from 1979) pro-
+-       vides both programs, Allman's comments in the 2BSD  source
+-       code indicate that he began work in October 1977, continu-
+-       ing development over the next few years.
+-
+-       In September 1980, Eric Allman modified tset to provide  a
+-       "reset"  feature  when  the  program was invoked as reset.
+-       This version appeared in 4.1cBSD, late in 1982.
++       vides both tset and reset, Allman's comments in  the  2BSD
++       source  code  indicate that he began work in October 1977,
++       continuing development over the next few years.
++
++       In September 1980, Eric Allman modified tset,  adding  the
++       code  from  the  existing  "reset"  feature  when tset was
++       invoked as reset.  Rather than simply copying the existing
++       program,  in  this  merged  version, tset used the termcap
++       database to do additional (re)initialization of the termi-
++       nal.  This version appeared in 4.1cBSD, late in 1982.
++
++       Other  developers  (e.g., Keith Bostic and Jim Bloom) con-
++       tinued to modify tset until 4.4BSD was released in 1993.
+ 
+        The ncurses implementation was lightly  adapted  from  the
+        4.4BSD  sources for a terminfo environment by Eric S. Ray-
+@@ -419,7 +435,7 @@
+        csh(1),   sh(1),   stty(1),   curs_terminfo(3x),   tty(4),
+        terminfo(5), ttys(5), environ(7)
+ 
+-       This describes ncurses version 6.0 (patch 20170107).
++       This describes ncurses version 6.0 (patch 20170114).
+ 
+ 
+ 
+Index: man/curs_trace.3x
+Prereq:  1.17 
+--- ncurses-6.0-20170107+/man/curs_trace.3x	2017-01-07 18:45:42.000000000 +0000
++++ ncurses-6.0-20170114/man/curs_trace.3x	2017-01-14 19:46:40.000000000 +0000
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_trace.3x,v 1.17 2017/01/07 18:45:42 tom Exp $
++.\" $Id: curs_trace.3x,v 1.18 2017/01/14 19:46:40 tom Exp $
+ .de bP
+ .IP \(bu 4
+ ..
+@@ -190,6 +190,25 @@
+ .hy
+ .ad
+ .RE
++.SS Command-line Utilities
++.PP
++The command-line utilities such as \fBtic\fP(1) provide a verbose option
++which extends the set of messages written using the \fBtrace\fP function.
++Both of these (\fB\-v\fP and \fBtrace\fP)
++use the same variable (\fB_nc_tracing\fP),
++which determines the messages which are written.
++.PP
++Because the command-line utilities may call initialization functions
++such as \fBsetupterm\fP, \fBtgetent\fP or \fBuse_extended_names\fP,
++some of their debugging output may be directed to the \fItrace\fP file
++if the \fBNCURSES_TRACE\fP environment variable is set:
++.bP
++messages produced in the utility are written to the standard error.
++.bP
++messages produced by the underlying library are written to \fItrace\fP.
++.PP
++If ncurses is built without tracing, none of the latter are produced,
++and fewer diagnostics are provided by the command-line utilities.
+ .SH RETURN VALUE
+ Routines which return a value are designed to be used as parameters
+ to the \fB_tracef\fR routine.
+Index: man/infocmp.1m
+Prereq:  1.59 
+--- ncurses-6.0-20170107+/man/infocmp.1m	2016-10-22 19:54:35.000000000 +0000
++++ ncurses-6.0-20170114/man/infocmp.1m	2017-01-14 19:55:27.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: infocmp.1m,v 1.59 2016/10/22 19:54:35 tom Exp $
++.\" $Id: infocmp.1m,v 1.60 2017/01/14 19:55:27 tom Exp $
+ .TH @INFOCMP@ 1M ""
+ .ds n 5
+ .de bP
+@@ -476,7 +476,10 @@
+ .TP 5
+ \fB\-v\fR \fIn\fR
+ prints out tracing information on standard error as the program runs.
+-Higher values of n induce greater verbosity.
++.IP
++The optional parameter \fIn\fR is a number from 1 to 10, inclusive,
++indicating the desired level of detail of information.
++If ncurses is built without tracing support, the optional parameter is ignored.
+ .TP
+ \fB\-W\fR
+ By itself, the \fB\-w\fP option will not force long strings to be wrapped.
+Index: man/manhtml.aliases
+Prereq:  1.5 
+--- ncurses-6.0-20170107+/man/manhtml.aliases	2017-01-07 20:28:43.000000000 +0000
++++ ncurses-6.0-20170114/man/manhtml.aliases	2017-01-14 19:57:16.000000000 +0000
+@@ -1,4 +1,31 @@
+-# $Id: manhtml.aliases,v 1.5 2017/01/07 20:28:43 tom Exp $
++# $Id: manhtml.aliases,v 1.6 2017/01/14 19:57:16 tom Exp $
++#***************************************************************************
++# Copyright (c) 2013-2016,2017 Free Software Foundation, Inc.              *
++#                                                                          *
++# Permission is hereby granted, free of charge, to any person obtaining a  *
++# copy of this software and associated documentation files (the            *
++# "Software"), to deal in the Software without restriction, including      *
++# without limitation the rights to use, copy, modify, merge, publish,      *
++# distribute, distribute with modifications, sublicense, and/or sell       *
++# copies of the Software, and to permit persons to whom the Software is    *
++# furnished to do so, subject to the following conditions:                 *
++#                                                                          *
++# The above copyright notice and this permission notice shall be included  *
++# in all copies or substantial portions of the Software.                   *
++#                                                                          *
++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
++# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
++# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
++# IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
++# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
++# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
++# THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
++#                                                                          *
++# Except as contained in this notice, the name(s) of the above copyright   *
++# holders shall not be used in advertising or otherwise to promote the     *
++# sale, use or other dealings in this Software without prior written       *
++# authorization.                                                           *
++#***************************************************************************
+ # Items in this list will be linked to the corresponding manpages by man2html
+ addch(3X)		curs_addch(3X)
+ delscreen(3X)		curs_initscr(3X)
+Index: man/tic.1m
+Prereq:  1.62 
+--- ncurses-6.0-20170107+/man/tic.1m	2016-10-01 17:14:50.000000000 +0000
++++ ncurses-6.0-20170114/man/tic.1m	2017-01-14 19:50:09.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tic.1m,v 1.62 2016/10/01 17:14:50 tom Exp $
++.\" $Id: tic.1m,v 1.63 2017/01/14 19:50:09 tom Exp $
+ .TH @TIC@ 1M ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -307,8 +307,10 @@
+ \fB\-v\fR\fIn\fR
+ specifies that (verbose) output be written to standard error trace
+ information showing \fB@TIC@\fR's progress.
++.IP
+ The optional parameter \fIn\fR is a number from 1 to 10, inclusive,
+ indicating the desired level of detail of information.
++If ncurses is built without tracing support, the optional parameter is ignored.
+ If \fIn\fR is omitted, the default level is 1.
+ If \fIn\fR is specified and greater than 1, the level of
+ detail is increased.
+Index: man/toe.1m
+Prereq:  1.27 
+--- ncurses-6.0-20170107+/man/toe.1m	2015-08-29 22:04:48.000000000 +0000
++++ ncurses-6.0-20170114/man/toe.1m	2017-01-14 19:55:36.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2011,2015 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2015,2017 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: toe.1m,v 1.27 2015/08/29 22:04:48 tom Exp $
++.\" $Id: toe.1m,v 1.28 2017/01/14 19:55:36 tom Exp $
+ .TH @TOE@ 1M ""
+ .ds n 5
+ .ds d @TERMINFO@
+@@ -91,8 +91,10 @@
+ \fB\-v\fR\fIn\fR
+ specifies that (verbose) output be written to standard error,
+ showing \fB@TOE@\fR's progress.
++.IP
+ The optional parameter \fIn\fR is a number from 1 to 10,
+ interpreted as for \fB@TIC@\fR(1M).
++If ncurses is built without tracing support, the optional parameter is ignored.
+ .TP
+ \fB\-V\fR
+ reports the version of ncurses which was used in this program,
+Index: man/tput.1
+Prereq:  1.50 
+--- ncurses-6.0-20170107+/man/tput.1	2017-01-07 23:03:28.000000000 +0000
++++ ncurses-6.0-20170114/man/tput.1	2017-01-14 20:49:40.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tput.1,v 1.50 2017/01/07 23:03:28 tom Exp $
++.\" $Id: tput.1,v 1.51 2017/01/14 20:49:40 tom Exp $
+ .TH @TPUT@ 1 ""
+ .ds d @TERMINFO@
+ .ds n 1
+@@ -401,9 +401,6 @@
+ whose \fBinit\fP and \fBreset\fP  subcommands
+ (more than half the program) were incorporated from
+ the \fBreset\fP feature of BSD \fBtset\fP written by Eric Allman.
+-Later the corresponding source code for \fIreset\fP
+-was removed from the BSD \fBtset\fP
+-(in June 1993, released in 4.4BSD-Lite a year later).
+ .PP
+ Keith Bostic replaced the BSD \fBtput\fP command in 1989 with a new implementation
+ based on the AT&T System V program \fBtput\fP.
+Index: man/tset.1
+Prereq:  1.47 
+--- ncurses-6.0-20170107+/man/tset.1	2017-01-07 22:59:51.000000000 +0000
++++ ncurses-6.0-20170114/man/tset.1	2017-01-14 20:55:07.000000000 +0000
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tset.1,v 1.47 2017/01/07 22:59:51 tom Exp $
++.\" $Id: tset.1,v 1.48 2017/01/14 20:55:07 tom Exp $
+ .TH @TSET@ 1 ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -274,18 +274,38 @@
+ any exclamation marks (\*(``!\*('').
+ .SH HISTORY
+ .PP
+-A \fBreset\fP command appeared in 2BSD (1979), written by Kurt Shoens.
++A \fBreset\fP command appeared in 2BSD (April 1979), written by Kurt Shoens.
++This program set the \fIerase\fP and \fIkill\fP characters
++to \fB^H\fP (backspace) and \fB@\fP respectively.
++Mark Horton improved that in 3BSD (October 1979), adding
++\fIintr\fP, \fIquit\fP, \fIstart\fP/\fIstop\fP and \fIeof\fP characters
++as well as changing the program to avoid modifying any user settings.
++.PP
++Later in 4.1BSD (December 1980),
++Mark Horton added a call to the \fBtset\fP program
++using the \fB\-I\fP and \fB\-Q\fP options, i.e.,
++using that to improve the terminal modes.
++With those options,
++that version of \fBreset\fP did not use the termcap database.
+ .PP
+ A separate \fBtset\fP command was provided in 2BSD by Eric Allman.
+-While the oldest published source (from 1979) provides both programs,
++While the oldest published source (from 1979)
++provides both \fBtset\fP and \fBreset\fP,
+ Allman's comments in the 2BSD source code indicate
+ that he began work in October 1977,
+ continuing development over the next few years.
+ .PP
+-In September 1980, Eric Allman modified \fBtset\fP to provide a \*(lqreset\*(rq
+-feature when the program was invoked as \fBreset\fP.
++In September 1980, Eric Allman modified \fBtset\fP,
++adding the code from the existing \*(lqreset\*(rq
++feature when \fBtset\fP was invoked as \fBreset\fP.
++Rather than simply copying the existing program,
++in this merged version, \fBtset\fP used the termcap database
++to do additional (re)initialization of the terminal.
+ This version appeared in 4.1cBSD, late in 1982.
+ .PP
++Other developers (e.g., Keith Bostic and Jim Bloom)
++continued to modify \fBtset\fP until 4.4BSD was released in 1993.
++.PP
+ The \fBncurses\fR implementation
+ was lightly adapted from the 4.4BSD sources for a terminfo environment by Eric
+ S. Raymond .
+Index: ncurses/curses.priv.h
+Prereq:  1.557 
+--- ncurses-6.0-20170107+/ncurses/curses.priv.h	2017-01-07 19:45:37.000000000 +0000
++++ ncurses-6.0-20170114/ncurses/curses.priv.h	2017-01-14 17:52:49.000000000 +0000
+@@ -34,7 +34,7 @@
+  ****************************************************************************/
+ 
+ /*
+- * $Id: curses.priv.h,v 1.557 2017/01/07 19:45:37 tom Exp $
++ * $Id: curses.priv.h,v 1.558 2017/01/14 17:52:49 tom Exp $
+  *
+  *	curses.priv.h
+  *
+@@ -901,6 +901,7 @@
+ #endif
+ 
+ #ifdef TRACE
++	bool		trace_opened;
+ 	char		trace_fname[PATH_MAX];
+ 	int		trace_level;
+ 	FILE		*trace_fp;
+Index: ncurses/tinfo/lib_data.c
+Prereq:  1.69 
+--- ncurses-6.0-20170107+/ncurses/tinfo/lib_data.c	2017-01-07 19:51:37.000000000 +0000
++++ ncurses-6.0-20170114/ncurses/tinfo/lib_data.c	2017-01-14 17:52:32.000000000 +0000
+@@ -42,7 +42,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_data.c,v 1.69 2017/01/07 19:51:37 tom Exp $")
++MODULE_ID("$Id: lib_data.c,v 1.70 2017/01/14 17:52:32 tom Exp $")
+ 
+ /*
+  * OS/2's native linker complains if we don't initialize public data when
+@@ -168,6 +168,7 @@
+ #endif
+ 
+ #ifdef TRACE
++    FALSE,			/* trace_opened */
+     CHARS_0s,			/* trace_fname */
+     0,				/* trace_level */
+     NULL,			/* trace_fp */
+Index: ncurses/trace/lib_trace.c
+Prereq:  1.85 
+--- ncurses-6.0-20170107+/ncurses/trace/lib_trace.c	2016-12-31 13:50:06.000000000 +0000
++++ ncurses-6.0-20170114/ncurses/trace/lib_trace.c	2017-01-14 17:53:42.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2013,2016 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -47,7 +47,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_trace.c,v 1.85 2016/12/31 13:50:06 tom Exp $")
++MODULE_ID("$Id: lib_trace.c,v 1.86 2017/01/14 17:53:42 tom Exp $")
+ 
+ NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */
+ 
+@@ -87,6 +87,7 @@
+ 
+ #define MyFP		_nc_globals.trace_fp
+ #define MyFD		_nc_globals.trace_fd
++#define MyInit		_nc_globals.trace_opened
+ #define MyPath		_nc_globals.trace_fname
+ #define MyLevel		_nc_globals.trace_level
+ #define MyNested	_nc_globals.nested_tracef
+@@ -95,6 +96,7 @@
+ trace(const unsigned int tracelevel)
+ {
+     if ((MyFP == 0) && tracelevel) {
++	MyInit = TRUE;
+ 	if (MyFD >= 0) {
+ 	    MyFP = fdopen(MyFD, "wb");
+ 	} else {
+@@ -160,7 +162,7 @@
+ 
+ #ifdef TRACE
+     /* verbose-trace in the command-line utilities relies on this */
+-    if (fp == 0 && _nc_tracing >= DEBUG_LEVEL(1))
++    if (fp == 0 && !MyInit && _nc_tracing >= DEBUG_LEVEL(1))
+ 	fp = stderr;
+ #endif
+ 
+Index: package/debian-mingw/changelog
+--- ncurses-6.0-20170107+/package/debian-mingw/changelog	2017-01-07 15:27:12.000000000 +0000
++++ ncurses-6.0-20170114/package/debian-mingw/changelog	2017-01-14 15:30:30.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20170107) unstable; urgency=low
++ncurses6 (6.0+20170114) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 07 Jan 2017 10:27:12 -0500
++ -- Thomas E. Dickey   Sat, 14 Jan 2017 10:30:30 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.0-20170107+/package/debian-mingw64/changelog	2017-01-07 15:27:12.000000000 +0000
++++ ncurses-6.0-20170114/package/debian-mingw64/changelog	2017-01-14 15:30:30.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20170107) unstable; urgency=low
++ncurses6 (6.0+20170114) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 07 Jan 2017 10:27:12 -0500
++ -- Thomas E. Dickey   Sat, 14 Jan 2017 10:30:30 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.0-20170107+/package/debian/changelog	2017-01-07 15:27:12.000000000 +0000
++++ ncurses-6.0-20170114/package/debian/changelog	2017-01-14 15:30:30.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20170107) unstable; urgency=low
++ncurses6 (6.0+20170114) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 07 Jan 2017 10:27:12 -0500
++ -- Thomas E. Dickey   Sat, 14 Jan 2017 10:30:30 -0500
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.192 
+--- ncurses-6.0-20170107+/package/mingw-ncurses.nsi	2017-01-07 15:27:12.000000000 +0000
++++ ncurses-6.0-20170114/package/mingw-ncurses.nsi	2017-01-14 15:30:30.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.192 2017/01/07 15:27:12 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.193 2017/01/14 15:30:30 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "0"
+ !define VERSION_YYYY  "2017"
+-!define VERSION_MMDD  "0107"
++!define VERSION_MMDD  "0114"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.0-20170107+/package/mingw-ncurses.spec	2017-01-07 15:27:12.000000000 +0000
++++ ncurses-6.0-20170114/package/mingw-ncurses.spec	2017-01-14 15:30:30.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.0
+-Release: 20170107
++Release: 20170114
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.0-20170107+/package/ncurses.spec	2017-01-07 15:27:12.000000000 +0000
++++ ncurses-6.0-20170114/package/ncurses.spec	2017-01-14 15:30:30.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.0
+-Release: 20170107
++Release: 20170114
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/ncurses-6.0-20151017.patch b/ncurses-6.0-20170121.patch
similarity index 50%
rename from ncurses-6.0-20151017.patch
rename to ncurses-6.0-20170121.patch
index 6bb1cd3..7d0f328 100644
--- a/ncurses-6.0-20151017.patch
+++ b/ncurses-6.0-20170121.patch
@@ -1,4 +1,4 @@
-# ncurses 6.0 - patch 20151017 - Thomas E. Dickey
+# ncurses 6.0 - patch 20170121 - Thomas E. Dickey
 #
 # ------------------------------------------------------------------------------
 #
@@ -10,14348 +10,12319 @@
 #	http://invisible-mirror.net/archives/ncurses/6.0 
 #
 # ------------------------------------------------------------------------------
-# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20151017.patch.gz
+# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20170121.patch.gz
 # patch by Thomas E. Dickey 
-# created  Sun Oct 18 00:40:46 UTC 2015
+# created  Sun Jan 22 02:22:50 UTC 2017
 # ------------------------------------------------------------------------------
-# Ada95/aclocal.m4                 |   15 
-# Ada95/configure                  |  977 +++++------
-# NEWS                             |   16 
-# VERSION                          |    2 
-# aclocal.m4                       |   27 
-# c++/Makefile.in                  |    4 
-# configure                        | 3156 ++++++++++++++++++-------------------
-# configure.in                     |   15 
-# dist.mk                          |    4 
-# ncurses/Makefile.in              |    4 
-# ncurses/base/lib_color.c         |    4 
-# ncurses/base/lib_mouse.c         |    4 
-# package/debian-mingw/changelog   |    4 
-# package/debian-mingw64/changelog |    4 
-# package/debian/changelog         |    4 
-# package/mingw-ncurses.nsi        |    4 
-# package/mingw-ncurses.spec       |    2 
-# package/ncurses.spec             |    2 
-# test/aclocal.m4                  |    7 
-# test/configure                   | 2585 +++++++++++++++---------------
-# 20 files changed, 3457 insertions(+), 3383 deletions(-)
+# Ada95/aclocal.m4                      |   25 
+# Ada95/configure                       |  636 +++---
+# NEWS                                  |   13 
+# VERSION                               |    2 
+# aclocal.m4                            |   77 
+# configure                             | 2972 ++++++++++++++++----------------
+# dist.mk                               |    4 
+# doc/html/man/adacurses6-config.1.html |    2 
+# doc/html/man/captoinfo.1m.html        |    2 
+# doc/html/man/clear.1.html             |    2 
+# doc/html/man/form.3x.html             |    2 
+# doc/html/man/infocmp.1m.html          |    2 
+# doc/html/man/infotocap.1m.html        |    2 
+# doc/html/man/menu.3x.html             |    2 
+# doc/html/man/ncurses.3x.html          |    2 
+# doc/html/man/ncurses6-config.1.html   |    2 
+# doc/html/man/panel.3x.html            |    2 
+# doc/html/man/tabs.1.html              |    2 
+# doc/html/man/terminfo.5.html          |    2 
+# doc/html/man/tic.1m.html              |    2 
+# doc/html/man/toe.1m.html              |    2 
+# doc/html/man/tput.1.html              |  263 +-
+# doc/html/man/tset.1.html              |    2 
+# include/curses.h.in                   |    6 
+# man/tput.1                            |   31 
+# ncurses/curses.priv.h                 |   10 
+# package/debian-mingw/changelog        |    4 
+# package/debian-mingw64/changelog      |    4 
+# package/debian/changelog              |    4 
+# package/mingw-ncurses.nsi             |    4 
+# package/mingw-ncurses.spec            |    2 
+# package/ncurses.spec                  |    2 
+# progs/tput.c                          |   11 
+# test/aclocal.m4                       |    7 
+# test/blue.c                           |   14 
+# test/configure                        | 2843 +++++++++++++++---------------
+# test/demo_defkey.c                    |    6 
+# 37 files changed, 3632 insertions(+), 3338 deletions(-)
 # ------------------------------------------------------------------------------
 Index: Ada95/aclocal.m4
-Prereq:  1.107 
---- ncurses-6.0-20151010+/Ada95/aclocal.m4	2015-10-10 19:52:33.000000000 +0000
-+++ ncurses-6.0-20151017/Ada95/aclocal.m4	2015-10-17 23:07:06.000000000 +0000
+Prereq:  1.116 
+--- ncurses-6.0-20170114+/Ada95/aclocal.m4	2016-09-04 00:11:44.000000000 +0000
++++ ncurses-6.0-20170121/Ada95/aclocal.m4	2017-01-21 22:20:17.000000000 +0000
+@@ -1,5 +1,5 @@
+ dnl***************************************************************************
+-dnl Copyright (c) 2010-2015,2016 Free Software Foundation, Inc.              *
++dnl Copyright (c) 2010-2016,2017 Free Software Foundation, Inc.              *
+ dnl                                                                          *
+ dnl Permission is hereby granted, free of charge, to any person obtaining a  *
+ dnl copy of this software and associated documentation files (the            *
 @@ -28,7 +28,7 @@
  dnl
  dnl Author: Thomas E. Dickey
  dnl
--dnl $Id: aclocal.m4,v 1.107 2015/10/10 19:52:33 tom Exp $
-+dnl $Id: aclocal.m4,v 1.108 2015/10/17 23:07:06 tom Exp $
+-dnl $Id: aclocal.m4,v 1.116 2016/09/04 00:11:44 tom Exp $
++dnl $Id: aclocal.m4,v 1.117 2017/01/21 22:20:17 tom Exp $
  dnl Macros used in NCURSES Ada95 auto-configuration script.
  dnl
  dnl These macros are maintained separately from NCURSES.  The copyright on
-@@ -1755,7 +1755,7 @@
- $1="$cf_library_path_list [$]$1"
+@@ -1627,7 +1627,7 @@
+ fi
  ])dnl
  dnl ---------------------------------------------------------------------------
--dnl CF_LIB_PREFIX version: 11 updated: 2015/04/18 08:56:57
-+dnl CF_LIB_PREFIX version: 12 updated: 2015/10/17 19:03:33
- dnl -------------
- dnl Compute the library-prefix for the given host system
- dnl $1 = variable to set
-@@ -1763,7 +1763,11 @@
- [
- 	case $cf_cv_system_name in
- 	(OS/2*|os2*)
--		LIB_PREFIX=''
-+		if test "$DFT_LWR_MODEL" = libtool; then
-+			LIB_PREFIX='lib'
-+		else
-+			LIB_PREFIX=''
-+		fi
- 		;;
- 	(*)	LIB_PREFIX='lib'
- 		;;
-@@ -3849,7 +3853,7 @@
- ])
+-dnl CF_LARGEFILE version: 9 updated: 2015/04/18 08:56:57
++dnl CF_LARGEFILE version: 10 updated: 2017/01/21 11:06:25
+ dnl ------------
+ dnl Add checks for large file support.
+ AC_DEFUN([CF_LARGEFILE],[
+@@ -1649,6 +1649,7 @@
+ 
+ 	AC_CACHE_CHECK(whether to use struct dirent64, cf_cv_struct_dirent64,[
+ 		AC_TRY_COMPILE([
++#pragma GCC diagnostic error "-Wincompatible-pointer-types"
+ #include 
+ #include 
+ 		],[
+@@ -1854,7 +1855,7 @@
+ 	test -n "$LIB_SUFFIX" && $2="${LIB_SUFFIX}[$]{$2}"
  ])dnl
  dnl ---------------------------------------------------------------------------
--dnl CF_XOPEN_SOURCE version: 49 updated: 2015/04/12 15:39:00
-+dnl CF_XOPEN_SOURCE version: 50 updated: 2015/10/17 19:03:33
- dnl ---------------
- dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
- dnl or adapt to the vendor's definitions to get equivalent functionality,
-@@ -3919,6 +3923,9 @@
- (openbsd*)
- 	# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
- 	;;
-+(os2*)
-+	cf_XOPEN_SOURCE=
-+	;;
- (osf[[45]]*)
- 	cf_xopen_source="-D_OSF_SOURCE"
- 	;;
-Index: Ada95/configure
---- ncurses-6.0-20151010+/Ada95/configure	2015-10-10 19:53:00.000000000 +0000
-+++ ncurses-6.0-20151017/Ada95/configure	2015-10-17 23:07:23.000000000 +0000
-@@ -8943,7 +8943,11 @@
- 
- 	case $cf_cv_system_name in
- 	(OS/2*|os2*)
--		LIB_PREFIX=''
-+		if test "$DFT_LWR_MODEL" = libtool; then
-+			LIB_PREFIX='lib'
-+		else
-+			LIB_PREFIX=''
-+		fi
- 		;;
- 	(*)	LIB_PREFIX='lib'
- 		;;
-@@ -8966,7 +8970,7 @@
- 	test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT=''
- fi
- 
--echo "$as_me:8969: checking for default loader flags" >&5
-+echo "$as_me:8973: checking for default loader flags" >&5
- echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
- case $DFT_LWR_MODEL in
- (normal)  LD_MODEL=''   ;;
-@@ -8974,11 +8978,11 @@
- (profile) LD_MODEL='-pg';;
- (shared)  LD_MODEL=''   ;;
- esac
--echo "$as_me:8977: result: $LD_MODEL" >&5
-+echo "$as_me:8981: result: $LD_MODEL" >&5
- echo "${ECHO_T}$LD_MODEL" >&6
- 
- LD_RPATH_OPT=
--echo "$as_me:8981: checking for an rpath option" >&5
-+echo "$as_me:8985: checking for an rpath option" >&5
- echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
- case $cf_cv_system_name in
- (irix*)
-@@ -9009,12 +9013,12 @@
- (*)
- 	;;
- esac
--echo "$as_me:9012: result: $LD_RPATH_OPT" >&5
-+echo "$as_me:9016: result: $LD_RPATH_OPT" >&5
- echo "${ECHO_T}$LD_RPATH_OPT" >&6
- 
- case "x$LD_RPATH_OPT" in
- (x-R*)
--	echo "$as_me:9017: checking if we need a space after rpath option" >&5
-+	echo "$as_me:9021: 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"
- 
-@@ -9035,7 +9039,7 @@
- LIBS="$cf_add_libs"
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9038 "configure"
-+#line 9042 "configure"
- #include "confdefs.h"
- 
- int
-@@ -9047,16 +9051,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9050: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9054: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9053: \$? = $ac_status" >&5
-+  echo "$as_me:9057: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9056: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9060: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9059: \$? = $ac_status" >&5
-+  echo "$as_me:9063: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_rpath_space=no
- else
-@@ -9066,7 +9070,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	LIBS="$cf_save_LIBS"
--	echo "$as_me:9069: result: $cf_rpath_space" >&5
-+	echo "$as_me:9073: result: $cf_rpath_space" >&5
- echo "${ECHO_T}$cf_rpath_space" >&6
- 	test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
- 	;;
-@@ -9087,7 +9091,7 @@
- 	cf_ld_rpath_opt=
- 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
- 
--	echo "$as_me:9090: checking if release/abi version should be used for shared libs" >&5
-+	echo "$as_me:9094: checking if release/abi version should be used for shared libs" >&5
- echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6
- 
- # Check whether --with-shlib-version or --without-shlib-version was given.
-@@ -9102,9 +9106,9 @@
- 		cf_cv_shlib_version=$withval
- 		;;
- 	(*)
--		echo "$as_me:9105: result: $withval" >&5
-+		echo "$as_me:9109: result: $withval" >&5
- echo "${ECHO_T}$withval" >&6
--		{ { echo "$as_me:9107: error: option value must be one of: rel, abi, or auto" >&5
-+		{ { echo "$as_me:9111: error: option value must be one of: rel, abi, or auto" >&5
- echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
-    { (exit 1); exit 1; }; }
- 		;;
-@@ -9113,7 +9117,7 @@
- else
-   cf_cv_shlib_version=auto
- fi;
--	echo "$as_me:9116: result: $cf_cv_shlib_version" >&5
-+	echo "$as_me:9120: result: $cf_cv_shlib_version" >&5
- echo "${ECHO_T}$cf_cv_shlib_version" >&6
- 
- 	cf_cv_rm_so_locs=no
-@@ -9123,14 +9127,14 @@
- 	CC_SHARED_OPTS=
- 	if test "$GCC" = yes
- 	then
--		echo "$as_me:9126: checking which $CC option to use" >&5
-+		echo "$as_me:9130: checking which $CC option to use" >&5
- echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
- 		cf_save_CFLAGS="$CFLAGS"
- 		for CC_SHARED_OPTS in -fPIC -fpic ''
- 		do
- 			CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 9133 "configure"
-+#line 9137 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -9142,16 +9146,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9145: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9149: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9148: \$? = $ac_status" >&5
-+  echo "$as_me:9152: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9151: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9155: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9154: \$? = $ac_status" >&5
-+  echo "$as_me:9158: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -9160,7 +9164,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		done
--		echo "$as_me:9163: result: $CC_SHARED_OPTS" >&5
-+		echo "$as_me:9167: result: $CC_SHARED_OPTS" >&5
- echo "${ECHO_T}$CC_SHARED_OPTS" >&6
- 		CFLAGS="$cf_save_CFLAGS"
- 	fi
-@@ -9231,7 +9235,7 @@
- 		MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
- 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
- 		cf_cv_shlib_version_infix=yes
--		echo "$as_me:9234: checking if ld -search_paths_first works" >&5
-+		echo "$as_me:9238: checking if ld -search_paths_first works" >&5
- echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6
- if test "${cf_cv_ldflags_search_paths_first+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9240,7 +9244,7 @@
- 			cf_save_LDFLAGS=$LDFLAGS
- 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 9243 "configure"
-+#line 9247 "configure"
- #include "confdefs.h"
- 
- int
-@@ -9252,16 +9256,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9255: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9259: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9258: \$? = $ac_status" >&5
-+  echo "$as_me:9262: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9261: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9265: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9264: \$? = $ac_status" >&5
-+  echo "$as_me:9268: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ldflags_search_paths_first=yes
- else
-@@ -9272,7 +9276,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 				LDFLAGS=$cf_save_LDFLAGS
- fi
--echo "$as_me:9275: result: $cf_cv_ldflags_search_paths_first" >&5
-+echo "$as_me:9279: result: $cf_cv_ldflags_search_paths_first" >&5
- echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
- 		if test $cf_cv_ldflags_search_paths_first = yes; then
- 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
-@@ -9497,7 +9501,7 @@
- 			do
- 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
- 				cat >conftest.$ac_ext <<_ACEOF
--#line 9500 "configure"
-+#line 9504 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -9509,16 +9513,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9512: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9516: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9515: \$? = $ac_status" >&5
-+  echo "$as_me:9519: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9518: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9522: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9521: \$? = $ac_status" >&5
-+  echo "$as_me:9525: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -9555,7 +9559,7 @@
- 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
- 			;;
- 		(*)
--			{ echo "$as_me:9558: WARNING: ignored --with-shlib-version" >&5
-+			{ echo "$as_me:9562: WARNING: ignored --with-shlib-version" >&5
- echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
- 			;;
- 		esac
-@@ -9565,7 +9569,7 @@
- 	if test -n "$cf_try_cflags"
- 	then
- cat > conftest.$ac_ext <
- int main(int argc, char *argv[])
- {
-@@ -9577,18 +9581,18 @@
- 		for cf_opt in $cf_try_cflags
- 		do
- 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
--			echo "$as_me:9580: checking if CFLAGS option -$cf_opt works" >&5
-+			echo "$as_me:9584: checking if CFLAGS option -$cf_opt works" >&5
- echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6
--			if { (eval echo "$as_me:9582: \"$ac_compile\"") >&5
-+			if { (eval echo "$as_me:9586: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9585: \$? = $ac_status" >&5
-+  echo "$as_me:9589: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--				echo "$as_me:9587: result: yes" >&5
-+				echo "$as_me:9591: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 				cf_save_CFLAGS="$CFLAGS"
- 			else
--				echo "$as_me:9591: result: no" >&5
-+				echo "$as_me:9595: result: no" >&5
- echo "${ECHO_T}no" >&6
- 			fi
- 		done
-@@ -9603,17 +9607,17 @@
- 
- 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
- 
--echo "${as_me:-configure}:9606: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
-+echo "${as_me:-configure}:9610: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
- 
- 	test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
- 
--echo "${as_me:-configure}:9610: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
-+echo "${as_me:-configure}:9614: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
- 
- # The test/sample programs in the original tree link using rpath option.
- # Make it optional for packagers.
- if test -n "$LOCAL_LDFLAGS"
- then
--	echo "$as_me:9616: checking if you want to link sample programs with rpath option" >&5
-+	echo "$as_me:9620: checking if you want to link sample programs with rpath option" >&5
- echo $ECHO_N "checking if you want to link sample programs with rpath option... $ECHO_C" >&6
- 
- # Check whether --enable-rpath-link or --disable-rpath-link was given.
-@@ -9623,7 +9627,7 @@
- else
-   with_rpath_link=yes
- fi;
--	echo "$as_me:9626: result: $with_rpath_link" >&5
-+	echo "$as_me:9630: result: $with_rpath_link" >&5
- echo "${ECHO_T}$with_rpath_link" >&6
- 	if test "$with_rpath_link" = no
- 	then
-@@ -9635,7 +9639,7 @@
- ###############################################################################
- 
- ###   use option --enable-broken-linker to force on use of broken-linker support
--echo "$as_me:9638: checking if you want broken-linker support code" >&5
-+echo "$as_me:9642: checking if you want broken-linker support code" >&5
- echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
- 
- # Check whether --enable-broken_linker or --disable-broken_linker was given.
-@@ -9645,7 +9649,7 @@
- else
-   with_broken_linker=${BROKEN_LINKER:-no}
- fi;
--echo "$as_me:9648: result: $with_broken_linker" >&5
-+echo "$as_me:9652: result: $with_broken_linker" >&5
- echo "${ECHO_T}$with_broken_linker" >&6
- 
- BROKEN_LINKER=0
-@@ -9665,7 +9669,7 @@
- 		BROKEN_LINKER=1
- 		test -n "$verbose" && echo "	cygwin linker is broken anyway" 1>&6
- 
--echo "${as_me:-configure}:9668: testing cygwin linker is broken anyway ..." 1>&5
-+echo "${as_me:-configure}:9672: testing cygwin linker is broken anyway ..." 1>&5
- 
- 		;;
- 	esac
-@@ -9711,14 +9715,14 @@
- 	;;
- (linux*|gnu*|mint*|k*bsd*-gnu)
- 
--echo "$as_me:9714: checking if we must define _GNU_SOURCE" >&5
-+echo "$as_me:9718: 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 9721 "configure"
-+#line 9725 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -9733,16 +9737,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9736: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9740: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9739: \$? = $ac_status" >&5
-+  echo "$as_me:9743: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9742: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9746: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9745: \$? = $ac_status" >&5
-+  echo "$as_me:9749: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -9751,7 +9755,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 9754 "configure"
-+#line 9758 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -9766,16 +9770,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9769: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9773: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9772: \$? = $ac_status" >&5
-+  echo "$as_me:9776: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9775: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9779: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9778: \$? = $ac_status" >&5
-+  echo "$as_me:9782: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -9790,7 +9794,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:9793: result: $cf_cv_gnu_source" >&5
-+echo "$as_me:9797: result: $cf_cv_gnu_source" >&5
- echo "${ECHO_T}$cf_cv_gnu_source" >&6
- test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- 
-@@ -9815,16 +9819,16 @@
- 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
- 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
- 
--echo "$as_me:9818: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "$as_me:9822: 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}:9824: testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me:-configure}:9828: testing if the symbol is already defined go no further ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9827 "configure"
-+#line 9831 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -9839,16 +9843,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9842: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9846: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9845: \$? = $ac_status" >&5
-+  echo "$as_me:9849: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9848: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9852: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9851: \$? = $ac_status" >&5
-+  echo "$as_me:9855: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_posix_c_source=no
- else
-@@ -9869,7 +9873,7 @@
- 	 esac
- 	 if test "$cf_want_posix_source" = yes ; then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 9872 "configure"
-+#line 9876 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -9884,16 +9888,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9887: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9891: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9890: \$? = $ac_status" >&5
-+  echo "$as_me:9894: \$? = $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:9897: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9896: \$? = $ac_status" >&5
-+  echo "$as_me:9900: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -9904,15 +9908,15 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	 fi
- 
--echo "${as_me:-configure}:9907: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me:-configure}:9911: 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}:9912: testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me:-configure}:9916: testing if the second compile does not leave our definition intact error ..." 1>&5
- 
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 9915 "configure"
-+#line 9919 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -9927,16 +9931,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9930: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9934: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9933: \$? = $ac_status" >&5
-+  echo "$as_me:9937: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9936: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9940: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9939: \$? = $ac_status" >&5
-+  echo "$as_me:9943: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -9952,7 +9956,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:9955: result: $cf_cv_posix_c_source" >&5
-+echo "$as_me:9959: 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
-@@ -10051,6 +10055,9 @@
- (openbsd*)
- 	# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
- 	;;
-+(os2*)
-+	cf_XOPEN_SOURCE=
-+	;;
- (osf[45]*)
- 	cf_xopen_source="-D_OSF_SOURCE"
- 	;;
-@@ -10070,14 +10077,14 @@
- 	;;
- (*)
- 
--echo "$as_me:10073: checking if we should define _XOPEN_SOURCE" >&5
-+echo "$as_me:10080: 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 10080 "configure"
-+#line 10087 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10096,16 +10103,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10099: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10106: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10102: \$? = $ac_status" >&5
-+  echo "$as_me:10109: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10105: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10112: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10108: \$? = $ac_status" >&5
-+  echo "$as_me:10115: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -10114,7 +10121,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 10117 "configure"
-+#line 10124 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10133,16 +10140,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10136: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10143: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10139: \$? = $ac_status" >&5
-+  echo "$as_me:10146: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10142: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10149: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10145: \$? = $ac_status" >&5
-+  echo "$as_me:10152: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -10157,7 +10164,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:10160: result: $cf_cv_xopen_source" >&5
-+echo "$as_me:10167: result: $cf_cv_xopen_source" >&5
- echo "${ECHO_T}$cf_cv_xopen_source" >&6
- 
- if test "$cf_cv_xopen_source" != no ; then
-@@ -10265,16 +10272,16 @@
- 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
- 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
- 
--echo "$as_me:10268: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "$as_me:10275: 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}:10274: testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me:-configure}:10281: testing if the symbol is already defined go no further ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 10277 "configure"
-+#line 10284 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -10289,16 +10296,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10292: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10299: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10295: \$? = $ac_status" >&5
-+  echo "$as_me:10302: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10298: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10305: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10301: \$? = $ac_status" >&5
-+  echo "$as_me:10308: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_posix_c_source=no
- else
-@@ -10319,7 +10326,7 @@
- 	 esac
- 	 if test "$cf_want_posix_source" = yes ; then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 10322 "configure"
-+#line 10329 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -10334,16 +10341,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10337: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10344: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10340: \$? = $ac_status" >&5
-+  echo "$as_me:10347: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10343: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10350: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10346: \$? = $ac_status" >&5
-+  echo "$as_me:10353: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -10354,15 +10361,15 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	 fi
- 
--echo "${as_me:-configure}:10357: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me:-configure}:10364: 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}:10362: testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me:-configure}:10369: testing if the second compile does not leave our definition intact error ..." 1>&5
- 
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 10365 "configure"
-+#line 10372 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -10377,16 +10384,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10380: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10387: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10383: \$? = $ac_status" >&5
-+  echo "$as_me:10390: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10386: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10393: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10389: \$? = $ac_status" >&5
-+  echo "$as_me:10396: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -10402,7 +10409,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:10405: result: $cf_cv_posix_c_source" >&5
-+echo "$as_me:10412: 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
-@@ -10560,7 +10567,7 @@
- if test -n "$cf_new_cflags" ; then
- 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
- 
--echo "${as_me:-configure}:10563: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
-+echo "${as_me:-configure}:10570: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
- 
- 	CFLAGS="$CFLAGS $cf_new_cflags"
- fi
-@@ -10568,7 +10575,7 @@
- if test -n "$cf_new_cppflags" ; then
- 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
- 
--echo "${as_me:-configure}:10571: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
-+echo "${as_me:-configure}:10578: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
- 
- 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
- fi
-@@ -10576,7 +10583,7 @@
- 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}:10579: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
-+echo "${as_me:-configure}:10586: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
- 
- 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
- fi
-@@ -10584,10 +10591,10 @@
- fi
- 
- if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
--	echo "$as_me:10587: checking if _XOPEN_SOURCE really is set" >&5
-+	echo "$as_me:10594: 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 10590 "configure"
-+#line 10597 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -10602,16 +10609,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10605: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10612: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10608: \$? = $ac_status" >&5
-+  echo "$as_me:10615: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10611: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10618: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10614: \$? = $ac_status" >&5
-+  echo "$as_me:10621: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_XOPEN_SOURCE_set=yes
- else
-@@ -10620,12 +10627,12 @@
- cf_XOPEN_SOURCE_set=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:10623: result: $cf_XOPEN_SOURCE_set" >&5
-+	echo "$as_me:10630: 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 10628 "configure"
-+#line 10635 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -10640,16 +10647,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10643: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10650: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10646: \$? = $ac_status" >&5
-+  echo "$as_me:10653: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10649: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10656: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10652: \$? = $ac_status" >&5
-+  echo "$as_me:10659: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_XOPEN_SOURCE_set_ok=yes
- else
-@@ -10660,19 +10667,19 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		if test $cf_XOPEN_SOURCE_set_ok = no
- 		then
--			{ echo "$as_me:10663: WARNING: _XOPEN_SOURCE is lower than requested" >&5
-+			{ echo "$as_me:10670: WARNING: _XOPEN_SOURCE is lower than requested" >&5
- echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
- 		fi
- 	else
- 
--echo "$as_me:10668: checking if we should define _XOPEN_SOURCE" >&5
-+echo "$as_me:10675: 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 10675 "configure"
-+#line 10682 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10691,16 +10698,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10694: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10701: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10697: \$? = $ac_status" >&5
-+  echo "$as_me:10704: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10700: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10707: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10703: \$? = $ac_status" >&5
-+  echo "$as_me:10710: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -10709,7 +10716,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 10712 "configure"
-+#line 10719 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10728,16 +10735,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10731: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10738: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10734: \$? = $ac_status" >&5
-+  echo "$as_me:10741: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10737: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10744: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10740: \$? = $ac_status" >&5
-+  echo "$as_me:10747: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -10752,7 +10759,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:10755: result: $cf_cv_xopen_source" >&5
-+echo "$as_me:10762: result: $cf_cv_xopen_source" >&5
- echo "${ECHO_T}$cf_cv_xopen_source" >&6
- 
- if test "$cf_cv_xopen_source" != no ; then
-@@ -10857,7 +10864,7 @@
- fi;
- if test "$enable_largefile" != no; then
- 
--  echo "$as_me:10860: checking for special C compiler options needed for large files" >&5
-+  echo "$as_me:10867: 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
-@@ -10869,7 +10876,7 @@
-      	 # 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 10872 "configure"
-+#line 10879 "configure"
- #include "confdefs.h"
- #include 
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10889,16 +10896,16 @@
- }
- _ACEOF
-      	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10892: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10899: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10895: \$? = $ac_status" >&5
-+  echo "$as_me:10902: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10898: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10905: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10901: \$? = $ac_status" >&5
-+  echo "$as_me:10908: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10908,16 +10915,16 @@
- rm -f conftest.$ac_objext
-      	 CC="$CC -n32"
-      	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10911: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10918: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10914: \$? = $ac_status" >&5
-+  echo "$as_me:10921: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10917: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10924: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10920: \$? = $ac_status" >&5
-+  echo "$as_me:10927: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_largefile_CC=' -n32'; break
- else
-@@ -10931,13 +10938,13 @@
-        rm -f conftest.$ac_ext
-     fi
- fi
--echo "$as_me:10934: result: $ac_cv_sys_largefile_CC" >&5
-+echo "$as_me:10941: 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:10940: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-+  echo "$as_me:10947: 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
-@@ -10945,7 +10952,7 @@
-   while :; do
-   ac_cv_sys_file_offset_bits=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10948 "configure"
-+#line 10955 "configure"
- #include "confdefs.h"
- #include 
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10965,16 +10972,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10968: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10975: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10971: \$? = $ac_status" >&5
-+  echo "$as_me:10978: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10974: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10981: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10977: \$? = $ac_status" >&5
-+  echo "$as_me:10984: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10983,7 +10990,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10986 "configure"
-+#line 10993 "configure"
- #include "confdefs.h"
- #define _FILE_OFFSET_BITS 64
- #include 
-@@ -11004,16 +11011,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11007: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11014: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11010: \$? = $ac_status" >&5
-+  echo "$as_me:11017: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11013: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11020: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11016: \$? = $ac_status" >&5
-+  echo "$as_me:11023: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_file_offset_bits=64; break
- else
-@@ -11024,7 +11031,7 @@
-   break
- done
- fi
--echo "$as_me:11027: result: $ac_cv_sys_file_offset_bits" >&5
-+echo "$as_me:11034: 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
- 
-@@ -11034,7 +11041,7 @@
- 
- fi
+-dnl CF_LINK_DATAONLY version: 10 updated: 2012/10/06 17:41:51
++dnl CF_LINK_DATAONLY version: 11 updated: 2017/01/21 11:06:25
+ dnl ----------------
+ dnl Some systems have a non-ANSI linker that doesn't pull in modules that have
+ dnl only data (i.e., no functions), for example NeXT.  On those systems we'll
+@@ -1897,7 +1898,7 @@
+ 	cf_saveLIBS="$LIBS"
+ 	LIBS="conftest.a $LIBS"
+ 	AC_TRY_RUN([
+-	int main()
++	int main(void)
+ 	{
+ 		extern int testfunc();
+ 		${cf_cv_main_return:-return} (!testfunc());
+@@ -2024,20 +2025,26 @@
+ test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES,1,[Define to 1 if filesystem supports mixed-case filenames.])
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_MKSTEMP version: 9 updated: 2012/10/03 04:34:49
++dnl CF_MKSTEMP version: 10 updated: 2017/01/21 11:12:16
+ dnl ----------
+ dnl Check for a working mkstemp.  This creates two files, checks that they are
+ dnl successfully created and distinct (AmigaOS apparently fails on the last).
+ AC_DEFUN([CF_MKSTEMP],[
++AC_CHECK_HEADERS( \
++unistd.h \
++)
+ AC_CACHE_CHECK(for working mkstemp, cf_cv_func_mkstemp,[
  rm -rf conftest*
--  echo "$as_me:11037: checking for _LARGE_FILES value needed for large files" >&5
-+  echo "$as_me:11044: 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
-@@ -11042,7 +11049,7 @@
-   while :; do
-   ac_cv_sys_large_files=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11045 "configure"
-+#line 11052 "configure"
- #include "confdefs.h"
+ AC_TRY_RUN([
  #include 
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -11062,16 +11069,16 @@
++#ifdef HAVE_UNISTD_H
++#include 
++#endif
+ #include 
+ #include 
+ #include 
+ #include 
+-int main()
++int main(void)
+ {
+ 	char *tmpl = "conftestXXXXXX";
+ 	char name[2][80];
+@@ -2758,7 +2765,7 @@
+ CF_CC_ENV_FLAGS
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_PROG_CC_C_O version: 4 updated: 2016/05/21 18:08:09
++dnl CF_PROG_CC_C_O version: 5 updated: 2017/01/21 11:06:25
+ dnl --------------
+ dnl Analogous to AC_PROG_CC_C_O, but more useful: tests only $CC, ensures that
+ dnl the output file can be renamed, and allows for a shell variable that can
+@@ -2775,7 +2782,7 @@
+ AC_CACHE_VAL(cf_cv_prog_$1_c_o,
+ [
+ cat > conftest.$ac_ext <&5
-+if { (eval echo "$as_me:11072: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11068: \$? = $ac_status" >&5
-+  echo "$as_me:11075: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11071: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11078: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11074: \$? = $ac_status" >&5
-+  echo "$as_me:11081: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
+Index: Ada95/configure
+--- ncurses-6.0-20170114+/Ada95/configure	2016-09-04 00:12:06.000000000 +0000
++++ ncurses-6.0-20170121/Ada95/configure	2017-01-21 22:20:43.000000000 +0000
+@@ -2199,7 +2199,7 @@
  else
-@@ -11080,7 +11087,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11083 "configure"
-+#line 11090 "configure"
+ 
+ cat > conftest.$ac_ext <
-@@ -11101,16 +11108,16 @@
+ #include 
+ 
+@@ -11379,16 +11380,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11104: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11111: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:11382: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11383: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:11107: \$? = $ac_status" >&5
-+  echo "$as_me:11114: \$? = $ac_status" >&5
+-  echo "$as_me:11385: \$? = $ac_status" >&5
++  echo "$as_me:11386: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11110: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11117: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:11388: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11389: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:11113: \$? = $ac_status" >&5
-+  echo "$as_me:11120: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_large_files=1; break
- else
-@@ -11121,7 +11128,7 @@
-   break
- done
- fi
--echo "$as_me:11124: result: $ac_cv_sys_large_files" >&5
-+echo "$as_me:11131: 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
- 
-@@ -11134,7 +11141,7 @@
- fi
- 
- 	if test "$enable_largefile" != no ; then
--	echo "$as_me:11137: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-+	echo "$as_me:11144: 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
-@@ -11142,7 +11149,7 @@
-   while :; do
-   ac_cv_sys_largefile_source=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11145 "configure"
-+#line 11152 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -11154,16 +11161,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11157: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11164: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11160: \$? = $ac_status" >&5
-+  echo "$as_me:11167: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11163: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11170: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11166: \$? = $ac_status" >&5
-+  echo "$as_me:11173: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -11172,7 +11179,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11175 "configure"
-+#line 11182 "configure"
- #include "confdefs.h"
- #define _LARGEFILE_SOURCE 1
- #include 
-@@ -11185,16 +11192,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11188: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11195: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11191: \$? = $ac_status" >&5
-+  echo "$as_me:11198: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11194: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11201: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11197: \$? = $ac_status" >&5
-+  echo "$as_me:11204: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_largefile_source=1; break
- else
-@@ -11205,7 +11212,7 @@
-   break
- done
- fi
--echo "$as_me:11208: result: $ac_cv_sys_largefile_source" >&5
-+echo "$as_me:11215: 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
- 
-@@ -11219,13 +11226,13 @@
- # 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:11222: checking for fseeko" >&5
-+echo "$as_me:11229: 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 11228 "configure"
-+#line 11235 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -11237,16 +11244,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11240: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11247: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11243: \$? = $ac_status" >&5
-+  echo "$as_me:11250: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11246: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11253: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11249: \$? = $ac_status" >&5
-+  echo "$as_me:11256: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_fseeko=yes
- else
-@@ -11256,7 +11263,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:11259: result: $ac_cv_func_fseeko" >&5
-+echo "$as_me:11266: result: $ac_cv_func_fseeko" >&5
- echo "${ECHO_T}$ac_cv_func_fseeko" >&6
- if test $ac_cv_func_fseeko = yes; then
- 
-@@ -11277,14 +11284,14 @@
- 	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:11280: checking whether to use struct dirent64" >&5
-+	echo "$as_me:11287: 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 11287 "configure"
-+#line 11294 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -11305,16 +11312,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11308: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11315: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11311: \$? = $ac_status" >&5
-+  echo "$as_me:11318: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11314: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11321: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11317: \$? = $ac_status" >&5
-+  echo "$as_me:11324: \$? = $ac_status" >&5
+-  echo "$as_me:11391: \$? = $ac_status" >&5
++  echo "$as_me:11392: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_struct_dirent64=yes
  else
-@@ -11325,7 +11332,7 @@
+@@ -11399,7 +11400,7 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  
  fi
--echo "$as_me:11328: result: $cf_cv_struct_dirent64" >&5
-+echo "$as_me:11335: result: $cf_cv_struct_dirent64" >&5
+-echo "$as_me:11402: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:11403: result: $cf_cv_struct_dirent64" >&5
  echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
  	test "$cf_cv_struct_dirent64" = yes &&
  cat >>confdefs.h <<\EOF
-@@ -11335,7 +11342,7 @@
+@@ -11409,7 +11410,7 @@
  	fi
  
  ### Enable compiling-in rcs id's
--echo "$as_me:11338: checking if RCS identifiers should be compiled-in" >&5
-+echo "$as_me:11345: checking if RCS identifiers should be compiled-in" >&5
+-echo "$as_me:11412: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:11413: checking if RCS identifiers should be compiled-in" >&5
  echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6
  
  # Check whether --with-rcs-ids or --without-rcs-ids was given.
-@@ -11345,7 +11352,7 @@
+@@ -11419,7 +11420,7 @@
  else
    with_rcs_ids=no
  fi;
--echo "$as_me:11348: result: $with_rcs_ids" >&5
-+echo "$as_me:11355: result: $with_rcs_ids" >&5
+-echo "$as_me:11422: result: $with_rcs_ids" >&5
++echo "$as_me:11423: result: $with_rcs_ids" >&5
  echo "${ECHO_T}$with_rcs_ids" >&6
  test "$with_rcs_ids" = yes &&
  cat >>confdefs.h <<\EOF
-@@ -11355,7 +11362,7 @@
+@@ -11429,7 +11430,7 @@
  ###############################################################################
  
  ### Note that some functions (such as const) are normally disabled anyway.
--echo "$as_me:11358: checking if you want to build with function extensions" >&5
-+echo "$as_me:11365: checking if you want to build with function extensions" >&5
+-echo "$as_me:11432: checking if you want to build with function extensions" >&5
++echo "$as_me:11433: checking if you want to build with function extensions" >&5
  echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6
  
  # Check whether --enable-ext-funcs or --disable-ext-funcs was given.
-@@ -11365,7 +11372,7 @@
+@@ -11439,7 +11440,7 @@
  else
    with_ext_funcs=yes
  fi;
--echo "$as_me:11368: result: $with_ext_funcs" >&5
-+echo "$as_me:11375: result: $with_ext_funcs" >&5
+-echo "$as_me:11442: result: $with_ext_funcs" >&5
++echo "$as_me:11443: result: $with_ext_funcs" >&5
  echo "${ECHO_T}$with_ext_funcs" >&6
  if test "$with_ext_funcs" = yes ; then
  	NCURSES_EXT_FUNCS=1
-@@ -11383,7 +11390,7 @@
+@@ -11457,7 +11458,7 @@
  fi
  
  ###   use option --enable-const to turn on use of const beyond that in XSI.
--echo "$as_me:11386: checking for extended use of const keyword" >&5
-+echo "$as_me:11393: checking for extended use of const keyword" >&5
+-echo "$as_me:11460: checking for extended use of const keyword" >&5
++echo "$as_me:11461: checking for extended use of const keyword" >&5
  echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
  
  # Check whether --enable-const or --disable-const was given.
-@@ -11393,7 +11400,7 @@
+@@ -11467,7 +11468,7 @@
  else
    with_ext_const=no
  fi;
--echo "$as_me:11396: result: $with_ext_const" >&5
-+echo "$as_me:11403: result: $with_ext_const" >&5
+-echo "$as_me:11470: result: $with_ext_const" >&5
++echo "$as_me:11471: result: $with_ext_const" >&5
  echo "${ECHO_T}$with_ext_const" >&6
  NCURSES_CONST='/*nothing*/'
  if test "$with_ext_const" = yes ; then
-@@ -11403,7 +11410,7 @@
+@@ -11477,7 +11478,7 @@
  ###############################################################################
  # These options are relatively safe to experiment with.
  
--echo "$as_me:11406: checking if you want all development code" >&5
-+echo "$as_me:11413: checking if you want all development code" >&5
+-echo "$as_me:11480: checking if you want all development code" >&5
++echo "$as_me:11481: checking if you want all development code" >&5
  echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
  
  # Check whether --with-develop or --without-develop was given.
-@@ -11413,7 +11420,7 @@
+@@ -11487,7 +11488,7 @@
  else
    with_develop=no
  fi;
--echo "$as_me:11416: result: $with_develop" >&5
-+echo "$as_me:11423: result: $with_develop" >&5
+-echo "$as_me:11490: result: $with_develop" >&5
++echo "$as_me:11491: result: $with_develop" >&5
  echo "${ECHO_T}$with_develop" >&6
  
  ###############################################################################
-@@ -11422,7 +11429,7 @@
+@@ -11496,7 +11497,7 @@
  # This is still experimental (20080329), but should ultimately be moved to
  # the script-block --with-normal, etc.
  
--echo "$as_me:11425: checking if you want to link with the pthread library" >&5
-+echo "$as_me:11432: checking if you want to link with the pthread library" >&5
+-echo "$as_me:11499: checking if you want to link with the pthread library" >&5
++echo "$as_me:11500: checking if you want to link with the pthread library" >&5
  echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6
  
  # Check whether --with-pthread or --without-pthread was given.
-@@ -11432,27 +11439,27 @@
+@@ -11506,27 +11507,27 @@
  else
    with_pthread=no
  fi;
--echo "$as_me:11435: result: $with_pthread" >&5
-+echo "$as_me:11442: result: $with_pthread" >&5
+-echo "$as_me:11509: result: $with_pthread" >&5
++echo "$as_me:11510: result: $with_pthread" >&5
  echo "${ECHO_T}$with_pthread" >&6
  
  if test "$with_pthread" != no ; then
--	echo "$as_me:11439: checking for pthread.h" >&5
-+	echo "$as_me:11446: checking for pthread.h" >&5
+-	echo "$as_me:11513: checking for pthread.h" >&5
++	echo "$as_me:11514: checking for pthread.h" >&5
  echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
  if test "${ac_cv_header_pthread_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 11445 "configure"
-+#line 11452 "configure"
+-#line 11519 "configure"
++#line 11520 "configure"
  #include "confdefs.h"
  #include 
  _ACEOF
--if { (eval echo "$as_me:11449: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:11456: \"$ac_cpp conftest.$ac_ext\"") >&5
+-if { (eval echo "$as_me:11523: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:11524: \"$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:11455: \$? = $ac_status" >&5
-+  echo "$as_me:11462: \$? = $ac_status" >&5
+-  echo "$as_me:11529: \$? = $ac_status" >&5
++  echo "$as_me:11530: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -11471,7 +11478,7 @@
+@@ -11545,7 +11546,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
--echo "$as_me:11474: result: $ac_cv_header_pthread_h" >&5
-+echo "$as_me:11481: result: $ac_cv_header_pthread_h" >&5
+-echo "$as_me:11548: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:11549: result: $ac_cv_header_pthread_h" >&5
  echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
  if test $ac_cv_header_pthread_h = yes; then
  
-@@ -11481,7 +11488,7 @@
+@@ -11555,7 +11556,7 @@
  
  	for cf_lib_pthread in pthread c_r
  	do
--	    echo "$as_me:11484: checking if we can link with the $cf_lib_pthread library" >&5
-+	    echo "$as_me:11491: checking if we can link with the $cf_lib_pthread library" >&5
+-	    echo "$as_me:11558: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:11559: checking if we can link with the $cf_lib_pthread library" >&5
  echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6
  	    cf_save_LIBS="$LIBS"
  
-@@ -11502,7 +11509,7 @@
+@@ -11576,7 +11577,7 @@
  LIBS="$cf_add_libs"
  
  	    cat >conftest.$ac_ext <<_ACEOF
--#line 11505 "configure"
-+#line 11512 "configure"
+-#line 11579 "configure"
++#line 11580 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -11519,16 +11526,16 @@
+@@ -11593,16 +11594,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11522: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11529: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:11596: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11597: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:11525: \$? = $ac_status" >&5
-+  echo "$as_me:11532: \$? = $ac_status" >&5
+-  echo "$as_me:11599: \$? = $ac_status" >&5
++  echo "$as_me:11600: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11528: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11535: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:11602: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11603: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:11531: \$? = $ac_status" >&5
-+  echo "$as_me:11538: \$? = $ac_status" >&5
+-  echo "$as_me:11605: \$? = $ac_status" >&5
++  echo "$as_me:11606: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    with_pthread=yes
  else
-@@ -11538,7 +11545,7 @@
+@@ -11612,7 +11613,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  	    LIBS="$cf_save_LIBS"
--	    echo "$as_me:11541: result: $with_pthread" >&5
-+	    echo "$as_me:11548: result: $with_pthread" >&5
+-	    echo "$as_me:11615: result: $with_pthread" >&5
++	    echo "$as_me:11616: result: $with_pthread" >&5
  echo "${ECHO_T}$with_pthread" >&6
  	    test "$with_pthread" = yes && break
  	done
-@@ -11566,7 +11573,7 @@
+@@ -11640,7 +11641,7 @@
  EOF
  
  	else
--	    { { echo "$as_me:11569: error: Cannot link with pthread library" >&5
-+	    { { echo "$as_me:11576: error: Cannot link with pthread library" >&5
+-	    { { echo "$as_me:11643: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:11644: error: Cannot link with pthread library" >&5
  echo "$as_me: error: Cannot link with pthread library" >&2;}
     { (exit 1); exit 1; }; }
  	fi
-@@ -11575,7 +11582,7 @@
+@@ -11649,7 +11650,7 @@
  
  fi
  
--echo "$as_me:11578: checking if you want to use weak-symbols for pthreads" >&5
-+echo "$as_me:11585: checking if you want to use weak-symbols for pthreads" >&5
+-echo "$as_me:11652: checking if you want to use weak-symbols for pthreads" >&5
++echo "$as_me:11653: checking if you want to use weak-symbols for pthreads" >&5
  echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6
  
  # Check whether --enable-weak-symbols or --disable-weak-symbols was given.
-@@ -11585,18 +11592,18 @@
+@@ -11659,18 +11660,18 @@
  else
    use_weak_symbols=no
  fi;
--echo "$as_me:11588: result: $use_weak_symbols" >&5
-+echo "$as_me:11595: result: $use_weak_symbols" >&5
+-echo "$as_me:11662: result: $use_weak_symbols" >&5
++echo "$as_me:11663: result: $use_weak_symbols" >&5
  echo "${ECHO_T}$use_weak_symbols" >&6
  if test "$use_weak_symbols" = yes ; then
  
--echo "$as_me:11592: checking if $CC supports weak symbols" >&5
-+echo "$as_me:11599: checking if $CC supports weak symbols" >&5
+-echo "$as_me:11666: checking if $CC supports weak symbols" >&5
++echo "$as_me:11667: checking if $CC supports weak symbols" >&5
  echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6
  if test "${cf_cv_weak_symbols+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
  cat >conftest.$ac_ext <<_ACEOF
--#line 11599 "configure"
-+#line 11606 "configure"
+-#line 11673 "configure"
++#line 11674 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -11622,16 +11629,16 @@
+@@ -11696,16 +11697,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11625: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11632: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:11699: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11700: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:11628: \$? = $ac_status" >&5
-+  echo "$as_me:11635: \$? = $ac_status" >&5
+-  echo "$as_me:11702: \$? = $ac_status" >&5
++  echo "$as_me:11703: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11631: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11638: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:11705: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11706: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:11634: \$? = $ac_status" >&5
-+  echo "$as_me:11641: \$? = $ac_status" >&5
+-  echo "$as_me:11708: \$? = $ac_status" >&5
++  echo "$as_me:11709: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_weak_symbols=yes
  else
-@@ -11642,7 +11649,7 @@
+@@ -11716,7 +11717,7 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  
  fi
--echo "$as_me:11645: result: $cf_cv_weak_symbols" >&5
-+echo "$as_me:11652: result: $cf_cv_weak_symbols" >&5
+-echo "$as_me:11719: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:11720: result: $cf_cv_weak_symbols" >&5
  echo "${ECHO_T}$cf_cv_weak_symbols" >&6
  
  else
-@@ -11671,13 +11678,13 @@
+@@ -11745,13 +11746,13 @@
  fi
  
  # OpenSUSE is installing ncurses6, using reentrant option.
--echo "$as_me:11674: checking for _nc_TABSIZE" >&5
-+echo "$as_me:11681: checking for _nc_TABSIZE" >&5
+-echo "$as_me:11748: checking for _nc_TABSIZE" >&5
++echo "$as_me:11749: checking for _nc_TABSIZE" >&5
  echo $ECHO_N "checking for _nc_TABSIZE... $ECHO_C" >&6
  if test "${ac_cv_func__nc_TABSIZE+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 11680 "configure"
-+#line 11687 "configure"
+-#line 11754 "configure"
++#line 11755 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char _nc_TABSIZE (); below.  */
-@@ -11708,16 +11715,16 @@
+@@ -11782,16 +11783,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11711: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11718: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:11785: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11786: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:11714: \$? = $ac_status" >&5
-+  echo "$as_me:11721: \$? = $ac_status" >&5
+-  echo "$as_me:11788: \$? = $ac_status" >&5
++  echo "$as_me:11789: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11717: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11724: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:11791: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11792: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:11720: \$? = $ac_status" >&5
-+  echo "$as_me:11727: \$? = $ac_status" >&5
+-  echo "$as_me:11794: \$? = $ac_status" >&5
++  echo "$as_me:11795: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func__nc_TABSIZE=yes
  else
-@@ -11727,7 +11734,7 @@
+@@ -11801,7 +11802,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:11730: result: $ac_cv_func__nc_TABSIZE" >&5
-+echo "$as_me:11737: result: $ac_cv_func__nc_TABSIZE" >&5
+-echo "$as_me:11804: result: $ac_cv_func__nc_TABSIZE" >&5
++echo "$as_me:11805: result: $ac_cv_func__nc_TABSIZE" >&5
  echo "${ECHO_T}$ac_cv_func__nc_TABSIZE" >&6
  if test $ac_cv_func__nc_TABSIZE = yes; then
    assume_reentrant=yes
-@@ -11739,7 +11746,7 @@
+@@ -11813,7 +11814,7 @@
  # opaque outside of that, so there is no --enable-opaque option.  We can use
  # this option without --with-pthreads, but this will be always set for
  # pthreads.
--echo "$as_me:11742: checking if you want experimental reentrant code" >&5
-+echo "$as_me:11749: checking if you want experimental reentrant code" >&5
+-echo "$as_me:11816: checking if you want experimental reentrant code" >&5
++echo "$as_me:11817: checking if you want experimental reentrant code" >&5
  echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6
  
  # Check whether --enable-reentrant or --disable-reentrant was given.
-@@ -11749,7 +11756,7 @@
+@@ -11823,7 +11824,7 @@
  else
    with_reentrant=$assume_reentrant
  fi;
--echo "$as_me:11752: result: $with_reentrant" >&5
-+echo "$as_me:11759: result: $with_reentrant" >&5
+-echo "$as_me:11826: result: $with_reentrant" >&5
++echo "$as_me:11827: result: $with_reentrant" >&5
  echo "${ECHO_T}$with_reentrant" >&6
  if test "$with_reentrant" = yes ; then
  	cf_cv_enable_reentrant=1
-@@ -11772,7 +11779,7 @@
+@@ -11846,7 +11847,7 @@
  
  ### Allow using a different wrap-prefix
  if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
--	echo "$as_me:11775: checking for prefix used to wrap public variables" >&5
-+	echo "$as_me:11782: checking for prefix used to wrap public variables" >&5
+-	echo "$as_me:11849: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:11850: checking for prefix used to wrap public variables" >&5
  echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6
  
  # Check whether --with-wrap-prefix or --without-wrap-prefix was given.
-@@ -11782,7 +11789,7 @@
+@@ -11856,7 +11857,7 @@
  else
    NCURSES_WRAP_PREFIX=_nc_
  fi;
--	echo "$as_me:11785: result: $NCURSES_WRAP_PREFIX" >&5
-+	echo "$as_me:11792: result: $NCURSES_WRAP_PREFIX" >&5
+-	echo "$as_me:11859: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:11860: result: $NCURSES_WRAP_PREFIX" >&5
  echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
  else
  	NCURSES_WRAP_PREFIX=_nc_
-@@ -11796,7 +11803,7 @@
+@@ -11870,7 +11871,7 @@
  
  ###	use option --disable-echo to suppress full display compiling commands
  
--echo "$as_me:11799: checking if you want to see long compiling messages" >&5
-+echo "$as_me:11806: checking if you want to see long compiling messages" >&5
+-echo "$as_me:11873: checking if you want to see long compiling messages" >&5
++echo "$as_me:11874: 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.
-@@ -11830,11 +11837,11 @@
+@@ -11904,11 +11905,11 @@
  	ECHO_CC=''
  
  fi;
--echo "$as_me:11833: result: $enableval" >&5
-+echo "$as_me:11840: result: $enableval" >&5
+-echo "$as_me:11907: result: $enableval" >&5
++echo "$as_me:11908: result: $enableval" >&5
  echo "${ECHO_T}$enableval" >&6
  
  ###	use option --enable-warnings to turn on all gcc warnings
--echo "$as_me:11837: checking if you want to see compiler warnings" >&5
-+echo "$as_me:11844: checking if you want to see compiler warnings" >&5
+-echo "$as_me:11911: checking if you want to see compiler warnings" >&5
++echo "$as_me:11912: checking if you want to see compiler warnings" >&5
  echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
  
  # Check whether --enable-warnings or --disable-warnings was given.
-@@ -11842,7 +11849,7 @@
+@@ -11916,7 +11917,7 @@
    enableval="$enable_warnings"
    with_warnings=$enableval
  fi;
--echo "$as_me:11845: result: $with_warnings" >&5
-+echo "$as_me:11852: result: $with_warnings" >&5
+-echo "$as_me:11919: result: $with_warnings" >&5
++echo "$as_me:11920: result: $with_warnings" >&5
  echo "${ECHO_T}$with_warnings" >&6
  
  if test "x$with_warnings" = "xyes"; then
-@@ -11854,12 +11861,12 @@
+@@ -11928,12 +11929,12 @@
  if test "$GCC" = yes ; then
  	case $host_os in
  	(linux*|gnu*)
--		echo "$as_me:11857: checking if this is really Intel C compiler" >&5
-+		echo "$as_me:11864: checking if this is really Intel C compiler" >&5
+-		echo "$as_me:11931: checking if this is really Intel C compiler" >&5
++		echo "$as_me:11932: 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 11862 "configure"
-+#line 11869 "configure"
+-#line 11936 "configure"
++#line 11937 "configure"
  #include "confdefs.h"
  
  int
-@@ -11876,16 +11883,16 @@
+@@ -11950,16 +11951,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11879: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11886: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:11953: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11954: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:11882: \$? = $ac_status" >&5
-+  echo "$as_me:11889: \$? = $ac_status" >&5
+-  echo "$as_me:11956: \$? = $ac_status" >&5
++  echo "$as_me:11957: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11885: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11892: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:11959: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11960: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:11888: \$? = $ac_status" >&5
-+  echo "$as_me:11895: \$? = $ac_status" >&5
+-  echo "$as_me:11962: \$? = $ac_status" >&5
++  echo "$as_me:11963: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    INTEL_COMPILER=yes
  cf_save_CFLAGS="$cf_save_CFLAGS -we147"
-@@ -11896,7 +11903,7 @@
+@@ -11970,7 +11971,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  		CFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:11899: result: $INTEL_COMPILER" >&5
-+		echo "$as_me:11906: result: $INTEL_COMPILER" >&5
+-		echo "$as_me:11973: result: $INTEL_COMPILER" >&5
++		echo "$as_me:11974: result: $INTEL_COMPILER" >&5
  echo "${ECHO_T}$INTEL_COMPILER" >&6
  		;;
  	esac
-@@ -11905,12 +11912,12 @@
+@@ -11979,12 +11980,12 @@
  CLANG_COMPILER=no
  
  if test "$GCC" = yes ; then
--	echo "$as_me:11908: checking if this is really Clang C compiler" >&5
-+	echo "$as_me:11915: checking if this is really Clang C compiler" >&5
+-	echo "$as_me:11982: checking if this is really Clang C compiler" >&5
++	echo "$as_me:11983: 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 11913 "configure"
-+#line 11920 "configure"
+-#line 11987 "configure"
++#line 11988 "configure"
  #include "confdefs.h"
  
  int
-@@ -11927,16 +11934,16 @@
+@@ -12001,16 +12002,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11930: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11937: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:12004: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12005: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:11933: \$? = $ac_status" >&5
-+  echo "$as_me:11940: \$? = $ac_status" >&5
+-  echo "$as_me:12007: \$? = $ac_status" >&5
++  echo "$as_me:12008: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11936: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11943: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:12010: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12011: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:11939: \$? = $ac_status" >&5
-+  echo "$as_me:11946: \$? = $ac_status" >&5
+-  echo "$as_me:12013: \$? = $ac_status" >&5
++  echo "$as_me:12014: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    CLANG_COMPILER=yes
  cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
-@@ -11947,12 +11954,12 @@
+@@ -12021,12 +12022,12 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  	CFLAGS="$cf_save_CFLAGS"
--	echo "$as_me:11950: result: $CLANG_COMPILER" >&5
-+	echo "$as_me:11957: result: $CLANG_COMPILER" >&5
+-	echo "$as_me:12024: result: $CLANG_COMPILER" >&5
++	echo "$as_me:12025: result: $CLANG_COMPILER" >&5
  echo "${ECHO_T}$CLANG_COMPILER" >&6
  fi
  
  cat > conftest.$ac_ext <&5
-+	{ echo "$as_me:11979: checking for $CC warning options..." >&5
+-	{ echo "$as_me:12046: checking for $CC warning options..." >&5
++	{ echo "$as_me:12047: checking for $CC warning options..." >&5
  echo "$as_me: checking for $CC warning options..." >&6;}
  	cf_save_CFLAGS="$CFLAGS"
  	EXTRA_CFLAGS="-Wall"
-@@ -11985,12 +11992,12 @@
+@@ -12059,12 +12060,12 @@
  		wd981
  	do
  		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:11988: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:11995: \"$ac_compile\"") >&5
+-		if { (eval echo "$as_me:12062: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:12063: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:11991: \$? = $ac_status" >&5
-+  echo "$as_me:11998: \$? = $ac_status" >&5
+-  echo "$as_me:12065: \$? = $ac_status" >&5
++  echo "$as_me:12066: \$? = $ac_status" >&5
    (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:11993: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:12000: result: ... -$cf_opt" >&5
+-			test -n "$verbose" && echo "$as_me:12067: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:12068: result: ... -$cf_opt" >&5
  echo "${ECHO_T}... -$cf_opt" >&6
  			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
  		fi
-@@ -11999,7 +12006,7 @@
+@@ -12073,7 +12074,7 @@
  
  elif test "$GCC" = yes
  then
--	{ echo "$as_me:12002: checking for $CC warning options..." >&5
-+	{ echo "$as_me:12009: checking for $CC warning options..." >&5
+-	{ echo "$as_me:12076: checking for $CC warning options..." >&5
++	{ echo "$as_me:12077: checking for $CC warning options..." >&5
  echo "$as_me: checking for $CC warning options..." >&6;}
  	cf_save_CFLAGS="$CFLAGS"
  	EXTRA_CFLAGS=
-@@ -12023,12 +12030,12 @@
+@@ -12097,12 +12098,12 @@
  		Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
  	do
  		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:12026: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:12033: \"$ac_compile\"") >&5
+-		if { (eval echo "$as_me:12100: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:12101: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:12029: \$? = $ac_status" >&5
-+  echo "$as_me:12036: \$? = $ac_status" >&5
+-  echo "$as_me:12103: \$? = $ac_status" >&5
++  echo "$as_me:12104: \$? = $ac_status" >&5
    (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:12031: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:12038: result: ... -$cf_opt" >&5
+-			test -n "$verbose" && echo "$as_me:12105: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:12106: result: ... -$cf_opt" >&5
  echo "${ECHO_T}... -$cf_opt" >&6
  			case $cf_opt in
  			(Wcast-qual)
-@@ -12039,7 +12046,7 @@
+@@ -12113,7 +12114,7 @@
  				([34].*)
  					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
  
--echo "${as_me:-configure}:12042: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:12049: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+-echo "${as_me:-configure}:12116: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:12117: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
  
  					continue;;
  				esac
-@@ -12049,7 +12056,7 @@
+@@ -12123,7 +12124,7 @@
  				([12].*)
  					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
  
--echo "${as_me:-configure}:12052: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:12059: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+-echo "${as_me:-configure}:12126: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:12127: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
  
  					continue;;
  				esac
-@@ -12082,10 +12089,10 @@
+@@ -12156,10 +12157,10 @@
  EOF
  if test "$GCC" = yes
  then
--	{ echo "$as_me:12085: checking for $CC __attribute__ directives..." >&5
-+	{ echo "$as_me:12092: checking for $CC __attribute__ directives..." >&5
+-	{ echo "$as_me:12159: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:12160: checking for $CC __attribute__ directives..." >&5
  echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
  cat > conftest.$ac_ext <&5
-+		if { (eval echo "$as_me:12144: \"$ac_compile\"") >&5
+-		if { (eval echo "$as_me:12211: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:12212: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:12140: \$? = $ac_status" >&5
-+  echo "$as_me:12147: \$? = $ac_status" >&5
+-  echo "$as_me:12214: \$? = $ac_status" >&5
++  echo "$as_me:12215: \$? = $ac_status" >&5
    (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:12142: result: ... $cf_attribute" >&5
-+			test -n "$verbose" && echo "$as_me:12149: result: ... $cf_attribute" >&5
+-			test -n "$verbose" && echo "$as_me:12216: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:12217: result: ... $cf_attribute" >&5
  echo "${ECHO_T}... $cf_attribute" >&6
  			cat conftest.h >>confdefs.h
  			case $cf_attribute in
-@@ -12199,7 +12206,7 @@
+@@ -12273,7 +12274,7 @@
  fi
  
  ###	use option --enable-assertions to turn on generation of assertion code
--echo "$as_me:12202: checking if you want to enable runtime assertions" >&5
-+echo "$as_me:12209: checking if you want to enable runtime assertions" >&5
+-echo "$as_me:12276: checking if you want to enable runtime assertions" >&5
++echo "$as_me:12277: checking if you want to enable runtime assertions" >&5
  echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
  
  # Check whether --enable-assertions or --disable-assertions was given.
-@@ -12209,7 +12216,7 @@
+@@ -12283,7 +12284,7 @@
  else
    with_assertions=no
  fi;
--echo "$as_me:12212: result: $with_assertions" >&5
-+echo "$as_me:12219: result: $with_assertions" >&5
+-echo "$as_me:12286: result: $with_assertions" >&5
++echo "$as_me:12287: result: $with_assertions" >&5
  echo "${ECHO_T}$with_assertions" >&6
  if test -n "$GCC"
  then
-@@ -12262,7 +12269,7 @@
+@@ -12336,7 +12337,7 @@
  	;;
  esac
  
--echo "$as_me:12265: checking whether to add trace feature to all models" >&5
-+echo "$as_me:12272: checking whether to add trace feature to all models" >&5
+-echo "$as_me:12339: checking whether to add trace feature to all models" >&5
++echo "$as_me:12340: checking whether to add trace feature to all models" >&5
  echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
  
  # Check whether --with-trace or --without-trace was given.
-@@ -12272,7 +12279,7 @@
+@@ -12346,7 +12347,7 @@
  else
    cf_with_trace=$cf_all_traces
  fi;
--echo "$as_me:12275: result: $cf_with_trace" >&5
-+echo "$as_me:12282: result: $cf_with_trace" >&5
+-echo "$as_me:12349: result: $cf_with_trace" >&5
++echo "$as_me:12350: result: $cf_with_trace" >&5
  echo "${ECHO_T}$cf_with_trace" >&6
  
  if test "$cf_with_trace" = yes ; then
-@@ -12360,7 +12367,7 @@
+@@ -12434,7 +12435,7 @@
  	ADA_TRACE=FALSE
  fi
  
--echo "$as_me:12363: checking if we want to use GNAT projects" >&5
-+echo "$as_me:12370: checking if we want to use GNAT projects" >&5
+-echo "$as_me:12437: checking if we want to use GNAT projects" >&5
++echo "$as_me:12438: checking if we want to use GNAT projects" >&5
  echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6
  
  # Check whether --enable-gnat-projects or --disable-gnat-projects was given.
-@@ -12377,7 +12384,7 @@
+@@ -12451,7 +12452,7 @@
  	enable_gnat_projects=yes
  
  fi;
--echo "$as_me:12380: result: $enable_gnat_projects" >&5
-+echo "$as_me:12387: result: $enable_gnat_projects" >&5
+-echo "$as_me:12454: result: $enable_gnat_projects" >&5
++echo "$as_me:12455: result: $enable_gnat_projects" >&5
  echo "${ECHO_T}$enable_gnat_projects" >&6
  
  ###	Checks for libraries.
-@@ -12385,13 +12392,13 @@
+@@ -12459,13 +12460,13 @@
  (*mingw32*)
  	;;
  (*)
--echo "$as_me:12388: checking for gettimeofday" >&5
-+echo "$as_me:12395: checking for gettimeofday" >&5
+-echo "$as_me:12462: checking for gettimeofday" >&5
++echo "$as_me:12463: checking for gettimeofday" >&5
  echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
  if test "${ac_cv_func_gettimeofday+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 12394 "configure"
-+#line 12401 "configure"
+-#line 12468 "configure"
++#line 12469 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char gettimeofday (); below.  */
-@@ -12422,16 +12429,16 @@
+@@ -12496,16 +12497,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12425: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12432: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:12499: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12500: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:12428: \$? = $ac_status" >&5
-+  echo "$as_me:12435: \$? = $ac_status" >&5
+-  echo "$as_me:12502: \$? = $ac_status" >&5
++  echo "$as_me:12503: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12431: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12438: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:12505: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12506: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:12434: \$? = $ac_status" >&5
-+  echo "$as_me:12441: \$? = $ac_status" >&5
+-  echo "$as_me:12508: \$? = $ac_status" >&5
++  echo "$as_me:12509: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_gettimeofday=yes
  else
-@@ -12441,7 +12448,7 @@
+@@ -12515,7 +12516,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:12444: result: $ac_cv_func_gettimeofday" >&5
-+echo "$as_me:12451: result: $ac_cv_func_gettimeofday" >&5
+-echo "$as_me:12518: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:12519: result: $ac_cv_func_gettimeofday" >&5
  echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
  if test $ac_cv_func_gettimeofday = yes; then
    cat >>confdefs.h <<\EOF
-@@ -12450,7 +12457,7 @@
+@@ -12524,7 +12525,7 @@
  
  else
  
--echo "$as_me:12453: checking for gettimeofday in -lbsd" >&5
-+echo "$as_me:12460: checking for gettimeofday in -lbsd" >&5
+-echo "$as_me:12527: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:12528: checking for gettimeofday in -lbsd" >&5
  echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
  if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12458,7 +12465,7 @@
+@@ -12532,7 +12533,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lbsd  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 12461 "configure"
-+#line 12468 "configure"
+-#line 12535 "configure"
++#line 12536 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -12477,16 +12484,16 @@
+@@ -12551,16 +12552,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12480: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12487: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:12554: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12555: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:12483: \$? = $ac_status" >&5
-+  echo "$as_me:12490: \$? = $ac_status" >&5
+-  echo "$as_me:12557: \$? = $ac_status" >&5
++  echo "$as_me:12558: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12486: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12493: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:12560: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12561: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:12489: \$? = $ac_status" >&5
-+  echo "$as_me:12496: \$? = $ac_status" >&5
+-  echo "$as_me:12563: \$? = $ac_status" >&5
++  echo "$as_me:12564: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_bsd_gettimeofday=yes
  else
-@@ -12497,7 +12504,7 @@
+@@ -12571,7 +12572,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:12500: result: $ac_cv_lib_bsd_gettimeofday" >&5
-+echo "$as_me:12507: result: $ac_cv_lib_bsd_gettimeofday" >&5
+-echo "$as_me:12574: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:12575: result: $ac_cv_lib_bsd_gettimeofday" >&5
  echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
  if test $ac_cv_lib_bsd_gettimeofday = yes; then
  
-@@ -12513,13 +12520,13 @@
+@@ -12587,13 +12588,13 @@
  esac
  
  ###	Checks for header files.
--echo "$as_me:12516: checking for ANSI C header files" >&5
-+echo "$as_me:12523: checking for ANSI C header files" >&5
+-echo "$as_me:12590: checking for ANSI C header files" >&5
++echo "$as_me:12591: 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 12522 "configure"
-+#line 12529 "configure"
+-#line 12596 "configure"
++#line 12597 "configure"
  #include "confdefs.h"
  #include 
  #include 
-@@ -12527,13 +12534,13 @@
+@@ -12601,13 +12602,13 @@
  #include 
  
  _ACEOF
--if { (eval echo "$as_me:12530: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:12537: \"$ac_cpp conftest.$ac_ext\"") >&5
+-if { (eval echo "$as_me:12604: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:12605: \"$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:12536: \$? = $ac_status" >&5
-+  echo "$as_me:12543: \$? = $ac_status" >&5
+-  echo "$as_me:12610: \$? = $ac_status" >&5
++  echo "$as_me:12611: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -12555,7 +12562,7 @@
+@@ -12629,7 +12630,7 @@
  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 12558 "configure"
-+#line 12565 "configure"
+-#line 12632 "configure"
++#line 12633 "configure"
  #include "confdefs.h"
  #include 
  
-@@ -12573,7 +12580,7 @@
+@@ -12647,7 +12648,7 @@
  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 12576 "configure"
-+#line 12583 "configure"
+-#line 12650 "configure"
++#line 12651 "configure"
  #include "confdefs.h"
  #include 
  
-@@ -12594,7 +12601,7 @@
+@@ -12668,7 +12669,7 @@
    :
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 12597 "configure"
-+#line 12604 "configure"
+-#line 12671 "configure"
++#line 12672 "configure"
  #include "confdefs.h"
  #include 
  #if ((' ' & 0x0FF) == 0x020)
-@@ -12620,15 +12627,15 @@
+@@ -12694,15 +12695,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
--if { (eval echo "$as_me:12623: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12630: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:12697: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12698: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:12626: \$? = $ac_status" >&5
-+  echo "$as_me:12633: \$? = $ac_status" >&5
+-  echo "$as_me:12700: \$? = $ac_status" >&5
++  echo "$as_me:12701: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:12628: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12635: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:12702: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12703: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:12631: \$? = $ac_status" >&5
-+  echo "$as_me:12638: \$? = $ac_status" >&5
+-  echo "$as_me:12705: \$? = $ac_status" >&5
++  echo "$as_me:12706: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -12641,7 +12648,7 @@
+@@ -12715,7 +12716,7 @@
  fi
  fi
  fi
--echo "$as_me:12644: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:12651: result: $ac_cv_header_stdc" >&5
+-echo "$as_me:12718: result: $ac_cv_header_stdc" >&5
++echo "$as_me:12719: result: $ac_cv_header_stdc" >&5
  echo "${ECHO_T}$ac_cv_header_stdc" >&6
  if test $ac_cv_header_stdc = yes; then
  
-@@ -12657,28 +12664,28 @@
+@@ -12731,28 +12732,28 @@
                    inttypes.h stdint.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:12660: checking for $ac_header" >&5
-+echo "$as_me:12667: checking for $ac_header" >&5
+-echo "$as_me:12734: checking for $ac_header" >&5
++echo "$as_me:12735: 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 12666 "configure"
-+#line 12673 "configure"
+-#line 12740 "configure"
++#line 12741 "configure"
  #include "confdefs.h"
  $ac_includes_default
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12672: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12679: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:12746: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12747: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:12675: \$? = $ac_status" >&5
-+  echo "$as_me:12682: \$? = $ac_status" >&5
+-  echo "$as_me:12749: \$? = $ac_status" >&5
++  echo "$as_me:12750: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12678: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12685: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:12752: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12753: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:12681: \$? = $ac_status" >&5
-+  echo "$as_me:12688: \$? = $ac_status" >&5
+-  echo "$as_me:12755: \$? = $ac_status" >&5
++  echo "$as_me:12756: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_Header=yes"
  else
-@@ -12688,7 +12695,7 @@
+@@ -12762,7 +12763,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
--echo "$as_me:12691: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:12698: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "$as_me:12765: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:12766: 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 <&5
-+echo "$as_me:12708: checking for signed char" >&5
+-echo "$as_me:12775: checking for signed char" >&5
++echo "$as_me:12776: checking for signed char" >&5
  echo $ECHO_N "checking for signed char... $ECHO_C" >&6
  if test "${ac_cv_type_signed_char+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 12707 "configure"
-+#line 12714 "configure"
+-#line 12781 "configure"
++#line 12782 "configure"
  #include "confdefs.h"
  $ac_includes_default
  int
-@@ -12719,16 +12726,16 @@
+@@ -12793,16 +12794,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12722: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12729: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:12796: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12797: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:12725: \$? = $ac_status" >&5
-+  echo "$as_me:12732: \$? = $ac_status" >&5
+-  echo "$as_me:12799: \$? = $ac_status" >&5
++  echo "$as_me:12800: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12728: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12735: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:12802: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12803: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:12731: \$? = $ac_status" >&5
-+  echo "$as_me:12738: \$? = $ac_status" >&5
+-  echo "$as_me:12805: \$? = $ac_status" >&5
++  echo "$as_me:12806: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_type_signed_char=yes
  else
-@@ -12738,10 +12745,10 @@
+@@ -12812,10 +12813,10 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
--echo "$as_me:12741: result: $ac_cv_type_signed_char" >&5
-+echo "$as_me:12748: result: $ac_cv_type_signed_char" >&5
+-echo "$as_me:12815: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:12816: result: $ac_cv_type_signed_char" >&5
  echo "${ECHO_T}$ac_cv_type_signed_char" >&6
  
--echo "$as_me:12744: checking size of signed char" >&5
-+echo "$as_me:12751: checking size of signed char" >&5
+-echo "$as_me:12818: checking size of signed char" >&5
++echo "$as_me:12819: checking size of signed char" >&5
  echo $ECHO_N "checking size of signed char... $ECHO_C" >&6
  if test "${ac_cv_sizeof_signed_char+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12750,7 +12757,7 @@
+@@ -12824,7 +12825,7 @@
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
--#line 12753 "configure"
-+#line 12760 "configure"
+-#line 12827 "configure"
++#line 12828 "configure"
  #include "confdefs.h"
  $ac_includes_default
  int
-@@ -12762,21 +12769,21 @@
+@@ -12836,21 +12837,21 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12765: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12772: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:12839: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12840: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:12768: \$? = $ac_status" >&5
-+  echo "$as_me:12775: \$? = $ac_status" >&5
+-  echo "$as_me:12842: \$? = $ac_status" >&5
++  echo "$as_me:12843: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12771: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12778: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:12845: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12846: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:12774: \$? = $ac_status" >&5
-+  echo "$as_me:12781: \$? = $ac_status" >&5
+-  echo "$as_me:12848: \$? = $ac_status" >&5
++  echo "$as_me:12849: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_lo=0 ac_mid=0
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
--#line 12779 "configure"
-+#line 12786 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12788,16 +12795,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12791: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12798: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12794: \$? = $ac_status" >&5
-+  echo "$as_me:12801: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12797: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12804: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12800: \$? = $ac_status" >&5
-+  echo "$as_me:12807: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid; break
- else
-@@ -12813,7 +12820,7 @@
- ac_hi=-1 ac_mid=-1
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 12816 "configure"
-+#line 12823 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12825,16 +12832,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12828: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12835: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12831: \$? = $ac_status" >&5
-+  echo "$as_me:12838: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12834: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12841: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12837: \$? = $ac_status" >&5
-+  echo "$as_me:12844: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=$ac_mid; break
- else
-@@ -12850,7 +12857,7 @@
- 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 12853 "configure"
-+#line 12860 "configure"
++#line 12854 "configure"
  #include "confdefs.h"
  $ac_includes_default
  int
-@@ -12862,16 +12869,16 @@
+@@ -12862,16 +12863,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:12865: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12872: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12866: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:12868: \$? = $ac_status" >&5
-+  echo "$as_me:12875: \$? = $ac_status" >&5
++  echo "$as_me:12869: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:12871: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12878: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12872: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:12874: \$? = $ac_status" >&5
-+  echo "$as_me:12881: \$? = $ac_status" >&5
++  echo "$as_me:12875: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -12887,7 +12888,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 12890 "configure"
++#line 12891 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -12899,16 +12900,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12902: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12903: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12905: \$? = $ac_status" >&5
++  echo "$as_me:12906: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12908: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12909: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12911: \$? = $ac_status" >&5
++  echo "$as_me:12912: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -12924,7 +12925,7 @@
+ 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 12927 "configure"
++#line 12928 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -12936,16 +12937,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12939: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12940: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12942: \$? = $ac_status" >&5
++  echo "$as_me:12943: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12945: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12946: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12948: \$? = $ac_status" >&5
++  echo "$as_me:12949: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_hi=$ac_mid
  else
-@@ -12884,12 +12891,12 @@
+@@ -12958,12 +12959,12 @@
  ac_cv_sizeof_signed_char=$ac_lo
  else
    if test "$cross_compiling" = yes; then
--  { { echo "$as_me:12887: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:12894: error: cannot run test program while cross compiling" >&5
+-  { { echo "$as_me:12961: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:12962: 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 12892 "configure"
-+#line 12899 "configure"
+-#line 12966 "configure"
++#line 12967 "configure"
  #include "confdefs.h"
  $ac_includes_default
  int
-@@ -12905,15 +12912,15 @@
+@@ -12979,15 +12980,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
--if { (eval echo "$as_me:12908: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12915: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:12982: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12983: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:12911: \$? = $ac_status" >&5
-+  echo "$as_me:12918: \$? = $ac_status" >&5
+-  echo "$as_me:12985: \$? = $ac_status" >&5
++  echo "$as_me:12986: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:12913: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12920: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:12987: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12988: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:12916: \$? = $ac_status" >&5
-+  echo "$as_me:12923: \$? = $ac_status" >&5
+-  echo "$as_me:12990: \$? = $ac_status" >&5
++  echo "$as_me:12991: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_sizeof_signed_char=`cat conftest.val`
  else
-@@ -12929,19 +12936,19 @@
+@@ -13003,19 +13004,19 @@
    ac_cv_sizeof_signed_char=0
  fi
  fi
--echo "$as_me:12932: result: $ac_cv_sizeof_signed_char" >&5
-+echo "$as_me:12939: result: $ac_cv_sizeof_signed_char" >&5
+-echo "$as_me:13006: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:13007: result: $ac_cv_sizeof_signed_char" >&5
  echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
  cat >>confdefs.h <&5
-+echo "$as_me:12945: checking for ANSI C header files" >&5
+-echo "$as_me:13012: checking for ANSI C header files" >&5
++echo "$as_me:13013: 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 12944 "configure"
-+#line 12951 "configure"
+-#line 13018 "configure"
++#line 13019 "configure"
  #include "confdefs.h"
  #include 
  #include 
-@@ -12949,13 +12956,13 @@
+@@ -13023,13 +13024,13 @@
  #include 
  
  _ACEOF
--if { (eval echo "$as_me:12952: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:12959: \"$ac_cpp conftest.$ac_ext\"") >&5
+-if { (eval echo "$as_me:13026: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:13027: \"$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:12958: \$? = $ac_status" >&5
-+  echo "$as_me:12965: \$? = $ac_status" >&5
+-  echo "$as_me:13032: \$? = $ac_status" >&5
++  echo "$as_me:13033: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -12977,7 +12984,7 @@
+@@ -13051,7 +13052,7 @@
  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 12980 "configure"
-+#line 12987 "configure"
+-#line 13054 "configure"
++#line 13055 "configure"
  #include "confdefs.h"
  #include 
  
-@@ -12995,7 +13002,7 @@
+@@ -13069,7 +13070,7 @@
  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 12998 "configure"
-+#line 13005 "configure"
+-#line 13072 "configure"
++#line 13073 "configure"
  #include "confdefs.h"
  #include 
  
-@@ -13016,7 +13023,7 @@
+@@ -13090,7 +13091,7 @@
    :
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 13019 "configure"
-+#line 13026 "configure"
+-#line 13093 "configure"
++#line 13094 "configure"
  #include "confdefs.h"
  #include 
  #if ((' ' & 0x0FF) == 0x020)
-@@ -13042,15 +13049,15 @@
+@@ -13116,15 +13117,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
--if { (eval echo "$as_me:13045: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13052: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:13119: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13120: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:13048: \$? = $ac_status" >&5
-+  echo "$as_me:13055: \$? = $ac_status" >&5
+-  echo "$as_me:13122: \$? = $ac_status" >&5
++  echo "$as_me:13123: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:13050: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13057: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:13124: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13125: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:13053: \$? = $ac_status" >&5
-+  echo "$as_me:13060: \$? = $ac_status" >&5
+-  echo "$as_me:13127: \$? = $ac_status" >&5
++  echo "$as_me:13128: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -13063,7 +13070,7 @@
+@@ -13137,7 +13138,7 @@
  fi
  fi
  fi
--echo "$as_me:13066: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:13073: result: $ac_cv_header_stdc" >&5
+-echo "$as_me:13140: result: $ac_cv_header_stdc" >&5
++echo "$as_me:13141: result: $ac_cv_header_stdc" >&5
  echo "${ECHO_T}$ac_cv_header_stdc" >&6
  if test $ac_cv_header_stdc = yes; then
  
-@@ -13076,13 +13083,13 @@
+@@ -13150,13 +13151,13 @@
  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:13079: checking for $ac_hdr that defines DIR" >&5
-+echo "$as_me:13086: checking for $ac_hdr that defines DIR" >&5
+-echo "$as_me:13153: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:13154: 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 13085 "configure"
-+#line 13092 "configure"
+-#line 13159 "configure"
++#line 13160 "configure"
  #include "confdefs.h"
  #include 
  #include <$ac_hdr>
-@@ -13097,16 +13104,16 @@
+@@ -13171,16 +13172,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13100: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13107: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:13174: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13175: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:13103: \$? = $ac_status" >&5
-+  echo "$as_me:13110: \$? = $ac_status" >&5
+-  echo "$as_me:13177: \$? = $ac_status" >&5
++  echo "$as_me:13178: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13106: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13113: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:13180: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13181: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:13109: \$? = $ac_status" >&5
-+  echo "$as_me:13116: \$? = $ac_status" >&5
+-  echo "$as_me:13183: \$? = $ac_status" >&5
++  echo "$as_me:13184: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_Header=yes"
  else
-@@ -13116,7 +13123,7 @@
+@@ -13190,7 +13191,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
--echo "$as_me:13119: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:13126: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "$as_me:13193: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:13194: 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 <&5
-+  echo "$as_me:13139: checking for opendir in -ldir" >&5
+-  echo "$as_me:13206: checking for opendir in -ldir" >&5
++  echo "$as_me:13207: 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
-@@ -13137,7 +13144,7 @@
+@@ -13211,7 +13212,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldir  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 13140 "configure"
-+#line 13147 "configure"
+-#line 13214 "configure"
++#line 13215 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -13156,16 +13163,16 @@
+@@ -13230,16 +13231,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13159: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13166: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:13233: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13234: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:13162: \$? = $ac_status" >&5
-+  echo "$as_me:13169: \$? = $ac_status" >&5
+-  echo "$as_me:13236: \$? = $ac_status" >&5
++  echo "$as_me:13237: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13165: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13172: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:13239: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13240: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:13168: \$? = $ac_status" >&5
-+  echo "$as_me:13175: \$? = $ac_status" >&5
+-  echo "$as_me:13242: \$? = $ac_status" >&5
++  echo "$as_me:13243: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_dir_opendir=yes
  else
-@@ -13176,14 +13183,14 @@
+@@ -13250,14 +13251,14 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:13179: result: $ac_cv_lib_dir_opendir" >&5
-+echo "$as_me:13186: result: $ac_cv_lib_dir_opendir" >&5
+-echo "$as_me:13253: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:13254: 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:13186: checking for opendir in -lx" >&5
-+  echo "$as_me:13193: checking for opendir in -lx" >&5
+-  echo "$as_me:13260: checking for opendir in -lx" >&5
++  echo "$as_me:13261: 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
-@@ -13191,7 +13198,7 @@
+@@ -13265,7 +13266,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lx  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 13194 "configure"
-+#line 13201 "configure"
+-#line 13268 "configure"
++#line 13269 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -13210,16 +13217,16 @@
+@@ -13284,16 +13285,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13213: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13220: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:13287: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13288: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:13216: \$? = $ac_status" >&5
-+  echo "$as_me:13223: \$? = $ac_status" >&5
+-  echo "$as_me:13290: \$? = $ac_status" >&5
++  echo "$as_me:13291: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13219: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13226: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:13293: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13294: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:13222: \$? = $ac_status" >&5
-+  echo "$as_me:13229: \$? = $ac_status" >&5
+-  echo "$as_me:13296: \$? = $ac_status" >&5
++  echo "$as_me:13297: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_x_opendir=yes
  else
-@@ -13230,7 +13237,7 @@
+@@ -13304,7 +13305,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:13233: result: $ac_cv_lib_x_opendir" >&5
-+echo "$as_me:13240: result: $ac_cv_lib_x_opendir" >&5
+-echo "$as_me:13307: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:13308: 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"
-@@ -13238,13 +13245,13 @@
+@@ -13312,13 +13313,13 @@
  
  fi
  
--echo "$as_me:13241: checking whether time.h and sys/time.h may both be included" >&5
-+echo "$as_me:13248: checking whether time.h and sys/time.h may both be included" >&5
+-echo "$as_me:13315: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:13316: 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 13247 "configure"
-+#line 13254 "configure"
+-#line 13321 "configure"
++#line 13322 "configure"
  #include "confdefs.h"
  #include 
  #include 
-@@ -13260,16 +13267,16 @@
+@@ -13334,16 +13335,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13263: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13270: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:13337: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13338: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:13266: \$? = $ac_status" >&5
-+  echo "$as_me:13273: \$? = $ac_status" >&5
+-  echo "$as_me:13340: \$? = $ac_status" >&5
++  echo "$as_me:13341: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13269: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13276: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:13343: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13344: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:13272: \$? = $ac_status" >&5
-+  echo "$as_me:13279: \$? = $ac_status" >&5
+-  echo "$as_me:13346: \$? = $ac_status" >&5
++  echo "$as_me:13347: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_header_time=yes
  else
-@@ -13279,7 +13286,7 @@
+@@ -13353,7 +13354,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
--echo "$as_me:13282: result: $ac_cv_header_time" >&5
-+echo "$as_me:13289: result: $ac_cv_header_time" >&5
+-echo "$as_me:13356: result: $ac_cv_header_time" >&5
++echo "$as_me:13357: result: $ac_cv_header_time" >&5
  echo "${ECHO_T}$ac_cv_header_time" >&6
  if test $ac_cv_header_time = yes; then
  
-@@ -13297,13 +13304,13 @@
+@@ -13371,13 +13372,13 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  ac_main_return=return
  
--echo "$as_me:13300: checking for an ANSI C-conforming const" >&5
-+echo "$as_me:13307: checking for an ANSI C-conforming const" >&5
+-echo "$as_me:13374: checking for an ANSI C-conforming const" >&5
++echo "$as_me:13375: checking for an ANSI C-conforming const" >&5
  echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
  if test "${ac_cv_c_const+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 13306 "configure"
-+#line 13313 "configure"
+-#line 13380 "configure"
++#line 13381 "configure"
  #include "confdefs.h"
  
  int
-@@ -13361,16 +13368,16 @@
+@@ -13435,16 +13436,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13364: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13371: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:13438: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13439: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:13367: \$? = $ac_status" >&5
-+  echo "$as_me:13374: \$? = $ac_status" >&5
+-  echo "$as_me:13441: \$? = $ac_status" >&5
++  echo "$as_me:13442: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13370: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13377: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:13444: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13445: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:13373: \$? = $ac_status" >&5
-+  echo "$as_me:13380: \$? = $ac_status" >&5
+-  echo "$as_me:13447: \$? = $ac_status" >&5
++  echo "$as_me:13448: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_c_const=yes
  else
-@@ -13380,7 +13387,7 @@
+@@ -13454,7 +13455,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
--echo "$as_me:13383: result: $ac_cv_c_const" >&5
-+echo "$as_me:13390: result: $ac_cv_c_const" >&5
+-echo "$as_me:13457: result: $ac_cv_c_const" >&5
++echo "$as_me:13458: result: $ac_cv_c_const" >&5
  echo "${ECHO_T}$ac_cv_c_const" >&6
  if test $ac_cv_c_const = no; then
  
-@@ -13392,7 +13399,7 @@
+@@ -13466,7 +13467,7 @@
  
  ###	Checks for external-data
  
--echo "$as_me:13395: checking if data-only library module links" >&5
-+echo "$as_me:13402: checking if data-only library module links" >&5
+-echo "$as_me:13469: checking if data-only library module links" >&5
++echo "$as_me:13470: checking if data-only library module links" >&5
  echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
  if test "${cf_cv_link_dataonly+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13400,20 +13407,20 @@
+@@ -13474,20 +13475,20 @@
  
  	rm -f conftest.a
  	cat >conftest.$ac_ext <&5
-+	if { (eval echo "$as_me:13413: \"$ac_compile\"") >&5
+-	if { (eval echo "$as_me:13480: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:13481: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:13409: \$? = $ac_status" >&5
-+  echo "$as_me:13416: \$? = $ac_status" >&5
+-  echo "$as_me:13483: \$? = $ac_status" >&5
++  echo "$as_me:13484: \$? = $ac_status" >&5
    (exit $ac_status); } ; then
  		mv conftest.o data.o && \
  		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
  	fi
  	rm -f conftest.$ac_ext data.o
  	cat >conftest.$ac_ext <&5
-+	if { (eval echo "$as_me:13436: \"$ac_compile\"") >&5
+-	if { (eval echo "$as_me:13503: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:13504: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:13432: \$? = $ac_status" >&5
-+  echo "$as_me:13439: \$? = $ac_status" >&5
+-  echo "$as_me:13506: \$? = $ac_status" >&5
++  echo "$as_me:13507: \$? = $ac_status" >&5
    (exit $ac_status); }; then
  		mv conftest.o func.o && \
  		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
-@@ -13442,7 +13449,7 @@
+@@ -13516,10 +13517,10 @@
    cf_cv_link_dataonly=unknown
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 13445 "configure"
-+#line 13452 "configure"
+-#line 13519 "configure"
++#line 13520 "configure"
  #include "confdefs.h"
  
- 	int main()
-@@ -13453,15 +13460,15 @@
+-	int main()
++	int main(void)
+ 	{
+ 		extern int testfunc();
+ 		${cf_cv_main_return:-return} (!testfunc());
+@@ -13527,15 +13528,15 @@
  
  _ACEOF
  rm -f conftest$ac_exeext
--if { (eval echo "$as_me:13456: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13463: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:13530: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13531: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:13459: \$? = $ac_status" >&5
-+  echo "$as_me:13466: \$? = $ac_status" >&5
+-  echo "$as_me:13533: \$? = $ac_status" >&5
++  echo "$as_me:13534: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:13461: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13468: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:13535: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13536: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:13464: \$? = $ac_status" >&5
-+  echo "$as_me:13471: \$? = $ac_status" >&5
+-  echo "$as_me:13538: \$? = $ac_status" >&5
++  echo "$as_me:13539: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_link_dataonly=yes
  else
-@@ -13476,7 +13483,7 @@
+@@ -13550,7 +13551,7 @@
  
  fi
  
--echo "$as_me:13479: result: $cf_cv_link_dataonly" >&5
-+echo "$as_me:13486: result: $cf_cv_link_dataonly" >&5
+-echo "$as_me:13553: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:13554: result: $cf_cv_link_dataonly" >&5
  echo "${ECHO_T}$cf_cv_link_dataonly" >&6
  
  if test "$cf_cv_link_dataonly" = no ; then
-@@ -13490,7 +13497,7 @@
+@@ -13564,7 +13565,57 @@
  
  ###	Checks for library functions.
  
--echo "$as_me:13493: checking for working mkstemp" >&5
-+echo "$as_me:13500: checking for working mkstemp" >&5
+-echo "$as_me:13567: checking for working mkstemp" >&5
++for ac_header in \
++unistd.h \
++
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++echo "$as_me:13573: 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 13579 "configure"
++#include "confdefs.h"
++#include <$ac_header>
++_ACEOF
++if { (eval echo "$as_me:13583: \"$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:13589: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  eval "$as_ac_Header=yes"
++else
++  echo "$as_me: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "$as_ac_Header=no"
++fi
++rm -f conftest.err conftest.$ac_ext
++fi
++echo "$as_me:13608: 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 <&5
  echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
  if test "${cf_cv_func_mkstemp+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13501,7 +13508,7 @@
+@@ -13575,15 +13626,18 @@
    cf_cv_func_mkstemp=maybe
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 13504 "configure"
-+#line 13511 "configure"
+-#line 13578 "configure"
++#line 13629 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -13539,15 +13546,15 @@
++#ifdef HAVE_UNISTD_H
++#include 
++#endif
+ #include 
+ #include 
+ #include 
+ #include 
+-int main()
++int main(void)
+ {
+ 	char *tmpl = "conftestXXXXXX";
+ 	char name[2][80];
+@@ -13613,15 +13667,15 @@
  
  _ACEOF
  rm -f conftest$ac_exeext
--if { (eval echo "$as_me:13542: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13549: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:13616: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13670: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:13545: \$? = $ac_status" >&5
-+  echo "$as_me:13552: \$? = $ac_status" >&5
+-  echo "$as_me:13619: \$? = $ac_status" >&5
++  echo "$as_me:13673: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:13547: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13554: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:13621: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13675: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:13550: \$? = $ac_status" >&5
-+  echo "$as_me:13557: \$? = $ac_status" >&5
+-  echo "$as_me:13624: \$? = $ac_status" >&5
++  echo "$as_me:13678: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_func_mkstemp=yes
  
-@@ -13562,16 +13569,16 @@
+@@ -13636,16 +13690,16 @@
  fi
  
  fi
--echo "$as_me:13565: result: $cf_cv_func_mkstemp" >&5
-+echo "$as_me:13572: result: $cf_cv_func_mkstemp" >&5
+-echo "$as_me:13639: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:13693: result: $cf_cv_func_mkstemp" >&5
  echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
  if test "x$cf_cv_func_mkstemp" = xmaybe ; then
--	echo "$as_me:13568: checking for mkstemp" >&5
-+	echo "$as_me:13575: checking for mkstemp" >&5
+-	echo "$as_me:13642: checking for mkstemp" >&5
++	echo "$as_me:13696: checking for mkstemp" >&5
  echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
  if test "${ac_cv_func_mkstemp+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 13574 "configure"
-+#line 13581 "configure"
+-#line 13648 "configure"
++#line 13702 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char mkstemp (); below.  */
-@@ -13602,16 +13609,16 @@
+@@ -13676,16 +13730,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13605: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13612: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:13679: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13733: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:13608: \$? = $ac_status" >&5
-+  echo "$as_me:13615: \$? = $ac_status" >&5
+-  echo "$as_me:13682: \$? = $ac_status" >&5
++  echo "$as_me:13736: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13611: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13618: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:13685: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13739: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:13614: \$? = $ac_status" >&5
-+  echo "$as_me:13621: \$? = $ac_status" >&5
+-  echo "$as_me:13688: \$? = $ac_status" >&5
++  echo "$as_me:13742: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_mkstemp=yes
  else
-@@ -13621,7 +13628,7 @@
+@@ -13695,7 +13749,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:13624: result: $ac_cv_func_mkstemp" >&5
-+echo "$as_me:13631: result: $ac_cv_func_mkstemp" >&5
+-echo "$as_me:13698: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:13752: result: $ac_cv_func_mkstemp" >&5
  echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
  
  fi
-@@ -13644,7 +13651,7 @@
+@@ -13718,7 +13772,7 @@
  cf_ada_make=gnatmake
  # Extract the first word of "$cf_ada_make", so it can be a program name with args.
  set dummy $cf_ada_make; ac_word=$2
--echo "$as_me:13647: checking for $ac_word" >&5
-+echo "$as_me:13654: checking for $ac_word" >&5
+-echo "$as_me:13721: checking for $ac_word" >&5
++echo "$as_me:13775: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_gnat_exists+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13659,7 +13666,7 @@
+@@ -13733,7 +13787,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_gnat_exists="yes"
--echo "$as_me:13662: found $ac_dir/$ac_word" >&5
-+echo "$as_me:13669: found $ac_dir/$ac_word" >&5
+-echo "$as_me:13736: found $ac_dir/$ac_word" >&5
++echo "$as_me:13790: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -13668,10 +13675,10 @@
+@@ -13742,10 +13796,10 @@
  fi
  gnat_exists=$ac_cv_prog_gnat_exists
  if test -n "$gnat_exists"; then
--  echo "$as_me:13671: result: $gnat_exists" >&5
-+  echo "$as_me:13678: result: $gnat_exists" >&5
+-  echo "$as_me:13745: result: $gnat_exists" >&5
++  echo "$as_me:13799: result: $gnat_exists" >&5
  echo "${ECHO_T}$gnat_exists" >&6
  else
--  echo "$as_me:13674: result: no" >&5
-+  echo "$as_me:13681: result: no" >&5
+-  echo "$as_me:13748: result: no" >&5
++  echo "$as_me:13802: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -13680,12 +13687,12 @@
+@@ -13754,12 +13808,12 @@
  	cf_cv_prog_gnat_correct=no
  else
  
--echo "$as_me:13683: checking for gnat version" >&5
-+echo "$as_me:13690: checking for gnat version" >&5
+-echo "$as_me:13757: checking for gnat version" >&5
++echo "$as_me:13811: checking for gnat version" >&5
  echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
  cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
  	grep '[0-9].[0-9][0-9]*' |\
  	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
--echo "$as_me:13688: result: $cf_gnat_version" >&5
-+echo "$as_me:13695: result: $cf_gnat_version" >&5
+-echo "$as_me:13762: result: $cf_gnat_version" >&5
++echo "$as_me:13816: result: $cf_gnat_version" >&5
  echo "${ECHO_T}$cf_gnat_version" >&6
  
  case $cf_gnat_version in
-@@ -13693,7 +13700,7 @@
+@@ -13767,7 +13821,7 @@
  	cf_cv_prog_gnat_correct=yes
  	;;
  (*)
--	{ echo "$as_me:13696: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
-+	{ echo "$as_me:13703: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+-	{ echo "$as_me:13770: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
++	{ echo "$as_me:13824: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
  echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
  	cf_cv_prog_gnat_correct=no
  	;;
-@@ -13701,7 +13708,7 @@
+@@ -13775,7 +13829,7 @@
  
  	# Extract the first word of "m4", so it can be a program name with args.
  set dummy m4; ac_word=$2
--echo "$as_me:13704: checking for $ac_word" >&5
-+echo "$as_me:13711: checking for $ac_word" >&5
+-echo "$as_me:13778: checking for $ac_word" >&5
++echo "$as_me:13832: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_M4_exists+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13716,7 +13723,7 @@
+@@ -13790,7 +13844,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_M4_exists="yes"
--echo "$as_me:13719: found $ac_dir/$ac_word" >&5
-+echo "$as_me:13726: found $ac_dir/$ac_word" >&5
+-echo "$as_me:13793: found $ac_dir/$ac_word" >&5
++echo "$as_me:13847: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -13725,10 +13732,10 @@
+@@ -13799,10 +13853,10 @@
  fi
  M4_exists=$ac_cv_prog_M4_exists
  if test -n "$M4_exists"; then
--  echo "$as_me:13728: result: $M4_exists" >&5
-+  echo "$as_me:13735: result: $M4_exists" >&5
+-  echo "$as_me:13802: result: $M4_exists" >&5
++  echo "$as_me:13856: result: $M4_exists" >&5
  echo "${ECHO_T}$M4_exists" >&6
  else
--  echo "$as_me:13731: result: no" >&5
-+  echo "$as_me:13738: result: no" >&5
+-  echo "$as_me:13805: result: no" >&5
++  echo "$as_me:13859: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -13737,7 +13744,7 @@
+@@ -13811,7 +13865,7 @@
  		echo Ada95 binding required program m4 not found. Ada95 binding disabled.
  	fi
  	if test "$cf_cv_prog_gnat_correct" = yes; then
--		echo "$as_me:13740: checking if GNAT works" >&5
-+		echo "$as_me:13747: checking if GNAT works" >&5
+-		echo "$as_me:13814: checking if GNAT works" >&5
++		echo "$as_me:13868: checking if GNAT works" >&5
  echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
  
  rm -rf conftest* *~conftest*
-@@ -13765,14 +13772,14 @@
+@@ -13839,14 +13893,14 @@
  fi
  rm -rf conftest* *~conftest*
  
--		echo "$as_me:13768: result: $cf_cv_prog_gnat_correct" >&5
-+		echo "$as_me:13775: result: $cf_cv_prog_gnat_correct" >&5
+-		echo "$as_me:13842: result: $cf_cv_prog_gnat_correct" >&5
++		echo "$as_me:13896: result: $cf_cv_prog_gnat_correct" >&5
  echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
  	fi
  fi
  
  	if test	"$cf_cv_prog_gnat_correct" = yes; then
  
--	echo "$as_me:13775: checking optimization options for ADAFLAGS" >&5
-+	echo "$as_me:13782: checking optimization options for ADAFLAGS" >&5
+-	echo "$as_me:13849: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:13903: checking optimization options for ADAFLAGS" >&5
  echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
  	case "$CFLAGS" in
  	(*-g*)
-@@ -13789,10 +13796,10 @@
+@@ -13863,10 +13917,10 @@
  
  		;;
  	esac
--	echo "$as_me:13792: result: $ADAFLAGS" >&5
-+	echo "$as_me:13799: result: $ADAFLAGS" >&5
+-	echo "$as_me:13866: result: $ADAFLAGS" >&5
++	echo "$as_me:13920: result: $ADAFLAGS" >&5
  echo "${ECHO_T}$ADAFLAGS" >&6
  
--echo "$as_me:13795: checking if GNATPREP supports -T option" >&5
-+echo "$as_me:13802: checking if GNATPREP supports -T option" >&5
+-echo "$as_me:13869: checking if GNATPREP supports -T option" >&5
++echo "$as_me:13923: checking if GNATPREP supports -T option" >&5
  echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
  if test "${cf_cv_gnatprep_opt_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13802,11 +13809,11 @@
+@@ -13876,11 +13930,11 @@
  gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
  
  fi
--echo "$as_me:13805: result: $cf_cv_gnatprep_opt_t" >&5
-+echo "$as_me:13812: result: $cf_cv_gnatprep_opt_t" >&5
+-echo "$as_me:13879: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:13933: result: $cf_cv_gnatprep_opt_t" >&5
  echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
  test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
  
--echo "$as_me:13809: checking if GNAT supports generics" >&5
-+echo "$as_me:13816: checking if GNAT supports generics" >&5
+-echo "$as_me:13883: checking if GNAT supports generics" >&5
++echo "$as_me:13937: checking if GNAT supports generics" >&5
  echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
  case $cf_gnat_version in
  (3.[1-9]*|[4-9].*)
-@@ -13816,7 +13823,7 @@
+@@ -13890,7 +13944,7 @@
  	cf_gnat_generics=no
  	;;
  esac
--echo "$as_me:13819: result: $cf_gnat_generics" >&5
-+echo "$as_me:13826: result: $cf_gnat_generics" >&5
+-echo "$as_me:13893: result: $cf_gnat_generics" >&5
++echo "$as_me:13947: result: $cf_gnat_generics" >&5
  echo "${ECHO_T}$cf_gnat_generics" >&6
  
  if test "$cf_gnat_generics" = yes
-@@ -13828,7 +13835,7 @@
+@@ -13902,7 +13956,7 @@
  	cf_generic_objects=
  fi
  
--echo "$as_me:13831: checking if GNAT supports SIGINT" >&5
-+echo "$as_me:13838: checking if GNAT supports SIGINT" >&5
+-echo "$as_me:13905: checking if GNAT supports SIGINT" >&5
++echo "$as_me:13959: checking if GNAT supports SIGINT" >&5
  echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
  if test "${cf_cv_gnat_sigint+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13876,7 +13883,7 @@
+@@ -13950,7 +14004,7 @@
  rm -rf conftest* *~conftest*
  
  fi
--echo "$as_me:13879: result: $cf_cv_gnat_sigint" >&5
-+echo "$as_me:13886: result: $cf_cv_gnat_sigint" >&5
+-echo "$as_me:13953: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:14007: result: $cf_cv_gnat_sigint" >&5
  echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
  
  if test $cf_cv_gnat_sigint = yes ; then
-@@ -13889,7 +13896,7 @@
+@@ -13963,7 +14017,7 @@
  cf_gnat_projects=no
  
  if test "$enable_gnat_projects" != no ; then
--echo "$as_me:13892: checking if GNAT supports project files" >&5
-+echo "$as_me:13899: checking if GNAT supports project files" >&5
+-echo "$as_me:13966: checking if GNAT supports project files" >&5
++echo "$as_me:14020: checking if GNAT supports project files" >&5
  echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
  case $cf_gnat_version in
  (3.[0-9]*)
-@@ -13949,15 +13956,15 @@
+@@ -14023,15 +14077,15 @@
  	esac
  	;;
  esac
--echo "$as_me:13952: result: $cf_gnat_projects" >&5
-+echo "$as_me:13959: result: $cf_gnat_projects" >&5
+-echo "$as_me:14026: result: $cf_gnat_projects" >&5
++echo "$as_me:14080: result: $cf_gnat_projects" >&5
  echo "${ECHO_T}$cf_gnat_projects" >&6
  fi # enable_gnat_projects
  
  if test $cf_gnat_projects = yes
  then
--	echo "$as_me:13958: checking if GNAT supports libraries" >&5
-+	echo "$as_me:13965: checking if GNAT supports libraries" >&5
+-	echo "$as_me:14032: checking if GNAT supports libraries" >&5
++	echo "$as_me:14086: checking if GNAT supports libraries" >&5
  echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
--	echo "$as_me:13960: result: $cf_gnat_libraries" >&5
-+	echo "$as_me:13967: result: $cf_gnat_libraries" >&5
+-	echo "$as_me:14034: result: $cf_gnat_libraries" >&5
++	echo "$as_me:14088: result: $cf_gnat_libraries" >&5
  echo "${ECHO_T}$cf_gnat_libraries" >&6
  fi
  
-@@ -13977,7 +13984,7 @@
+@@ -14051,7 +14105,7 @@
  	USE_GNAT_LIBRARIES="#"
  fi
  
--echo "$as_me:13980: checking for ada-compiler" >&5
-+echo "$as_me:13987: checking for ada-compiler" >&5
+-echo "$as_me:14054: checking for ada-compiler" >&5
++echo "$as_me:14108: checking for ada-compiler" >&5
  echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
  
  # Check whether --with-ada-compiler or --without-ada-compiler was given.
-@@ -13988,12 +13995,12 @@
+@@ -14062,12 +14116,12 @@
    cf_ada_compiler=gnatmake
  fi;
  
--echo "$as_me:13991: result: $cf_ada_compiler" >&5
-+echo "$as_me:13998: result: $cf_ada_compiler" >&5
+-echo "$as_me:14065: result: $cf_ada_compiler" >&5
++echo "$as_me:14119: result: $cf_ada_compiler" >&5
  echo "${ECHO_T}$cf_ada_compiler" >&6
  
  		cf_ada_package=terminal_interface
  
--echo "$as_me:13996: checking for ada-include" >&5
-+echo "$as_me:14003: checking for ada-include" >&5
+-echo "$as_me:14070: checking for ada-include" >&5
++echo "$as_me:14124: checking for ada-include" >&5
  echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
  
  # Check whether --with-ada-include or --without-ada-include was given.
-@@ -14029,7 +14036,7 @@
+@@ -14103,7 +14157,7 @@
  	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
  	;;
  (*)
--	{ { echo "$as_me:14032: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:14039: error: expected a pathname, not \"$withval\"" >&5
+-	{ { echo "$as_me:14106: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:14160: error: expected a pathname, not \"$withval\"" >&5
  echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
     { (exit 1); exit 1; }; }
  	;;
-@@ -14038,10 +14045,10 @@
+@@ -14112,10 +14166,10 @@
  fi
  eval ADA_INCLUDE="$withval"
  
--echo "$as_me:14041: result: $ADA_INCLUDE" >&5
-+echo "$as_me:14048: result: $ADA_INCLUDE" >&5
+-echo "$as_me:14115: result: $ADA_INCLUDE" >&5
++echo "$as_me:14169: result: $ADA_INCLUDE" >&5
  echo "${ECHO_T}$ADA_INCLUDE" >&6
  
--echo "$as_me:14044: checking for ada-objects" >&5
-+echo "$as_me:14051: checking for ada-objects" >&5
+-echo "$as_me:14118: checking for ada-objects" >&5
++echo "$as_me:14172: checking for ada-objects" >&5
  echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
  
  # Check whether --with-ada-objects or --without-ada-objects was given.
-@@ -14077,7 +14084,7 @@
+@@ -14151,7 +14205,7 @@
  	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
  	;;
  (*)
--	{ { echo "$as_me:14080: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:14087: error: expected a pathname, not \"$withval\"" >&5
+-	{ { echo "$as_me:14154: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:14208: error: expected a pathname, not \"$withval\"" >&5
  echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
     { (exit 1); exit 1; }; }
  	;;
-@@ -14086,10 +14093,10 @@
+@@ -14160,10 +14214,10 @@
  fi
  eval ADA_OBJECTS="$withval"
  
--echo "$as_me:14089: result: $ADA_OBJECTS" >&5
-+echo "$as_me:14096: result: $ADA_OBJECTS" >&5
+-echo "$as_me:14163: result: $ADA_OBJECTS" >&5
++echo "$as_me:14217: result: $ADA_OBJECTS" >&5
  echo "${ECHO_T}$ADA_OBJECTS" >&6
  
--echo "$as_me:14092: checking if an Ada95 shared-library should be built" >&5
-+echo "$as_me:14099: checking if an Ada95 shared-library should be built" >&5
+-echo "$as_me:14166: checking if an Ada95 shared-library should be built" >&5
++echo "$as_me:14220: checking if an Ada95 shared-library should be built" >&5
  echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
  
  # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
-@@ -14099,7 +14106,7 @@
+@@ -14173,7 +14227,7 @@
  else
    with_ada_sharedlib=no
  fi;
--echo "$as_me:14102: result: $with_ada_sharedlib" >&5
-+echo "$as_me:14109: result: $with_ada_sharedlib" >&5
+-echo "$as_me:14176: result: $with_ada_sharedlib" >&5
++echo "$as_me:14230: result: $with_ada_sharedlib" >&5
  echo "${ECHO_T}$with_ada_sharedlib" >&6
  
  ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
-@@ -14115,12 +14122,12 @@
+@@ -14189,12 +14243,12 @@
  fi
  
  	else
--		{ { echo "$as_me:14118: error: No usable Ada compiler found" >&5
-+		{ { echo "$as_me:14125: error: No usable Ada compiler found" >&5
+-		{ { echo "$as_me:14192: error: No usable Ada compiler found" >&5
++		{ { echo "$as_me:14246: error: No usable Ada compiler found" >&5
  echo "$as_me: error: No usable Ada compiler found" >&2;}
     { (exit 1); exit 1; }; }
  	fi
  else
--	{ { echo "$as_me:14123: error: The Ada compiler is needed for this package" >&5
-+	{ { echo "$as_me:14130: error: The Ada compiler is needed for this package" >&5
+-	{ { echo "$as_me:14197: error: The Ada compiler is needed for this package" >&5
++	{ { echo "$as_me:14251: error: The Ada compiler is needed for this package" >&5
  echo "$as_me: error: The Ada compiler is needed for this package" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -14160,7 +14167,7 @@
+@@ -14234,7 +14288,7 @@
  fi
  
  ### Build up pieces for makefile rules
--echo "$as_me:14163: checking default library suffix" >&5
-+echo "$as_me:14170: checking default library suffix" >&5
+-echo "$as_me:14237: checking default library suffix" >&5
++echo "$as_me:14291: checking default library suffix" >&5
  echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
  
  	case $DFT_LWR_MODEL in
-@@ -14171,10 +14178,10 @@
+@@ -14245,10 +14299,10 @@
  	(shared)  DFT_ARG_SUFFIX=''   ;;
  	esac
  	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
--echo "$as_me:14174: result: $DFT_ARG_SUFFIX" >&5
-+echo "$as_me:14181: result: $DFT_ARG_SUFFIX" >&5
+-echo "$as_me:14248: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:14302: result: $DFT_ARG_SUFFIX" >&5
  echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
  
--echo "$as_me:14177: checking default library-dependency suffix" >&5
-+echo "$as_me:14184: checking default library-dependency suffix" >&5
+-echo "$as_me:14251: checking default library-dependency suffix" >&5
++echo "$as_me:14305: checking default library-dependency suffix" >&5
  echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
  
  	case X$DFT_LWR_MODEL in
-@@ -14232,10 +14239,10 @@
+@@ -14306,10 +14360,10 @@
  		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
  		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
  	fi
--echo "$as_me:14235: result: $DFT_DEP_SUFFIX" >&5
-+echo "$as_me:14242: result: $DFT_DEP_SUFFIX" >&5
+-echo "$as_me:14309: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:14363: result: $DFT_DEP_SUFFIX" >&5
  echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
  
--echo "$as_me:14238: checking default object directory" >&5
-+echo "$as_me:14245: checking default object directory" >&5
+-echo "$as_me:14312: checking default object directory" >&5
++echo "$as_me:14366: checking default object directory" >&5
  echo $ECHO_N "checking default object directory... $ECHO_C" >&6
  
  	case $DFT_LWR_MODEL in
-@@ -14251,7 +14258,7 @@
+@@ -14325,7 +14379,7 @@
  			DFT_OBJ_SUBDIR='obj_s' ;;
  		esac
  	esac
--echo "$as_me:14254: result: $DFT_OBJ_SUBDIR" >&5
-+echo "$as_me:14261: result: $DFT_OBJ_SUBDIR" >&5
+-echo "$as_me:14328: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:14382: result: $DFT_OBJ_SUBDIR" >&5
  echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
  
  ### Set up low-level terminfo dependencies for makefiles.
-@@ -14469,7 +14476,7 @@
+@@ -14543,7 +14597,7 @@
  : ${CONFIG_STATUS=./config.status}
  ac_clean_files_save=$ac_clean_files
  ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ echo "$as_me:14472: creating $CONFIG_STATUS" >&5
-+{ echo "$as_me:14479: creating $CONFIG_STATUS" >&5
+-{ echo "$as_me:14546: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:14600: creating $CONFIG_STATUS" >&5
  echo "$as_me: creating $CONFIG_STATUS" >&6;}
  cat >$CONFIG_STATUS <<_ACEOF
  #! $SHELL
-@@ -14645,7 +14652,7 @@
+@@ -14719,7 +14773,7 @@
      echo "$ac_cs_version"; exit 0 ;;
    --he | --h)
      # Conflict between --help and --header
--    { { echo "$as_me:14648: error: ambiguous option: $1
-+    { { echo "$as_me:14655: error: ambiguous option: $1
+-    { { echo "$as_me:14722: error: ambiguous option: $1
++    { { echo "$as_me:14776: 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;}
-@@ -14664,7 +14671,7 @@
+@@ -14738,7 +14792,7 @@
      ac_need_defaults=false;;
  
    # This is an error.
--  -*) { { echo "$as_me:14667: error: unrecognized option: $1
-+  -*) { { echo "$as_me:14674: error: unrecognized option: $1
+-  -*) { { echo "$as_me:14741: error: unrecognized option: $1
++  -*) { { echo "$as_me:14795: 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;}
-@@ -14735,7 +14742,7 @@
+@@ -14809,7 +14863,7 @@
    "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
    "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
--  *) { { echo "$as_me:14738: error: invalid argument: $ac_config_target" >&5
-+  *) { { echo "$as_me:14745: error: invalid argument: $ac_config_target" >&5
+-  *) { { echo "$as_me:14812: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:14866: error: invalid argument: $ac_config_target" >&5
  echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
     { (exit 1); exit 1; }; };;
    esac
-@@ -15078,7 +15085,7 @@
+@@ -15152,7 +15206,7 @@
    esac
  
    if test x"$ac_file" != x-; then
--    { echo "$as_me:15081: creating $ac_file" >&5
-+    { echo "$as_me:15088: creating $ac_file" >&5
+-    { echo "$as_me:15155: creating $ac_file" >&5
++    { echo "$as_me:15209: creating $ac_file" >&5
  echo "$as_me: creating $ac_file" >&6;}
      rm -f "$ac_file"
    fi
-@@ -15096,7 +15103,7 @@
+@@ -15170,7 +15224,7 @@
        -) echo $tmp/stdin ;;
        [\\/$]*)
           # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:15099: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:15106: error: cannot find input file: $f" >&5
+-         test -f "$f" || { { echo "$as_me:15173: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:15227: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
           echo $f;;
-@@ -15109,7 +15116,7 @@
+@@ -15183,7 +15237,7 @@
             echo $srcdir/$f
           else
             # /dev/null tree
--           { { echo "$as_me:15112: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:15119: error: cannot find input file: $f" >&5
+-           { { echo "$as_me:15186: error: cannot find input file: $f" >&5
++           { { echo "$as_me:15240: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
           fi;;
-@@ -15125,7 +15132,7 @@
+@@ -15199,7 +15253,7 @@
        if test -n "$ac_seen"; then
          ac_used=`grep '@datarootdir@' $ac_item`
          if test -z "$ac_used"; then
--          { echo "$as_me:15128: WARNING: datarootdir was used implicitly but not set:
-+          { echo "$as_me:15135: WARNING: datarootdir was used implicitly but not set:
+-          { echo "$as_me:15202: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:15256: 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;}
-@@ -15134,7 +15141,7 @@
+@@ -15208,7 +15262,7 @@
        fi
        ac_seen=`grep '${datarootdir}' $ac_item`
        if test -n "$ac_seen"; then
--        { echo "$as_me:15137: WARNING: datarootdir was used explicitly but not set:
-+        { echo "$as_me:15144: WARNING: datarootdir was used explicitly but not set:
+-        { echo "$as_me:15211: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:15265: 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;}
-@@ -15171,7 +15178,7 @@
+@@ -15245,7 +15299,7 @@
              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:15174: WARNING: Variable $ac_name is used but was not set:
-+              { echo "$as_me:15181: WARNING: Variable $ac_name is used but was not set:
+-              { echo "$as_me:15248: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:15302: 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;}
-@@ -15182,7 +15189,7 @@
+@@ -15256,7 +15310,7 @@
      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:15185: WARNING: Some variables may not be substituted:
-+      { echo "$as_me:15192: WARNING: Some variables may not be substituted:
+-      { echo "$as_me:15259: WARNING: Some variables may not be substituted:
++      { echo "$as_me:15313: WARNING: Some variables may not be substituted:
  $ac_seen" >&5
  echo "$as_me: WARNING: Some variables may not be substituted:
  $ac_seen" >&2;}
-@@ -15231,7 +15238,7 @@
+@@ -15305,7 +15359,7 @@
    * )   ac_file_in=$ac_file.in ;;
    esac
  
--  test x"$ac_file" != x- && { echo "$as_me:15234: creating $ac_file" >&5
-+  test x"$ac_file" != x- && { echo "$as_me:15241: creating $ac_file" >&5
+-  test x"$ac_file" != x- && { echo "$as_me:15308: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:15362: creating $ac_file" >&5
  echo "$as_me: creating $ac_file" >&6;}
  
    # First look for the input files in the build tree, otherwise in the
-@@ -15242,7 +15249,7 @@
+@@ -15316,7 +15370,7 @@
        -) echo $tmp/stdin ;;
        [\\/$]*)
           # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:15245: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:15252: error: cannot find input file: $f" >&5
+-         test -f "$f" || { { echo "$as_me:15319: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:15373: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
           echo $f;;
-@@ -15255,7 +15262,7 @@
+@@ -15329,7 +15383,7 @@
             echo $srcdir/$f
           else
             # /dev/null tree
--           { { echo "$as_me:15258: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:15265: error: cannot find input file: $f" >&5
+-           { { echo "$as_me:15332: error: cannot find input file: $f" >&5
++           { { echo "$as_me:15386: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
           fi;;
-@@ -15313,7 +15320,7 @@
+@@ -15387,7 +15441,7 @@
    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:15316: $ac_file is unchanged" >&5
-+      { echo "$as_me:15323: $ac_file is unchanged" >&5
+-      { echo "$as_me:15390: $ac_file is unchanged" >&5
++      { echo "$as_me:15444: $ac_file is unchanged" >&5
  echo "$as_me: $ac_file is unchanged" >&6;}
      else
        ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 Index: NEWS
-Prereq:  1.2505 
---- ncurses-6.0-20151010+/NEWS	2015-10-10 20:24:26.000000000 +0000
-+++ ncurses-6.0-20151017/NEWS	2015-10-17 22:02:46.000000000 +0000
+Prereq:  1.2735 
+--- ncurses-6.0-20170114+/NEWS	2017-01-14 20:59:06.000000000 +0000
++++ ncurses-6.0-20170121/NEWS	2017-01-21 23:40:19.000000000 +0000
 @@ -25,7 +25,7 @@
  -- sale, use or other dealings in this Software without prior written        --
  -- authorization.                                                            --
  -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.2505 2015/10/10 20:24:26 tom Exp $
-+-- $Id: NEWS,v 1.2509 2015/10/17 22:02:46 tom Exp $
+--- $Id: NEWS,v 1.2735 2017/01/14 20:59:06 tom Exp $
++-- $Id: NEWS,v 1.2741 2017/01/21 23:40:19 tom Exp $
  -------------------------------------------------------------------------------
  
  This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,18 @@
+@@ -45,6 +45,17 @@
  Changes through 1.9.9e did not credit all contributions;
  it is not possible to add this information.
  
-+20151017
-+	+ modify ncurses/Makefile.in to sort keys.list in POSIX locale
-+	  (Debian #801864, patch by Esa Peuha).
-+	+ remove an early-return from _nc_do_color, which can interfere with
-+	  data needed by bkgd when ncurses is configured with extended colors
-+	  (patch by Denis Tikhomirov).
-+	> fixes for OS/2 (patches by KO Myung-Hun)
-+	+ use button instead of kbuf[0] in EMX-specific part of lib_mouse.c
-+	+ support building with libtool on OS/2
-+	+ use stdc++ on OS/2 kLIBC
-+	+ clear cf_XOPEN_SOURCE on OS/2
++20170121
++	+ incorporate A_COLOR mask into COLOR_PAIR(), in case user application
++	  provides an out-of-range pair number (report by Elijah Stone).
++	+ clarify description in tput manual page regarding support for
++	  termcap names (prompted by FreeBSD #214709).
++	+ remove a restriction in tput's support for termcap names which
++	  omitted capabilities normally not shown in termcap translations
++	  (cf: 990123).
++	+ modify configure script for clang as used on FreeBSD, to work around
++	  clang's differences in exit codes vs gcc.
 +
- 20151010
- 	+ add configure check for openpty to test/configure script, for ditto.
- 	+ minor fixes to test/view.c in investigating Debian #790847.
-@@ -1713,7 +1725,7 @@
- 	+ modify check_existence() in db_iterator.c to simply check if the
- 	  path is a directory or file, according to the need.  Checking for
- 	  directory size also gives no usable result with OS/2 (cf: 20120107).
--	+ support OS/2 kLIBC (patch by KO Myung-Han).
-+	+ support OS/2 kLIBC (patch by KO Myung-Hun).
- 
- 20120114
- 	+ several improvements to test/movewindow.c (prompted by discussion on
+ 20170114
+ 	+ improve discussion of early history of tset/reset programs.
+ 	+ clarify in manual pages that the optional verbose option level is
 Index: VERSION
---- ncurses-6.0-20151010+/VERSION	2015-10-10 17:06:12.000000000 +0000
-+++ ncurses-6.0-20151017/VERSION	2015-10-17 20:29:47.000000000 +0000
+--- ncurses-6.0-20170114+/VERSION	2017-01-14 15:30:30.000000000 +0000
++++ ncurses-6.0-20170121/VERSION	2017-01-21 13:48:23.000000000 +0000
 @@ -1 +1 @@
--5:0:9	6.0	20151010
-+5:0:9	6.0	20151017
+-5:0:9	6.0	20170114
++5:0:9	6.0	20170121
 Index: aclocal.m4
-Prereq:  1.770 
---- ncurses-6.0-20151010+/aclocal.m4	2015-10-10 19:27:07.000000000 +0000
-+++ ncurses-6.0-20151017/aclocal.m4	2015-10-17 23:05:09.000000000 +0000
+Prereq:  1.803 
+--- ncurses-6.0-20170114+/aclocal.m4	2016-12-31 17:09:35.000000000 +0000
++++ ncurses-6.0-20170121/aclocal.m4	2017-01-21 16:13:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ dnl***************************************************************************
+-dnl Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
++dnl Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
+ dnl                                                                          *
+ dnl Permission is hereby granted, free of charge, to any person obtaining a  *
+ dnl copy of this software and associated documentation files (the            *
 @@ -28,7 +28,7 @@
  dnl
  dnl Author: Thomas E. Dickey 1995-on
  dnl
--dnl $Id: aclocal.m4,v 1.770 2015/10/10 19:27:07 tom Exp $
-+dnl $Id: aclocal.m4,v 1.774 2015/10/17 23:05:09 tom Exp $
+-dnl $Id: aclocal.m4,v 1.803 2016/12/31 17:09:35 tom Exp $
++dnl $Id: aclocal.m4,v 1.804 2017/01/21 16:13:56 tom Exp $
  dnl Macros used in NCURSES auto-configuration script.
  dnl
  dnl These macros are maintained separately from NCURSES.  The copyright on
-@@ -3221,7 +3221,7 @@
- test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_LIB_PREFIX version: 11 updated: 2015/04/18 08:56:57
-+dnl CF_LIB_PREFIX version: 12 updated: 2015/10/17 19:03:33
- dnl -------------
- dnl Compute the library-prefix for the given host system
- dnl $1 = variable to set
-@@ -3229,7 +3229,11 @@
- [
- 	case $cf_cv_system_name in
- 	(OS/2*|os2*)
--		LIB_PREFIX=''
-+		if test "$DFT_LWR_MODEL" = libtool; then
-+			LIB_PREFIX='lib'
-+		else
-+			LIB_PREFIX=''
-+		fi
- 		;;
- 	(*)	LIB_PREFIX='lib'
- 		;;
-@@ -6257,7 +6261,7 @@
+@@ -551,7 +551,7 @@
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
--dnl CF_STDCPP_LIBRARY version: 10 updated: 2015/09/12 15:53:39
-+dnl CF_STDCPP_LIBRARY version: 11 updated: 2015/10/17 19:03:33
- dnl -----------------
- dnl Check for -lstdc++, which is GNU's standard C++ library.
- dnl If $CXXLIBS is set, add that to the libraries used for test-linking.
-@@ -6282,7 +6286,11 @@
- 	then
- 		case $cf_cv_system_name in
- 		(os2*)
--			cf_stdcpp_libname=stdcpp
-+			if test -z "`g++ -dM -E - < /dev/null | grep __KLIBC__`"; then
-+				cf_stdcpp_libname=stdcpp
-+			else
-+				cf_stdcpp_libname=stdc++
-+			fi
- 			;;
- 		(*)
- 			cf_stdcpp_libname=stdc++
-@@ -7047,7 +7055,7 @@
+-dnl CF_BOOL_SIZE version: 14 updated: 2015/04/17 21:13:04
++dnl CF_BOOL_SIZE version: 15 updated: 2017/01/21 11:06:25
+ dnl ------------
+ dnl Test for the size of 'bool' in the configured C++ compiler (e.g., a type).
+ dnl Don't bother looking for bool.h, since it's been deprecated.
+@@ -585,7 +585,7 @@
+ 
+ #endif
+ 
+-int main()
++int main(void)
+ {
+ 	FILE *fp = fopen("cf_test.out", "w");
+ 	if (fp != 0) {
+@@ -811,7 +811,7 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_CGETENT version: 5 updated: 2012/10/06 17:56:13
++dnl CF_CGETENT version: 6 updated: 2017/01/21 11:06:25
+ dnl ----------
+ dnl Check if the terminal-capability database functions are available.  If not,
+ dnl ncurses has a much-reduced version.
+@@ -835,6 +835,7 @@
+ 	AC_DEFINE(HAVE_BSD_CGETENT,1,[Define to 1 if we have BSD cgetent])
+ AC_CACHE_CHECK(if cgetent uses const parameter,cf_cv_cgetent_const,[
+ AC_TRY_LINK([
++#pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
+ #include ],[
+ 	char temp[128];
+ 	char *buf = temp;
+@@ -947,7 +948,7 @@
+ 
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_CHECK_GPM_WGETCH version: 2 updated: 2010/08/14 18:25:37
++dnl CF_CHECK_GPM_WGETCH version: 3 updated: 2017/01/21 11:06:25
+ dnl -------------------
+ dnl Check if GPM is already linked with curses.  If so - and if the linkage
+ dnl is not "weak" - warn about this because it can create problems linking
+@@ -961,7 +962,7 @@
+ 
+ cat >conftest.$ac_ext <
+-int main()
++int main(void)
+ {
+ 	Gpm_Wgetch();
+ 	${cf_cv_main_return:-return}(0);
+@@ -1012,15 +1013,24 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_CHECK_WCHAR_H version: 1 updated: 2011/10/29 15:01:05
++dnl CF_CHECK_WCHAR_H version: 2 updated: 2017/01/21 11:06:25
+ dnl ----------------
+ dnl Check if wchar.h can be used, i.e., without defining _XOPEN_SOURCE_EXTENDED
+ AC_DEFUN([CF_CHECK_WCHAR_H],[
++AC_CHECK_HEADERS( \
++wchar.h \
++wctype.h \
++)
+ AC_CACHE_CHECK(if wchar.h can be used as is,cf_cv_wchar_h_okay,[
+ AC_TRY_COMPILE(
+ [
+ #include 
++#ifdef HAVE_WCHAR_H
+ #include 
++#endif
++#ifdef HAVE_WCTYPE_H
++#include 
++#endif
+ ],[
+ 	wint_t foo = 0;
+ 	int bar = iswpunct(foo)],
+@@ -1209,7 +1219,7 @@
  fi
  ])
  dnl ---------------------------------------------------------------------------
--dnl CF_WITH_LIBTOOL version: 32 updated: 2015/04/17 21:13:04
-+dnl CF_WITH_LIBTOOL version: 33 updated: 2015/10/17 19:03:33
+-dnl CF_CPP_PARAM_INIT version: 6 updated: 2012/10/06 17:56:13
++dnl CF_CPP_PARAM_INIT version: 7 updated: 2017/01/21 11:06:25
+ dnl -----------------
+ dnl Check if the C++ compiler accepts duplicate parameter initialization.  This
+ dnl is a late feature for the standard and is not in some recent compilers
+@@ -1233,7 +1243,7 @@
+ {
+ 	value = x;
+ }
+-int main() { }
++int main(void) { }
+ ],
+ 	[cf_cv_cpp_param_init=yes],
+ 	[cf_cv_cpp_param_init=no],
+@@ -1903,7 +1913,7 @@
+ fi
+ ])
+ dnl ---------------------------------------------------------------------------
+-dnl CF_FUNC_MEMMOVE version: 8 updated: 2012/10/04 20:12:20
++dnl CF_FUNC_MEMMOVE version: 9 updated: 2017/01/21 11:06:25
  dnl ---------------
- dnl Provide a configure option to incorporate libtool.  Define several useful
- dnl symbols for the makefile rules.
-@@ -7145,7 +7153,7 @@
- 	# special hack to add -no-undefined (which libtool should do for itself)
- 	LT_UNDEF=
- 	case "$cf_cv_system_name" in
--	(cygwin*|msys*|mingw32*|uwin*|aix[[4-7]])
-+	(cygwin*|msys*|mingw32*|os2*|uwin*|aix[[4-7]])
- 		LT_UNDEF=-no-undefined
- 		;;
- 	esac
-@@ -7643,7 +7651,7 @@
- AC_SUBST(WILDCARD_SYMS)
+ dnl Check for memmove, or a bcopy that can handle overlapping copy.  If neither
+ dnl is found, add our own version of memmove to the list of objects.
+@@ -1913,7 +1923,7 @@
+ AC_CHECK_FUNC(bcopy,[
+ 	AC_CACHE_CHECK(if bcopy does overlapping moves,cf_cv_good_bcopy,[
+ 		AC_TRY_RUN([
+-int main() {
++int main(void) {
+ 	static char data[] = "abcdefghijklmnopqrstuwwxyz";
+ 	char temp[40];
+ 	bcopy(data, temp, sizeof(data));
+@@ -1934,7 +1944,7 @@
+ 	fi
+ ])])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_FUNC_NANOSLEEP version: 4 updated: 2012/10/06 17:56:13
++dnl CF_FUNC_NANOSLEEP version: 5 updated: 2017/01/21 11:06:25
+ dnl -----------------
+ dnl Check for existence of workable nanosleep() function.  Some systems, e.g.,
+ dnl AIX 4.x, provide a non-working version.
+@@ -1949,7 +1959,7 @@
+ #include 
+ #endif
+ 
+-int main() {
++int main(void) {
+ 	struct timespec ts1, ts2;
+ 	int code;
+ 	ts1.tv_sec  = 0;
+@@ -3169,7 +3179,7 @@
+ test "$cf_cv_have_isascii" = yes && AC_DEFINE(HAVE_ISASCII,1,[Define to 1 if we have isascii()])
  ])dnl
  dnl ---------------------------------------------------------------------------
--dnl CF_XOPEN_SOURCE version: 49 updated: 2015/04/12 15:39:00
-+dnl CF_XOPEN_SOURCE version: 50 updated: 2015/10/17 19:03:33
- dnl ---------------
- dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
- dnl or adapt to the vendor's definitions to get equivalent functionality,
-@@ -7713,6 +7721,9 @@
- (openbsd*)
- 	# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
- 	;;
-+(os2*)
-+	cf_XOPEN_SOURCE=
-+	;;
- (osf[[45]]*)
- 	cf_xopen_source="-D_OSF_SOURCE"
- 	;;
-Index: c++/Makefile.in
-Prereq:  1.111 
---- ncurses-6.0-20151010+/c++/Makefile.in	2015-08-05 23:15:41.000000000 +0000
-+++ ncurses-6.0-20151017/c++/Makefile.in	2015-10-17 22:59:12.000000000 +0000
-@@ -1,4 +1,4 @@
--# $Id: Makefile.in,v 1.111 2015/08/05 23:15:41 tom Exp $
-+# $Id: Makefile.in,v 1.113 2015/10/17 22:59:12 tom Exp $
- ##############################################################################
- # Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.                #
- #                                                                            #
-@@ -58,7 +58,7 @@
- PACKAGE		= @PACKAGE@
+-dnl CF_LARGEFILE version: 9 updated: 2015/04/18 08:56:57
++dnl CF_LARGEFILE version: 10 updated: 2017/01/21 11:06:25
+ dnl ------------
+ dnl Add checks for large file support.
+ AC_DEFUN([CF_LARGEFILE],[
+@@ -3191,6 +3201,7 @@
  
- LIBTOOL		= @LIBTOOL_CXX@
--LIBTOOL_OPTS	= @LIBTOOL_OPTS@
-+LIBTOOL_OPTS	= @LIBTOOL_OPTS@ @LIBTOOL_OPTS_CXX@
- LIBTOOL_CLEAN	= @LIB_CLEAN@
- LIBTOOL_COMPILE	= @LIB_COMPILE@
- LIBTOOL_LINK	= @LIB_LINK@
-Index: configure
---- ncurses-6.0-20151010+/configure	2015-10-10 19:18:37.000000000 +0000
-+++ ncurses-6.0-20151017/configure	2015-10-17 23:05:27.000000000 +0000
-@@ -1,5 +1,5 @@
- #! /bin/sh
--# From configure.in Revision: 1.619 .
-+# From configure.in Revision: 1.620 .
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by Autoconf 2.52.20150926.
- #
-@@ -4975,7 +4975,7 @@
- 	# special hack to add -no-undefined (which libtool should do for itself)
- 	LT_UNDEF=
- 	case "$cf_cv_system_name" in
--	(cygwin*|msys*|mingw32*|uwin*|aix[4-7])
-+	(cygwin*|msys*|mingw32*|os2*|uwin*|aix[4-7])
- 		LT_UNDEF=-no-undefined
- 		;;
- 	esac
-@@ -5124,7 +5124,11 @@
- 
- 	case $cf_cv_system_name in
- 	(OS/2*|os2*)
--		LIB_PREFIX=''
-+		if test "$DFT_LWR_MODEL" = libtool; then
-+			LIB_PREFIX='lib'
-+		else
-+			LIB_PREFIX=''
-+		fi
- 		;;
- 	(*)	LIB_PREFIX='lib'
- 		;;
-@@ -5140,19 +5144,19 @@
- 
- LIB_SUFFIX=
- 
--	echo "$as_me:5143: checking for PATH separator" >&5
-+	echo "$as_me:5147: 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:5150: result: $PATH_SEPARATOR" >&5
-+	echo "$as_me:5154: result: $PATH_SEPARATOR" >&5
- echo "${ECHO_T}$PATH_SEPARATOR" >&6
- 
- ###############################################################################
- 
--echo "$as_me:5155: checking if you want to build a separate terminfo library" >&5
-+echo "$as_me:5159: checking if you want to build a separate terminfo library" >&5
- echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6
- 
- # Check whether --with-termlib or --without-termlib was given.
-@@ -5162,10 +5166,10 @@
- else
-   with_termlib=no
- fi;
--echo "$as_me:5165: result: $with_termlib" >&5
-+echo "$as_me:5169: result: $with_termlib" >&5
- echo "${ECHO_T}$with_termlib" >&6
- 
--echo "$as_me:5168: checking if you want to build a separate tic library" >&5
-+echo "$as_me:5172: checking if you want to build a separate tic library" >&5
- echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6
- 
- # Check whether --with-ticlib or --without-ticlib was given.
-@@ -5175,13 +5179,13 @@
- else
-   with_ticlib=no
- fi;
--echo "$as_me:5178: result: $with_ticlib" >&5
-+echo "$as_me:5182: result: $with_ticlib" >&5
- echo "${ECHO_T}$with_ticlib" >&6
- 
- ### Checks for special libraries, must be done up-front.
- SHLIB_LIST=""
- 
--echo "$as_me:5184: checking if you want to link with the GPM mouse library" >&5
-+echo "$as_me:5188: checking if you want to link with the GPM mouse library" >&5
- echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6
- 
- # Check whether --with-gpm or --without-gpm was given.
-@@ -5191,27 +5195,27 @@
- else
-   with_gpm=maybe
- fi;
--echo "$as_me:5194: result: $with_gpm" >&5
-+echo "$as_me:5198: result: $with_gpm" >&5
- echo "${ECHO_T}$with_gpm" >&6
- 
- if test "$with_gpm" != no ; then
--	echo "$as_me:5198: checking for gpm.h" >&5
-+	echo "$as_me:5202: checking for gpm.h" >&5
- echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6
- if test "${ac_cv_header_gpm_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5204 "configure"
-+#line 5208 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:5208: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:5212: \"$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:5214: \$? = $ac_status" >&5
-+  echo "$as_me:5218: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -5230,7 +5234,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:5233: result: $ac_cv_header_gpm_h" >&5
-+echo "$as_me:5237: result: $ac_cv_header_gpm_h" >&5
- echo "${ECHO_T}$ac_cv_header_gpm_h" >&6
- if test $ac_cv_header_gpm_h = yes; then
- 
-@@ -5241,14 +5245,14 @@
- 		if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then
- 			test -n "$verbose" && echo "	assuming we really have GPM library" 1>&6
- 
--echo "${as_me:-configure}:5244: testing assuming we really have GPM library ..." 1>&5
-+echo "${as_me:-configure}:5248: testing assuming we really have GPM library ..." 1>&5
- 
- cat >>confdefs.h <<\EOF
- #define HAVE_LIBGPM 1
- EOF
- 
- 		else
--			echo "$as_me:5251: checking for Gpm_Open in -lgpm" >&5
-+			echo "$as_me:5255: 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
-@@ -5256,7 +5260,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5259 "configure"
-+#line 5263 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5275,16 +5279,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5278: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5282: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5281: \$? = $ac_status" >&5
-+  echo "$as_me:5285: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5284: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5288: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5287: \$? = $ac_status" >&5
-+  echo "$as_me:5291: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_Gpm_Open=yes
- else
-@@ -5295,13 +5299,13 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:5298: result: $ac_cv_lib_gpm_Gpm_Open" >&5
-+echo "$as_me:5302: 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
-   :
- else
- 
--				{ { echo "$as_me:5304: error: Cannot link with GPM library" >&5
-+				{ { echo "$as_me:5308: error: Cannot link with GPM library" >&5
- echo "$as_me: error: Cannot link with GPM library" >&2;}
-    { (exit 1); exit 1; }; }
- 		fi
-@@ -5311,7 +5315,7 @@
- 
- else
- 
--		test "$with_gpm" != maybe && { echo "$as_me:5314: WARNING: Cannot find GPM header" >&5
-+		test "$with_gpm" != maybe && { echo "$as_me:5318: WARNING: Cannot find GPM header" >&5
- echo "$as_me: WARNING: Cannot find GPM header" >&2;}
- 		with_gpm=no
- 
-@@ -5320,7 +5324,7 @@
- fi
- 
- if test "$with_gpm" != no ; then
--	echo "$as_me:5323: checking if you want to load GPM dynamically" >&5
-+	echo "$as_me:5327: checking if you want to load GPM dynamically" >&5
- echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6
- 
- # Check whether --with-dlsym or --without-dlsym was given.
-@@ -5330,18 +5334,18 @@
- else
-   with_dlsym=yes
- fi;
--	echo "$as_me:5333: result: $with_dlsym" >&5
-+	echo "$as_me:5337: result: $with_dlsym" >&5
- echo "${ECHO_T}$with_dlsym" >&6
- 	if test "x$with_dlsym" = xyes ; then
- 
- cf_have_dlsym=no
--echo "$as_me:5338: checking for dlsym" >&5
-+echo "$as_me:5342: checking for dlsym" >&5
- echo $ECHO_N "checking for dlsym... $ECHO_C" >&6
- if test "${ac_cv_func_dlsym+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5344 "configure"
-+#line 5348 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char dlsym (); below.  */
-@@ -5372,16 +5376,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5375: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5379: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5378: \$? = $ac_status" >&5
-+  echo "$as_me:5382: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5381: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5385: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5384: \$? = $ac_status" >&5
-+  echo "$as_me:5388: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_dlsym=yes
- else
-@@ -5391,14 +5395,14 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:5394: result: $ac_cv_func_dlsym" >&5
-+echo "$as_me:5398: result: $ac_cv_func_dlsym" >&5
- echo "${ECHO_T}$ac_cv_func_dlsym" >&6
- if test $ac_cv_func_dlsym = yes; then
-   cf_have_dlsym=yes
- else
- 
- cf_have_libdl=no
--echo "$as_me:5401: checking for dlsym in -ldl" >&5
-+echo "$as_me:5405: 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
-@@ -5406,7 +5410,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5409 "configure"
-+#line 5413 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5425,16 +5429,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5428: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5432: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5431: \$? = $ac_status" >&5
-+  echo "$as_me:5435: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5434: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5438: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5437: \$? = $ac_status" >&5
-+  echo "$as_me:5441: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dl_dlsym=yes
- else
-@@ -5445,7 +5449,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:5448: result: $ac_cv_lib_dl_dlsym" >&5
-+echo "$as_me:5452: 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
- 
-@@ -5474,10 +5478,10 @@
- LIBS="$cf_add_libs"
-  }
- 
--	echo "$as_me:5477: checking whether able to link to dl*() functions" >&5
-+	echo "$as_me:5481: checking whether able to link to dl*() functions" >&5
- echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 5480 "configure"
-+#line 5484 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -5495,16 +5499,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5498: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5502: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5501: \$? = $ac_status" >&5
-+  echo "$as_me:5505: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5504: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5508: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5507: \$? = $ac_status" >&5
-+  echo "$as_me:5511: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- cat >>confdefs.h <<\EOF
-@@ -5515,15 +5519,15 @@
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- 
--		{ { echo "$as_me:5518: error: Cannot link test program for libdl" >&5
-+		{ { echo "$as_me:5522: error: Cannot link test program for libdl" >&5
- echo "$as_me: error: Cannot link test program for libdl" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--	echo "$as_me:5523: result: ok" >&5
-+	echo "$as_me:5527: result: ok" >&5
- echo "${ECHO_T}ok" >&6
- else
--	{ { echo "$as_me:5526: error: Cannot find dlsym function" >&5
-+	{ { echo "$as_me:5530: error: Cannot find dlsym function" >&5
- echo "$as_me: error: Cannot find dlsym function" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -5531,12 +5535,12 @@
- 		if test "x$with_gpm" != xyes ; then
- 			test -n "$verbose" && echo "	assuming soname for gpm is $with_gpm" 1>&6
- 
--echo "${as_me:-configure}:5534: testing assuming soname for gpm is $with_gpm ..." 1>&5
-+echo "${as_me:-configure}:5538: testing assuming soname for gpm is $with_gpm ..." 1>&5
- 
- 			cf_cv_gpm_soname="$with_gpm"
- 		else
- 
--echo "$as_me:5539: checking for soname of gpm library" >&5
-+echo "$as_me:5543: checking for soname of gpm library" >&5
- echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6
- if test "${cf_cv_gpm_soname+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5570,15 +5574,15 @@
- done
- LIBS="$cf_add_libs"
- 
--	if { (eval echo "$as_me:5573: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:5577: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:5576: \$? = $ac_status" >&5
-+  echo "$as_me:5580: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
--		if { (eval echo "$as_me:5578: \"$ac_link\"") >&5
-+		if { (eval echo "$as_me:5582: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5581: \$? = $ac_status" >&5
-+  echo "$as_me:5585: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 			cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.`
- 			test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
-@@ -5589,7 +5593,7 @@
- fi
- 
- fi
--echo "$as_me:5592: result: $cf_cv_gpm_soname" >&5
-+echo "$as_me:5596: result: $cf_cv_gpm_soname" >&5
- echo "${ECHO_T}$cf_cv_gpm_soname" >&6
- 
- 		fi
-@@ -5624,7 +5628,7 @@
- #define HAVE_LIBGPM 1
- EOF
- 
--echo "$as_me:5627: checking for Gpm_Wgetch in -lgpm" >&5
-+echo "$as_me:5631: checking for Gpm_Wgetch in -lgpm" >&5
- echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6
- if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5632,7 +5636,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5635 "configure"
-+#line 5639 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5651,16 +5655,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5654: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5658: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5657: \$? = $ac_status" >&5
-+  echo "$as_me:5661: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5660: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5664: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5663: \$? = $ac_status" >&5
-+  echo "$as_me:5667: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_Gpm_Wgetch=yes
- else
-@@ -5671,11 +5675,11 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:5674: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
-+echo "$as_me:5678: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
- echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6
- if test $ac_cv_lib_gpm_Gpm_Wgetch = yes; then
- 
--echo "$as_me:5678: checking if GPM is weakly bound to curses library" >&5
-+echo "$as_me:5682: checking if GPM is weakly bound to curses library" >&5
- echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6
- if test "${cf_cv_check_gpm_wgetch+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5699,15 +5703,15 @@
- 	# to rely on the static library, noting that some packagers may not
- 	# include it.
- 	LIBS="-static -lgpm -dynamic $LIBS"
--	if { (eval echo "$as_me:5702: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:5706: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:5705: \$? = $ac_status" >&5
-+  echo "$as_me:5709: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
--		if { (eval echo "$as_me:5707: \"$ac_link\"") >&5
-+		if { (eval echo "$as_me:5711: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5710: \$? = $ac_status" >&5
-+  echo "$as_me:5714: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 			cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\' | egrep '\<[vVwW]\>'`
- 			test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
-@@ -5719,11 +5723,11 @@
- fi
- 
- fi
--echo "$as_me:5722: result: $cf_cv_check_gpm_wgetch" >&5
-+echo "$as_me:5726: result: $cf_cv_check_gpm_wgetch" >&5
- echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6
- 
- if test "$cf_cv_check_gpm_wgetch" != yes ; then
--	{ echo "$as_me:5726: WARNING: GPM library is already linked with curses - read the FAQ" >&5
-+	{ echo "$as_me:5730: WARNING: GPM library is already linked with curses - read the FAQ" >&5
- echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;}
- fi
- 
-@@ -5733,7 +5737,7 @@
- 
- # not everyone has "test -c"
- if test -c /dev/sysmouse 2>/dev/null ; then
--echo "$as_me:5736: checking if you want to use sysmouse" >&5
-+echo "$as_me:5740: checking if you want to use sysmouse" >&5
- echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6
- 
- # Check whether --with-sysmouse or --without-sysmouse was given.
-@@ -5745,7 +5749,7 @@
- fi;
- 	if test "$cf_with_sysmouse" != no ; then
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 5748 "configure"
-+#line 5752 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -5768,16 +5772,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:5771: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5775: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:5774: \$? = $ac_status" >&5
-+  echo "$as_me:5778: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:5777: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5781: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5780: \$? = $ac_status" >&5
-+  echo "$as_me:5784: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_with_sysmouse=yes
- else
-@@ -5787,7 +5791,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	fi
--echo "$as_me:5790: result: $cf_with_sysmouse" >&5
-+echo "$as_me:5794: result: $cf_with_sysmouse" >&5
- echo "${ECHO_T}$cf_with_sysmouse" >&6
- test "$cf_with_sysmouse" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -5806,7 +5810,7 @@
- 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
- fi
- 
--echo "$as_me:5809: checking for default loader flags" >&5
-+echo "$as_me:5813: checking for default loader flags" >&5
- echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
- case $DFT_LWR_MODEL in
- (libtool) LD_MODEL=''   ;;
-@@ -5815,13 +5819,13 @@
- (profile) LD_MODEL='-pg';;
- (shared)  LD_MODEL=''   ;;
- esac
--echo "$as_me:5818: result: $LD_MODEL" >&5
-+echo "$as_me:5822: result: $LD_MODEL" >&5
- echo "${ECHO_T}$LD_MODEL" >&6
- 
- case $DFT_LWR_MODEL in
- (shared)
- 
--echo "$as_me:5824: checking if rpath option should be used" >&5
-+echo "$as_me:5828: checking if rpath option should be used" >&5
- echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6
- 
- # Check whether --enable-rpath or --disable-rpath was given.
-@@ -5831,10 +5835,10 @@
- else
-   cf_cv_enable_rpath=no
- fi;
--echo "$as_me:5834: result: $cf_cv_enable_rpath" >&5
-+echo "$as_me:5838: result: $cf_cv_enable_rpath" >&5
- echo "${ECHO_T}$cf_cv_enable_rpath" >&6
- 
--echo "$as_me:5837: checking if shared libraries should be relinked during install" >&5
-+echo "$as_me:5841: checking if shared libraries should be relinked during install" >&5
- echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6
- 
- # Check whether --enable-relink or --disable-relink was given.
-@@ -5844,7 +5848,7 @@
- else
-   cf_cv_do_relink=yes
- fi;
--echo "$as_me:5847: result: $cf_cv_do_relink" >&5
-+echo "$as_me:5851: result: $cf_cv_do_relink" >&5
- echo "${ECHO_T}$cf_cv_do_relink" >&6
- 	;;
- esac
-@@ -5853,7 +5857,7 @@
- rel_builddir=..
- 
- LD_RPATH_OPT=
--echo "$as_me:5856: checking for an rpath option" >&5
-+echo "$as_me:5860: checking for an rpath option" >&5
- echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
- case $cf_cv_system_name in
- (irix*)
-@@ -5884,12 +5888,12 @@
- (*)
- 	;;
- esac
--echo "$as_me:5887: result: $LD_RPATH_OPT" >&5
-+echo "$as_me:5891: result: $LD_RPATH_OPT" >&5
- echo "${ECHO_T}$LD_RPATH_OPT" >&6
- 
- case "x$LD_RPATH_OPT" in
- (x-R*)
--	echo "$as_me:5892: checking if we need a space after rpath option" >&5
-+	echo "$as_me:5896: 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"
- 
-@@ -5910,7 +5914,7 @@
- LIBS="$cf_add_libs"
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 5913 "configure"
-+#line 5917 "configure"
- #include "confdefs.h"
- 
- int
-@@ -5922,16 +5926,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5925: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5929: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5928: \$? = $ac_status" >&5
-+  echo "$as_me:5932: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5931: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5935: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5934: \$? = $ac_status" >&5
-+  echo "$as_me:5938: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_rpath_space=no
- else
-@@ -5941,7 +5945,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	LIBS="$cf_save_LIBS"
--	echo "$as_me:5944: result: $cf_rpath_space" >&5
-+	echo "$as_me:5948: result: $cf_rpath_space" >&5
- echo "${ECHO_T}$cf_rpath_space" >&6
- 	test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
- 	;;
-@@ -5962,7 +5966,7 @@
- 	cf_ld_rpath_opt=
- 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
- 
--	echo "$as_me:5965: checking if release/abi version should be used for shared libs" >&5
-+	echo "$as_me:5969: checking if release/abi version should be used for shared libs" >&5
- echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6
- 
- # Check whether --with-shlib-version or --without-shlib-version was given.
-@@ -5977,9 +5981,9 @@
- 		cf_cv_shlib_version=$withval
- 		;;
- 	(*)
--		echo "$as_me:5980: result: $withval" >&5
-+		echo "$as_me:5984: result: $withval" >&5
- echo "${ECHO_T}$withval" >&6
--		{ { echo "$as_me:5982: error: option value must be one of: rel, abi, or auto" >&5
-+		{ { echo "$as_me:5986: error: option value must be one of: rel, abi, or auto" >&5
- echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
-    { (exit 1); exit 1; }; }
- 		;;
-@@ -5988,7 +5992,7 @@
- else
-   cf_cv_shlib_version=auto
- fi;
--	echo "$as_me:5991: result: $cf_cv_shlib_version" >&5
-+	echo "$as_me:5995: result: $cf_cv_shlib_version" >&5
- echo "${ECHO_T}$cf_cv_shlib_version" >&6
- 
- 	cf_cv_rm_so_locs=no
-@@ -5998,14 +6002,14 @@
- 	CC_SHARED_OPTS=
- 	if test "$GCC" = yes
- 	then
--		echo "$as_me:6001: checking which $CC option to use" >&5
-+		echo "$as_me:6005: checking which $CC option to use" >&5
- echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
- 		cf_save_CFLAGS="$CFLAGS"
- 		for CC_SHARED_OPTS in -fPIC -fpic ''
- 		do
- 			CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 6008 "configure"
-+#line 6012 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -6017,16 +6021,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6020: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6024: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6023: \$? = $ac_status" >&5
-+  echo "$as_me:6027: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6026: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6030: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6029: \$? = $ac_status" >&5
-+  echo "$as_me:6033: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -6035,7 +6039,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		done
--		echo "$as_me:6038: result: $CC_SHARED_OPTS" >&5
-+		echo "$as_me:6042: result: $CC_SHARED_OPTS" >&5
- echo "${ECHO_T}$CC_SHARED_OPTS" >&6
- 		CFLAGS="$cf_save_CFLAGS"
- 	fi
-@@ -6106,7 +6110,7 @@
- 		MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
- 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
- 		cf_cv_shlib_version_infix=yes
--		echo "$as_me:6109: checking if ld -search_paths_first works" >&5
-+		echo "$as_me:6113: checking if ld -search_paths_first works" >&5
- echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6
- if test "${cf_cv_ldflags_search_paths_first+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6115,7 +6119,7 @@
- 			cf_save_LDFLAGS=$LDFLAGS
- 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 6118 "configure"
-+#line 6122 "configure"
- #include "confdefs.h"
- 
- int
-@@ -6127,16 +6131,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6130: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6134: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6133: \$? = $ac_status" >&5
-+  echo "$as_me:6137: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6136: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6140: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6139: \$? = $ac_status" >&5
-+  echo "$as_me:6143: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ldflags_search_paths_first=yes
- else
-@@ -6147,7 +6151,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 				LDFLAGS=$cf_save_LDFLAGS
- fi
--echo "$as_me:6150: result: $cf_cv_ldflags_search_paths_first" >&5
-+echo "$as_me:6154: result: $cf_cv_ldflags_search_paths_first" >&5
- echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
- 		if test $cf_cv_ldflags_search_paths_first = yes; then
- 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
-@@ -6372,7 +6376,7 @@
- 			do
- 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
- 				cat >conftest.$ac_ext <<_ACEOF
--#line 6375 "configure"
-+#line 6379 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -6384,16 +6388,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6387: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6391: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6390: \$? = $ac_status" >&5
-+  echo "$as_me:6394: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6393: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6397: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6396: \$? = $ac_status" >&5
-+  echo "$as_me:6400: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -6430,7 +6434,7 @@
- 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
- 			;;
- 		(*)
--			{ echo "$as_me:6433: WARNING: ignored --with-shlib-version" >&5
-+			{ echo "$as_me:6437: WARNING: ignored --with-shlib-version" >&5
- echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
- 			;;
- 		esac
-@@ -6440,7 +6444,7 @@
- 	if test -n "$cf_try_cflags"
- 	then
- cat > conftest.$ac_ext <
- int main(int argc, char *argv[])
+ 	AC_CACHE_CHECK(whether to use struct dirent64, cf_cv_struct_dirent64,[
+ 		AC_TRY_COMPILE([
++#pragma GCC diagnostic error "-Wincompatible-pointer-types"
+ #include 
+ #include 
+ 		],[
+@@ -4009,7 +4020,7 @@
+ AC_SUBST(Libs_To_Make)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_LIB_SONAME version: 5 updated: 2010/08/14 18:25:37
++dnl CF_LIB_SONAME version: 6 updated: 2017/01/21 11:06:25
+ dnl -------------
+ dnl Find the and soname for the given shared library.  Set the cache variable
+ dnl cf_cv_$3_soname to this, unless it is not found.  Then set the cache
+@@ -4026,7 +4037,7 @@
+ if test "$cross_compiling" != yes ; then
+ cat >conftest.$ac_ext <&5
-+			echo "$as_me:6459: checking if CFLAGS option -$cf_opt works" >&5
- echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6
--			if { (eval echo "$as_me:6457: \"$ac_compile\"") >&5
-+			if { (eval echo "$as_me:6461: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6460: \$? = $ac_status" >&5
-+  echo "$as_me:6464: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--				echo "$as_me:6462: result: yes" >&5
-+				echo "$as_me:6466: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 				cf_save_CFLAGS="$CFLAGS"
- 			else
--				echo "$as_me:6466: result: no" >&5
-+				echo "$as_me:6470: result: no" >&5
- echo "${ECHO_T}no" >&6
- 			fi
- 		done
-@@ -6478,17 +6482,17 @@
- 
- 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
- 
--echo "${as_me:-configure}:6481: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
-+echo "${as_me:-configure}:6485: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
- 
- 	test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
- 
--echo "${as_me:-configure}:6485: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
-+echo "${as_me:-configure}:6489: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
- 
- for model in $cf_list_models; do
- 	case $model in
- 	(libtool)
- 
--echo "$as_me:6491: checking for additional libtool options" >&5
-+echo "$as_me:6495: checking for additional libtool options" >&5
- echo $ECHO_N "checking for additional libtool options... $ECHO_C" >&6
- 
- # Check whether --with-libtool-opts or --without-libtool-opts was given.
-@@ -6498,7 +6502,7 @@
- else
-   with_libtool_opts=no
- fi;
--echo "$as_me:6501: result: $with_libtool_opts" >&5
-+echo "$as_me:6505: result: $with_libtool_opts" >&5
- echo "${ECHO_T}$with_libtool_opts" >&6
- 
- case .$with_libtool_opts in
-@@ -6509,7 +6513,7 @@
- 	;;
- esac
- 
--echo "$as_me:6512: checking if exported-symbols file should be used" >&5
-+echo "$as_me:6516: checking if exported-symbols file should be used" >&5
- echo $ECHO_N "checking if exported-symbols file should be used... $ECHO_C" >&6
- 
- # Check whether --with-export-syms or --without-export-syms was given.
-@@ -6524,7 +6528,7 @@
- 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
- 
- fi
--echo "$as_me:6527: result: $with_export_syms" >&5
-+echo "$as_me:6531: result: $with_export_syms" >&5
- echo "${ECHO_T}$with_export_syms" >&6
- if test "x$with_export_syms" != xno
- then
-@@ -6535,12 +6539,12 @@
- 		;;
- 	(shared)
- 		if test "$CC_SHARED_OPTS" = "unknown"; then
--			{ { echo "$as_me:6538: error: Shared libraries are not supported in this version" >&5
-+			{ { echo "$as_me:6542: error: Shared libraries are not supported in this version" >&5
- echo "$as_me: error: Shared libraries are not supported in this version" >&2;}
-    { (exit 1); exit 1; }; }
- 		fi
- 
--echo "$as_me:6543: checking if versioned-symbols file should be used" >&5
-+echo "$as_me:6547: checking if versioned-symbols file should be used" >&5
- echo $ECHO_N "checking if versioned-symbols file should be used... $ECHO_C" >&6
- 
- # Check whether --with-versioned-syms or --without-versioned-syms was given.
-@@ -6555,7 +6559,7 @@
- 	with_versioned_syms='${top_srcdir}/package/${PACKAGE}.map'
- 
- fi
--echo "$as_me:6558: result: $with_versioned_syms" >&5
-+echo "$as_me:6562: result: $with_versioned_syms" >&5
- echo "${ECHO_T}$with_versioned_syms" >&6
- 
- RESULTING_SYMS=
-@@ -6571,7 +6575,7 @@
- 		MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-Wl,%\\${VERSIONED_SYMS} -Wl,%"`
- 		test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
- 
--echo "${as_me:-configure}:6574: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
-+echo "${as_me:-configure}:6578: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
- 
- 		;;
- 	(*-dy\ *)
-@@ -6579,11 +6583,11 @@
- 		MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-dy%\\${VERSIONED_SYMS} -dy%"`
- 		test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
- 
--echo "${as_me:-configure}:6582: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
-+echo "${as_me:-configure}:6586: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
- 
- 		;;
- 	(*)
--		{ echo "$as_me:6586: WARNING: this system does not support versioned-symbols" >&5
-+		{ echo "$as_me:6590: WARNING: this system does not support versioned-symbols" >&5
- echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
- 		;;
- 	esac
-@@ -6595,7 +6599,7 @@
- 	# symbols.
- 	if test "x$VERSIONED_SYMS" != "x"
- 	then
--		echo "$as_me:6598: checking if wildcards can be used to selectively omit symbols" >&5
-+		echo "$as_me:6602: checking if wildcards can be used to selectively omit symbols" >&5
- echo $ECHO_N "checking if wildcards can be used to selectively omit symbols... $ECHO_C" >&6
- 		WILDCARD_SYMS=no
- 
-@@ -6632,7 +6636,7 @@
- } submodule_1.0;
- EOF
- 		cat >conftest.$ac_ext <&5 |fgrep _ismissing | egrep '[ 	]T[ 	]'`
- 			test -n "$cf_missing" && WILDCARD_SYMS=yes
- 		fi
--		echo "$as_me:6666: result: $WILDCARD_SYMS" >&5
-+		echo "$as_me:6670: result: $WILDCARD_SYMS" >&5
- echo "${ECHO_T}$WILDCARD_SYMS" >&6
- 		rm -f conftest.*
- 	fi
-@@ -6674,7 +6678,7 @@
- done
- 
- # pretend that ncurses==ncursesw==ncursest
--echo "$as_me:6677: checking if you want to disable library suffixes" >&5
-+echo "$as_me:6681: checking if you want to disable library suffixes" >&5
- echo $ECHO_N "checking if you want to disable library suffixes... $ECHO_C" >&6
- 
- # Check whether --enable-lib-suffixes or --disable-lib-suffixes was given.
-@@ -6691,13 +6695,13 @@
- 	disable_lib_suffixes=no
- 
- fi;
--echo "$as_me:6694: result: $disable_lib_suffixes" >&5
-+echo "$as_me:6698: result: $disable_lib_suffixes" >&5
- echo "${ECHO_T}$disable_lib_suffixes" >&6
- 
- ### If we're building with rpath, try to link non-standard libs that way too.
- if test "$DFT_LWR_MODEL" = "shared"; then
- 
--echo "$as_me:6700: checking if rpath-hack should be disabled" >&5
-+echo "$as_me:6704: 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.
-@@ -6714,21 +6718,21 @@
- 	cf_disable_rpath_hack=no
- 
- fi;
--echo "$as_me:6717: result: $cf_disable_rpath_hack" >&5
-+echo "$as_me:6721: 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:6721: checking for updated LDFLAGS" >&5
-+echo "$as_me:6725: 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:6724: result: maybe" >&5
-+	echo "$as_me:6728: 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:6731: checking for $ac_word" >&5
-+echo "$as_me:6735: 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
-@@ -6743,7 +6747,7 @@
-   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:6746: found $ac_dir/$ac_word" >&5
-+echo "$as_me:6750: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -6751,10 +6755,10 @@
- fi
- cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
- if test -n "$cf_ldd_prog"; then
--  echo "$as_me:6754: result: $cf_ldd_prog" >&5
-+  echo "$as_me:6758: result: $cf_ldd_prog" >&5
- echo "${ECHO_T}$cf_ldd_prog" >&6
- else
--  echo "$as_me:6757: result: no" >&5
-+  echo "$as_me:6761: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -6768,7 +6772,7 @@
- 		cf_rpath_oops=
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 6771 "configure"
-+#line 6775 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -6780,16 +6784,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6783: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6787: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6786: \$? = $ac_status" >&5
-+  echo "$as_me:6790: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6789: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6793: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6792: \$? = $ac_status" >&5
-+  echo "$as_me:6796: \$? = $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`
-@@ -6817,7 +6821,7 @@
- 					then
- 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
- 
--echo "${as_me:-configure}:6820: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
-+echo "${as_me:-configure}:6824: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
- 
- 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
- 						break
-@@ -6829,11 +6833,11 @@
- 
- 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:6832: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6836: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
- 
- test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:6836: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6840: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
- 
- cf_rpath_dst=
- for cf_rpath_src in $LDFLAGS
-@@ -6870,7 +6874,7 @@
- 			then
- 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
- 
--echo "${as_me:-configure}:6873: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
-+echo "${as_me:-configure}:6877: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
- 
- 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
- 			fi
-@@ -6883,11 +6887,11 @@
- 
- test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:6886: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6890: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
- 
- test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
- 
--echo "${as_me:-configure}:6890: testing ...checking LIBS $LIBS ..." 1>&5
-+echo "${as_me:-configure}:6894: testing ...checking LIBS $LIBS ..." 1>&5
- 
- cf_rpath_dst=
- for cf_rpath_src in $LIBS
-@@ -6924,7 +6928,7 @@
- 			then
- 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
- 
--echo "${as_me:-configure}:6927: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
-+echo "${as_me:-configure}:6931: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
- 
- 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
- 			fi
-@@ -6937,14 +6941,14 @@
- 
- test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
- 
--echo "${as_me:-configure}:6940: testing ...checked LIBS $LIBS ..." 1>&5
-+echo "${as_me:-configure}:6944: testing ...checked LIBS $LIBS ..." 1>&5
- 
- 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:6944: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6948: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
- 
- else
--	echo "$as_me:6947: result: no" >&5
-+	echo "$as_me:6951: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -6955,7 +6959,7 @@
- ###############################################################################
- 
- ###	use option --with-extra-suffix to append suffix to headers and libraries
--echo "$as_me:6958: checking if you wish to append extra suffix to header/library paths" >&5
-+echo "$as_me:6962: checking if you wish to append extra suffix to header/library paths" >&5
- echo $ECHO_N "checking if you wish to append extra suffix to header/library paths... $ECHO_C" >&6
- EXTRA_SUFFIX=
- 
-@@ -6974,11 +6978,11 @@
- 	esac
- 
- fi;
--echo "$as_me:6977: result: $EXTRA_SUFFIX" >&5
-+echo "$as_me:6981: result: $EXTRA_SUFFIX" >&5
- echo "${ECHO_T}$EXTRA_SUFFIX" >&6
- 
- ###	use option --disable-overwrite to leave out the link to -lcurses
--echo "$as_me:6981: checking if you wish to install ncurses overwriting curses" >&5
-+echo "$as_me:6985: checking if you wish to install ncurses overwriting curses" >&5
- echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6
- 
- # Check whether --enable-overwrite or --disable-overwrite was given.
-@@ -6988,10 +6992,10 @@
- else
-   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
- fi;
--echo "$as_me:6991: result: $with_overwrite" >&5
-+echo "$as_me:6995: result: $with_overwrite" >&5
- echo "${ECHO_T}$with_overwrite" >&6
- 
--echo "$as_me:6994: checking if external terminfo-database is used" >&5
-+echo "$as_me:6998: checking if external terminfo-database is used" >&5
- echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6
- 
- # Check whether --enable-database or --disable-database was given.
-@@ -7001,7 +7005,7 @@
- else
-   use_database=yes
- fi;
--echo "$as_me:7004: result: $use_database" >&5
-+echo "$as_me:7008: result: $use_database" >&5
- echo "${ECHO_T}$use_database" >&6
- 
- case $host_os in
-@@ -7017,7 +7021,7 @@
- if test "$use_database" != no ; then
- 	NCURSES_USE_DATABASE=1
- 
--	echo "$as_me:7020: checking which terminfo source-file will be installed" >&5
-+	echo "$as_me:7024: checking which terminfo source-file will be installed" >&5
- echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6
- 
- # Check whether --with-database or --without-database was given.
-@@ -7025,10 +7029,10 @@
-   withval="$with_database"
-   TERMINFO_SRC=$withval
- fi;
--	echo "$as_me:7028: result: $TERMINFO_SRC" >&5
-+	echo "$as_me:7032: result: $TERMINFO_SRC" >&5
- echo "${ECHO_T}$TERMINFO_SRC" >&6
- 
--	echo "$as_me:7031: checking whether to use hashed database instead of directory/tree" >&5
-+	echo "$as_me:7035: checking whether to use hashed database instead of directory/tree" >&5
- echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6
- 
- # Check whether --with-hashed-db or --without-hashed-db was given.
-@@ -7038,13 +7042,13 @@
- else
-   with_hashed_db=no
- fi;
--	echo "$as_me:7041: result: $with_hashed_db" >&5
-+	echo "$as_me:7045: result: $with_hashed_db" >&5
- echo "${ECHO_T}$with_hashed_db" >&6
- else
- 	with_hashed_db=no
- fi
- 
--echo "$as_me:7047: checking for list of fallback descriptions" >&5
-+echo "$as_me:7051: checking for list of fallback descriptions" >&5
- echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6
- 
- # Check whether --with-fallbacks or --without-fallbacks was given.
-@@ -7054,11 +7058,11 @@
- else
-   with_fallback=
- fi;
--echo "$as_me:7057: result: $with_fallback" >&5
-+echo "$as_me:7061: result: $with_fallback" >&5
- echo "${ECHO_T}$with_fallback" >&6
- FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'`
- 
--echo "$as_me:7061: checking if you want modern xterm or antique" >&5
-+echo "$as_me:7065: checking if you want modern xterm or antique" >&5
- echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6
- 
- # Check whether --with-xterm-new or --without-xterm-new was given.
-@@ -7072,11 +7076,11 @@
- (no) with_xterm_new=xterm-old;;
- (*)	 with_xterm_new=xterm-new;;
- esac
--echo "$as_me:7075: result: $with_xterm_new" >&5
-+echo "$as_me:7079: result: $with_xterm_new" >&5
- echo "${ECHO_T}$with_xterm_new" >&6
- WHICH_XTERM=$with_xterm_new
- 
--echo "$as_me:7079: checking if xterm backspace sends BS or DEL" >&5
-+echo "$as_me:7083: checking if xterm backspace sends BS or DEL" >&5
- echo $ECHO_N "checking if xterm backspace sends BS or DEL... $ECHO_C" >&6
- 
- # Check whether --with-xterm-kbs or --without-xterm-kbs was given.
-@@ -7097,7 +7101,7 @@
- 	with_xterm_kbs=$withval
- 	;;
- esac
--echo "$as_me:7100: result: $with_xterm_kbs" >&5
-+echo "$as_me:7104: result: $with_xterm_kbs" >&5
- echo "${ECHO_T}$with_xterm_kbs" >&6
- XTERM_KBS=$with_xterm_kbs
- 
-@@ -7107,7 +7111,7 @@
- 	MAKE_TERMINFO="#"
- else
- 
--echo "$as_me:7110: checking for list of terminfo directories" >&5
-+echo "$as_me:7114: checking for list of terminfo directories" >&5
- echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6
- 
- # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given.
-@@ -7147,7 +7151,7 @@
- 	cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:7150: error: expected a pathname, not \"$cf_src_path\"" >&5
-+	{ { echo "$as_me:7154: error: expected a pathname, not \"$cf_src_path\"" >&5
- echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -7170,14 +7174,14 @@
- 	;;
- esac
- 
--echo "$as_me:7173: result: $TERMINFO_DIRS" >&5
-+echo "$as_me:7177: result: $TERMINFO_DIRS" >&5
- echo "${ECHO_T}$TERMINFO_DIRS" >&6
- test -n "$TERMINFO_DIRS" &&
- cat >>confdefs.h <&5
-+echo "$as_me:7184: checking for default terminfo directory" >&5
- echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6
- 
- # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given.
-@@ -7213,7 +7217,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:7216: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:7220: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -7222,7 +7226,7 @@
- fi
- eval TERMINFO="$withval"
- 
--echo "$as_me:7225: result: $TERMINFO" >&5
-+echo "$as_me:7229: result: $TERMINFO" >&5
- echo "${ECHO_T}$TERMINFO" >&6
- 
- cat >>confdefs.h <&5
-+echo "$as_me:7240: checking if big-core option selected" >&5
- echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6
- 
- # Check whether --enable-big-core or --disable-big-core was given.
-@@ -7245,7 +7249,7 @@
-   with_big_core=no
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7248 "configure"
-+#line 7252 "configure"
- #include "confdefs.h"
- 
+ $2
+ 	${cf_cv_main_return:-return}(0);
+@@ -4130,7 +4141,7 @@
+ 	test -n "$LIB_SUFFIX" && $2="${LIB_SUFFIX}[$]{$2}"
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_LINK_DATAONLY version: 10 updated: 2012/10/06 17:41:51
++dnl CF_LINK_DATAONLY version: 11 updated: 2017/01/21 11:06:25
+ dnl ----------------
+ dnl Some systems have a non-ANSI linker that doesn't pull in modules that have
+ dnl only data (i.e., no functions), for example NeXT.  On those systems we'll
+@@ -4173,7 +4184,7 @@
+ 	cf_saveLIBS="$LIBS"
+ 	LIBS="conftest.a $LIBS"
+ 	AC_TRY_RUN([
+-	int main()
++	int main(void)
+ 	{
+ 		extern int testfunc();
+ 		${cf_cv_main_return:-return} (!testfunc());
+@@ -4193,13 +4204,16 @@
+ 
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_LINK_FUNCS version: 8 updated: 2012/10/06 17:56:13
++dnl CF_LINK_FUNCS version: 9 updated: 2017/01/21 11:11:02
+ dnl -------------
+ dnl Most Unix systems have both link and symlink, a few don't have symlink.
+ dnl A few non-Unix systems implement symlink, but not link.
+ dnl A few non-systems implement neither (or have nonfunctional versions).
+ AC_DEFUN([CF_LINK_FUNCS],
+ [
++AC_CHECK_HEADERS( \
++unistd.h \
++)
+ AC_CHECK_FUNCS( \
+ 	remove \
+ 	unlink )
+@@ -4218,7 +4232,7 @@
+ #ifdef HAVE_UNISTD_H
+ #include 
+ #endif
+-int main()
++int main(void)
+ {
+ 	int fail = 0;
+ 	char *src = "config.log";
+@@ -4887,7 +4901,7 @@
+ 
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_MATH_LIB version: 8 updated: 2010/05/29 16:31:02
++dnl CF_MATH_LIB version: 9 updated: 2017/01/21 11:06:25
+ dnl -----------
+ dnl Checks for libraries.  At least one UNIX system, Apple Macintosh
+ dnl Rhapsody 5.5, does not have -lm.  We cannot use the simpler
+@@ -4898,6 +4912,7 @@
+ 	cf_cv_need_libm,[
+ 	AC_TRY_LINK([
+ 	#include 
++	#include 
+ 	#include 
+ 	],
+ 	[double x = rand(); printf("result = %g\n", ]ifelse([$2],,sin(x),$2)[)],
+@@ -4941,20 +4956,26 @@
+ test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES,1,[Define to 1 if filesystem supports mixed-case filenames.])
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_MKSTEMP version: 9 updated: 2012/10/03 04:34:49
++dnl CF_MKSTEMP version: 10 updated: 2017/01/21 11:12:16
+ dnl ----------
+ dnl Check for a working mkstemp.  This creates two files, checks that they are
+ dnl successfully created and distinct (AmigaOS apparently fails on the last).
+ AC_DEFUN([CF_MKSTEMP],[
++AC_CHECK_HEADERS( \
++unistd.h \
++)
+ AC_CACHE_CHECK(for working mkstemp, cf_cv_func_mkstemp,[
+ rm -rf conftest*
+ AC_TRY_RUN([
+ #include 
++#ifdef HAVE_UNISTD_H
++#include 
++#endif
  #include 
-@@ -7259,15 +7263,15 @@
+ #include 
+ #include 
+ #include 
+-int main()
++int main(void)
+ {
+ 	char *tmpl = "conftestXXXXXX";
+ 	char name[2][80];
+@@ -5353,7 +5374,7 @@
+ CF_CC_ENV_FLAGS
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_PROG_CC_C_O version: 4 updated: 2016/05/21 18:08:09
++dnl CF_PROG_CC_C_O version: 5 updated: 2017/01/21 11:06:25
+ dnl --------------
+ dnl Analogous to AC_PROG_CC_C_O, but more useful: tests only $CC, ensures that
+ dnl the output file can be renamed, and allows for a shell variable that can
+@@ -5370,7 +5391,7 @@
+ AC_CACHE_VAL(cf_cv_prog_$1_c_o,
+ [
+ cat > conftest.$ac_ext <&5
-+if { (eval echo "$as_me:7266: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7265: \$? = $ac_status" >&5
-+  echo "$as_me:7269: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:7267: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7271: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7270: \$? = $ac_status" >&5
-+  echo "$as_me:7274: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   with_big_core=yes
- else
-@@ -7279,7 +7283,7 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+@@ -6737,7 +6758,7 @@
  fi
- fi;
--echo "$as_me:7282: result: $with_big_core" >&5
-+echo "$as_me:7286: result: $with_big_core" >&5
- echo "${ECHO_T}$with_big_core" >&6
- test "x$with_big_core" = "xyes" &&
- cat >>confdefs.h <<\EOF
-@@ -7289,7 +7293,7 @@
- ### ISO C only guarantees 512-char strings, we have tables which load faster
- ### when constructed using "big" strings.  More than the C compiler, the awk
- ### program is a limit on most vendor UNIX systems.  Check that we can build.
--echo "$as_me:7292: checking if big-strings option selected" >&5
-+echo "$as_me:7296: checking if big-strings option selected" >&5
- echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6
- 
- # Check whether --enable-big-strings or --disable-big-strings was given.
-@@ -7313,14 +7317,14 @@
- 	esac
- 
- fi;
--echo "$as_me:7316: result: $with_big_strings" >&5
-+echo "$as_me:7320: result: $with_big_strings" >&5
- echo "${ECHO_T}$with_big_strings" >&6
- 
- USE_BIG_STRINGS=0
- test "x$with_big_strings" = "xyes" && USE_BIG_STRINGS=1
- 
- ###	use option --enable-termcap to compile in the termcap fallback support
--echo "$as_me:7323: checking if you want termcap-fallback support" >&5
-+echo "$as_me:7327: checking if you want termcap-fallback support" >&5
- echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6
- 
- # Check whether --enable-termcap or --disable-termcap was given.
-@@ -7330,14 +7334,14 @@
- else
-   with_termcap=no
- fi;
--echo "$as_me:7333: result: $with_termcap" >&5
-+echo "$as_me:7337: result: $with_termcap" >&5
- echo "${ECHO_T}$with_termcap" >&6
- 
- NCURSES_USE_TERMCAP=0
- if test "x$with_termcap" != "xyes" ; then
- 	if test "$use_database" = no ; then
- 		if test -z "$with_fallback" ; then
--			{ { echo "$as_me:7340: error: You have disabled the database w/o specifying fallbacks" >&5
-+			{ { echo "$as_me:7344: error: You have disabled the database w/o specifying fallbacks" >&5
- echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;}
-    { (exit 1); exit 1; }; }
- 		fi
-@@ -7350,13 +7354,13 @@
+ ])
+ dnl ---------------------------------------------------------------------------
+-dnl CF_TYPEOF_CHTYPE version: 9 updated: 2012/10/06 17:56:13
++dnl CF_TYPEOF_CHTYPE version: 10 updated: 2017/01/21 11:06:25
+ dnl ----------------
+ dnl Determine the type we should use for chtype (and attr_t, which is treated
+ dnl as the same thing).  We want around 32 bits, so on most machines want a
+@@ -6750,7 +6771,7 @@
+ 		AC_TRY_RUN([
+ #define WANT_BITS 31
+ #include 
+-int main()
++int main(void)
+ {
+ 	FILE *fp = fopen("cf_test.out", "w");
+ 	if (fp != 0) {
+Index: configure
+--- ncurses-6.0-20170114+/configure	2016-12-31 17:10:44.000000000 +0000
++++ ncurses-6.0-20170121/configure	2017-01-21 16:16:16.000000000 +0000
+@@ -2551,7 +2551,7 @@
  else
  
- 	if test "$with_ticlib" != no ; then
--		{ { echo "$as_me:7353: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
-+		{ { echo "$as_me:7357: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
- echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
+ cat > conftest.$ac_ext <conftest.$ac_ext <
+-int main()
++int main(void)
+ {
+ if (Gpm_Open(0,0)) Gpm_Close();
+ 	${cf_cv_main_return:-return}(0);
+@@ -5718,7 +5718,7 @@
  
- 	NCURSES_USE_TERMCAP=1
--	echo "$as_me:7359: checking for list of termcap files" >&5
-+	echo "$as_me:7363: checking for list of termcap files" >&5
- echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6
+ cat >conftest.$ac_ext <
+-int main()
++int main(void)
+ {
+ 	Gpm_Wgetch();
+ 	${cf_cv_main_return:-return}(0);
+@@ -7577,18 +7577,68 @@
+ ###   Use option --enable-symlinks to make tic use symlinks, not hard links
+ ###   to reduce storage requirements for the terminfo database.
  
- # Check whether --with-termpath or --without-termpath was given.
-@@ -7396,7 +7400,7 @@
- 	cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:7399: error: expected a pathname, not \"$cf_src_path\"" >&5
-+	{ { echo "$as_me:7403: error: expected a pathname, not \"$cf_src_path\"" >&5
- echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -7419,7 +7423,7 @@
- 	;;
- esac
- 
--	echo "$as_me:7422: result: $TERMPATH" >&5
-+	echo "$as_me:7426: result: $TERMPATH" >&5
- echo "${ECHO_T}$TERMPATH" >&6
- 	test -n "$TERMPATH" &&
- cat >>confdefs.h <&5
-+	echo "$as_me:7434: checking if fast termcap-loader is needed" >&5
- echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6
- 
- # Check whether --enable-getcap or --disable-getcap was given.
-@@ -7437,14 +7441,14 @@
- else
-   with_getcap=no
- fi;
--	echo "$as_me:7440: result: $with_getcap" >&5
-+	echo "$as_me:7444: result: $with_getcap" >&5
- echo "${ECHO_T}$with_getcap" >&6
- 	test "x$with_getcap" = "xyes" &&
- cat >>confdefs.h <<\EOF
- #define USE_GETCAP 1
- EOF
- 
--	echo "$as_me:7447: checking if translated termcaps will be cached in ~/.terminfo" >&5
-+	echo "$as_me:7451: checking if translated termcaps will be cached in ~/.terminfo" >&5
- echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6
- 
- # Check whether --enable-getcap-cache or --disable-getcap-cache was given.
-@@ -7454,7 +7458,7 @@
- else
-   with_getcap_cache=no
- fi;
--	echo "$as_me:7457: result: $with_getcap_cache" >&5
-+	echo "$as_me:7461: result: $with_getcap_cache" >&5
- echo "${ECHO_T}$with_getcap_cache" >&6
- 	test "x$with_getcap_cache" = "xyes" &&
- cat >>confdefs.h <<\EOF
-@@ -7464,7 +7468,7 @@
- fi
- 
- ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
--echo "$as_me:7467: checking if ~/.terminfo is wanted" >&5
-+echo "$as_me:7471: checking if ~/.terminfo is wanted" >&5
- echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6
- 
- # Check whether --enable-home-terminfo or --disable-home-terminfo was given.
-@@ -7474,14 +7478,14 @@
- else
-   with_home_terminfo=yes
- fi;
--echo "$as_me:7477: result: $with_home_terminfo" >&5
-+echo "$as_me:7481: result: $with_home_terminfo" >&5
- echo "${ECHO_T}$with_home_terminfo" >&6
- test "x$with_home_terminfo" = "xyes" &&
- cat >>confdefs.h <<\EOF
- #define USE_HOME_TERMINFO 1
- EOF
- 
--echo "$as_me:7484: checking if you want to use restricted environment when running as root" >&5
-+echo "$as_me:7488: checking if you want to use restricted environment when running as root" >&5
- echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6
- 
- # Check whether --enable-root-environ or --disable-root-environ was given.
-@@ -7491,7 +7495,7 @@
- else
-   with_root_environ=yes
- fi;
--echo "$as_me:7494: result: $with_root_environ" >&5
-+echo "$as_me:7498: result: $with_root_environ" >&5
- echo "${ECHO_T}$with_root_environ" >&6
- test "x$with_root_environ" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -7506,13 +7510,13 @@
++for ac_header in \
++unistd.h \
++
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++echo "$as_me:7585: 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 7591 "configure"
++#include "confdefs.h"
++#include <$ac_header>
++_ACEOF
++if { (eval echo "$as_me:7595: \"$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:7601: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  eval "$as_ac_Header=yes"
++else
++  echo "$as_me: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "$as_ac_Header=no"
++fi
++rm -f conftest.err conftest.$ac_ext
++fi
++echo "$as_me:7620: 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 <&5
-+echo "$as_me:7513: checking for $ac_func" >&5
+-echo "$as_me:7585: checking for $ac_func" >&5
++echo "$as_me:7635: 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 7515 "configure"
-+#line 7519 "configure"
+-#line 7591 "configure"
++#line 7641 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func (); below.  */
-@@ -7543,16 +7547,16 @@
+@@ -7619,16 +7669,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7546: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7550: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:7622: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7672: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:7549: \$? = $ac_status" >&5
-+  echo "$as_me:7553: \$? = $ac_status" >&5
+-  echo "$as_me:7625: \$? = $ac_status" >&5
++  echo "$as_me:7675: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7552: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7556: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:7628: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7678: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:7555: \$? = $ac_status" >&5
-+  echo "$as_me:7559: \$? = $ac_status" >&5
+-  echo "$as_me:7631: \$? = $ac_status" >&5
++  echo "$as_me:7681: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_var=yes"
  else
-@@ -7562,7 +7566,7 @@
+@@ -7638,7 +7688,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:7565: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:7569: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "$as_me:7641: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:7691: 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 <&5
-+echo "$as_me:7586: checking for $ac_func" >&5
+-echo "$as_me:7658: checking for $ac_func" >&5
++echo "$as_me:7708: 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 7588 "configure"
-+#line 7592 "configure"
+-#line 7664 "configure"
++#line 7714 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func (); below.  */
-@@ -7616,16 +7620,16 @@
+@@ -7692,16 +7742,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7619: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7623: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:7695: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7745: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:7622: \$? = $ac_status" >&5
-+  echo "$as_me:7626: \$? = $ac_status" >&5
+-  echo "$as_me:7698: \$? = $ac_status" >&5
++  echo "$as_me:7748: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7625: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7629: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:7701: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7751: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:7628: \$? = $ac_status" >&5
-+  echo "$as_me:7632: \$? = $ac_status" >&5
+-  echo "$as_me:7704: \$? = $ac_status" >&5
++  echo "$as_me:7754: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_var=yes"
  else
-@@ -7635,7 +7639,7 @@
+@@ -7711,7 +7761,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:7638: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:7642: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "$as_me:7714: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:7764: 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 <&5
-+	echo "$as_me:7653: checking if link/symlink functions work" >&5
+-	echo "$as_me:7725: checking if link/symlink functions work" >&5
++	echo "$as_me:7775: checking if link/symlink functions work" >&5
  echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6
  if test "${cf_cv_link_funcs+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7659,7 +7663,7 @@
+@@ -7735,7 +7785,7 @@
  			eval 'ac_cv_func_'$cf_func'=error'
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 7662 "configure"
-+#line 7666 "configure"
+-#line 7738 "configure"
++#line 7788 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -7689,15 +7693,15 @@
+@@ -7743,7 +7793,7 @@
+ #ifdef HAVE_UNISTD_H
+ #include 
+ #endif
+-int main()
++int main(void)
+ {
+ 	int fail = 0;
+ 	char *src = "config.log";
+@@ -7765,15 +7815,15 @@
  
  _ACEOF
  rm -f conftest$ac_exeext
--if { (eval echo "$as_me:7692: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7696: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:7768: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7818: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:7695: \$? = $ac_status" >&5
-+  echo "$as_me:7699: \$? = $ac_status" >&5
+-  echo "$as_me:7771: \$? = $ac_status" >&5
++  echo "$as_me:7821: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:7697: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7701: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:7773: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7823: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:7700: \$? = $ac_status" >&5
-+  echo "$as_me:7704: \$? = $ac_status" >&5
+-  echo "$as_me:7776: \$? = $ac_status" >&5
++  echo "$as_me:7826: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
  			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
-@@ -7715,7 +7719,7 @@
+@@ -7791,7 +7841,7 @@
  		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
  
  fi
--echo "$as_me:7718: result: $cf_cv_link_funcs" >&5
-+echo "$as_me:7722: result: $cf_cv_link_funcs" >&5
+-echo "$as_me:7794: result: $cf_cv_link_funcs" >&5
++echo "$as_me:7844: result: $cf_cv_link_funcs" >&5
  echo "${ECHO_T}$cf_cv_link_funcs" >&6
  	test "$ac_cv_func_link"    = yes &&
  cat >>confdefs.h <<\EOF
-@@ -7735,7 +7739,7 @@
+@@ -7811,7 +7861,7 @@
  # soft links (symbolic links) are useful for some systems where hard links do
  # not work, or to make it simpler to copy terminfo trees around.
  if test "x$ac_cv_func_symlink" = xyes ; then
--	echo "$as_me:7738: checking if tic should use symbolic links" >&5
-+	echo "$as_me:7742: checking if tic should use symbolic links" >&5
+-	echo "$as_me:7814: checking if tic should use symbolic links" >&5
++	echo "$as_me:7864: checking if tic should use symbolic links" >&5
  echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6
  
  # Check whether --enable-symlinks or --disable-symlinks was given.
-@@ -7745,21 +7749,21 @@
+@@ -7821,21 +7871,21 @@
  else
    with_symlinks=no
  fi;
--	echo "$as_me:7748: result: $with_symlinks" >&5
-+	echo "$as_me:7752: result: $with_symlinks" >&5
+-	echo "$as_me:7824: result: $with_symlinks" >&5
++	echo "$as_me:7874: result: $with_symlinks" >&5
  echo "${ECHO_T}$with_symlinks" >&6
  fi
  
  # If we have hard links and did not choose to use soft links instead, there is
  # no reason to make this choice optional - use the hard links.
  if test "$with_symlinks" = no ; then
--	echo "$as_me:7755: checking if tic should use hard links" >&5
-+	echo "$as_me:7759: checking if tic should use hard links" >&5
+-	echo "$as_me:7831: checking if tic should use hard links" >&5
++	echo "$as_me:7881: checking if tic should use hard links" >&5
  echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6
  	if test "x$ac_cv_func_link" = xyes ; then
  		with_links=yes
  	else
  		with_links=no
  	fi
--	echo "$as_me:7762: result: $with_links" >&5
-+	echo "$as_me:7766: result: $with_links" >&5
+-	echo "$as_me:7838: result: $with_links" >&5
++	echo "$as_me:7888: result: $with_links" >&5
  echo "${ECHO_T}$with_links" >&6
  fi
  
-@@ -7774,7 +7778,7 @@
+@@ -7850,7 +7900,7 @@
  EOF
  
  ###   use option --enable-broken-linker to force on use of broken-linker support
--echo "$as_me:7777: checking if you want broken-linker support code" >&5
-+echo "$as_me:7781: checking if you want broken-linker support code" >&5
+-echo "$as_me:7853: checking if you want broken-linker support code" >&5
++echo "$as_me:7903: checking if you want broken-linker support code" >&5
  echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
  
  # Check whether --enable-broken_linker or --disable-broken_linker was given.
-@@ -7784,7 +7788,7 @@
+@@ -7860,7 +7910,7 @@
  else
    with_broken_linker=${BROKEN_LINKER:-no}
  fi;
--echo "$as_me:7787: result: $with_broken_linker" >&5
-+echo "$as_me:7791: result: $with_broken_linker" >&5
+-echo "$as_me:7863: result: $with_broken_linker" >&5
++echo "$as_me:7913: result: $with_broken_linker" >&5
  echo "${ECHO_T}$with_broken_linker" >&6
  
  BROKEN_LINKER=0
-@@ -7806,14 +7810,14 @@
+@@ -7882,14 +7932,14 @@
  		BROKEN_LINKER=1
  		test -n "$verbose" && echo "	cygwin linker is broken anyway" 1>&6
  
--echo "${as_me:-configure}:7809: testing cygwin linker is broken anyway ..." 1>&5
-+echo "${as_me:-configure}:7813: testing cygwin linker is broken anyway ..." 1>&5
+-echo "${as_me:-configure}:7885: testing cygwin linker is broken anyway ..." 1>&5
++echo "${as_me:-configure}:7935: testing cygwin linker is broken anyway ..." 1>&5
  
  		;;
  	esac
  fi
  
  ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
--echo "$as_me:7816: checking if tputs should process BSD-style prefix padding" >&5
-+echo "$as_me:7820: checking if tputs should process BSD-style prefix padding" >&5
+-echo "$as_me:7892: checking if tputs should process BSD-style prefix padding" >&5
++echo "$as_me:7942: checking if tputs should process BSD-style prefix padding" >&5
  echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6
  
  # Check whether --enable-bsdpad or --disable-bsdpad was given.
-@@ -7823,7 +7827,7 @@
+@@ -7899,7 +7949,7 @@
  else
    with_bsdpad=no
  fi;
--echo "$as_me:7826: result: $with_bsdpad" >&5
-+echo "$as_me:7830: result: $with_bsdpad" >&5
+-echo "$as_me:7902: result: $with_bsdpad" >&5
++echo "$as_me:7952: result: $with_bsdpad" >&5
  echo "${ECHO_T}$with_bsdpad" >&6
  test "x$with_bsdpad" = xyes &&
  cat >>confdefs.h <<\EOF
-@@ -7880,14 +7884,14 @@
+@@ -7956,14 +8006,14 @@
  	;;
- (linux*|gnu*|mint*|k*bsd*-gnu)
+ (linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin)
  
--echo "$as_me:7883: checking if we must define _GNU_SOURCE" >&5
-+echo "$as_me:7887: checking if we must define _GNU_SOURCE" >&5
+-echo "$as_me:7959: checking if we must define _GNU_SOURCE" >&5
++echo "$as_me:8009: 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 7890 "configure"
-+#line 7894 "configure"
+-#line 7966 "configure"
++#line 8016 "configure"
  #include "confdefs.h"
  #include 
  int
-@@ -7902,16 +7906,16 @@
+@@ -7978,16 +8028,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7905: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7909: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:7981: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8031: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:7908: \$? = $ac_status" >&5
-+  echo "$as_me:7912: \$? = $ac_status" >&5
+-  echo "$as_me:7984: \$? = $ac_status" >&5
++  echo "$as_me:8034: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7911: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7915: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:7987: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8037: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:7914: \$? = $ac_status" >&5
-+  echo "$as_me:7918: \$? = $ac_status" >&5
+-  echo "$as_me:7990: \$? = $ac_status" >&5
++  echo "$as_me:8040: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_gnu_source=no
  else
-@@ -7920,7 +7924,7 @@
+@@ -7996,7 +8046,7 @@
  cf_save="$CPPFLAGS"
  	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
  	 cat >conftest.$ac_ext <<_ACEOF
--#line 7923 "configure"
-+#line 7927 "configure"
+-#line 7999 "configure"
++#line 8049 "configure"
  #include "confdefs.h"
  #include 
  int
-@@ -7935,16 +7939,16 @@
+@@ -8011,16 +8061,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7938: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7942: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:8014: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8064: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:7941: \$? = $ac_status" >&5
-+  echo "$as_me:7945: \$? = $ac_status" >&5
+-  echo "$as_me:8017: \$? = $ac_status" >&5
++  echo "$as_me:8067: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7944: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7948: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:8020: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8070: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:7947: \$? = $ac_status" >&5
-+  echo "$as_me:7951: \$? = $ac_status" >&5
+-  echo "$as_me:8023: \$? = $ac_status" >&5
++  echo "$as_me:8073: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_gnu_source=no
  else
-@@ -7959,7 +7963,7 @@
+@@ -8035,12 +8085,12 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  
  fi
--echo "$as_me:7962: result: $cf_cv_gnu_source" >&5
-+echo "$as_me:7966: result: $cf_cv_gnu_source" >&5
+-echo "$as_me:8038: result: $cf_cv_gnu_source" >&5
++echo "$as_me:8088: result: $cf_cv_gnu_source" >&5
  echo "${ECHO_T}$cf_cv_gnu_source" >&6
- test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
  
-@@ -7984,16 +7988,16 @@
+ if test "$cf_cv_gnu_source" = yes
+ then
+-echo "$as_me:8043: checking if we should also define _DEFAULT_SOURCE" >&5
++echo "$as_me:8093: 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
+@@ -8048,7 +8098,7 @@
+ 
+ CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 8051 "configure"
++#line 8101 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8063,16 +8113,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8066: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8116: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8069: \$? = $ac_status" >&5
++  echo "$as_me:8119: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8072: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8122: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8075: \$? = $ac_status" >&5
++  echo "$as_me:8125: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -8083,7 +8133,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:8086: result: $cf_cv_default_source" >&5
++echo "$as_me:8136: 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
+@@ -8109,16 +8159,16 @@
  	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
  		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
  
--echo "$as_me:7987: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "$as_me:7991: checking if we should define _POSIX_C_SOURCE" >&5
+-echo "$as_me:8112: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:8162: 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}:7993: testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me:-configure}:7997: testing if the symbol is already defined go no further ..." 1>&5
+-echo "${as_me:-configure}:8118: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:8168: testing if the symbol is already defined go no further ..." 1>&5
  
  	cat >conftest.$ac_ext <<_ACEOF
--#line 7996 "configure"
-+#line 8000 "configure"
+-#line 8121 "configure"
++#line 8171 "configure"
  #include "confdefs.h"
  #include 
  int
-@@ -8008,16 +8012,16 @@
+@@ -8133,16 +8183,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8011: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8015: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:8136: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8186: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:8014: \$? = $ac_status" >&5
-+  echo "$as_me:8018: \$? = $ac_status" >&5
+-  echo "$as_me:8139: \$? = $ac_status" >&5
++  echo "$as_me:8189: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8017: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8021: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:8142: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8192: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:8020: \$? = $ac_status" >&5
-+  echo "$as_me:8024: \$? = $ac_status" >&5
+-  echo "$as_me:8145: \$? = $ac_status" >&5
++  echo "$as_me:8195: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_posix_c_source=no
  else
-@@ -8038,7 +8042,7 @@
+@@ -8163,7 +8213,7 @@
  	 esac
  	 if test "$cf_want_posix_source" = yes ; then
  		cat >conftest.$ac_ext <<_ACEOF
--#line 8041 "configure"
-+#line 8045 "configure"
+-#line 8166 "configure"
++#line 8216 "configure"
  #include "confdefs.h"
  #include 
  int
-@@ -8053,16 +8057,16 @@
+@@ -8178,16 +8228,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8056: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8060: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:8181: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8231: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:8059: \$? = $ac_status" >&5
-+  echo "$as_me:8063: \$? = $ac_status" >&5
+-  echo "$as_me:8184: \$? = $ac_status" >&5
++  echo "$as_me:8234: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8062: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8066: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:8187: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8237: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:8065: \$? = $ac_status" >&5
-+  echo "$as_me:8069: \$? = $ac_status" >&5
+-  echo "$as_me:8190: \$? = $ac_status" >&5
++  echo "$as_me:8240: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -8073,15 +8077,15 @@
+@@ -8198,15 +8248,15 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  	 fi
  
--echo "${as_me:-configure}:8076: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me:-configure}:8080: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+-echo "${as_me:-configure}:8201: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:8251: 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}:8081: testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me:-configure}:8085: testing if the second compile does not leave our definition intact error ..." 1>&5
+-echo "${as_me:-configure}:8206: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:8256: testing if the second compile does not leave our definition intact error ..." 1>&5
  
  	 cat >conftest.$ac_ext <<_ACEOF
--#line 8084 "configure"
-+#line 8088 "configure"
+-#line 8209 "configure"
++#line 8259 "configure"
  #include "confdefs.h"
  #include 
  int
-@@ -8096,16 +8100,16 @@
+@@ -8221,16 +8271,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8099: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8103: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:8224: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8274: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:8102: \$? = $ac_status" >&5
-+  echo "$as_me:8106: \$? = $ac_status" >&5
+-  echo "$as_me:8227: \$? = $ac_status" >&5
++  echo "$as_me:8277: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8105: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8109: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:8230: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8280: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:8108: \$? = $ac_status" >&5
-+  echo "$as_me:8112: \$? = $ac_status" >&5
+-  echo "$as_me:8233: \$? = $ac_status" >&5
++  echo "$as_me:8283: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -8121,7 +8125,7 @@
+@@ -8246,7 +8296,7 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  
  fi
--echo "$as_me:8124: result: $cf_cv_posix_c_source" >&5
-+echo "$as_me:8128: result: $cf_cv_posix_c_source" >&5
+-echo "$as_me:8249: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:8299: 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
-@@ -8220,6 +8224,9 @@
- (openbsd*)
- 	# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
- 	;;
-+(os2*)
-+	cf_XOPEN_SOURCE=
-+	;;
- (osf[45]*)
- 	cf_xopen_source="-D_OSF_SOURCE"
- 	;;
-@@ -8239,14 +8246,14 @@
+@@ -8364,14 +8414,14 @@
  	;;
  (*)
  
--echo "$as_me:8242: checking if we should define _XOPEN_SOURCE" >&5
-+echo "$as_me:8249: checking if we should define _XOPEN_SOURCE" >&5
+-echo "$as_me:8367: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:8417: 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 8249 "configure"
-+#line 8256 "configure"
+-#line 8374 "configure"
++#line 8424 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -8265,16 +8272,16 @@
+@@ -8390,16 +8440,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8268: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8275: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:8393: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8443: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:8271: \$? = $ac_status" >&5
-+  echo "$as_me:8278: \$? = $ac_status" >&5
+-  echo "$as_me:8396: \$? = $ac_status" >&5
++  echo "$as_me:8446: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8274: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8281: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:8399: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8449: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:8277: \$? = $ac_status" >&5
-+  echo "$as_me:8284: \$? = $ac_status" >&5
+-  echo "$as_me:8402: \$? = $ac_status" >&5
++  echo "$as_me:8452: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_xopen_source=no
  else
-@@ -8283,7 +8290,7 @@
+@@ -8408,7 +8458,7 @@
  cf_save="$CPPFLAGS"
  	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
  	 cat >conftest.$ac_ext <<_ACEOF
--#line 8286 "configure"
-+#line 8293 "configure"
+-#line 8411 "configure"
++#line 8461 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -8302,16 +8309,16 @@
+@@ -8427,16 +8477,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8305: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8312: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:8430: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8480: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:8308: \$? = $ac_status" >&5
-+  echo "$as_me:8315: \$? = $ac_status" >&5
+-  echo "$as_me:8433: \$? = $ac_status" >&5
++  echo "$as_me:8483: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8311: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8318: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:8436: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8486: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:8314: \$? = $ac_status" >&5
-+  echo "$as_me:8321: \$? = $ac_status" >&5
+-  echo "$as_me:8439: \$? = $ac_status" >&5
++  echo "$as_me:8489: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_xopen_source=no
  else
-@@ -8326,7 +8333,7 @@
+@@ -8451,7 +8501,7 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  
  fi
--echo "$as_me:8329: result: $cf_cv_xopen_source" >&5
-+echo "$as_me:8336: result: $cf_cv_xopen_source" >&5
+-echo "$as_me:8454: result: $cf_cv_xopen_source" >&5
++echo "$as_me:8504: result: $cf_cv_xopen_source" >&5
  echo "${ECHO_T}$cf_cv_xopen_source" >&6
  
  if test "$cf_cv_xopen_source" != no ; then
-@@ -8434,16 +8441,16 @@
+@@ -8559,16 +8609,16 @@
  	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
  		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
  
--echo "$as_me:8437: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "$as_me:8444: checking if we should define _POSIX_C_SOURCE" >&5
+-echo "$as_me:8562: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:8612: 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}:8443: testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me:-configure}:8450: testing if the symbol is already defined go no further ..." 1>&5
+-echo "${as_me:-configure}:8568: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:8618: testing if the symbol is already defined go no further ..." 1>&5
  
  	cat >conftest.$ac_ext <<_ACEOF
--#line 8446 "configure"
-+#line 8453 "configure"
+-#line 8571 "configure"
++#line 8621 "configure"
  #include "confdefs.h"
  #include 
  int
-@@ -8458,16 +8465,16 @@
+@@ -8583,16 +8633,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8461: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8468: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:8586: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8636: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:8464: \$? = $ac_status" >&5
-+  echo "$as_me:8471: \$? = $ac_status" >&5
+-  echo "$as_me:8589: \$? = $ac_status" >&5
++  echo "$as_me:8639: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8467: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8474: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:8592: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8642: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:8470: \$? = $ac_status" >&5
-+  echo "$as_me:8477: \$? = $ac_status" >&5
+-  echo "$as_me:8595: \$? = $ac_status" >&5
++  echo "$as_me:8645: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_posix_c_source=no
  else
-@@ -8488,7 +8495,7 @@
+@@ -8613,7 +8663,7 @@
  	 esac
  	 if test "$cf_want_posix_source" = yes ; then
  		cat >conftest.$ac_ext <<_ACEOF
--#line 8491 "configure"
-+#line 8498 "configure"
+-#line 8616 "configure"
++#line 8666 "configure"
  #include "confdefs.h"
  #include 
  int
-@@ -8503,16 +8510,16 @@
+@@ -8628,16 +8678,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8506: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8513: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:8631: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8681: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:8509: \$? = $ac_status" >&5
-+  echo "$as_me:8516: \$? = $ac_status" >&5
+-  echo "$as_me:8634: \$? = $ac_status" >&5
++  echo "$as_me:8684: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8512: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8519: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:8637: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8687: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:8515: \$? = $ac_status" >&5
-+  echo "$as_me:8522: \$? = $ac_status" >&5
+-  echo "$as_me:8640: \$? = $ac_status" >&5
++  echo "$as_me:8690: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -8523,15 +8530,15 @@
+@@ -8648,15 +8698,15 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  	 fi
  
--echo "${as_me:-configure}:8526: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me:-configure}:8533: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+-echo "${as_me:-configure}:8651: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:8701: 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}:8531: testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me:-configure}:8538: testing if the second compile does not leave our definition intact error ..." 1>&5
+-echo "${as_me:-configure}:8656: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:8706: testing if the second compile does not leave our definition intact error ..." 1>&5
  
  	 cat >conftest.$ac_ext <<_ACEOF
--#line 8534 "configure"
-+#line 8541 "configure"
+-#line 8659 "configure"
++#line 8709 "configure"
  #include "confdefs.h"
  #include 
  int
-@@ -8546,16 +8553,16 @@
+@@ -8671,16 +8721,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8549: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8556: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:8674: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8724: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:8552: \$? = $ac_status" >&5
-+  echo "$as_me:8559: \$? = $ac_status" >&5
+-  echo "$as_me:8677: \$? = $ac_status" >&5
++  echo "$as_me:8727: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8555: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8562: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:8680: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8730: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:8558: \$? = $ac_status" >&5
-+  echo "$as_me:8565: \$? = $ac_status" >&5
+-  echo "$as_me:8683: \$? = $ac_status" >&5
++  echo "$as_me:8733: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -8571,7 +8578,7 @@
+@@ -8696,7 +8746,7 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  
  fi
--echo "$as_me:8574: result: $cf_cv_posix_c_source" >&5
-+echo "$as_me:8581: result: $cf_cv_posix_c_source" >&5
+-echo "$as_me:8699: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:8749: 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
-@@ -8729,7 +8736,7 @@
+@@ -8854,7 +8904,7 @@
  if test -n "$cf_new_cflags" ; then
  	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
  
--echo "${as_me:-configure}:8732: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
-+echo "${as_me:-configure}:8739: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+-echo "${as_me:-configure}:8857: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:8907: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
  
  	CFLAGS="$CFLAGS $cf_new_cflags"
  fi
-@@ -8737,7 +8744,7 @@
+@@ -8862,7 +8912,7 @@
  if test -n "$cf_new_cppflags" ; then
  	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
  
--echo "${as_me:-configure}:8740: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
-+echo "${as_me:-configure}:8747: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+-echo "${as_me:-configure}:8865: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:8915: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
  
  	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
  fi
-@@ -8745,7 +8752,7 @@
+@@ -8870,7 +8920,7 @@
  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}:8748: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
-+echo "${as_me:-configure}:8755: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+-echo "${as_me:-configure}:8873: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:8923: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
  
  	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
  fi
-@@ -8753,10 +8760,10 @@
+@@ -8878,10 +8928,10 @@
  fi
  
  if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
--	echo "$as_me:8756: checking if _XOPEN_SOURCE really is set" >&5
-+	echo "$as_me:8763: checking if _XOPEN_SOURCE really is set" >&5
+-	echo "$as_me:8881: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:8931: 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 8759 "configure"
-+#line 8766 "configure"
+-#line 8884 "configure"
++#line 8934 "configure"
  #include "confdefs.h"
  #include 
  int
-@@ -8771,16 +8778,16 @@
+@@ -8896,16 +8946,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8774: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8781: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:8899: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8949: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:8777: \$? = $ac_status" >&5
-+  echo "$as_me:8784: \$? = $ac_status" >&5
+-  echo "$as_me:8902: \$? = $ac_status" >&5
++  echo "$as_me:8952: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8780: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8787: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:8905: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8955: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:8783: \$? = $ac_status" >&5
-+  echo "$as_me:8790: \$? = $ac_status" >&5
+-  echo "$as_me:8908: \$? = $ac_status" >&5
++  echo "$as_me:8958: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_XOPEN_SOURCE_set=yes
  else
-@@ -8789,12 +8796,12 @@
+@@ -8914,12 +8964,12 @@
  cf_XOPEN_SOURCE_set=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:8792: result: $cf_XOPEN_SOURCE_set" >&5
-+	echo "$as_me:8799: result: $cf_XOPEN_SOURCE_set" >&5
+-	echo "$as_me:8917: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:8967: 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 8797 "configure"
-+#line 8804 "configure"
+-#line 8922 "configure"
++#line 8972 "configure"
  #include "confdefs.h"
  #include 
  int
-@@ -8809,16 +8816,16 @@
+@@ -8934,16 +8984,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8812: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8819: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:8937: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8987: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:8815: \$? = $ac_status" >&5
-+  echo "$as_me:8822: \$? = $ac_status" >&5
+-  echo "$as_me:8940: \$? = $ac_status" >&5
++  echo "$as_me:8990: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8818: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8825: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:8943: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8993: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:8821: \$? = $ac_status" >&5
-+  echo "$as_me:8828: \$? = $ac_status" >&5
+-  echo "$as_me:8946: \$? = $ac_status" >&5
++  echo "$as_me:8996: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_XOPEN_SOURCE_set_ok=yes
  else
-@@ -8829,19 +8836,19 @@
+@@ -8954,19 +9004,19 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  		if test $cf_XOPEN_SOURCE_set_ok = no
  		then
--			{ echo "$as_me:8832: WARNING: _XOPEN_SOURCE is lower than requested" >&5
-+			{ echo "$as_me:8839: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+-			{ echo "$as_me:8957: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:9007: WARNING: _XOPEN_SOURCE is lower than requested" >&5
  echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
  		fi
  	else
  
--echo "$as_me:8837: checking if we should define _XOPEN_SOURCE" >&5
-+echo "$as_me:8844: checking if we should define _XOPEN_SOURCE" >&5
+-echo "$as_me:8962: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:9012: 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 8844 "configure"
-+#line 8851 "configure"
+-#line 8969 "configure"
++#line 9019 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -8860,16 +8867,16 @@
+@@ -8985,16 +9035,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8863: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8870: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:8988: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9038: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:8866: \$? = $ac_status" >&5
-+  echo "$as_me:8873: \$? = $ac_status" >&5
+-  echo "$as_me:8991: \$? = $ac_status" >&5
++  echo "$as_me:9041: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8869: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8876: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:8994: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9044: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:8872: \$? = $ac_status" >&5
-+  echo "$as_me:8879: \$? = $ac_status" >&5
+-  echo "$as_me:8997: \$? = $ac_status" >&5
++  echo "$as_me:9047: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_xopen_source=no
  else
-@@ -8878,7 +8885,7 @@
+@@ -9003,7 +9053,7 @@
  cf_save="$CPPFLAGS"
  	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
  	 cat >conftest.$ac_ext <<_ACEOF
--#line 8881 "configure"
-+#line 8888 "configure"
+-#line 9006 "configure"
++#line 9056 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -8897,16 +8904,16 @@
+@@ -9022,16 +9072,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8900: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8907: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:9025: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9075: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:8903: \$? = $ac_status" >&5
-+  echo "$as_me:8910: \$? = $ac_status" >&5
+-  echo "$as_me:9028: \$? = $ac_status" >&5
++  echo "$as_me:9078: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8906: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8913: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:9031: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9081: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:8909: \$? = $ac_status" >&5
-+  echo "$as_me:8916: \$? = $ac_status" >&5
+-  echo "$as_me:9034: \$? = $ac_status" >&5
++  echo "$as_me:9084: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_xopen_source=no
  else
-@@ -8921,7 +8928,7 @@
+@@ -9046,7 +9096,7 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  
  fi
--echo "$as_me:8924: result: $cf_cv_xopen_source" >&5
-+echo "$as_me:8931: result: $cf_cv_xopen_source" >&5
+-echo "$as_me:9049: result: $cf_cv_xopen_source" >&5
++echo "$as_me:9099: result: $cf_cv_xopen_source" >&5
  echo "${ECHO_T}$cf_cv_xopen_source" >&6
  
  if test "$cf_cv_xopen_source" != no ; then
-@@ -9023,14 +9030,14 @@
+@@ -9148,14 +9198,14 @@
  
  # Work around breakage on OS X
  
--echo "$as_me:9026: checking if SIGWINCH is defined" >&5
-+echo "$as_me:9033: checking if SIGWINCH is defined" >&5
+-echo "$as_me:9151: checking if SIGWINCH is defined" >&5
++echo "$as_me:9201: 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 9033 "configure"
-+#line 9040 "configure"
+-#line 9158 "configure"
++#line 9208 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -9045,23 +9052,23 @@
+@@ -9170,23 +9220,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9048: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9055: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:9173: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9223: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:9051: \$? = $ac_status" >&5
-+  echo "$as_me:9058: \$? = $ac_status" >&5
+-  echo "$as_me:9176: \$? = $ac_status" >&5
++  echo "$as_me:9226: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9054: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9061: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:9179: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9229: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:9057: \$? = $ac_status" >&5
-+  echo "$as_me:9064: \$? = $ac_status" >&5
+-  echo "$as_me:9182: \$? = $ac_status" >&5
++  echo "$as_me:9232: \$? = $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 9064 "configure"
-+#line 9071 "configure"
+-#line 9189 "configure"
++#line 9239 "configure"
  #include "confdefs.h"
  
  #undef _XOPEN_SOURCE
-@@ -9079,16 +9086,16 @@
+@@ -9204,16 +9254,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9082: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9089: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:9207: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9257: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:9085: \$? = $ac_status" >&5
-+  echo "$as_me:9092: \$? = $ac_status" >&5
+-  echo "$as_me:9210: \$? = $ac_status" >&5
++  echo "$as_me:9260: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9088: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9095: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:9213: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9263: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:9091: \$? = $ac_status" >&5
-+  echo "$as_me:9098: \$? = $ac_status" >&5
+-  echo "$as_me:9216: \$? = $ac_status" >&5
++  echo "$as_me:9266: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_define_sigwinch=maybe
  else
-@@ -9102,11 +9109,11 @@
+@@ -9227,11 +9277,11 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  
  fi
--echo "$as_me:9105: result: $cf_cv_define_sigwinch" >&5
-+echo "$as_me:9112: result: $cf_cv_define_sigwinch" >&5
+-echo "$as_me:9230: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:9280: 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:9109: checking for actual SIGWINCH definition" >&5
-+echo "$as_me:9116: checking for actual SIGWINCH definition" >&5
+-echo "$as_me:9234: checking for actual SIGWINCH definition" >&5
++echo "$as_me:9284: 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
-@@ -9117,7 +9124,7 @@
+@@ -9242,7 +9292,7 @@
  while test $cf_sigwinch != 1
  do
  	cat >conftest.$ac_ext <<_ACEOF
--#line 9120 "configure"
-+#line 9127 "configure"
+-#line 9245 "configure"
++#line 9295 "configure"
  #include "confdefs.h"
  
  #undef _XOPEN_SOURCE
-@@ -9139,16 +9146,16 @@
+@@ -9264,16 +9314,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9142: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9149: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:9267: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9317: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:9145: \$? = $ac_status" >&5
-+  echo "$as_me:9152: \$? = $ac_status" >&5
+-  echo "$as_me:9270: \$? = $ac_status" >&5
++  echo "$as_me:9320: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9148: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9155: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:9273: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9323: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:9151: \$? = $ac_status" >&5
-+  echo "$as_me:9158: \$? = $ac_status" >&5
+-  echo "$as_me:9276: \$? = $ac_status" >&5
++  echo "$as_me:9326: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_fixup_sigwinch=$cf_sigwinch
  	 break
-@@ -9162,7 +9169,7 @@
+@@ -9287,7 +9337,7 @@
  done
  
  fi
--echo "$as_me:9165: result: $cf_cv_fixup_sigwinch" >&5
-+echo "$as_me:9172: result: $cf_cv_fixup_sigwinch" >&5
+-echo "$as_me:9290: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:9340: result: $cf_cv_fixup_sigwinch" >&5
  echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
  
  	if test "$cf_cv_fixup_sigwinch" != unknown ; then
-@@ -9172,13 +9179,13 @@
+@@ -9297,13 +9347,13 @@
  
  # Checks for CODESET support.
  
--echo "$as_me:9175: checking for nl_langinfo and CODESET" >&5
-+echo "$as_me:9182: checking for nl_langinfo and CODESET" >&5
+-echo "$as_me:9300: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:9350: 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 9181 "configure"
-+#line 9188 "configure"
+-#line 9306 "configure"
++#line 9356 "configure"
  #include "confdefs.h"
  #include 
  int
-@@ -9190,16 +9197,16 @@
+@@ -9315,16 +9365,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9193: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9200: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:9318: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9368: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:9196: \$? = $ac_status" >&5
-+  echo "$as_me:9203: \$? = $ac_status" >&5
+-  echo "$as_me:9321: \$? = $ac_status" >&5
++  echo "$as_me:9371: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9199: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9206: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:9324: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9374: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:9202: \$? = $ac_status" >&5
-+  echo "$as_me:9209: \$? = $ac_status" >&5
+-  echo "$as_me:9327: \$? = $ac_status" >&5
++  echo "$as_me:9377: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    am_cv_langinfo_codeset=yes
  else
-@@ -9210,7 +9217,7 @@
+@@ -9335,7 +9385,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  
  fi
--echo "$as_me:9213: result: $am_cv_langinfo_codeset" >&5
-+echo "$as_me:9220: result: $am_cv_langinfo_codeset" >&5
+-echo "$as_me:9338: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:9388: result: $am_cv_langinfo_codeset" >&5
  echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
  	if test $am_cv_langinfo_codeset = yes; then
  
-@@ -9224,7 +9231,7 @@
+@@ -9349,7 +9399,7 @@
  NCURSES_OK_WCHAR_T=
  NCURSES_OK_WINT_T=
  
--echo "$as_me:9227: checking if you want wide-character code" >&5
-+echo "$as_me:9234: checking if you want wide-character code" >&5
+-echo "$as_me:9352: checking if you want wide-character code" >&5
++echo "$as_me:9402: checking if you want wide-character code" >&5
  echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6
  
  # Check whether --enable-widec or --disable-widec was given.
-@@ -9234,7 +9241,7 @@
+@@ -9359,7 +9409,7 @@
  else
    with_widec=no
  fi;
--echo "$as_me:9237: result: $with_widec" >&5
-+echo "$as_me:9244: result: $with_widec" >&5
+-echo "$as_me:9362: result: $with_widec" >&5
++echo "$as_me:9412: result: $with_widec" >&5
  echo "${ECHO_T}$with_widec" >&6
- if test "x$with_widec" = xyes ; then
- 	if test "x$disable_lib_suffixes" = xno ; then
-@@ -9249,14 +9256,14 @@
+ 
+ NCURSES_WCWIDTH_GRAPHICS=1
+@@ -9377,18 +9427,74 @@
  #define NCURSES_WIDECHAR 1
  EOF
  
--echo "$as_me:9252: checking if wchar.h can be used as is" >&5
-+echo "$as_me:9259: checking if wchar.h can be used as is" >&5
+-echo "$as_me:9380: checking if wchar.h can be used as is" >&5
++for ac_header in \
++wchar.h \
++wctype.h \
++
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++echo "$as_me:9436: 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 9442 "configure"
++#include "confdefs.h"
++#include <$ac_header>
++_ACEOF
++if { (eval echo "$as_me:9446: \"$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:9452: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  eval "$as_ac_Header=yes"
++else
++  echo "$as_me: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "$as_ac_Header=no"
++fi
++rm -f conftest.err conftest.$ac_ext
++fi
++echo "$as_me:9471: 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 <&5
  echo $ECHO_N "checking if wchar.h can be used as is... $ECHO_C" >&6
  if test "${cf_cv_wchar_h_okay+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
  cat >conftest.$ac_ext <<_ACEOF
--#line 9259 "configure"
-+#line 9266 "configure"
+-#line 9387 "configure"
++#line 9488 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -9273,16 +9280,16 @@
++#ifdef HAVE_WCHAR_H
+ #include 
++#endif
++#ifdef HAVE_WCTYPE_H
++#include 
++#endif
+ 
+ int
+ main ()
+@@ -9401,16 +9507,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9276: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9283: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:9404: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9510: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:9279: \$? = $ac_status" >&5
-+  echo "$as_me:9286: \$? = $ac_status" >&5
+-  echo "$as_me:9407: \$? = $ac_status" >&5
++  echo "$as_me:9513: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9282: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9289: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:9410: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9516: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:9285: \$? = $ac_status" >&5
-+  echo "$as_me:9292: \$? = $ac_status" >&5
+-  echo "$as_me:9413: \$? = $ac_status" >&5
++  echo "$as_me:9519: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_wchar_h_okay=yes
  else
-@@ -9292,16 +9299,16 @@
+@@ -9420,16 +9526,16 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
--echo "$as_me:9295: result: $cf_cv_wchar_h_okay" >&5
-+echo "$as_me:9302: result: $cf_cv_wchar_h_okay" >&5
+-echo "$as_me:9423: result: $cf_cv_wchar_h_okay" >&5
++echo "$as_me:9529: result: $cf_cv_wchar_h_okay" >&5
  echo "${ECHO_T}$cf_cv_wchar_h_okay" >&6
  
  if test $cf_cv_wchar_h_okay = no
  then
  
--echo "$as_me:9301: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
-+echo "$as_me:9308: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+-echo "$as_me:9429: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
++echo "$as_me:9535: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
  echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
--#line 9304 "configure"
-+#line 9311 "configure"
+-#line 9432 "configure"
++#line 9538 "configure"
  #include "confdefs.h"
  #include 
  
-@@ -9317,16 +9324,16 @@
+@@ -9445,16 +9551,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9320: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9327: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:9448: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9554: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:9323: \$? = $ac_status" >&5
-+  echo "$as_me:9330: \$? = $ac_status" >&5
+-  echo "$as_me:9451: \$? = $ac_status" >&5
++  echo "$as_me:9557: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9326: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9333: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:9454: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9560: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:9329: \$? = $ac_status" >&5
-+  echo "$as_me:9336: \$? = $ac_status" >&5
+-  echo "$as_me:9457: \$? = $ac_status" >&5
++  echo "$as_me:9563: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=no
  else
-@@ -9335,16 +9342,16 @@
+@@ -9463,16 +9569,16 @@
  cf_result=yes
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:9338: result: $cf_result" >&5
-+echo "$as_me:9345: result: $cf_result" >&5
+-echo "$as_me:9466: result: $cf_result" >&5
++echo "$as_me:9572: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
  
  if test "$cf_result" = yes ; then
  	CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
  elif test "x" != "x" ; then
--	echo "$as_me:9344: checking checking for compatible value versus " >&5
-+	echo "$as_me:9351: checking checking for compatible value versus " >&5
+-	echo "$as_me:9472: checking checking for compatible value versus " >&5
++	echo "$as_me:9578: checking checking for compatible value versus " >&5
  echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6
  	cat >conftest.$ac_ext <<_ACEOF
--#line 9347 "configure"
-+#line 9354 "configure"
+-#line 9475 "configure"
++#line 9581 "configure"
  #include "confdefs.h"
  #include 
  
-@@ -9360,16 +9367,16 @@
+@@ -9488,16 +9594,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9363: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9370: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:9491: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9597: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:9366: \$? = $ac_status" >&5
-+  echo "$as_me:9373: \$? = $ac_status" >&5
+-  echo "$as_me:9494: \$? = $ac_status" >&5
++  echo "$as_me:9600: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9369: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9376: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:9497: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9603: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:9372: \$? = $ac_status" >&5
-+  echo "$as_me:9379: \$? = $ac_status" >&5
+-  echo "$as_me:9500: \$? = $ac_status" >&5
++  echo "$as_me:9606: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -9378,7 +9385,7 @@
+@@ -9506,7 +9612,7 @@
  cf_result=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:9381: result: $cf_result" >&5
-+	echo "$as_me:9388: result: $cf_result" >&5
+-	echo "$as_me:9509: result: $cf_result" >&5
++	echo "$as_me:9615: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
  	if test "$cf_result" = no ; then
  		# perhaps we can override it - try...
-@@ -9394,13 +9401,13 @@
+@@ -9516,7 +9622,7 @@
+ 
+ fi
+ 
+-echo "$as_me:9519: checking if wcwidth agrees graphics are single-width" >&5
++echo "$as_me:9625: checking if wcwidth agrees graphics are single-width" >&5
+ echo $ECHO_N "checking if wcwidth agrees graphics are single-width... $ECHO_C" >&6
+ if test "${cf_cv_wcwidth_graphics+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9587,7 +9693,7 @@
+   cf_cv_wcwidth_graphics=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9590 "configure"
++#line 9696 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -9631,15 +9737,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:9634: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9740: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9637: \$? = $ac_status" >&5
++  echo "$as_me:9743: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:9639: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9745: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9642: \$? = $ac_status" >&5
++  echo "$as_me:9748: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wcwidth_graphics=yes
+ else
+@@ -9652,7 +9758,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:9655: result: $cf_cv_wcwidth_graphics" >&5
++echo "$as_me:9761: result: $cf_cv_wcwidth_graphics" >&5
+ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
+ 
+ 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
+@@ -9663,13 +9769,13 @@
  for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:9397: checking for $ac_func" >&5
-+echo "$as_me:9404: checking for $ac_func" >&5
+-echo "$as_me:9666: checking for $ac_func" >&5
++echo "$as_me:9772: 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 9403 "configure"
-+#line 9410 "configure"
+-#line 9672 "configure"
++#line 9778 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func (); below.  */
-@@ -9431,16 +9438,16 @@
+@@ -9700,16 +9806,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9434: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9441: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:9703: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9809: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:9437: \$? = $ac_status" >&5
-+  echo "$as_me:9444: \$? = $ac_status" >&5
+-  echo "$as_me:9706: \$? = $ac_status" >&5
++  echo "$as_me:9812: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9440: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9447: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:9709: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9815: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:9443: \$? = $ac_status" >&5
-+  echo "$as_me:9450: \$? = $ac_status" >&5
+-  echo "$as_me:9712: \$? = $ac_status" >&5
++  echo "$as_me:9818: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_var=yes"
  else
-@@ -9450,7 +9457,7 @@
+@@ -9719,7 +9825,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:9453: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:9460: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "$as_me:9722: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:9828: 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 <&5
-+echo "$as_me:9472: checking for multibyte character support" >&5
+-echo "$as_me:9734: checking for multibyte character support" >&5
++echo "$as_me:9840: 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
-@@ -9470,7 +9477,7 @@
+@@ -9739,7 +9845,7 @@
  
  	cf_save_LIBS="$LIBS"
  	cat >conftest.$ac_ext <<_ACEOF
--#line 9473 "configure"
-+#line 9480 "configure"
+-#line 9742 "configure"
++#line 9848 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -9483,16 +9490,16 @@
+@@ -9752,16 +9858,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9486: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9493: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:9755: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9861: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:9489: \$? = $ac_status" >&5
-+  echo "$as_me:9496: \$? = $ac_status" >&5
+-  echo "$as_me:9758: \$? = $ac_status" >&5
++  echo "$as_me:9864: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9492: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9499: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:9761: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9867: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:9495: \$? = $ac_status" >&5
-+  echo "$as_me:9502: \$? = $ac_status" >&5
+-  echo "$as_me:9764: \$? = $ac_status" >&5
++  echo "$as_me:9870: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_utf8_lib=yes
  else
-@@ -9504,12 +9511,12 @@
+@@ -9773,12 +9879,12 @@
  cf_cv_header_path_utf8=
  cf_cv_library_path_utf8=
  
--echo "${as_me:-configure}:9507: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:9514: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+-echo "${as_me:-configure}:9776: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:9882: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
  
  cf_save_LIBS="$LIBS"
  
  cat >conftest.$ac_ext <<_ACEOF
--#line 9512 "configure"
-+#line 9519 "configure"
+-#line 9781 "configure"
++#line 9887 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -9522,16 +9529,16 @@
+@@ -9791,16 +9897,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9525: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9532: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:9794: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9900: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:9528: \$? = $ac_status" >&5
-+  echo "$as_me:9535: \$? = $ac_status" >&5
+-  echo "$as_me:9797: \$? = $ac_status" >&5
++  echo "$as_me:9903: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9531: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9538: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:9800: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9906: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:9534: \$? = $ac_status" >&5
-+  echo "$as_me:9541: \$? = $ac_status" >&5
+-  echo "$as_me:9803: \$? = $ac_status" >&5
++  echo "$as_me:9909: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
  	cf_cv_find_linkage_utf8=yes
-@@ -9545,7 +9552,7 @@
+@@ -9814,7 +9920,7 @@
  LIBS="-lutf8  $cf_save_LIBS"
  
  cat >conftest.$ac_ext <<_ACEOF
--#line 9548 "configure"
-+#line 9555 "configure"
+-#line 9817 "configure"
++#line 9923 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -9558,16 +9565,16 @@
+@@ -9827,16 +9933,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9561: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9568: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:9830: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9936: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:9564: \$? = $ac_status" >&5
-+  echo "$as_me:9571: \$? = $ac_status" >&5
+-  echo "$as_me:9833: \$? = $ac_status" >&5
++  echo "$as_me:9939: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9567: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9574: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:9836: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9942: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:9570: \$? = $ac_status" >&5
-+  echo "$as_me:9577: \$? = $ac_status" >&5
+-  echo "$as_me:9839: \$? = $ac_status" >&5
++  echo "$as_me:9945: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
  	cf_cv_find_linkage_utf8=yes
-@@ -9584,9 +9591,9 @@
+@@ -9853,9 +9959,9 @@
  
  	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
  
--echo "${as_me:-configure}:9587: testing find linkage for utf8 library ..." 1>&5
-+echo "${as_me:-configure}:9594: testing find linkage for utf8 library ..." 1>&5
+-echo "${as_me:-configure}:9856: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:9962: testing find linkage for utf8 library ..." 1>&5
  
--echo "${as_me:-configure}:9589: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:9596: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+-echo "${as_me:-configure}:9858: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:9964: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
  
  	cf_save_CPPFLAGS="$CPPFLAGS"
  	cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -9677,11 +9684,11 @@
+@@ -9946,11 +10052,11 @@
  		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}:9680: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9687: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+-echo "${as_me:-configure}:9949: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:10055: 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 9684 "configure"
-+#line 9691 "configure"
+-#line 9953 "configure"
++#line 10059 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -9694,21 +9701,21 @@
+@@ -9963,21 +10069,21 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9697: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9704: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:9966: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10072: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:9700: \$? = $ac_status" >&5
-+  echo "$as_me:9707: \$? = $ac_status" >&5
+-  echo "$as_me:9969: \$? = $ac_status" >&5
++  echo "$as_me:10075: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9703: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9710: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:9972: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10078: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:9706: \$? = $ac_status" >&5
-+  echo "$as_me:9713: \$? = $ac_status" >&5
+-  echo "$as_me:9975: \$? = $ac_status" >&5
++  echo "$as_me:10081: \$? = $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}:9711: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9718: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+-echo "${as_me:-configure}:9980: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:10086: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
  
  				cf_cv_find_linkage_utf8=maybe
  				cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -9726,7 +9733,7 @@
+@@ -9995,7 +10101,7 @@
  
  	if test "$cf_cv_find_linkage_utf8" = maybe ; then
  
--echo "${as_me:-configure}:9729: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:9736: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+-echo "${as_me:-configure}:9998: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:10104: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
  
  		cf_save_LIBS="$LIBS"
  		cf_save_LDFLAGS="$LDFLAGS"
-@@ -9801,13 +9808,13 @@
+@@ -10070,13 +10176,13 @@
  				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}:9804: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9811: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+-echo "${as_me:-configure}:10073: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:10179: 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 9810 "configure"
-+#line 9817 "configure"
+-#line 10079 "configure"
++#line 10185 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -9820,21 +9827,21 @@
+@@ -10089,21 +10195,21 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9823: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9830: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:10092: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10198: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:9826: \$? = $ac_status" >&5
-+  echo "$as_me:9833: \$? = $ac_status" >&5
+-  echo "$as_me:10095: \$? = $ac_status" >&5
++  echo "$as_me:10201: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9829: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9836: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:10098: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10204: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:9832: \$? = $ac_status" >&5
-+  echo "$as_me:9839: \$? = $ac_status" >&5
+-  echo "$as_me:10101: \$? = $ac_status" >&5
++  echo "$as_me:10207: \$? = $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}:9837: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9844: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+-echo "${as_me:-configure}:10106: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:10212: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
  
  					cf_cv_find_linkage_utf8=yes
  					cf_cv_library_file_utf8="-lutf8"
-@@ -9876,7 +9883,7 @@
+@@ -10145,7 +10251,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:9879: result: $cf_cv_utf8_lib" >&5
-+echo "$as_me:9886: result: $cf_cv_utf8_lib" >&5
+-echo "$as_me:10148: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:10254: 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
-@@ -9911,7 +9918,7 @@
+@@ -10180,7 +10286,7 @@
  			  cf_save_CPPFLAGS=$CPPFLAGS
  			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  			  cat >conftest.$ac_ext <<_ACEOF
--#line 9914 "configure"
-+#line 9921 "configure"
+-#line 10183 "configure"
++#line 10289 "configure"
  #include "confdefs.h"
  #include 
  int
-@@ -9923,16 +9930,16 @@
+@@ -10192,16 +10298,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9926: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9933: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:10195: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10301: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:9929: \$? = $ac_status" >&5
-+  echo "$as_me:9936: \$? = $ac_status" >&5
+-  echo "$as_me:10198: \$? = $ac_status" >&5
++  echo "$as_me:10304: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9932: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9939: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:10201: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10307: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:9935: \$? = $ac_status" >&5
-+  echo "$as_me:9942: \$? = $ac_status" >&5
+-  echo "$as_me:10204: \$? = $ac_status" >&5
++  echo "$as_me:10310: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -9949,7 +9956,7 @@
+@@ -10218,7 +10324,7 @@
  		if test "$cf_have_incdir" = no ; then
  		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
  
--echo "${as_me:-configure}:9952: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:9959: testing adding $cf_add_incdir to include-path ..." 1>&5
+-echo "${as_me:-configure}:10221: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:10327: testing adding $cf_add_incdir to include-path ..." 1>&5
  
  		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  
-@@ -9985,7 +9992,7 @@
+@@ -10254,7 +10360,7 @@
  			if test "$cf_have_libdir" = no ; then
  				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
  
--echo "${as_me:-configure}:9988: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:9995: testing adding $cf_add_libdir to library-path ..." 1>&5
+-echo "${as_me:-configure}:10257: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:10363: testing adding $cf_add_libdir to library-path ..." 1>&5
  
  				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
  			fi
-@@ -10017,14 +10024,14 @@
+@@ -10286,14 +10392,14 @@
  	fi
  
  # This is needed on Tru64 5.0 to declare mbstate_t
--echo "$as_me:10020: checking if we must include wchar.h to declare mbstate_t" >&5
-+echo "$as_me:10027: checking if we must include wchar.h to declare mbstate_t" >&5
+-echo "$as_me:10289: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:10395: 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_mbstate_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
  cat >conftest.$ac_ext <<_ACEOF
--#line 10027 "configure"
-+#line 10034 "configure"
+-#line 10296 "configure"
++#line 10402 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -10042,23 +10049,23 @@
+@@ -10311,23 +10417,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10045: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10052: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:10314: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10420: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:10048: \$? = $ac_status" >&5
-+  echo "$as_me:10055: \$? = $ac_status" >&5
+-  echo "$as_me:10317: \$? = $ac_status" >&5
++  echo "$as_me:10423: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10051: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10058: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:10320: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10426: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:10054: \$? = $ac_status" >&5
-+  echo "$as_me:10061: \$? = $ac_status" >&5
+-  echo "$as_me:10323: \$? = $ac_status" >&5
++  echo "$as_me:10429: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_mbstate_t=no
  else
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
  cat >conftest.$ac_ext <<_ACEOF
--#line 10061 "configure"
-+#line 10068 "configure"
+-#line 10330 "configure"
++#line 10436 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -10077,16 +10084,16 @@
+@@ -10346,16 +10452,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10080: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10087: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:10349: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10455: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:10083: \$? = $ac_status" >&5
-+  echo "$as_me:10090: \$? = $ac_status" >&5
+-  echo "$as_me:10352: \$? = $ac_status" >&5
++  echo "$as_me:10458: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10086: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10093: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:10355: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10461: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:10089: \$? = $ac_status" >&5
-+  echo "$as_me:10096: \$? = $ac_status" >&5
+-  echo "$as_me:10358: \$? = $ac_status" >&5
++  echo "$as_me:10464: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_mbstate_t=yes
  else
-@@ -10098,7 +10105,7 @@
+@@ -10367,7 +10473,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
--echo "$as_me:10101: result: $cf_cv_mbstate_t" >&5
-+echo "$as_me:10108: result: $cf_cv_mbstate_t" >&5
+-echo "$as_me:10370: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:10476: result: $cf_cv_mbstate_t" >&5
  echo "${ECHO_T}$cf_cv_mbstate_t" >&6
  
  if test "$cf_cv_mbstate_t" = yes ; then
-@@ -10116,14 +10123,14 @@
+@@ -10385,14 +10491,14 @@
  fi
  
  # This is needed on Tru64 5.0 to declare wchar_t
--echo "$as_me:10119: checking if we must include wchar.h to declare wchar_t" >&5
-+echo "$as_me:10126: checking if we must include wchar.h to declare wchar_t" >&5
+-echo "$as_me:10388: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:10494: checking if we must include wchar.h to declare wchar_t" >&5
  echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
  if test "${cf_cv_wchar_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
  cat >conftest.$ac_ext <<_ACEOF
--#line 10126 "configure"
-+#line 10133 "configure"
+-#line 10395 "configure"
++#line 10501 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -10141,23 +10148,23 @@
+@@ -10410,23 +10516,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10144: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10151: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:10413: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10519: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:10147: \$? = $ac_status" >&5
-+  echo "$as_me:10154: \$? = $ac_status" >&5
+-  echo "$as_me:10416: \$? = $ac_status" >&5
++  echo "$as_me:10522: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10150: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10157: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:10419: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10525: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:10153: \$? = $ac_status" >&5
-+  echo "$as_me:10160: \$? = $ac_status" >&5
+-  echo "$as_me:10422: \$? = $ac_status" >&5
++  echo "$as_me:10528: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_wchar_t=no
  else
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
  cat >conftest.$ac_ext <<_ACEOF
--#line 10160 "configure"
-+#line 10167 "configure"
+-#line 10429 "configure"
++#line 10535 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -10176,16 +10183,16 @@
+@@ -10445,16 +10551,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10179: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10186: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:10448: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10554: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:10182: \$? = $ac_status" >&5
-+  echo "$as_me:10189: \$? = $ac_status" >&5
+-  echo "$as_me:10451: \$? = $ac_status" >&5
++  echo "$as_me:10557: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10185: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10192: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:10454: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10560: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:10188: \$? = $ac_status" >&5
-+  echo "$as_me:10195: \$? = $ac_status" >&5
+-  echo "$as_me:10457: \$? = $ac_status" >&5
++  echo "$as_me:10563: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_wchar_t=yes
  else
-@@ -10197,7 +10204,7 @@
+@@ -10466,7 +10572,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
--echo "$as_me:10200: result: $cf_cv_wchar_t" >&5
-+echo "$as_me:10207: result: $cf_cv_wchar_t" >&5
+-echo "$as_me:10469: result: $cf_cv_wchar_t" >&5
++echo "$as_me:10575: result: $cf_cv_wchar_t" >&5
  echo "${ECHO_T}$cf_cv_wchar_t" >&6
  
  if test "$cf_cv_wchar_t" = yes ; then
-@@ -10220,14 +10227,14 @@
+@@ -10489,14 +10595,14 @@
  fi
  
  # This is needed on Tru64 5.0 to declare wint_t
--echo "$as_me:10223: checking if we must include wchar.h to declare wint_t" >&5
-+echo "$as_me:10230: checking if we must include wchar.h to declare wint_t" >&5
+-echo "$as_me:10492: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:10598: checking if we must include wchar.h to declare wint_t" >&5
  echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
  if test "${cf_cv_wint_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
  cat >conftest.$ac_ext <<_ACEOF
--#line 10230 "configure"
-+#line 10237 "configure"
+-#line 10499 "configure"
++#line 10605 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -10245,23 +10252,23 @@
+@@ -10514,23 +10620,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10248: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10255: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:10517: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10623: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:10251: \$? = $ac_status" >&5
-+  echo "$as_me:10258: \$? = $ac_status" >&5
+-  echo "$as_me:10520: \$? = $ac_status" >&5
++  echo "$as_me:10626: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10254: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10261: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:10523: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10629: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:10257: \$? = $ac_status" >&5
-+  echo "$as_me:10264: \$? = $ac_status" >&5
+-  echo "$as_me:10526: \$? = $ac_status" >&5
++  echo "$as_me:10632: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_wint_t=no
  else
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
  cat >conftest.$ac_ext <<_ACEOF
--#line 10264 "configure"
-+#line 10271 "configure"
+-#line 10533 "configure"
++#line 10639 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -10280,16 +10287,16 @@
+@@ -10549,16 +10655,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10283: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10290: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:10552: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10658: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:10286: \$? = $ac_status" >&5
-+  echo "$as_me:10293: \$? = $ac_status" >&5
+-  echo "$as_me:10555: \$? = $ac_status" >&5
++  echo "$as_me:10661: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10289: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10296: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:10558: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10664: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:10292: \$? = $ac_status" >&5
-+  echo "$as_me:10299: \$? = $ac_status" >&5
+-  echo "$as_me:10561: \$? = $ac_status" >&5
++  echo "$as_me:10667: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_wint_t=yes
  else
-@@ -10301,7 +10308,7 @@
+@@ -10570,7 +10676,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
--echo "$as_me:10304: result: $cf_cv_wint_t" >&5
-+echo "$as_me:10311: result: $cf_cv_wint_t" >&5
+-echo "$as_me:10573: result: $cf_cv_wint_t" >&5
++echo "$as_me:10679: result: $cf_cv_wint_t" >&5
  echo "${ECHO_T}$cf_cv_wint_t" >&6
  
  if test "$cf_cv_wint_t" = yes ; then
-@@ -10333,7 +10340,7 @@
+@@ -10602,7 +10708,7 @@
  fi
  
  ###   use option --disable-lp64 to allow long chtype
--echo "$as_me:10336: checking whether to enable _LP64 definition in curses.h" >&5
-+echo "$as_me:10343: checking whether to enable _LP64 definition in curses.h" >&5
+-echo "$as_me:10605: checking whether to enable _LP64 definition in curses.h" >&5
++echo "$as_me:10711: checking whether to enable _LP64 definition in curses.h" >&5
  echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6
  
  # Check whether --enable-lp64 or --disable-lp64 was given.
-@@ -10343,7 +10350,7 @@
+@@ -10612,7 +10718,7 @@
  else
    with_lp64=$cf_dft_with_lp64
  fi;
--echo "$as_me:10346: result: $with_lp64" >&5
-+echo "$as_me:10353: result: $with_lp64" >&5
+-echo "$as_me:10615: result: $with_lp64" >&5
++echo "$as_me:10721: result: $with_lp64" >&5
  echo "${ECHO_T}$with_lp64" >&6
  
  if test "x$with_lp64" = xyes ; then
-@@ -10359,7 +10366,7 @@
+@@ -10628,7 +10734,7 @@
  fi;
  if test "$enable_largefile" != no; then
  
--  echo "$as_me:10362: checking for special C compiler options needed for large files" >&5
-+  echo "$as_me:10369: checking for special C compiler options needed for large files" >&5
+-  echo "$as_me:10631: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:10737: 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
-@@ -10371,7 +10378,7 @@
+@@ -10640,7 +10746,7 @@
       	 # 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 10374 "configure"
-+#line 10381 "configure"
+-#line 10643 "configure"
++#line 10749 "configure"
  #include "confdefs.h"
  #include 
   /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10391,16 +10398,16 @@
+@@ -10660,16 +10766,16 @@
  }
  _ACEOF
       	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10394: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10401: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:10663: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10769: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:10397: \$? = $ac_status" >&5
-+  echo "$as_me:10404: \$? = $ac_status" >&5
+-  echo "$as_me:10666: \$? = $ac_status" >&5
++  echo "$as_me:10772: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10400: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10407: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:10669: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10775: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:10403: \$? = $ac_status" >&5
-+  echo "$as_me:10410: \$? = $ac_status" >&5
+-  echo "$as_me:10672: \$? = $ac_status" >&5
++  echo "$as_me:10778: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    break
  else
-@@ -10410,16 +10417,16 @@
+@@ -10679,16 +10785,16 @@
  rm -f conftest.$ac_objext
       	 CC="$CC -n32"
       	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10413: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10420: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:10682: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10788: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:10416: \$? = $ac_status" >&5
-+  echo "$as_me:10423: \$? = $ac_status" >&5
+-  echo "$as_me:10685: \$? = $ac_status" >&5
++  echo "$as_me:10791: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10419: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10426: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:10688: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10794: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:10422: \$? = $ac_status" >&5
-+  echo "$as_me:10429: \$? = $ac_status" >&5
+-  echo "$as_me:10691: \$? = $ac_status" >&5
++  echo "$as_me:10797: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_sys_largefile_CC=' -n32'; break
  else
-@@ -10433,13 +10440,13 @@
+@@ -10702,13 +10808,13 @@
         rm -f conftest.$ac_ext
      fi
  fi
--echo "$as_me:10436: result: $ac_cv_sys_largefile_CC" >&5
-+echo "$as_me:10443: result: $ac_cv_sys_largefile_CC" >&5
+-echo "$as_me:10705: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:10811: 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:10442: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-+  echo "$as_me:10449: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+-  echo "$as_me:10711: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:10817: 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
-@@ -10447,7 +10454,7 @@
+@@ -10716,7 +10822,7 @@
    while :; do
    ac_cv_sys_file_offset_bits=no
    cat >conftest.$ac_ext <<_ACEOF
--#line 10450 "configure"
-+#line 10457 "configure"
+-#line 10719 "configure"
++#line 10825 "configure"
  #include "confdefs.h"
  #include 
   /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10467,16 +10474,16 @@
+@@ -10736,16 +10842,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10470: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10477: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:10739: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10845: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:10473: \$? = $ac_status" >&5
-+  echo "$as_me:10480: \$? = $ac_status" >&5
+-  echo "$as_me:10742: \$? = $ac_status" >&5
++  echo "$as_me:10848: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10476: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10483: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:10745: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10851: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:10479: \$? = $ac_status" >&5
-+  echo "$as_me:10486: \$? = $ac_status" >&5
+-  echo "$as_me:10748: \$? = $ac_status" >&5
++  echo "$as_me:10854: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    break
  else
-@@ -10485,7 +10492,7 @@
+@@ -10754,7 +10860,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
    cat >conftest.$ac_ext <<_ACEOF
--#line 10488 "configure"
-+#line 10495 "configure"
+-#line 10757 "configure"
++#line 10863 "configure"
  #include "confdefs.h"
  #define _FILE_OFFSET_BITS 64
  #include 
-@@ -10506,16 +10513,16 @@
+@@ -10775,16 +10881,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10509: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10516: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:10778: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10884: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:10512: \$? = $ac_status" >&5
-+  echo "$as_me:10519: \$? = $ac_status" >&5
+-  echo "$as_me:10781: \$? = $ac_status" >&5
++  echo "$as_me:10887: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10515: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10522: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:10784: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10890: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:10518: \$? = $ac_status" >&5
-+  echo "$as_me:10525: \$? = $ac_status" >&5
+-  echo "$as_me:10787: \$? = $ac_status" >&5
++  echo "$as_me:10893: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_sys_file_offset_bits=64; break
  else
-@@ -10526,7 +10533,7 @@
+@@ -10795,7 +10901,7 @@
    break
  done
  fi
--echo "$as_me:10529: result: $ac_cv_sys_file_offset_bits" >&5
-+echo "$as_me:10536: result: $ac_cv_sys_file_offset_bits" >&5
+-echo "$as_me:10798: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:10904: 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
  
-@@ -10536,7 +10543,7 @@
+@@ -10805,7 +10911,7 @@
  
  fi
  rm -rf conftest*
--  echo "$as_me:10539: checking for _LARGE_FILES value needed for large files" >&5
-+  echo "$as_me:10546: checking for _LARGE_FILES value needed for large files" >&5
+-  echo "$as_me:10808: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:10914: 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
-@@ -10544,7 +10551,7 @@
+@@ -10813,7 +10919,7 @@
    while :; do
    ac_cv_sys_large_files=no
    cat >conftest.$ac_ext <<_ACEOF
--#line 10547 "configure"
-+#line 10554 "configure"
+-#line 10816 "configure"
++#line 10922 "configure"
  #include "confdefs.h"
  #include 
   /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10564,16 +10571,16 @@
+@@ -10833,16 +10939,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10567: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10574: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:10836: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10942: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:10570: \$? = $ac_status" >&5
-+  echo "$as_me:10577: \$? = $ac_status" >&5
+-  echo "$as_me:10839: \$? = $ac_status" >&5
++  echo "$as_me:10945: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10573: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10580: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:10842: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10948: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:10576: \$? = $ac_status" >&5
-+  echo "$as_me:10583: \$? = $ac_status" >&5
+-  echo "$as_me:10845: \$? = $ac_status" >&5
++  echo "$as_me:10951: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    break
  else
-@@ -10582,7 +10589,7 @@
+@@ -10851,7 +10957,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
    cat >conftest.$ac_ext <<_ACEOF
--#line 10585 "configure"
-+#line 10592 "configure"
+-#line 10854 "configure"
++#line 10960 "configure"
  #include "confdefs.h"
  #define _LARGE_FILES 1
  #include 
-@@ -10603,16 +10610,16 @@
+@@ -10872,16 +10978,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10606: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10613: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:10875: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10981: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:10609: \$? = $ac_status" >&5
-+  echo "$as_me:10616: \$? = $ac_status" >&5
+-  echo "$as_me:10878: \$? = $ac_status" >&5
++  echo "$as_me:10984: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10612: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10619: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:10881: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10987: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:10615: \$? = $ac_status" >&5
-+  echo "$as_me:10622: \$? = $ac_status" >&5
+-  echo "$as_me:10884: \$? = $ac_status" >&5
++  echo "$as_me:10990: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_sys_large_files=1; break
  else
-@@ -10623,7 +10630,7 @@
+@@ -10892,7 +10998,7 @@
    break
  done
  fi
--echo "$as_me:10626: result: $ac_cv_sys_large_files" >&5
-+echo "$as_me:10633: result: $ac_cv_sys_large_files" >&5
+-echo "$as_me:10895: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:11001: 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
  
-@@ -10636,7 +10643,7 @@
+@@ -10905,7 +11011,7 @@
  fi
  
  	if test "$enable_largefile" != no ; then
--	echo "$as_me:10639: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-+	echo "$as_me:10646: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+-	echo "$as_me:10908: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++	echo "$as_me:11014: 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
-@@ -10644,7 +10651,7 @@
+@@ -10913,7 +11019,7 @@
    while :; do
    ac_cv_sys_largefile_source=no
    cat >conftest.$ac_ext <<_ACEOF
--#line 10647 "configure"
-+#line 10654 "configure"
+-#line 10916 "configure"
++#line 11022 "configure"
  #include "confdefs.h"
  #include 
  int
-@@ -10656,16 +10663,16 @@
+@@ -10925,16 +11031,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10659: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10666: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:10928: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11034: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:10662: \$? = $ac_status" >&5
-+  echo "$as_me:10669: \$? = $ac_status" >&5
+-  echo "$as_me:10931: \$? = $ac_status" >&5
++  echo "$as_me:11037: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10665: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10672: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:10934: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11040: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:10668: \$? = $ac_status" >&5
-+  echo "$as_me:10675: \$? = $ac_status" >&5
+-  echo "$as_me:10937: \$? = $ac_status" >&5
++  echo "$as_me:11043: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    break
  else
-@@ -10674,7 +10681,7 @@
+@@ -10943,7 +11049,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
    cat >conftest.$ac_ext <<_ACEOF
--#line 10677 "configure"
-+#line 10684 "configure"
+-#line 10946 "configure"
++#line 11052 "configure"
  #include "confdefs.h"
  #define _LARGEFILE_SOURCE 1
  #include 
-@@ -10687,16 +10694,16 @@
+@@ -10956,16 +11062,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10690: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10697: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:10959: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11065: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:10693: \$? = $ac_status" >&5
-+  echo "$as_me:10700: \$? = $ac_status" >&5
+-  echo "$as_me:10962: \$? = $ac_status" >&5
++  echo "$as_me:11068: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10696: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10703: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:10965: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11071: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:10699: \$? = $ac_status" >&5
-+  echo "$as_me:10706: \$? = $ac_status" >&5
+-  echo "$as_me:10968: \$? = $ac_status" >&5
++  echo "$as_me:11074: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_sys_largefile_source=1; break
  else
-@@ -10707,7 +10714,7 @@
+@@ -10976,7 +11082,7 @@
    break
  done
  fi
--echo "$as_me:10710: result: $ac_cv_sys_largefile_source" >&5
-+echo "$as_me:10717: result: $ac_cv_sys_largefile_source" >&5
+-echo "$as_me:10979: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:11085: 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
  
-@@ -10721,13 +10728,13 @@
+@@ -10990,13 +11096,13 @@
  # 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:10724: checking for fseeko" >&5
-+echo "$as_me:10731: checking for fseeko" >&5
+-echo "$as_me:10993: checking for fseeko" >&5
++echo "$as_me:11099: 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 10730 "configure"
-+#line 10737 "configure"
+-#line 10999 "configure"
++#line 11105 "configure"
  #include "confdefs.h"
  #include 
  int
-@@ -10739,16 +10746,16 @@
+@@ -11008,16 +11114,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:10742: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10749: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:11011: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11117: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:10745: \$? = $ac_status" >&5
-+  echo "$as_me:10752: \$? = $ac_status" >&5
+-  echo "$as_me:11014: \$? = $ac_status" >&5
++  echo "$as_me:11120: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:10748: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10755: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:11017: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11123: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:10751: \$? = $ac_status" >&5
-+  echo "$as_me:10758: \$? = $ac_status" >&5
+-  echo "$as_me:11020: \$? = $ac_status" >&5
++  echo "$as_me:11126: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_fseeko=yes
  else
-@@ -10758,7 +10765,7 @@
+@@ -11027,7 +11133,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:10761: result: $ac_cv_func_fseeko" >&5
-+echo "$as_me:10768: result: $ac_cv_func_fseeko" >&5
+-echo "$as_me:11030: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:11136: result: $ac_cv_func_fseeko" >&5
  echo "${ECHO_T}$ac_cv_func_fseeko" >&6
  if test $ac_cv_func_fseeko = yes; then
  
-@@ -10779,14 +10786,14 @@
+@@ -11048,16 +11154,17 @@
  	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:10782: checking whether to use struct dirent64" >&5
-+	echo "$as_me:10789: checking whether to use struct dirent64" >&5
+-	echo "$as_me:11051: checking whether to use struct dirent64" >&5
++	echo "$as_me:11157: 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 10789 "configure"
-+#line 10796 "configure"
+-#line 11058 "configure"
++#line 11164 "configure"
  #include "confdefs.h"
  
++#pragma GCC diagnostic error "-Wincompatible-pointer-types"
  #include 
-@@ -10807,16 +10814,16 @@
+ #include 
+ 
+@@ -11076,16 +11183,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10810: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10817: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:11079: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11186: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:10813: \$? = $ac_status" >&5
-+  echo "$as_me:10820: \$? = $ac_status" >&5
+-  echo "$as_me:11082: \$? = $ac_status" >&5
++  echo "$as_me:11189: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10816: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10823: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:11085: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11192: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:10819: \$? = $ac_status" >&5
-+  echo "$as_me:10826: \$? = $ac_status" >&5
+-  echo "$as_me:11088: \$? = $ac_status" >&5
++  echo "$as_me:11195: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_struct_dirent64=yes
  else
-@@ -10827,7 +10834,7 @@
+@@ -11096,7 +11203,7 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  
  fi
--echo "$as_me:10830: result: $cf_cv_struct_dirent64" >&5
-+echo "$as_me:10837: result: $cf_cv_struct_dirent64" >&5
+-echo "$as_me:11099: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:11206: result: $cf_cv_struct_dirent64" >&5
  echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
  	test "$cf_cv_struct_dirent64" = yes &&
  cat >>confdefs.h <<\EOF
-@@ -10837,7 +10844,7 @@
+@@ -11106,7 +11213,7 @@
  	fi
  
  ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
--echo "$as_me:10840: checking if you want tparm not to use X/Open fixed-parameter list" >&5
-+echo "$as_me:10847: checking if you want tparm not to use X/Open fixed-parameter list" >&5
+-echo "$as_me:11109: checking if you want tparm not to use X/Open fixed-parameter list" >&5
++echo "$as_me:11216: checking if you want tparm not to use X/Open fixed-parameter list" >&5
  echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6
  
  # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given.
-@@ -10847,14 +10854,14 @@
+@@ -11116,14 +11223,14 @@
  else
    with_tparm_varargs=yes
  fi;
--echo "$as_me:10850: result: $with_tparm_varargs" >&5
-+echo "$as_me:10857: result: $with_tparm_varargs" >&5
+-echo "$as_me:11119: result: $with_tparm_varargs" >&5
++echo "$as_me:11226: result: $with_tparm_varargs" >&5
  echo "${ECHO_T}$with_tparm_varargs" >&6
  NCURSES_TPARM_VARARGS=0
  test "x$with_tparm_varargs" = xyes && NCURSES_TPARM_VARARGS=1
  
  ###   use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw
  if test "$with_ticlib" != no ; then
--echo "$as_me:10857: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
-+echo "$as_me:10864: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
+-echo "$as_me:11126: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
++echo "$as_me:11233: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
  echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6
  
  # Check whether --enable-tic-depends or --disable-tic-depends was given.
-@@ -10864,14 +10871,14 @@
+@@ -11133,14 +11240,14 @@
  else
    with_tic_depends=yes
  fi;
--echo "$as_me:10867: result: $with_tic_depends" >&5
-+echo "$as_me:10874: result: $with_tic_depends" >&5
+-echo "$as_me:11136: result: $with_tic_depends" >&5
++echo "$as_me:11243: result: $with_tic_depends" >&5
  echo "${ECHO_T}$with_tic_depends" >&6
  else
  	with_tic_depends=no
  fi
  
+ ###   use option --disable-wattr-macros to suppress wattr* macros from curses.h
+-echo "$as_me:11143: checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition" >&5
++echo "$as_me:11250: checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition" >&5
+ echo $ECHO_N "checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition... $ECHO_C" >&6
+ 
+ # Check whether --enable-wattr-macros or --disable-wattr-macros was given.
+@@ -11152,16 +11259,16 @@
+ fi;
+ if [ "x$with_wattr_macros" != xyes ]; then
+ 	NCURSES_WATTR_MACROS=0
+-	echo "$as_me:11155: result: yes" >&5
++	echo "$as_me:11262: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+ 	NCURSES_WATTR_MACROS=1
+-	echo "$as_me:11159: result: no" >&5
++	echo "$as_me:11266: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
  ###   use option --with-bool to override bool's type
--echo "$as_me:10874: checking for type of bool" >&5
-+echo "$as_me:10881: checking for type of bool" >&5
+-echo "$as_me:11164: checking for type of bool" >&5
++echo "$as_me:11271: checking for type of bool" >&5
  echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
  
  # Check whether --with-bool or --without-bool was given.
-@@ -10881,10 +10888,10 @@
+@@ -11171,10 +11278,10 @@
  else
    NCURSES_BOOL=auto
  fi;
--echo "$as_me:10884: result: $NCURSES_BOOL" >&5
-+echo "$as_me:10891: result: $NCURSES_BOOL" >&5
+-echo "$as_me:11174: result: $NCURSES_BOOL" >&5
++echo "$as_me:11281: result: $NCURSES_BOOL" >&5
  echo "${ECHO_T}$NCURSES_BOOL" >&6
  
--echo "$as_me:10887: checking for alternate terminal capabilities file" >&5
-+echo "$as_me:10894: checking for alternate terminal capabilities file" >&5
+-echo "$as_me:11177: checking for alternate terminal capabilities file" >&5
++echo "$as_me:11284: checking for alternate terminal capabilities file" >&5
  echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6
  
  # Check whether --with-caps or --without-caps was given.
-@@ -10895,11 +10902,11 @@
+@@ -11185,11 +11292,11 @@
    TERMINFO_CAPS=Caps
  fi;
  test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
--echo "$as_me:10898: result: $TERMINFO_CAPS" >&5
-+echo "$as_me:10905: result: $TERMINFO_CAPS" >&5
+-echo "$as_me:11188: result: $TERMINFO_CAPS" >&5
++echo "$as_me:11295: result: $TERMINFO_CAPS" >&5
  echo "${ECHO_T}$TERMINFO_CAPS" >&6
  
  ###   use option --with-chtype to override chtype's type
--echo "$as_me:10902: checking for type of chtype" >&5
-+echo "$as_me:10909: checking for type of chtype" >&5
+-echo "$as_me:11192: checking for type of chtype" >&5
++echo "$as_me:11299: checking for type of chtype" >&5
  echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
  
  # Check whether --with-chtype or --without-chtype was given.
-@@ -10909,11 +10916,11 @@
+@@ -11199,11 +11306,11 @@
  else
    NCURSES_CHTYPE=$cf_dft_chtype
  fi;
--echo "$as_me:10912: result: $NCURSES_CHTYPE" >&5
-+echo "$as_me:10919: result: $NCURSES_CHTYPE" >&5
+-echo "$as_me:11202: result: $NCURSES_CHTYPE" >&5
++echo "$as_me:11309: result: $NCURSES_CHTYPE" >&5
  echo "${ECHO_T}$NCURSES_CHTYPE" >&6
  
  ###   use option --with-ospeed to override ospeed's type
--echo "$as_me:10916: checking for type of ospeed" >&5
-+echo "$as_me:10923: checking for type of ospeed" >&5
+-echo "$as_me:11206: checking for type of ospeed" >&5
++echo "$as_me:11313: checking for type of ospeed" >&5
  echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6
  
  # Check whether --with-ospeed or --without-ospeed was given.
-@@ -10923,11 +10930,11 @@
+@@ -11213,11 +11320,11 @@
  else
    NCURSES_OSPEED=short
  fi;
--echo "$as_me:10926: result: $NCURSES_OSPEED" >&5
-+echo "$as_me:10933: result: $NCURSES_OSPEED" >&5
+-echo "$as_me:11216: result: $NCURSES_OSPEED" >&5
++echo "$as_me:11323: result: $NCURSES_OSPEED" >&5
  echo "${ECHO_T}$NCURSES_OSPEED" >&6
  
  ###   use option --with-mmask-t to override mmask_t's type
--echo "$as_me:10930: checking for type of mmask_t" >&5
-+echo "$as_me:10937: checking for type of mmask_t" >&5
+-echo "$as_me:11220: checking for type of mmask_t" >&5
++echo "$as_me:11327: checking for type of mmask_t" >&5
  echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6
  
  # Check whether --with-mmask-t or --without-mmask-t was given.
-@@ -10937,11 +10944,11 @@
+@@ -11227,11 +11334,11 @@
  else
    NCURSES_MMASK_T=$cf_dft_mmask_t
  fi;
--echo "$as_me:10940: result: $NCURSES_MMASK_T" >&5
-+echo "$as_me:10947: result: $NCURSES_MMASK_T" >&5
+-echo "$as_me:11230: result: $NCURSES_MMASK_T" >&5
++echo "$as_me:11337: result: $NCURSES_MMASK_T" >&5
  echo "${ECHO_T}$NCURSES_MMASK_T" >&6
  
  ###   use option --with-ccharw-max to override CCHARW_MAX size
--echo "$as_me:10944: checking for size CCHARW_MAX" >&5
-+echo "$as_me:10951: checking for size CCHARW_MAX" >&5
+-echo "$as_me:11234: checking for size CCHARW_MAX" >&5
++echo "$as_me:11341: checking for size CCHARW_MAX" >&5
  echo $ECHO_N "checking for size CCHARW_MAX... $ECHO_C" >&6
  
  # Check whether --with-ccharw-max or --without-ccharw-max was given.
-@@ -10951,11 +10958,11 @@
+@@ -11241,11 +11348,11 @@
  else
    NCURSES_CCHARW_MAX=5
  fi;
--echo "$as_me:10954: result: $NCURSES_CCHARW_MAX" >&5
-+echo "$as_me:10961: result: $NCURSES_CCHARW_MAX" >&5
+-echo "$as_me:11244: result: $NCURSES_CCHARW_MAX" >&5
++echo "$as_me:11351: result: $NCURSES_CCHARW_MAX" >&5
  echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
  
  ###   use option --with-tparm-arg to override tparm's argument type
--echo "$as_me:10958: checking for type of tparm args" >&5
-+echo "$as_me:10965: checking for type of tparm args" >&5
+-echo "$as_me:11248: checking for type of tparm args" >&5
++echo "$as_me:11355: checking for type of tparm args" >&5
  echo $ECHO_N "checking for type of tparm args... $ECHO_C" >&6
  
  # Check whether --with-tparm-arg or --without-tparm-arg was given.
-@@ -10965,11 +10972,11 @@
+@@ -11255,11 +11362,11 @@
  else
    NCURSES_TPARM_ARG=$cf_dft_tparm_arg
  fi;
--echo "$as_me:10968: result: $NCURSES_TPARM_ARG" >&5
-+echo "$as_me:10975: result: $NCURSES_TPARM_ARG" >&5
+-echo "$as_me:11258: result: $NCURSES_TPARM_ARG" >&5
++echo "$as_me:11365: result: $NCURSES_TPARM_ARG" >&5
  echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
  
  ### Enable compiling-in rcs id's
--echo "$as_me:10972: checking if RCS identifiers should be compiled-in" >&5
-+echo "$as_me:10979: checking if RCS identifiers should be compiled-in" >&5
+-echo "$as_me:11262: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:11369: checking if RCS identifiers should be compiled-in" >&5
  echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6
  
  # Check whether --with-rcs-ids or --without-rcs-ids was given.
-@@ -10979,7 +10986,7 @@
+@@ -11269,7 +11376,7 @@
  else
    with_rcs_ids=no
  fi;
--echo "$as_me:10982: result: $with_rcs_ids" >&5
-+echo "$as_me:10989: result: $with_rcs_ids" >&5
+-echo "$as_me:11272: result: $with_rcs_ids" >&5
++echo "$as_me:11379: result: $with_rcs_ids" >&5
  echo "${ECHO_T}$with_rcs_ids" >&6
  test "x$with_rcs_ids" = xyes &&
  cat >>confdefs.h <<\EOF
-@@ -10988,7 +10995,7 @@
+@@ -11278,7 +11385,7 @@
  
  ###############################################################################
  
--echo "$as_me:10991: checking format of man-pages" >&5
-+echo "$as_me:10998: checking format of man-pages" >&5
+-echo "$as_me:11281: checking format of man-pages" >&5
++echo "$as_me:11388: checking format of man-pages" >&5
  echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6
  
  # Check whether --with-manpage-format or --without-manpage-format was given.
-@@ -11077,14 +11084,14 @@
+@@ -11367,14 +11474,14 @@
  	;;
  esac
  
--echo "$as_me:11080: result: $MANPAGE_FORMAT" >&5
-+echo "$as_me:11087: result: $MANPAGE_FORMAT" >&5
+-echo "$as_me:11370: result: $MANPAGE_FORMAT" >&5
++echo "$as_me:11477: result: $MANPAGE_FORMAT" >&5
  echo "${ECHO_T}$MANPAGE_FORMAT" >&6
  if test -n "$cf_unknown" ; then
--	{ echo "$as_me:11083: WARNING: Unexpected manpage-format $cf_unknown" >&5
-+	{ echo "$as_me:11090: WARNING: Unexpected manpage-format $cf_unknown" >&5
+-	{ echo "$as_me:11373: WARNING: Unexpected manpage-format $cf_unknown" >&5
++	{ echo "$as_me:11480: WARNING: Unexpected manpage-format $cf_unknown" >&5
  echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
  fi
  
--echo "$as_me:11087: checking for manpage renaming" >&5
-+echo "$as_me:11094: checking for manpage renaming" >&5
+-echo "$as_me:11377: checking for manpage renaming" >&5
++echo "$as_me:11484: checking for manpage renaming" >&5
  echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6
  
  # Check whether --with-manpage-renames or --without-manpage-renames was given.
-@@ -11112,7 +11119,7 @@
+@@ -11402,7 +11509,7 @@
  	if test -f $srcdir/man/$MANPAGE_RENAMES ; then
  		MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES
  	elif test ! -f $MANPAGE_RENAMES ; then
--		{ { echo "$as_me:11115: error: not a filename: $MANPAGE_RENAMES" >&5
-+		{ { echo "$as_me:11122: error: not a filename: $MANPAGE_RENAMES" >&5
+-		{ { echo "$as_me:11405: error: not a filename: $MANPAGE_RENAMES" >&5
++		{ { echo "$as_me:11512: error: not a filename: $MANPAGE_RENAMES" >&5
  echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
     { (exit 1); exit 1; }; }
  	fi
-@@ -11126,10 +11133,10 @@
+@@ -11416,10 +11523,10 @@
  	fi
  fi
  
--echo "$as_me:11129: result: $MANPAGE_RENAMES" >&5
-+echo "$as_me:11136: result: $MANPAGE_RENAMES" >&5
+-echo "$as_me:11419: result: $MANPAGE_RENAMES" >&5
++echo "$as_me:11526: result: $MANPAGE_RENAMES" >&5
  echo "${ECHO_T}$MANPAGE_RENAMES" >&6
  
--echo "$as_me:11132: checking if manpage aliases will be installed" >&5
-+echo "$as_me:11139: checking if manpage aliases will be installed" >&5
+-echo "$as_me:11422: checking if manpage aliases will be installed" >&5
++echo "$as_me:11529: checking if manpage aliases will be installed" >&5
  echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6
  
  # Check whether --with-manpage-aliases or --without-manpage-aliases was given.
-@@ -11140,7 +11147,7 @@
+@@ -11430,7 +11537,7 @@
    MANPAGE_ALIASES=yes
  fi;
  
--echo "$as_me:11143: result: $MANPAGE_ALIASES" >&5
-+echo "$as_me:11150: result: $MANPAGE_ALIASES" >&5
+-echo "$as_me:11433: result: $MANPAGE_ALIASES" >&5
++echo "$as_me:11540: result: $MANPAGE_ALIASES" >&5
  echo "${ECHO_T}$MANPAGE_ALIASES" >&6
  
  case "x$LN_S" in
-@@ -11154,7 +11161,7 @@
+@@ -11444,7 +11551,7 @@
  
  MANPAGE_SYMLINKS=no
  if test "$MANPAGE_ALIASES" = yes ; then
--echo "$as_me:11157: checking if manpage symlinks should be used" >&5
-+echo "$as_me:11164: checking if manpage symlinks should be used" >&5
+-echo "$as_me:11447: checking if manpage symlinks should be used" >&5
++echo "$as_me:11554: checking if manpage symlinks should be used" >&5
  echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6
  
  # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given.
-@@ -11167,17 +11174,17 @@
+@@ -11457,17 +11564,17 @@
  
  if test "$$cf_use_symlinks" = no; then
  if test "$MANPAGE_SYMLINKS" = yes ; then
--	{ echo "$as_me:11170: WARNING: cannot make symlinks" >&5
-+	{ echo "$as_me:11177: WARNING: cannot make symlinks" >&5
+-	{ echo "$as_me:11460: WARNING: cannot make symlinks" >&5
++	{ echo "$as_me:11567: WARNING: cannot make symlinks" >&5
  echo "$as_me: WARNING: cannot make symlinks" >&2;}
  	MANPAGE_SYMLINKS=no
  fi
  fi
  
--echo "$as_me:11176: result: $MANPAGE_SYMLINKS" >&5
-+echo "$as_me:11183: result: $MANPAGE_SYMLINKS" >&5
+-echo "$as_me:11466: result: $MANPAGE_SYMLINKS" >&5
++echo "$as_me:11573: result: $MANPAGE_SYMLINKS" >&5
  echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
  fi
  
--echo "$as_me:11180: checking for manpage tbl" >&5
-+echo "$as_me:11187: checking for manpage tbl" >&5
+-echo "$as_me:11470: checking for manpage tbl" >&5
++echo "$as_me:11577: checking for manpage tbl" >&5
  echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6
  
  # Check whether --with-manpage-tbl or --without-manpage-tbl was given.
-@@ -11188,7 +11195,7 @@
+@@ -11478,7 +11585,7 @@
    MANPAGE_TBL=no
  fi;
  
--echo "$as_me:11191: result: $MANPAGE_TBL" >&5
-+echo "$as_me:11198: result: $MANPAGE_TBL" >&5
+-echo "$as_me:11481: result: $MANPAGE_TBL" >&5
++echo "$as_me:11588: result: $MANPAGE_TBL" >&5
  echo "${ECHO_T}$MANPAGE_TBL" >&6
  
  if test "$prefix" = "NONE" ; then
-@@ -11521,7 +11528,7 @@
+@@ -11811,7 +11918,7 @@
  ###############################################################################
  
  ### Note that some functions (such as const) are normally disabled anyway.
--echo "$as_me:11524: checking if you want to build with function extensions" >&5
-+echo "$as_me:11531: checking if you want to build with function extensions" >&5
+-echo "$as_me:11814: checking if you want to build with function extensions" >&5
++echo "$as_me:11921: checking if you want to build with function extensions" >&5
  echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6
  
  # Check whether --enable-ext-funcs or --disable-ext-funcs was given.
-@@ -11531,7 +11538,7 @@
+@@ -11821,7 +11928,7 @@
  else
    with_ext_funcs=yes
  fi;
--echo "$as_me:11534: result: $with_ext_funcs" >&5
-+echo "$as_me:11541: result: $with_ext_funcs" >&5
+-echo "$as_me:11824: result: $with_ext_funcs" >&5
++echo "$as_me:11931: result: $with_ext_funcs" >&5
  echo "${ECHO_T}$with_ext_funcs" >&6
  if test "x$with_ext_funcs" = xyes ; then
  	NCURSES_EXT_FUNCS=1
-@@ -11586,7 +11593,7 @@
+@@ -11880,7 +11987,7 @@
  	GENERATED_EXT_FUNCS=
  fi
  
--echo "$as_me:11589: checking if you want to build with SCREEN extensions" >&5
-+echo "$as_me:11596: checking if you want to build with SCREEN extensions" >&5
+-echo "$as_me:11883: checking if you want to build with SCREEN extensions" >&5
++echo "$as_me:11990: checking if you want to build with SCREEN extensions" >&5
  echo $ECHO_N "checking if you want to build with SCREEN extensions... $ECHO_C" >&6
  
  # Check whether --enable-sp-funcs or --disable-sp-funcs was given.
-@@ -11596,7 +11603,7 @@
+@@ -11890,7 +11997,7 @@
  else
    with_sp_funcs=$cf_dft_ext_spfuncs
  fi;
--echo "$as_me:11599: result: $with_sp_funcs" >&5
-+echo "$as_me:11606: result: $with_sp_funcs" >&5
+-echo "$as_me:11893: result: $with_sp_funcs" >&5
++echo "$as_me:12000: result: $with_sp_funcs" >&5
  echo "${ECHO_T}$with_sp_funcs" >&6
  if test "x$with_sp_funcs" = xyes ; then
  	NCURSES_SP_FUNCS=1
-@@ -11611,7 +11618,7 @@
+@@ -11905,7 +12012,7 @@
  	GENERATED_SP_FUNCS=
  fi
  
--echo "$as_me:11614: checking if you want to build with terminal-driver" >&5
-+echo "$as_me:11621: checking if you want to build with terminal-driver" >&5
+-echo "$as_me:11908: checking if you want to build with terminal-driver" >&5
++echo "$as_me:12015: checking if you want to build with terminal-driver" >&5
  echo $ECHO_N "checking if you want to build with terminal-driver... $ECHO_C" >&6
  
  # Check whether --enable-term-driver or --disable-term-driver was given.
-@@ -11621,7 +11628,7 @@
+@@ -11915,7 +12022,7 @@
  else
    with_term_driver=no
  fi;
--echo "$as_me:11624: result: $with_term_driver" >&5
-+echo "$as_me:11631: result: $with_term_driver" >&5
+-echo "$as_me:11918: result: $with_term_driver" >&5
++echo "$as_me:12025: result: $with_term_driver" >&5
  echo "${ECHO_T}$with_term_driver" >&6
  if test "x$with_term_driver" = xyes ; then
  
-@@ -11630,19 +11637,19 @@
+@@ -11924,19 +12031,19 @@
  EOF
  
  	if test "x$with_termlib" != xno ; then
--		{ { echo "$as_me:11633: error: The term-driver option conflicts with the termlib option" >&5
-+		{ { echo "$as_me:11640: error: The term-driver option conflicts with the termlib option" >&5
+-		{ { echo "$as_me:11927: error: The term-driver option conflicts with the termlib option" >&5
++		{ { echo "$as_me:12034: error: The term-driver option conflicts with the termlib option" >&5
  echo "$as_me: error: The term-driver option conflicts with the termlib option" >&2;}
     { (exit 1); exit 1; }; }
  	fi
  	if test "x$with_sp_funcs" != xyes ; then
--		{ { echo "$as_me:11638: error: The term-driver option relies upon sp-funcs" >&5
-+		{ { echo "$as_me:11645: error: The term-driver option relies upon sp-funcs" >&5
+-		{ { echo "$as_me:11932: error: The term-driver option relies upon sp-funcs" >&5
++		{ { echo "$as_me:12039: error: The term-driver option relies upon sp-funcs" >&5
  echo "$as_me: error: The term-driver option relies upon sp-funcs" >&2;}
     { (exit 1); exit 1; }; }
  	fi
  fi
  
  ###   use option --enable-const to turn on use of const beyond that in XSI.
--echo "$as_me:11645: checking for extended use of const keyword" >&5
-+echo "$as_me:11652: checking for extended use of const keyword" >&5
+-echo "$as_me:11939: checking for extended use of const keyword" >&5
++echo "$as_me:12046: checking for extended use of const keyword" >&5
  echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
  
  # Check whether --enable-const or --disable-const was given.
-@@ -11652,7 +11659,7 @@
+@@ -11946,7 +12053,7 @@
  else
    with_ext_const=$cf_dft_ext_const
  fi;
--echo "$as_me:11655: result: $with_ext_const" >&5
-+echo "$as_me:11662: result: $with_ext_const" >&5
+-echo "$as_me:11949: result: $with_ext_const" >&5
++echo "$as_me:12056: result: $with_ext_const" >&5
  echo "${ECHO_T}$with_ext_const" >&6
  NCURSES_CONST='/*nothing*/'
  if test "x$with_ext_const" = xyes ; then
-@@ -11660,7 +11667,7 @@
+@@ -11954,7 +12061,7 @@
  fi
  
  ###   use option --enable-ext-colors to turn on use of colors beyond 16.
--echo "$as_me:11663: checking if you want to use extended colors" >&5
-+echo "$as_me:11670: checking if you want to use extended colors" >&5
+-echo "$as_me:11957: checking if you want to use extended colors" >&5
++echo "$as_me:12064: checking if you want to use extended colors" >&5
  echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6
  
  # Check whether --enable-ext-colors or --disable-ext-colors was given.
-@@ -11670,12 +11677,12 @@
+@@ -11964,12 +12071,12 @@
  else
    with_ext_colors=$cf_dft_ext_colors
  fi;
--echo "$as_me:11673: result: $with_ext_colors" >&5
-+echo "$as_me:11680: result: $with_ext_colors" >&5
+-echo "$as_me:11967: result: $with_ext_colors" >&5
++echo "$as_me:12074: result: $with_ext_colors" >&5
  echo "${ECHO_T}$with_ext_colors" >&6
  NCURSES_EXT_COLORS=0
  if test "x$with_ext_colors" = xyes ; then
  	if test "x$with_widec" != xyes ; then
--		{ echo "$as_me:11678: WARNING: This option applies only to wide-character library" >&5
-+		{ echo "$as_me:11685: WARNING: This option applies only to wide-character library" >&5
+-		{ echo "$as_me:11972: WARNING: This option applies only to wide-character library" >&5
++		{ echo "$as_me:12079: WARNING: This option applies only to wide-character library" >&5
  echo "$as_me: WARNING: This option applies only to wide-character library" >&2;}
  	else
  		# cannot be ABI 5 since it changes sizeof(cchar_t)
-@@ -11685,7 +11692,7 @@
+@@ -11979,7 +12086,7 @@
  	(5.*)
  		cf_cv_rel_version=6.0
  		cf_cv_abi_version=6
--		{ echo "$as_me:11688: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
-+		{ echo "$as_me:11695: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+-		{ echo "$as_me:11982: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:12089: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
  echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
  		;;
  	esac
-@@ -11701,7 +11708,7 @@
+@@ -11995,7 +12102,7 @@
  fi
  
  ###   use option --enable-ext-mouse to modify coding to support 5-button mice
--echo "$as_me:11704: checking if you want to use extended mouse encoding" >&5
-+echo "$as_me:11711: checking if you want to use extended mouse encoding" >&5
+-echo "$as_me:11998: checking if you want to use extended mouse encoding" >&5
++echo "$as_me:12105: checking if you want to use extended mouse encoding" >&5
  echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6
  
  # Check whether --enable-ext-mouse or --disable-ext-mouse was given.
-@@ -11711,7 +11718,7 @@
+@@ -12005,7 +12112,7 @@
  else
    with_ext_mouse=$cf_dft_ext_mouse
  fi;
--echo "$as_me:11714: result: $with_ext_mouse" >&5
-+echo "$as_me:11721: result: $with_ext_mouse" >&5
+-echo "$as_me:12008: result: $with_ext_mouse" >&5
++echo "$as_me:12115: result: $with_ext_mouse" >&5
  echo "${ECHO_T}$with_ext_mouse" >&6
  NCURSES_MOUSE_VERSION=1
  if test "x$with_ext_mouse" = xyes ; then
-@@ -11722,7 +11729,7 @@
+@@ -12016,7 +12123,7 @@
  	(5.*)
  		cf_cv_rel_version=6.0
  		cf_cv_abi_version=6
--		{ echo "$as_me:11725: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
-+		{ echo "$as_me:11732: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+-		{ echo "$as_me:12019: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:12126: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
  echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
  		;;
  	esac
-@@ -11731,7 +11738,7 @@
+@@ -12025,7 +12132,7 @@
  fi
  
  ###   use option --enable-ext-putwin to turn on extended screendumps
--echo "$as_me:11734: checking if you want to use extended putwin/screendump" >&5
-+echo "$as_me:11741: checking if you want to use extended putwin/screendump" >&5
+-echo "$as_me:12028: checking if you want to use extended putwin/screendump" >&5
++echo "$as_me:12135: checking if you want to use extended putwin/screendump" >&5
  echo $ECHO_N "checking if you want to use extended putwin/screendump... $ECHO_C" >&6
  
  # Check whether --enable-ext-putwin or --disable-ext-putwin was given.
-@@ -11741,7 +11748,7 @@
+@@ -12035,7 +12142,7 @@
  else
    with_ext_putwin=$cf_dft_ext_putwin
  fi;
--echo "$as_me:11744: result: $with_ext_putwin" >&5
-+echo "$as_me:11751: result: $with_ext_putwin" >&5
+-echo "$as_me:12038: result: $with_ext_putwin" >&5
++echo "$as_me:12145: result: $with_ext_putwin" >&5
  echo "${ECHO_T}$with_ext_putwin" >&6
  if test "x$with_ext_putwin" = xyes ; then
  
-@@ -11751,7 +11758,7 @@
+@@ -12045,7 +12152,7 @@
  
  fi
  
--echo "$as_me:11754: checking if you want \$NCURSES_NO_PADDING code" >&5
-+echo "$as_me:11761: checking if you want \$NCURSES_NO_PADDING code" >&5
+-echo "$as_me:12048: checking if you want \$NCURSES_NO_PADDING code" >&5
++echo "$as_me:12155: checking if you want \$NCURSES_NO_PADDING code" >&5
  echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6
  
  # Check whether --enable-no-padding or --disable-no-padding was given.
-@@ -11761,20 +11768,20 @@
+@@ -12055,20 +12162,20 @@
  else
    with_no_padding=$with_ext_funcs
  fi;
--echo "$as_me:11764: result: $with_no_padding" >&5
-+echo "$as_me:11771: result: $with_no_padding" >&5
+-echo "$as_me:12058: result: $with_no_padding" >&5
++echo "$as_me:12165: result: $with_no_padding" >&5
  echo "${ECHO_T}$with_no_padding" >&6
  test "x$with_no_padding" = xyes &&
  cat >>confdefs.h <<\EOF
  #define NCURSES_NO_PADDING 1
  EOF
  
--echo "$as_me:11771: checking for ANSI C header files" >&5
-+echo "$as_me:11778: checking for ANSI C header files" >&5
+-echo "$as_me:12065: checking for ANSI C header files" >&5
++echo "$as_me:12172: 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 11777 "configure"
-+#line 11784 "configure"
+-#line 12071 "configure"
++#line 12178 "configure"
  #include "confdefs.h"
  #include 
  #include 
-@@ -11782,13 +11789,13 @@
+@@ -12076,13 +12183,13 @@
  #include 
  
  _ACEOF
--if { (eval echo "$as_me:11785: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:11792: \"$ac_cpp conftest.$ac_ext\"") >&5
+-if { (eval echo "$as_me:12079: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:12186: \"$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:11791: \$? = $ac_status" >&5
-+  echo "$as_me:11798: \$? = $ac_status" >&5
+-  echo "$as_me:12085: \$? = $ac_status" >&5
++  echo "$as_me:12192: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -11810,7 +11817,7 @@
+@@ -12104,7 +12211,7 @@
  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 11813 "configure"
-+#line 11820 "configure"
+-#line 12107 "configure"
++#line 12214 "configure"
  #include "confdefs.h"
  #include 
  
-@@ -11828,7 +11835,7 @@
+@@ -12122,7 +12229,7 @@
  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 11831 "configure"
-+#line 11838 "configure"
+-#line 12125 "configure"
++#line 12232 "configure"
  #include "confdefs.h"
  #include 
  
-@@ -11849,7 +11856,7 @@
+@@ -12143,7 +12250,7 @@
    :
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 11852 "configure"
-+#line 11859 "configure"
+-#line 12146 "configure"
++#line 12253 "configure"
  #include "confdefs.h"
  #include 
  #if ((' ' & 0x0FF) == 0x020)
-@@ -11875,15 +11882,15 @@
+@@ -12169,15 +12276,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
--if { (eval echo "$as_me:11878: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11885: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:12172: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12279: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:11881: \$? = $ac_status" >&5
-+  echo "$as_me:11888: \$? = $ac_status" >&5
+-  echo "$as_me:12175: \$? = $ac_status" >&5
++  echo "$as_me:12282: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:11883: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11890: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:12177: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12284: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:11886: \$? = $ac_status" >&5
-+  echo "$as_me:11893: \$? = $ac_status" >&5
+-  echo "$as_me:12180: \$? = $ac_status" >&5
++  echo "$as_me:12287: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -11896,7 +11903,7 @@
+@@ -12190,7 +12297,7 @@
  fi
  fi
  fi
--echo "$as_me:11899: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:11906: result: $ac_cv_header_stdc" >&5
+-echo "$as_me:12193: result: $ac_cv_header_stdc" >&5
++echo "$as_me:12300: result: $ac_cv_header_stdc" >&5
  echo "${ECHO_T}$ac_cv_header_stdc" >&6
  if test $ac_cv_header_stdc = yes; then
  
-@@ -11912,28 +11919,28 @@
+@@ -12206,28 +12313,28 @@
                    inttypes.h stdint.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:11915: checking for $ac_header" >&5
-+echo "$as_me:11922: checking for $ac_header" >&5
+-echo "$as_me:12209: checking for $ac_header" >&5
++echo "$as_me:12316: 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 11921 "configure"
-+#line 11928 "configure"
+-#line 12215 "configure"
++#line 12322 "configure"
  #include "confdefs.h"
  $ac_includes_default
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11927: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11934: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:12221: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12328: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:11930: \$? = $ac_status" >&5
-+  echo "$as_me:11937: \$? = $ac_status" >&5
+-  echo "$as_me:12224: \$? = $ac_status" >&5
++  echo "$as_me:12331: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11933: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11940: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:12227: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12334: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:11936: \$? = $ac_status" >&5
-+  echo "$as_me:11943: \$? = $ac_status" >&5
+-  echo "$as_me:12230: \$? = $ac_status" >&5
++  echo "$as_me:12337: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_Header=yes"
  else
-@@ -11943,7 +11950,7 @@
+@@ -12237,7 +12344,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
--echo "$as_me:11946: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:11953: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "$as_me:12240: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:12347: 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 <&5
-+echo "$as_me:11963: checking for signed char" >&5
+-echo "$as_me:12250: checking for signed char" >&5
++echo "$as_me:12357: checking for signed char" >&5
  echo $ECHO_N "checking for signed char... $ECHO_C" >&6
  if test "${ac_cv_type_signed_char+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 11962 "configure"
-+#line 11969 "configure"
+-#line 12256 "configure"
++#line 12363 "configure"
  #include "confdefs.h"
  $ac_includes_default
  int
-@@ -11974,16 +11981,16 @@
+@@ -12268,16 +12375,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11977: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11984: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:12271: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12378: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:11980: \$? = $ac_status" >&5
-+  echo "$as_me:11987: \$? = $ac_status" >&5
+-  echo "$as_me:12274: \$? = $ac_status" >&5
++  echo "$as_me:12381: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11983: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11990: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:12277: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12384: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:11986: \$? = $ac_status" >&5
-+  echo "$as_me:11993: \$? = $ac_status" >&5
+-  echo "$as_me:12280: \$? = $ac_status" >&5
++  echo "$as_me:12387: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_type_signed_char=yes
  else
-@@ -11993,10 +12000,10 @@
+@@ -12287,10 +12394,10 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
--echo "$as_me:11996: result: $ac_cv_type_signed_char" >&5
-+echo "$as_me:12003: result: $ac_cv_type_signed_char" >&5
+-echo "$as_me:12290: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:12397: result: $ac_cv_type_signed_char" >&5
  echo "${ECHO_T}$ac_cv_type_signed_char" >&6
  
--echo "$as_me:11999: checking size of signed char" >&5
-+echo "$as_me:12006: checking size of signed char" >&5
+-echo "$as_me:12293: checking size of signed char" >&5
++echo "$as_me:12400: checking size of signed char" >&5
  echo $ECHO_N "checking size of signed char... $ECHO_C" >&6
  if test "${ac_cv_sizeof_signed_char+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12005,7 +12012,7 @@
+@@ -12299,7 +12406,7 @@
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
--#line 12008 "configure"
-+#line 12015 "configure"
+-#line 12302 "configure"
++#line 12409 "configure"
  #include "confdefs.h"
  $ac_includes_default
  int
-@@ -12017,21 +12024,21 @@
+@@ -12311,21 +12418,21 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12020: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12027: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:12314: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12421: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:12023: \$? = $ac_status" >&5
-+  echo "$as_me:12030: \$? = $ac_status" >&5
+-  echo "$as_me:12317: \$? = $ac_status" >&5
++  echo "$as_me:12424: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12026: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12033: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:12320: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12427: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:12029: \$? = $ac_status" >&5
-+  echo "$as_me:12036: \$? = $ac_status" >&5
+-  echo "$as_me:12323: \$? = $ac_status" >&5
++  echo "$as_me:12430: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_lo=0 ac_mid=0
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
--#line 12034 "configure"
-+#line 12041 "configure"
+-#line 12328 "configure"
++#line 12435 "configure"
  #include "confdefs.h"
  $ac_includes_default
  int
-@@ -12043,16 +12050,16 @@
+@@ -12337,16 +12444,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12046: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12053: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:12340: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12447: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:12049: \$? = $ac_status" >&5
-+  echo "$as_me:12056: \$? = $ac_status" >&5
+-  echo "$as_me:12343: \$? = $ac_status" >&5
++  echo "$as_me:12450: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12052: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12059: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:12346: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12453: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:12055: \$? = $ac_status" >&5
-+  echo "$as_me:12062: \$? = $ac_status" >&5
+-  echo "$as_me:12349: \$? = $ac_status" >&5
++  echo "$as_me:12456: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_hi=$ac_mid; break
  else
-@@ -12068,7 +12075,7 @@
+@@ -12362,7 +12469,7 @@
  ac_hi=-1 ac_mid=-1
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
--#line 12071 "configure"
-+#line 12078 "configure"
+-#line 12365 "configure"
++#line 12472 "configure"
  #include "confdefs.h"
  $ac_includes_default
  int
-@@ -12080,16 +12087,16 @@
+@@ -12374,16 +12481,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12083: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12090: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:12377: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12484: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:12086: \$? = $ac_status" >&5
-+  echo "$as_me:12093: \$? = $ac_status" >&5
+-  echo "$as_me:12380: \$? = $ac_status" >&5
++  echo "$as_me:12487: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12089: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12096: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:12383: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12490: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:12092: \$? = $ac_status" >&5
-+  echo "$as_me:12099: \$? = $ac_status" >&5
+-  echo "$as_me:12386: \$? = $ac_status" >&5
++  echo "$as_me:12493: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_lo=$ac_mid; break
  else
-@@ -12105,7 +12112,7 @@
+@@ -12399,7 +12506,7 @@
  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 12108 "configure"
-+#line 12115 "configure"
+-#line 12402 "configure"
++#line 12509 "configure"
  #include "confdefs.h"
  $ac_includes_default
  int
-@@ -12117,16 +12124,16 @@
+@@ -12411,16 +12518,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12120: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12127: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:12414: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12521: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:12123: \$? = $ac_status" >&5
-+  echo "$as_me:12130: \$? = $ac_status" >&5
+-  echo "$as_me:12417: \$? = $ac_status" >&5
++  echo "$as_me:12524: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12126: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12133: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:12420: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12527: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:12129: \$? = $ac_status" >&5
-+  echo "$as_me:12136: \$? = $ac_status" >&5
+-  echo "$as_me:12423: \$? = $ac_status" >&5
++  echo "$as_me:12530: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_hi=$ac_mid
  else
-@@ -12139,12 +12146,12 @@
+@@ -12433,12 +12540,12 @@
  ac_cv_sizeof_signed_char=$ac_lo
  else
    if test "$cross_compiling" = yes; then
--  { { echo "$as_me:12142: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:12149: error: cannot run test program while cross compiling" >&5
+-  { { echo "$as_me:12436: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:12543: 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 12147 "configure"
-+#line 12154 "configure"
+-#line 12441 "configure"
++#line 12548 "configure"
  #include "confdefs.h"
  $ac_includes_default
  int
-@@ -12160,15 +12167,15 @@
+@@ -12454,15 +12561,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
--if { (eval echo "$as_me:12163: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12170: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:12457: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12564: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:12166: \$? = $ac_status" >&5
-+  echo "$as_me:12173: \$? = $ac_status" >&5
+-  echo "$as_me:12460: \$? = $ac_status" >&5
++  echo "$as_me:12567: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:12168: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12175: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:12462: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12569: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:12171: \$? = $ac_status" >&5
-+  echo "$as_me:12178: \$? = $ac_status" >&5
+-  echo "$as_me:12465: \$? = $ac_status" >&5
++  echo "$as_me:12572: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_sizeof_signed_char=`cat conftest.val`
  else
-@@ -12184,7 +12191,7 @@
+@@ -12478,7 +12585,7 @@
    ac_cv_sizeof_signed_char=0
  fi
  fi
--echo "$as_me:12187: result: $ac_cv_sizeof_signed_char" >&5
-+echo "$as_me:12194: result: $ac_cv_sizeof_signed_char" >&5
+-echo "$as_me:12481: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:12588: result: $ac_cv_sizeof_signed_char" >&5
  echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
  cat >>confdefs.h <&5
-+echo "$as_me:12205: checking if you want to use signed Boolean array in term.h" >&5
+-echo "$as_me:12492: checking if you want to use signed Boolean array in term.h" >&5
++echo "$as_me:12599: checking if you want to use signed Boolean array in term.h" >&5
  echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6
  
  # Check whether --enable-signed-char or --disable-signed-char was given.
-@@ -12205,12 +12212,12 @@
+@@ -12499,12 +12606,12 @@
  else
    with_signed_char=no
  fi;
--echo "$as_me:12208: result: $with_signed_char" >&5
-+echo "$as_me:12215: result: $with_signed_char" >&5
+-echo "$as_me:12502: result: $with_signed_char" >&5
++echo "$as_me:12609: result: $with_signed_char" >&5
  echo "${ECHO_T}$with_signed_char" >&6
  test "x$with_signed_char" != xyes && NCURSES_SBOOL="char"
  
  ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
--echo "$as_me:12213: checking if you want SIGWINCH handler" >&5
-+echo "$as_me:12220: checking if you want SIGWINCH handler" >&5
+-echo "$as_me:12507: checking if you want SIGWINCH handler" >&5
++echo "$as_me:12614: checking if you want SIGWINCH handler" >&5
  echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6
  
  # Check whether --enable-sigwinch or --disable-sigwinch was given.
-@@ -12220,7 +12227,7 @@
+@@ -12514,7 +12621,7 @@
  else
    with_sigwinch=$with_ext_funcs
  fi;
--echo "$as_me:12223: result: $with_sigwinch" >&5
-+echo "$as_me:12230: result: $with_sigwinch" >&5
+-echo "$as_me:12517: result: $with_sigwinch" >&5
++echo "$as_me:12624: result: $with_sigwinch" >&5
  echo "${ECHO_T}$with_sigwinch" >&6
  test "x$with_sigwinch" = xyes &&
  cat >>confdefs.h <<\EOF
-@@ -12228,7 +12235,7 @@
+@@ -12522,7 +12629,7 @@
  EOF
  
  ###   use option --enable-tcap-names to allow user to define new capabilities
--echo "$as_me:12231: checking if you want user-definable terminal capabilities like termcap" >&5
-+echo "$as_me:12238: checking if you want user-definable terminal capabilities like termcap" >&5
+-echo "$as_me:12525: checking if you want user-definable terminal capabilities like termcap" >&5
++echo "$as_me:12632: checking if you want user-definable terminal capabilities like termcap" >&5
  echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6
  
  # Check whether --enable-tcap-names or --disable-tcap-names was given.
-@@ -12238,7 +12245,7 @@
+@@ -12532,7 +12639,7 @@
  else
    with_tcap_names=$with_ext_funcs
  fi;
--echo "$as_me:12241: result: $with_tcap_names" >&5
-+echo "$as_me:12248: result: $with_tcap_names" >&5
+-echo "$as_me:12535: result: $with_tcap_names" >&5
++echo "$as_me:12642: result: $with_tcap_names" >&5
  echo "${ECHO_T}$with_tcap_names" >&6
  NCURSES_XNAMES=0
  test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1
-@@ -12246,7 +12253,7 @@
+@@ -12540,7 +12647,7 @@
  ###############################################################################
  # These options are relatively safe to experiment with.
  
--echo "$as_me:12249: checking if you want all development code" >&5
-+echo "$as_me:12256: checking if you want all development code" >&5
+-echo "$as_me:12543: checking if you want all development code" >&5
++echo "$as_me:12650: checking if you want all development code" >&5
  echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
  
  # Check whether --with-develop or --without-develop was given.
-@@ -12256,11 +12263,11 @@
+@@ -12550,11 +12657,11 @@
  else
    with_develop=no
  fi;
--echo "$as_me:12259: result: $with_develop" >&5
-+echo "$as_me:12266: result: $with_develop" >&5
+-echo "$as_me:12553: result: $with_develop" >&5
++echo "$as_me:12660: result: $with_develop" >&5
  echo "${ECHO_T}$with_develop" >&6
  
  ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
--echo "$as_me:12263: checking if you want hard-tabs code" >&5
-+echo "$as_me:12270: checking if you want hard-tabs code" >&5
+-echo "$as_me:12557: checking if you want hard-tabs code" >&5
++echo "$as_me:12664: checking if you want hard-tabs code" >&5
  echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6
  
  # Check whether --enable-hard-tabs or --disable-hard-tabs was given.
-@@ -12270,7 +12277,7 @@
+@@ -12564,7 +12671,7 @@
  else
    enable_hard_tabs=$with_develop
  fi;
--echo "$as_me:12273: result: $enable_hard_tabs" >&5
-+echo "$as_me:12280: result: $enable_hard_tabs" >&5
+-echo "$as_me:12567: result: $enable_hard_tabs" >&5
++echo "$as_me:12674: result: $enable_hard_tabs" >&5
  echo "${ECHO_T}$enable_hard_tabs" >&6
  test "x$enable_hard_tabs" = xyes &&
  cat >>confdefs.h <<\EOF
-@@ -12278,7 +12285,7 @@
+@@ -12572,7 +12679,7 @@
  EOF
  
  ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
--echo "$as_me:12281: checking if you want limited support for xmc" >&5
-+echo "$as_me:12288: checking if you want limited support for xmc" >&5
+-echo "$as_me:12575: checking if you want limited support for xmc" >&5
++echo "$as_me:12682: checking if you want limited support for xmc" >&5
  echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6
  
  # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given.
-@@ -12288,7 +12295,7 @@
+@@ -12582,7 +12689,7 @@
  else
    enable_xmc_glitch=$with_develop
  fi;
--echo "$as_me:12291: result: $enable_xmc_glitch" >&5
-+echo "$as_me:12298: result: $enable_xmc_glitch" >&5
+-echo "$as_me:12585: result: $enable_xmc_glitch" >&5
++echo "$as_me:12692: result: $enable_xmc_glitch" >&5
  echo "${ECHO_T}$enable_xmc_glitch" >&6
  test "x$enable_xmc_glitch" = xyes &&
  cat >>confdefs.h <<\EOF
-@@ -12298,7 +12305,7 @@
+@@ -12592,7 +12699,7 @@
  ###############################################################################
  # These are just experimental, probably should not be in a package:
  
--echo "$as_me:12301: checking if you do not want to assume colors are white-on-black" >&5
-+echo "$as_me:12308: checking if you do not want to assume colors are white-on-black" >&5
+-echo "$as_me:12595: checking if you do not want to assume colors are white-on-black" >&5
++echo "$as_me:12702: checking if you do not want to assume colors are white-on-black" >&5
  echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6
  
  # Check whether --enable-assumed-color or --disable-assumed-color was given.
-@@ -12308,7 +12315,7 @@
+@@ -12602,7 +12709,7 @@
  else
    with_assumed_color=yes
  fi;
--echo "$as_me:12311: result: $with_assumed_color" >&5
-+echo "$as_me:12318: result: $with_assumed_color" >&5
+-echo "$as_me:12605: result: $with_assumed_color" >&5
++echo "$as_me:12712: result: $with_assumed_color" >&5
  echo "${ECHO_T}$with_assumed_color" >&6
  test "x$with_assumed_color" = xyes &&
  cat >>confdefs.h <<\EOF
-@@ -12316,7 +12323,7 @@
+@@ -12610,7 +12717,7 @@
  EOF
  
  ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
--echo "$as_me:12319: checking if you want hashmap scrolling-optimization code" >&5
-+echo "$as_me:12326: checking if you want hashmap scrolling-optimization code" >&5
+-echo "$as_me:12613: checking if you want hashmap scrolling-optimization code" >&5
++echo "$as_me:12720: checking if you want hashmap scrolling-optimization code" >&5
  echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6
  
  # Check whether --enable-hashmap or --disable-hashmap was given.
-@@ -12326,7 +12333,7 @@
+@@ -12620,7 +12727,7 @@
  else
    with_hashmap=yes
  fi;
--echo "$as_me:12329: result: $with_hashmap" >&5
-+echo "$as_me:12336: result: $with_hashmap" >&5
+-echo "$as_me:12623: result: $with_hashmap" >&5
++echo "$as_me:12730: result: $with_hashmap" >&5
  echo "${ECHO_T}$with_hashmap" >&6
  test "x$with_hashmap" = xyes &&
  cat >>confdefs.h <<\EOF
-@@ -12334,7 +12341,7 @@
+@@ -12628,7 +12735,7 @@
  EOF
  
  ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
--echo "$as_me:12337: checking if you want colorfgbg code" >&5
-+echo "$as_me:12344: checking if you want colorfgbg code" >&5
+-echo "$as_me:12631: checking if you want colorfgbg code" >&5
++echo "$as_me:12738: checking if you want colorfgbg code" >&5
  echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6
  
  # Check whether --enable-colorfgbg or --disable-colorfgbg was given.
-@@ -12344,7 +12351,7 @@
+@@ -12638,7 +12745,7 @@
  else
    with_colorfgbg=no
  fi;
--echo "$as_me:12347: result: $with_colorfgbg" >&5
-+echo "$as_me:12354: result: $with_colorfgbg" >&5
+-echo "$as_me:12641: result: $with_colorfgbg" >&5
++echo "$as_me:12748: result: $with_colorfgbg" >&5
  echo "${ECHO_T}$with_colorfgbg" >&6
  test "x$with_colorfgbg" = xyes &&
  cat >>confdefs.h <<\EOF
-@@ -12352,7 +12359,7 @@
+@@ -12646,7 +12753,7 @@
  EOF
  
  ###   use option --enable-interop to turn on use of bindings used for interop
--echo "$as_me:12355: checking if you want interop bindings" >&5
-+echo "$as_me:12362: checking if you want interop bindings" >&5
+-echo "$as_me:12649: checking if you want interop bindings" >&5
++echo "$as_me:12756: checking if you want interop bindings" >&5
  echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6
  
  # Check whether --enable-interop or --disable-interop was given.
-@@ -12362,7 +12369,7 @@
+@@ -12656,7 +12763,7 @@
  else
    with_exp_interop=$cf_dft_interop
  fi;
--echo "$as_me:12365: result: $with_exp_interop" >&5
-+echo "$as_me:12372: result: $with_exp_interop" >&5
+-echo "$as_me:12659: result: $with_exp_interop" >&5
++echo "$as_me:12766: result: $with_exp_interop" >&5
  echo "${ECHO_T}$with_exp_interop" >&6
  
  NCURSES_INTEROP_FUNCS=0
-@@ -12371,7 +12378,7 @@
+@@ -12665,7 +12772,7 @@
  # This is still experimental (20080329), but should ultimately be moved to
  # the script-block --with-normal, etc.
  
--echo "$as_me:12374: checking if you want to link with the pthread library" >&5
-+echo "$as_me:12381: checking if you want to link with the pthread library" >&5
+-echo "$as_me:12668: checking if you want to link with the pthread library" >&5
++echo "$as_me:12775: checking if you want to link with the pthread library" >&5
  echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6
  
  # Check whether --with-pthread or --without-pthread was given.
-@@ -12381,27 +12388,27 @@
+@@ -12675,27 +12782,27 @@
  else
    with_pthread=no
  fi;
--echo "$as_me:12384: result: $with_pthread" >&5
-+echo "$as_me:12391: result: $with_pthread" >&5
+-echo "$as_me:12678: result: $with_pthread" >&5
++echo "$as_me:12785: result: $with_pthread" >&5
  echo "${ECHO_T}$with_pthread" >&6
  
  if test "$with_pthread" != no ; then
--	echo "$as_me:12388: checking for pthread.h" >&5
-+	echo "$as_me:12395: checking for pthread.h" >&5
+-	echo "$as_me:12682: checking for pthread.h" >&5
++	echo "$as_me:12789: checking for pthread.h" >&5
  echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
  if test "${ac_cv_header_pthread_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 12394 "configure"
-+#line 12401 "configure"
+-#line 12688 "configure"
++#line 12795 "configure"
  #include "confdefs.h"
  #include 
  _ACEOF
--if { (eval echo "$as_me:12398: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:12405: \"$ac_cpp conftest.$ac_ext\"") >&5
+-if { (eval echo "$as_me:12692: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:12799: \"$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:12404: \$? = $ac_status" >&5
-+  echo "$as_me:12411: \$? = $ac_status" >&5
+-  echo "$as_me:12698: \$? = $ac_status" >&5
++  echo "$as_me:12805: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -12420,7 +12427,7 @@
+@@ -12714,7 +12821,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
--echo "$as_me:12423: result: $ac_cv_header_pthread_h" >&5
-+echo "$as_me:12430: result: $ac_cv_header_pthread_h" >&5
+-echo "$as_me:12717: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:12824: result: $ac_cv_header_pthread_h" >&5
  echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
  if test $ac_cv_header_pthread_h = yes; then
  
-@@ -12430,7 +12437,7 @@
+@@ -12724,7 +12831,7 @@
  
  	for cf_lib_pthread in pthread c_r
  	do
--	    echo "$as_me:12433: checking if we can link with the $cf_lib_pthread library" >&5
-+	    echo "$as_me:12440: checking if we can link with the $cf_lib_pthread library" >&5
+-	    echo "$as_me:12727: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:12834: checking if we can link with the $cf_lib_pthread library" >&5
  echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6
  	    cf_save_LIBS="$LIBS"
  
-@@ -12451,7 +12458,7 @@
+@@ -12745,7 +12852,7 @@
  LIBS="$cf_add_libs"
  
  	    cat >conftest.$ac_ext <<_ACEOF
--#line 12454 "configure"
-+#line 12461 "configure"
+-#line 12748 "configure"
++#line 12855 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -12468,16 +12475,16 @@
+@@ -12762,16 +12869,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12471: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12478: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:12765: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12872: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:12474: \$? = $ac_status" >&5
-+  echo "$as_me:12481: \$? = $ac_status" >&5
+-  echo "$as_me:12768: \$? = $ac_status" >&5
++  echo "$as_me:12875: \$? = $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:12484: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:12771: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12878: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:12480: \$? = $ac_status" >&5
-+  echo "$as_me:12487: \$? = $ac_status" >&5
+-  echo "$as_me:12774: \$? = $ac_status" >&5
++  echo "$as_me:12881: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    with_pthread=yes
  else
-@@ -12487,7 +12494,7 @@
+@@ -12781,7 +12888,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  	    LIBS="$cf_save_LIBS"
--	    echo "$as_me:12490: result: $with_pthread" >&5
-+	    echo "$as_me:12497: result: $with_pthread" >&5
+-	    echo "$as_me:12784: result: $with_pthread" >&5
++	    echo "$as_me:12891: result: $with_pthread" >&5
  echo "${ECHO_T}$with_pthread" >&6
  	    test "$with_pthread" = yes && break
  	done
-@@ -12515,7 +12522,7 @@
+@@ -12809,7 +12916,7 @@
  EOF
  
  	else
--	    { { echo "$as_me:12518: error: Cannot link with pthread library" >&5
-+	    { { echo "$as_me:12525: error: Cannot link with pthread library" >&5
+-	    { { echo "$as_me:12812: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:12919: error: Cannot link with pthread library" >&5
  echo "$as_me: error: Cannot link with pthread library" >&2;}
     { (exit 1); exit 1; }; }
  	fi
-@@ -12525,13 +12532,13 @@
+@@ -12819,13 +12926,13 @@
  fi
  
  if test "x$with_pthread" != xno; then
--	echo "$as_me:12528: checking for pthread_kill" >&5
-+	echo "$as_me:12535: checking for pthread_kill" >&5
+-	echo "$as_me:12822: checking for pthread_kill" >&5
++	echo "$as_me:12929: checking for pthread_kill" >&5
  echo $ECHO_N "checking for pthread_kill... $ECHO_C" >&6
  if test "${ac_cv_func_pthread_kill+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 12534 "configure"
-+#line 12541 "configure"
+-#line 12828 "configure"
++#line 12935 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char pthread_kill (); below.  */
-@@ -12562,16 +12569,16 @@
+@@ -12856,16 +12963,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12565: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12572: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:12859: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12966: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:12568: \$? = $ac_status" >&5
-+  echo "$as_me:12575: \$? = $ac_status" >&5
+-  echo "$as_me:12862: \$? = $ac_status" >&5
++  echo "$as_me:12969: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12571: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12578: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:12865: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12972: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:12574: \$? = $ac_status" >&5
-+  echo "$as_me:12581: \$? = $ac_status" >&5
+-  echo "$as_me:12868: \$? = $ac_status" >&5
++  echo "$as_me:12975: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_pthread_kill=yes
  else
-@@ -12581,11 +12588,11 @@
+@@ -12875,11 +12982,11 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:12584: result: $ac_cv_func_pthread_kill" >&5
-+echo "$as_me:12591: result: $ac_cv_func_pthread_kill" >&5
+-echo "$as_me:12878: result: $ac_cv_func_pthread_kill" >&5
++echo "$as_me:12985: result: $ac_cv_func_pthread_kill" >&5
  echo "${ECHO_T}$ac_cv_func_pthread_kill" >&6
  if test $ac_cv_func_pthread_kill = yes; then
  
--		echo "$as_me:12588: checking if you want to allow EINTR in wgetch with pthreads" >&5
-+		echo "$as_me:12595: checking if you want to allow EINTR in wgetch with pthreads" >&5
+-		echo "$as_me:12882: checking if you want to allow EINTR in wgetch with pthreads" >&5
++		echo "$as_me:12989: checking if you want to allow EINTR in wgetch with pthreads" >&5
  echo $ECHO_N "checking if you want to allow EINTR in wgetch with pthreads... $ECHO_C" >&6
  
  # Check whether --enable-pthreads-eintr or --disable-pthreads-eintr was given.
-@@ -12595,7 +12602,7 @@
+@@ -12889,7 +12996,7 @@
  else
    use_pthreads_eintr=no
  fi;
--		echo "$as_me:12598: result: $use_pthreads_eintr" >&5
-+		echo "$as_me:12605: result: $use_pthreads_eintr" >&5
+-		echo "$as_me:12892: result: $use_pthreads_eintr" >&5
++		echo "$as_me:12999: result: $use_pthreads_eintr" >&5
  echo "${ECHO_T}$use_pthreads_eintr" >&6
  		if test "x$use_pthreads_eintr" = xyes ; then
  
-@@ -12606,7 +12613,7 @@
+@@ -12900,7 +13007,7 @@
  		fi
  fi
  
--	echo "$as_me:12609: checking if you want to use weak-symbols for pthreads" >&5
-+	echo "$as_me:12616: checking if you want to use weak-symbols for pthreads" >&5
+-	echo "$as_me:12903: checking if you want to use weak-symbols for pthreads" >&5
++	echo "$as_me:13010: checking if you want to use weak-symbols for pthreads" >&5
  echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6
  
  # Check whether --enable-weak-symbols or --disable-weak-symbols was given.
-@@ -12616,18 +12623,18 @@
+@@ -12910,18 +13017,18 @@
  else
    use_weak_symbols=no
  fi;
--	echo "$as_me:12619: result: $use_weak_symbols" >&5
-+	echo "$as_me:12626: result: $use_weak_symbols" >&5
+-	echo "$as_me:12913: result: $use_weak_symbols" >&5
++	echo "$as_me:13020: result: $use_weak_symbols" >&5
  echo "${ECHO_T}$use_weak_symbols" >&6
  	if test "x$use_weak_symbols" = xyes ; then
  
--echo "$as_me:12623: checking if $CC supports weak symbols" >&5
-+echo "$as_me:12630: checking if $CC supports weak symbols" >&5
+-echo "$as_me:12917: checking if $CC supports weak symbols" >&5
++echo "$as_me:13024: checking if $CC supports weak symbols" >&5
  echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6
  if test "${cf_cv_weak_symbols+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
  cat >conftest.$ac_ext <<_ACEOF
--#line 12630 "configure"
-+#line 12637 "configure"
+-#line 12924 "configure"
++#line 13031 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -12653,16 +12660,16 @@
+@@ -12947,16 +13054,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12656: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12663: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:12950: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13057: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:12659: \$? = $ac_status" >&5
-+  echo "$as_me:12666: \$? = $ac_status" >&5
+-  echo "$as_me:12953: \$? = $ac_status" >&5
++  echo "$as_me:13060: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12662: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12669: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:12956: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13063: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:12665: \$? = $ac_status" >&5
-+  echo "$as_me:12672: \$? = $ac_status" >&5
+-  echo "$as_me:12959: \$? = $ac_status" >&5
++  echo "$as_me:13066: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_weak_symbols=yes
  else
-@@ -12673,7 +12680,7 @@
+@@ -12967,7 +13074,7 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  
  fi
--echo "$as_me:12676: result: $cf_cv_weak_symbols" >&5
-+echo "$as_me:12683: result: $cf_cv_weak_symbols" >&5
+-echo "$as_me:12970: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:13077: result: $cf_cv_weak_symbols" >&5
  echo "${ECHO_T}$cf_cv_weak_symbols" >&6
  
  	else
-@@ -12706,7 +12713,7 @@
+@@ -13000,7 +13107,7 @@
  # opaque outside of that, so there is no --enable-opaque option.  We can use
  # this option without --with-pthreads, but this will be always set for
  # pthreads.
--echo "$as_me:12709: checking if you want reentrant code" >&5
-+echo "$as_me:12716: checking if you want reentrant code" >&5
+-echo "$as_me:13003: checking if you want reentrant code" >&5
++echo "$as_me:13110: checking if you want reentrant code" >&5
  echo $ECHO_N "checking if you want reentrant code... $ECHO_C" >&6
  
  # Check whether --enable-reentrant or --disable-reentrant was given.
-@@ -12716,7 +12723,7 @@
+@@ -13010,7 +13117,7 @@
  else
    with_reentrant=no
  fi;
--echo "$as_me:12719: result: $with_reentrant" >&5
-+echo "$as_me:12726: result: $with_reentrant" >&5
+-echo "$as_me:13013: result: $with_reentrant" >&5
++echo "$as_me:13120: result: $with_reentrant" >&5
  echo "${ECHO_T}$with_reentrant" >&6
  if test "x$with_reentrant" = xyes ; then
  	cf_cv_enable_reentrant=1
-@@ -12789,7 +12796,7 @@
+@@ -13083,7 +13190,7 @@
  	(5.*)
  		cf_cv_rel_version=6.0
  		cf_cv_abi_version=6
--		{ echo "$as_me:12792: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
-+		{ echo "$as_me:12799: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+-		{ echo "$as_me:13086: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:13193: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
  echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
  		;;
  	esac
-@@ -12804,7 +12811,7 @@
+@@ -13098,7 +13205,7 @@
  
  ### Allow using a different wrap-prefix
  if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
--	echo "$as_me:12807: checking for prefix used to wrap public variables" >&5
-+	echo "$as_me:12814: checking for prefix used to wrap public variables" >&5
+-	echo "$as_me:13101: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:13208: checking for prefix used to wrap public variables" >&5
  echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6
  
  # Check whether --with-wrap-prefix or --without-wrap-prefix was given.
-@@ -12814,7 +12821,7 @@
+@@ -13108,7 +13215,7 @@
  else
    NCURSES_WRAP_PREFIX=_nc_
  fi;
--	echo "$as_me:12817: result: $NCURSES_WRAP_PREFIX" >&5
-+	echo "$as_me:12824: result: $NCURSES_WRAP_PREFIX" >&5
+-	echo "$as_me:13111: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:13218: result: $NCURSES_WRAP_PREFIX" >&5
  echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
  else
  	NCURSES_WRAP_PREFIX=_nc_
-@@ -12824,7 +12831,7 @@
+@@ -13118,7 +13225,7 @@
  #define NCURSES_WRAP_PREFIX "$NCURSES_WRAP_PREFIX"
  EOF
  
--echo "$as_me:12827: checking if you want experimental safe-sprintf code" >&5
-+echo "$as_me:12834: checking if you want experimental safe-sprintf code" >&5
+-echo "$as_me:13121: checking if you want experimental safe-sprintf code" >&5
++echo "$as_me:13228: checking if you want experimental safe-sprintf code" >&5
  echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6
  
  # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given.
-@@ -12834,7 +12841,7 @@
+@@ -13128,7 +13235,7 @@
  else
    with_safe_sprintf=no
  fi;
--echo "$as_me:12837: result: $with_safe_sprintf" >&5
-+echo "$as_me:12844: result: $with_safe_sprintf" >&5
+-echo "$as_me:13131: result: $with_safe_sprintf" >&5
++echo "$as_me:13238: result: $with_safe_sprintf" >&5
  echo "${ECHO_T}$with_safe_sprintf" >&6
  test "x$with_safe_sprintf" = xyes &&
  cat >>confdefs.h <<\EOF
-@@ -12844,7 +12851,7 @@
+@@ -13138,7 +13245,7 @@
  ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
  # when hashmap is used scroll hints are useless
  if test "$with_hashmap" = no ; then
--echo "$as_me:12847: checking if you want to experiment without scrolling-hints code" >&5
-+echo "$as_me:12854: checking if you want to experiment without scrolling-hints code" >&5
+-echo "$as_me:13141: checking if you want to experiment without scrolling-hints code" >&5
++echo "$as_me:13248: checking if you want to experiment without scrolling-hints code" >&5
  echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6
  
  # Check whether --enable-scroll-hints or --disable-scroll-hints was given.
-@@ -12854,7 +12861,7 @@
+@@ -13148,7 +13255,7 @@
  else
    with_scroll_hints=yes
  fi;
--echo "$as_me:12857: result: $with_scroll_hints" >&5
-+echo "$as_me:12864: result: $with_scroll_hints" >&5
+-echo "$as_me:13151: result: $with_scroll_hints" >&5
++echo "$as_me:13258: result: $with_scroll_hints" >&5
  echo "${ECHO_T}$with_scroll_hints" >&6
  test "x$with_scroll_hints" = xyes &&
  cat >>confdefs.h <<\EOF
-@@ -12863,7 +12870,7 @@
+@@ -13157,7 +13264,7 @@
  
  fi
  
--echo "$as_me:12866: checking if you want wgetch-events code" >&5
-+echo "$as_me:12873: checking if you want wgetch-events code" >&5
+-echo "$as_me:13160: checking if you want wgetch-events code" >&5
++echo "$as_me:13267: checking if you want wgetch-events code" >&5
  echo $ECHO_N "checking if you want wgetch-events code... $ECHO_C" >&6
  
  # Check whether --enable-wgetch-events or --disable-wgetch-events was given.
-@@ -12873,7 +12880,7 @@
+@@ -13167,7 +13274,7 @@
  else
    with_wgetch_events=no
  fi;
--echo "$as_me:12876: result: $with_wgetch_events" >&5
-+echo "$as_me:12883: result: $with_wgetch_events" >&5
+-echo "$as_me:13170: result: $with_wgetch_events" >&5
++echo "$as_me:13277: result: $with_wgetch_events" >&5
  echo "${ECHO_T}$with_wgetch_events" >&6
  test "x$with_wgetch_events" = xyes &&
  cat >>confdefs.h <<\EOF
-@@ -12884,7 +12891,7 @@
+@@ -13178,7 +13285,7 @@
  
  ###	use option --disable-echo to suppress full display compiling commands
  
--echo "$as_me:12887: checking if you want to see long compiling messages" >&5
-+echo "$as_me:12894: checking if you want to see long compiling messages" >&5
+-echo "$as_me:13181: checking if you want to see long compiling messages" >&5
++echo "$as_me:13288: 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.
-@@ -12918,7 +12925,7 @@
+@@ -13212,7 +13319,7 @@
  	ECHO_CC=''
  
  fi;
--echo "$as_me:12921: result: $enableval" >&5
-+echo "$as_me:12928: result: $enableval" >&5
+-echo "$as_me:13215: result: $enableval" >&5
++echo "$as_me:13322: result: $enableval" >&5
  echo "${ECHO_T}$enableval" >&6
  
  if test "x$enable_echo" = xyes; then
-@@ -12930,7 +12937,7 @@
+@@ -13224,7 +13331,7 @@
  fi
  
  ###	use option --enable-warnings to turn on all gcc warnings
--echo "$as_me:12933: checking if you want to see compiler warnings" >&5
-+echo "$as_me:12940: checking if you want to see compiler warnings" >&5
+-echo "$as_me:13227: checking if you want to see compiler warnings" >&5
++echo "$as_me:13334: checking if you want to see compiler warnings" >&5
  echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
  
  # Check whether --enable-warnings or --disable-warnings was given.
-@@ -12938,7 +12945,7 @@
+@@ -13232,7 +13339,7 @@
    enableval="$enable_warnings"
    with_warnings=$enableval
  fi;
--echo "$as_me:12941: result: $with_warnings" >&5
-+echo "$as_me:12948: result: $with_warnings" >&5
+-echo "$as_me:13235: result: $with_warnings" >&5
++echo "$as_me:13342: result: $with_warnings" >&5
  echo "${ECHO_T}$with_warnings" >&6
  
  if test "x$with_warnings" = "xyes"; then
-@@ -12950,12 +12957,12 @@
+@@ -13244,12 +13351,12 @@
  if test "$GCC" = yes ; then
  	case $host_os in
  	(linux*|gnu*)
--		echo "$as_me:12953: checking if this is really Intel C compiler" >&5
-+		echo "$as_me:12960: checking if this is really Intel C compiler" >&5
+-		echo "$as_me:13247: checking if this is really Intel C compiler" >&5
++		echo "$as_me:13354: 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 12958 "configure"
-+#line 12965 "configure"
+-#line 13252 "configure"
++#line 13359 "configure"
  #include "confdefs.h"
  
  int
-@@ -12972,16 +12979,16 @@
+@@ -13266,16 +13373,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12975: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12982: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:13269: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13376: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:12978: \$? = $ac_status" >&5
-+  echo "$as_me:12985: \$? = $ac_status" >&5
+-  echo "$as_me:13272: \$? = $ac_status" >&5
++  echo "$as_me:13379: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12981: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12988: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:13275: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13382: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:12984: \$? = $ac_status" >&5
-+  echo "$as_me:12991: \$? = $ac_status" >&5
+-  echo "$as_me:13278: \$? = $ac_status" >&5
++  echo "$as_me:13385: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    INTEL_COMPILER=yes
  cf_save_CFLAGS="$cf_save_CFLAGS -we147"
-@@ -12992,7 +12999,7 @@
+@@ -13286,7 +13393,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  		CFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:12995: result: $INTEL_COMPILER" >&5
-+		echo "$as_me:13002: result: $INTEL_COMPILER" >&5
+-		echo "$as_me:13289: result: $INTEL_COMPILER" >&5
++		echo "$as_me:13396: result: $INTEL_COMPILER" >&5
  echo "${ECHO_T}$INTEL_COMPILER" >&6
  		;;
  	esac
-@@ -13001,12 +13008,12 @@
+@@ -13295,12 +13402,12 @@
  CLANG_COMPILER=no
  
  if test "$GCC" = yes ; then
--	echo "$as_me:13004: checking if this is really Clang C compiler" >&5
-+	echo "$as_me:13011: checking if this is really Clang C compiler" >&5
+-	echo "$as_me:13298: checking if this is really Clang C compiler" >&5
++	echo "$as_me:13405: 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 13009 "configure"
-+#line 13016 "configure"
+-#line 13303 "configure"
++#line 13410 "configure"
  #include "confdefs.h"
  
  int
-@@ -13023,16 +13030,16 @@
+@@ -13317,16 +13424,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13026: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13033: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:13320: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13427: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:13029: \$? = $ac_status" >&5
-+  echo "$as_me:13036: \$? = $ac_status" >&5
+-  echo "$as_me:13323: \$? = $ac_status" >&5
++  echo "$as_me:13430: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13032: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13039: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:13326: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13433: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:13035: \$? = $ac_status" >&5
-+  echo "$as_me:13042: \$? = $ac_status" >&5
+-  echo "$as_me:13329: \$? = $ac_status" >&5
++  echo "$as_me:13436: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    CLANG_COMPILER=yes
  cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
-@@ -13043,12 +13050,12 @@
+@@ -13337,12 +13444,12 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  	CFLAGS="$cf_save_CFLAGS"
--	echo "$as_me:13046: result: $CLANG_COMPILER" >&5
-+	echo "$as_me:13053: result: $CLANG_COMPILER" >&5
+-	echo "$as_me:13340: result: $CLANG_COMPILER" >&5
++	echo "$as_me:13447: result: $CLANG_COMPILER" >&5
  echo "${ECHO_T}$CLANG_COMPILER" >&6
  fi
  
  cat > conftest.$ac_ext <&5
-+	{ echo "$as_me:13075: checking for $CC warning options..." >&5
+-	{ echo "$as_me:13362: checking for $CC warning options..." >&5
++	{ echo "$as_me:13469: checking for $CC warning options..." >&5
  echo "$as_me: checking for $CC warning options..." >&6;}
  	cf_save_CFLAGS="$CFLAGS"
  	EXTRA_CFLAGS="-Wall"
-@@ -13081,12 +13088,12 @@
+@@ -13375,12 +13482,12 @@
  		wd981
  	do
  		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:13084: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13091: \"$ac_compile\"") >&5
+-		if { (eval echo "$as_me:13378: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:13485: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:13087: \$? = $ac_status" >&5
-+  echo "$as_me:13094: \$? = $ac_status" >&5
+-  echo "$as_me:13381: \$? = $ac_status" >&5
++  echo "$as_me:13488: \$? = $ac_status" >&5
    (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13089: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13096: result: ... -$cf_opt" >&5
+-			test -n "$verbose" && echo "$as_me:13383: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:13490: result: ... -$cf_opt" >&5
  echo "${ECHO_T}... -$cf_opt" >&6
  			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
  		fi
-@@ -13095,7 +13102,7 @@
+@@ -13389,7 +13496,7 @@
  
  elif test "$GCC" = yes
  then
--	{ echo "$as_me:13098: checking for $CC warning options..." >&5
-+	{ echo "$as_me:13105: checking for $CC warning options..." >&5
+-	{ echo "$as_me:13392: checking for $CC warning options..." >&5
++	{ echo "$as_me:13499: checking for $CC warning options..." >&5
  echo "$as_me: checking for $CC warning options..." >&6;}
  	cf_save_CFLAGS="$CFLAGS"
  	EXTRA_CFLAGS=
-@@ -13119,12 +13126,12 @@
+@@ -13413,12 +13520,12 @@
  		Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
  	do
  		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:13122: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13129: \"$ac_compile\"") >&5
+-		if { (eval echo "$as_me:13416: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:13523: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:13125: \$? = $ac_status" >&5
-+  echo "$as_me:13132: \$? = $ac_status" >&5
+-  echo "$as_me:13419: \$? = $ac_status" >&5
++  echo "$as_me:13526: \$? = $ac_status" >&5
    (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13127: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13134: result: ... -$cf_opt" >&5
+-			test -n "$verbose" && echo "$as_me:13421: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:13528: result: ... -$cf_opt" >&5
  echo "${ECHO_T}... -$cf_opt" >&6
  			case $cf_opt in
  			(Wcast-qual)
-@@ -13135,7 +13142,7 @@
+@@ -13429,7 +13536,7 @@
  				([34].*)
  					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
  
--echo "${as_me:-configure}:13138: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:13145: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+-echo "${as_me:-configure}:13432: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:13539: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
  
  					continue;;
  				esac
-@@ -13145,7 +13152,7 @@
+@@ -13439,7 +13546,7 @@
  				([12].*)
  					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
  
--echo "${as_me:-configure}:13148: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:13155: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+-echo "${as_me:-configure}:13442: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:13549: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
  
  					continue;;
  				esac
-@@ -13165,12 +13172,12 @@
+@@ -13459,12 +13566,12 @@
  if test "$GCC" = yes ; then
  	case $host_os in
  	(linux*|gnu*)
--		echo "$as_me:13168: checking if this is really Intel C++ compiler" >&5
-+		echo "$as_me:13175: checking if this is really Intel C++ compiler" >&5
+-		echo "$as_me:13462: checking if this is really Intel C++ compiler" >&5
++		echo "$as_me:13569: 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="$CXXFLAGS"
  		CXXFLAGS="$CXXFLAGS -no-gcc"
  		cat >conftest.$ac_ext <<_ACEOF
--#line 13173 "configure"
-+#line 13180 "configure"
+-#line 13467 "configure"
++#line 13574 "configure"
  #include "confdefs.h"
  
  int
-@@ -13187,16 +13194,16 @@
+@@ -13481,16 +13588,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13190: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13197: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:13484: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13591: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:13193: \$? = $ac_status" >&5
-+  echo "$as_me:13200: \$? = $ac_status" >&5
+-  echo "$as_me:13487: \$? = $ac_status" >&5
++  echo "$as_me:13594: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13196: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13203: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:13490: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13597: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:13199: \$? = $ac_status" >&5
-+  echo "$as_me:13206: \$? = $ac_status" >&5
+-  echo "$as_me:13493: \$? = $ac_status" >&5
++  echo "$as_me:13600: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    INTEL_CPLUSPLUS=yes
  cf_save_CFLAGS="$cf_save_CFLAGS -we147"
-@@ -13207,7 +13214,7 @@
+@@ -13501,7 +13608,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  		CXXFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:13210: result: $INTEL_CPLUSPLUS" >&5
-+		echo "$as_me:13217: result: $INTEL_CPLUSPLUS" >&5
+-		echo "$as_me:13504: result: $INTEL_CPLUSPLUS" >&5
++		echo "$as_me:13611: result: $INTEL_CPLUSPLUS" >&5
  echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
  		;;
  	esac
-@@ -13216,12 +13223,12 @@
+@@ -13510,12 +13617,12 @@
  CLANG_CPLUSPLUS=no
  
  if test "$GCC" = yes ; then
--	echo "$as_me:13219: checking if this is really Clang C++ compiler" >&5
-+	echo "$as_me:13226: checking if this is really Clang C++ compiler" >&5
+-	echo "$as_me:13513: checking if this is really Clang C++ compiler" >&5
++	echo "$as_me:13620: 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="$CXXFLAGS"
  	CXXFLAGS="$CXXFLAGS -Qunused-arguments"
  	cat >conftest.$ac_ext <<_ACEOF
--#line 13224 "configure"
-+#line 13231 "configure"
+-#line 13518 "configure"
++#line 13625 "configure"
  #include "confdefs.h"
  
  int
-@@ -13238,16 +13245,16 @@
+@@ -13532,16 +13639,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13241: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13248: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:13535: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13642: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:13244: \$? = $ac_status" >&5
-+  echo "$as_me:13251: \$? = $ac_status" >&5
+-  echo "$as_me:13538: \$? = $ac_status" >&5
++  echo "$as_me:13645: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13247: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13254: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:13541: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13648: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:13250: \$? = $ac_status" >&5
-+  echo "$as_me:13257: \$? = $ac_status" >&5
+-  echo "$as_me:13544: \$? = $ac_status" >&5
++  echo "$as_me:13651: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    CLANG_CPLUSPLUS=yes
  cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
-@@ -13258,7 +13265,7 @@
+@@ -13552,7 +13659,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  	CXXFLAGS="$cf_save_CFLAGS"
--	echo "$as_me:13261: result: $CLANG_CPLUSPLUS" >&5
-+	echo "$as_me:13268: result: $CLANG_CPLUSPLUS" >&5
+-	echo "$as_me:13555: result: $CLANG_CPLUSPLUS" >&5
++	echo "$as_me:13662: result: $CLANG_CPLUSPLUS" >&5
  echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
  fi
  
-@@ -13270,7 +13277,7 @@
+@@ -13564,7 +13671,7 @@
  ac_main_return=return
  
  cat > conftest.$ac_ext <&5
-+	{ echo "$as_me:13298: checking for $CC warning options..." >&5
+-	{ echo "$as_me:13585: checking for $CC warning options..." >&5
++	{ echo "$as_me:13692: checking for $CC warning options..." >&5
  echo "$as_me: checking for $CC warning options..." >&6;}
  	cf_save_CXXFLAGS="$CXXFLAGS"
  	EXTRA_CXXFLAGS="-Wall"
-@@ -13305,12 +13312,12 @@
+@@ -13599,12 +13706,12 @@
  		wd981
  	do
  		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
--		if { (eval echo "$as_me:13308: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13315: \"$ac_compile\"") >&5
+-		if { (eval echo "$as_me:13602: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:13709: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:13311: \$? = $ac_status" >&5
-+  echo "$as_me:13318: \$? = $ac_status" >&5
+-  echo "$as_me:13605: \$? = $ac_status" >&5
++  echo "$as_me:13712: \$? = $ac_status" >&5
    (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13313: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13320: result: ... -$cf_opt" >&5
+-			test -n "$verbose" && echo "$as_me:13607: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:13714: result: ... -$cf_opt" >&5
  echo "${ECHO_T}... -$cf_opt" >&6
  			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
  		fi
-@@ -13319,7 +13326,7 @@
+@@ -13613,7 +13720,7 @@
  
  elif test "$GXX" = yes
  then
--	{ echo "$as_me:13322: checking for $CXX warning options..." >&5
-+	{ echo "$as_me:13329: checking for $CXX warning options..." >&5
+-	{ echo "$as_me:13616: checking for $CXX warning options..." >&5
++	{ echo "$as_me:13723: checking for $CXX warning options..." >&5
  echo "$as_me: checking for $CXX warning options..." >&6;}
  	cf_save_CXXFLAGS="$CXXFLAGS"
  	EXTRA_CXXFLAGS="-W -Wall"
-@@ -13349,16 +13356,16 @@
+@@ -13643,16 +13750,16 @@
  		Wundef $cf_gxx_extra_warnings Wno-unused
  	do
  		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
--		if { (eval echo "$as_me:13352: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13359: \"$ac_compile\"") >&5
+-		if { (eval echo "$as_me:13646: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:13753: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:13355: \$? = $ac_status" >&5
-+  echo "$as_me:13362: \$? = $ac_status" >&5
+-  echo "$as_me:13649: \$? = $ac_status" >&5
++  echo "$as_me:13756: \$? = $ac_status" >&5
    (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13357: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13364: result: ... -$cf_opt" >&5
+-			test -n "$verbose" && echo "$as_me:13651: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:13758: result: ... -$cf_opt" >&5
  echo "${ECHO_T}... -$cf_opt" >&6
  			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
  		else
--			test -n "$verbose" && echo "$as_me:13361: result: ... no -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13368: result: ... no -$cf_opt" >&5
+-			test -n "$verbose" && echo "$as_me:13655: result: ... no -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:13762: result: ... no -$cf_opt" >&5
  echo "${ECHO_T}... no -$cf_opt" >&6
  		fi
  	done
-@@ -13394,10 +13401,10 @@
+@@ -13688,10 +13795,10 @@
  EOF
  if test "$GCC" = yes
  then
--	{ echo "$as_me:13397: checking for $CC __attribute__ directives..." >&5
-+	{ echo "$as_me:13404: checking for $CC __attribute__ directives..." >&5
+-	{ echo "$as_me:13691: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:13798: checking for $CC __attribute__ directives..." >&5
  echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
  cat > conftest.$ac_ext <&5
-+		if { (eval echo "$as_me:13456: \"$ac_compile\"") >&5
+-		if { (eval echo "$as_me:13743: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:13850: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:13452: \$? = $ac_status" >&5
-+  echo "$as_me:13459: \$? = $ac_status" >&5
+-  echo "$as_me:13746: \$? = $ac_status" >&5
++  echo "$as_me:13853: \$? = $ac_status" >&5
    (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13454: result: ... $cf_attribute" >&5
-+			test -n "$verbose" && echo "$as_me:13461: result: ... $cf_attribute" >&5
+-			test -n "$verbose" && echo "$as_me:13748: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:13855: result: ... $cf_attribute" >&5
  echo "${ECHO_T}... $cf_attribute" >&6
  			cat conftest.h >>confdefs.h
  			case $cf_attribute in
-@@ -13510,7 +13517,7 @@
+@@ -13804,7 +13911,7 @@
  rm -rf conftest*
  fi
  
--echo "$as_me:13513: checking if you want to work around bogus compiler/loader warnings" >&5
-+echo "$as_me:13520: checking if you want to work around bogus compiler/loader warnings" >&5
+-echo "$as_me:13807: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:13914: checking if you want to work around bogus compiler/loader warnings" >&5
  echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6
  
  # Check whether --enable-string-hacks or --disable-string-hacks was given.
-@@ -13520,7 +13527,7 @@
+@@ -13814,7 +13921,7 @@
  else
    with_string_hacks=no
  fi;
--echo "$as_me:13523: result: $with_string_hacks" >&5
-+echo "$as_me:13530: result: $with_string_hacks" >&5
+-echo "$as_me:13817: result: $with_string_hacks" >&5
++echo "$as_me:13924: result: $with_string_hacks" >&5
  echo "${ECHO_T}$with_string_hacks" >&6
  
  if test "x$with_string_hacks" = "xyes"; then
-@@ -13529,19 +13536,19 @@
+@@ -13823,15 +13930,15 @@
  #define USE_STRING_HACKS 1
  EOF
  
--	{ echo "$as_me:13532: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
-+	{ echo "$as_me:13539: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+-	{ echo "$as_me:13826: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++	{ echo "$as_me:13933: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
  echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;}
+-	echo "$as_me:13828: checking for strlcat" >&5
++	echo "$as_me:13935: checking for strlcat" >&5
+ echo $ECHO_N "checking for strlcat... $ECHO_C" >&6
+ if test "${ac_cv_func_strlcat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 13834 "configure"
++#line 13941 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char strlcat (); below.  */
+@@ -13862,16 +13969,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13865: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13972: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13868: \$? = $ac_status" >&5
++  echo "$as_me:13975: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13871: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13978: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13874: \$? = $ac_status" >&5
++  echo "$as_me:13981: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_strlcat=yes
+ else
+@@ -13881,7 +13988,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:13884: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:13991: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test $ac_cv_func_strlcat = yes; then
  
- for ac_func in strlcat strlcpy snprintf
+@@ -13891,7 +13998,7 @@
+ 
+ else
+ 
+-		echo "$as_me:13894: checking for strlcat in -lbsd" >&5
++		echo "$as_me:14001: checking for strlcat in -lbsd" >&5
+ echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_strlcat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13899,7 +14006,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13902 "configure"
++#line 14009 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13918,16 +14025,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13921: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14028: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13924: \$? = $ac_status" >&5
++  echo "$as_me:14031: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13927: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14034: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13930: \$? = $ac_status" >&5
++  echo "$as_me:14037: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -13938,7 +14045,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13941: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:14048: result: $ac_cv_lib_bsd_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6
+ if test $ac_cv_lib_bsd_strlcat = yes; then
+ 
+@@ -13961,23 +14068,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:13964: checking for $ac_header" >&5
++echo "$as_me:14071: 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 13970 "configure"
++#line 14077 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:13974: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:14081: \"$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:13980: \$? = $ac_status" >&5
++  echo "$as_me:14087: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -13996,7 +14103,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:13999: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:14106: 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 <&5
-+echo "$as_me:13545: checking for $ac_func" >&5
+-echo "$as_me:14020: checking for $ac_func" >&5
++echo "$as_me:14127: 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 13544 "configure"
-+#line 13551 "configure"
+-#line 14026 "configure"
++#line 14133 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func (); below.  */
-@@ -13572,16 +13579,16 @@
+@@ -14054,16 +14161,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13575: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13582: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:14057: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14164: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:13578: \$? = $ac_status" >&5
-+  echo "$as_me:13585: \$? = $ac_status" >&5
+-  echo "$as_me:14060: \$? = $ac_status" >&5
++  echo "$as_me:14167: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13581: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13588: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:14063: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14170: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:13584: \$? = $ac_status" >&5
-+  echo "$as_me:13591: \$? = $ac_status" >&5
+-  echo "$as_me:14066: \$? = $ac_status" >&5
++  echo "$as_me:14173: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_var=yes"
  else
-@@ -13591,7 +13598,7 @@
+@@ -14073,7 +14180,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:13594: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:13601: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "$as_me:14076: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:14183: 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 <&5
-+echo "$as_me:13614: checking if you want to enable runtime assertions" >&5
+-echo "$as_me:14089: checking if you want to enable runtime assertions" >&5
++echo "$as_me:14196: checking if you want to enable runtime assertions" >&5
  echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
  
  # Check whether --enable-assertions or --disable-assertions was given.
-@@ -13614,7 +13621,7 @@
+@@ -14096,7 +14203,7 @@
  else
    with_assertions=no
  fi;
--echo "$as_me:13617: result: $with_assertions" >&5
-+echo "$as_me:13624: result: $with_assertions" >&5
+-echo "$as_me:14099: result: $with_assertions" >&5
++echo "$as_me:14206: result: $with_assertions" >&5
  echo "${ECHO_T}$with_assertions" >&6
  if test -n "$GCC"
  then
-@@ -13630,7 +13637,7 @@
+@@ -14112,7 +14219,7 @@
  
  ###	use option --disable-leaks to suppress "permanent" leaks, for testing
  
--echo "$as_me:13633: checking if you want to use dmalloc for testing" >&5
-+echo "$as_me:13640: checking if you want to use dmalloc for testing" >&5
+-echo "$as_me:14115: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:14222: 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.
-@@ -13647,7 +13654,7 @@
+@@ -14129,7 +14236,7 @@
  else
    with_dmalloc=
  fi;
--echo "$as_me:13650: result: ${with_dmalloc:-no}" >&5
-+echo "$as_me:13657: result: ${with_dmalloc:-no}" >&5
+-echo "$as_me:14132: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:14239: result: ${with_dmalloc:-no}" >&5
  echo "${ECHO_T}${with_dmalloc:-no}" >&6
  
  case .$with_cflags in
-@@ -13741,23 +13748,23 @@
+@@ -14223,23 +14330,23 @@
  esac
  
  if test "$with_dmalloc" = yes ; then
--	echo "$as_me:13744: checking for dmalloc.h" >&5
-+	echo "$as_me:13751: checking for dmalloc.h" >&5
+-	echo "$as_me:14226: checking for dmalloc.h" >&5
++	echo "$as_me:14333: 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 13750 "configure"
-+#line 13757 "configure"
+-#line 14232 "configure"
++#line 14339 "configure"
  #include "confdefs.h"
  #include 
  _ACEOF
--if { (eval echo "$as_me:13754: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:13761: \"$ac_cpp conftest.$ac_ext\"") >&5
+-if { (eval echo "$as_me:14236: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:14343: \"$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:13760: \$? = $ac_status" >&5
-+  echo "$as_me:13767: \$? = $ac_status" >&5
+-  echo "$as_me:14242: \$? = $ac_status" >&5
++  echo "$as_me:14349: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -13776,11 +13783,11 @@
+@@ -14258,11 +14365,11 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
--echo "$as_me:13779: result: $ac_cv_header_dmalloc_h" >&5
-+echo "$as_me:13786: result: $ac_cv_header_dmalloc_h" >&5
+-echo "$as_me:14261: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:14368: 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:13783: checking for dmalloc_debug in -ldmalloc" >&5
-+echo "$as_me:13790: checking for dmalloc_debug in -ldmalloc" >&5
+-echo "$as_me:14265: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:14372: 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
-@@ -13788,7 +13795,7 @@
+@@ -14270,7 +14377,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldmalloc  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 13791 "configure"
-+#line 13798 "configure"
+-#line 14273 "configure"
++#line 14380 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -13807,16 +13814,16 @@
+@@ -14289,16 +14396,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13810: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13817: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:14292: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14399: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:13813: \$? = $ac_status" >&5
-+  echo "$as_me:13820: \$? = $ac_status" >&5
+-  echo "$as_me:14295: \$? = $ac_status" >&5
++  echo "$as_me:14402: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13816: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13823: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:14298: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14405: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:13819: \$? = $ac_status" >&5
-+  echo "$as_me:13826: \$? = $ac_status" >&5
+-  echo "$as_me:14301: \$? = $ac_status" >&5
++  echo "$as_me:14408: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_dmalloc_dmalloc_debug=yes
  else
-@@ -13827,7 +13834,7 @@
+@@ -14309,7 +14416,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:13830: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
-+echo "$as_me:13837: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+-echo "$as_me:14312: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:14419: 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 <&5
-+echo "$as_me:13852: checking if you want to use dbmalloc for testing" >&5
+-echo "$as_me:14327: checking if you want to use dbmalloc for testing" >&5
++echo "$as_me:14434: 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.
-@@ -13859,7 +13866,7 @@
+@@ -14341,7 +14448,7 @@
  else
    with_dbmalloc=
  fi;
--echo "$as_me:13862: result: ${with_dbmalloc:-no}" >&5
-+echo "$as_me:13869: result: ${with_dbmalloc:-no}" >&5
+-echo "$as_me:14344: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:14451: result: ${with_dbmalloc:-no}" >&5
  echo "${ECHO_T}${with_dbmalloc:-no}" >&6
  
  case .$with_cflags in
-@@ -13953,23 +13960,23 @@
+@@ -14435,23 +14542,23 @@
  esac
  
  if test "$with_dbmalloc" = yes ; then
--	echo "$as_me:13956: checking for dbmalloc.h" >&5
-+	echo "$as_me:13963: checking for dbmalloc.h" >&5
+-	echo "$as_me:14438: checking for dbmalloc.h" >&5
++	echo "$as_me:14545: 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 13962 "configure"
-+#line 13969 "configure"
+-#line 14444 "configure"
++#line 14551 "configure"
  #include "confdefs.h"
  #include 
  _ACEOF
--if { (eval echo "$as_me:13966: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:13973: \"$ac_cpp conftest.$ac_ext\"") >&5
+-if { (eval echo "$as_me:14448: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:14555: \"$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:13972: \$? = $ac_status" >&5
-+  echo "$as_me:13979: \$? = $ac_status" >&5
+-  echo "$as_me:14454: \$? = $ac_status" >&5
++  echo "$as_me:14561: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -13988,11 +13995,11 @@
+@@ -14470,11 +14577,11 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
--echo "$as_me:13991: result: $ac_cv_header_dbmalloc_h" >&5
-+echo "$as_me:13998: result: $ac_cv_header_dbmalloc_h" >&5
+-echo "$as_me:14473: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:14580: 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:13995: checking for debug_malloc in -ldbmalloc" >&5
-+echo "$as_me:14002: checking for debug_malloc in -ldbmalloc" >&5
+-echo "$as_me:14477: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:14584: 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
-@@ -14000,7 +14007,7 @@
+@@ -14482,7 +14589,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldbmalloc  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 14003 "configure"
-+#line 14010 "configure"
+-#line 14485 "configure"
++#line 14592 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14019,16 +14026,16 @@
+@@ -14501,16 +14608,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14022: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14029: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:14504: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14611: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:14025: \$? = $ac_status" >&5
-+  echo "$as_me:14032: \$? = $ac_status" >&5
+-  echo "$as_me:14507: \$? = $ac_status" >&5
++  echo "$as_me:14614: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14028: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14035: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:14510: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14617: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:14031: \$? = $ac_status" >&5
-+  echo "$as_me:14038: \$? = $ac_status" >&5
+-  echo "$as_me:14513: \$? = $ac_status" >&5
++  echo "$as_me:14620: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_dbmalloc_debug_malloc=yes
  else
-@@ -14039,7 +14046,7 @@
+@@ -14521,7 +14628,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:14042: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
-+echo "$as_me:14049: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+-echo "$as_me:14524: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:14631: 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 <&5
-+echo "$as_me:14064: checking if you want to use valgrind for testing" >&5
+-echo "$as_me:14539: checking if you want to use valgrind for testing" >&5
++echo "$as_me:14646: checking if you want to use valgrind for testing" >&5
  echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
  
  # Check whether --with-valgrind or --without-valgrind was given.
-@@ -14071,7 +14078,7 @@
+@@ -14553,7 +14660,7 @@
  else
    with_valgrind=
  fi;
--echo "$as_me:14074: result: ${with_valgrind:-no}" >&5
-+echo "$as_me:14081: result: ${with_valgrind:-no}" >&5
+-echo "$as_me:14556: result: ${with_valgrind:-no}" >&5
++echo "$as_me:14663: result: ${with_valgrind:-no}" >&5
  echo "${ECHO_T}${with_valgrind:-no}" >&6
  
  case .$with_cflags in
-@@ -14164,7 +14171,7 @@
+@@ -14646,7 +14753,7 @@
  	;;
  esac
  
--echo "$as_me:14167: checking if you want to perform memory-leak testing" >&5
-+echo "$as_me:14174: checking if you want to perform memory-leak testing" >&5
+-echo "$as_me:14649: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:14756: checking if you want to perform memory-leak testing" >&5
  echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
  
  # Check whether --enable-leaks or --disable-leaks was given.
-@@ -14174,7 +14181,7 @@
+@@ -14656,7 +14763,7 @@
  else
    : ${with_no_leaks:=no}
  fi;
--echo "$as_me:14177: result: $with_no_leaks" >&5
-+echo "$as_me:14184: result: $with_no_leaks" >&5
+-echo "$as_me:14659: result: $with_no_leaks" >&5
++echo "$as_me:14766: result: $with_no_leaks" >&5
  echo "${ECHO_T}$with_no_leaks" >&6
  
  if test "$with_no_leaks" = yes ; then
-@@ -14226,7 +14233,7 @@
+@@ -14708,7 +14815,7 @@
  	;;
  esac
  
--echo "$as_me:14229: checking whether to add trace feature to all models" >&5
-+echo "$as_me:14236: checking whether to add trace feature to all models" >&5
+-echo "$as_me:14711: checking whether to add trace feature to all models" >&5
++echo "$as_me:14818: checking whether to add trace feature to all models" >&5
  echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
  
  # Check whether --with-trace or --without-trace was given.
-@@ -14236,7 +14243,7 @@
+@@ -14718,7 +14825,7 @@
  else
    cf_with_trace=$cf_all_traces
  fi;
--echo "$as_me:14239: result: $cf_with_trace" >&5
-+echo "$as_me:14246: result: $cf_with_trace" >&5
+-echo "$as_me:14721: result: $cf_with_trace" >&5
++echo "$as_me:14828: result: $cf_with_trace" >&5
  echo "${ECHO_T}$cf_with_trace" >&6
  
  if test "x$cf_with_trace" = xyes ; then
-@@ -14326,7 +14333,7 @@
+@@ -14808,7 +14915,7 @@
  	ADA_TRACE=FALSE
  fi
  
--echo "$as_me:14329: checking if we want to use GNAT projects" >&5
-+echo "$as_me:14336: checking if we want to use GNAT projects" >&5
+-echo "$as_me:14811: checking if we want to use GNAT projects" >&5
++echo "$as_me:14918: checking if we want to use GNAT projects" >&5
  echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6
  
  # Check whether --enable-gnat-projects or --disable-gnat-projects was given.
-@@ -14343,7 +14350,7 @@
+@@ -14825,7 +14932,7 @@
  	enable_gnat_projects=yes
  
  fi;
--echo "$as_me:14346: result: $enable_gnat_projects" >&5
-+echo "$as_me:14353: result: $enable_gnat_projects" >&5
+-echo "$as_me:14828: result: $enable_gnat_projects" >&5
++echo "$as_me:14935: result: $enable_gnat_projects" >&5
  echo "${ECHO_T}$enable_gnat_projects" >&6
  
  ###	Checks for libraries.
-@@ -14353,13 +14360,13 @@
+@@ -14835,13 +14942,13 @@
  	LIBS=" -lpsapi $LIBS"
  	;;
  (*)
--echo "$as_me:14356: checking for gettimeofday" >&5
-+echo "$as_me:14363: checking for gettimeofday" >&5
+-echo "$as_me:14838: checking for gettimeofday" >&5
++echo "$as_me:14945: checking for gettimeofday" >&5
  echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
  if test "${ac_cv_func_gettimeofday+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 14362 "configure"
-+#line 14369 "configure"
+-#line 14844 "configure"
++#line 14951 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char gettimeofday (); below.  */
-@@ -14390,16 +14397,16 @@
+@@ -14872,16 +14979,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14393: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14400: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:14875: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14982: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:14396: \$? = $ac_status" >&5
-+  echo "$as_me:14403: \$? = $ac_status" >&5
+-  echo "$as_me:14878: \$? = $ac_status" >&5
++  echo "$as_me:14985: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14399: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14406: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:14881: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14988: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:14402: \$? = $ac_status" >&5
-+  echo "$as_me:14409: \$? = $ac_status" >&5
+-  echo "$as_me:14884: \$? = $ac_status" >&5
++  echo "$as_me:14991: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_gettimeofday=yes
  else
-@@ -14409,7 +14416,7 @@
+@@ -14891,7 +14998,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:14412: result: $ac_cv_func_gettimeofday" >&5
-+echo "$as_me:14419: result: $ac_cv_func_gettimeofday" >&5
+-echo "$as_me:14894: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:15001: result: $ac_cv_func_gettimeofday" >&5
  echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
  if test $ac_cv_func_gettimeofday = yes; then
  
-@@ -14419,7 +14426,7 @@
+@@ -14901,7 +15008,7 @@
  
  else
  
--echo "$as_me:14422: checking for gettimeofday in -lbsd" >&5
-+echo "$as_me:14429: checking for gettimeofday in -lbsd" >&5
+-echo "$as_me:14904: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:15011: checking for gettimeofday in -lbsd" >&5
  echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
  if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14427,7 +14434,7 @@
+@@ -14909,7 +15016,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lbsd  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 14430 "configure"
-+#line 14437 "configure"
+-#line 14912 "configure"
++#line 15019 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14446,16 +14453,16 @@
+@@ -14928,16 +15035,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14449: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14456: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:14931: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15038: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:14452: \$? = $ac_status" >&5
-+  echo "$as_me:14459: \$? = $ac_status" >&5
+-  echo "$as_me:14934: \$? = $ac_status" >&5
++  echo "$as_me:15041: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14455: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14462: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:14937: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15044: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:14458: \$? = $ac_status" >&5
-+  echo "$as_me:14465: \$? = $ac_status" >&5
+-  echo "$as_me:14940: \$? = $ac_status" >&5
++  echo "$as_me:15047: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_bsd_gettimeofday=yes
  else
-@@ -14466,7 +14473,7 @@
+@@ -14948,7 +15055,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:14469: result: $ac_cv_lib_bsd_gettimeofday" >&5
-+echo "$as_me:14476: result: $ac_cv_lib_bsd_gettimeofday" >&5
+-echo "$as_me:14951: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:15058: result: $ac_cv_lib_bsd_gettimeofday" >&5
  echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
  if test $ac_cv_lib_bsd_gettimeofday = yes; then
  
-@@ -14496,14 +14503,14 @@
+@@ -14978,17 +15085,18 @@
  	;;
  esac
  
--echo "$as_me:14499: checking if -lm needed for math functions" >&5
-+echo "$as_me:14506: checking if -lm needed for math functions" >&5
+-echo "$as_me:14981: checking if -lm needed for math functions" >&5
++echo "$as_me:15088: 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 14506 "configure"
-+#line 14513 "configure"
+-#line 14988 "configure"
++#line 15095 "configure"
  #include "confdefs.h"
  
  	#include 
-@@ -14518,16 +14525,16 @@
++	#include 
+ 	#include 
+ 
+ int
+@@ -15000,16 +15108,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14521: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14528: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:15003: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15111: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:14524: \$? = $ac_status" >&5
-+  echo "$as_me:14531: \$? = $ac_status" >&5
+-  echo "$as_me:15006: \$? = $ac_status" >&5
++  echo "$as_me:15114: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14527: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14534: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:15009: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15117: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:14530: \$? = $ac_status" >&5
-+  echo "$as_me:14537: \$? = $ac_status" >&5
+-  echo "$as_me:15012: \$? = $ac_status" >&5
++  echo "$as_me:15120: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_need_libm=no
  else
-@@ -14537,7 +14544,7 @@
+@@ -15019,7 +15127,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:14540: result: $cf_cv_need_libm" >&5
-+echo "$as_me:14547: result: $cf_cv_need_libm" >&5
+-echo "$as_me:15022: result: $cf_cv_need_libm" >&5
++echo "$as_me:15130: result: $cf_cv_need_libm" >&5
  echo "${ECHO_T}$cf_cv_need_libm" >&6
  if test "$cf_cv_need_libm" = yes
  then
-@@ -14545,13 +14552,13 @@
+@@ -15027,13 +15135,13 @@
  fi
  
  ###	Checks for header files.
--echo "$as_me:14548: checking for ANSI C header files" >&5
-+echo "$as_me:14555: checking for ANSI C header files" >&5
+-echo "$as_me:15030: checking for ANSI C header files" >&5
++echo "$as_me:15138: 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 14554 "configure"
-+#line 14561 "configure"
+-#line 15036 "configure"
++#line 15144 "configure"
  #include "confdefs.h"
  #include 
  #include 
-@@ -14559,13 +14566,13 @@
+@@ -15041,13 +15149,13 @@
  #include 
  
  _ACEOF
--if { (eval echo "$as_me:14562: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:14569: \"$ac_cpp conftest.$ac_ext\"") >&5
+-if { (eval echo "$as_me:15044: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:15152: \"$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:14568: \$? = $ac_status" >&5
-+  echo "$as_me:14575: \$? = $ac_status" >&5
+-  echo "$as_me:15050: \$? = $ac_status" >&5
++  echo "$as_me:15158: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -14587,7 +14594,7 @@
+@@ -15069,7 +15177,7 @@
  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 14590 "configure"
-+#line 14597 "configure"
+-#line 15072 "configure"
++#line 15180 "configure"
  #include "confdefs.h"
  #include 
  
-@@ -14605,7 +14612,7 @@
+@@ -15087,7 +15195,7 @@
  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 14608 "configure"
-+#line 14615 "configure"
+-#line 15090 "configure"
++#line 15198 "configure"
  #include "confdefs.h"
  #include 
  
-@@ -14626,7 +14633,7 @@
+@@ -15108,7 +15216,7 @@
    :
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 14629 "configure"
-+#line 14636 "configure"
+-#line 15111 "configure"
++#line 15219 "configure"
  #include "confdefs.h"
  #include 
  #if ((' ' & 0x0FF) == 0x020)
-@@ -14652,15 +14659,15 @@
+@@ -15134,15 +15242,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
--if { (eval echo "$as_me:14655: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14662: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:15137: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15245: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:14658: \$? = $ac_status" >&5
-+  echo "$as_me:14665: \$? = $ac_status" >&5
+-  echo "$as_me:15140: \$? = $ac_status" >&5
++  echo "$as_me:15248: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:14660: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14667: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:15142: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15250: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:14663: \$? = $ac_status" >&5
-+  echo "$as_me:14670: \$? = $ac_status" >&5
+-  echo "$as_me:15145: \$? = $ac_status" >&5
++  echo "$as_me:15253: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -14673,7 +14680,7 @@
+@@ -15155,7 +15263,7 @@
  fi
  fi
  fi
--echo "$as_me:14676: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:14683: result: $ac_cv_header_stdc" >&5
+-echo "$as_me:15158: result: $ac_cv_header_stdc" >&5
++echo "$as_me:15266: result: $ac_cv_header_stdc" >&5
  echo "${ECHO_T}$ac_cv_header_stdc" >&6
  if test $ac_cv_header_stdc = yes; then
  
-@@ -14686,13 +14693,13 @@
+@@ -15168,13 +15276,13 @@
  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:14689: checking for $ac_hdr that defines DIR" >&5
-+echo "$as_me:14696: checking for $ac_hdr that defines DIR" >&5
+-echo "$as_me:15171: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:15279: 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 14695 "configure"
-+#line 14702 "configure"
+-#line 15177 "configure"
++#line 15285 "configure"
  #include "confdefs.h"
  #include 
  #include <$ac_hdr>
-@@ -14707,16 +14714,16 @@
+@@ -15189,16 +15297,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14710: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14717: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:15192: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15300: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:14713: \$? = $ac_status" >&5
-+  echo "$as_me:14720: \$? = $ac_status" >&5
+-  echo "$as_me:15195: \$? = $ac_status" >&5
++  echo "$as_me:15303: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14716: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14723: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:15198: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15306: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:14719: \$? = $ac_status" >&5
-+  echo "$as_me:14726: \$? = $ac_status" >&5
+-  echo "$as_me:15201: \$? = $ac_status" >&5
++  echo "$as_me:15309: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_Header=yes"
  else
-@@ -14726,7 +14733,7 @@
+@@ -15208,7 +15316,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
--echo "$as_me:14729: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:14736: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "$as_me:15211: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:15319: 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 <&5
-+  echo "$as_me:14749: checking for opendir in -ldir" >&5
+-  echo "$as_me:15224: checking for opendir in -ldir" >&5
++  echo "$as_me:15332: 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
-@@ -14747,7 +14754,7 @@
+@@ -15229,7 +15337,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldir  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 14750 "configure"
-+#line 14757 "configure"
+-#line 15232 "configure"
++#line 15340 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14766,16 +14773,16 @@
+@@ -15248,16 +15356,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14769: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14776: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:15251: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15359: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:14772: \$? = $ac_status" >&5
-+  echo "$as_me:14779: \$? = $ac_status" >&5
+-  echo "$as_me:15254: \$? = $ac_status" >&5
++  echo "$as_me:15362: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14775: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14782: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:15257: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15365: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:14778: \$? = $ac_status" >&5
-+  echo "$as_me:14785: \$? = $ac_status" >&5
+-  echo "$as_me:15260: \$? = $ac_status" >&5
++  echo "$as_me:15368: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_dir_opendir=yes
  else
-@@ -14786,14 +14793,14 @@
+@@ -15268,14 +15376,14 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:14789: result: $ac_cv_lib_dir_opendir" >&5
-+echo "$as_me:14796: result: $ac_cv_lib_dir_opendir" >&5
+-echo "$as_me:15271: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:15379: 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:14796: checking for opendir in -lx" >&5
-+  echo "$as_me:14803: checking for opendir in -lx" >&5
+-  echo "$as_me:15278: checking for opendir in -lx" >&5
++  echo "$as_me:15386: 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
-@@ -14801,7 +14808,7 @@
+@@ -15283,7 +15391,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lx  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 14804 "configure"
-+#line 14811 "configure"
+-#line 15286 "configure"
++#line 15394 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14820,16 +14827,16 @@
+@@ -15302,16 +15410,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14823: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14830: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:15305: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15413: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:14826: \$? = $ac_status" >&5
-+  echo "$as_me:14833: \$? = $ac_status" >&5
+-  echo "$as_me:15308: \$? = $ac_status" >&5
++  echo "$as_me:15416: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14829: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14836: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:15311: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15419: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:14832: \$? = $ac_status" >&5
-+  echo "$as_me:14839: \$? = $ac_status" >&5
+-  echo "$as_me:15314: \$? = $ac_status" >&5
++  echo "$as_me:15422: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_x_opendir=yes
  else
-@@ -14840,7 +14847,7 @@
+@@ -15322,7 +15430,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:14843: result: $ac_cv_lib_x_opendir" >&5
-+echo "$as_me:14850: result: $ac_cv_lib_x_opendir" >&5
+-echo "$as_me:15325: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:15433: 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"
-@@ -14848,13 +14855,13 @@
+@@ -15330,13 +15438,13 @@
  
  fi
  
--echo "$as_me:14851: checking whether time.h and sys/time.h may both be included" >&5
-+echo "$as_me:14858: checking whether time.h and sys/time.h may both be included" >&5
+-echo "$as_me:15333: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:15441: 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 14857 "configure"
-+#line 14864 "configure"
+-#line 15339 "configure"
++#line 15447 "configure"
  #include "confdefs.h"
  #include 
  #include 
-@@ -14870,16 +14877,16 @@
+@@ -15352,16 +15460,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14873: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14880: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:15355: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15463: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:14876: \$? = $ac_status" >&5
-+  echo "$as_me:14883: \$? = $ac_status" >&5
+-  echo "$as_me:15358: \$? = $ac_status" >&5
++  echo "$as_me:15466: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14879: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14886: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:15361: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15469: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:14882: \$? = $ac_status" >&5
-+  echo "$as_me:14889: \$? = $ac_status" >&5
+-  echo "$as_me:15364: \$? = $ac_status" >&5
++  echo "$as_me:15472: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_header_time=yes
  else
-@@ -14889,7 +14896,7 @@
+@@ -15371,7 +15479,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
--echo "$as_me:14892: result: $ac_cv_header_time" >&5
-+echo "$as_me:14899: result: $ac_cv_header_time" >&5
+-echo "$as_me:15374: result: $ac_cv_header_time" >&5
++echo "$as_me:15482: result: $ac_cv_header_time" >&5
  echo "${ECHO_T}$ac_cv_header_time" >&6
  if test $ac_cv_header_time = yes; then
  
-@@ -14908,13 +14915,13 @@
+@@ -15390,13 +15498,13 @@
  	;;
  esac
  
--echo "$as_me:14911: checking for regcomp" >&5
-+echo "$as_me:14918: checking for regcomp" >&5
+-echo "$as_me:15393: checking for regcomp" >&5
++echo "$as_me:15501: checking for regcomp" >&5
  echo $ECHO_N "checking for regcomp... $ECHO_C" >&6
  if test "${ac_cv_func_regcomp+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 14917 "configure"
-+#line 14924 "configure"
+-#line 15399 "configure"
++#line 15507 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char regcomp (); below.  */
-@@ -14945,16 +14952,16 @@
+@@ -15427,16 +15535,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14948: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14955: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:15430: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15538: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:14951: \$? = $ac_status" >&5
-+  echo "$as_me:14958: \$? = $ac_status" >&5
+-  echo "$as_me:15433: \$? = $ac_status" >&5
++  echo "$as_me:15541: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14954: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14961: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:15436: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15544: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:14957: \$? = $ac_status" >&5
-+  echo "$as_me:14964: \$? = $ac_status" >&5
+-  echo "$as_me:15439: \$? = $ac_status" >&5
++  echo "$as_me:15547: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_regcomp=yes
  else
-@@ -14964,7 +14971,7 @@
+@@ -15446,7 +15554,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:14967: result: $ac_cv_func_regcomp" >&5
-+echo "$as_me:14974: result: $ac_cv_func_regcomp" >&5
+-echo "$as_me:15449: result: $ac_cv_func_regcomp" >&5
++echo "$as_me:15557: result: $ac_cv_func_regcomp" >&5
  echo "${ECHO_T}$ac_cv_func_regcomp" >&6
  if test $ac_cv_func_regcomp = yes; then
    cf_regex_func=regcomp
-@@ -14973,7 +14980,7 @@
+@@ -15455,7 +15563,7 @@
  	for cf_regex_lib in $cf_regex_libs
  	do
  		as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh`
--echo "$as_me:14976: checking for regcomp in -l$cf_regex_lib" >&5
-+echo "$as_me:14983: checking for regcomp in -l$cf_regex_lib" >&5
+-echo "$as_me:15458: checking for regcomp in -l$cf_regex_lib" >&5
++echo "$as_me:15566: checking for regcomp in -l$cf_regex_lib" >&5
  echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6
  if eval "test \"\${$as_ac_Lib+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14981,7 +14988,7 @@
+@@ -15463,7 +15571,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-l$cf_regex_lib  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 14984 "configure"
-+#line 14991 "configure"
+-#line 15466 "configure"
++#line 15574 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -15000,16 +15007,16 @@
+@@ -15482,16 +15590,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15003: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15010: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:15485: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15593: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:15006: \$? = $ac_status" >&5
-+  echo "$as_me:15013: \$? = $ac_status" >&5
+-  echo "$as_me:15488: \$? = $ac_status" >&5
++  echo "$as_me:15596: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15009: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15016: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:15491: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15599: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:15012: \$? = $ac_status" >&5
-+  echo "$as_me:15019: \$? = $ac_status" >&5
+-  echo "$as_me:15494: \$? = $ac_status" >&5
++  echo "$as_me:15602: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_Lib=yes"
  else
-@@ -15020,7 +15027,7 @@
+@@ -15502,7 +15610,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:15023: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-+echo "$as_me:15030: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+-echo "$as_me:15505: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:15613: 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
  
-@@ -15049,13 +15056,13 @@
+@@ -15531,13 +15639,13 @@
  fi
  
  if test "$cf_regex_func" = no ; then
--	echo "$as_me:15052: checking for compile" >&5
-+	echo "$as_me:15059: checking for compile" >&5
+-	echo "$as_me:15534: checking for compile" >&5
++	echo "$as_me:15642: checking for compile" >&5
  echo $ECHO_N "checking for compile... $ECHO_C" >&6
  if test "${ac_cv_func_compile+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 15058 "configure"
-+#line 15065 "configure"
+-#line 15540 "configure"
++#line 15648 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char compile (); below.  */
-@@ -15086,16 +15093,16 @@
+@@ -15568,16 +15676,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15089: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15096: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:15571: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15679: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:15092: \$? = $ac_status" >&5
-+  echo "$as_me:15099: \$? = $ac_status" >&5
+-  echo "$as_me:15574: \$? = $ac_status" >&5
++  echo "$as_me:15682: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15095: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15102: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:15577: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15685: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:15098: \$? = $ac_status" >&5
-+  echo "$as_me:15105: \$? = $ac_status" >&5
+-  echo "$as_me:15580: \$? = $ac_status" >&5
++  echo "$as_me:15688: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_compile=yes
  else
-@@ -15105,13 +15112,13 @@
+@@ -15587,13 +15695,13 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:15108: result: $ac_cv_func_compile" >&5
-+echo "$as_me:15115: result: $ac_cv_func_compile" >&5
+-echo "$as_me:15590: result: $ac_cv_func_compile" >&5
++echo "$as_me:15698: result: $ac_cv_func_compile" >&5
  echo "${ECHO_T}$ac_cv_func_compile" >&6
  if test $ac_cv_func_compile = yes; then
    cf_regex_func=compile
  else
  
--		echo "$as_me:15114: checking for compile in -lgen" >&5
-+		echo "$as_me:15121: checking for compile in -lgen" >&5
+-		echo "$as_me:15596: checking for compile in -lgen" >&5
++		echo "$as_me:15704: checking for compile in -lgen" >&5
  echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6
  if test "${ac_cv_lib_gen_compile+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15119,7 +15126,7 @@
+@@ -15601,7 +15709,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lgen  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 15122 "configure"
-+#line 15129 "configure"
+-#line 15604 "configure"
++#line 15712 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -15138,16 +15145,16 @@
+@@ -15620,16 +15728,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15141: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15148: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:15623: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15731: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:15144: \$? = $ac_status" >&5
-+  echo "$as_me:15151: \$? = $ac_status" >&5
+-  echo "$as_me:15626: \$? = $ac_status" >&5
++  echo "$as_me:15734: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15147: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15154: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:15629: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15737: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:15150: \$? = $ac_status" >&5
-+  echo "$as_me:15157: \$? = $ac_status" >&5
+-  echo "$as_me:15632: \$? = $ac_status" >&5
++  echo "$as_me:15740: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_gen_compile=yes
  else
-@@ -15158,7 +15165,7 @@
+@@ -15640,7 +15748,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:15161: result: $ac_cv_lib_gen_compile" >&5
-+echo "$as_me:15168: result: $ac_cv_lib_gen_compile" >&5
+-echo "$as_me:15643: result: $ac_cv_lib_gen_compile" >&5
++echo "$as_me:15751: result: $ac_cv_lib_gen_compile" >&5
  echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6
  if test $ac_cv_lib_gen_compile = yes; then
  
-@@ -15186,11 +15193,11 @@
+@@ -15668,11 +15776,11 @@
  fi
  
  if test "$cf_regex_func" = no ; then
--	{ echo "$as_me:15189: WARNING: cannot find regular expression library" >&5
-+	{ echo "$as_me:15196: WARNING: cannot find regular expression library" >&5
+-	{ echo "$as_me:15671: WARNING: cannot find regular expression library" >&5
++	{ echo "$as_me:15779: WARNING: cannot find regular expression library" >&5
  echo "$as_me: WARNING: cannot find regular expression library" >&2;}
  fi
  
--echo "$as_me:15193: checking for regular-expression headers" >&5
-+echo "$as_me:15200: checking for regular-expression headers" >&5
+-echo "$as_me:15675: checking for regular-expression headers" >&5
++echo "$as_me:15783: checking for regular-expression headers" >&5
  echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
  if test "${cf_cv_regex_hdrs+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15202,7 +15209,7 @@
+@@ -15684,7 +15792,7 @@
  	for cf_regex_hdr in regexp.h regexpr.h
  	do
  		cat >conftest.$ac_ext <<_ACEOF
--#line 15205 "configure"
-+#line 15212 "configure"
+-#line 15687 "configure"
++#line 15795 "configure"
  #include "confdefs.h"
  #include <$cf_regex_hdr>
  int
-@@ -15217,16 +15224,16 @@
+@@ -15699,16 +15807,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15220: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15227: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:15702: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15810: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:15223: \$? = $ac_status" >&5
-+  echo "$as_me:15230: \$? = $ac_status" >&5
+-  echo "$as_me:15705: \$? = $ac_status" >&5
++  echo "$as_me:15813: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15226: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15233: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:15708: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15816: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:15229: \$? = $ac_status" >&5
-+  echo "$as_me:15236: \$? = $ac_status" >&5
+-  echo "$as_me:15711: \$? = $ac_status" >&5
++  echo "$as_me:15819: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
  			cf_cv_regex_hdrs=$cf_regex_hdr
-@@ -15243,7 +15250,7 @@
+@@ -15725,7 +15833,7 @@
  	for cf_regex_hdr in regex.h
  	do
  		cat >conftest.$ac_ext <<_ACEOF
--#line 15246 "configure"
-+#line 15253 "configure"
+-#line 15728 "configure"
++#line 15836 "configure"
  #include "confdefs.h"
  #include 
  #include <$cf_regex_hdr>
-@@ -15261,16 +15268,16 @@
+@@ -15743,16 +15851,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15264: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15271: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:15746: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15854: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:15267: \$? = $ac_status" >&5
-+  echo "$as_me:15274: \$? = $ac_status" >&5
+-  echo "$as_me:15749: \$? = $ac_status" >&5
++  echo "$as_me:15857: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15270: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15277: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:15752: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15860: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:15273: \$? = $ac_status" >&5
-+  echo "$as_me:15280: \$? = $ac_status" >&5
+-  echo "$as_me:15755: \$? = $ac_status" >&5
++  echo "$as_me:15863: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
  			cf_cv_regex_hdrs=$cf_regex_hdr
-@@ -15286,11 +15293,11 @@
+@@ -15768,11 +15876,11 @@
  esac
  
  fi
--echo "$as_me:15289: result: $cf_cv_regex_hdrs" >&5
-+echo "$as_me:15296: result: $cf_cv_regex_hdrs" >&5
+-echo "$as_me:15771: result: $cf_cv_regex_hdrs" >&5
++echo "$as_me:15879: result: $cf_cv_regex_hdrs" >&5
  echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
  
  case $cf_cv_regex_hdrs in
--	(no)		{ echo "$as_me:15293: WARNING: no regular expression header found" >&5
-+	(no)		{ echo "$as_me:15300: WARNING: no regular expression header found" >&5
+-	(no)		{ echo "$as_me:15775: WARNING: no regular expression header found" >&5
++	(no)		{ echo "$as_me:15883: WARNING: no regular expression header found" >&5
  echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
  	(regex.h)
  cat >>confdefs.h <<\EOF
-@@ -15329,23 +15336,23 @@
+@@ -15811,23 +15919,23 @@
  
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:15332: checking for $ac_header" >&5
-+echo "$as_me:15339: checking for $ac_header" >&5
+-echo "$as_me:15814: checking for $ac_header" >&5
++echo "$as_me:15922: 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 15338 "configure"
-+#line 15345 "configure"
+-#line 15820 "configure"
++#line 15928 "configure"
  #include "confdefs.h"
  #include <$ac_header>
  _ACEOF
--if { (eval echo "$as_me:15342: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:15349: \"$ac_cpp conftest.$ac_ext\"") >&5
+-if { (eval echo "$as_me:15824: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:15932: \"$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:15348: \$? = $ac_status" >&5
-+  echo "$as_me:15355: \$? = $ac_status" >&5
+-  echo "$as_me:15830: \$? = $ac_status" >&5
++  echo "$as_me:15938: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -15364,7 +15371,7 @@
+@@ -15846,7 +15954,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
--echo "$as_me:15367: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:15374: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "$as_me:15849: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:15957: 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 <&5
-+echo "$as_me:15387: checking for $ac_header" >&5
+-echo "$as_me:15862: checking for $ac_header" >&5
++echo "$as_me:15970: 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 15386 "configure"
-+#line 15393 "configure"
+-#line 15868 "configure"
++#line 15976 "configure"
  #include "confdefs.h"
  #include <$ac_header>
  _ACEOF
--if { (eval echo "$as_me:15390: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:15397: \"$ac_cpp conftest.$ac_ext\"") >&5
+-if { (eval echo "$as_me:15872: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:15980: \"$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:15396: \$? = $ac_status" >&5
-+  echo "$as_me:15403: \$? = $ac_status" >&5
+-  echo "$as_me:15878: \$? = $ac_status" >&5
++  echo "$as_me:15986: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -15412,7 +15419,7 @@
+@@ -15894,7 +16002,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
--echo "$as_me:15415: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:15422: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "$as_me:15897: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:16005: 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 <&5
-+echo "$as_me:15432: checking for header declaring getopt variables" >&5
+-echo "$as_me:15907: checking for header declaring getopt variables" >&5
++echo "$as_me:16015: checking for header declaring getopt variables" >&5
  echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6
  if test "${cf_cv_getopt_header+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15432,7 +15439,7 @@
+@@ -15914,7 +16022,7 @@
  for cf_header in stdio.h stdlib.h unistd.h getopt.h
  do
  cat >conftest.$ac_ext <<_ACEOF
--#line 15435 "configure"
-+#line 15442 "configure"
+-#line 15917 "configure"
++#line 16025 "configure"
  #include "confdefs.h"
  
  #include <$cf_header>
-@@ -15445,16 +15452,16 @@
+@@ -15927,16 +16035,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15448: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15455: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:15930: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16038: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:15451: \$? = $ac_status" >&5
-+  echo "$as_me:15458: \$? = $ac_status" >&5
+-  echo "$as_me:15933: \$? = $ac_status" >&5
++  echo "$as_me:16041: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15454: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15461: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:15936: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16044: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:15457: \$? = $ac_status" >&5
-+  echo "$as_me:15464: \$? = $ac_status" >&5
+-  echo "$as_me:15939: \$? = $ac_status" >&5
++  echo "$as_me:16047: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_getopt_header=$cf_header
   break
-@@ -15466,7 +15473,7 @@
+@@ -15948,7 +16056,7 @@
  done
  
  fi
--echo "$as_me:15469: result: $cf_cv_getopt_header" >&5
-+echo "$as_me:15476: result: $cf_cv_getopt_header" >&5
+-echo "$as_me:15951: result: $cf_cv_getopt_header" >&5
++echo "$as_me:16059: result: $cf_cv_getopt_header" >&5
  echo "${ECHO_T}$cf_cv_getopt_header" >&6
  if test $cf_cv_getopt_header != none ; then
  
-@@ -15487,7 +15494,7 @@
+@@ -15969,7 +16077,7 @@
  # Note: even non-Posix ISC needs  to declare fd_set
  if test "x$ISC" = xyes ; then
  
--echo "$as_me:15490: checking for main in -lcposix" >&5
-+echo "$as_me:15497: checking for main in -lcposix" >&5
+-echo "$as_me:15972: checking for main in -lcposix" >&5
++echo "$as_me:16080: checking for main in -lcposix" >&5
  echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6
  if test "${ac_cv_lib_cposix_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15495,7 +15502,7 @@
+@@ -15977,7 +16085,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lcposix  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 15498 "configure"
-+#line 15505 "configure"
+-#line 15980 "configure"
++#line 16088 "configure"
  #include "confdefs.h"
  
  int
-@@ -15507,16 +15514,16 @@
+@@ -15989,16 +16097,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15510: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15517: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:15992: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16100: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:15513: \$? = $ac_status" >&5
-+  echo "$as_me:15520: \$? = $ac_status" >&5
+-  echo "$as_me:15995: \$? = $ac_status" >&5
++  echo "$as_me:16103: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15516: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15523: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:15998: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16106: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:15519: \$? = $ac_status" >&5
-+  echo "$as_me:15526: \$? = $ac_status" >&5
+-  echo "$as_me:16001: \$? = $ac_status" >&5
++  echo "$as_me:16109: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_cposix_main=yes
  else
-@@ -15527,7 +15534,7 @@
+@@ -16009,7 +16117,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:15530: result: $ac_cv_lib_cposix_main" >&5
-+echo "$as_me:15537: result: $ac_cv_lib_cposix_main" >&5
+-echo "$as_me:16012: result: $ac_cv_lib_cposix_main" >&5
++echo "$as_me:16120: result: $ac_cv_lib_cposix_main" >&5
  echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6
  if test $ac_cv_lib_cposix_main = yes; then
    cat >>confdefs.h <&5
-+	echo "$as_me:15548: checking for bzero in -linet" >&5
+-	echo "$as_me:16023: checking for bzero in -linet" >&5
++	echo "$as_me:16131: checking for bzero in -linet" >&5
  echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6
  if test "${ac_cv_lib_inet_bzero+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15546,7 +15553,7 @@
+@@ -16028,7 +16136,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-linet  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 15549 "configure"
-+#line 15556 "configure"
+-#line 16031 "configure"
++#line 16139 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -15565,16 +15572,16 @@
+@@ -16047,16 +16155,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15568: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15575: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:16050: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16158: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:15571: \$? = $ac_status" >&5
-+  echo "$as_me:15578: \$? = $ac_status" >&5
+-  echo "$as_me:16053: \$? = $ac_status" >&5
++  echo "$as_me:16161: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15574: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15581: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:16056: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16164: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:15577: \$? = $ac_status" >&5
-+  echo "$as_me:15584: \$? = $ac_status" >&5
+-  echo "$as_me:16059: \$? = $ac_status" >&5
++  echo "$as_me:16167: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_inet_bzero=yes
  else
-@@ -15585,7 +15592,7 @@
+@@ -16067,7 +16175,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:15588: result: $ac_cv_lib_inet_bzero" >&5
-+echo "$as_me:15595: result: $ac_cv_lib_inet_bzero" >&5
+-echo "$as_me:16070: result: $ac_cv_lib_inet_bzero" >&5
++echo "$as_me:16178: result: $ac_cv_lib_inet_bzero" >&5
  echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6
  if test $ac_cv_lib_inet_bzero = yes; then
  
-@@ -15608,14 +15615,14 @@
+@@ -16090,14 +16198,14 @@
  fi
  fi
  
--echo "$as_me:15611: checking if sys/time.h works with sys/select.h" >&5
-+echo "$as_me:15618: checking if sys/time.h works with sys/select.h" >&5
+-echo "$as_me:16093: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:16201: checking if sys/time.h works with sys/select.h" >&5
  echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
  if test "${cf_cv_sys_time_select+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
  cat >conftest.$ac_ext <<_ACEOF
--#line 15618 "configure"
-+#line 15625 "configure"
+-#line 16100 "configure"
++#line 16208 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -15635,16 +15642,16 @@
+@@ -16117,16 +16225,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15638: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15645: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:16120: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16228: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:15641: \$? = $ac_status" >&5
-+  echo "$as_me:15648: \$? = $ac_status" >&5
+-  echo "$as_me:16123: \$? = $ac_status" >&5
++  echo "$as_me:16231: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15644: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15651: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:16126: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16234: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:15647: \$? = $ac_status" >&5
-+  echo "$as_me:15654: \$? = $ac_status" >&5
+-  echo "$as_me:16129: \$? = $ac_status" >&5
++  echo "$as_me:16237: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_sys_time_select=yes
  else
-@@ -15656,7 +15663,7 @@
+@@ -16138,7 +16246,7 @@
  
  fi
  
--echo "$as_me:15659: result: $cf_cv_sys_time_select" >&5
-+echo "$as_me:15666: result: $cf_cv_sys_time_select" >&5
+-echo "$as_me:16141: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:16249: result: $cf_cv_sys_time_select" >&5
  echo "${ECHO_T}$cf_cv_sys_time_select" >&6
  test "$cf_cv_sys_time_select" = yes &&
  cat >>confdefs.h <<\EOF
-@@ -15671,13 +15678,13 @@
+@@ -16153,13 +16261,13 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  ac_main_return=return
  
--echo "$as_me:15674: checking for an ANSI C-conforming const" >&5
-+echo "$as_me:15681: checking for an ANSI C-conforming const" >&5
+-echo "$as_me:16156: checking for an ANSI C-conforming const" >&5
++echo "$as_me:16264: checking for an ANSI C-conforming const" >&5
  echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
  if test "${ac_cv_c_const+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 15680 "configure"
-+#line 15687 "configure"
+-#line 16162 "configure"
++#line 16270 "configure"
  #include "confdefs.h"
  
  int
-@@ -15735,16 +15742,16 @@
+@@ -16217,16 +16325,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15738: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15745: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:16220: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16328: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:15741: \$? = $ac_status" >&5
-+  echo "$as_me:15748: \$? = $ac_status" >&5
+-  echo "$as_me:16223: \$? = $ac_status" >&5
++  echo "$as_me:16331: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15744: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15751: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:16226: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16334: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:15747: \$? = $ac_status" >&5
-+  echo "$as_me:15754: \$? = $ac_status" >&5
+-  echo "$as_me:16229: \$? = $ac_status" >&5
++  echo "$as_me:16337: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_c_const=yes
  else
-@@ -15754,7 +15761,7 @@
+@@ -16236,7 +16344,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
--echo "$as_me:15757: result: $ac_cv_c_const" >&5
-+echo "$as_me:15764: result: $ac_cv_c_const" >&5
+-echo "$as_me:16239: result: $ac_cv_c_const" >&5
++echo "$as_me:16347: result: $ac_cv_c_const" >&5
  echo "${ECHO_T}$ac_cv_c_const" >&6
  if test $ac_cv_c_const = no; then
  
-@@ -15764,7 +15771,7 @@
+@@ -16246,7 +16354,7 @@
  
  fi
  
--echo "$as_me:15767: checking for inline" >&5
-+echo "$as_me:15774: checking for inline" >&5
+-echo "$as_me:16249: checking for inline" >&5
++echo "$as_me:16357: 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
-@@ -15772,7 +15779,7 @@
+@@ -16254,7 +16362,7 @@
    ac_cv_c_inline=no
  for ac_kw in inline __inline__ __inline; do
    cat >conftest.$ac_ext <<_ACEOF
--#line 15775 "configure"
-+#line 15782 "configure"
+-#line 16257 "configure"
++#line 16365 "configure"
  #include "confdefs.h"
  #ifndef __cplusplus
  static $ac_kw int static_foo () {return 0; }
-@@ -15781,16 +15788,16 @@
+@@ -16263,16 +16371,16 @@
  
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15784: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15791: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:16266: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16374: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:15787: \$? = $ac_status" >&5
-+  echo "$as_me:15794: \$? = $ac_status" >&5
+-  echo "$as_me:16269: \$? = $ac_status" >&5
++  echo "$as_me:16377: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15790: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15797: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:16272: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16380: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:15793: \$? = $ac_status" >&5
-+  echo "$as_me:15800: \$? = $ac_status" >&5
+-  echo "$as_me:16275: \$? = $ac_status" >&5
++  echo "$as_me:16383: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_c_inline=$ac_kw; break
  else
-@@ -15801,7 +15808,7 @@
+@@ -16283,7 +16391,7 @@
  done
  
  fi
--echo "$as_me:15804: result: $ac_cv_c_inline" >&5
-+echo "$as_me:15811: result: $ac_cv_c_inline" >&5
+-echo "$as_me:16286: result: $ac_cv_c_inline" >&5
++echo "$as_me:16394: result: $ac_cv_c_inline" >&5
  echo "${ECHO_T}$ac_cv_c_inline" >&6
  case $ac_cv_c_inline in
    inline | yes) ;;
-@@ -15827,7 +15834,7 @@
+@@ -16309,7 +16417,7 @@
  		:
  	elif test "$GCC" = yes
  	then
--		echo "$as_me:15830: checking if $CC supports options to tune inlining" >&5
-+		echo "$as_me:15837: checking if $CC supports options to tune inlining" >&5
+-		echo "$as_me:16312: checking if $CC supports options to tune inlining" >&5
++		echo "$as_me:16420: checking if $CC supports options to tune inlining" >&5
  echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6
  if test "${cf_cv_gcc_inline+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15836,7 +15843,7 @@
+@@ -16318,7 +16426,7 @@
  		cf_save_CFLAGS=$CFLAGS
  		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
  		cat >conftest.$ac_ext <<_ACEOF
--#line 15839 "configure"
-+#line 15846 "configure"
+-#line 16321 "configure"
++#line 16429 "configure"
  #include "confdefs.h"
  inline int foo(void) { return 1; }
  int
-@@ -15848,16 +15855,16 @@
+@@ -16330,16 +16438,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15851: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15858: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:16333: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16441: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:15854: \$? = $ac_status" >&5
-+  echo "$as_me:15861: \$? = $ac_status" >&5
+-  echo "$as_me:16336: \$? = $ac_status" >&5
++  echo "$as_me:16444: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15857: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15864: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:16339: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16447: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:15860: \$? = $ac_status" >&5
-+  echo "$as_me:15867: \$? = $ac_status" >&5
+-  echo "$as_me:16342: \$? = $ac_status" >&5
++  echo "$as_me:16450: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_gcc_inline=yes
  else
-@@ -15869,7 +15876,7 @@
+@@ -16351,7 +16459,7 @@
  		CFLAGS=$cf_save_CFLAGS
  
  fi
--echo "$as_me:15872: result: $cf_cv_gcc_inline" >&5
-+echo "$as_me:15879: result: $cf_cv_gcc_inline" >&5
+-echo "$as_me:16354: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:16462: result: $cf_cv_gcc_inline" >&5
  echo "${ECHO_T}$cf_cv_gcc_inline" >&6
  		if test "$cf_cv_gcc_inline" = yes ; then
  
-@@ -15955,7 +15962,7 @@
+@@ -16437,7 +16545,7 @@
  	fi
  fi
  
--echo "$as_me:15958: checking for signal global datatype" >&5
-+echo "$as_me:15965: checking for signal global datatype" >&5
+-echo "$as_me:16440: checking for signal global datatype" >&5
++echo "$as_me:16548: checking for signal global datatype" >&5
  echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6
  if test "${cf_cv_sig_atomic_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15967,7 +15974,7 @@
+@@ -16449,7 +16557,7 @@
  		"int"
  	do
  	cat >conftest.$ac_ext <<_ACEOF
--#line 15970 "configure"
-+#line 15977 "configure"
+-#line 16452 "configure"
++#line 16560 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -15990,16 +15997,16 @@
+@@ -16472,16 +16580,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15993: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16000: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:16475: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16583: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:15996: \$? = $ac_status" >&5
-+  echo "$as_me:16003: \$? = $ac_status" >&5
+-  echo "$as_me:16478: \$? = $ac_status" >&5
++  echo "$as_me:16586: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15999: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16006: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:16481: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16589: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:16002: \$? = $ac_status" >&5
-+  echo "$as_me:16009: \$? = $ac_status" >&5
+-  echo "$as_me:16484: \$? = $ac_status" >&5
++  echo "$as_me:16592: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_sig_atomic_t=$cf_type
  else
-@@ -16013,7 +16020,7 @@
+@@ -16495,7 +16603,7 @@
  
  fi
  
--echo "$as_me:16016: result: $cf_cv_sig_atomic_t" >&5
-+echo "$as_me:16023: result: $cf_cv_sig_atomic_t" >&5
+-echo "$as_me:16498: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:16606: result: $cf_cv_sig_atomic_t" >&5
  echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
  test "$cf_cv_sig_atomic_t" != no &&
  cat >>confdefs.h <&5
-+echo "$as_me:16032: checking for type of chtype" >&5
+-echo "$as_me:16507: checking for type of chtype" >&5
++echo "$as_me:16615: checking for type of chtype" >&5
  echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
  if test "${cf_cv_typeof_chtype+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16032,7 +16039,7 @@
+@@ -16514,12 +16622,12 @@
    cf_cv_typeof_chtype=long
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 16035 "configure"
-+#line 16042 "configure"
+-#line 16517 "configure"
++#line 16625 "configure"
  #include "confdefs.h"
  
  #define WANT_BITS 31
-@@ -16067,15 +16074,15 @@
+ #include 
+-int main()
++int main(void)
+ {
+ 	FILE *fp = fopen("cf_test.out", "w");
+ 	if (fp != 0) {
+@@ -16549,15 +16657,15 @@
  
  _ACEOF
  rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16070: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16077: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:16552: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16660: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:16073: \$? = $ac_status" >&5
-+  echo "$as_me:16080: \$? = $ac_status" >&5
+-  echo "$as_me:16555: \$? = $ac_status" >&5
++  echo "$as_me:16663: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16075: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16082: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:16557: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16665: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:16078: \$? = $ac_status" >&5
-+  echo "$as_me:16085: \$? = $ac_status" >&5
+-  echo "$as_me:16560: \$? = $ac_status" >&5
++  echo "$as_me:16668: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_typeof_chtype=`cat cf_test.out`
  else
-@@ -16090,7 +16097,7 @@
+@@ -16572,7 +16680,7 @@
  
  fi
  
--echo "$as_me:16093: result: $cf_cv_typeof_chtype" >&5
-+echo "$as_me:16100: result: $cf_cv_typeof_chtype" >&5
+-echo "$as_me:16575: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:16683: result: $cf_cv_typeof_chtype" >&5
  echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
  
  cat >>confdefs.h <&5
-+echo "$as_me:16112: checking if unsigned literals are legal" >&5
+-echo "$as_me:16587: checking if unsigned literals are legal" >&5
++echo "$as_me:16695: checking if unsigned literals are legal" >&5
  echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6
  if test "${cf_cv_unsigned_literals+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
  	cat >conftest.$ac_ext <<_ACEOF
--#line 16112 "configure"
-+#line 16119 "configure"
+-#line 16594 "configure"
++#line 16702 "configure"
  #include "confdefs.h"
  
  int
-@@ -16121,16 +16128,16 @@
+@@ -16603,16 +16711,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16124: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16131: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:16606: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16714: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:16127: \$? = $ac_status" >&5
-+  echo "$as_me:16134: \$? = $ac_status" >&5
+-  echo "$as_me:16609: \$? = $ac_status" >&5
++  echo "$as_me:16717: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16130: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16137: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:16612: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16720: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:16133: \$? = $ac_status" >&5
-+  echo "$as_me:16140: \$? = $ac_status" >&5
+-  echo "$as_me:16615: \$? = $ac_status" >&5
++  echo "$as_me:16723: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_unsigned_literals=yes
  else
-@@ -16142,7 +16149,7 @@
+@@ -16624,7 +16732,7 @@
  
  fi
  
--echo "$as_me:16145: result: $cf_cv_unsigned_literals" >&5
-+echo "$as_me:16152: result: $cf_cv_unsigned_literals" >&5
+-echo "$as_me:16627: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:16735: result: $cf_cv_unsigned_literals" >&5
  echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
  
  cf_cv_1UL="1"
-@@ -16158,14 +16165,14 @@
+@@ -16640,14 +16748,14 @@
  
  ###	Checks for external-data
  
--echo "$as_me:16161: checking if external errno is declared" >&5
-+echo "$as_me:16168: checking if external errno is declared" >&5
+-echo "$as_me:16643: checking if external errno is declared" >&5
++echo "$as_me:16751: 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 16168 "configure"
-+#line 16175 "configure"
+-#line 16650 "configure"
++#line 16758 "configure"
  #include "confdefs.h"
  
  #ifdef HAVE_STDLIB_H
-@@ -16183,16 +16190,16 @@
+@@ -16665,16 +16773,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16186: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16193: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:16668: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16776: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:16189: \$? = $ac_status" >&5
-+  echo "$as_me:16196: \$? = $ac_status" >&5
+-  echo "$as_me:16671: \$? = $ac_status" >&5
++  echo "$as_me:16779: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16192: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16199: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:16674: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16782: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:16195: \$? = $ac_status" >&5
-+  echo "$as_me:16202: \$? = $ac_status" >&5
+-  echo "$as_me:16677: \$? = $ac_status" >&5
++  echo "$as_me:16785: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_dcl_errno=yes
  else
-@@ -16203,7 +16210,7 @@
+@@ -16685,7 +16793,7 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  
  fi
--echo "$as_me:16206: result: $cf_cv_dcl_errno" >&5
-+echo "$as_me:16213: result: $cf_cv_dcl_errno" >&5
+-echo "$as_me:16688: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:16796: result: $cf_cv_dcl_errno" >&5
  echo "${ECHO_T}$cf_cv_dcl_errno" >&6
  
  if test "$cf_cv_dcl_errno" = no ; then
-@@ -16218,14 +16225,14 @@
+@@ -16700,14 +16808,14 @@
  
  # It's possible (for near-UNIX clones) that the data doesn't exist
  
--echo "$as_me:16221: checking if external errno exists" >&5
-+echo "$as_me:16228: checking if external errno exists" >&5
+-echo "$as_me:16703: checking if external errno exists" >&5
++echo "$as_me:16811: 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 16228 "configure"
-+#line 16235 "configure"
+-#line 16710 "configure"
++#line 16818 "configure"
  #include "confdefs.h"
  
  #undef errno
-@@ -16240,16 +16247,16 @@
+@@ -16722,16 +16830,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16243: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16250: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:16725: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16833: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:16246: \$? = $ac_status" >&5
-+  echo "$as_me:16253: \$? = $ac_status" >&5
+-  echo "$as_me:16728: \$? = $ac_status" >&5
++  echo "$as_me:16836: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16249: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16256: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:16731: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16839: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:16252: \$? = $ac_status" >&5
-+  echo "$as_me:16259: \$? = $ac_status" >&5
+-  echo "$as_me:16734: \$? = $ac_status" >&5
++  echo "$as_me:16842: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_have_errno=yes
  else
-@@ -16260,7 +16267,7 @@
+@@ -16742,7 +16850,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  
  fi
--echo "$as_me:16263: result: $cf_cv_have_errno" >&5
-+echo "$as_me:16270: result: $cf_cv_have_errno" >&5
+-echo "$as_me:16745: result: $cf_cv_have_errno" >&5
++echo "$as_me:16853: result: $cf_cv_have_errno" >&5
  echo "${ECHO_T}$cf_cv_have_errno" >&6
  
  if test "$cf_cv_have_errno" = yes ; then
-@@ -16273,7 +16280,7 @@
+@@ -16755,7 +16863,7 @@
  
  fi
  
--echo "$as_me:16276: checking if data-only library module links" >&5
-+echo "$as_me:16283: checking if data-only library module links" >&5
+-echo "$as_me:16758: checking if data-only library module links" >&5
++echo "$as_me:16866: checking if data-only library module links" >&5
  echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
  if test "${cf_cv_link_dataonly+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16281,20 +16288,20 @@
+@@ -16763,20 +16871,20 @@
  
  	rm -f conftest.a
  	cat >conftest.$ac_ext <&5
-+	if { (eval echo "$as_me:16294: \"$ac_compile\"") >&5
+-	if { (eval echo "$as_me:16769: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:16877: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:16290: \$? = $ac_status" >&5
-+  echo "$as_me:16297: \$? = $ac_status" >&5
+-  echo "$as_me:16772: \$? = $ac_status" >&5
++  echo "$as_me:16880: \$? = $ac_status" >&5
    (exit $ac_status); } ; then
  		mv conftest.o data.o && \
  		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
  	fi
  	rm -f conftest.$ac_ext data.o
  	cat >conftest.$ac_ext <&5
-+	if { (eval echo "$as_me:16317: \"$ac_compile\"") >&5
+-	if { (eval echo "$as_me:16792: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:16900: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:16313: \$? = $ac_status" >&5
-+  echo "$as_me:16320: \$? = $ac_status" >&5
+-  echo "$as_me:16795: \$? = $ac_status" >&5
++  echo "$as_me:16903: \$? = $ac_status" >&5
    (exit $ac_status); }; then
  		mv conftest.o func.o && \
  		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
-@@ -16323,7 +16330,7 @@
+@@ -16805,10 +16913,10 @@
    cf_cv_link_dataonly=unknown
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 16326 "configure"
-+#line 16333 "configure"
+-#line 16808 "configure"
++#line 16916 "configure"
  #include "confdefs.h"
  
- 	int main()
-@@ -16334,15 +16341,15 @@
+-	int main()
++	int main(void)
+ 	{
+ 		extern int testfunc();
+ 		${cf_cv_main_return:-return} (!testfunc());
+@@ -16816,15 +16924,15 @@
  
  _ACEOF
  rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16337: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16344: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:16819: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16927: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:16340: \$? = $ac_status" >&5
-+  echo "$as_me:16347: \$? = $ac_status" >&5
+-  echo "$as_me:16822: \$? = $ac_status" >&5
++  echo "$as_me:16930: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16342: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16349: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:16824: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16932: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:16345: \$? = $ac_status" >&5
-+  echo "$as_me:16352: \$? = $ac_status" >&5
+-  echo "$as_me:16827: \$? = $ac_status" >&5
++  echo "$as_me:16935: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_link_dataonly=yes
  else
-@@ -16357,7 +16364,7 @@
+@@ -16839,7 +16947,7 @@
  
  fi
  
--echo "$as_me:16360: result: $cf_cv_link_dataonly" >&5
-+echo "$as_me:16367: result: $cf_cv_link_dataonly" >&5
+-echo "$as_me:16842: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:16950: result: $cf_cv_link_dataonly" >&5
  echo "${ECHO_T}$cf_cv_link_dataonly" >&6
  
  if test "$cf_cv_link_dataonly" = no ; then
-@@ -16396,13 +16403,13 @@
+@@ -16878,13 +16986,13 @@
  
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:16399: checking for $ac_func" >&5
-+echo "$as_me:16406: checking for $ac_func" >&5
+-echo "$as_me:16881: checking for $ac_func" >&5
++echo "$as_me:16989: 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 16405 "configure"
-+#line 16412 "configure"
+-#line 16887 "configure"
++#line 16995 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func (); below.  */
-@@ -16433,16 +16440,16 @@
+@@ -16915,16 +17023,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16436: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16443: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:16918: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17026: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:16439: \$? = $ac_status" >&5
-+  echo "$as_me:16446: \$? = $ac_status" >&5
+-  echo "$as_me:16921: \$? = $ac_status" >&5
++  echo "$as_me:17029: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16442: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16449: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:16924: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17032: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:16445: \$? = $ac_status" >&5
-+  echo "$as_me:16452: \$? = $ac_status" >&5
+-  echo "$as_me:16927: \$? = $ac_status" >&5
++  echo "$as_me:17035: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_var=yes"
  else
-@@ -16452,7 +16459,7 @@
+@@ -16934,7 +17042,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:16455: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:16462: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "$as_me:16937: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:17045: 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 <&5
-+	{ { echo "$as_me:16474: error: getopt is required for building programs" >&5
+-	{ { echo "$as_me:16949: error: getopt is required for building programs" >&5
++	{ { echo "$as_me:17057: error: getopt is required for building programs" >&5
  echo "$as_me: error: getopt is required for building programs" >&2;}
     { (exit 1); exit 1; }; }
  fi
  
  if test "x$with_getcap" = "xyes" ; then
  
--echo "$as_me:16474: checking for terminal-capability database functions" >&5
-+echo "$as_me:16481: checking for terminal-capability database functions" >&5
+-echo "$as_me:16956: checking for terminal-capability database functions" >&5
++echo "$as_me:17064: checking for terminal-capability database functions" >&5
  echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6
  if test "${cf_cv_cgetent+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
  cat >conftest.$ac_ext <<_ACEOF
--#line 16481 "configure"
-+#line 16488 "configure"
+-#line 16963 "configure"
++#line 17071 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -16498,16 +16505,16 @@
+@@ -16980,16 +17088,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16501: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16508: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:16983: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17091: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:16504: \$? = $ac_status" >&5
-+  echo "$as_me:16511: \$? = $ac_status" >&5
+-  echo "$as_me:16986: \$? = $ac_status" >&5
++  echo "$as_me:17094: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16507: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16514: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:16989: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17097: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:16510: \$? = $ac_status" >&5
-+  echo "$as_me:16517: \$? = $ac_status" >&5
+-  echo "$as_me:16992: \$? = $ac_status" >&5
++  echo "$as_me:17100: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_cgetent=yes
  else
-@@ -16518,7 +16525,7 @@
+@@ -17000,7 +17108,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  
  fi
--echo "$as_me:16521: result: $cf_cv_cgetent" >&5
-+echo "$as_me:16528: result: $cf_cv_cgetent" >&5
+-echo "$as_me:17003: result: $cf_cv_cgetent" >&5
++echo "$as_me:17111: result: $cf_cv_cgetent" >&5
  echo "${ECHO_T}$cf_cv_cgetent" >&6
  
  if test "$cf_cv_cgetent" = yes
-@@ -16528,14 +16535,14 @@
+@@ -17010,16 +17118,17 @@
  #define HAVE_BSD_CGETENT 1
  EOF
  
--echo "$as_me:16531: checking if cgetent uses const parameter" >&5
-+echo "$as_me:16538: checking if cgetent uses const parameter" >&5
+-echo "$as_me:17013: checking if cgetent uses const parameter" >&5
++echo "$as_me:17121: checking if cgetent uses const parameter" >&5
  echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6
  if test "${cf_cv_cgetent_const+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
  cat >conftest.$ac_ext <<_ACEOF
--#line 16538 "configure"
-+#line 16545 "configure"
+-#line 17020 "configure"
++#line 17128 "configure"
  #include "confdefs.h"
  
++#pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
  #include 
-@@ -16557,16 +16564,16 @@
+ int
+ main ()
+@@ -17039,16 +17148,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16560: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16567: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:17042: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17151: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:16563: \$? = $ac_status" >&5
-+  echo "$as_me:16570: \$? = $ac_status" >&5
+-  echo "$as_me:17045: \$? = $ac_status" >&5
++  echo "$as_me:17154: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16566: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16573: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:17048: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17157: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:16569: \$? = $ac_status" >&5
-+  echo "$as_me:16576: \$? = $ac_status" >&5
+-  echo "$as_me:17051: \$? = $ac_status" >&5
++  echo "$as_me:17160: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_cgetent_const=yes
  else
-@@ -16577,7 +16584,7 @@
+@@ -17059,7 +17168,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  
  fi
--echo "$as_me:16580: result: $cf_cv_cgetent_const" >&5
-+echo "$as_me:16587: result: $cf_cv_cgetent_const" >&5
+-echo "$as_me:17062: result: $cf_cv_cgetent_const" >&5
++echo "$as_me:17171: result: $cf_cv_cgetent_const" >&5
  echo "${ECHO_T}$cf_cv_cgetent_const" >&6
  	if test "$cf_cv_cgetent_const" = yes
  	then
-@@ -16591,14 +16598,14 @@
+@@ -17073,14 +17182,14 @@
  
  fi
  
--echo "$as_me:16594: checking for isascii" >&5
-+echo "$as_me:16601: checking for isascii" >&5
+-echo "$as_me:17076: checking for isascii" >&5
++echo "$as_me:17185: checking for isascii" >&5
  echo $ECHO_N "checking for isascii... $ECHO_C" >&6
  if test "${cf_cv_have_isascii+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
  	cat >conftest.$ac_ext <<_ACEOF
--#line 16601 "configure"
-+#line 16608 "configure"
+-#line 17083 "configure"
++#line 17192 "configure"
  #include "confdefs.h"
  #include 
  int
-@@ -16610,16 +16617,16 @@
+@@ -17092,16 +17201,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16613: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16620: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:17095: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17204: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:16616: \$? = $ac_status" >&5
-+  echo "$as_me:16623: \$? = $ac_status" >&5
+-  echo "$as_me:17098: \$? = $ac_status" >&5
++  echo "$as_me:17207: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16619: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16626: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:17101: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17210: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:16622: \$? = $ac_status" >&5
-+  echo "$as_me:16629: \$? = $ac_status" >&5
+-  echo "$as_me:17104: \$? = $ac_status" >&5
++  echo "$as_me:17213: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_have_isascii=yes
  else
-@@ -16630,7 +16637,7 @@
+@@ -17112,7 +17221,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  
  fi
--echo "$as_me:16633: result: $cf_cv_have_isascii" >&5
-+echo "$as_me:16640: result: $cf_cv_have_isascii" >&5
+-echo "$as_me:17115: result: $cf_cv_have_isascii" >&5
++echo "$as_me:17224: result: $cf_cv_have_isascii" >&5
  echo "${ECHO_T}$cf_cv_have_isascii" >&6
  test "$cf_cv_have_isascii" = yes &&
  cat >>confdefs.h <<\EOF
-@@ -16638,10 +16645,10 @@
+@@ -17120,10 +17229,10 @@
  EOF
  
  if test "$ac_cv_func_sigaction" = yes; then
--echo "$as_me:16641: checking whether sigaction needs _POSIX_SOURCE" >&5
-+echo "$as_me:16648: checking whether sigaction needs _POSIX_SOURCE" >&5
+-echo "$as_me:17123: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:17232: checking whether sigaction needs _POSIX_SOURCE" >&5
  echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
--#line 16644 "configure"
-+#line 16651 "configure"
+-#line 17126 "configure"
++#line 17235 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -16655,16 +16662,16 @@
+@@ -17137,16 +17246,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16658: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16665: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:17140: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17249: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:16661: \$? = $ac_status" >&5
-+  echo "$as_me:16668: \$? = $ac_status" >&5
+-  echo "$as_me:17143: \$? = $ac_status" >&5
++  echo "$as_me:17252: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16664: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16671: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:17146: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17255: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:16667: \$? = $ac_status" >&5
-+  echo "$as_me:16674: \$? = $ac_status" >&5
+-  echo "$as_me:17149: \$? = $ac_status" >&5
++  echo "$as_me:17258: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    sigact_bad=no
  else
-@@ -16672,7 +16679,7 @@
+@@ -17154,7 +17263,7 @@
  cat conftest.$ac_ext >&5
  
  cat >conftest.$ac_ext <<_ACEOF
--#line 16675 "configure"
-+#line 16682 "configure"
+-#line 17157 "configure"
++#line 17266 "configure"
  #include "confdefs.h"
  
  #define _POSIX_SOURCE
-@@ -16687,16 +16694,16 @@
+@@ -17169,16 +17278,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16690: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16697: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:17172: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17281: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:16693: \$? = $ac_status" >&5
-+  echo "$as_me:16700: \$? = $ac_status" >&5
+-  echo "$as_me:17175: \$? = $ac_status" >&5
++  echo "$as_me:17284: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16696: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16703: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:17178: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17287: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:16699: \$? = $ac_status" >&5
-+  echo "$as_me:16706: \$? = $ac_status" >&5
+-  echo "$as_me:17181: \$? = $ac_status" >&5
++  echo "$as_me:17290: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    sigact_bad=yes
  
-@@ -16712,11 +16719,11 @@
+@@ -17194,11 +17303,11 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:16715: result: $sigact_bad" >&5
-+echo "$as_me:16722: result: $sigact_bad" >&5
+-echo "$as_me:17197: result: $sigact_bad" >&5
++echo "$as_me:17306: result: $sigact_bad" >&5
  echo "${ECHO_T}$sigact_bad" >&6
  fi
  
--echo "$as_me:16719: checking if nanosleep really works" >&5
-+echo "$as_me:16726: checking if nanosleep really works" >&5
+-echo "$as_me:17201: checking if nanosleep really works" >&5
++echo "$as_me:17310: checking if nanosleep really works" >&5
  echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6
  if test "${cf_cv_func_nanosleep+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16726,7 +16733,7 @@
+@@ -17208,7 +17317,7 @@
    cf_cv_func_nanosleep=unknown
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 16729 "configure"
-+#line 16736 "configure"
+-#line 17211 "configure"
++#line 17320 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -16751,15 +16758,15 @@
+@@ -17219,7 +17328,7 @@
+ #include 
+ #endif
+ 
+-int main() {
++int main(void) {
+ 	struct timespec ts1, ts2;
+ 	int code;
+ 	ts1.tv_sec  = 0;
+@@ -17233,15 +17342,15 @@
  
  _ACEOF
  rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16754: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16761: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:17236: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17345: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:16757: \$? = $ac_status" >&5
-+  echo "$as_me:16764: \$? = $ac_status" >&5
+-  echo "$as_me:17239: \$? = $ac_status" >&5
++  echo "$as_me:17348: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16759: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16766: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:17241: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17350: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:16762: \$? = $ac_status" >&5
-+  echo "$as_me:16769: \$? = $ac_status" >&5
+-  echo "$as_me:17244: \$? = $ac_status" >&5
++  echo "$as_me:17353: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_func_nanosleep=yes
  else
-@@ -16771,7 +16778,7 @@
+@@ -17253,7 +17362,7 @@
  rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  fi
--echo "$as_me:16774: result: $cf_cv_func_nanosleep" >&5
-+echo "$as_me:16781: result: $cf_cv_func_nanosleep" >&5
+-echo "$as_me:17256: result: $cf_cv_func_nanosleep" >&5
++echo "$as_me:17365: result: $cf_cv_func_nanosleep" >&5
  echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
  
  test "$cf_cv_func_nanosleep" = "yes" &&
-@@ -16786,23 +16793,23 @@
+@@ -17268,23 +17377,23 @@
  
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:16789: checking for $ac_header" >&5
-+echo "$as_me:16796: checking for $ac_header" >&5
+-echo "$as_me:17271: checking for $ac_header" >&5
++echo "$as_me:17380: 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 16795 "configure"
-+#line 16802 "configure"
+-#line 17277 "configure"
++#line 17386 "configure"
  #include "confdefs.h"
  #include <$ac_header>
  _ACEOF
--if { (eval echo "$as_me:16799: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:16806: \"$ac_cpp conftest.$ac_ext\"") >&5
+-if { (eval echo "$as_me:17281: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17390: \"$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:16805: \$? = $ac_status" >&5
-+  echo "$as_me:16812: \$? = $ac_status" >&5
+-  echo "$as_me:17287: \$? = $ac_status" >&5
++  echo "$as_me:17396: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -16821,7 +16828,7 @@
+@@ -17303,7 +17412,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
--echo "$as_me:16824: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:16831: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "$as_me:17306: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:17415: 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 <&5
-+echo "$as_me:16846: checking for $ac_header" >&5
+-echo "$as_me:17321: checking for $ac_header" >&5
++echo "$as_me:17430: 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 16845 "configure"
-+#line 16852 "configure"
+-#line 17327 "configure"
++#line 17436 "configure"
  #include "confdefs.h"
  #include <$ac_header>
  _ACEOF
--if { (eval echo "$as_me:16849: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:16856: \"$ac_cpp conftest.$ac_ext\"") >&5
+-if { (eval echo "$as_me:17331: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17440: \"$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:16855: \$? = $ac_status" >&5
-+  echo "$as_me:16862: \$? = $ac_status" >&5
+-  echo "$as_me:17337: \$? = $ac_status" >&5
++  echo "$as_me:17446: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -16871,7 +16878,7 @@
+@@ -17353,7 +17462,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
--echo "$as_me:16874: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:16881: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "$as_me:17356: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:17465: 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 <&5
-+	echo "$as_me:16899: checking whether termios.h needs _POSIX_SOURCE" >&5
+-	echo "$as_me:17374: checking whether termios.h needs _POSIX_SOURCE" >&5
++	echo "$as_me:17483: 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 16895 "configure"
-+#line 16902 "configure"
+-#line 17377 "configure"
++#line 17486 "configure"
  #include "confdefs.h"
  #include 
  int
-@@ -16904,16 +16911,16 @@
+@@ -17386,16 +17495,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16907: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16914: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:17389: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17498: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:16910: \$? = $ac_status" >&5
-+  echo "$as_me:16917: \$? = $ac_status" >&5
+-  echo "$as_me:17392: \$? = $ac_status" >&5
++  echo "$as_me:17501: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16913: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16920: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:17395: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17504: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:16916: \$? = $ac_status" >&5
-+  echo "$as_me:16923: \$? = $ac_status" >&5
+-  echo "$as_me:17398: \$? = $ac_status" >&5
++  echo "$as_me:17507: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    termios_bad=no
  else
-@@ -16921,7 +16928,7 @@
+@@ -17403,7 +17512,7 @@
  cat conftest.$ac_ext >&5
  
  		cat >conftest.$ac_ext <<_ACEOF
--#line 16924 "configure"
-+#line 16931 "configure"
+-#line 17406 "configure"
++#line 17515 "configure"
  #include "confdefs.h"
  
  #define _POSIX_SOURCE
-@@ -16935,16 +16942,16 @@
+@@ -17417,16 +17526,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16938: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16945: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:17420: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17529: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:16941: \$? = $ac_status" >&5
-+  echo "$as_me:16948: \$? = $ac_status" >&5
+-  echo "$as_me:17423: \$? = $ac_status" >&5
++  echo "$as_me:17532: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16944: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16951: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:17426: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17535: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:16947: \$? = $ac_status" >&5
-+  echo "$as_me:16954: \$? = $ac_status" >&5
+-  echo "$as_me:17429: \$? = $ac_status" >&5
++  echo "$as_me:17538: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    termios_bad=unknown
  else
-@@ -16960,19 +16967,19 @@
+@@ -17442,19 +17551,19 @@
  
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:16963: result: $termios_bad" >&5
-+	echo "$as_me:16970: result: $termios_bad" >&5
+-	echo "$as_me:17445: result: $termios_bad" >&5
++	echo "$as_me:17554: result: $termios_bad" >&5
  echo "${ECHO_T}$termios_bad" >&6
  	fi
  fi
  
--echo "$as_me:16968: checking for tcgetattr" >&5
-+echo "$as_me:16975: checking for tcgetattr" >&5
+-echo "$as_me:17450: checking for tcgetattr" >&5
++echo "$as_me:17559: checking for tcgetattr" >&5
  echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6
  if test "${cf_cv_have_tcgetattr+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
  cat >conftest.$ac_ext <<_ACEOF
--#line 16975 "configure"
-+#line 16982 "configure"
+-#line 17457 "configure"
++#line 17566 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -17000,16 +17007,16 @@
+@@ -17482,16 +17591,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17003: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17010: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:17485: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17594: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:17006: \$? = $ac_status" >&5
-+  echo "$as_me:17013: \$? = $ac_status" >&5
+-  echo "$as_me:17488: \$? = $ac_status" >&5
++  echo "$as_me:17597: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17009: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17016: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:17491: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17600: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:17012: \$? = $ac_status" >&5
-+  echo "$as_me:17019: \$? = $ac_status" >&5
+-  echo "$as_me:17494: \$? = $ac_status" >&5
++  echo "$as_me:17603: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_have_tcgetattr=yes
  else
-@@ -17019,21 +17026,21 @@
+@@ -17501,21 +17610,21 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:17022: result: $cf_cv_have_tcgetattr" >&5
-+echo "$as_me:17029: result: $cf_cv_have_tcgetattr" >&5
+-echo "$as_me:17504: result: $cf_cv_have_tcgetattr" >&5
++echo "$as_me:17613: result: $cf_cv_have_tcgetattr" >&5
  echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6
  test "$cf_cv_have_tcgetattr" = yes &&
  cat >>confdefs.h <<\EOF
  #define HAVE_TCGETATTR 1
  EOF
  
--echo "$as_me:17029: checking for vsscanf function or workaround" >&5
-+echo "$as_me:17036: checking for vsscanf function or workaround" >&5
+-echo "$as_me:17511: checking for vsscanf function or workaround" >&5
++echo "$as_me:17620: checking for vsscanf function or workaround" >&5
  echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6
  if test "${cf_cv_func_vsscanf+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
  cat >conftest.$ac_ext <<_ACEOF
--#line 17036 "configure"
-+#line 17043 "configure"
+-#line 17518 "configure"
++#line 17627 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -17049,16 +17056,16 @@
+@@ -17531,16 +17640,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17052: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17059: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:17534: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17643: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:17055: \$? = $ac_status" >&5
-+  echo "$as_me:17062: \$? = $ac_status" >&5
+-  echo "$as_me:17537: \$? = $ac_status" >&5
++  echo "$as_me:17646: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17058: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17065: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:17540: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17649: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:17061: \$? = $ac_status" >&5
-+  echo "$as_me:17068: \$? = $ac_status" >&5
+-  echo "$as_me:17543: \$? = $ac_status" >&5
++  echo "$as_me:17652: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_func_vsscanf=vsscanf
  else
-@@ -17066,7 +17073,7 @@
+@@ -17548,7 +17657,7 @@
  cat conftest.$ac_ext >&5
  
  cat >conftest.$ac_ext <<_ACEOF
--#line 17069 "configure"
-+#line 17076 "configure"
+-#line 17551 "configure"
++#line 17660 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -17088,16 +17095,16 @@
+@@ -17570,16 +17679,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17091: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17098: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:17573: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17682: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:17094: \$? = $ac_status" >&5
-+  echo "$as_me:17101: \$? = $ac_status" >&5
+-  echo "$as_me:17576: \$? = $ac_status" >&5
++  echo "$as_me:17685: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17097: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17104: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:17579: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17688: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:17100: \$? = $ac_status" >&5
-+  echo "$as_me:17107: \$? = $ac_status" >&5
+-  echo "$as_me:17582: \$? = $ac_status" >&5
++  echo "$as_me:17691: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_func_vsscanf=vfscanf
  else
-@@ -17105,7 +17112,7 @@
+@@ -17587,7 +17696,7 @@
  cat conftest.$ac_ext >&5
  
  cat >conftest.$ac_ext <<_ACEOF
--#line 17108 "configure"
-+#line 17115 "configure"
+-#line 17590 "configure"
++#line 17699 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -17127,16 +17134,16 @@
+@@ -17609,16 +17718,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17130: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17137: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:17612: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17721: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:17133: \$? = $ac_status" >&5
-+  echo "$as_me:17140: \$? = $ac_status" >&5
+-  echo "$as_me:17615: \$? = $ac_status" >&5
++  echo "$as_me:17724: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17136: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17143: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:17618: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17727: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:17139: \$? = $ac_status" >&5
-+  echo "$as_me:17146: \$? = $ac_status" >&5
+-  echo "$as_me:17621: \$? = $ac_status" >&5
++  echo "$as_me:17730: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_func_vsscanf=_doscan
  else
-@@ -17151,7 +17158,7 @@
+@@ -17633,7 +17742,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:17154: result: $cf_cv_func_vsscanf" >&5
-+echo "$as_me:17161: result: $cf_cv_func_vsscanf" >&5
+-echo "$as_me:17636: result: $cf_cv_func_vsscanf" >&5
++echo "$as_me:17745: result: $cf_cv_func_vsscanf" >&5
  echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
  
  case $cf_cv_func_vsscanf in
-@@ -17172,7 +17179,7 @@
+@@ -17654,7 +17763,57 @@
  ;;
  esac
  
--echo "$as_me:17175: checking for working mkstemp" >&5
-+echo "$as_me:17182: checking for working mkstemp" >&5
+-echo "$as_me:17657: checking for working mkstemp" >&5
++for ac_header in \
++unistd.h \
++
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++echo "$as_me:17771: 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 17777 "configure"
++#include "confdefs.h"
++#include <$ac_header>
++_ACEOF
++if { (eval echo "$as_me:17781: \"$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:17787: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  eval "$as_ac_Header=yes"
++else
++  echo "$as_me: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "$as_ac_Header=no"
++fi
++rm -f conftest.err conftest.$ac_ext
++fi
++echo "$as_me:17806: 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 <&5
  echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
  if test "${cf_cv_func_mkstemp+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17183,7 +17190,7 @@
+@@ -17665,15 +17824,18 @@
    cf_cv_func_mkstemp=maybe
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 17186 "configure"
-+#line 17193 "configure"
+-#line 17668 "configure"
++#line 17827 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -17221,15 +17228,15 @@
++#ifdef HAVE_UNISTD_H
++#include 
++#endif
+ #include 
+ #include 
+ #include 
+ #include 
+-int main()
++int main(void)
+ {
+ 	char *tmpl = "conftestXXXXXX";
+ 	char name[2][80];
+@@ -17703,15 +17865,15 @@
  
  _ACEOF
  rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17224: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17231: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:17706: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17868: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:17227: \$? = $ac_status" >&5
-+  echo "$as_me:17234: \$? = $ac_status" >&5
+-  echo "$as_me:17709: \$? = $ac_status" >&5
++  echo "$as_me:17871: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17229: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17236: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:17711: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17873: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:17232: \$? = $ac_status" >&5
-+  echo "$as_me:17239: \$? = $ac_status" >&5
+-  echo "$as_me:17714: \$? = $ac_status" >&5
++  echo "$as_me:17876: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_func_mkstemp=yes
  
-@@ -17244,16 +17251,16 @@
+@@ -17726,16 +17888,16 @@
  fi
  
  fi
--echo "$as_me:17247: result: $cf_cv_func_mkstemp" >&5
-+echo "$as_me:17254: result: $cf_cv_func_mkstemp" >&5
+-echo "$as_me:17729: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:17891: result: $cf_cv_func_mkstemp" >&5
  echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
  if test "x$cf_cv_func_mkstemp" = xmaybe ; then
--	echo "$as_me:17250: checking for mkstemp" >&5
-+	echo "$as_me:17257: checking for mkstemp" >&5
+-	echo "$as_me:17732: checking for mkstemp" >&5
++	echo "$as_me:17894: checking for mkstemp" >&5
  echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
  if test "${ac_cv_func_mkstemp+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 17256 "configure"
-+#line 17263 "configure"
+-#line 17738 "configure"
++#line 17900 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char mkstemp (); below.  */
-@@ -17284,16 +17291,16 @@
+@@ -17766,16 +17928,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17287: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17294: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:17769: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17931: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:17290: \$? = $ac_status" >&5
-+  echo "$as_me:17297: \$? = $ac_status" >&5
+-  echo "$as_me:17772: \$? = $ac_status" >&5
++  echo "$as_me:17934: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17293: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17300: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:17775: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17937: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:17296: \$? = $ac_status" >&5
-+  echo "$as_me:17303: \$? = $ac_status" >&5
+-  echo "$as_me:17778: \$? = $ac_status" >&5
++  echo "$as_me:17940: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_mkstemp=yes
  else
-@@ -17303,7 +17310,7 @@
+@@ -17785,7 +17947,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:17306: result: $ac_cv_func_mkstemp" >&5
-+echo "$as_me:17313: result: $ac_cv_func_mkstemp" >&5
+-echo "$as_me:17788: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:17950: result: $ac_cv_func_mkstemp" >&5
  echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
  
  fi
-@@ -17324,21 +17331,21 @@
+@@ -17806,21 +17968,21 @@
  fi
  
  if test "x$cross_compiling" = xyes ; then
--	{ echo "$as_me:17327: WARNING: cross compiling: assume setvbuf params not reversed" >&5
-+	{ echo "$as_me:17334: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+-	{ echo "$as_me:17809: WARNING: cross compiling: assume setvbuf params not reversed" >&5
++	{ echo "$as_me:17971: WARNING: cross compiling: assume setvbuf params not reversed" >&5
  echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;}
  else
--	echo "$as_me:17330: checking whether setvbuf arguments are reversed" >&5
-+	echo "$as_me:17337: checking whether setvbuf arguments are reversed" >&5
+-	echo "$as_me:17812: checking whether setvbuf arguments are reversed" >&5
++	echo "$as_me:17974: checking whether setvbuf arguments are reversed" >&5
  echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6
  if test "${ac_cv_func_setvbuf_reversed+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test "$cross_compiling" = yes; then
--  { { echo "$as_me:17336: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:17343: error: cannot run test program while cross compiling" >&5
+-  { { echo "$as_me:17818: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:17980: 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 17341 "configure"
-+#line 17348 "configure"
+-#line 17823 "configure"
++#line 17985 "configure"
  #include "confdefs.h"
  #include 
  /* If setvbuf has the reversed format, exit 0. */
-@@ -17355,15 +17362,15 @@
+@@ -17837,15 +17999,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17358: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17365: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:17840: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18002: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:17361: \$? = $ac_status" >&5
-+  echo "$as_me:17368: \$? = $ac_status" >&5
+-  echo "$as_me:17843: \$? = $ac_status" >&5
++  echo "$as_me:18005: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17363: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17370: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:17845: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18007: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:17366: \$? = $ac_status" >&5
-+  echo "$as_me:17373: \$? = $ac_status" >&5
+-  echo "$as_me:17848: \$? = $ac_status" >&5
++  echo "$as_me:18010: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_setvbuf_reversed=yes
  else
-@@ -17376,7 +17383,7 @@
+@@ -17858,7 +18020,7 @@
  fi
  rm -f core core.* *.core
  fi
--echo "$as_me:17379: result: $ac_cv_func_setvbuf_reversed" >&5
-+echo "$as_me:17386: result: $ac_cv_func_setvbuf_reversed" >&5
+-echo "$as_me:17861: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:18023: result: $ac_cv_func_setvbuf_reversed" >&5
  echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6
  if test $ac_cv_func_setvbuf_reversed = yes; then
  
-@@ -17387,13 +17394,13 @@
+@@ -17869,13 +18031,13 @@
  fi
  
  fi
--echo "$as_me:17390: checking for intptr_t" >&5
-+echo "$as_me:17397: checking for intptr_t" >&5
+-echo "$as_me:17872: checking for intptr_t" >&5
++echo "$as_me:18034: 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 17396 "configure"
-+#line 17403 "configure"
+-#line 17878 "configure"
++#line 18040 "configure"
  #include "confdefs.h"
  $ac_includes_default
  int
-@@ -17408,16 +17415,16 @@
+@@ -17890,16 +18052,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17411: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17418: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:17893: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18055: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:17414: \$? = $ac_status" >&5
-+  echo "$as_me:17421: \$? = $ac_status" >&5
+-  echo "$as_me:17896: \$? = $ac_status" >&5
++  echo "$as_me:18058: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17417: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17424: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:17899: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18061: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:17420: \$? = $ac_status" >&5
-+  echo "$as_me:17427: \$? = $ac_status" >&5
+-  echo "$as_me:17902: \$? = $ac_status" >&5
++  echo "$as_me:18064: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_type_intptr_t=yes
  else
-@@ -17427,7 +17434,7 @@
+@@ -17909,7 +18071,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
--echo "$as_me:17430: result: $ac_cv_type_intptr_t" >&5
-+echo "$as_me:17437: result: $ac_cv_type_intptr_t" >&5
+-echo "$as_me:17912: result: $ac_cv_type_intptr_t" >&5
++echo "$as_me:18074: 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
    :
-@@ -17439,13 +17446,13 @@
+@@ -17921,13 +18083,13 @@
  
  fi
  
--echo "$as_me:17442: checking for ssize_t" >&5
-+echo "$as_me:17449: checking for ssize_t" >&5
+-echo "$as_me:17924: checking for ssize_t" >&5
++echo "$as_me:18086: 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 17448 "configure"
-+#line 17455 "configure"
+-#line 17930 "configure"
++#line 18092 "configure"
  #include "confdefs.h"
  $ac_includes_default
  int
-@@ -17460,16 +17467,16 @@
+@@ -17942,16 +18104,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17463: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17470: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:17945: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18107: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:17466: \$? = $ac_status" >&5
-+  echo "$as_me:17473: \$? = $ac_status" >&5
+-  echo "$as_me:17948: \$? = $ac_status" >&5
++  echo "$as_me:18110: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17469: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17476: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:17951: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18113: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:17472: \$? = $ac_status" >&5
-+  echo "$as_me:17479: \$? = $ac_status" >&5
+-  echo "$as_me:17954: \$? = $ac_status" >&5
++  echo "$as_me:18116: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_type_ssize_t=yes
  else
-@@ -17479,7 +17486,7 @@
+@@ -17961,7 +18123,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
--echo "$as_me:17482: result: $ac_cv_type_ssize_t" >&5
-+echo "$as_me:17489: result: $ac_cv_type_ssize_t" >&5
+-echo "$as_me:17964: result: $ac_cv_type_ssize_t" >&5
++echo "$as_me:18126: 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
    :
-@@ -17491,14 +17498,14 @@
+@@ -17973,14 +18135,14 @@
  
  fi
  
--echo "$as_me:17494: checking for type sigaction_t" >&5
-+echo "$as_me:17501: checking for type sigaction_t" >&5
+-echo "$as_me:17976: checking for type sigaction_t" >&5
++echo "$as_me:18138: checking for type sigaction_t" >&5
  echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6
  if test "${cf_cv_type_sigaction+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
  	cat >conftest.$ac_ext <<_ACEOF
--#line 17501 "configure"
-+#line 17508 "configure"
+-#line 17983 "configure"
++#line 18145 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -17511,16 +17518,16 @@
+@@ -17993,16 +18155,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17514: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17521: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:17996: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18158: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:17517: \$? = $ac_status" >&5
-+  echo "$as_me:17524: \$? = $ac_status" >&5
+-  echo "$as_me:17999: \$? = $ac_status" >&5
++  echo "$as_me:18161: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17520: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17527: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:18002: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18164: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:17523: \$? = $ac_status" >&5
-+  echo "$as_me:17530: \$? = $ac_status" >&5
+-  echo "$as_me:18005: \$? = $ac_status" >&5
++  echo "$as_me:18167: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_type_sigaction=yes
  else
-@@ -17531,14 +17538,14 @@
+@@ -18013,14 +18175,14 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
  
--echo "$as_me:17534: result: $cf_cv_type_sigaction" >&5
-+echo "$as_me:17541: result: $cf_cv_type_sigaction" >&5
+-echo "$as_me:18016: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:18178: result: $cf_cv_type_sigaction" >&5
  echo "${ECHO_T}$cf_cv_type_sigaction" >&6
  test "$cf_cv_type_sigaction" = yes &&
  cat >>confdefs.h <<\EOF
  #define HAVE_TYPE_SIGACTION 1
  EOF
  
--echo "$as_me:17541: checking declaration of size-change" >&5
-+echo "$as_me:17548: checking declaration of size-change" >&5
+-echo "$as_me:18023: checking declaration of size-change" >&5
++echo "$as_me:18185: 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
-@@ -17553,7 +17560,7 @@
+@@ -18035,7 +18197,7 @@
  	CPPFLAGS="$cf_save_CPPFLAGS"
  	test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
  	cat >conftest.$ac_ext <<_ACEOF
--#line 17556 "configure"
-+#line 17563 "configure"
+-#line 18038 "configure"
++#line 18200 "configure"
  #include "confdefs.h"
  #include 
  #ifdef HAVE_TERMIOS_H
-@@ -17597,16 +17604,16 @@
+@@ -18079,16 +18241,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17600: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17607: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:18082: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18244: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:17603: \$? = $ac_status" >&5
-+  echo "$as_me:17610: \$? = $ac_status" >&5
+-  echo "$as_me:18085: \$? = $ac_status" >&5
++  echo "$as_me:18247: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17606: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17613: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:18088: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18250: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:17609: \$? = $ac_status" >&5
-+  echo "$as_me:17616: \$? = $ac_status" >&5
+-  echo "$as_me:18091: \$? = $ac_status" >&5
++  echo "$as_me:18253: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_sizechange=yes
  else
-@@ -17625,7 +17632,7 @@
+@@ -18107,7 +18269,7 @@
  done
  
  fi
--echo "$as_me:17628: result: $cf_cv_sizechange" >&5
-+echo "$as_me:17635: result: $cf_cv_sizechange" >&5
+-echo "$as_me:18110: result: $cf_cv_sizechange" >&5
++echo "$as_me:18272: result: $cf_cv_sizechange" >&5
  echo "${ECHO_T}$cf_cv_sizechange" >&6
  if test "$cf_cv_sizechange" != no ; then
  
-@@ -17643,13 +17650,13 @@
+@@ -18125,13 +18287,13 @@
  	esac
  fi
  
--echo "$as_me:17646: checking for memmove" >&5
-+echo "$as_me:17653: checking for memmove" >&5
+-echo "$as_me:18128: checking for memmove" >&5
++echo "$as_me:18290: checking for memmove" >&5
  echo $ECHO_N "checking for memmove... $ECHO_C" >&6
  if test "${ac_cv_func_memmove+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 17652 "configure"
-+#line 17659 "configure"
+-#line 18134 "configure"
++#line 18296 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char memmove (); below.  */
-@@ -17680,16 +17687,16 @@
+@@ -18162,16 +18324,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17683: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17690: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:18165: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18327: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:17686: \$? = $ac_status" >&5
-+  echo "$as_me:17693: \$? = $ac_status" >&5
+-  echo "$as_me:18168: \$? = $ac_status" >&5
++  echo "$as_me:18330: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17689: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17696: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:18171: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18333: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:17692: \$? = $ac_status" >&5
-+  echo "$as_me:17699: \$? = $ac_status" >&5
+-  echo "$as_me:18174: \$? = $ac_status" >&5
++  echo "$as_me:18336: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_memmove=yes
  else
-@@ -17699,19 +17706,19 @@
+@@ -18181,19 +18343,19 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:17702: result: $ac_cv_func_memmove" >&5
-+echo "$as_me:17709: result: $ac_cv_func_memmove" >&5
+-echo "$as_me:18184: result: $ac_cv_func_memmove" >&5
++echo "$as_me:18346: result: $ac_cv_func_memmove" >&5
  echo "${ECHO_T}$ac_cv_func_memmove" >&6
  if test $ac_cv_func_memmove = yes; then
    :
  else
  
--echo "$as_me:17708: checking for bcopy" >&5
-+echo "$as_me:17715: checking for bcopy" >&5
+-echo "$as_me:18190: checking for bcopy" >&5
++echo "$as_me:18352: checking for bcopy" >&5
  echo $ECHO_N "checking for bcopy... $ECHO_C" >&6
  if test "${ac_cv_func_bcopy+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 17714 "configure"
-+#line 17721 "configure"
+-#line 18196 "configure"
++#line 18358 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char bcopy (); below.  */
-@@ -17742,16 +17749,16 @@
+@@ -18224,16 +18386,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17745: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17752: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:18227: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18389: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:17748: \$? = $ac_status" >&5
-+  echo "$as_me:17755: \$? = $ac_status" >&5
+-  echo "$as_me:18230: \$? = $ac_status" >&5
++  echo "$as_me:18392: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17751: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17758: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:18233: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18395: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:17754: \$? = $ac_status" >&5
-+  echo "$as_me:17761: \$? = $ac_status" >&5
+-  echo "$as_me:18236: \$? = $ac_status" >&5
++  echo "$as_me:18398: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_bcopy=yes
  else
-@@ -17761,11 +17768,11 @@
+@@ -18243,11 +18405,11 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:17764: result: $ac_cv_func_bcopy" >&5
-+echo "$as_me:17771: result: $ac_cv_func_bcopy" >&5
+-echo "$as_me:18246: result: $ac_cv_func_bcopy" >&5
++echo "$as_me:18408: result: $ac_cv_func_bcopy" >&5
  echo "${ECHO_T}$ac_cv_func_bcopy" >&6
  if test $ac_cv_func_bcopy = yes; then
  
--	echo "$as_me:17768: checking if bcopy does overlapping moves" >&5
-+	echo "$as_me:17775: checking if bcopy does overlapping moves" >&5
+-	echo "$as_me:18250: checking if bcopy does overlapping moves" >&5
++	echo "$as_me:18412: checking if bcopy does overlapping moves" >&5
  echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6
  if test "${cf_cv_good_bcopy+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17775,7 +17782,7 @@
+@@ -18257,10 +18419,10 @@
    cf_cv_good_bcopy=unknown
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 17778 "configure"
-+#line 17785 "configure"
+-#line 18260 "configure"
++#line 18422 "configure"
  #include "confdefs.h"
  
- int main() {
-@@ -17789,15 +17796,15 @@
+-int main() {
++int main(void) {
+ 	static char data[] = "abcdefghijklmnopqrstuwwxyz";
+ 	char temp[40];
+ 	bcopy(data, temp, sizeof(data));
+@@ -18271,15 +18433,15 @@
  
  _ACEOF
  rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17792: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17799: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:18274: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18436: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:17795: \$? = $ac_status" >&5
-+  echo "$as_me:17802: \$? = $ac_status" >&5
+-  echo "$as_me:18277: \$? = $ac_status" >&5
++  echo "$as_me:18439: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17797: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17804: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:18279: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18441: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:17800: \$? = $ac_status" >&5
-+  echo "$as_me:17807: \$? = $ac_status" >&5
+-  echo "$as_me:18282: \$? = $ac_status" >&5
++  echo "$as_me:18444: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_good_bcopy=yes
  else
-@@ -17810,7 +17817,7 @@
+@@ -18292,7 +18454,7 @@
  fi
  
  fi
--echo "$as_me:17813: result: $cf_cv_good_bcopy" >&5
-+echo "$as_me:17820: result: $cf_cv_good_bcopy" >&5
+-echo "$as_me:18295: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:18457: result: $cf_cv_good_bcopy" >&5
  echo "${ECHO_T}$cf_cv_good_bcopy" >&6
  
  else
-@@ -17837,13 +17844,13 @@
+@@ -18319,13 +18481,13 @@
  for ac_func in posix_openpt
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:17840: checking for $ac_func" >&5
-+echo "$as_me:17847: checking for $ac_func" >&5
+-echo "$as_me:18322: checking for $ac_func" >&5
++echo "$as_me:18484: 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 17846 "configure"
-+#line 17853 "configure"
+-#line 18328 "configure"
++#line 18490 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func (); below.  */
-@@ -17874,16 +17881,16 @@
+@@ -18356,16 +18518,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17877: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17884: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:18359: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18521: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:17880: \$? = $ac_status" >&5
-+  echo "$as_me:17887: \$? = $ac_status" >&5
+-  echo "$as_me:18362: \$? = $ac_status" >&5
++  echo "$as_me:18524: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17883: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17890: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:18365: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18527: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:17886: \$? = $ac_status" >&5
-+  echo "$as_me:17893: \$? = $ac_status" >&5
+-  echo "$as_me:18368: \$? = $ac_status" >&5
++  echo "$as_me:18530: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_var=yes"
  else
-@@ -17893,7 +17900,7 @@
+@@ -18375,7 +18537,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:17896: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:17903: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "$as_me:18378: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:18540: 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 <&5
-+echo "$as_me:17913: checking if poll really works" >&5
+-echo "$as_me:18388: checking if poll really works" >&5
++echo "$as_me:18550: checking if poll really works" >&5
  echo $ECHO_N "checking if poll really works... $ECHO_C" >&6
  if test "${cf_cv_working_poll+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17913,7 +17920,7 @@
+@@ -18395,7 +18557,7 @@
    cf_cv_working_poll=unknown
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 17916 "configure"
-+#line 17923 "configure"
+-#line 18398 "configure"
++#line 18560 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -17965,15 +17972,15 @@
+@@ -18447,15 +18609,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17968: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17975: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:18450: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18612: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:17971: \$? = $ac_status" >&5
-+  echo "$as_me:17978: \$? = $ac_status" >&5
+-  echo "$as_me:18453: \$? = $ac_status" >&5
++  echo "$as_me:18615: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17973: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17980: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:18455: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18617: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:17976: \$? = $ac_status" >&5
-+  echo "$as_me:17983: \$? = $ac_status" >&5
+-  echo "$as_me:18458: \$? = $ac_status" >&5
++  echo "$as_me:18620: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_working_poll=yes
  else
-@@ -17985,21 +17992,21 @@
+@@ -18467,21 +18629,21 @@
  rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  fi
--echo "$as_me:17988: result: $cf_cv_working_poll" >&5
-+echo "$as_me:17995: result: $cf_cv_working_poll" >&5
+-echo "$as_me:18470: result: $cf_cv_working_poll" >&5
++echo "$as_me:18632: result: $cf_cv_working_poll" >&5
  echo "${ECHO_T}$cf_cv_working_poll" >&6
  test "$cf_cv_working_poll" = "yes" &&
  cat >>confdefs.h <<\EOF
  #define HAVE_WORKING_POLL 1
  EOF
  
--echo "$as_me:17995: checking for va_copy" >&5
-+echo "$as_me:18002: checking for va_copy" >&5
+-echo "$as_me:18477: checking for va_copy" >&5
++echo "$as_me:18639: checking for va_copy" >&5
  echo $ECHO_N "checking for va_copy... $ECHO_C" >&6
  if test "${cf_cv_have_va_copy+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
  cat >conftest.$ac_ext <<_ACEOF
--#line 18002 "configure"
-+#line 18009 "configure"
+-#line 18484 "configure"
++#line 18646 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -18016,16 +18023,16 @@
+@@ -18498,16 +18660,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18019: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18026: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:18501: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18663: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:18022: \$? = $ac_status" >&5
-+  echo "$as_me:18029: \$? = $ac_status" >&5
+-  echo "$as_me:18504: \$? = $ac_status" >&5
++  echo "$as_me:18666: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18025: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18032: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:18507: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18669: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:18028: \$? = $ac_status" >&5
-+  echo "$as_me:18035: \$? = $ac_status" >&5
+-  echo "$as_me:18510: \$? = $ac_status" >&5
++  echo "$as_me:18672: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_have_va_copy=yes
  else
-@@ -18035,7 +18042,7 @@
+@@ -18517,7 +18679,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:18038: result: $cf_cv_have_va_copy" >&5
-+echo "$as_me:18045: result: $cf_cv_have_va_copy" >&5
+-echo "$as_me:18520: result: $cf_cv_have_va_copy" >&5
++echo "$as_me:18682: result: $cf_cv_have_va_copy" >&5
  echo "${ECHO_T}$cf_cv_have_va_copy" >&6
  
  test "$cf_cv_have_va_copy" = yes &&
-@@ -18043,14 +18050,14 @@
+@@ -18525,14 +18687,14 @@
  #define HAVE_VA_COPY 1
  EOF
  
--echo "$as_me:18046: checking for __va_copy" >&5
-+echo "$as_me:18053: checking for __va_copy" >&5
+-echo "$as_me:18528: checking for __va_copy" >&5
++echo "$as_me:18690: checking for __va_copy" >&5
  echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6
  if test "${cf_cv_have___va_copy+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
  cat >conftest.$ac_ext <<_ACEOF
--#line 18053 "configure"
-+#line 18060 "configure"
+-#line 18535 "configure"
++#line 18697 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -18067,16 +18074,16 @@
+@@ -18549,16 +18711,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18070: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18077: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:18552: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18714: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:18073: \$? = $ac_status" >&5
-+  echo "$as_me:18080: \$? = $ac_status" >&5
+-  echo "$as_me:18555: \$? = $ac_status" >&5
++  echo "$as_me:18717: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18076: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18083: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:18558: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18720: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:18079: \$? = $ac_status" >&5
-+  echo "$as_me:18086: \$? = $ac_status" >&5
+-  echo "$as_me:18561: \$? = $ac_status" >&5
++  echo "$as_me:18723: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_have___va_copy=yes
  else
-@@ -18086,7 +18093,7 @@
+@@ -18568,7 +18730,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:18089: result: $cf_cv_have___va_copy" >&5
-+echo "$as_me:18096: result: $cf_cv_have___va_copy" >&5
+-echo "$as_me:18571: result: $cf_cv_have___va_copy" >&5
++echo "$as_me:18733: result: $cf_cv_have___va_copy" >&5
  echo "${ECHO_T}$cf_cv_have___va_copy" >&6
  
  test "$cf_cv_have___va_copy" = yes &&
-@@ -18094,13 +18101,13 @@
+@@ -18576,13 +18738,13 @@
  #define HAVE___VA_COPY 1
  EOF
  
--echo "$as_me:18097: checking for pid_t" >&5
-+echo "$as_me:18104: checking for pid_t" >&5
+-echo "$as_me:18579: checking for pid_t" >&5
++echo "$as_me:18741: 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 18103 "configure"
-+#line 18110 "configure"
+-#line 18585 "configure"
++#line 18747 "configure"
  #include "confdefs.h"
  $ac_includes_default
  int
-@@ -18115,16 +18122,16 @@
+@@ -18597,16 +18759,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18118: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18125: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:18600: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18762: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:18121: \$? = $ac_status" >&5
-+  echo "$as_me:18128: \$? = $ac_status" >&5
+-  echo "$as_me:18603: \$? = $ac_status" >&5
++  echo "$as_me:18765: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18124: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18131: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:18606: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18768: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:18127: \$? = $ac_status" >&5
-+  echo "$as_me:18134: \$? = $ac_status" >&5
+-  echo "$as_me:18609: \$? = $ac_status" >&5
++  echo "$as_me:18771: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_type_pid_t=yes
  else
-@@ -18134,7 +18141,7 @@
+@@ -18616,7 +18778,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
--echo "$as_me:18137: result: $ac_cv_type_pid_t" >&5
-+echo "$as_me:18144: result: $ac_cv_type_pid_t" >&5
+-echo "$as_me:18619: result: $ac_cv_type_pid_t" >&5
++echo "$as_me:18781: 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
    :
-@@ -18149,23 +18156,23 @@
+@@ -18631,23 +18793,23 @@
  for ac_header in unistd.h vfork.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:18152: checking for $ac_header" >&5
-+echo "$as_me:18159: checking for $ac_header" >&5
+-echo "$as_me:18634: checking for $ac_header" >&5
++echo "$as_me:18796: 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 18158 "configure"
-+#line 18165 "configure"
+-#line 18640 "configure"
++#line 18802 "configure"
  #include "confdefs.h"
  #include <$ac_header>
  _ACEOF
--if { (eval echo "$as_me:18162: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:18169: \"$ac_cpp conftest.$ac_ext\"") >&5
+-if { (eval echo "$as_me:18644: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:18806: \"$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:18168: \$? = $ac_status" >&5
-+  echo "$as_me:18175: \$? = $ac_status" >&5
+-  echo "$as_me:18650: \$? = $ac_status" >&5
++  echo "$as_me:18812: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -18184,7 +18191,7 @@
+@@ -18666,7 +18828,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
--echo "$as_me:18187: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:18194: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "$as_me:18669: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:18831: 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 <&5
-+echo "$as_me:18207: checking for $ac_func" >&5
+-echo "$as_me:18682: checking for $ac_func" >&5
++echo "$as_me:18844: 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 18206 "configure"
-+#line 18213 "configure"
+-#line 18688 "configure"
++#line 18850 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func (); below.  */
-@@ -18234,16 +18241,16 @@
+@@ -18716,16 +18878,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18237: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18244: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:18719: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18881: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:18240: \$? = $ac_status" >&5
-+  echo "$as_me:18247: \$? = $ac_status" >&5
+-  echo "$as_me:18722: \$? = $ac_status" >&5
++  echo "$as_me:18884: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18243: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18250: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:18725: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18887: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:18246: \$? = $ac_status" >&5
-+  echo "$as_me:18253: \$? = $ac_status" >&5
+-  echo "$as_me:18728: \$? = $ac_status" >&5
++  echo "$as_me:18890: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_var=yes"
  else
-@@ -18253,7 +18260,7 @@
+@@ -18735,7 +18897,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:18256: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:18263: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "$as_me:18738: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:18900: 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 <&5
-+  echo "$as_me:18275: checking for working fork" >&5
+-  echo "$as_me:18750: checking for working fork" >&5
++  echo "$as_me:18912: 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
-@@ -18288,15 +18295,15 @@
+@@ -18770,15 +18932,15 @@
        }
  _ACEOF
  rm -f conftest$ac_exeext
--if { (eval echo "$as_me:18291: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18298: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:18773: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18935: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:18294: \$? = $ac_status" >&5
-+  echo "$as_me:18301: \$? = $ac_status" >&5
+-  echo "$as_me:18776: \$? = $ac_status" >&5
++  echo "$as_me:18938: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:18296: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18303: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:18778: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18940: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:18299: \$? = $ac_status" >&5
-+  echo "$as_me:18306: \$? = $ac_status" >&5
+-  echo "$as_me:18781: \$? = $ac_status" >&5
++  echo "$as_me:18943: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_fork_works=yes
  else
-@@ -18308,7 +18315,7 @@
+@@ -18790,7 +18952,7 @@
  rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  fi
--echo "$as_me:18311: result: $ac_cv_func_fork_works" >&5
-+echo "$as_me:18318: result: $ac_cv_func_fork_works" >&5
+-echo "$as_me:18793: result: $ac_cv_func_fork_works" >&5
++echo "$as_me:18955: result: $ac_cv_func_fork_works" >&5
  echo "${ECHO_T}$ac_cv_func_fork_works" >&6
  
  fi
-@@ -18322,12 +18329,12 @@
+@@ -18804,12 +18966,12 @@
        ac_cv_func_fork_works=yes
        ;;
    esac
--  { echo "$as_me:18325: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
-+  { echo "$as_me:18332: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+-  { echo "$as_me:18807: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:18969: 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:18330: checking for working vfork" >&5
-+  echo "$as_me:18337: checking for working vfork" >&5
+-  echo "$as_me:18812: checking for working vfork" >&5
++  echo "$as_me:18974: 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
-@@ -18336,7 +18343,7 @@
+@@ -18818,7 +18980,7 @@
    ac_cv_func_vfork_works=cross
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 18339 "configure"
-+#line 18346 "configure"
+-#line 18821 "configure"
++#line 18983 "configure"
  #include "confdefs.h"
  /* Thanks to Paul Eggert for this test.  */
  #include 
-@@ -18433,15 +18440,15 @@
+@@ -18915,15 +19077,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
--if { (eval echo "$as_me:18436: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18443: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:18918: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19080: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:18439: \$? = $ac_status" >&5
-+  echo "$as_me:18446: \$? = $ac_status" >&5
+-  echo "$as_me:18921: \$? = $ac_status" >&5
++  echo "$as_me:19083: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:18441: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18448: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:18923: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19085: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:18444: \$? = $ac_status" >&5
-+  echo "$as_me:18451: \$? = $ac_status" >&5
+-  echo "$as_me:18926: \$? = $ac_status" >&5
++  echo "$as_me:19088: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_vfork_works=yes
  else
-@@ -18453,13 +18460,13 @@
+@@ -18935,13 +19097,13 @@
  rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  fi
--echo "$as_me:18456: result: $ac_cv_func_vfork_works" >&5
-+echo "$as_me:18463: result: $ac_cv_func_vfork_works" >&5
+-echo "$as_me:18938: result: $ac_cv_func_vfork_works" >&5
++echo "$as_me:19100: 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:18462: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
-+  { echo "$as_me:18469: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+-  { echo "$as_me:18944: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:19106: 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
  
-@@ -18486,7 +18493,7 @@
+@@ -18968,7 +19130,7 @@
  
  # special check for test/ditto.c
  
--echo "$as_me:18489: checking for openpty in -lutil" >&5
-+echo "$as_me:18496: checking for openpty in -lutil" >&5
+-echo "$as_me:18971: checking for openpty in -lutil" >&5
++echo "$as_me:19133: checking for openpty in -lutil" >&5
  echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
  if test "${ac_cv_lib_util_openpty+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18494,7 +18501,7 @@
+@@ -18976,7 +19138,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lutil  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 18497 "configure"
-+#line 18504 "configure"
+-#line 18979 "configure"
++#line 19141 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -18513,16 +18520,16 @@
+@@ -18995,16 +19157,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18516: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18523: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:18998: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19160: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:18519: \$? = $ac_status" >&5
-+  echo "$as_me:18526: \$? = $ac_status" >&5
+-  echo "$as_me:19001: \$? = $ac_status" >&5
++  echo "$as_me:19163: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18522: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18529: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:19004: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19166: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:18525: \$? = $ac_status" >&5
-+  echo "$as_me:18532: \$? = $ac_status" >&5
+-  echo "$as_me:19007: \$? = $ac_status" >&5
++  echo "$as_me:19169: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_util_openpty=yes
  else
-@@ -18533,7 +18540,7 @@
+@@ -19015,7 +19177,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:18536: result: $ac_cv_lib_util_openpty" >&5
-+echo "$as_me:18543: result: $ac_cv_lib_util_openpty" >&5
+-echo "$as_me:19018: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:19180: result: $ac_cv_lib_util_openpty" >&5
  echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
  if test $ac_cv_lib_util_openpty = yes; then
    cf_cv_lib_util=yes
-@@ -18541,7 +18548,7 @@
+@@ -19023,7 +19185,7 @@
    cf_cv_lib_util=no
  fi
  
--echo "$as_me:18544: checking for openpty header" >&5
-+echo "$as_me:18551: checking for openpty header" >&5
+-echo "$as_me:19026: checking for openpty header" >&5
++echo "$as_me:19188: checking for openpty header" >&5
  echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
  if test "${cf_cv_func_openpty+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18568,7 +18575,7 @@
+@@ -19050,7 +19212,7 @@
  	for cf_header in pty.h libutil.h util.h
  	do
  	cat >conftest.$ac_ext <<_ACEOF
--#line 18571 "configure"
-+#line 18578 "configure"
+-#line 19053 "configure"
++#line 19215 "configure"
  #include "confdefs.h"
  
  #include <$cf_header>
-@@ -18585,16 +18592,16 @@
+@@ -19067,16 +19229,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18588: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18595: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:19070: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19232: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:18591: \$? = $ac_status" >&5
-+  echo "$as_me:18598: \$? = $ac_status" >&5
+-  echo "$as_me:19073: \$? = $ac_status" >&5
++  echo "$as_me:19235: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18594: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18601: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:19076: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19238: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:18597: \$? = $ac_status" >&5
-+  echo "$as_me:18604: \$? = $ac_status" >&5
+-  echo "$as_me:19079: \$? = $ac_status" >&5
++  echo "$as_me:19241: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
  		cf_cv_func_openpty=$cf_header
-@@ -18612,7 +18619,7 @@
+@@ -19094,7 +19256,7 @@
  	LIBS="$cf_save_LIBS"
  
  fi
--echo "$as_me:18615: result: $cf_cv_func_openpty" >&5
-+echo "$as_me:18622: result: $cf_cv_func_openpty" >&5
+-echo "$as_me:19097: result: $cf_cv_func_openpty" >&5
++echo "$as_me:19259: result: $cf_cv_func_openpty" >&5
  echo "${ECHO_T}$cf_cv_func_openpty" >&6
  
  if test "$cf_cv_func_openpty" != no ; then
-@@ -18682,7 +18689,7 @@
+@@ -19164,7 +19326,7 @@
  			  cf_save_CPPFLAGS=$CPPFLAGS
  			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  			  cat >conftest.$ac_ext <<_ACEOF
--#line 18685 "configure"
-+#line 18692 "configure"
+-#line 19167 "configure"
++#line 19329 "configure"
  #include "confdefs.h"
  #include 
  int
-@@ -18694,16 +18701,16 @@
+@@ -19176,16 +19338,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18697: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18704: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:19179: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19341: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:18700: \$? = $ac_status" >&5
-+  echo "$as_me:18707: \$? = $ac_status" >&5
+-  echo "$as_me:19182: \$? = $ac_status" >&5
++  echo "$as_me:19344: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18703: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18710: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:19185: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19347: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:18706: \$? = $ac_status" >&5
-+  echo "$as_me:18713: \$? = $ac_status" >&5
+-  echo "$as_me:19188: \$? = $ac_status" >&5
++  echo "$as_me:19350: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -18720,7 +18727,7 @@
+@@ -19202,7 +19364,7 @@
  		if test "$cf_have_incdir" = no ; then
  		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
  
--echo "${as_me:-configure}:18723: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:18730: testing adding $cf_add_incdir to include-path ..." 1>&5
+-echo "${as_me:-configure}:19205: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:19367: testing adding $cf_add_incdir to include-path ..." 1>&5
  
  		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  
-@@ -18756,7 +18763,7 @@
+@@ -19238,7 +19400,7 @@
  			if test "$cf_have_libdir" = no ; then
  				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
  
--echo "${as_me:-configure}:18759: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:18766: testing adding $cf_add_libdir to library-path ..." 1>&5
+-echo "${as_me:-configure}:19241: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:19403: testing adding $cf_add_libdir to library-path ..." 1>&5
  
  				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
  			fi
-@@ -18767,7 +18774,7 @@
+@@ -19249,7 +19411,7 @@
  	else
  		case "$with_hashed_db" in
  		(./*|../*|/*)
--			{ echo "$as_me:18770: WARNING: no such directory $with_hashed_db" >&5
-+			{ echo "$as_me:18777: WARNING: no such directory $with_hashed_db" >&5
+-			{ echo "$as_me:19252: WARNING: no such directory $with_hashed_db" >&5
++			{ echo "$as_me:19414: WARNING: no such directory $with_hashed_db" >&5
  echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
  			;;
  		(*)
-@@ -18836,7 +18843,7 @@
+@@ -19318,7 +19480,7 @@
  			  cf_save_CPPFLAGS=$CPPFLAGS
  			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  			  cat >conftest.$ac_ext <<_ACEOF
--#line 18839 "configure"
-+#line 18846 "configure"
+-#line 19321 "configure"
++#line 19483 "configure"
  #include "confdefs.h"
  #include 
  int
-@@ -18848,16 +18855,16 @@
+@@ -19330,16 +19492,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18851: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18858: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:19333: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19495: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:18854: \$? = $ac_status" >&5
-+  echo "$as_me:18861: \$? = $ac_status" >&5
+-  echo "$as_me:19336: \$? = $ac_status" >&5
++  echo "$as_me:19498: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18857: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18864: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:19339: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19501: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:18860: \$? = $ac_status" >&5
-+  echo "$as_me:18867: \$? = $ac_status" >&5
+-  echo "$as_me:19342: \$? = $ac_status" >&5
++  echo "$as_me:19504: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -18874,7 +18881,7 @@
+@@ -19356,7 +19518,7 @@
  		if test "$cf_have_incdir" = no ; then
  		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
  
--echo "${as_me:-configure}:18877: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:18884: testing adding $cf_add_incdir to include-path ..." 1>&5
+-echo "${as_me:-configure}:19359: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:19521: testing adding $cf_add_incdir to include-path ..." 1>&5
  
  		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  
-@@ -18954,7 +18961,7 @@
+@@ -19436,7 +19598,7 @@
  			if test "$cf_have_libdir" = no ; then
  				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
  
--echo "${as_me:-configure}:18957: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:18964: testing adding $cf_add_libdir to library-path ..." 1>&5
+-echo "${as_me:-configure}:19439: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:19601: testing adding $cf_add_libdir to library-path ..." 1>&5
  
  				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
  			fi
-@@ -18971,23 +18978,23 @@
+@@ -19453,23 +19615,23 @@
  	fi
  esac
  
--echo "$as_me:18974: checking for db.h" >&5
-+echo "$as_me:18981: checking for db.h" >&5
+-echo "$as_me:19456: checking for db.h" >&5
++echo "$as_me:19618: checking for db.h" >&5
  echo $ECHO_N "checking for db.h... $ECHO_C" >&6
  if test "${ac_cv_header_db_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 18980 "configure"
-+#line 18987 "configure"
+-#line 19462 "configure"
++#line 19624 "configure"
  #include "confdefs.h"
  #include 
  _ACEOF
--if { (eval echo "$as_me:18984: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:18991: \"$ac_cpp conftest.$ac_ext\"") >&5
+-if { (eval echo "$as_me:19466: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:19628: \"$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:18990: \$? = $ac_status" >&5
-+  echo "$as_me:18997: \$? = $ac_status" >&5
+-  echo "$as_me:19472: \$? = $ac_status" >&5
++  echo "$as_me:19634: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -19006,11 +19013,11 @@
+@@ -19488,11 +19650,11 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
--echo "$as_me:19009: result: $ac_cv_header_db_h" >&5
-+echo "$as_me:19016: result: $ac_cv_header_db_h" >&5
+-echo "$as_me:19491: result: $ac_cv_header_db_h" >&5
++echo "$as_me:19653: result: $ac_cv_header_db_h" >&5
  echo "${ECHO_T}$ac_cv_header_db_h" >&6
  if test $ac_cv_header_db_h = yes; then
  
--echo "$as_me:19013: checking for version of db" >&5
-+echo "$as_me:19020: checking for version of db" >&5
+-echo "$as_me:19495: checking for version of db" >&5
++echo "$as_me:19657: checking for version of db" >&5
  echo $ECHO_N "checking for version of db... $ECHO_C" >&6
  if test "${cf_cv_hashed_db_version+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19021,10 +19028,10 @@
+@@ -19503,10 +19665,10 @@
  for cf_db_version in 1 2 3 4 5 6
  do
  
--echo "${as_me:-configure}:19024: testing checking for db version $cf_db_version ..." 1>&5
-+echo "${as_me:-configure}:19031: testing checking for db version $cf_db_version ..." 1>&5
+-echo "${as_me:-configure}:19506: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me:-configure}:19668: testing checking for db version $cf_db_version ..." 1>&5
  
  	cat >conftest.$ac_ext <<_ACEOF
--#line 19027 "configure"
-+#line 19034 "configure"
+-#line 19509 "configure"
++#line 19671 "configure"
  #include "confdefs.h"
  
  $ac_includes_default
-@@ -19054,16 +19061,16 @@
+@@ -19536,16 +19698,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19057: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19064: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:19539: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19701: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:19060: \$? = $ac_status" >&5
-+  echo "$as_me:19067: \$? = $ac_status" >&5
+-  echo "$as_me:19542: \$? = $ac_status" >&5
++  echo "$as_me:19704: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19063: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19070: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:19545: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19707: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:19066: \$? = $ac_status" >&5
-+  echo "$as_me:19073: \$? = $ac_status" >&5
+-  echo "$as_me:19548: \$? = $ac_status" >&5
++  echo "$as_me:19710: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
  	cf_cv_hashed_db_version=$cf_db_version
-@@ -19077,16 +19084,16 @@
+@@ -19559,16 +19721,16 @@
  done
  
  fi
--echo "$as_me:19080: result: $cf_cv_hashed_db_version" >&5
-+echo "$as_me:19087: result: $cf_cv_hashed_db_version" >&5
+-echo "$as_me:19562: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:19724: result: $cf_cv_hashed_db_version" >&5
  echo "${ECHO_T}$cf_cv_hashed_db_version" >&6
  
  if test "$cf_cv_hashed_db_version" = unknown ; then
--	{ { echo "$as_me:19084: error: Cannot determine version of db" >&5
-+	{ { echo "$as_me:19091: error: Cannot determine version of db" >&5
+-	{ { echo "$as_me:19566: error: Cannot determine version of db" >&5
++	{ { echo "$as_me:19728: error: Cannot determine version of db" >&5
  echo "$as_me: error: Cannot determine version of db" >&2;}
     { (exit 1); exit 1; }; }
  else
  
--echo "$as_me:19089: checking for db libraries" >&5
-+echo "$as_me:19096: checking for db libraries" >&5
+-echo "$as_me:19571: checking for db libraries" >&5
++echo "$as_me:19733: checking for db libraries" >&5
  echo $ECHO_N "checking for db libraries... $ECHO_C" >&6
  if test "${cf_cv_hashed_db_libs+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19116,10 +19123,10 @@
+@@ -19598,10 +19760,10 @@
  
  	fi
  
--echo "${as_me:-configure}:19119: testing checking for library "$cf_db_libs" ..." 1>&5
-+echo "${as_me:-configure}:19126: testing checking for library "$cf_db_libs" ..." 1>&5
+-echo "${as_me:-configure}:19601: testing checking for library "$cf_db_libs" ..." 1>&5
++echo "${as_me:-configure}:19763: testing checking for library "$cf_db_libs" ..." 1>&5
  
  	cat >conftest.$ac_ext <<_ACEOF
--#line 19122 "configure"
-+#line 19129 "configure"
+-#line 19604 "configure"
++#line 19766 "configure"
  #include "confdefs.h"
  
  $ac_includes_default
-@@ -19174,16 +19181,16 @@
+@@ -19656,16 +19818,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19177: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19184: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:19659: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19821: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:19180: \$? = $ac_status" >&5
-+  echo "$as_me:19187: \$? = $ac_status" >&5
+-  echo "$as_me:19662: \$? = $ac_status" >&5
++  echo "$as_me:19824: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19183: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19190: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:19665: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19827: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:19186: \$? = $ac_status" >&5
-+  echo "$as_me:19193: \$? = $ac_status" >&5
+-  echo "$as_me:19668: \$? = $ac_status" >&5
++  echo "$as_me:19830: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
  	if test -n "$cf_db_libs" ; then
-@@ -19203,11 +19210,11 @@
+@@ -19685,11 +19847,11 @@
  done
  
  fi
--echo "$as_me:19206: result: $cf_cv_hashed_db_libs" >&5
-+echo "$as_me:19213: result: $cf_cv_hashed_db_libs" >&5
+-echo "$as_me:19688: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:19850: result: $cf_cv_hashed_db_libs" >&5
  echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6
  
  	if test "$cf_cv_hashed_db_libs" = unknown ; then
--		{ { echo "$as_me:19210: error: Cannot determine library for db" >&5
-+		{ { echo "$as_me:19217: error: Cannot determine library for db" >&5
+-		{ { echo "$as_me:19692: error: Cannot determine library for db" >&5
++		{ { echo "$as_me:19854: error: Cannot determine library for db" >&5
  echo "$as_me: error: Cannot determine library for db" >&2;}
     { (exit 1); exit 1; }; }
  	elif test "$cf_cv_hashed_db_libs" != default ; then
-@@ -19233,7 +19240,7 @@
+@@ -19715,7 +19877,7 @@
  
  else
  
--	{ { echo "$as_me:19236: error: Cannot find db.h" >&5
-+	{ { echo "$as_me:19243: error: Cannot find db.h" >&5
+-	{ { echo "$as_me:19718: error: Cannot find db.h" >&5
++	{ { echo "$as_me:19880: error: Cannot find db.h" >&5
  echo "$as_me: error: Cannot find db.h" >&2;}
     { (exit 1); exit 1; }; }
  
-@@ -19248,7 +19255,7 @@
+@@ -19730,7 +19892,7 @@
  
  # Just in case, check if the C compiler has a bool type.
  
--echo "$as_me:19251: checking if we should include stdbool.h" >&5
-+echo "$as_me:19258: checking if we should include stdbool.h" >&5
+-echo "$as_me:19733: checking if we should include stdbool.h" >&5
++echo "$as_me:19895: checking if we should include stdbool.h" >&5
  echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
  
  if test "${cf_cv_header_stdbool_h+set}" = set; then
-@@ -19256,7 +19263,7 @@
+@@ -19738,7 +19900,7 @@
  else
  
  	cat >conftest.$ac_ext <<_ACEOF
--#line 19259 "configure"
-+#line 19266 "configure"
+-#line 19741 "configure"
++#line 19903 "configure"
  #include "confdefs.h"
  
  int
-@@ -19268,23 +19275,23 @@
+@@ -19750,23 +19912,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19271: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19278: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:19753: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19915: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:19274: \$? = $ac_status" >&5
-+  echo "$as_me:19281: \$? = $ac_status" >&5
+-  echo "$as_me:19756: \$? = $ac_status" >&5
++  echo "$as_me:19918: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19277: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19284: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:19759: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19921: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:19280: \$? = $ac_status" >&5
-+  echo "$as_me:19287: \$? = $ac_status" >&5
+-  echo "$as_me:19762: \$? = $ac_status" >&5
++  echo "$as_me:19924: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_header_stdbool_h=0
  else
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
  cat >conftest.$ac_ext <<_ACEOF
--#line 19287 "configure"
-+#line 19294 "configure"
+-#line 19769 "configure"
++#line 19931 "configure"
  #include "confdefs.h"
  
  #ifndef __BEOS__
-@@ -19300,16 +19307,16 @@
+@@ -19782,16 +19944,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19303: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19310: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:19785: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19947: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:19306: \$? = $ac_status" >&5
-+  echo "$as_me:19313: \$? = $ac_status" >&5
+-  echo "$as_me:19788: \$? = $ac_status" >&5
++  echo "$as_me:19950: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19309: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19316: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:19791: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19953: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:19312: \$? = $ac_status" >&5
-+  echo "$as_me:19319: \$? = $ac_status" >&5
+-  echo "$as_me:19794: \$? = $ac_status" >&5
++  echo "$as_me:19956: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_header_stdbool_h=1
  else
-@@ -19323,13 +19330,13 @@
+@@ -19805,13 +19967,13 @@
  fi
  
  if test "$cf_cv_header_stdbool_h" = 1
--then	echo "$as_me:19326: result: yes" >&5
-+then	echo "$as_me:19333: result: yes" >&5
+-then	echo "$as_me:19808: result: yes" >&5
++then	echo "$as_me:19970: result: yes" >&5
  echo "${ECHO_T}yes" >&6
--else	echo "$as_me:19328: result: no" >&5
-+else	echo "$as_me:19335: result: no" >&5
+-else	echo "$as_me:19810: result: no" >&5
++else	echo "$as_me:19972: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
--echo "$as_me:19332: checking for builtin bool type" >&5
-+echo "$as_me:19339: checking for builtin bool type" >&5
+-echo "$as_me:19814: checking for builtin bool type" >&5
++echo "$as_me:19976: checking for builtin bool type" >&5
  echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
  
  if test "${cf_cv_cc_bool_type+set}" = set; then
-@@ -19337,7 +19344,7 @@
+@@ -19819,7 +19981,7 @@
  else
  
  	cat >conftest.$ac_ext <<_ACEOF
--#line 19340 "configure"
-+#line 19347 "configure"
+-#line 19822 "configure"
++#line 19984 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -19352,16 +19359,16 @@
+@@ -19834,16 +19996,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19355: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19362: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:19837: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19999: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:19358: \$? = $ac_status" >&5
-+  echo "$as_me:19365: \$? = $ac_status" >&5
+-  echo "$as_me:19840: \$? = $ac_status" >&5
++  echo "$as_me:20002: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19361: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19368: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:19843: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20005: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:19364: \$? = $ac_status" >&5
-+  echo "$as_me:19371: \$? = $ac_status" >&5
+-  echo "$as_me:19846: \$? = $ac_status" >&5
++  echo "$as_me:20008: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_cc_bool_type=1
  else
-@@ -19374,9 +19381,9 @@
+@@ -19856,9 +20018,9 @@
  fi
  
  if test "$cf_cv_cc_bool_type" = 1
--then	echo "$as_me:19377: result: yes" >&5
-+then	echo "$as_me:19384: result: yes" >&5
+-then	echo "$as_me:19859: result: yes" >&5
++then	echo "$as_me:20021: result: yes" >&5
  echo "${ECHO_T}yes" >&6
--else	echo "$as_me:19379: result: no" >&5
-+else	echo "$as_me:19386: result: no" >&5
+-else	echo "$as_me:19861: result: no" >&5
++else	echo "$as_me:20023: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -19393,10 +19400,10 @@
+@@ -19875,10 +20037,10 @@
  
  	cf_save="$LIBS"
  	LIBS="$LIBS $CXXLIBS"
--	echo "$as_me:19396: checking if we already have C++ library" >&5
-+	echo "$as_me:19403: checking if we already have C++ library" >&5
+-	echo "$as_me:19878: checking if we already have C++ library" >&5
++	echo "$as_me:20040: checking if we already have C++ library" >&5
  echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6
  	cat >conftest.$ac_ext <<_ACEOF
--#line 19399 "configure"
-+#line 19406 "configure"
- #include "confdefs.h"
- 
- 			#include 
-@@ -19410,16 +19417,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19413: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19420: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19416: \$? = $ac_status" >&5
-+  echo "$as_me:19423: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19419: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19426: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19422: \$? = $ac_status" >&5
-+  echo "$as_me:19429: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_have_libstdcpp=yes
- else
-@@ -19428,7 +19435,7 @@
- cf_have_libstdcpp=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--	echo "$as_me:19431: result: $cf_have_libstdcpp" >&5
-+	echo "$as_me:19438: result: $cf_have_libstdcpp" >&5
- echo "${ECHO_T}$cf_have_libstdcpp" >&6
- 	LIBS="$cf_save"
- 
-@@ -19436,14 +19443,18 @@
- 	then
- 		case $cf_cv_system_name in
- 		(os2*)
--			cf_stdcpp_libname=stdcpp
-+			if test -z "`g++ -dM -E - < /dev/null | grep __KLIBC__`"; then
-+				cf_stdcpp_libname=stdcpp
-+			else
-+				cf_stdcpp_libname=stdc++
-+			fi
- 			;;
- 		(*)
- 			cf_stdcpp_libname=stdc++
- 			;;
- 		esac
- 
--		echo "$as_me:19446: checking for library $cf_stdcpp_libname" >&5
-+		echo "$as_me:19457: checking for library $cf_stdcpp_libname" >&5
- echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6
- if test "${cf_cv_libstdcpp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19469,7 +19480,7 @@
- LIBS="$cf_add_libs"
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 19472 "configure"
-+#line 19483 "configure"
- #include "confdefs.h"
- 
- 				#include 
-@@ -19483,16 +19494,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19486: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19497: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19489: \$? = $ac_status" >&5
-+  echo "$as_me:19500: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19492: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19503: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19495: \$? = $ac_status" >&5
-+  echo "$as_me:19506: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_libstdcpp=yes
- else
-@@ -19504,7 +19515,7 @@
- 			LIBS="$cf_save"
- 
- fi
--echo "$as_me:19507: result: $cf_cv_libstdcpp" >&5
-+echo "$as_me:19518: result: $cf_cv_libstdcpp" >&5
- echo "${ECHO_T}$cf_cv_libstdcpp" >&6
- 		test "$cf_cv_libstdcpp" = yes && {
- cf_add_libs="-l$cf_stdcpp_libname"
-@@ -19526,7 +19537,7 @@
- 	fi
- fi
- 
--	echo "$as_me:19529: checking whether $CXX understands -c and -o together" >&5
-+	echo "$as_me:19540: checking whether $CXX understands -c and -o together" >&5
- echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6
- if test "${cf_cv_prog_CXX_c_o+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19542,15 +19553,15 @@
- # We do the test twice because some compilers refuse to overwrite an
- # existing .o file with -o, though they will create one.
- ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
--if { (eval echo "$as_me:19545: \"$ac_try\"") >&5
-+if { (eval echo "$as_me:19556: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19548: \$? = $ac_status" >&5
-+  echo "$as_me:19559: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--  test -f conftest2.$ac_objext && { (eval echo "$as_me:19550: \"$ac_try\"") >&5
-+  test -f conftest2.$ac_objext && { (eval echo "$as_me:19561: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19553: \$? = $ac_status" >&5
-+  echo "$as_me:19564: \$? = $ac_status" >&5
-   (exit $ac_status); };
- then
-   eval cf_cv_prog_CXX_c_o=yes
-@@ -19561,10 +19572,10 @@
- 
- fi
- if test $cf_cv_prog_CXX_c_o = yes; then
--  echo "$as_me:19564: result: yes" >&5
-+  echo "$as_me:19575: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--  echo "$as_me:19567: result: no" >&5
-+  echo "$as_me:19578: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -19584,7 +19595,7 @@
- 	;;
- esac
- if test "$GXX" = yes; then
--	echo "$as_me:19587: checking for lib$cf_gpp_libname" >&5
-+	echo "$as_me:19598: checking for lib$cf_gpp_libname" >&5
- echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
- 	cf_save="$LIBS"
- 
-@@ -19605,7 +19616,7 @@
- LIBS="$cf_add_libs"
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19608 "configure"
-+#line 19619 "configure"
- #include "confdefs.h"
- 
- #include <$cf_gpp_libname/builtin.h>
-@@ -19619,16 +19630,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19622: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19633: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19625: \$? = $ac_status" >&5
-+  echo "$as_me:19636: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19628: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19639: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19631: \$? = $ac_status" >&5
-+  echo "$as_me:19642: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cxx_library=yes
- 
-@@ -19665,7 +19676,7 @@
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 19668 "configure"
-+#line 19679 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -19679,16 +19690,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19682: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19693: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19685: \$? = $ac_status" >&5
-+  echo "$as_me:19696: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19688: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19699: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19691: \$? = $ac_status" >&5
-+  echo "$as_me:19702: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cxx_library=yes
- 
-@@ -19721,7 +19732,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	LIBS="$cf_save"
--	echo "$as_me:19724: result: $cf_cxx_library" >&5
-+	echo "$as_me:19735: result: $cf_cxx_library" >&5
- echo "${ECHO_T}$cf_cxx_library" >&6
- fi
- 
-@@ -19737,7 +19748,7 @@
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- ac_main_return=return
--echo "$as_me:19740: checking how to run the C++ preprocessor" >&5
-+echo "$as_me:19751: checking how to run the C++ preprocessor" >&5
- echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
- if test -z "$CXXCPP"; then
-   if test "${ac_cv_prog_CXXCPP+set}" = set; then
-@@ -19754,18 +19765,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19757 "configure"
-+#line 19768 "configure"
- #include "confdefs.h"
- #include 
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:19762: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19773: \"$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:19768: \$? = $ac_status" >&5
-+  echo "$as_me:19779: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19788,17 +19799,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19791 "configure"
-+#line 19802 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:19795: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19806: \"$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:19801: \$? = $ac_status" >&5
-+  echo "$as_me:19812: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19835,7 +19846,7 @@
- else
-   ac_cv_prog_CXXCPP=$CXXCPP
- fi
--echo "$as_me:19838: result: $CXXCPP" >&5
-+echo "$as_me:19849: result: $CXXCPP" >&5
- echo "${ECHO_T}$CXXCPP" >&6
- ac_preproc_ok=false
- for ac_cxx_preproc_warn_flag in '' yes
-@@ -19845,18 +19856,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19848 "configure"
-+#line 19859 "configure"
- #include "confdefs.h"
- #include 
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:19853: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19864: \"$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:19859: \$? = $ac_status" >&5
-+  echo "$as_me:19870: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19879,17 +19890,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19882 "configure"
-+#line 19893 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:19886: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19897: \"$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:19892: \$? = $ac_status" >&5
-+  echo "$as_me:19903: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19917,7 +19928,7 @@
- if $ac_preproc_ok; then
-   :
- else
--  { { echo "$as_me:19920: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
-+  { { echo "$as_me:19931: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
- echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -19932,23 +19943,23 @@
- for ac_header in typeinfo
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:19935: checking for $ac_header" >&5
-+echo "$as_me:19946: 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 19941 "configure"
-+#line 19952 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:19945: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19956: \"$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:19951: \$? = $ac_status" >&5
-+  echo "$as_me:19962: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19967,7 +19978,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:19970: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:19981: 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 <&5
-+echo "$as_me:19994: 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 19989 "configure"
-+#line 20000 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:19993: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:20004: \"$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:19999: \$? = $ac_status" >&5
-+  echo "$as_me:20010: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -20015,7 +20026,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:20018: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:20029: 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 <&5
-+	echo "$as_me:20040: checking if iostream uses std-namespace" >&5
- echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 20032 "configure"
+-#line 19881 "configure"
 +#line 20043 "configure"
  #include "confdefs.h"
  
- #include 
-@@ -20046,16 +20057,16 @@
+ 			#include 
+@@ -19892,16 +20054,16 @@
  }
  _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20049: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20060: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19895: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20057: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:20052: \$? = $ac_status" >&5
-+  echo "$as_me:20063: \$? = $ac_status" >&5
+-  echo "$as_me:19898: \$? = $ac_status" >&5
++  echo "$as_me:20060: \$? = $ac_status" >&5
    (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20055: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20066: \"$ac_try\"") >&5
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19901: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20063: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:20058: \$? = $ac_status" >&5
-+  echo "$as_me:20069: \$? = $ac_status" >&5
+-  echo "$as_me:19904: \$? = $ac_status" >&5
++  echo "$as_me:20066: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-   cf_iostream_namespace=yes
+   cf_have_libstdcpp=yes
  else
-@@ -20064,7 +20075,7 @@
- cf_iostream_namespace=no
+@@ -19910,7 +20072,7 @@
+ cf_have_libstdcpp=no
  fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:20067: result: $cf_iostream_namespace" >&5
-+	echo "$as_me:20078: result: $cf_iostream_namespace" >&5
- echo "${ECHO_T}$cf_iostream_namespace" >&6
- 	if test "$cf_iostream_namespace" = yes ; then
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-	echo "$as_me:19913: result: $cf_have_libstdcpp" >&5
++	echo "$as_me:20075: result: $cf_have_libstdcpp" >&5
+ echo "${ECHO_T}$cf_have_libstdcpp" >&6
+ 	LIBS="$cf_save"
  
-@@ -20075,7 +20086,7 @@
+@@ -19929,7 +20091,7 @@
+ 			;;
+ 		esac
+ 
+-		echo "$as_me:19932: checking for library $cf_stdcpp_libname" >&5
++		echo "$as_me:20094: checking for library $cf_stdcpp_libname" >&5
+ echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6
+ if test "${cf_cv_libstdcpp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19955,7 +20117,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 19958 "configure"
++#line 20120 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -19969,16 +20131,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19972: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20134: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19975: \$? = $ac_status" >&5
++  echo "$as_me:20137: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19978: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20140: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19981: \$? = $ac_status" >&5
++  echo "$as_me:20143: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_libstdcpp=yes
+ else
+@@ -19990,7 +20152,7 @@
+ 			LIBS="$cf_save"
+ 
+ fi
+-echo "$as_me:19993: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:20155: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ 		test "$cf_cv_libstdcpp" = yes && {
+ cf_add_libs="-l$cf_stdcpp_libname"
+@@ -20012,14 +20174,14 @@
  	fi
  fi
  
--echo "$as_me:20078: checking if we should include stdbool.h" >&5
-+echo "$as_me:20089: checking if we should include stdbool.h" >&5
- echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
- 
- if test "${cf_cv_header_stdbool_h+set}" = set; then
-@@ -20083,7 +20094,7 @@
+-	echo "$as_me:20015: checking whether $CXX understands -c and -o together" >&5
++	echo "$as_me:20177: checking whether $CXX understands -c and -o together" >&5
+ echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6
+ if test "${cf_cv_prog_CXX_c_o+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
+ cat > conftest.$ac_ext <&5
++if { (eval echo "$as_me:20192: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20033: \$? = $ac_status" >&5
++  echo "$as_me:20195: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:20035: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:20197: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20038: \$? = $ac_status" >&5
++  echo "$as_me:20200: \$? = $ac_status" >&5
+   (exit $ac_status); };
+ then
+   eval cf_cv_prog_CXX_c_o=yes
+@@ -20046,10 +20208,10 @@
+ 
+ fi
+ if test $cf_cv_prog_CXX_c_o = yes; then
+-  echo "$as_me:20049: result: yes" >&5
++  echo "$as_me:20211: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:20052: result: no" >&5
++  echo "$as_me:20214: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -20069,7 +20231,7 @@
+ 	;;
+ esac
+ if test "$GXX" = yes; then
+-	echo "$as_me:20072: checking for lib$cf_gpp_libname" >&5
++	echo "$as_me:20234: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ 	cf_save="$LIBS"
+ 
+@@ -20090,7 +20252,7 @@
+ LIBS="$cf_add_libs"
+ 
  	cat >conftest.$ac_ext <<_ACEOF
--#line 20086 "configure"
-+#line 20097 "configure"
+-#line 20093 "configure"
++#line 20255 "configure"
  #include "confdefs.h"
  
- int
-@@ -20095,23 +20106,23 @@
+ #include <$cf_gpp_libname/builtin.h>
+@@ -20104,16 +20266,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20107: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20269: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20110: \$? = $ac_status" >&5
++  echo "$as_me:20272: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20113: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20275: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20116: \$? = $ac_status" >&5
++  echo "$as_me:20278: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -20150,7 +20312,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 20153 "configure"
++#line 20315 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20164,16 +20326,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20167: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20329: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20170: \$? = $ac_status" >&5
++  echo "$as_me:20332: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20173: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20335: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20176: \$? = $ac_status" >&5
++  echo "$as_me:20338: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -20206,7 +20368,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 	LIBS="$cf_save"
+-	echo "$as_me:20209: result: $cf_cxx_library" >&5
++	echo "$as_me:20371: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+ 
+@@ -20222,7 +20384,7 @@
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ ac_main_return=return
+-echo "$as_me:20225: checking how to run the C++ preprocessor" >&5
++echo "$as_me:20387: checking how to run the C++ preprocessor" >&5
+ echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
+ if test -z "$CXXCPP"; then
+   if test "${ac_cv_prog_CXXCPP+set}" = set; then
+@@ -20239,18 +20401,18 @@
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 20242 "configure"
++#line 20404 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:20247: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:20409: \"$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:20253: \$? = $ac_status" >&5
++  echo "$as_me:20415: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -20273,17 +20435,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 20276 "configure"
++#line 20438 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:20280: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:20442: \"$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:20286: \$? = $ac_status" >&5
++  echo "$as_me:20448: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -20320,7 +20482,7 @@
+ else
+   ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:20323: result: $CXXCPP" >&5
++echo "$as_me:20485: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -20330,18 +20492,18 @@
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 20333 "configure"
++#line 20495 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:20338: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:20500: \"$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:20344: \$? = $ac_status" >&5
++  echo "$as_me:20506: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -20364,17 +20526,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 20367 "configure"
++#line 20529 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:20371: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:20533: \"$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:20377: \$? = $ac_status" >&5
++  echo "$as_me:20539: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -20402,7 +20564,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:20405: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++  { { echo "$as_me:20567: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -20417,23 +20579,23 @@
+ for ac_header in typeinfo
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20420: checking for $ac_header" >&5
++echo "$as_me:20582: 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 20426 "configure"
++#line 20588 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20430: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:20592: \"$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:20436: \$? = $ac_status" >&5
++  echo "$as_me:20598: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -20452,7 +20614,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:20455: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:20617: 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 <&5
++echo "$as_me:20630: 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 20474 "configure"
++#line 20636 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20478: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:20640: \"$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:20484: \$? = $ac_status" >&5
++  echo "$as_me:20646: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -20500,7 +20662,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:20503: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:20665: 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 <&5
++	echo "$as_me:20676: checking if iostream uses std-namespace" >&5
+ echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 20517 "configure"
++#line 20679 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20531,16 +20693,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20098: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20109: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:20534: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20696: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:20101: \$? = $ac_status" >&5
-+  echo "$as_me:20112: \$? = $ac_status" >&5
+-  echo "$as_me:20537: \$? = $ac_status" >&5
++  echo "$as_me:20699: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20104: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20115: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:20540: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20702: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:20107: \$? = $ac_status" >&5
-+  echo "$as_me:20118: \$? = $ac_status" >&5
+-  echo "$as_me:20543: \$? = $ac_status" >&5
++  echo "$as_me:20705: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_iostream_namespace=yes
+ else
+@@ -20549,7 +20711,7 @@
+ cf_iostream_namespace=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-	echo "$as_me:20552: result: $cf_iostream_namespace" >&5
++	echo "$as_me:20714: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+ 	if test "$cf_iostream_namespace" = yes ; then
+ 
+@@ -20560,7 +20722,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:20563: checking if we should include stdbool.h" >&5
++echo "$as_me:20725: checking if we should include stdbool.h" >&5
+ echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
+ 
+ if test "${cf_cv_header_stdbool_h+set}" = set; then
+@@ -20568,7 +20730,7 @@
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 20571 "configure"
++#line 20733 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -20580,23 +20742,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20583: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20745: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20586: \$? = $ac_status" >&5
++  echo "$as_me:20748: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20589: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20751: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20592: \$? = $ac_status" >&5
++  echo "$as_me:20754: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_header_stdbool_h=0
  else
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
  cat >conftest.$ac_ext <<_ACEOF
--#line 20114 "configure"
-+#line 20125 "configure"
+-#line 20599 "configure"
++#line 20761 "configure"
  #include "confdefs.h"
  
  #ifndef __BEOS__
-@@ -20127,16 +20138,16 @@
+@@ -20612,16 +20774,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20130: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20141: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:20615: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20777: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:20133: \$? = $ac_status" >&5
-+  echo "$as_me:20144: \$? = $ac_status" >&5
+-  echo "$as_me:20618: \$? = $ac_status" >&5
++  echo "$as_me:20780: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20136: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20147: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:20621: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20783: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:20139: \$? = $ac_status" >&5
-+  echo "$as_me:20150: \$? = $ac_status" >&5
+-  echo "$as_me:20624: \$? = $ac_status" >&5
++  echo "$as_me:20786: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_header_stdbool_h=1
  else
-@@ -20150,13 +20161,13 @@
+@@ -20635,13 +20797,13 @@
  fi
  
  if test "$cf_cv_header_stdbool_h" = 1
--then	echo "$as_me:20153: result: yes" >&5
-+then	echo "$as_me:20164: result: yes" >&5
+-then	echo "$as_me:20638: result: yes" >&5
++then	echo "$as_me:20800: result: yes" >&5
  echo "${ECHO_T}yes" >&6
--else	echo "$as_me:20155: result: no" >&5
-+else	echo "$as_me:20166: result: no" >&5
+-else	echo "$as_me:20640: result: no" >&5
++else	echo "$as_me:20802: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
--echo "$as_me:20159: checking for builtin bool type" >&5
-+echo "$as_me:20170: checking for builtin bool type" >&5
+-echo "$as_me:20644: checking for builtin bool type" >&5
++echo "$as_me:20806: checking for builtin bool type" >&5
  echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
  
  if test "${cf_cv_builtin_bool+set}" = set; then
-@@ -20164,7 +20175,7 @@
+@@ -20649,7 +20811,7 @@
  else
  
  	cat >conftest.$ac_ext <<_ACEOF
--#line 20167 "configure"
-+#line 20178 "configure"
+-#line 20652 "configure"
++#line 20814 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -20179,16 +20190,16 @@
+@@ -20664,16 +20826,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20182: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20193: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:20667: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20829: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:20185: \$? = $ac_status" >&5
-+  echo "$as_me:20196: \$? = $ac_status" >&5
+-  echo "$as_me:20670: \$? = $ac_status" >&5
++  echo "$as_me:20832: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20188: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20199: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:20673: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20835: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:20191: \$? = $ac_status" >&5
-+  echo "$as_me:20202: \$? = $ac_status" >&5
+-  echo "$as_me:20676: \$? = $ac_status" >&5
++  echo "$as_me:20838: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_builtin_bool=1
  else
-@@ -20201,13 +20212,13 @@
+@@ -20686,13 +20848,13 @@
  fi
  
  if test "$cf_cv_builtin_bool" = 1
--then	echo "$as_me:20204: result: yes" >&5
-+then	echo "$as_me:20215: result: yes" >&5
+-then	echo "$as_me:20689: result: yes" >&5
++then	echo "$as_me:20851: result: yes" >&5
  echo "${ECHO_T}yes" >&6
--else	echo "$as_me:20206: result: no" >&5
-+else	echo "$as_me:20217: result: no" >&5
+-else	echo "$as_me:20691: result: no" >&5
++else	echo "$as_me:20853: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
--echo "$as_me:20210: checking for size of bool" >&5
-+echo "$as_me:20221: checking for size of bool" >&5
+-echo "$as_me:20695: checking for size of bool" >&5
++echo "$as_me:20857: checking for size of bool" >&5
  echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
  if test "${cf_cv_type_of_bool+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20218,7 +20229,7 @@
+@@ -20703,7 +20865,7 @@
    cf_cv_type_of_bool=unknown
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 20221 "configure"
-+#line 20232 "configure"
+-#line 20706 "configure"
++#line 20868 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -20260,15 +20271,15 @@
+@@ -20727,7 +20889,7 @@
+ 
+ #endif
+ 
+-int main()
++int main(void)
+ {
+ 	FILE *fp = fopen("cf_test.out", "w");
+ 	if (fp != 0) {
+@@ -20745,15 +20907,15 @@
  
  _ACEOF
  rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20263: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20274: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:20748: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20910: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:20266: \$? = $ac_status" >&5
-+  echo "$as_me:20277: \$? = $ac_status" >&5
+-  echo "$as_me:20751: \$? = $ac_status" >&5
++  echo "$as_me:20913: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20268: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20279: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:20753: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20915: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:20271: \$? = $ac_status" >&5
-+  echo "$as_me:20282: \$? = $ac_status" >&5
+-  echo "$as_me:20756: \$? = $ac_status" >&5
++  echo "$as_me:20918: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_type_of_bool=`cat cf_test.out`
  		 if test -z "$cf_cv_type_of_bool"; then
-@@ -20286,18 +20297,18 @@
+@@ -20771,18 +20933,18 @@
  fi
  
  	rm -f cf_test.out
--echo "$as_me:20289: result: $cf_cv_type_of_bool" >&5
-+echo "$as_me:20300: result: $cf_cv_type_of_bool" >&5
+-echo "$as_me:20774: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:20936: result: $cf_cv_type_of_bool" >&5
  echo "${ECHO_T}$cf_cv_type_of_bool" >&6
  if test "$cf_cv_type_of_bool" = unknown ; then
  	case .$NCURSES_BOOL in
  	(.auto|.) NCURSES_BOOL=unsigned;;
  	esac
--	{ echo "$as_me:20295: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-+	{ echo "$as_me:20306: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+-	{ echo "$as_me:20780: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:20942: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
  echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
  	cf_cv_type_of_bool=$NCURSES_BOOL
  fi
  
--echo "$as_me:20300: checking for special defines needed for etip.h" >&5
-+echo "$as_me:20311: checking for special defines needed for etip.h" >&5
+-echo "$as_me:20785: checking for special defines needed for etip.h" >&5
++echo "$as_me:20947: checking for special defines needed for etip.h" >&5
  echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6
  cf_save_CXXFLAGS="$CXXFLAGS"
  cf_result="none"
-@@ -20315,7 +20326,7 @@
+@@ -20800,7 +20962,7 @@
  	test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}"
  	test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
  cat >conftest.$ac_ext <<_ACEOF
--#line 20318 "configure"
-+#line 20329 "configure"
+-#line 20803 "configure"
++#line 20965 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -20329,16 +20340,16 @@
+@@ -20814,16 +20976,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20332: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20343: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:20817: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20979: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:20335: \$? = $ac_status" >&5
-+  echo "$as_me:20346: \$? = $ac_status" >&5
+-  echo "$as_me:20820: \$? = $ac_status" >&5
++  echo "$as_me:20982: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20338: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20349: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:20823: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20985: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:20341: \$? = $ac_status" >&5
-+  echo "$as_me:20352: \$? = $ac_status" >&5
+-  echo "$as_me:20826: \$? = $ac_status" >&5
++  echo "$as_me:20988: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
  	test -n "$cf_math" && cat >>confdefs.h <&5
-+echo "$as_me:20373: result: $cf_result" >&5
+-echo "$as_me:20847: result: $cf_result" >&5
++echo "$as_me:21009: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
  CXXFLAGS="$cf_save_CXXFLAGS"
  
  if test -n "$CXX"; then
--echo "$as_me:20367: checking if $CXX accepts parameter initialization" >&5
-+echo "$as_me:20378: checking if $CXX accepts parameter initialization" >&5
+-echo "$as_me:20852: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:21014: checking if $CXX accepts parameter initialization" >&5
  echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6
  if test "${cf_cv_cpp_param_init+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20381,7 +20392,7 @@
+@@ -20866,7 +21028,7 @@
    cf_cv_cpp_param_init=unknown
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 20384 "configure"
-+#line 20395 "configure"
+-#line 20869 "configure"
++#line 21031 "configure"
  #include "confdefs.h"
  
  class TEST {
-@@ -20400,15 +20411,15 @@
+@@ -20881,19 +21043,19 @@
+ {
+ 	value = x;
+ }
+-int main() { }
++int main(void) { }
  
  _ACEOF
  rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20403: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20414: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:20888: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21050: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:20406: \$? = $ac_status" >&5
-+  echo "$as_me:20417: \$? = $ac_status" >&5
+-  echo "$as_me:20891: \$? = $ac_status" >&5
++  echo "$as_me:21053: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20408: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20419: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:20893: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21055: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:20411: \$? = $ac_status" >&5
-+  echo "$as_me:20422: \$? = $ac_status" >&5
+-  echo "$as_me:20896: \$? = $ac_status" >&5
++  echo "$as_me:21058: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_cpp_param_init=yes
  else
-@@ -20427,7 +20438,7 @@
+@@ -20912,7 +21074,7 @@
  ac_main_return=return
  
  fi
--echo "$as_me:20430: result: $cf_cv_cpp_param_init" >&5
-+echo "$as_me:20441: result: $cf_cv_cpp_param_init" >&5
+-echo "$as_me:20915: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:21077: result: $cf_cv_cpp_param_init" >&5
  echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
  fi
  test "$cf_cv_cpp_param_init" = yes &&
-@@ -20437,7 +20448,7 @@
+@@ -20922,7 +21084,7 @@
  
  if test -n "$CXX"; then
  
--echo "$as_me:20440: checking if $CXX accepts static_cast" >&5
-+echo "$as_me:20451: checking if $CXX accepts static_cast" >&5
+-echo "$as_me:20925: checking if $CXX accepts static_cast" >&5
++echo "$as_me:21087: checking if $CXX accepts static_cast" >&5
  echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6
  if test "${cf_cv_cpp_static_cast+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20451,7 +20462,7 @@
+@@ -20936,7 +21098,7 @@
  ac_main_return=return
  
  	cat >conftest.$ac_ext <<_ACEOF
--#line 20454 "configure"
-+#line 20465 "configure"
+-#line 20939 "configure"
++#line 21101 "configure"
  #include "confdefs.h"
  
  class NCursesPanel
-@@ -20495,16 +20506,16 @@
+@@ -20980,16 +21142,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20498: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20509: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:20983: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21145: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:20501: \$? = $ac_status" >&5
-+  echo "$as_me:20512: \$? = $ac_status" >&5
+-  echo "$as_me:20986: \$? = $ac_status" >&5
++  echo "$as_me:21148: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20504: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20515: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:20989: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21151: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:20507: \$? = $ac_status" >&5
-+  echo "$as_me:20518: \$? = $ac_status" >&5
+-  echo "$as_me:20992: \$? = $ac_status" >&5
++  echo "$as_me:21154: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_cpp_static_cast=yes
  else
-@@ -20522,7 +20533,7 @@
+@@ -21007,7 +21169,7 @@
  ac_main_return=return
  
  fi
--echo "$as_me:20525: result: $cf_cv_cpp_static_cast" >&5
-+echo "$as_me:20536: result: $cf_cv_cpp_static_cast" >&5
+-echo "$as_me:21010: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:21172: result: $cf_cv_cpp_static_cast" >&5
  echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
  
  fi
-@@ -20571,7 +20582,7 @@
+@@ -21056,7 +21218,7 @@
  	else
  		if test "$cf_cv_header_stdbool_h" = 1 ; then
  
--echo "$as_me:20574: checking for size of bool" >&5
-+echo "$as_me:20585: checking for size of bool" >&5
+-echo "$as_me:21059: checking for size of bool" >&5
++echo "$as_me:21221: checking for size of bool" >&5
  echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
  if test "${cf_cv_type_of_bool+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20582,7 +20593,7 @@
+@@ -21067,7 +21229,7 @@
    cf_cv_type_of_bool=unknown
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 20585 "configure"
-+#line 20596 "configure"
+-#line 21070 "configure"
++#line 21232 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -20624,15 +20635,15 @@
+@@ -21091,7 +21253,7 @@
+ 
+ #endif
+ 
+-int main()
++int main(void)
+ {
+ 	FILE *fp = fopen("cf_test.out", "w");
+ 	if (fp != 0) {
+@@ -21109,15 +21271,15 @@
  
  _ACEOF
  rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20627: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20638: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:21112: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21274: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:20630: \$? = $ac_status" >&5
-+  echo "$as_me:20641: \$? = $ac_status" >&5
+-  echo "$as_me:21115: \$? = $ac_status" >&5
++  echo "$as_me:21277: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20632: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20643: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:21117: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21279: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:20635: \$? = $ac_status" >&5
-+  echo "$as_me:20646: \$? = $ac_status" >&5
+-  echo "$as_me:21120: \$? = $ac_status" >&5
++  echo "$as_me:21282: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_type_of_bool=`cat cf_test.out`
  		 if test -z "$cf_cv_type_of_bool"; then
-@@ -20650,25 +20661,25 @@
+@@ -21135,25 +21297,25 @@
  fi
  
  	rm -f cf_test.out
--echo "$as_me:20653: result: $cf_cv_type_of_bool" >&5
-+echo "$as_me:20664: result: $cf_cv_type_of_bool" >&5
+-echo "$as_me:21138: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:21300: result: $cf_cv_type_of_bool" >&5
  echo "${ECHO_T}$cf_cv_type_of_bool" >&6
  if test "$cf_cv_type_of_bool" = unknown ; then
  	case .$NCURSES_BOOL in
  	(.auto|.) NCURSES_BOOL=unsigned;;
  	esac
--	{ echo "$as_me:20659: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-+	{ echo "$as_me:20670: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+-	{ echo "$as_me:21144: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:21306: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
  echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
  	cf_cv_type_of_bool=$NCURSES_BOOL
  fi
  
  		else
--			echo "$as_me:20665: checking for fallback type of bool" >&5
-+			echo "$as_me:20676: checking for fallback type of bool" >&5
+-			echo "$as_me:21150: checking for fallback type of bool" >&5
++			echo "$as_me:21312: checking for fallback type of bool" >&5
  echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
  			case "$host_cpu" in
  			(i?86)	cf_cv_type_of_bool=char	;;
  			(*)	cf_cv_type_of_bool=int	;;
  			esac
--			echo "$as_me:20671: result: $cf_cv_type_of_bool" >&5
-+			echo "$as_me:20682: result: $cf_cv_type_of_bool" >&5
+-			echo "$as_me:21156: result: $cf_cv_type_of_bool" >&5
++			echo "$as_me:21318: result: $cf_cv_type_of_bool" >&5
  echo "${ECHO_T}$cf_cv_type_of_bool" >&6
  		fi
  	fi
-@@ -20697,7 +20708,7 @@
+@@ -21182,7 +21344,7 @@
  
  	if test "$cf_with_ada" != "no" ; then
  		if test "$with_libtool" != "no"; then
--			{ echo "$as_me:20700: WARNING: libtool does not support Ada - disabling feature" >&5
-+			{ echo "$as_me:20711: WARNING: libtool does not support Ada - disabling feature" >&5
+-			{ echo "$as_me:21185: WARNING: libtool does not support Ada - disabling feature" >&5
++			{ echo "$as_me:21347: WARNING: libtool does not support Ada - disabling feature" >&5
  echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
  			cf_with_ada=no
  		fi
-@@ -20708,7 +20719,7 @@
+@@ -21193,7 +21355,7 @@
  cf_ada_make=gnatmake
  # Extract the first word of "$cf_ada_make", so it can be a program name with args.
  set dummy $cf_ada_make; ac_word=$2
--echo "$as_me:20711: checking for $ac_word" >&5
-+echo "$as_me:20722: checking for $ac_word" >&5
+-echo "$as_me:21196: checking for $ac_word" >&5
++echo "$as_me:21358: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_gnat_exists+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20723,7 +20734,7 @@
+@@ -21208,7 +21370,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_gnat_exists="yes"
--echo "$as_me:20726: found $ac_dir/$ac_word" >&5
-+echo "$as_me:20737: found $ac_dir/$ac_word" >&5
+-echo "$as_me:21211: found $ac_dir/$ac_word" >&5
++echo "$as_me:21373: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -20732,10 +20743,10 @@
+@@ -21217,10 +21379,10 @@
  fi
  gnat_exists=$ac_cv_prog_gnat_exists
  if test -n "$gnat_exists"; then
--  echo "$as_me:20735: result: $gnat_exists" >&5
-+  echo "$as_me:20746: result: $gnat_exists" >&5
+-  echo "$as_me:21220: result: $gnat_exists" >&5
++  echo "$as_me:21382: result: $gnat_exists" >&5
  echo "${ECHO_T}$gnat_exists" >&6
  else
--  echo "$as_me:20738: result: no" >&5
-+  echo "$as_me:20749: result: no" >&5
+-  echo "$as_me:21223: result: no" >&5
++  echo "$as_me:21385: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -20744,12 +20755,12 @@
+@@ -21229,12 +21391,12 @@
  	cf_cv_prog_gnat_correct=no
  else
  
--echo "$as_me:20747: checking for gnat version" >&5
-+echo "$as_me:20758: checking for gnat version" >&5
+-echo "$as_me:21232: checking for gnat version" >&5
++echo "$as_me:21394: checking for gnat version" >&5
  echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
  cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
  	grep '[0-9].[0-9][0-9]*' |\
  	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
--echo "$as_me:20752: result: $cf_gnat_version" >&5
-+echo "$as_me:20763: result: $cf_gnat_version" >&5
+-echo "$as_me:21237: result: $cf_gnat_version" >&5
++echo "$as_me:21399: result: $cf_gnat_version" >&5
  echo "${ECHO_T}$cf_gnat_version" >&6
  
  case $cf_gnat_version in
-@@ -20757,7 +20768,7 @@
+@@ -21242,7 +21404,7 @@
  	cf_cv_prog_gnat_correct=yes
  	;;
  (*)
--	{ echo "$as_me:20760: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
-+	{ echo "$as_me:20771: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+-	{ echo "$as_me:21245: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
++	{ echo "$as_me:21407: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
  echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
  	cf_cv_prog_gnat_correct=no
  	;;
-@@ -20765,7 +20776,7 @@
+@@ -21250,7 +21412,7 @@
  
  	# Extract the first word of "m4", so it can be a program name with args.
  set dummy m4; ac_word=$2
--echo "$as_me:20768: checking for $ac_word" >&5
-+echo "$as_me:20779: checking for $ac_word" >&5
+-echo "$as_me:21253: checking for $ac_word" >&5
++echo "$as_me:21415: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_M4_exists+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20780,7 +20791,7 @@
+@@ -21265,7 +21427,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_M4_exists="yes"
--echo "$as_me:20783: found $ac_dir/$ac_word" >&5
-+echo "$as_me:20794: found $ac_dir/$ac_word" >&5
+-echo "$as_me:21268: found $ac_dir/$ac_word" >&5
++echo "$as_me:21430: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -20789,10 +20800,10 @@
+@@ -21274,10 +21436,10 @@
  fi
  M4_exists=$ac_cv_prog_M4_exists
  if test -n "$M4_exists"; then
--  echo "$as_me:20792: result: $M4_exists" >&5
-+  echo "$as_me:20803: result: $M4_exists" >&5
+-  echo "$as_me:21277: result: $M4_exists" >&5
++  echo "$as_me:21439: result: $M4_exists" >&5
  echo "${ECHO_T}$M4_exists" >&6
  else
--  echo "$as_me:20795: result: no" >&5
-+  echo "$as_me:20806: result: no" >&5
+-  echo "$as_me:21280: result: no" >&5
++  echo "$as_me:21442: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -20801,7 +20812,7 @@
+@@ -21286,7 +21448,7 @@
  		echo Ada95 binding required program m4 not found. Ada95 binding disabled.
  	fi
  	if test "$cf_cv_prog_gnat_correct" = yes; then
--		echo "$as_me:20804: checking if GNAT works" >&5
-+		echo "$as_me:20815: checking if GNAT works" >&5
+-		echo "$as_me:21289: checking if GNAT works" >&5
++		echo "$as_me:21451: checking if GNAT works" >&5
  echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
  
  rm -rf conftest* *~conftest*
-@@ -20829,7 +20840,7 @@
+@@ -21314,7 +21476,7 @@
  fi
  rm -rf conftest* *~conftest*
  
--		echo "$as_me:20832: result: $cf_cv_prog_gnat_correct" >&5
-+		echo "$as_me:20843: result: $cf_cv_prog_gnat_correct" >&5
+-		echo "$as_me:21317: result: $cf_cv_prog_gnat_correct" >&5
++		echo "$as_me:21479: result: $cf_cv_prog_gnat_correct" >&5
  echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
  	fi
  fi
-@@ -20838,7 +20849,7 @@
+@@ -21323,7 +21485,7 @@
  
   	ADAFLAGS="$ADAFLAGS -gnatpn"
  
--	echo "$as_me:20841: checking optimization options for ADAFLAGS" >&5
-+	echo "$as_me:20852: checking optimization options for ADAFLAGS" >&5
+-	echo "$as_me:21326: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:21488: checking optimization options for ADAFLAGS" >&5
  echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
  	case "$CFLAGS" in
  	(*-g*)
-@@ -20855,10 +20866,10 @@
+@@ -21340,10 +21502,10 @@
  
  		;;
  	esac
--	echo "$as_me:20858: result: $ADAFLAGS" >&5
-+	echo "$as_me:20869: result: $ADAFLAGS" >&5
+-	echo "$as_me:21343: result: $ADAFLAGS" >&5
++	echo "$as_me:21505: result: $ADAFLAGS" >&5
  echo "${ECHO_T}$ADAFLAGS" >&6
  
--echo "$as_me:20861: checking if GNATPREP supports -T option" >&5
-+echo "$as_me:20872: checking if GNATPREP supports -T option" >&5
+-echo "$as_me:21346: checking if GNATPREP supports -T option" >&5
++echo "$as_me:21508: checking if GNATPREP supports -T option" >&5
  echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
  if test "${cf_cv_gnatprep_opt_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20868,11 +20879,11 @@
+@@ -21353,11 +21515,11 @@
  gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
  
  fi
--echo "$as_me:20871: result: $cf_cv_gnatprep_opt_t" >&5
-+echo "$as_me:20882: result: $cf_cv_gnatprep_opt_t" >&5
+-echo "$as_me:21356: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:21518: result: $cf_cv_gnatprep_opt_t" >&5
  echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
  test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
  
--echo "$as_me:20875: checking if GNAT supports generics" >&5
-+echo "$as_me:20886: checking if GNAT supports generics" >&5
+-echo "$as_me:21360: checking if GNAT supports generics" >&5
++echo "$as_me:21522: checking if GNAT supports generics" >&5
  echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
  case $cf_gnat_version in
  (3.[1-9]*|[4-9].*)
-@@ -20882,7 +20893,7 @@
+@@ -21367,7 +21529,7 @@
  	cf_gnat_generics=no
  	;;
  esac
--echo "$as_me:20885: result: $cf_gnat_generics" >&5
-+echo "$as_me:20896: result: $cf_gnat_generics" >&5
+-echo "$as_me:21370: result: $cf_gnat_generics" >&5
++echo "$as_me:21532: result: $cf_gnat_generics" >&5
  echo "${ECHO_T}$cf_gnat_generics" >&6
  
  if test "$cf_gnat_generics" = yes
-@@ -20894,7 +20905,7 @@
+@@ -21379,7 +21541,7 @@
  	cf_generic_objects=
  fi
  
--echo "$as_me:20897: checking if GNAT supports SIGINT" >&5
-+echo "$as_me:20908: checking if GNAT supports SIGINT" >&5
+-echo "$as_me:21382: checking if GNAT supports SIGINT" >&5
++echo "$as_me:21544: checking if GNAT supports SIGINT" >&5
  echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
  if test "${cf_cv_gnat_sigint+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20942,7 +20953,7 @@
+@@ -21427,7 +21589,7 @@
  rm -rf conftest* *~conftest*
  
  fi
--echo "$as_me:20945: result: $cf_cv_gnat_sigint" >&5
-+echo "$as_me:20956: result: $cf_cv_gnat_sigint" >&5
+-echo "$as_me:21430: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:21592: result: $cf_cv_gnat_sigint" >&5
  echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
  
  if test $cf_cv_gnat_sigint = yes ; then
-@@ -20955,7 +20966,7 @@
+@@ -21440,7 +21602,7 @@
  cf_gnat_projects=no
  
  if test "$enable_gnat_projects" != no ; then
--echo "$as_me:20958: checking if GNAT supports project files" >&5
-+echo "$as_me:20969: checking if GNAT supports project files" >&5
+-echo "$as_me:21443: checking if GNAT supports project files" >&5
++echo "$as_me:21605: checking if GNAT supports project files" >&5
  echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
  case $cf_gnat_version in
  (3.[0-9]*)
-@@ -21015,15 +21026,15 @@
+@@ -21500,15 +21662,15 @@
  	esac
  	;;
  esac
--echo "$as_me:21018: result: $cf_gnat_projects" >&5
-+echo "$as_me:21029: result: $cf_gnat_projects" >&5
+-echo "$as_me:21503: result: $cf_gnat_projects" >&5
++echo "$as_me:21665: result: $cf_gnat_projects" >&5
  echo "${ECHO_T}$cf_gnat_projects" >&6
  fi # enable_gnat_projects
  
  if test $cf_gnat_projects = yes
  then
--	echo "$as_me:21024: checking if GNAT supports libraries" >&5
-+	echo "$as_me:21035: checking if GNAT supports libraries" >&5
+-	echo "$as_me:21509: checking if GNAT supports libraries" >&5
++	echo "$as_me:21671: checking if GNAT supports libraries" >&5
  echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
--	echo "$as_me:21026: result: $cf_gnat_libraries" >&5
-+	echo "$as_me:21037: result: $cf_gnat_libraries" >&5
+-	echo "$as_me:21511: result: $cf_gnat_libraries" >&5
++	echo "$as_me:21673: result: $cf_gnat_libraries" >&5
  echo "${ECHO_T}$cf_gnat_libraries" >&6
  fi
  
-@@ -21043,7 +21054,7 @@
+@@ -21528,7 +21690,7 @@
  	USE_GNAT_LIBRARIES="#"
  fi
  
--echo "$as_me:21046: checking for ada-compiler" >&5
-+echo "$as_me:21057: checking for ada-compiler" >&5
+-echo "$as_me:21531: checking for ada-compiler" >&5
++echo "$as_me:21693: checking for ada-compiler" >&5
  echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
  
  # Check whether --with-ada-compiler or --without-ada-compiler was given.
-@@ -21054,12 +21065,12 @@
+@@ -21539,12 +21701,12 @@
    cf_ada_compiler=gnatmake
  fi;
  
--echo "$as_me:21057: result: $cf_ada_compiler" >&5
-+echo "$as_me:21068: result: $cf_ada_compiler" >&5
+-echo "$as_me:21542: result: $cf_ada_compiler" >&5
++echo "$as_me:21704: result: $cf_ada_compiler" >&5
  echo "${ECHO_T}$cf_ada_compiler" >&6
  
  			cf_ada_package=terminal_interface
  
--echo "$as_me:21062: checking for ada-include" >&5
-+echo "$as_me:21073: checking for ada-include" >&5
+-echo "$as_me:21547: checking for ada-include" >&5
++echo "$as_me:21709: checking for ada-include" >&5
  echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
  
  # Check whether --with-ada-include or --without-ada-include was given.
-@@ -21095,7 +21106,7 @@
+@@ -21580,7 +21742,7 @@
  	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
  	;;
  (*)
--	{ { echo "$as_me:21098: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:21109: error: expected a pathname, not \"$withval\"" >&5
+-	{ { echo "$as_me:21583: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:21745: error: expected a pathname, not \"$withval\"" >&5
  echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
     { (exit 1); exit 1; }; }
  	;;
-@@ -21104,10 +21115,10 @@
+@@ -21589,10 +21751,10 @@
  fi
  eval ADA_INCLUDE="$withval"
  
--echo "$as_me:21107: result: $ADA_INCLUDE" >&5
-+echo "$as_me:21118: result: $ADA_INCLUDE" >&5
+-echo "$as_me:21592: result: $ADA_INCLUDE" >&5
++echo "$as_me:21754: result: $ADA_INCLUDE" >&5
  echo "${ECHO_T}$ADA_INCLUDE" >&6
  
--echo "$as_me:21110: checking for ada-objects" >&5
-+echo "$as_me:21121: checking for ada-objects" >&5
+-echo "$as_me:21595: checking for ada-objects" >&5
++echo "$as_me:21757: checking for ada-objects" >&5
  echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
  
  # Check whether --with-ada-objects or --without-ada-objects was given.
-@@ -21143,7 +21154,7 @@
+@@ -21628,7 +21790,7 @@
  	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
  	;;
  (*)
--	{ { echo "$as_me:21146: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:21157: error: expected a pathname, not \"$withval\"" >&5
+-	{ { echo "$as_me:21631: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:21793: error: expected a pathname, not \"$withval\"" >&5
  echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
     { (exit 1); exit 1; }; }
  	;;
-@@ -21152,10 +21163,10 @@
+@@ -21637,10 +21799,10 @@
  fi
  eval ADA_OBJECTS="$withval"
  
--echo "$as_me:21155: result: $ADA_OBJECTS" >&5
-+echo "$as_me:21166: result: $ADA_OBJECTS" >&5
+-echo "$as_me:21640: result: $ADA_OBJECTS" >&5
++echo "$as_me:21802: result: $ADA_OBJECTS" >&5
  echo "${ECHO_T}$ADA_OBJECTS" >&6
  
--echo "$as_me:21158: checking if an Ada95 shared-library should be built" >&5
-+echo "$as_me:21169: checking if an Ada95 shared-library should be built" >&5
+-echo "$as_me:21643: checking if an Ada95 shared-library should be built" >&5
++echo "$as_me:21805: checking if an Ada95 shared-library should be built" >&5
  echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
  
  # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
-@@ -21165,7 +21176,7 @@
+@@ -21650,7 +21812,7 @@
  else
    with_ada_sharedlib=no
  fi;
--echo "$as_me:21168: result: $with_ada_sharedlib" >&5
-+echo "$as_me:21179: result: $with_ada_sharedlib" >&5
+-echo "$as_me:21653: result: $with_ada_sharedlib" >&5
++echo "$as_me:21815: result: $with_ada_sharedlib" >&5
  echo "${ECHO_T}$with_ada_sharedlib" >&6
  
  ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
-@@ -21188,13 +21199,13 @@
+@@ -21673,13 +21835,13 @@
  
  # do this "late" to avoid conflict with header-checks
  if test "x$with_widec" = xyes ; then
--	echo "$as_me:21191: checking for wchar_t" >&5
-+	echo "$as_me:21202: checking for wchar_t" >&5
+-	echo "$as_me:21676: checking for wchar_t" >&5
++	echo "$as_me:21838: checking for wchar_t" >&5
  echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6
  if test "${ac_cv_type_wchar_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 21197 "configure"
-+#line 21208 "configure"
+-#line 21682 "configure"
++#line 21844 "configure"
  #include "confdefs.h"
  $ac_includes_default
  int
-@@ -21209,16 +21220,16 @@
+@@ -21694,16 +21856,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21212: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21223: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:21697: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21859: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:21215: \$? = $ac_status" >&5
-+  echo "$as_me:21226: \$? = $ac_status" >&5
+-  echo "$as_me:21700: \$? = $ac_status" >&5
++  echo "$as_me:21862: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21218: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21229: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:21703: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21865: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:21221: \$? = $ac_status" >&5
-+  echo "$as_me:21232: \$? = $ac_status" >&5
+-  echo "$as_me:21706: \$? = $ac_status" >&5
++  echo "$as_me:21868: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_type_wchar_t=yes
  else
-@@ -21228,10 +21239,10 @@
+@@ -21713,10 +21875,10 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
--echo "$as_me:21231: result: $ac_cv_type_wchar_t" >&5
-+echo "$as_me:21242: result: $ac_cv_type_wchar_t" >&5
+-echo "$as_me:21716: result: $ac_cv_type_wchar_t" >&5
++echo "$as_me:21878: result: $ac_cv_type_wchar_t" >&5
  echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
  
--echo "$as_me:21234: checking size of wchar_t" >&5
-+echo "$as_me:21245: checking size of wchar_t" >&5
+-echo "$as_me:21719: checking size of wchar_t" >&5
++echo "$as_me:21881: checking size of wchar_t" >&5
  echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6
  if test "${ac_cv_sizeof_wchar_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -21240,7 +21251,7 @@
+@@ -21725,7 +21887,7 @@
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
--#line 21243 "configure"
-+#line 21254 "configure"
+-#line 21728 "configure"
++#line 21890 "configure"
  #include "confdefs.h"
  $ac_includes_default
  int
-@@ -21252,21 +21263,21 @@
+@@ -21737,21 +21899,21 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21255: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21266: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:21740: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21902: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:21258: \$? = $ac_status" >&5
-+  echo "$as_me:21269: \$? = $ac_status" >&5
+-  echo "$as_me:21743: \$? = $ac_status" >&5
++  echo "$as_me:21905: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21261: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21272: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:21746: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21908: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:21264: \$? = $ac_status" >&5
-+  echo "$as_me:21275: \$? = $ac_status" >&5
+-  echo "$as_me:21749: \$? = $ac_status" >&5
++  echo "$as_me:21911: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_lo=0 ac_mid=0
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
--#line 21269 "configure"
-+#line 21280 "configure"
+-#line 21754 "configure"
++#line 21916 "configure"
  #include "confdefs.h"
  $ac_includes_default
  int
-@@ -21278,16 +21289,16 @@
+@@ -21763,16 +21925,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21281: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21292: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:21766: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21928: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:21284: \$? = $ac_status" >&5
-+  echo "$as_me:21295: \$? = $ac_status" >&5
+-  echo "$as_me:21769: \$? = $ac_status" >&5
++  echo "$as_me:21931: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21287: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21298: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:21772: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21934: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:21290: \$? = $ac_status" >&5
-+  echo "$as_me:21301: \$? = $ac_status" >&5
+-  echo "$as_me:21775: \$? = $ac_status" >&5
++  echo "$as_me:21937: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_hi=$ac_mid; break
  else
-@@ -21303,7 +21314,7 @@
+@@ -21788,7 +21950,7 @@
  ac_hi=-1 ac_mid=-1
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
--#line 21306 "configure"
-+#line 21317 "configure"
+-#line 21791 "configure"
++#line 21953 "configure"
  #include "confdefs.h"
  $ac_includes_default
  int
-@@ -21315,16 +21326,16 @@
+@@ -21800,16 +21962,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21318: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21329: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:21803: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21965: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:21321: \$? = $ac_status" >&5
-+  echo "$as_me:21332: \$? = $ac_status" >&5
+-  echo "$as_me:21806: \$? = $ac_status" >&5
++  echo "$as_me:21968: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21324: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21335: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:21809: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21971: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:21327: \$? = $ac_status" >&5
-+  echo "$as_me:21338: \$? = $ac_status" >&5
+-  echo "$as_me:21812: \$? = $ac_status" >&5
++  echo "$as_me:21974: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_lo=$ac_mid; break
  else
-@@ -21340,7 +21351,7 @@
+@@ -21825,7 +21987,7 @@
  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 21343 "configure"
-+#line 21354 "configure"
+-#line 21828 "configure"
++#line 21990 "configure"
  #include "confdefs.h"
  $ac_includes_default
  int
-@@ -21352,16 +21363,16 @@
+@@ -21837,16 +21999,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21355: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21366: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:21840: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22002: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:21358: \$? = $ac_status" >&5
-+  echo "$as_me:21369: \$? = $ac_status" >&5
+-  echo "$as_me:21843: \$? = $ac_status" >&5
++  echo "$as_me:22005: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21361: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21372: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:21846: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22008: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:21364: \$? = $ac_status" >&5
-+  echo "$as_me:21375: \$? = $ac_status" >&5
+-  echo "$as_me:21849: \$? = $ac_status" >&5
++  echo "$as_me:22011: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_hi=$ac_mid
  else
-@@ -21374,12 +21385,12 @@
+@@ -21859,12 +22021,12 @@
  ac_cv_sizeof_wchar_t=$ac_lo
  else
    if test "$cross_compiling" = yes; then
--  { { echo "$as_me:21377: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:21388: error: cannot run test program while cross compiling" >&5
+-  { { echo "$as_me:21862: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:22024: 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 21382 "configure"
-+#line 21393 "configure"
+-#line 21867 "configure"
++#line 22029 "configure"
  #include "confdefs.h"
  $ac_includes_default
  int
-@@ -21395,15 +21406,15 @@
+@@ -21880,15 +22042,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
--if { (eval echo "$as_me:21398: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21409: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:21883: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22045: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:21401: \$? = $ac_status" >&5
-+  echo "$as_me:21412: \$? = $ac_status" >&5
+-  echo "$as_me:21886: \$? = $ac_status" >&5
++  echo "$as_me:22048: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:21403: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21414: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:21888: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22050: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:21406: \$? = $ac_status" >&5
-+  echo "$as_me:21417: \$? = $ac_status" >&5
+-  echo "$as_me:21891: \$? = $ac_status" >&5
++  echo "$as_me:22053: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_sizeof_wchar_t=`cat conftest.val`
  else
-@@ -21419,7 +21430,7 @@
+@@ -21904,7 +22066,7 @@
    ac_cv_sizeof_wchar_t=0
  fi
  fi
--echo "$as_me:21422: result: $ac_cv_sizeof_wchar_t" >&5
-+echo "$as_me:21433: result: $ac_cv_sizeof_wchar_t" >&5
+-echo "$as_me:21907: result: $ac_cv_sizeof_wchar_t" >&5
++echo "$as_me:22069: result: $ac_cv_sizeof_wchar_t" >&5
  echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
  cat >>confdefs.h <&5
-+echo "$as_me:21451: checking for library subsets" >&5
+-echo "$as_me:21925: checking for library subsets" >&5
++echo "$as_me:22087: checking for library subsets" >&5
  echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
  LIB_SUBSETS=
  
-@@ -21479,7 +21490,7 @@
+@@ -21964,7 +22126,7 @@
  test "x$with_widec"     = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
  test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
  
--echo "$as_me:21482: result: $LIB_SUBSETS" >&5
-+echo "$as_me:21493: result: $LIB_SUBSETS" >&5
+-echo "$as_me:21967: result: $LIB_SUBSETS" >&5
++echo "$as_me:22129: result: $LIB_SUBSETS" >&5
  echo "${ECHO_T}$LIB_SUBSETS" >&6
  
  ### Construct the list of include-directories to be generated
-@@ -21510,7 +21521,7 @@
+@@ -21995,7 +22157,7 @@
  fi
  
  ### Build up pieces for makefile rules
--echo "$as_me:21513: checking default library suffix" >&5
-+echo "$as_me:21524: checking default library suffix" >&5
+-echo "$as_me:21998: checking default library suffix" >&5
++echo "$as_me:22160: checking default library suffix" >&5
  echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
  
  	case $DFT_LWR_MODEL in
-@@ -21521,10 +21532,10 @@
+@@ -22006,10 +22168,10 @@
  	(shared)  DFT_ARG_SUFFIX=''   ;;
  	esac
  	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
--echo "$as_me:21524: result: $DFT_ARG_SUFFIX" >&5
-+echo "$as_me:21535: result: $DFT_ARG_SUFFIX" >&5
+-echo "$as_me:22009: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:22171: result: $DFT_ARG_SUFFIX" >&5
  echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
  
--echo "$as_me:21527: checking default library-dependency suffix" >&5
-+echo "$as_me:21538: checking default library-dependency suffix" >&5
+-echo "$as_me:22012: checking default library-dependency suffix" >&5
++echo "$as_me:22174: checking default library-dependency suffix" >&5
  echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
  
  	case X$DFT_LWR_MODEL in
-@@ -21582,10 +21593,10 @@
+@@ -22067,10 +22229,10 @@
  		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
  		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
  	fi
--echo "$as_me:21585: result: $DFT_DEP_SUFFIX" >&5
-+echo "$as_me:21596: result: $DFT_DEP_SUFFIX" >&5
+-echo "$as_me:22070: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:22232: result: $DFT_DEP_SUFFIX" >&5
  echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
  
--echo "$as_me:21588: checking default object directory" >&5
-+echo "$as_me:21599: checking default object directory" >&5
+-echo "$as_me:22073: checking default object directory" >&5
++echo "$as_me:22235: checking default object directory" >&5
  echo $ECHO_N "checking default object directory... $ECHO_C" >&6
  
  	case $DFT_LWR_MODEL in
-@@ -21601,11 +21612,11 @@
+@@ -22086,11 +22248,11 @@
  			DFT_OBJ_SUBDIR='obj_s' ;;
  		esac
  	esac
--echo "$as_me:21604: result: $DFT_OBJ_SUBDIR" >&5
-+echo "$as_me:21615: result: $DFT_OBJ_SUBDIR" >&5
+-echo "$as_me:22089: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:22251: result: $DFT_OBJ_SUBDIR" >&5
  echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
  
  if test "x$cf_with_cxx" = xyes ; then
--echo "$as_me:21608: checking c++ library-dependency suffix" >&5
-+echo "$as_me:21619: checking c++ library-dependency suffix" >&5
+-echo "$as_me:22093: checking c++ library-dependency suffix" >&5
++echo "$as_me:22255: checking c++ library-dependency suffix" >&5
  echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
  if test "$with_libtool" != "no"; then
  	# libtool thinks it can make c++ shared libraries (perhaps only g++)
-@@ -21673,7 +21684,7 @@
+@@ -22158,7 +22320,7 @@
  	fi
  
  fi
--echo "$as_me:21676: result: $CXX_LIB_SUFFIX" >&5
-+echo "$as_me:21687: result: $CXX_LIB_SUFFIX" >&5
+-echo "$as_me:22161: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:22323: result: $CXX_LIB_SUFFIX" >&5
  echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
  
  fi
-@@ -21846,19 +21857,19 @@
+@@ -22334,19 +22496,19 @@
  
  if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
  then
--	echo "$as_me:21849: checking if linker supports switching between static/dynamic" >&5
-+	echo "$as_me:21860: checking if linker supports switching between static/dynamic" >&5
+-	echo "$as_me:22337: checking if linker supports switching between static/dynamic" >&5
++	echo "$as_me:22499: checking if linker supports switching between static/dynamic" >&5
  echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6
  
  	rm -f libconftest.a
  	cat >conftest.$ac_ext <
  int cf_ldflags_static(FILE *fp) { return fflush(fp); }
  EOF
--	if { (eval echo "$as_me:21858: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:21869: \"$ac_compile\"") >&5
+-	if { (eval echo "$as_me:22346: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:22508: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:21861: \$? = $ac_status" >&5
-+  echo "$as_me:21872: \$? = $ac_status" >&5
+-  echo "$as_me:22349: \$? = $ac_status" >&5
++  echo "$as_me:22511: \$? = $ac_status" >&5
    (exit $ac_status); } ; then
  		( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null
  		( eval $RANLIB libconftest.a ) 2>&5 >/dev/null
-@@ -21869,10 +21880,10 @@
+@@ -22357,10 +22519,10 @@
  
  	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
  	cat >conftest.$ac_ext <<_ACEOF
--#line 21872 "configure"
-+#line 21883 "configure"
+-#line 22360 "configure"
++#line 22522 "configure"
  #include "confdefs.h"
  
--#line 21875 "configure"
-+#line 21886 "configure"
+-#line 22363 "configure"
++#line 22525 "configure"
  #include 
  int cf_ldflags_static(FILE *fp);
  
-@@ -21887,16 +21898,16 @@
+@@ -22375,16 +22537,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:21890: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21901: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:22378: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22540: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:21893: \$? = $ac_status" >&5
-+  echo "$as_me:21904: \$? = $ac_status" >&5
+-  echo "$as_me:22381: \$? = $ac_status" >&5
++  echo "$as_me:22543: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:21896: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21907: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:22384: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22546: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:21899: \$? = $ac_status" >&5
-+  echo "$as_me:21910: \$? = $ac_status" >&5
+-  echo "$as_me:22387: \$? = $ac_status" >&5
++  echo "$as_me:22549: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
  	# some linkers simply ignore the -dynamic
-@@ -21919,7 +21930,7 @@
+@@ -22407,7 +22569,7 @@
  	rm -f libconftest.*
  	LIBS="$cf_save_LIBS"
  
--	echo "$as_me:21922: result: $cf_ldflags_static" >&5
-+	echo "$as_me:21933: result: $cf_ldflags_static" >&5
+-	echo "$as_me:22410: result: $cf_ldflags_static" >&5
++	echo "$as_me:22572: result: $cf_ldflags_static" >&5
  echo "${ECHO_T}$cf_ldflags_static" >&6
  
  	if test $cf_ldflags_static != yes
-@@ -21935,7 +21946,7 @@
+@@ -22423,7 +22585,7 @@
  	;;
  esac
  
--echo "$as_me:21938: checking where we will install curses.h" >&5
-+echo "$as_me:21949: checking where we will install curses.h" >&5
+-echo "$as_me:22426: checking where we will install curses.h" >&5
++echo "$as_me:22588: checking where we will install curses.h" >&5
  echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
  
  includesubdir=
-@@ -21945,7 +21956,7 @@
+@@ -22433,7 +22595,7 @@
  then
  	includesubdir="/ncurses${USE_LIB_SUFFIX}"
  fi
--echo "$as_me:21948: result: ${includedir}${includesubdir}" >&5
-+echo "$as_me:21959: result: ${includedir}${includesubdir}" >&5
+-echo "$as_me:22436: result: ${includedir}${includesubdir}" >&5
++echo "$as_me:22598: result: ${includedir}${includesubdir}" >&5
  echo "${ECHO_T}${includedir}${includesubdir}" >&6
  
  ### Resolve a conflict between normal and wide-curses by forcing applications
-@@ -21953,7 +21964,7 @@
+@@ -22441,7 +22603,7 @@
  if test "$with_overwrite" != no ; then
  if test "$NCURSES_LIBUTF8" = 1 ; then
  	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
--	{ echo "$as_me:21956: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
-+	{ echo "$as_me:21967: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+-	{ echo "$as_me:22444: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++	{ echo "$as_me:22606: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
  echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
  fi
  fi
-@@ -21971,7 +21982,7 @@
+@@ -22459,7 +22621,7 @@
  ### Construct the list of subdirectories for which we'll customize makefiles
  ### with the appropriate compile-rules.
  
--echo "$as_me:21974: checking for src modules" >&5
-+echo "$as_me:21985: checking for src modules" >&5
+-echo "$as_me:22462: checking for src modules" >&5
++echo "$as_me:22624: checking for src modules" >&5
  echo $ECHO_N "checking for src modules... $ECHO_C" >&6
  
  # dependencies and linker-arguments for test-programs
-@@ -22036,7 +22047,7 @@
+@@ -22524,7 +22686,7 @@
  		fi
  	fi
  done
--echo "$as_me:22039: result: $cf_cv_src_modules" >&5
-+echo "$as_me:22050: result: $cf_cv_src_modules" >&5
+-echo "$as_me:22527: result: $cf_cv_src_modules" >&5
++echo "$as_me:22689: result: $cf_cv_src_modules" >&5
  echo "${ECHO_T}$cf_cv_src_modules" >&6
  
  TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
-@@ -22256,7 +22267,7 @@
+@@ -22741,7 +22903,7 @@
  
  # Extract the first word of "tic", so it can be a program name with args.
  set dummy tic; ac_word=$2
--echo "$as_me:22259: checking for $ac_word" >&5
-+echo "$as_me:22270: checking for $ac_word" >&5
+-echo "$as_me:22744: checking for $ac_word" >&5
++echo "$as_me:22906: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_path_TIC_PATH+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -22273,7 +22284,7 @@
+@@ -22758,7 +22920,7 @@
    test -z "$ac_dir" && ac_dir=.
    if $as_executable_p "$ac_dir/$ac_word"; then
     ac_cv_path_TIC_PATH="$ac_dir/$ac_word"
--   echo "$as_me:22276: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:22287: found $ac_dir/$ac_word" >&5
+-   echo "$as_me:22761: found $ac_dir/$ac_word" >&5
++   echo "$as_me:22923: found $ac_dir/$ac_word" >&5
     break
  fi
  done
-@@ -22285,10 +22296,10 @@
+@@ -22770,10 +22932,10 @@
  TIC_PATH=$ac_cv_path_TIC_PATH
  
  if test -n "$TIC_PATH"; then
--  echo "$as_me:22288: result: $TIC_PATH" >&5
-+  echo "$as_me:22299: result: $TIC_PATH" >&5
+-  echo "$as_me:22773: result: $TIC_PATH" >&5
++  echo "$as_me:22935: result: $TIC_PATH" >&5
  echo "${ECHO_T}$TIC_PATH" >&6
  else
--  echo "$as_me:22291: result: no" >&5
-+  echo "$as_me:22302: result: no" >&5
+-  echo "$as_me:22776: result: no" >&5
++  echo "$as_me:22938: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -22296,7 +22307,7 @@
+@@ -22781,7 +22943,7 @@
  then
  	if test "$TIC_PATH" = unknown
  	then
--		{ echo "$as_me:22299: WARNING: no tic program found for fallbacks" >&5
-+		{ echo "$as_me:22310: WARNING: no tic program found for fallbacks" >&5
+-		{ echo "$as_me:22784: WARNING: no tic program found for fallbacks" >&5
++		{ echo "$as_me:22946: WARNING: no tic program found for fallbacks" >&5
  echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
  	fi
  fi
-@@ -22315,6 +22326,16 @@
- FORM_NAME=form
- CXX_NAME=ncurses++
- 
-+# workaround for OS/2 (20151017)
-+case $cf_cv_system_name in
-+(os2*)
-+	LIBTOOL_OPTS_CXX="-os2dllname ncurs++"
-+	;;
-+(*)
-+	LIBTOOL_OPTS_CXX=
-+	;;
-+esac
-+
- # workaround for g++ versus Solaris (20131116)
- case $cf_cv_system_name in
- (solaris2*)
-@@ -22322,7 +22343,7 @@
+@@ -22817,7 +22979,7 @@
  	(*-D_XOPEN_SOURCE_EXTENDED*)
  		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
  
--echo "${as_me:-configure}:22325: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
-+echo "${as_me:-configure}:22346: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+-echo "${as_me:-configure}:22820: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
++echo "${as_me:-configure}:22982: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
  
  		CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
  		CPPFLAGS=`echo "x$CPPFLAGS" | sed -e  's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'`
-@@ -22333,7 +22354,7 @@
+@@ -22828,7 +22990,7 @@
  
  # Help to automatically enable the extended curses features when using either
  # the *-config or the ".pc" files by adding defines.
--echo "$as_me:22336: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
-+echo "$as_me:22357: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
+-echo "$as_me:22831: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
++echo "$as_me:22993: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
  echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6
  PKG_CFLAGS=
  for cf_loop1 in $CPPFLAGS_after_XOPEN
-@@ -22349,7 +22370,7 @@
+@@ -22844,7 +23006,7 @@
  	done
  	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
  done
--echo "$as_me:22352: result: $PKG_CFLAGS" >&5
-+echo "$as_me:22373: result: $PKG_CFLAGS" >&5
+-echo "$as_me:22847: result: $PKG_CFLAGS" >&5
++echo "$as_me:23009: result: $PKG_CFLAGS" >&5
  echo "${ECHO_T}$PKG_CFLAGS" >&6
  
  # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
-@@ -22406,7 +22427,7 @@
+@@ -22901,7 +23063,7 @@
  	cf_filter_syms=$cf_dft_filter_syms
  	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_version" 1>&6
  
--echo "${as_me:-configure}:22409: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
-+echo "${as_me:-configure}:22430: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
+-echo "${as_me:-configure}:22904: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
++echo "${as_me:-configure}:23066: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
  
  fi
  
-@@ -22508,7 +22529,7 @@
+@@ -23005,7 +23167,7 @@
  : ${CONFIG_STATUS=./config.status}
  ac_clean_files_save=$ac_clean_files
  ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ echo "$as_me:22511: creating $CONFIG_STATUS" >&5
-+{ echo "$as_me:22532: creating $CONFIG_STATUS" >&5
+-{ echo "$as_me:23008: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:23170: creating $CONFIG_STATUS" >&5
  echo "$as_me: creating $CONFIG_STATUS" >&6;}
  cat >$CONFIG_STATUS <<_ACEOF
  #! $SHELL
-@@ -22684,7 +22705,7 @@
+@@ -23181,7 +23343,7 @@
      echo "$ac_cs_version"; exit 0 ;;
    --he | --h)
      # Conflict between --help and --header
--    { { echo "$as_me:22687: error: ambiguous option: $1
-+    { { echo "$as_me:22708: error: ambiguous option: $1
+-    { { echo "$as_me:23184: error: ambiguous option: $1
++    { { echo "$as_me:23346: 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;}
-@@ -22703,7 +22724,7 @@
+@@ -23200,7 +23362,7 @@
      ac_need_defaults=false;;
  
    # This is an error.
--  -*) { { echo "$as_me:22706: error: unrecognized option: $1
-+  -*) { { echo "$as_me:22727: error: unrecognized option: $1
+-  -*) { { echo "$as_me:23203: error: unrecognized option: $1
++  -*) { { echo "$as_me:23365: 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;}
-@@ -22821,7 +22842,7 @@
+@@ -23319,7 +23481,7 @@
    "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
    "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
--  *) { { echo "$as_me:22824: error: invalid argument: $ac_config_target" >&5
-+  *) { { echo "$as_me:22845: error: invalid argument: $ac_config_target" >&5
+-  *) { { echo "$as_me:23322: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:23484: error: invalid argument: $ac_config_target" >&5
  echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
     { (exit 1); exit 1; }; };;
    esac
-@@ -23157,6 +23178,7 @@
- s,@MENU_NAME@,$MENU_NAME,;t t
- s,@FORM_NAME@,$FORM_NAME,;t t
- s,@CXX_NAME@,$CXX_NAME,;t t
-+s,@LIBTOOL_OPTS_CXX@,$LIBTOOL_OPTS_CXX,;t t
- s,@PKG_CFLAGS@,$PKG_CFLAGS,;t t
- s,@MISC_INSTALL_DATA@,$MISC_INSTALL_DATA,;t t
- s,@MISC_UNINSTALL_DATA@,$MISC_UNINSTALL_DATA,;t t
-@@ -23294,7 +23316,7 @@
+@@ -23795,7 +23957,7 @@
    esac
  
    if test x"$ac_file" != x-; then
--    { echo "$as_me:23297: creating $ac_file" >&5
-+    { echo "$as_me:23319: creating $ac_file" >&5
+-    { echo "$as_me:23798: creating $ac_file" >&5
++    { echo "$as_me:23960: creating $ac_file" >&5
  echo "$as_me: creating $ac_file" >&6;}
      rm -f "$ac_file"
    fi
-@@ -23312,7 +23334,7 @@
+@@ -23813,7 +23975,7 @@
        -) echo $tmp/stdin ;;
        [\\/$]*)
           # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:23315: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:23337: error: cannot find input file: $f" >&5
+-         test -f "$f" || { { echo "$as_me:23816: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:23978: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
           echo $f;;
-@@ -23325,7 +23347,7 @@
+@@ -23826,7 +23988,7 @@
             echo $srcdir/$f
           else
             # /dev/null tree
--           { { echo "$as_me:23328: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:23350: error: cannot find input file: $f" >&5
+-           { { echo "$as_me:23829: error: cannot find input file: $f" >&5
++           { { echo "$as_me:23991: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
           fi;;
-@@ -23341,7 +23363,7 @@
+@@ -23842,7 +24004,7 @@
        if test -n "$ac_seen"; then
          ac_used=`grep '@datarootdir@' $ac_item`
          if test -z "$ac_used"; then
--          { echo "$as_me:23344: WARNING: datarootdir was used implicitly but not set:
-+          { echo "$as_me:23366: WARNING: datarootdir was used implicitly but not set:
+-          { echo "$as_me:23845: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:24007: 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;}
-@@ -23350,7 +23372,7 @@
+@@ -23851,7 +24013,7 @@
        fi
        ac_seen=`grep '${datarootdir}' $ac_item`
        if test -n "$ac_seen"; then
--        { echo "$as_me:23353: WARNING: datarootdir was used explicitly but not set:
-+        { echo "$as_me:23375: WARNING: datarootdir was used explicitly but not set:
+-        { echo "$as_me:23854: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:24016: 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;}
-@@ -23387,7 +23409,7 @@
+@@ -23888,7 +24050,7 @@
              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:23390: WARNING: Variable $ac_name is used but was not set:
-+              { echo "$as_me:23412: WARNING: Variable $ac_name is used but was not set:
+-              { echo "$as_me:23891: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:24053: 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;}
-@@ -23398,7 +23420,7 @@
+@@ -23899,7 +24061,7 @@
      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:23401: WARNING: Some variables may not be substituted:
-+      { echo "$as_me:23423: WARNING: Some variables may not be substituted:
+-      { echo "$as_me:23902: WARNING: Some variables may not be substituted:
++      { echo "$as_me:24064: WARNING: Some variables may not be substituted:
  $ac_seen" >&5
  echo "$as_me: WARNING: Some variables may not be substituted:
  $ac_seen" >&2;}
-@@ -23447,7 +23469,7 @@
+@@ -23948,7 +24110,7 @@
    * )   ac_file_in=$ac_file.in ;;
    esac
  
--  test x"$ac_file" != x- && { echo "$as_me:23450: creating $ac_file" >&5
-+  test x"$ac_file" != x- && { echo "$as_me:23472: creating $ac_file" >&5
+-  test x"$ac_file" != x- && { echo "$as_me:23951: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:24113: creating $ac_file" >&5
  echo "$as_me: creating $ac_file" >&6;}
  
    # First look for the input files in the build tree, otherwise in the
-@@ -23458,7 +23480,7 @@
+@@ -23959,7 +24121,7 @@
        -) echo $tmp/stdin ;;
        [\\/$]*)
           # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:23461: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:23483: error: cannot find input file: $f" >&5
+-         test -f "$f" || { { echo "$as_me:23962: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:24124: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
           echo $f;;
-@@ -23471,7 +23493,7 @@
+@@ -23972,7 +24134,7 @@
             echo $srcdir/$f
           else
             # /dev/null tree
--           { { echo "$as_me:23474: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:23496: error: cannot find input file: $f" >&5
+-           { { echo "$as_me:23975: error: cannot find input file: $f" >&5
++           { { echo "$as_me:24137: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
           fi;;
-@@ -23529,7 +23551,7 @@
+@@ -24030,7 +24192,7 @@
    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:23532: $ac_file is unchanged" >&5
-+      { echo "$as_me:23554: $ac_file is unchanged" >&5
+-      { echo "$as_me:24033: $ac_file is unchanged" >&5
++      { echo "$as_me:24195: $ac_file is unchanged" >&5
  echo "$as_me: $ac_file is unchanged" >&6;}
      else
        ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-@@ -23867,7 +23889,7 @@
+@@ -24375,7 +24537,7 @@
  				(cygdll|msysdll|mingw)
  					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
  
--echo "${as_me:-configure}:23870: testing overriding CXX_MODEL to SHARED ..." 1>&5
-+echo "${as_me:-configure}:23892: testing overriding CXX_MODEL to SHARED ..." 1>&5
+-echo "${as_me:-configure}:24378: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:24540: testing overriding CXX_MODEL to SHARED ..." 1>&5
  
  					with_shared_cxx=yes
  					;;
-Index: configure.in
-Prereq:  1.619 
---- ncurses-6.0-20151010+/configure.in	2015-08-05 23:32:27.000000000 +0000
-+++ ncurses-6.0-20151017/configure.in	2015-10-17 23:01:54.000000000 +0000
-@@ -28,14 +28,14 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: configure.in,v 1.619 2015/08/05 23:32:27 tom Exp $
-+dnl $Id: configure.in,v 1.620 2015/10/17 23:01:54 tom Exp $
- dnl Process this file with autoconf to produce a configure script.
- dnl
- dnl See http://invisible-island.net/autoconf/ for additional information.
- dnl
- dnl ---------------------------------------------------------------------------
- AC_PREREQ(2.52.20030208)
--AC_REVISION($Revision: 1.619 $)
-+AC_REVISION($Revision: 1.620 $)
- AC_INIT(ncurses/base/lib_initscr.c)
- AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
- 
-@@ -2075,6 +2075,17 @@
- AC_SUBST(FORM_NAME)
- AC_SUBST(CXX_NAME)
- 
-+# workaround for OS/2 (20151017)
-+case $cf_cv_system_name in
-+(os2*)
-+	LIBTOOL_OPTS_CXX="-os2dllname ncurs++"
-+	;;
-+(*)
-+	LIBTOOL_OPTS_CXX=
-+	;;
-+esac
-+AC_SUBST(LIBTOOL_OPTS_CXX)
-+
- # workaround for g++ versus Solaris (20131116)
- case $cf_cv_system_name in
- (solaris2*)
 Index: dist.mk
-Prereq:  1.1073 
---- ncurses-6.0-20151010+/dist.mk	2015-10-10 17:06:12.000000000 +0000
-+++ ncurses-6.0-20151017/dist.mk	2015-10-17 20:29:47.000000000 +0000
+Prereq:  1.1142 
+--- ncurses-6.0-20170114+/dist.mk	2017-01-14 15:30:30.000000000 +0000
++++ ncurses-6.0-20170121/dist.mk	2017-01-21 13:48:23.000000000 +0000
 @@ -25,7 +25,7 @@
  # use or other dealings in this Software without prior written               #
  # authorization.                                                             #
  ##############################################################################
--# $Id: dist.mk,v 1.1073 2015/10/10 17:06:12 tom Exp $
-+# $Id: dist.mk,v 1.1074 2015/10/17 20:29:47 tom Exp $
+-# $Id: dist.mk,v 1.1142 2017/01/14 15:30:30 tom Exp $
++# $Id: dist.mk,v 1.1143 2017/01/21 13:48:23 tom Exp $
  # Makefile for creating ncurses distributions.
  #
  # This only needs to be used directly as a makefile by developers, but
@@ -14359,8812 +12330,10523 @@ Prereq:  1.1073
  # These define the major/minor/patch versions of ncurses.
  NCURSES_MAJOR = 6
  NCURSES_MINOR = 0
--NCURSES_PATCH = 20151010
-+NCURSES_PATCH = 20151017
+-NCURSES_PATCH = 20170114
++NCURSES_PATCH = 20170121
  
  # We don't append the patch to the version, since this only applies to releases
  VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: ncurses/Makefile.in
-Prereq:  1.147 
---- ncurses-6.0-20151010+/ncurses/Makefile.in	2015-08-05 23:15:41.000000000 +0000
-+++ ncurses-6.0-20151017/ncurses/Makefile.in	2015-10-17 21:48:15.000000000 +0000
-@@ -1,4 +1,4 @@
--# $Id: Makefile.in,v 1.147 2015/08/05 23:15:41 tom Exp $
-+# $Id: Makefile.in,v 1.148 2015/10/17 21:48:15 Esa.Peuha Exp $
- ##############################################################################
- # Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.                #
- #                                                                            #
-@@ -225,7 +225,7 @@
- 	./make_keys$(BUILD_EXEEXT) keys.list > $@
+Index: doc/html/man/adacurses6-config.1.html
+--- ncurses-6.0-20170114+/doc/html/man/adacurses6-config.1.html	2017-01-14 22:55:32.000000000 +0000
++++ ncurses-6.0-20170121/doc/html/man/adacurses6-config.1.html	2017-01-21 23:35:54.000000000 +0000
+@@ -131,7 +131,7 @@
+

    SEE ALSO

    +        curses(3x)
  
- keys.list :	$(tinfo)/MKkeys_list.sh
--	AWK=$(AWK) $(SHELL) $(tinfo)/MKkeys_list.sh $(TERMINFO_CAPS) | sort >$@
-+	AWK=$(AWK) $(SHELL) $(tinfo)/MKkeys_list.sh $(TERMINFO_CAPS) | LC_ALL=C sort >$@
+-       This describes ncurses version 6.0 (patch 20170114).
++       This describes ncurses version 6.0 (patch 20170121).
  
- make_keys$(BUILD_EXEEXT) : \
- 		$(tinfo)/make_keys.c \
-Index: ncurses/base/lib_color.c
-Prereq:  1.111 
---- ncurses-6.0-20151010+/ncurses/base/lib_color.c	2015-08-22 22:38:58.000000000 +0000
-+++ ncurses-6.0-20151017/ncurses/base/lib_color.c	2015-10-17 20:39:18.000000000 +0000
-@@ -45,7 +45,7 @@
- #define CUR SP_TERMTYPE
- #endif
  
--MODULE_ID("$Id: lib_color.c,v 1.111 2015/08/22 22:38:58 tom Exp $")
-+MODULE_ID("$Id: lib_color.c,v 1.112 2015/10/17 20:39:18 Denis.Tikhomirov Exp $")
  
- #ifdef USE_TERM_DRIVER
- #define CanChange      InfoOf(SP_PARM).canchange
-@@ -858,8 +858,6 @@
- 	}
-     } else {
- 	reset_color_pair(NCURSES_SP_ARG);
--	if (old_pair < 0)
--	    return;
-     }
+Index: doc/html/man/captoinfo.1m.html
+--- ncurses-6.0-20170114+/doc/html/man/captoinfo.1m.html	2017-01-14 22:55:32.000000000 +0000
++++ ncurses-6.0-20170121/doc/html/man/captoinfo.1m.html	2017-01-21 23:35:54.000000000 +0000
+@@ -198,7 +198,7 @@
+

    SEE ALSO

    +        infocmp(1m), curses(3x), terminfo(5)
  
- #if NCURSES_EXT_FUNCS
-Index: ncurses/base/lib_mouse.c
-Prereq:  1.166 
---- ncurses-6.0-20151010+/ncurses/base/lib_mouse.c	2015-07-05 00:28:27.000000000 +0000
-+++ ncurses-6.0-20151017/ncurses/base/lib_mouse.c	2015-10-17 22:08:05.000000000 +0000
-@@ -84,7 +84,7 @@
- #define CUR SP_TERMTYPE
- #endif
+-       This describes ncurses version 6.0 (patch 20170114).
++       This describes ncurses version 6.0 (patch 20170121).
  
--MODULE_ID("$Id: lib_mouse.c,v 1.166 2015/07/05 00:28:27 tom Exp $")
-+MODULE_ID("$Id: lib_mouse.c,v 1.167 2015/10/17 22:08:05 KO.Myung-Hun Exp $")
  
- #include 
+

    AUTHOR

    +Index: doc/html/man/clear.1.html
+--- ncurses-6.0-20170114+/doc/html/man/clear.1.html	2017-01-14 22:55:32.000000000 +0000
++++ ncurses-6.0-20170121/doc/html/man/clear.1.html	2017-01-21 23:35:54.000000000 +0000
+@@ -147,7 +147,7 @@
+

    SEE ALSO

    +        tput(1), terminfo(5)
  
-@@ -888,7 +888,7 @@
-     do { \
- 	    eventp->bstate = MASK_PRESS(n); \
- 	    sp->_mouse_bstate |= MASK_PRESS(n); \
--	    if (kbuf[0] & 0x40) { \
-+	    if (button & 0x40) { \
- 		    eventp->bstate = MASK_RELEASE(n); \
- 		    sp->_mouse_bstate &= ~MASK_PRESS(n); \
- 	    } \
+-       This describes ncurses version 6.0 (patch 20170114).
++       This describes ncurses version 6.0 (patch 20170121).
+ 
+ 
+ 
+Index: doc/html/man/form.3x.html
+--- ncurses-6.0-20170114+/doc/html/man/form.3x.html	2017-01-14 22:55:35.000000000 +0000
++++ ncurses-6.0-20170121/doc/html/man/form.3x.html	2017-01-21 23:35:57.000000000 +0000
+@@ -239,7 +239,7 @@
+        curses(3x) and related pages whose names begin "form_" for
+        detailed descriptions of the entry points.
+ 
+-       This describes ncurses version 6.0 (patch 20170114).
++       This describes ncurses version 6.0 (patch 20170121).
+ 
+ 
+ 
+Index: doc/html/man/infocmp.1m.html
+--- ncurses-6.0-20170114+/doc/html/man/infocmp.1m.html	2017-01-14 22:55:36.000000000 +0000
++++ ncurses-6.0-20170121/doc/html/man/infocmp.1m.html	2017-01-21 23:35:57.000000000 +0000
+@@ -482,7 +482,7 @@
+ 
+        http://invisible-island.net/ncurses/tctest.html
+ 
+-       This describes ncurses version 6.0 (patch 20170114).
++       This describes ncurses version 6.0 (patch 20170121).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/infotocap.1m.html
+--- ncurses-6.0-20170114+/doc/html/man/infotocap.1m.html	2017-01-14 22:55:36.000000000 +0000
++++ ncurses-6.0-20170121/doc/html/man/infotocap.1m.html	2017-01-21 23:35:58.000000000 +0000
+@@ -88,7 +88,7 @@
+

    SEE ALSO

    +        curses(3x), tic(1m), infocmp(1m), terminfo(5)
+ 
+-       This describes ncurses version 6.0 (patch 20170114).
++       This describes ncurses version 6.0 (patch 20170121).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/menu.3x.html
+--- ncurses-6.0-20170114+/doc/html/man/menu.3x.html	2017-01-14 22:55:36.000000000 +0000
++++ ncurses-6.0-20170121/doc/html/man/menu.3x.html	2017-01-21 23:35:58.000000000 +0000
+@@ -217,7 +217,7 @@
+        curses(3x) and related pages whose names begin "menu_" for
+        detailed descriptions of the entry points.
+ 
+-       This describes ncurses version 6.0 (patch 20170114).
++       This describes ncurses version 6.0 (patch 20170121).
+ 
+ 
+ 
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.0-20170114+/doc/html/man/ncurses.3x.html	2017-01-14 22:55:37.000000000 +0000
++++ ncurses-6.0-20170121/doc/html/man/ncurses.3x.html	2017-01-21 23:35:58.000000000 +0000
+@@ -60,7 +60,7 @@
+        sonable optimization.  This implementation is "new curses"
+        (ncurses) and is the approved replacement for 4.4BSD clas-
+        sic  curses,  which has been discontinued.  This describes
+-       ncurses version 6.0 (patch 20170114).
++       ncurses version 6.0 (patch 20170121).
+ 
+        The ncurses library emulates the curses library of  System
+        V  Release  4  UNIX,  and  XPG4 (X/Open Portability Guide)
+Index: doc/html/man/ncurses6-config.1.html
+--- ncurses-6.0-20170114+/doc/html/man/ncurses6-config.1.html	2017-01-14 22:55:37.000000000 +0000
++++ ncurses-6.0-20170121/doc/html/man/ncurses6-config.1.html	2017-01-21 23:35:59.000000000 +0000
+@@ -114,7 +114,7 @@
+

    SEE ALSO

    +        curses(3x)
+ 
+-       This describes ncurses version 6.0 (patch 20170114).
++       This describes ncurses version 6.0 (patch 20170121).
+ 
+ 
+ 
+Index: doc/html/man/panel.3x.html
+--- ncurses-6.0-20170114+/doc/html/man/panel.3x.html	2017-01-14 22:55:37.000000000 +0000
++++ ncurses-6.0-20170121/doc/html/man/panel.3x.html	2017-01-21 23:35:59.000000000 +0000
+@@ -208,7 +208,7 @@
+

    SEE ALSO

    +        curses(3x), curs_variables(3x),
+ 
+-       This describes ncurses version 6.0 (patch 20170114).
++       This describes ncurses version 6.0 (patch 20170121).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/tabs.1.html
+--- ncurses-6.0-20170114+/doc/html/man/tabs.1.html	2017-01-14 22:55:37.000000000 +0000
++++ ncurses-6.0-20170121/doc/html/man/tabs.1.html	2017-01-21 23:35:59.000000000 +0000
+@@ -170,7 +170,7 @@
+

    SEE ALSO

    +        tset(1), infocmp(1m), curses(3x), terminfo(5).
+ 
+-       This describes ncurses version 6.0 (patch 20170114).
++       This describes ncurses version 6.0 (patch 20170121).
+ 
+ 
+ 
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.0-20170114+/doc/html/man/terminfo.5.html	2017-01-14 22:55:37.000000000 +0000
++++ ncurses-6.0-20170121/doc/html/man/terminfo.5.html	2017-01-21 23:35:59.000000000 +0000
+@@ -75,7 +75,7 @@
+        nals by giving a set of capabilities which they  have,  by
+        specifying how to perform screen operations, and by speci-
+        fying padding requirements and  initialization  sequences.
+-       This describes ncurses version 6.0 (patch 20170114).
++       This describes ncurses version 6.0 (patch 20170121).
+ 
+        Entries in terminfo consist of a sequence of `,' separated
+        fields (embedded commas may be escaped with a backslash or
+Index: doc/html/man/tic.1m.html
+--- ncurses-6.0-20170114+/doc/html/man/tic.1m.html	2017-01-14 22:55:37.000000000 +0000
++++ ncurses-6.0-20170121/doc/html/man/tic.1m.html	2017-01-21 23:35:59.000000000 +0000
+@@ -403,7 +403,7 @@
+        infocmp(1m),   captoinfo(1m),   infotocap(1m),    toe(1m),
+        curses(3x), term(5).  terminfo(5).
+ 
+-       This describes ncurses version 6.0 (patch 20170114).
++       This describes ncurses version 6.0 (patch 20170121).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/toe.1m.html
+--- ncurses-6.0-20170114+/doc/html/man/toe.1m.html	2017-01-14 22:55:37.000000000 +0000
++++ ncurses-6.0-20170121/doc/html/man/toe.1m.html	2017-01-21 23:35:59.000000000 +0000
+@@ -120,7 +120,7 @@
+        tic(1m),    infocmp(1m),   captoinfo(1m),   infotocap(1m),
+        curses(3x), terminfo(5).
+ 
+-       This describes ncurses version 6.0 (patch 20170114).
++       This describes ncurses version 6.0 (patch 20170121).
+ 
+ 
+ 
+Index: doc/html/man/tput.1.html
+--- ncurses-6.0-20170114+/doc/html/man/tput.1.html	2017-01-14 22:55:37.000000000 +0000
++++ ncurses-6.0-20170121/doc/html/man/tput.1.html	2017-01-21 23:35:59.000000000 +0000
+@@ -27,7 +27,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: tput.1,v 1.51 2017/01/14 20:49:40 tom Exp @
++  * @Id: tput.1,v 1.52 2017/01/21 17:38:30 tom Exp @
+ -->
+ 
+ 
+@@ -115,27 +115,26 @@
+ 
+

    Commands

    +        capname
+-              indicates  the  capability  from the terminfo data-
+-              base.  When termcap support  is  compiled  in,  the
+-              termcap name for the capability is also accepted.
++              indicates  the  capability  from the terminal data-
++              base.
+ 
+-              If  the  capability  is a string that takes parame-
+-              ters, the arguments following the  capability  will
++              If the capability is a string  that  takes  parame-
++              ters,  the  arguments following the capability will
+               be used as parameters for the string.
+ 
+-              Most  parameters  are numbers.  Only a few terminfo
++              Most parameters are numbers.  Only a  few  terminal
+               capabilities require string parameters; tput uses a
+               table to decide which to pass as strings.  Normally
+-              tput uses tparm(3x) to  perform  the  substitution.
++              tput  uses  tparm(3x)  to perform the substitution.
+               If no parameters are given for the capability, tput
+-              writes the string without performing the  substitu-
++              writes  the string without performing the substitu-
+               tion.
+ 
+-       init   If  the  terminfo  database is present and an entry
++       init   If the terminal database is present  and  an  entry
+               for the user's terminal exists (see -Ttype, above),
+               the following will occur:
+ 
+-              (1)  first,  tput  retrieves  the  current terminal
++              (1)  first, tput  retrieves  the  current  terminal
+                    mode settings for your terminal.  It does this
+                    by successively testing
+ 
+@@ -159,29 +158,29 @@
+ 
+               (3)  the terminal modes will be updated:
+ 
+-                   o   any  delays  (e.g.,  newline) specified in
++                   o   any delays (e.g.,  newline)  specified  in
+                        the entry will be set in the tty driver,
+ 
+-                   o   tabs expansion will be turned  on  or  off
++                   o   tabs  expansion  will  be turned on or off
+                        according  to  the  specification  in  the
+                        entry, and
+ 
+-                   o   if tabs are not  expanded,  standard  tabs
++                   o   if  tabs  are  not expanded, standard tabs
+                        will be set (every 8 spaces).
+ 
+-              (4)  if   present,  the  terminal's  initialization
++              (4)  if  present,  the  terminal's   initialization
+                    strings will be output as detailed in the ter-
+                    minfo(5) section on Tabs and Initialization,
+ 
+               (5)  output is flushed.
+ 
+               If an entry does not contain the information needed
+-              for any of these  activities,  that  activity  will
++              for  any  of  these  activities, that activity will
+               silently be skipped.
+ 
+        reset  This is similar to init, with two differences:
+ 
+-              (1)  before  any other initialization, the terminal
++              (1)  before any other initialization, the  terminal
+                    modes will be reset to a "sane" state:
+ 
+                    o   set cooked and echo modes,
+@@ -195,16 +194,16 @@
+ 
+               (2)  Instead of putting out initialization strings,
+                    the terminal's reset strings will be output if
+-                   present  (rs1,  rs2,  rs3,  rf).  If the reset
+-                   strings are not  present,  but  initialization
+-                   strings  are,  the initialization strings will
++                   present (rs1, rs2, rs3,  rf).   If  the  reset
++                   strings  are  not  present, but initialization
++                   strings are, the initialization  strings  will
+                    be output.
+ 
+               Otherwise, reset acts identically to init.
+ 
+        longname
+-              If the terminfo database is present  and  an  entry
+-              for  the user's terminal exists (see -Ttype above),
++              If  the  terminal  database is present and an entry
++              for the user's terminal exists (see -Ttype  above),
+               then the long name of the terminal will be put out.
+               The long name is the last name in the first line of
+               the terminal's description in the terminfo database
+@@ -216,59 +215,59 @@
+        it allows for the possibility that it is invoked by a link
+        with those names.
+ 
+-       If  tput  is  invoked  by a link named reset, this has the
+-       same effect as  tput  reset.   The  tset(1)  utility  also
++       If tput is invoked by a link named  reset,  this  has  the
++       same  effect  as  tput  reset.   The  tset(1) utility also
+        treats a link named reset specially.
+ 
+-       Before  ncurses 6.1, the two utilities were different from
++       Before ncurses 6.1, the two utilities were different  from
+        each other:
+ 
+-       o   tset utility reset  the  terminal  modes  and  special
++       o   tset  utility  reset  the  terminal  modes and special
+            characters (not done with tput).
+ 
+        o   On the other hand, tset's repertoire of terminal capa-
+-           bilities for resetting the terminal was more  limited,
++           bilities  for resetting the terminal was more limited,
+            i.e., only reset_1string, reset_2string and reset_file
+            in contrast to the tab-stops and margins which are set
+            by this utility.
+ 
+-       o   The  reset  program  is  usually  an  alias  for tset,
+-           because of this  difference  with  resetting  terminal
++       o   The reset  program  is  usually  an  alias  for  tset,
++           because  of  this  difference  with resetting terminal
+            modes and special characters.
+ 
+-       With  the  changes made for ncurses 6.1, the reset feature
+-       of the two programs is (mostly) the same.  A  few  differ-
++       With the changes made for ncurses 6.1, the  reset  feature
++       of  the  two programs is (mostly) the same.  A few differ-
+        ences remain:
+ 
+-       o   The  tset  program waits one second when resetting, in
++       o   The tset program waits one second when  resetting,  in
+            case it happens to be a hardware terminal.
+ 
+-       o   The two programs  write  the  terminal  initialization
+-           strings  to  different  streams  (i.e.,.  the standard
++       o   The  two  programs  write  the terminal initialization
++           strings to  different  streams  (i.e.,.  the  standard
+            error for tset and the standard output for tput).
+ 
+            Note:  although  these  programs  write  to  different
+-           streams,  redirecting their output to a file will cap-
+-           ture only part of their actions.  The changes  to  the
+-           terminal  modes  are  not  affected by redirecting the
++           streams, redirecting their output to a file will  cap-
++           ture  only  part of their actions.  The changes to the
++           terminal modes are not  affected  by  redirecting  the
+            output.
+ 
+        If tput is invoked by a link named init, this has the same
+-       effect  as  tput  init.  Again, you are less likely to use
+-       that link because another program named init  has  a  more
++       effect as tput init.  Again, you are less  likely  to  use
++       that  link  because  another program named init has a more
+        well-established use.
+ 
+ 
+

    EXAMPLES

    +        tput init
+             Initialize the terminal according to the type of ter-
+-            minal in the environmental variable TERM.  This  com-
+-            mand  should be included in everyone's .profile after
++            minal  in the environmental variable TERM.  This com-
++            mand should be included in everyone's .profile  after
+             the environmental variable TERM has been exported, as
+             illustrated on the profile(5) manual page.
+ 
+        tput -T5620 reset
+-            Reset  an  AT&T 5620 terminal, overriding the type of
++            Reset an AT&T 5620 terminal, overriding the  type  of
+             terminal in the environmental variable TERM.
+ 
+        tput cup 0 0
+@@ -289,16 +288,16 @@
+        bold=`tput smso` offbold=`tput rmso`
+             Set the shell variables bold, to begin stand-out mode
+             sequence, and offbold, to end standout mode sequence,
+-            for  the current terminal.  This might be followed by
+-            a prompt: echo  "${bold}Please  type  in  your  name:
++            for the current terminal.  This might be followed  by
++            a  prompt:  echo  "${bold}Please  type  in your name:
+             ${offbold}\c"
+ 
+        tput hc
+-            Set  exit code to indicate if the current terminal is
++            Set exit code to indicate if the current terminal  is
+             a hard copy terminal.
+ 
+        tput cup 23 4
+-            Send the sequence to move the cursor to row 23,  col-
++            Send  the sequence to move the cursor to row 23, col-
+             umn 4.
+ 
+        tput cup
+@@ -306,8 +305,8 @@
+             parameters substituted.
+ 
+        tput longname
+-            Print the long name from the  terminfo  database  for
+-            the  type  of terminal specified in the environmental
++            Print  the  long  name from the terminfo database for
++            the type of terminal specified in  the  environmental
+             variable TERM.
+ 
+             tput -S <<!
+@@ -316,10 +315,10 @@
+             > bold
+             > !
+ 
+-            This example shows tput processing several  capabili-
+-            ties  in one invocation.  It clears the screen, moves
+-            the cursor to position  10,  10  and  turns  on  bold
+-            (extra  bright)  mode.   The list is terminated by an
++            This  example shows tput processing several capabili-
++            ties in one invocation.  It clears the screen,  moves
++            the  cursor  to  position  10,  10  and turns on bold
++            (extra bright) mode.  The list is  terminated  by  an
+             exclamation mark (!) on a line by itself.
+ 
+ 
+@@ -329,44 +328,44 @@
+ 
+        /usr/share/tabset/*
+               tab settings for some terminals, in a format appro-
+-              priate   to  be  output  to  the  terminal  (escape
+-              sequences that set  margins  and  tabs);  for  more
+-              information,  see the Tabs and Initialization, sec-
++              priate  to  be  output  to  the  terminal   (escape
++              sequences  that  set  margins  and  tabs); for more
++              information, see the Tabs and Initialization,  sec-
+               tion of terminfo(5)
+ 
+ 
+

    EXIT CODES

    +        If the -S option is used, tput checks for errors from each
+-       line,  and if any errors are found, will set the exit code
+-       to 4 plus the number of lines with errors.  If  no  errors
+-       are  found,  the  exit  code is 0.  No indication of which
++       line, and if any errors are found, will set the exit  code
++       to  4  plus the number of lines with errors.  If no errors
++       are found, the exit code is 0.   No  indication  of  which
+        line failed can be given so exit code 1 will never appear.
+-       Exit  codes 2, 3, and 4 retain their usual interpretation.
++       Exit codes 2, 3, and 4 retain their usual  interpretation.
+        If the -S option is not used, the exit code depends on the
+        type of capname:
+ 
+           boolean
+                  a value of 0 is set for TRUE and 1 for FALSE.
+ 
+-          string a  value  of  0 is set if the capname is defined
+-                 for this terminal type (the value of capname  is
+-                 returned  on  standard  output); a value of 1 is
+-                 set if capname is not defined for this  terminal
++          string a value of 0 is set if the  capname  is  defined
++                 for  this terminal type (the value of capname is
++                 returned on standard output); a value  of  1  is
++                 set  if capname is not defined for this terminal
+                  type (nothing is written to standard output).
+ 
+           integer
+-                 a  value of 0 is always set, whether or not cap-
+-                 name is defined  for  this  terminal  type.   To
+-                 determine  if capname is defined for this termi-
+-                 nal type, the user must test the  value  written
+-                 to  standard  output.   A value of -1 means that
++                 a value of 0 is always set, whether or not  cap-
++                 name  is  defined  for  this  terminal type.  To
++                 determine if capname is defined for this  termi-
++                 nal  type,  the user must test the value written
++                 to standard output.  A value of  -1  means  that
+                  capname is not defined for this terminal type.
+ 
+-          other  reset or init may fail to find their  respective
+-                 files.   In that case, the exit code is set to 4
++          other  reset  or init may fail to find their respective
++                 files.  In that case, the exit code is set to  4
+                  + errno.
+ 
+-       Any other exit code indicates an error; see  the  DIAGNOS-
++       Any  other  exit code indicates an error; see the DIAGNOS-
+        TICS section.
+ 
+ 
+@@ -376,8 +375,8 @@
+ 
+        exit code   error message
+        ---------------------------------------------------------------------
+-       0           (capname is a numeric variable that is not specified  in
+-                   the  terminfo(5)  database  for this terminal type, e.g.
++       0           (capname  is a numeric variable that is not specified in
++                   the terminfo(5) database for this  terminal  type,  e.g.
+                    tput -T450 lines and tput -T2621 xmc)
+        1           no error message is printed, see the EXIT CODES section.
+        2           usage error
+@@ -388,117 +387,133 @@
+ 
+ 
+

    HISTORY

    +-       The tput command was begun by Bill Joy in 1980.  The  ini-
++       The  tput command was begun by Bill Joy in 1980.  The ini-
+        tial version only cleared the screen.
+ 
+-       AT&T  System  V  provided  a different tput command, whose
+-       init and reset  subcommands (more than half  the  program)
++       AT&T System V provided a  different  tput  command,  whose
++       init  and  reset  subcommands (more than half the program)
+        were incorporated from the reset feature of BSD tset writ-
+        ten by Eric Allman.
+ 
+-       Keith Bostic replaced the BSD tput command in 1989 with  a
+-       new  implementation  based  on  the  AT&T System V program
+-       tput.  Like the AT&T program,  Bostic's  version  accepted
+-       some  parameters  named  for terminfo capabilities (clear,
+-       init, longname and reset).  However (because he  had  only
+-       termcap  available),  it  accepted termcap names for other
+-       capabilities.  Also, Bostic's BSD tput did not modify  the
++       Keith  Bostic replaced the BSD tput command in 1989 with a
++       new implementation based on  the  AT&T  System  V  program
++       tput.   Like  the  AT&T program, Bostic's version accepted
++       some parameters named for  terminfo  capabilities  (clear,
++       init,  longname  and reset).  However (because he had only
++       termcap available), it accepted termcap  names  for  other
++       capabilities.   Also, Bostic's BSD tput did not modify the
+        terminal I/O modes as the earlier BSD tset had done.
+ 
+-       At  the  same  time,  Bostic  added  a  shell script named
++       At the same  time,  Bostic  added  a  shell  script  named
+        "clear", which used tput to clear the screen.
+ 
+-       Both of these appeared in 4.4BSD,  becoming  the  "modern"
++       Both  of  these  appeared in 4.4BSD, becoming the "modern"
+        BSD implementation of tput.
+ 
+ 
+

    PORTABILITY

    +-       This  implementation of tput differs from AT&T tput in two
++       This implementation of tput differs from AT&T tput in  two
+        important areas:
+ 
+        o   tput capname writes to the standard output.  That need
+-           not  be  a regular terminal.  However, the subcommands
+-           which manipulate terminal modes may not use the  stan-
++           not be a regular terminal.  However,  the  subcommands
++           which  manipulate terminal modes may not use the stan-
+            dard output.
+ 
+-           The  AT&T implementation's init and reset commands use
++           The AT&T implementation's init and reset commands  use
+            the BSD (4.1c) tset source, which manipulates terminal
+-           modes.   It  successively tries standard output, stan-
+-           dard error, standard  input  before  falling  back  to
++           modes.  It successively tries standard  output,  stan-
++           dard  error,  standard  input  before  falling back to
+            "/dev/tty" and finally just assumes a 1200Bd terminal.
+            When updating terminal modes, it ignores errors.
+ 
+-           Until changes made after ncurses  6.0,  tput  did  not
++           Until  changes  made  after  ncurses 6.0, tput did not
+            modify  terminal  modes.   tput  now  uses  a  similar
+-           scheme, using functions shared with  tset  (and  ulti-
+-           mately  based  on the 4.4BSD tset).  If it is not able
+-           to open a terminal, e.g., when running in  cron,  tput
++           scheme,  using  functions  shared with tset (and ulti-
++           mately based on the 4.4BSD tset).  If it is  not  able
++           to  open  a terminal, e.g., when running in cron, tput
+            will return an error.
+ 
+-       o   AT&T  tput guesses the type of its capname operands by
++       o   AT&T tput guesses the type of its capname operands  by
+            seeing if all of the characters are numeric, or not.
+ 
+            Most implementations which provide support for capname
+-           operands  use  the tparm function to expand parameters
++           operands use the tparm function to  expand  parameters
+            in it.  That function expects a mixture of numeric and
+-           string  parameters,  requiring tput to know which type
++           string parameters, requiring tput to know  which  type
+            to use.
+ 
+-           This implementation uses  a  table  to  determine  the
++           This  implementation  uses  a  table  to determine the
+            parameter types for the standard capname operands, and
+-           an internal library function  to  analyze  nonstandard
++           an  internal  library  function to analyze nonstandard
+            capname operands.
+ 
+-       The  longname  and -S options, and the parameter-substitu-
+-       tion features used in the cup example, were not  supported
+-       in  BSD curses before 4.3reno (1989) or in AT&T/USL curses
++       This implementation (unlike others) can accept both  term-
++       cap and terminfo names for the capname feature, if termcap
++       support is compiled in.  However, the  predefined  termcap
++       and  terminfo names have two ambiguities in this case (and
++       the terminfo name is assumed):
++
++       o   The termcap name dl corresponds to the  terminfo  name
++           dl1 (delete one line).
++           The  terminfo  name dl corresponds to the termcap name
++           DL (delete a given number of lines).
++
++       o   The termcap name ed corresponds to the  terminfo  name
++           rmdc (end delete mode).
++           The  terminfo  name ed corresponds to the termcap name
++           cd (clear to end of screen).
++
++       The longname and -S options, and  the  parameter-substitu-
++       tion  features used in the cup example, were not supported
++       in BSD curses before 4.3reno (1989) or in AT&T/USL  curses
+        before SVr4 (1988).
+ 
+-       IEEE Std 1003.1/The Open Group  Base Specifications  Issue
+-       7  (POSIX.1-2008)  documents  only the operands for clear,
+-       init and reset.  There are a few interesting  observations
++       IEEE  Std 1003.1/The Open Group  Base Specifications Issue
++       7 (POSIX.1-2008) documents only the  operands  for  clear,
++       init  and reset.  There are a few interesting observations
+        to make regarding that:
+ 
+-       o   In  this  implementation, clear is part of the capname
++       o   In this implementation, clear is part of  the  capname
+            support.  The others (init and longname) do not corre-
+            spond to terminal capabilities.
+ 
+-       o   Other  implementations  of  tput on SVr4-based systems
+-           such as Solaris, IRIX64 and HPUX  as  well  as  others
+-           such  as AIX and Tru64 provide support for capname op-
++       o   Other implementations of tput  on  SVr4-based  systems
++           such  as  Solaris,  IRIX64  and HPUX as well as others
++           such as AIX and Tru64 provide support for capname  op-
+            erands.
+ 
+-       o   A few platforms  such  as  FreeBSD  recognize  termcap
+-           names  rather  than terminfo capability names in their
+-           respective tput commands.  Since 2010,  NetBSD's  tput
+-           uses  terminfo  names.  Before that, it (like FreeBSD)
++       o   A  few  platforms  such  as  FreeBSD recognize termcap
++           names rather than terminfo capability names  in  their
++           respective  tput  commands.  Since 2010, NetBSD's tput
++           uses terminfo names.  Before that, it  (like  FreeBSD)
+            recognized termcap names.
+ 
+-       Because (apparently) all of  the  certified  Unix  systems
+-       support  the  full  set of capability names, the reasoning
++       Because  (apparently)  all  of  the certified Unix systems
++       support the full set of capability  names,  the  reasoning
+        for documenting only a few may not be apparent.
+ 
+        o   X/Open Curses Issue 7 documents tput differently, with
+-           capname  and the other features used in this implemen-
++           capname and the other features used in this  implemen-
+            tation.
+ 
+-       o   That is, there are two standards for  tput:  POSIX  (a
+-           subset)  and  X/Open Curses (the full implementation).
+-           POSIX documents a subset to avoid the complication  of
+-           including  X/Open Curses and the terminal capabilities
++       o   That  is,  there  are two standards for tput: POSIX (a
++           subset) and X/Open Curses (the  full  implementation).
++           POSIX  documents a subset to avoid the complication of
++           including X/Open Curses and the terminal  capabilities
+            database.
+ 
+        o   While it is certainly possible to write a tput program
+            without using curses, none of the systems which have a
+-           curses implementation provide  a  tput  utility  which
++           curses  implementation  provide  a  tput utility which
+            does not provide the capname feature.
+ 
+ 
+

    SEE ALSO

    +-       clear(1),    stty(1),   tabs(1),   tset(1),   terminfo(5),
++       clear(1),   stty(1),   tabs(1),   tset(1),    terminfo(5),
+        curs_termcap(3x).
+ 
+-       This describes ncurses version 6.0 (patch 20170114).
++       This describes ncurses version 6.0 (patch 20170121).
+ 
+ 
+ 
+Index: doc/html/man/tset.1.html
+--- ncurses-6.0-20170114+/doc/html/man/tset.1.html	2017-01-14 22:55:37.000000000 +0000
++++ ncurses-6.0-20170121/doc/html/man/tset.1.html	2017-01-21 23:35:59.000000000 +0000
+@@ -435,7 +435,7 @@
+        csh(1),   sh(1),   stty(1),   curs_terminfo(3x),   tty(4),
+        terminfo(5), ttys(5), environ(7)
+ 
+-       This describes ncurses version 6.0 (patch 20170114).
++       This describes ncurses version 6.0 (patch 20170121).
+ 
+ 
+ 
+Index: include/curses.h.in
+Prereq:  1.244 
+--- ncurses-6.0-20170114+/include/curses.h.in	2016-12-10 23:56:23.000000000 +0000
++++ ncurses-6.0-20170121/include/curses.h.in	2017-01-21 23:06:27.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -32,7 +32,7 @@
+  *     and: Thomas E. Dickey                        1996-on                 *
+  ****************************************************************************/
+ 
+-/* $Id: curses.h.in,v 1.244 2016/12/10 23:56:23 tom Exp $ */
++/* $Id: curses.h.in,v 1.245 2017/01/21 23:06:27 tom Exp $ */
+ 
+ #ifndef __NCURSES_H
+ #define __NCURSES_H
+@@ -1203,7 +1203,7 @@
+ /*
+  * These apply to the first 256 color pairs.
+  */
+-#define COLOR_PAIR(n)	NCURSES_BITS((n), 0)
++#define COLOR_PAIR(n)	(NCURSES_BITS((n), 0) & A_COLOR)
+ #define PAIR_NUMBER(a)	(NCURSES_CAST(int,((NCURSES_CAST(unsigned long,(a)) & A_COLOR) >> NCURSES_ATTR_SHIFT)))
+ 
+ /*
+Index: man/tput.1
+Prereq:  1.51 
+--- ncurses-6.0-20170114+/man/tput.1	2017-01-14 20:49:40.000000000 +0000
++++ ncurses-6.0-20170121/man/tput.1	2017-01-21 17:38:30.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tput.1,v 1.51 2017/01/14 20:49:40 tom Exp $
++.\" $Id: tput.1,v 1.52 2017/01/21 17:38:30 tom Exp $
+ .TH @TPUT@ 1 ""
+ .ds d @TERMINFO@
+ .ds n 1
+@@ -112,22 +112,20 @@
+ .SS Commands
+ .TP
+ \fIcapname\fR
+-indicates the capability from the \fBterminfo\fR database.  When
+-\fBtermcap\fR support is compiled in, the \fBtermcap\fR name for
+-the capability is also accepted.
++indicates the capability from the terminal database.
+ .IP
+ If the capability is a string that takes parameters, the arguments
+ following the capability will be used as parameters for the string.
+ .IP
+ Most parameters are numbers.
+-Only a few terminfo capabilities require string parameters;
++Only a few terminal capabilities require string parameters;
+ \fB@TPUT@\fR uses a table to decide which to pass as strings.
+ Normally \fB@TPUT@\fR uses \fBtparm\fR(3X) to perform the substitution.
+ If no parameters are given for the capability,
+ \fB@TPUT@\fR writes the string without performing the substitution.
+ .TP
+ \fBinit\fR
+-If the \fBterminfo\fR database is present and an entry for the user's
++If the terminal database is present and an entry for the user's
+ terminal exists (see \fB\-T\fR\fItype\fR, above), the following will
+ occur:
+ .RS
+@@ -213,7 +211,7 @@
+ Otherwise, \fBreset\fR acts identically to \fBinit\fR.
+ .TP
+ \fBlongname\fR
+-If the \fBterminfo\fR database is present and an entry for the
++If the terminal database is present and an entry for the
+ user's terminal exists (see \fB\-T\fR\fItype\fR above), then the long name
+ of the terminal will be put out.  The long name is the last
+ name in the first line of the terminal's description in the
+@@ -453,6 +451,25 @@
+ the standard \fIcapname\fR operands, and an internal library
+ function to analyze nonstandard \fIcapname\fR operands.
+ .PP
++This implementation (unlike others) can accept both \fItermcap\fP
++and \fIterminfo\fP names for the \fIcapname\fP feature,
++if
++\fItermcap\fR support is compiled in.
++However, the predefined \fItermcap\fP and \fIterminfo\fP names have two
++ambiguities in this case (and the \fIterminfo\fP name is assumed):
++.bP
++The \fItermcap\fP name \fBdl\fP corresponds to
++the \fIterminfo\fP name \fBdl1\fP (delete one line).
++.br
++The \fIterminfo\fP name \fBdl\fP corresponds to
++the \fItermcap\fP name \fBDL\fP (delete a given number of lines).
++.bP
++The \fItermcap\fP name \fBed\fP corresponds to
++the \fIterminfo\fP name \fBrmdc\fP (end delete mode).
++.br
++The \fIterminfo\fP name \fBed\fP corresponds to
++the \fItermcap\fP name \fBcd\fP (clear to end of screen).
++.PP
+ The \fBlongname\fR and \fB\-S\fR options, and the parameter-substitution
+ features used in the \fBcup\fR example,
+ were not supported in BSD curses before 4.3reno (1989) or in
+Index: ncurses/curses.priv.h
+Prereq:  1.558 
+--- ncurses-6.0-20170114+/ncurses/curses.priv.h	2017-01-14 17:52:49.000000000 +0000
++++ ncurses-6.0-20170121/ncurses/curses.priv.h	2017-01-21 23:02:04.000000000 +0000
+@@ -34,7 +34,7 @@
+  ****************************************************************************/
+ 
+ /*
+- * $Id: curses.priv.h,v 1.558 2017/01/14 17:52:49 tom Exp $
++ * $Id: curses.priv.h,v 1.559 2017/01/21 23:02:04 tom Exp $
+  *
+  *	curses.priv.h
+  *
+@@ -406,7 +406,7 @@
+  * option for compiling the tracing into the library.
+  */
+ #if 1
+-#define ColorPair(n)		NCURSES_BITS(n, 0)
++#define ColorPair(n)		(NCURSES_BITS(n, 0) & A_COLOR)
+ #define PairNumber(a)		(NCURSES_CAST(int,(((unsigned long)(a) & A_COLOR) >> NCURSES_ATTR_SHIFT)))
+ #else
+ #define ColorPair(pair)		COLOR_PAIR(pair)
+@@ -426,7 +426,7 @@
+ #define if_EXT_COLORS(stmt)	stmt
+ #define SetPair(value,p)	SetPair2((value).ext_color, AttrOf(value), p)
+ #define SetPair2(c,a,p)		c = (p), \
+-				a = (unColor2(a) | (A_COLOR & (unsigned) ColorPair(oldColor(c))))
++				a = (unColor2(a) | ColorPair(oldColor(c)))
+ #define GetPair(value)		GetPair2((value).ext_color, AttrOf(value))
+ #define GetPair2(c,a)		((c) ? (c) : PairNumber(a))
+ #define oldColor(p)		(((p) > 255) ? 255 : (p))
+@@ -440,11 +440,11 @@
+ 
+ #define if_EXT_COLORS(stmt)	/* nothing */
+ #define SetPair(value,p)	RemAttr(value, A_COLOR), \
+-				SetAttr(value, AttrOf(value) | (A_COLOR & (attr_t) ColorPair(p)))
++				SetAttr(value, AttrOf(value) | ColorPair(p))
+ #define GetPair(value)		PairNumber(AttrOf(value))
+ #define GET_WINDOW_PAIR(w)	PairNumber(WINDOW_ATTRS(w))
+ #define SET_WINDOW_PAIR(w,p)	WINDOW_ATTRS(w) &= ALL_BUT_COLOR, \
+-				WINDOW_ATTRS(w) |= (A_COLOR & (attr_t) ColorPair(p))
++				WINDOW_ATTRS(w) |= ColorPair(p)
+ #define SameAttrOf(a,b)		(AttrOf(a) == AttrOf(b))
+ 
+ #define VIDATTR(sp,attr,pair)	NCURSES_SP_NAME(vidputs)(NCURSES_SP_ARGx attr, NCURSES_OUTC_FUNC)
 Index: package/debian-mingw/changelog
---- ncurses-6.0-20151010+/package/debian-mingw/changelog	2015-10-10 17:06:12.000000000 +0000
-+++ ncurses-6.0-20151017/package/debian-mingw/changelog	2015-10-17 20:29:47.000000000 +0000
+--- ncurses-6.0-20170114+/package/debian-mingw/changelog	2017-01-14 15:30:30.000000000 +0000
++++ ncurses-6.0-20170121/package/debian-mingw/changelog	2017-01-21 13:48:23.000000000 +0000
 @@ -1,8 +1,8 @@
--ncurses6 (6.0+20151010) unstable; urgency=low
-+ncurses6 (6.0+20151017) unstable; urgency=low
+-ncurses6 (6.0+20170114) unstable; urgency=low
++ncurses6 (6.0+20170121) unstable; urgency=low
  
    * latest weekly patch
  
-- -- Thomas E. Dickey   Sat, 10 Oct 2015 13:06:12 -0400
-+ -- Thomas E. Dickey   Sat, 17 Oct 2015 16:29:47 -0400
+- -- Thomas E. Dickey   Sat, 14 Jan 2017 10:30:30 -0500
++ -- Thomas E. Dickey   Sat, 21 Jan 2017 08:48:23 -0500
  
  ncurses6 (5.9-20131005) unstable; urgency=low
  
 Index: package/debian-mingw64/changelog
---- ncurses-6.0-20151010+/package/debian-mingw64/changelog	2015-10-10 17:06:12.000000000 +0000
-+++ ncurses-6.0-20151017/package/debian-mingw64/changelog	2015-10-17 20:29:47.000000000 +0000
+--- ncurses-6.0-20170114+/package/debian-mingw64/changelog	2017-01-14 15:30:30.000000000 +0000
++++ ncurses-6.0-20170121/package/debian-mingw64/changelog	2017-01-21 13:48:23.000000000 +0000
 @@ -1,8 +1,8 @@
--ncurses6 (6.0+20151010) unstable; urgency=low
-+ncurses6 (6.0+20151017) unstable; urgency=low
+-ncurses6 (6.0+20170114) unstable; urgency=low
++ncurses6 (6.0+20170121) unstable; urgency=low
  
    * latest weekly patch
  
-- -- Thomas E. Dickey   Sat, 10 Oct 2015 13:06:12 -0400
-+ -- Thomas E. Dickey   Sat, 17 Oct 2015 16:29:47 -0400
+- -- Thomas E. Dickey   Sat, 14 Jan 2017 10:30:30 -0500
++ -- Thomas E. Dickey   Sat, 21 Jan 2017 08:48:23 -0500
  
  ncurses6 (5.9-20131005) unstable; urgency=low
  
 Index: package/debian/changelog
---- ncurses-6.0-20151010+/package/debian/changelog	2015-10-10 17:06:12.000000000 +0000
-+++ ncurses-6.0-20151017/package/debian/changelog	2015-10-17 20:29:47.000000000 +0000
+--- ncurses-6.0-20170114+/package/debian/changelog	2017-01-14 15:30:30.000000000 +0000
++++ ncurses-6.0-20170121/package/debian/changelog	2017-01-21 13:48:23.000000000 +0000
 @@ -1,8 +1,8 @@
--ncurses6 (6.0+20151010) unstable; urgency=low
-+ncurses6 (6.0+20151017) unstable; urgency=low
+-ncurses6 (6.0+20170114) unstable; urgency=low
++ncurses6 (6.0+20170121) unstable; urgency=low
  
    * latest weekly patch
  
-- -- Thomas E. Dickey   Sat, 10 Oct 2015 13:06:12 -0400
-+ -- Thomas E. Dickey   Sat, 17 Oct 2015 16:29:47 -0400
+- -- Thomas E. Dickey   Sat, 14 Jan 2017 10:30:30 -0500
++ -- Thomas E. Dickey   Sat, 21 Jan 2017 08:48:23 -0500
  
  ncurses6 (5.9-20120608) unstable; urgency=low
  
 Index: package/mingw-ncurses.nsi
-Prereq:  1.126 
---- ncurses-6.0-20151010+/package/mingw-ncurses.nsi	2015-10-10 17:06:12.000000000 +0000
-+++ ncurses-6.0-20151017/package/mingw-ncurses.nsi	2015-10-17 20:29:47.000000000 +0000
+Prereq:  1.193 
+--- ncurses-6.0-20170114+/package/mingw-ncurses.nsi	2017-01-14 15:30:30.000000000 +0000
++++ ncurses-6.0-20170121/package/mingw-ncurses.nsi	2017-01-21 13:48:23.000000000 +0000
 @@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.126 2015/10/10 17:06:12 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.127 2015/10/17 20:29:47 tom Exp $
+-; $Id: mingw-ncurses.nsi,v 1.193 2017/01/14 15:30:30 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.194 2017/01/21 13:48:23 tom Exp $
  
  ; TODO add examples
  ; TODO bump ABI to 6
 @@ -10,7 +10,7 @@
  !define VERSION_MAJOR "6"
  !define VERSION_MINOR "0"
- !define VERSION_YYYY  "2015"
--!define VERSION_MMDD  "1010"
-+!define VERSION_MMDD  "1017"
+ !define VERSION_YYYY  "2017"
+-!define VERSION_MMDD  "0114"
++!define VERSION_MMDD  "0121"
  !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
  
  !define MY_ABI   "5"
 Index: package/mingw-ncurses.spec
---- ncurses-6.0-20151010+/package/mingw-ncurses.spec	2015-10-10 17:06:12.000000000 +0000
-+++ ncurses-6.0-20151017/package/mingw-ncurses.spec	2015-10-17 20:29:47.000000000 +0000
+--- ncurses-6.0-20170114+/package/mingw-ncurses.spec	2017-01-14 15:30:30.000000000 +0000
++++ ncurses-6.0-20170121/package/mingw-ncurses.spec	2017-01-21 13:48:23.000000000 +0000
 @@ -3,7 +3,7 @@
  Summary: shared libraries for terminal handling
  Name: mingw32-ncurses6
  Version: 6.0
--Release: 20151010
-+Release: 20151017
+-Release: 20170114
++Release: 20170121
  License: X11
  Group: Development/Libraries
  Source: ncurses-%{version}-%{release}.tgz
 Index: package/ncurses.spec
---- ncurses-6.0-20151010+/package/ncurses.spec	2015-10-10 17:06:12.000000000 +0000
-+++ ncurses-6.0-20151017/package/ncurses.spec	2015-10-17 20:29:47.000000000 +0000
+--- ncurses-6.0-20170114+/package/ncurses.spec	2017-01-14 15:30:30.000000000 +0000
++++ ncurses-6.0-20170121/package/ncurses.spec	2017-01-21 13:48:23.000000000 +0000
 @@ -1,7 +1,7 @@
  Summary: shared libraries for terminal handling
  Name: ncurses6
  Version: 6.0
--Release: 20151010
-+Release: 20151017
+-Release: 20170114
++Release: 20170121
  License: X11
  Group: Development/Libraries
  Source: ncurses-%{version}-%{release}.tgz
+Index: progs/tput.c
+Prereq:  1.68 
+--- ncurses-6.0-20170114+/progs/tput.c	2017-01-07 23:08:24.000000000 +0000
++++ ncurses-6.0-20170121/progs/tput.c	2017-01-21 17:40:51.000000000 +0000
+@@ -50,7 +50,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: tput.c,v 1.68 2017/01/07 23:08:24 tom Exp $")
++MODULE_ID("$Id: tput.c,v 1.69 2017/01/21 17:40:51 tom Exp $")
+ 
+ #define PUTS(s)		fputs(s, stdout)
+ 
+@@ -180,18 +180,15 @@
+ 	    if ((np = _nc_find_entry(name, _nc_get_hash_table(termcap))) != 0) {
+ 		switch (np->nte_type) {
+ 		case BOOLEAN:
+-		    if (bool_from_termcap[np->nte_index])
+-			name = boolnames[np->nte_index];
++		    name = boolnames[np->nte_index];
+ 		    break;
+ 
+ 		case NUMBER:
+-		    if (num_from_termcap[np->nte_index])
+-			name = numnames[np->nte_index];
++		    name = numnames[np->nte_index];
+ 		    break;
+ 
+ 		case STRING:
+-		    if (str_from_termcap[np->nte_index])
+-			name = strnames[np->nte_index];
++		    name = strnames[np->nte_index];
+ 		    break;
+ 		}
+ 		goto retry;
 Index: test/aclocal.m4
-Prereq:  1.121 
---- ncurses-6.0-20151010+/test/aclocal.m4	2015-10-10 20:30:48.000000000 +0000
-+++ ncurses-6.0-20151017/test/aclocal.m4	2015-10-17 23:06:10.000000000 +0000
+Prereq:  1.136 
+--- ncurses-6.0-20170114+/test/aclocal.m4	2016-10-08 21:36:55.000000000 +0000
++++ ncurses-6.0-20170121/test/aclocal.m4	2017-01-21 22:18:40.000000000 +0000
+@@ -1,5 +1,5 @@
+ dnl***************************************************************************
+-dnl Copyright (c) 2003-2015,2016 Free Software Foundation, Inc.              *
++dnl Copyright (c) 2003-2016,2017 Free Software Foundation, Inc.              *
+ dnl                                                                          *
+ dnl Permission is hereby granted, free of charge, to any person obtaining a  *
+ dnl copy of this software and associated documentation files (the            *
 @@ -26,7 +26,7 @@
  dnl authorization.                                                           *
  dnl***************************************************************************
  dnl
--dnl $Id: aclocal.m4,v 1.121 2015/10/10 20:30:48 tom Exp $
-+dnl $Id: aclocal.m4,v 1.122 2015/10/17 23:06:10 tom Exp $
+-dnl $Id: aclocal.m4,v 1.136 2016/10/08 21:36:55 tom Exp $
++dnl $Id: aclocal.m4,v 1.137 2017/01/21 22:18:40 tom Exp $
  dnl
  dnl Author: Thomas E. Dickey
  dnl
-@@ -3306,7 +3306,7 @@
- test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
+@@ -1941,7 +1941,7 @@
+ AC_SUBST(MAKE_LOWER_TAGS)
  ])dnl
  dnl ---------------------------------------------------------------------------
--dnl CF_XOPEN_SOURCE version: 49 updated: 2015/04/12 15:39:00
-+dnl CF_XOPEN_SOURCE version: 50 updated: 2015/10/17 19:03:33
- dnl ---------------
- dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
- dnl or adapt to the vendor's definitions to get equivalent functionality,
-@@ -3376,6 +3376,9 @@
- (openbsd*)
- 	# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
- 	;;
-+(os2*)
-+	cf_XOPEN_SOURCE=
-+	;;
- (osf[[45]]*)
- 	cf_xopen_source="-D_OSF_SOURCE"
- 	;;
-Index: test/configure
---- ncurses-6.0-20151010+/test/configure	2015-10-10 20:30:58.000000000 +0000
-+++ ncurses-6.0-20151017/test/configure	2015-10-17 23:06:33.000000000 +0000
-@@ -3173,6 +3173,9 @@
- (openbsd*)
- 	# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
- 	;;
-+(os2*)
-+	cf_XOPEN_SOURCE=
-+	;;
- (osf[45]*)
- 	cf_xopen_source="-D_OSF_SOURCE"
- 	;;
-@@ -3192,14 +3195,14 @@
- 	;;
- (*)
+-dnl CF_MATH_LIB version: 8 updated: 2010/05/29 16:31:02
++dnl CF_MATH_LIB version: 9 updated: 2017/01/21 11:06:25
+ dnl -----------
+ dnl Checks for libraries.  At least one UNIX system, Apple Macintosh
+ dnl Rhapsody 5.5, does not have -lm.  We cannot use the simpler
+@@ -1952,6 +1952,7 @@
+ 	cf_cv_need_libm,[
+ 	AC_TRY_LINK([
+ 	#include 
++	#include 
+ 	#include 
+ 	],
+ 	[double x = rand(); printf("result = %g\n", ]ifelse([$2],,sin(x),$2)[)],
+Index: test/blue.c
+Prereq:  1.46 
+--- ncurses-6.0-20170114+/test/blue.c	2016-09-05 00:24:27.000000000 +0000
++++ ncurses-6.0-20170121/test/blue.c	2017-01-22 00:39:52.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2013,2016 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -36,7 +36,7 @@
+  *****************************************************************************/
  
--echo "$as_me:3195: checking if we should define _XOPEN_SOURCE" >&5
-+echo "$as_me:3198: 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
+ /*
+- * $Id: blue.c,v 1.46 2016/09/05 00:24:27 tom Exp $
++ * $Id: blue.c,v 1.48 2017/01/22 00:39:52 tom Exp $
+  */
+ 
+ #include 
+@@ -209,7 +209,11 @@
+ 	addch(ranks[isuit][0] | (chtype) COLOR_PAIR(BLUE_ON_WHITE));
+ 	addch(ranks[isuit][1] | (chtype) COLOR_PAIR(BLUE_ON_WHITE));
+ 
+-	attron(color);
++#ifdef NCURSES_VERSION
++	(attron) ((int) color);	/* quieter compiler warnings */
++#else
++	attron(color);		/* PDCurses, etc., either no macro or wrong */
++#endif
+ #if USE_WIDEC_SUPPORT
+ 	{
+ 	    wchar_t values[2];
+@@ -220,7 +224,11 @@
+ #else
+ 	addch((chtype) suits[which]);
+ #endif
++#ifdef NCURSES_VERSION
++	(attroff) ((int) color);
++#else
+ 	attroff(color);
++#endif
+     }
+     (void) addch(' ');
+ }
+Index: test/configure
+--- ncurses-6.0-20170114+/test/configure	2016-10-08 21:37:21.000000000 +0000
++++ ncurses-6.0-20170121/test/configure	2017-01-21 22:19:22.000000000 +0000
+@@ -2613,6 +2613,7 @@
+ #include "confdefs.h"
+ 
+ 	#include 
++	#include 
+ 	#include 
+ 
+ int
+@@ -2624,16 +2625,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:2627: \"$ac_link\"") >&5
++if { (eval echo "$as_me:2628: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:2630: \$? = $ac_status" >&5
++  echo "$as_me:2631: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:2633: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2634: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2636: \$? = $ac_status" >&5
++  echo "$as_me:2637: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_need_libm=no
+ else
+@@ -2643,7 +2644,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:2646: result: $cf_cv_need_libm" >&5
++echo "$as_me:2647: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+ if test "$cf_cv_need_libm" = yes
+ then
+@@ -2702,10 +2703,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:2705: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:2706: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > conftest.$ac_ext <&5
++		if { (eval echo "$as_me:2758: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2760: \$? = $ac_status" >&5
++  echo "$as_me:2761: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:2762: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:2763: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case $cf_attribute in
+@@ -2818,7 +2819,7 @@
+ rm -rf conftest*
+ fi
+ 
+-echo "$as_me:2821: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:2822: checking if you want to work around bogus compiler/loader warnings" >&5
+ echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6
+ 
+ # Check whether --enable-string-hacks or --disable-string-hacks was given.
+@@ -2828,7 +2829,7 @@
+ else
+   with_string_hacks=no
+ fi;
+-echo "$as_me:2831: result: $with_string_hacks" >&5
++echo "$as_me:2832: result: $with_string_hacks" >&5
+ echo "${ECHO_T}$with_string_hacks" >&6
+ 
+ if test "x$with_string_hacks" = "xyes"; then
+@@ -2837,15 +2838,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+ 
+-	{ echo "$as_me:2840: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++	{ echo "$as_me:2841: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+ echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;}
+-	echo "$as_me:2842: checking for strlcat" >&5
++	echo "$as_me:2843: checking for strlcat" >&5
+ echo $ECHO_N "checking for strlcat... $ECHO_C" >&6
+ if test "${ac_cv_func_strlcat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2848 "configure"
++#line 2849 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char strlcat (); below.  */
+@@ -2876,16 +2877,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:2879: \"$ac_link\"") >&5
++if { (eval echo "$as_me:2880: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:2882: \$? = $ac_status" >&5
++  echo "$as_me:2883: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:2885: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2886: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2888: \$? = $ac_status" >&5
++  echo "$as_me:2889: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_strlcat=yes
+ else
+@@ -2895,7 +2896,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:2898: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:2899: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test $ac_cv_func_strlcat = yes; then
+ 
+@@ -2905,7 +2906,7 @@
+ 
+ else
+ 
+-		echo "$as_me:2908: checking for strlcat in -lbsd" >&5
++		echo "$as_me:2909: checking for strlcat in -lbsd" >&5
+ echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_strlcat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2913,7 +2914,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 2916 "configure"
++#line 2917 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -2932,16 +2933,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:2935: \"$ac_link\"") >&5
++if { (eval echo "$as_me:2936: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:2938: \$? = $ac_status" >&5
++  echo "$as_me:2939: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:2941: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2942: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2944: \$? = $ac_status" >&5
++  echo "$as_me:2945: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -2952,7 +2953,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:2955: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:2956: result: $ac_cv_lib_bsd_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6
+ if test $ac_cv_lib_bsd_strlcat = yes; then
+ 
+@@ -2975,23 +2976,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:2978: checking for $ac_header" >&5
++echo "$as_me:2979: 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 2984 "configure"
++#line 2985 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:2988: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:2989: \"$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:2994: \$? = $ac_status" >&5
++  echo "$as_me:2995: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -3010,7 +3011,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:3013: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:3014: 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 <&5
++echo "$as_me:3035: 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 3040 "configure"
++#line 3041 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -3068,16 +3069,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:3071: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3072: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3074: \$? = $ac_status" >&5
++  echo "$as_me:3075: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:3077: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3078: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3080: \$? = $ac_status" >&5
++  echo "$as_me:3081: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -3087,7 +3088,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:3090: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:3091: 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 <&5
++echo "$as_me:3141: 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 3202 "configure"
-+#line 3205 "configure"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 3147 "configure"
++#line 3148 "configure"
  #include "confdefs.h"
- 
- #include 
-@@ -3218,16 +3221,16 @@
+ #include 
+ int
+@@ -3159,16 +3160,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:3221: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3224: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:3162: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3163: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:3224: \$? = $ac_status" >&5
-+  echo "$as_me:3227: \$? = $ac_status" >&5
+-  echo "$as_me:3165: \$? = $ac_status" >&5
++  echo "$as_me:3166: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:3227: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3230: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:3168: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3169: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:3230: \$? = $ac_status" >&5
-+  echo "$as_me:3233: \$? = $ac_status" >&5
+-  echo "$as_me:3171: \$? = $ac_status" >&5
++  echo "$as_me:3172: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
+   cf_cv_gnu_source=no
  else
-@@ -3236,7 +3239,7 @@
+@@ -3177,7 +3178,7 @@
  cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
  	 cat >conftest.$ac_ext <<_ACEOF
--#line 3239 "configure"
-+#line 3242 "configure"
+-#line 3180 "configure"
++#line 3181 "configure"
  #include "confdefs.h"
- 
- #include 
-@@ -3255,16 +3258,16 @@
+ #include 
+ int
+@@ -3192,16 +3193,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:3258: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3261: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:3195: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3196: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:3261: \$? = $ac_status" >&5
-+  echo "$as_me:3264: \$? = $ac_status" >&5
+-  echo "$as_me:3198: \$? = $ac_status" >&5
++  echo "$as_me:3199: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:3264: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3267: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:3201: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3202: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:3267: \$? = $ac_status" >&5
-+  echo "$as_me:3270: \$? = $ac_status" >&5
+-  echo "$as_me:3204: \$? = $ac_status" >&5
++  echo "$as_me:3205: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
+   cf_cv_gnu_source=no
  else
-@@ -3279,7 +3282,7 @@
+@@ -3216,12 +3217,12 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  
  fi
--echo "$as_me:3282: result: $cf_cv_xopen_source" >&5
-+echo "$as_me:3285: result: $cf_cv_xopen_source" >&5
- echo "${ECHO_T}$cf_cv_xopen_source" >&6
+-echo "$as_me:3219: result: $cf_cv_gnu_source" >&5
++echo "$as_me:3220: result: $cf_cv_gnu_source" >&5
+ echo "${ECHO_T}$cf_cv_gnu_source" >&6
  
- if test "$cf_cv_xopen_source" != no ; then
-@@ -3387,16 +3390,16 @@
+ if test "$cf_cv_gnu_source" = yes
+ then
+-echo "$as_me:3224: checking if we should also define _DEFAULT_SOURCE" >&5
++echo "$as_me:3225: 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
+@@ -3229,7 +3230,7 @@
+ 
+ CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 3232 "configure"
++#line 3233 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -3244,16 +3245,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3247: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3248: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3250: \$? = $ac_status" >&5
++  echo "$as_me:3251: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3253: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3254: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3256: \$? = $ac_status" >&5
++  echo "$as_me:3257: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -3264,7 +3265,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:3267: result: $cf_cv_default_source" >&5
++echo "$as_me:3268: 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
+@@ -3290,16 +3291,16 @@
  	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
  		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
  
--echo "$as_me:3390: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "$as_me:3393: checking if we should define _POSIX_C_SOURCE" >&5
+-echo "$as_me:3293: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:3294: 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}:3396: testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me:-configure}:3399: testing if the symbol is already defined go no further ..." 1>&5
+-echo "${as_me:-configure}:3299: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:3300: testing if the symbol is already defined go no further ..." 1>&5
  
  	cat >conftest.$ac_ext <<_ACEOF
--#line 3399 "configure"
-+#line 3402 "configure"
+-#line 3302 "configure"
++#line 3303 "configure"
  #include "confdefs.h"
  #include 
  int
-@@ -3411,16 +3414,16 @@
+@@ -3314,16 +3315,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:3414: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3417: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:3317: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3318: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:3417: \$? = $ac_status" >&5
-+  echo "$as_me:3420: \$? = $ac_status" >&5
+-  echo "$as_me:3320: \$? = $ac_status" >&5
++  echo "$as_me:3321: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:3420: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3423: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:3323: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3324: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:3423: \$? = $ac_status" >&5
-+  echo "$as_me:3426: \$? = $ac_status" >&5
+-  echo "$as_me:3326: \$? = $ac_status" >&5
++  echo "$as_me:3327: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_posix_c_source=no
  else
-@@ -3441,7 +3444,7 @@
+@@ -3344,7 +3345,7 @@
  	 esac
  	 if test "$cf_want_posix_source" = yes ; then
  		cat >conftest.$ac_ext <<_ACEOF
--#line 3444 "configure"
-+#line 3447 "configure"
+-#line 3347 "configure"
++#line 3348 "configure"
  #include "confdefs.h"
  #include 
  int
-@@ -3456,16 +3459,16 @@
+@@ -3359,16 +3360,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:3459: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3462: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:3362: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3363: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:3462: \$? = $ac_status" >&5
-+  echo "$as_me:3465: \$? = $ac_status" >&5
+-  echo "$as_me:3365: \$? = $ac_status" >&5
++  echo "$as_me:3366: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:3465: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3468: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:3368: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3369: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:3468: \$? = $ac_status" >&5
-+  echo "$as_me:3471: \$? = $ac_status" >&5
+-  echo "$as_me:3371: \$? = $ac_status" >&5
++  echo "$as_me:3372: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -3476,15 +3479,15 @@
+@@ -3379,15 +3380,15 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  	 fi
  
--echo "${as_me:-configure}:3479: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me:-configure}:3482: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+-echo "${as_me:-configure}:3382: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:3383: 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}:3484: testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me:-configure}:3487: testing if the second compile does not leave our definition intact error ..." 1>&5
+-echo "${as_me:-configure}:3387: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:3388: testing if the second compile does not leave our definition intact error ..." 1>&5
  
  	 cat >conftest.$ac_ext <<_ACEOF
--#line 3487 "configure"
-+#line 3490 "configure"
+-#line 3390 "configure"
++#line 3391 "configure"
  #include "confdefs.h"
  #include 
  int
-@@ -3499,16 +3502,16 @@
+@@ -3402,16 +3403,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:3502: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3505: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:3405: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3406: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:3505: \$? = $ac_status" >&5
-+  echo "$as_me:3508: \$? = $ac_status" >&5
+-  echo "$as_me:3408: \$? = $ac_status" >&5
++  echo "$as_me:3409: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:3508: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3511: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:3411: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3412: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:3511: \$? = $ac_status" >&5
-+  echo "$as_me:3514: \$? = $ac_status" >&5
+-  echo "$as_me:3414: \$? = $ac_status" >&5
++  echo "$as_me:3415: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -3524,7 +3527,7 @@
+@@ -3427,7 +3428,7 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  
  fi
--echo "$as_me:3527: result: $cf_cv_posix_c_source" >&5
-+echo "$as_me:3530: result: $cf_cv_posix_c_source" >&5
+-echo "$as_me:3430: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:3431: 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
-@@ -3682,7 +3685,7 @@
- if test -n "$cf_new_cflags" ; then
- 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+@@ -3545,14 +3546,14 @@
+ 	;;
+ (*)
  
--echo "${as_me:-configure}:3685: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
-+echo "${as_me:-configure}:3688: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
- 
- 	CFLAGS="$CFLAGS $cf_new_cflags"
- fi
-@@ -3690,7 +3693,7 @@
- if test -n "$cf_new_cppflags" ; then
- 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
- 
--echo "${as_me:-configure}:3693: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
-+echo "${as_me:-configure}:3696: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
- 
- 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
- fi
-@@ -3698,7 +3701,7 @@
- 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}:3701: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
-+echo "${as_me:-configure}:3704: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
- 
- 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
- fi
-@@ -3706,10 +3709,10 @@
- fi
- 
- if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
--	echo "$as_me:3709: checking if _XOPEN_SOURCE really is set" >&5
-+	echo "$as_me:3712: 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 3712 "configure"
-+#line 3715 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -3724,16 +3727,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:3727: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3730: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:3730: \$? = $ac_status" >&5
-+  echo "$as_me:3733: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:3733: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3736: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3736: \$? = $ac_status" >&5
-+  echo "$as_me:3739: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_XOPEN_SOURCE_set=yes
- else
-@@ -3742,12 +3745,12 @@
- cf_XOPEN_SOURCE_set=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:3745: result: $cf_XOPEN_SOURCE_set" >&5
-+	echo "$as_me:3748: 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 3750 "configure"
-+#line 3753 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -3762,16 +3765,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:3765: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3768: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:3768: \$? = $ac_status" >&5
-+  echo "$as_me:3771: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:3771: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3774: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3774: \$? = $ac_status" >&5
-+  echo "$as_me:3777: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_XOPEN_SOURCE_set_ok=yes
- else
-@@ -3782,19 +3785,19 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		if test $cf_XOPEN_SOURCE_set_ok = no
- 		then
--			{ echo "$as_me:3785: WARNING: _XOPEN_SOURCE is lower than requested" >&5
-+			{ echo "$as_me:3788: WARNING: _XOPEN_SOURCE is lower than requested" >&5
- echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
- 		fi
- 	else
- 
--echo "$as_me:3790: checking if we should define _XOPEN_SOURCE" >&5
-+echo "$as_me:3793: checking if we should define _XOPEN_SOURCE" >&5
+-echo "$as_me:3548: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:3549: 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 3797 "configure"
-+#line 3800 "configure"
+-#line 3555 "configure"
++#line 3556 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -3813,16 +3816,16 @@
+@@ -3571,16 +3572,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:3816: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3819: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:3574: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3575: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:3819: \$? = $ac_status" >&5
-+  echo "$as_me:3822: \$? = $ac_status" >&5
+-  echo "$as_me:3577: \$? = $ac_status" >&5
++  echo "$as_me:3578: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:3822: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3825: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:3580: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3581: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:3825: \$? = $ac_status" >&5
-+  echo "$as_me:3828: \$? = $ac_status" >&5
+-  echo "$as_me:3583: \$? = $ac_status" >&5
++  echo "$as_me:3584: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_xopen_source=no
  else
-@@ -3831,7 +3834,7 @@
+@@ -3589,7 +3590,7 @@
  cf_save="$CPPFLAGS"
  	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
  	 cat >conftest.$ac_ext <<_ACEOF
--#line 3834 "configure"
-+#line 3837 "configure"
+-#line 3592 "configure"
++#line 3593 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -3850,16 +3853,16 @@
+@@ -3608,16 +3609,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:3853: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3856: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:3611: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3612: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:3856: \$? = $ac_status" >&5
-+  echo "$as_me:3859: \$? = $ac_status" >&5
+-  echo "$as_me:3614: \$? = $ac_status" >&5
++  echo "$as_me:3615: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:3859: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3862: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:3617: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3618: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:3862: \$? = $ac_status" >&5
-+  echo "$as_me:3865: \$? = $ac_status" >&5
+-  echo "$as_me:3620: \$? = $ac_status" >&5
++  echo "$as_me:3621: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_xopen_source=no
  else
-@@ -3874,7 +3877,7 @@
+@@ -3632,7 +3633,7 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  
  fi
--echo "$as_me:3877: result: $cf_cv_xopen_source" >&5
-+echo "$as_me:3880: result: $cf_cv_xopen_source" >&5
+-echo "$as_me:3635: result: $cf_cv_xopen_source" >&5
++echo "$as_me:3636: result: $cf_cv_xopen_source" >&5
  echo "${ECHO_T}$cf_cv_xopen_source" >&6
  
  if test "$cf_cv_xopen_source" != no ; then
-@@ -3972,7 +3975,7 @@
- 	fi
- fi
+@@ -3740,16 +3741,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
  
--echo "$as_me:3975: checking for signal global datatype" >&5
-+echo "$as_me:3978: checking for signal global datatype" >&5
- echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6
- if test "${cf_cv_sig_atomic_t+set}" = set; then
+-echo "$as_me:3743: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:3744: 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
-@@ -3984,7 +3987,7 @@
- 		"int"
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 3987 "configure"
-+#line 3990 "configure"
- #include "confdefs.h"
+ else
  
+-echo "${as_me:-configure}:3749: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:3750: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 3752 "configure"
++#line 3753 "configure"
+ #include "confdefs.h"
  #include 
-@@ -4007,16 +4010,16 @@
+ int
+@@ -3764,16 +3765,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4010: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4013: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:3767: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3768: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:4013: \$? = $ac_status" >&5
-+  echo "$as_me:4016: \$? = $ac_status" >&5
+-  echo "$as_me:3770: \$? = $ac_status" >&5
++  echo "$as_me:3771: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:4016: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4019: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:3773: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3774: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:4019: \$? = $ac_status" >&5
-+  echo "$as_me:4022: \$? = $ac_status" >&5
+-  echo "$as_me:3776: \$? = $ac_status" >&5
++  echo "$as_me:3777: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -3794,7 +3795,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 3797 "configure"
++#line 3798 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -3809,16 +3810,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3812: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3813: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3815: \$? = $ac_status" >&5
++  echo "$as_me:3816: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3818: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3819: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3821: \$? = $ac_status" >&5
++  echo "$as_me:3822: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -3829,15 +3830,15 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 	 fi
+ 
+-echo "${as_me:-configure}:3832: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:3833: 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}:3837: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:3838: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 3840 "configure"
++#line 3841 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -3852,16 +3853,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3855: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3856: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3858: \$? = $ac_status" >&5
++  echo "$as_me:3859: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3861: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3862: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3864: \$? = $ac_status" >&5
++  echo "$as_me:3865: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -3877,7 +3878,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:3880: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:3881: 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
+@@ -4035,7 +4036,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:4038: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:4039: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	CFLAGS="$CFLAGS $cf_new_cflags"
+ fi
+@@ -4043,7 +4044,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:4046: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:4047: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+ fi
+@@ -4051,7 +4052,7 @@
+ 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}:4054: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:4055: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+ 
+ 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+ fi
+@@ -4059,10 +4060,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:4062: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:4063: 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 4065 "configure"
++#line 4066 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4077,16 +4078,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4080: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4081: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4083: \$? = $ac_status" >&5
++  echo "$as_me:4084: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4086: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4087: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4089: \$? = $ac_status" >&5
++  echo "$as_me:4090: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -4095,12 +4096,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-	echo "$as_me:4098: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:4099: 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 4103 "configure"
++#line 4104 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4115,16 +4116,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4118: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4119: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4121: \$? = $ac_status" >&5
++  echo "$as_me:4122: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4124: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4125: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4127: \$? = $ac_status" >&5
++  echo "$as_me:4128: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -4135,19 +4136,19 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 		if test $cf_XOPEN_SOURCE_set_ok = no
+ 		then
+-			{ echo "$as_me:4138: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:4139: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:4143: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:4144: 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 4150 "configure"
++#line 4151 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -4166,16 +4167,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4169: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4170: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4172: \$? = $ac_status" >&5
++  echo "$as_me:4173: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4175: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4176: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4178: \$? = $ac_status" >&5
++  echo "$as_me:4179: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -4184,7 +4185,7 @@
+ cf_save="$CPPFLAGS"
+ 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 4187 "configure"
++#line 4188 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -4203,16 +4204,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4206: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4207: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4209: \$? = $ac_status" >&5
++  echo "$as_me:4210: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4212: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4213: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4215: \$? = $ac_status" >&5
++  echo "$as_me:4216: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -4227,7 +4228,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:4230: result: $cf_cv_xopen_source" >&5
++echo "$as_me:4231: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -4325,7 +4326,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:4328: checking for signal global datatype" >&5
++echo "$as_me:4329: checking for signal global datatype" >&5
+ echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6
+ if test "${cf_cv_sig_atomic_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4337,7 +4338,7 @@
+ 		"int"
+ 	do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 4340 "configure"
++#line 4341 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -4360,16 +4361,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4363: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4364: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4366: \$? = $ac_status" >&5
++  echo "$as_me:4367: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4369: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4370: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4372: \$? = $ac_status" >&5
++  echo "$as_me:4373: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_sig_atomic_t=$cf_type
  else
-@@ -4030,14 +4033,14 @@
+@@ -4383,7 +4384,7 @@
  
  fi
  
--echo "$as_me:4033: result: $cf_cv_sig_atomic_t" >&5
-+echo "$as_me:4036: result: $cf_cv_sig_atomic_t" >&5
+-echo "$as_me:4386: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:4387: result: $cf_cv_sig_atomic_t" >&5
  echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
  test "$cf_cv_sig_atomic_t" != no &&
  cat >>confdefs.h <&5
-+echo "$as_me:4043: checking if you want to use pkg-config" >&5
+ # Work around breakage on OS X
+ 
+-echo "$as_me:4395: checking if SIGWINCH is defined" >&5
++echo "$as_me:4396: 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 4402 "configure"
++#line 4403 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -4414,23 +4415,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4417: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4418: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4420: \$? = $ac_status" >&5
++  echo "$as_me:4421: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4423: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4424: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4426: \$? = $ac_status" >&5
++  echo "$as_me:4427: \$? = $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 4433 "configure"
++#line 4434 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -4448,16 +4449,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4451: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4452: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4454: \$? = $ac_status" >&5
++  echo "$as_me:4455: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4457: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4458: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4460: \$? = $ac_status" >&5
++  echo "$as_me:4461: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_define_sigwinch=maybe
+ else
+@@ -4471,11 +4472,11 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:4474: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:4475: 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:4478: checking for actual SIGWINCH definition" >&5
++echo "$as_me:4479: 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
+@@ -4486,7 +4487,7 @@
+ while test $cf_sigwinch != 1
+ do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 4489 "configure"
++#line 4490 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -4508,16 +4509,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4511: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4512: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4514: \$? = $ac_status" >&5
++  echo "$as_me:4515: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4517: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4518: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4520: \$? = $ac_status" >&5
++  echo "$as_me:4521: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_fixup_sigwinch=$cf_sigwinch
+ 	 break
+@@ -4531,7 +4532,7 @@
+ done
+ 
+ fi
+-echo "$as_me:4534: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:4535: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+ 
+ 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -4541,13 +4542,13 @@
+ 
+ # Checks for CODESET support.
+ 
+-echo "$as_me:4544: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:4545: 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 4550 "configure"
++#line 4551 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4559,16 +4560,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:4562: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4563: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4565: \$? = $ac_status" >&5
++  echo "$as_me:4566: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:4568: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4569: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4571: \$? = $ac_status" >&5
++  echo "$as_me:4572: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   am_cv_langinfo_codeset=yes
+ else
+@@ -4579,7 +4580,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:4582: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:4583: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ 	if test $am_cv_langinfo_codeset = yes; then
+ 
+@@ -4589,7 +4590,7 @@
+ 
+ 	fi
+ 
+-echo "$as_me:4592: checking if you want to use pkg-config" >&5
++echo "$as_me:4593: 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.
-@@ -4047,7 +4050,7 @@
+@@ -4599,7 +4600,7 @@
  else
    cf_pkg_config=yes
  fi;
--echo "$as_me:4050: result: $cf_pkg_config" >&5
-+echo "$as_me:4053: result: $cf_pkg_config" >&5
+-echo "$as_me:4602: result: $cf_pkg_config" >&5
++echo "$as_me:4603: result: $cf_pkg_config" >&5
  echo "${ECHO_T}$cf_pkg_config" >&6
  
  case $cf_pkg_config in
-@@ -4059,7 +4062,7 @@
+@@ -4611,7 +4612,7 @@
  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:4062: checking for $ac_word" >&5
-+echo "$as_me:4065: checking for $ac_word" >&5
+-echo "$as_me:4614: checking for $ac_word" >&5
++echo "$as_me:4615: 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
-@@ -4076,7 +4079,7 @@
+@@ -4628,7 +4629,7 @@
    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:4079: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:4082: found $ac_dir/$ac_word" >&5
+-   echo "$as_me:4631: found $ac_dir/$ac_word" >&5
++   echo "$as_me:4632: found $ac_dir/$ac_word" >&5
     break
  fi
  done
-@@ -4087,10 +4090,10 @@
+@@ -4639,10 +4640,10 @@
  PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  
  if test -n "$PKG_CONFIG"; then
--  echo "$as_me:4090: result: $PKG_CONFIG" >&5
-+  echo "$as_me:4093: result: $PKG_CONFIG" >&5
+-  echo "$as_me:4642: result: $PKG_CONFIG" >&5
++  echo "$as_me:4643: result: $PKG_CONFIG" >&5
  echo "${ECHO_T}$PKG_CONFIG" >&6
  else
--  echo "$as_me:4093: result: no" >&5
-+  echo "$as_me:4096: result: no" >&5
+-  echo "$as_me:4645: result: no" >&5
++  echo "$as_me:4646: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -4099,7 +4102,7 @@
+@@ -4651,7 +4652,7 @@
    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:4102: checking for $ac_word" >&5
-+echo "$as_me:4105: checking for $ac_word" >&5
+-echo "$as_me:4654: checking for $ac_word" >&5
++echo "$as_me:4655: 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
-@@ -4116,7 +4119,7 @@
+@@ -4668,7 +4669,7 @@
    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:4119: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:4122: found $ac_dir/$ac_word" >&5
+-   echo "$as_me:4671: found $ac_dir/$ac_word" >&5
++   echo "$as_me:4672: found $ac_dir/$ac_word" >&5
     break
  fi
  done
-@@ -4128,10 +4131,10 @@
+@@ -4680,10 +4681,10 @@
  ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
  
  if test -n "$ac_pt_PKG_CONFIG"; then
--  echo "$as_me:4131: result: $ac_pt_PKG_CONFIG" >&5
-+  echo "$as_me:4134: result: $ac_pt_PKG_CONFIG" >&5
+-  echo "$as_me:4683: result: $ac_pt_PKG_CONFIG" >&5
++  echo "$as_me:4684: result: $ac_pt_PKG_CONFIG" >&5
  echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
  else
--  echo "$as_me:4134: result: no" >&5
-+  echo "$as_me:4137: result: no" >&5
+-  echo "$as_me:4686: result: no" >&5
++  echo "$as_me:4687: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -4174,18 +4177,18 @@
+@@ -4726,18 +4727,18 @@
  	PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
  	;;
  (*)
--	{ { echo "$as_me:4177: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
-+	{ { echo "$as_me:4180: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+-	{ { echo "$as_me:4729: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++	{ { echo "$as_me:4730: 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:4184: WARNING: pkg-config is not installed" >&5
-+	{ echo "$as_me:4187: WARNING: pkg-config is not installed" >&5
+-	{ echo "$as_me:4736: WARNING: pkg-config is not installed" >&5
++	{ echo "$as_me:4737: WARNING: pkg-config is not installed" >&5
  echo "$as_me: WARNING: pkg-config is not installed" >&2;}
  fi
  
--echo "$as_me:4188: checking if you want to see long compiling messages" >&5
-+echo "$as_me:4191: checking if you want to see long compiling messages" >&5
+-echo "$as_me:4740: checking if you want to see long compiling messages" >&5
++echo "$as_me:4741: 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.
-@@ -4219,10 +4222,10 @@
+@@ -4771,10 +4772,10 @@
  	ECHO_CC=''
  
  fi;
--echo "$as_me:4222: result: $enableval" >&5
-+echo "$as_me:4225: result: $enableval" >&5
+-echo "$as_me:4774: result: $enableval" >&5
++echo "$as_me:4775: result: $enableval" >&5
  echo "${ECHO_T}$enableval" >&6
  
--echo "$as_me:4225: checking for ncurses wrap-prefix" >&5
-+echo "$as_me:4228: checking for ncurses wrap-prefix" >&5
+-echo "$as_me:4777: checking for ncurses wrap-prefix" >&5
++echo "$as_me:4778: checking for ncurses wrap-prefix" >&5
  echo $ECHO_N "checking for ncurses wrap-prefix... $ECHO_C" >&6
  
  # Check whether --with-ncurses-wrap-prefix or --without-ncurses-wrap-prefix was given.
-@@ -4232,10 +4235,10 @@
+@@ -4784,10 +4785,10 @@
  else
    NCURSES_WRAP_PREFIX=_nc_
  fi;
--echo "$as_me:4235: result: $NCURSES_WRAP_PREFIX" >&5
-+echo "$as_me:4238: result: $NCURSES_WRAP_PREFIX" >&5
+-echo "$as_me:4787: result: $NCURSES_WRAP_PREFIX" >&5
++echo "$as_me:4788: result: $NCURSES_WRAP_PREFIX" >&5
  echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
  
--echo "$as_me:4238: checking if you want to check for wide-character functions" >&5
-+echo "$as_me:4241: checking if you want to check for wide-character functions" >&5
+-echo "$as_me:4790: checking if you want to check for wide-character functions" >&5
++echo "$as_me:4791: checking if you want to check for wide-character functions" >&5
  echo $ECHO_N "checking if you want to check for wide-character functions... $ECHO_C" >&6
  
  # Check whether --enable-widec or --disable-widec was given.
-@@ -4252,10 +4255,10 @@
+@@ -4804,10 +4805,10 @@
  	cf_enable_widec=yes
  
  fi;
--echo "$as_me:4255: result: $cf_enable_widec" >&5
-+echo "$as_me:4258: result: $cf_enable_widec" >&5
+-echo "$as_me:4807: result: $cf_enable_widec" >&5
++echo "$as_me:4808: result: $cf_enable_widec" >&5
  echo "${ECHO_T}$cf_enable_widec" >&6
  
--echo "$as_me:4258: checking for specific curses-directory" >&5
-+echo "$as_me:4261: checking for specific curses-directory" >&5
+-echo "$as_me:4810: checking for specific curses-directory" >&5
++echo "$as_me:4811: 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.
-@@ -4265,7 +4268,7 @@
+@@ -4817,7 +4818,7 @@
  else
    cf_cv_curses_dir=no
  fi;
--echo "$as_me:4268: result: $cf_cv_curses_dir" >&5
-+echo "$as_me:4271: result: $cf_cv_curses_dir" >&5
+-echo "$as_me:4820: result: $cf_cv_curses_dir" >&5
++echo "$as_me:4821: 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" )
-@@ -4296,7 +4299,7 @@
+@@ -4848,7 +4849,7 @@
  	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
  	;;
  (*)
--	{ { echo "$as_me:4299: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:4302: error: expected a pathname, not \"$withval\"" >&5
+-	{ { echo "$as_me:4851: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:4852: error: expected a pathname, not \"$withval\"" >&5
  echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
     { (exit 1); exit 1; }; }
  	;;
-@@ -4329,7 +4332,7 @@
+@@ -4881,7 +4882,7 @@
  			  cf_save_CPPFLAGS=$CPPFLAGS
  			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  			  cat >conftest.$ac_ext <<_ACEOF
--#line 4332 "configure"
-+#line 4335 "configure"
+-#line 4884 "configure"
++#line 4885 "configure"
  #include "confdefs.h"
  #include 
  int
-@@ -4341,16 +4344,16 @@
+@@ -4893,16 +4894,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4344: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4347: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:4896: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4897: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:4347: \$? = $ac_status" >&5
-+  echo "$as_me:4350: \$? = $ac_status" >&5
+-  echo "$as_me:4899: \$? = $ac_status" >&5
++  echo "$as_me:4900: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:4350: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4353: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:4902: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4903: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:4353: \$? = $ac_status" >&5
-+  echo "$as_me:4356: \$? = $ac_status" >&5
+-  echo "$as_me:4905: \$? = $ac_status" >&5
++  echo "$as_me:4906: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -4367,7 +4370,7 @@
+@@ -4919,7 +4920,7 @@
  		if test "$cf_have_incdir" = no ; then
  		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
  
--echo "${as_me:-configure}:4370: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:4373: testing adding $cf_add_incdir to include-path ..." 1>&5
+-echo "${as_me:-configure}:4922: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:4923: testing adding $cf_add_incdir to include-path ..." 1>&5
  
  		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  
-@@ -4403,7 +4406,7 @@
+@@ -4955,7 +4956,7 @@
  			if test "$cf_have_libdir" = no ; then
  				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
  
--echo "${as_me:-configure}:4406: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:4409: testing adding $cf_add_libdir to library-path ..." 1>&5
+-echo "${as_me:-configure}:4958: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:4959: testing adding $cf_add_libdir to library-path ..." 1>&5
  
  				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
  			fi
-@@ -4416,7 +4419,7 @@
+@@ -4968,7 +4969,7 @@
  
  cf_cv_screen=curses
  
--echo "$as_me:4419: checking for specified curses library type" >&5
-+echo "$as_me:4422: checking for specified curses library type" >&5
+-echo "$as_me:4971: checking for specified curses library type" >&5
++echo "$as_me:4972: checking for specified curses library type" >&5
  echo $ECHO_N "checking for specified curses library type... $ECHO_C" >&6
  
  # Check whether --with-screen or --without-screen was given.
-@@ -4460,13 +4463,13 @@
+@@ -5012,13 +5013,13 @@
  fi;
  fi;
  
--echo "$as_me:4463: result: $cf_cv_screen" >&5
-+echo "$as_me:4466: result: $cf_cv_screen" >&5
+-echo "$as_me:5015: result: $cf_cv_screen" >&5
++echo "$as_me:5016: result: $cf_cv_screen" >&5
  echo "${ECHO_T}$cf_cv_screen" >&6
  
  case $cf_cv_screen in
  (curses|curses_*)
  
--echo "$as_me:4469: checking for extra include directories" >&5
-+echo "$as_me:4472: checking for extra include directories" >&5
+-echo "$as_me:5021: checking for extra include directories" >&5
++echo "$as_me:5022: 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
-@@ -4492,11 +4495,11 @@
+@@ -5044,11 +5045,11 @@
  esac
  
  fi
--echo "$as_me:4495: result: $cf_cv_curses_incdir" >&5
-+echo "$as_me:4498: result: $cf_cv_curses_incdir" >&5
+-echo "$as_me:5047: result: $cf_cv_curses_incdir" >&5
++echo "$as_me:5048: 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:4499: checking if we have identified curses headers" >&5
-+echo "$as_me:4502: checking if we have identified curses headers" >&5
+-echo "$as_me:5051: checking if we have identified curses headers" >&5
++echo "$as_me:5052: 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
-@@ -4508,7 +4511,7 @@
+@@ -5060,7 +5061,7 @@
  	curses.h  ncurses/ncurses.h ncurses/curses.h
  do
  cat >conftest.$ac_ext <<_ACEOF
--#line 4511 "configure"
-+#line 4514 "configure"
+-#line 5063 "configure"
++#line 5064 "configure"
  #include "confdefs.h"
  #include <${cf_header}>
  int
-@@ -4520,16 +4523,16 @@
+@@ -5072,16 +5073,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4523: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4526: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:5075: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5076: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:4526: \$? = $ac_status" >&5
-+  echo "$as_me:4529: \$? = $ac_status" >&5
+-  echo "$as_me:5078: \$? = $ac_status" >&5
++  echo "$as_me:5079: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:4529: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4532: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:5081: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5082: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:4532: \$? = $ac_status" >&5
-+  echo "$as_me:4535: \$? = $ac_status" >&5
+-  echo "$as_me:5084: \$? = $ac_status" >&5
++  echo "$as_me:5085: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_ncurses_header=$cf_header; break
  else
-@@ -4540,11 +4543,11 @@
+@@ -5092,11 +5093,11 @@
  done
  
  fi
--echo "$as_me:4543: result: $cf_cv_ncurses_header" >&5
-+echo "$as_me:4546: result: $cf_cv_ncurses_header" >&5
+-echo "$as_me:5095: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:5096: 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:4547: error: No curses header-files found" >&5
-+	{ { echo "$as_me:4550: error: No curses header-files found" >&5
+-	{ { echo "$as_me:5099: error: No curses header-files found" >&5
++	{ { echo "$as_me:5100: error: No curses header-files found" >&5
  echo "$as_me: error: No curses header-files found" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -4554,23 +4557,23 @@
+@@ -5106,23 +5107,23 @@
  for ac_header in $cf_cv_ncurses_header
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:4557: checking for $ac_header" >&5
-+echo "$as_me:4560: checking for $ac_header" >&5
+-echo "$as_me:5109: checking for $ac_header" >&5
++echo "$as_me:5110: 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 4563 "configure"
-+#line 4566 "configure"
+-#line 5115 "configure"
++#line 5116 "configure"
  #include "confdefs.h"
  #include <$ac_header>
  _ACEOF
--if { (eval echo "$as_me:4567: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:4570: \"$ac_cpp conftest.$ac_ext\"") >&5
+-if { (eval echo "$as_me:5119: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:5120: \"$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:4573: \$? = $ac_status" >&5
-+  echo "$as_me:4576: \$? = $ac_status" >&5
+-  echo "$as_me:5125: \$? = $ac_status" >&5
++  echo "$as_me:5126: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -4589,7 +4592,7 @@
+@@ -5141,7 +5142,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
--echo "$as_me:4592: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:4595: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "$as_me:5144: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:5145: 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 <&5
-+echo "$as_me:4605: checking for terminfo header" >&5
+-echo "$as_me:5154: checking for terminfo header" >&5
++echo "$as_me:5155: 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
-@@ -4617,7 +4620,7 @@
+@@ -5169,7 +5170,7 @@
  for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
  do
  cat >conftest.$ac_ext <<_ACEOF
--#line 4620 "configure"
-+#line 4623 "configure"
+-#line 5172 "configure"
++#line 5173 "configure"
  #include "confdefs.h"
  #include 
  #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -4632,16 +4635,16 @@
+@@ -5184,16 +5185,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4635: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4638: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:5187: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5188: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:4638: \$? = $ac_status" >&5
-+  echo "$as_me:4641: \$? = $ac_status" >&5
+-  echo "$as_me:5190: \$? = $ac_status" >&5
++  echo "$as_me:5191: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:4641: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4644: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:5193: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5194: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:4644: \$? = $ac_status" >&5
-+  echo "$as_me:4647: \$? = $ac_status" >&5
+-  echo "$as_me:5196: \$? = $ac_status" >&5
++  echo "$as_me:5197: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
  	cf_cv_term_header="$cf_test"
-@@ -4657,7 +4660,7 @@
+@@ -5209,7 +5210,7 @@
  done
  
  fi
--echo "$as_me:4660: result: $cf_cv_term_header" >&5
-+echo "$as_me:4663: result: $cf_cv_term_header" >&5
+-echo "$as_me:5212: result: $cf_cv_term_header" >&5
++echo "$as_me:5213: result: $cf_cv_term_header" >&5
  echo "${ECHO_T}$cf_cv_term_header" >&6
  
  # Set definitions to allow ifdef'ing to accommodate subdirectories
-@@ -4689,7 +4692,7 @@
+@@ -5241,7 +5242,7 @@
  	;;
  esac
  
--echo "$as_me:4692: checking for ncurses version" >&5
-+echo "$as_me:4695: checking for ncurses version" >&5
+-echo "$as_me:5244: checking for ncurses version" >&5
++echo "$as_me:5245: 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
-@@ -4715,10 +4718,10 @@
+@@ -5267,10 +5268,10 @@
  #endif
  EOF
  	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
--	{ (eval echo "$as_me:4718: \"$cf_try\"") >&5
-+	{ (eval echo "$as_me:4721: \"$cf_try\"") >&5
+-	{ (eval echo "$as_me:5270: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:5271: \"$cf_try\"") >&5
    (eval $cf_try) 2>&5
    ac_status=$?
--  echo "$as_me:4721: \$? = $ac_status" >&5
-+  echo "$as_me:4724: \$? = $ac_status" >&5
+-  echo "$as_me:5273: \$? = $ac_status" >&5
++  echo "$as_me:5274: \$? = $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%".*%%'`
-@@ -4728,7 +4731,7 @@
+@@ -5280,7 +5281,7 @@
  
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 4731 "configure"
-+#line 4734 "configure"
+-#line 5283 "configure"
++#line 5284 "configure"
  #include "confdefs.h"
  
  #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -4753,15 +4756,15 @@
+@@ -5305,15 +5306,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
--if { (eval echo "$as_me:4756: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4759: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:5308: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5309: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:4759: \$? = $ac_status" >&5
-+  echo "$as_me:4762: \$? = $ac_status" >&5
+-  echo "$as_me:5311: \$? = $ac_status" >&5
++  echo "$as_me:5312: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:4761: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4764: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:5313: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5314: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:4764: \$? = $ac_status" >&5
-+  echo "$as_me:4767: \$? = $ac_status" >&5
+-  echo "$as_me:5316: \$? = $ac_status" >&5
++  echo "$as_me:5317: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
  	cf_cv_ncurses_version=`cat $cf_tempfile`
-@@ -4775,17 +4778,17 @@
+@@ -5327,17 +5328,17 @@
  	rm -f $cf_tempfile
  
  fi
--echo "$as_me:4778: result: $cf_cv_ncurses_version" >&5
-+echo "$as_me:4781: result: $cf_cv_ncurses_version" >&5
+-echo "$as_me:5330: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:5331: 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:4785: checking if we have identified curses libraries" >&5
-+echo "$as_me:4788: checking if we have identified curses libraries" >&5
+-echo "$as_me:5337: checking if we have identified curses libraries" >&5
++echo "$as_me:5338: 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 4788 "configure"
-+#line 4791 "configure"
+-#line 5340 "configure"
++#line 5341 "configure"
  #include "confdefs.h"
  #include <${cf_cv_ncurses_header:-curses.h}>
  int
-@@ -4797,16 +4800,16 @@
+@@ -5349,16 +5350,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:4800: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4803: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:5352: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5353: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:4803: \$? = $ac_status" >&5
-+  echo "$as_me:4806: \$? = $ac_status" >&5
+-  echo "$as_me:5355: \$? = $ac_status" >&5
++  echo "$as_me:5356: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:4806: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4809: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:5358: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5359: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:4809: \$? = $ac_status" >&5
-+  echo "$as_me:4812: \$? = $ac_status" >&5
+-  echo "$as_me:5361: \$? = $ac_status" >&5
++  echo "$as_me:5362: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -4815,13 +4818,13 @@
+@@ -5367,13 +5368,13 @@
  cf_result=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--echo "$as_me:4818: result: $cf_result" >&5
-+echo "$as_me:4821: result: $cf_result" >&5
+-echo "$as_me:5370: result: $cf_result" >&5
++echo "$as_me:5371: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
  
  if test "$cf_result" = no ; then
  case $host_os in
  (freebsd*)
--	echo "$as_me:4824: checking for tgoto in -lmytinfo" >&5
-+	echo "$as_me:4827: checking for tgoto in -lmytinfo" >&5
+-	echo "$as_me:5376: checking for tgoto in -lmytinfo" >&5
++	echo "$as_me:5377: 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
-@@ -4829,7 +4832,7 @@
+@@ -5381,7 +5382,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lmytinfo  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 4832 "configure"
-+#line 4835 "configure"
+-#line 5384 "configure"
++#line 5385 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -4848,16 +4851,16 @@
+@@ -5400,16 +5401,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:4851: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4854: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:5403: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5404: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:4854: \$? = $ac_status" >&5
-+  echo "$as_me:4857: \$? = $ac_status" >&5
+-  echo "$as_me:5406: \$? = $ac_status" >&5
++  echo "$as_me:5407: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:4857: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4860: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:5409: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5410: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:4860: \$? = $ac_status" >&5
-+  echo "$as_me:4863: \$? = $ac_status" >&5
+-  echo "$as_me:5412: \$? = $ac_status" >&5
++  echo "$as_me:5413: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_mytinfo_tgoto=yes
  else
-@@ -4868,7 +4871,7 @@
+@@ -5420,7 +5421,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:4871: result: $ac_cv_lib_mytinfo_tgoto" >&5
-+echo "$as_me:4874: result: $ac_cv_lib_mytinfo_tgoto" >&5
+-echo "$as_me:5423: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:5424: 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
  
-@@ -4898,7 +4901,7 @@
+@@ -5450,7 +5451,7 @@
  	# term.h) for cur_colr
  	if test "x$cf_cv_screen" = "xcurses_colr"
  	then
--		echo "$as_me:4901: checking for initscr in -lcur_colr" >&5
-+		echo "$as_me:4904: checking for initscr in -lcur_colr" >&5
+-		echo "$as_me:5453: checking for initscr in -lcur_colr" >&5
++		echo "$as_me:5454: 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
-@@ -4906,7 +4909,7 @@
+@@ -5458,7 +5459,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lcur_colr  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 4909 "configure"
-+#line 4912 "configure"
+-#line 5461 "configure"
++#line 5462 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -4925,16 +4928,16 @@
+@@ -5477,16 +5478,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:4928: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4931: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:5480: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5481: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:4931: \$? = $ac_status" >&5
-+  echo "$as_me:4934: \$? = $ac_status" >&5
+-  echo "$as_me:5483: \$? = $ac_status" >&5
++  echo "$as_me:5484: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:4934: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4937: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:5486: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5487: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:4937: \$? = $ac_status" >&5
-+  echo "$as_me:4940: \$? = $ac_status" >&5
+-  echo "$as_me:5489: \$? = $ac_status" >&5
++  echo "$as_me:5490: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_cur_colr_initscr=yes
  else
-@@ -4945,7 +4948,7 @@
+@@ -5497,7 +5498,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:4948: result: $ac_cv_lib_cur_colr_initscr" >&5
-+echo "$as_me:4951: result: $ac_cv_lib_cur_colr_initscr" >&5
+-echo "$as_me:5500: result: $ac_cv_lib_cur_colr_initscr" >&5
++echo "$as_me:5501: 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
  
-@@ -4969,7 +4972,7 @@
+@@ -5521,7 +5522,7 @@
  
  else
  
--		echo "$as_me:4972: checking for initscr in -lHcurses" >&5
-+		echo "$as_me:4975: checking for initscr in -lHcurses" >&5
+-		echo "$as_me:5524: checking for initscr in -lHcurses" >&5
++		echo "$as_me:5525: 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
-@@ -4977,7 +4980,7 @@
+@@ -5529,7 +5530,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lHcurses  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 4980 "configure"
-+#line 4983 "configure"
+-#line 5532 "configure"
++#line 5533 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -4996,16 +4999,16 @@
+@@ -5548,16 +5549,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:4999: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5002: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:5551: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5552: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:5002: \$? = $ac_status" >&5
-+  echo "$as_me:5005: \$? = $ac_status" >&5
+-  echo "$as_me:5554: \$? = $ac_status" >&5
++  echo "$as_me:5555: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5005: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5008: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:5557: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5558: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:5008: \$? = $ac_status" >&5
-+  echo "$as_me:5011: \$? = $ac_status" >&5
+-  echo "$as_me:5560: \$? = $ac_status" >&5
++  echo "$as_me:5561: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_Hcurses_initscr=yes
  else
-@@ -5016,7 +5019,7 @@
+@@ -5568,7 +5569,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:5019: result: $ac_cv_lib_Hcurses_initscr" >&5
-+echo "$as_me:5022: result: $ac_cv_lib_Hcurses_initscr" >&5
+-echo "$as_me:5571: result: $ac_cv_lib_Hcurses_initscr" >&5
++echo "$as_me:5572: 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
  
-@@ -5072,7 +5075,7 @@
+@@ -5624,7 +5625,7 @@
  			if test "$cf_have_libdir" = no ; then
  				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
  
--echo "${as_me:-configure}:5075: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:5078: testing adding $cf_add_libdir to library-path ..." 1>&5
+-echo "${as_me:-configure}:5627: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:5628: testing adding $cf_add_libdir to library-path ..." 1>&5
  
  				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
  			fi
-@@ -5101,7 +5104,7 @@
+@@ -5653,7 +5654,7 @@
  			if test "$cf_have_libdir" = no ; then
  				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
  
--echo "${as_me:-configure}:5104: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:5107: testing adding $cf_add_libdir to library-path ..." 1>&5
+-echo "${as_me:-configure}:5656: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:5657: testing adding $cf_add_libdir to library-path ..." 1>&5
  
  				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
  			fi
-@@ -5132,7 +5135,7 @@
+@@ -5684,7 +5685,7 @@
  			if test "$cf_have_libdir" = no ; then
  				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
  
--echo "${as_me:-configure}:5135: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:5138: testing adding $cf_add_libdir to library-path ..." 1>&5
+-echo "${as_me:-configure}:5687: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:5688: testing adding $cf_add_libdir to library-path ..." 1>&5
  
  				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
  			fi
-@@ -5167,7 +5170,7 @@
+@@ -5719,7 +5720,7 @@
  			if test "$cf_have_libdir" = no ; then
  				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
  
--echo "${as_me:-configure}:5170: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:5173: testing adding $cf_add_libdir to library-path ..." 1>&5
+-echo "${as_me:-configure}:5722: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:5723: testing adding $cf_add_libdir to library-path ..." 1>&5
  
  				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
  			fi
-@@ -5211,13 +5214,13 @@
+@@ -5763,13 +5764,13 @@
  	# because it may be needed to link the test-case for initscr.
  	if test "x$cf_term_lib" = x
  	then
--		echo "$as_me:5214: checking for tgoto" >&5
-+		echo "$as_me:5217: checking for tgoto" >&5
+-		echo "$as_me:5766: checking for tgoto" >&5
++		echo "$as_me:5767: 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 5220 "configure"
-+#line 5223 "configure"
+-#line 5772 "configure"
++#line 5773 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char tgoto (); below.  */
-@@ -5248,16 +5251,16 @@
+@@ -5800,16 +5801,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5251: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5254: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:5803: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5804: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:5254: \$? = $ac_status" >&5
-+  echo "$as_me:5257: \$? = $ac_status" >&5
+-  echo "$as_me:5806: \$? = $ac_status" >&5
++  echo "$as_me:5807: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5257: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5260: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:5809: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5810: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:5260: \$? = $ac_status" >&5
-+  echo "$as_me:5263: \$? = $ac_status" >&5
+-  echo "$as_me:5812: \$? = $ac_status" >&5
++  echo "$as_me:5813: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_tgoto=yes
  else
-@@ -5267,7 +5270,7 @@
+@@ -5819,7 +5820,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:5270: result: $ac_cv_func_tgoto" >&5
-+echo "$as_me:5273: result: $ac_cv_func_tgoto" >&5
+-echo "$as_me:5822: result: $ac_cv_func_tgoto" >&5
++echo "$as_me:5823: 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
-@@ -5276,7 +5279,7 @@
+@@ -5828,7 +5829,7 @@
  			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:5279: checking for tgoto in -l$cf_term_lib" >&5
-+echo "$as_me:5282: checking for tgoto in -l$cf_term_lib" >&5
+-echo "$as_me:5831: checking for tgoto in -l$cf_term_lib" >&5
++echo "$as_me:5832: 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
-@@ -5284,7 +5287,7 @@
+@@ -5836,7 +5837,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-l$cf_term_lib  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 5287 "configure"
-+#line 5290 "configure"
+-#line 5839 "configure"
++#line 5840 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5303,16 +5306,16 @@
+@@ -5855,16 +5856,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5306: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5309: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:5858: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5859: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:5309: \$? = $ac_status" >&5
-+  echo "$as_me:5312: \$? = $ac_status" >&5
+-  echo "$as_me:5861: \$? = $ac_status" >&5
++  echo "$as_me:5862: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5312: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5315: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:5864: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5865: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:5315: \$? = $ac_status" >&5
-+  echo "$as_me:5318: \$? = $ac_status" >&5
+-  echo "$as_me:5867: \$? = $ac_status" >&5
++  echo "$as_me:5868: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_Lib=yes"
  else
-@@ -5323,7 +5326,7 @@
+@@ -5875,7 +5876,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:5326: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-+echo "$as_me:5329: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+-echo "$as_me:5878: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:5879: 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
-@@ -5342,7 +5345,7 @@
+@@ -5894,7 +5895,7 @@
  		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:5345: checking for initscr in -l$cf_curs_lib" >&5
-+echo "$as_me:5348: checking for initscr in -l$cf_curs_lib" >&5
+-echo "$as_me:5897: checking for initscr in -l$cf_curs_lib" >&5
++echo "$as_me:5898: 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
-@@ -5350,7 +5353,7 @@
+@@ -5902,7 +5903,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-l$cf_curs_lib  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 5353 "configure"
-+#line 5356 "configure"
+-#line 5905 "configure"
++#line 5906 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5369,16 +5372,16 @@
+@@ -5921,16 +5922,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5372: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5375: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:5924: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5925: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:5375: \$? = $ac_status" >&5
-+  echo "$as_me:5378: \$? = $ac_status" >&5
+-  echo "$as_me:5927: \$? = $ac_status" >&5
++  echo "$as_me:5928: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5378: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5381: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:5930: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5931: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:5381: \$? = $ac_status" >&5
-+  echo "$as_me:5384: \$? = $ac_status" >&5
+-  echo "$as_me:5933: \$? = $ac_status" >&5
++  echo "$as_me:5934: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_Lib=yes"
  else
-@@ -5389,7 +5392,7 @@
+@@ -5941,7 +5942,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:5392: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-+echo "$as_me:5395: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+-echo "$as_me:5944: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:5945: 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
-@@ -5397,16 +5400,16 @@
+@@ -5949,16 +5950,16 @@
  
  		done
  	fi
--	test $cf_curs_lib = unknown && { { echo "$as_me:5400: error: no curses library found" >&5
-+	test $cf_curs_lib = unknown && { { echo "$as_me:5403: error: no curses library found" >&5
+-	test $cf_curs_lib = unknown && { { echo "$as_me:5952: error: no curses library found" >&5
++	test $cf_curs_lib = unknown && { { echo "$as_me:5953: 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:5406: checking if we can link with $cf_curs_lib library" >&5
-+		echo "$as_me:5409: checking if we can link with $cf_curs_lib library" >&5
+-		echo "$as_me:5958: checking if we can link with $cf_curs_lib library" >&5
++		echo "$as_me:5959: 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 5409 "configure"
-+#line 5412 "configure"
+-#line 5961 "configure"
++#line 5962 "configure"
  #include "confdefs.h"
  #include <${cf_cv_ncurses_header:-curses.h}>
  int
-@@ -5418,16 +5421,16 @@
+@@ -5970,16 +5971,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5421: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5424: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:5973: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5974: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:5424: \$? = $ac_status" >&5
-+  echo "$as_me:5427: \$? = $ac_status" >&5
+-  echo "$as_me:5976: \$? = $ac_status" >&5
++  echo "$as_me:5977: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5427: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5430: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:5979: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5980: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:5430: \$? = $ac_status" >&5
-+  echo "$as_me:5433: \$? = $ac_status" >&5
+-  echo "$as_me:5982: \$? = $ac_status" >&5
++  echo "$as_me:5983: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -5436,18 +5439,18 @@
+@@ -5988,18 +5989,18 @@
  cf_result=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--		echo "$as_me:5439: result: $cf_result" >&5
-+		echo "$as_me:5442: result: $cf_result" >&5
+-		echo "$as_me:5991: result: $cf_result" >&5
++		echo "$as_me:5992: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
--		test $cf_result = no && { { echo "$as_me:5441: error: Cannot link curses library" >&5
-+		test $cf_result = no && { { echo "$as_me:5444: error: Cannot link curses library" >&5
+-		test $cf_result = no && { { echo "$as_me:5993: error: Cannot link curses library" >&5
++		test $cf_result = no && { { echo "$as_me:5994: 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:5447: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
-+		echo "$as_me:5450: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+-		echo "$as_me:5999: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
++		echo "$as_me:6000: 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 5450 "configure"
-+#line 5453 "configure"
+-#line 6002 "configure"
++#line 6003 "configure"
  #include "confdefs.h"
  #include <${cf_cv_ncurses_header:-curses.h}>
  int
-@@ -5459,16 +5462,16 @@
+@@ -6011,16 +6012,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5462: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5465: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:6014: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6015: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:5465: \$? = $ac_status" >&5
-+  echo "$as_me:5468: \$? = $ac_status" >&5
+-  echo "$as_me:6017: \$? = $ac_status" >&5
++  echo "$as_me:6018: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5468: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5471: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:6020: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6021: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:5471: \$? = $ac_status" >&5
-+  echo "$as_me:5474: \$? = $ac_status" >&5
+-  echo "$as_me:6023: \$? = $ac_status" >&5
++  echo "$as_me:6024: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=no
  else
-@@ -5477,7 +5480,7 @@
+@@ -6029,7 +6030,7 @@
  
  			LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
  			cat >conftest.$ac_ext <<_ACEOF
--#line 5480 "configure"
-+#line 5483 "configure"
+-#line 6032 "configure"
++#line 6033 "configure"
  #include "confdefs.h"
  #include <${cf_cv_ncurses_header:-curses.h}>
  int
-@@ -5489,16 +5492,16 @@
+@@ -6041,16 +6042,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5492: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5495: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:6044: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6045: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:5495: \$? = $ac_status" >&5
-+  echo "$as_me:5498: \$? = $ac_status" >&5
+-  echo "$as_me:6047: \$? = $ac_status" >&5
++  echo "$as_me:6048: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5498: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5501: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:6050: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6051: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:5501: \$? = $ac_status" >&5
-+  echo "$as_me:5504: \$? = $ac_status" >&5
+-  echo "$as_me:6053: \$? = $ac_status" >&5
++  echo "$as_me:6054: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -5510,7 +5513,7 @@
+@@ -6062,7 +6063,7 @@
  
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--		echo "$as_me:5513: result: $cf_result" >&5
-+		echo "$as_me:5516: result: $cf_result" >&5
+-		echo "$as_me:6065: result: $cf_result" >&5
++		echo "$as_me:6066: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
  	fi
  fi
-@@ -5519,7 +5522,7 @@
+@@ -6071,7 +6072,7 @@
  	;;
  (ncursesw*)
  
--echo "$as_me:5522: checking for multibyte character support" >&5
-+echo "$as_me:5525: checking for multibyte character support" >&5
+-echo "$as_me:6074: checking for multibyte character support" >&5
++echo "$as_me:6075: 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
-@@ -5527,7 +5530,7 @@
+@@ -6079,7 +6080,7 @@
  
  	cf_save_LIBS="$LIBS"
  	cat >conftest.$ac_ext <<_ACEOF
--#line 5530 "configure"
-+#line 5533 "configure"
+-#line 6082 "configure"
++#line 6083 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -5540,16 +5543,16 @@
+@@ -6092,16 +6093,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5543: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5546: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:6095: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6096: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:5546: \$? = $ac_status" >&5
-+  echo "$as_me:5549: \$? = $ac_status" >&5
+-  echo "$as_me:6098: \$? = $ac_status" >&5
++  echo "$as_me:6099: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5549: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5552: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:6101: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6102: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:5552: \$? = $ac_status" >&5
-+  echo "$as_me:5555: \$? = $ac_status" >&5
+-  echo "$as_me:6104: \$? = $ac_status" >&5
++  echo "$as_me:6105: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_utf8_lib=yes
  else
-@@ -5561,12 +5564,12 @@
+@@ -6113,12 +6114,12 @@
  cf_cv_header_path_utf8=
  cf_cv_library_path_utf8=
  
--echo "${as_me:-configure}:5564: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:5567: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+-echo "${as_me:-configure}:6116: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:6117: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
  
  cf_save_LIBS="$LIBS"
  
  cat >conftest.$ac_ext <<_ACEOF
--#line 5569 "configure"
-+#line 5572 "configure"
+-#line 6121 "configure"
++#line 6122 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -5579,16 +5582,16 @@
+@@ -6131,16 +6132,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5582: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5585: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:6134: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6135: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:5585: \$? = $ac_status" >&5
-+  echo "$as_me:5588: \$? = $ac_status" >&5
+-  echo "$as_me:6137: \$? = $ac_status" >&5
++  echo "$as_me:6138: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5588: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5591: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:6140: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6141: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:5591: \$? = $ac_status" >&5
-+  echo "$as_me:5594: \$? = $ac_status" >&5
+-  echo "$as_me:6143: \$? = $ac_status" >&5
++  echo "$as_me:6144: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
  	cf_cv_find_linkage_utf8=yes
-@@ -5602,7 +5605,7 @@
+@@ -6154,7 +6155,7 @@
  LIBS="-lutf8  $cf_save_LIBS"
  
  cat >conftest.$ac_ext <<_ACEOF
--#line 5605 "configure"
-+#line 5608 "configure"
+-#line 6157 "configure"
++#line 6158 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -5615,16 +5618,16 @@
+@@ -6167,16 +6168,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5618: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5621: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:6170: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6171: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:5621: \$? = $ac_status" >&5
-+  echo "$as_me:5624: \$? = $ac_status" >&5
+-  echo "$as_me:6173: \$? = $ac_status" >&5
++  echo "$as_me:6174: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5624: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5627: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:6176: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6177: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:5627: \$? = $ac_status" >&5
-+  echo "$as_me:5630: \$? = $ac_status" >&5
+-  echo "$as_me:6179: \$? = $ac_status" >&5
++  echo "$as_me:6180: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
  	cf_cv_find_linkage_utf8=yes
-@@ -5641,9 +5644,9 @@
+@@ -6193,9 +6194,9 @@
  
  	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
  
--echo "${as_me:-configure}:5644: testing find linkage for utf8 library ..." 1>&5
-+echo "${as_me:-configure}:5647: testing find linkage for utf8 library ..." 1>&5
+-echo "${as_me:-configure}:6196: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:6197: testing find linkage for utf8 library ..." 1>&5
  
--echo "${as_me:-configure}:5646: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:5649: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+-echo "${as_me:-configure}:6198: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:6199: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
  
  	cf_save_CPPFLAGS="$CPPFLAGS"
  	cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -5734,11 +5737,11 @@
+@@ -6286,11 +6287,11 @@
  		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}:5737: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:5740: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+-echo "${as_me:-configure}:6289: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:6290: 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 5741 "configure"
-+#line 5744 "configure"
+-#line 6293 "configure"
++#line 6294 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -5751,21 +5754,21 @@
+@@ -6303,21 +6304,21 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:5754: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5757: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:6306: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6307: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:5757: \$? = $ac_status" >&5
-+  echo "$as_me:5760: \$? = $ac_status" >&5
+-  echo "$as_me:6309: \$? = $ac_status" >&5
++  echo "$as_me:6310: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:5760: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5763: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:6312: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6313: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:5763: \$? = $ac_status" >&5
-+  echo "$as_me:5766: \$? = $ac_status" >&5
+-  echo "$as_me:6315: \$? = $ac_status" >&5
++  echo "$as_me:6316: \$? = $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}:5768: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:5771: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+-echo "${as_me:-configure}:6320: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:6321: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
  
  				cf_cv_find_linkage_utf8=maybe
  				cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -5783,7 +5786,7 @@
+@@ -6335,7 +6336,7 @@
  
  	if test "$cf_cv_find_linkage_utf8" = maybe ; then
  
--echo "${as_me:-configure}:5786: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:5789: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+-echo "${as_me:-configure}:6338: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:6339: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
  
  		cf_save_LIBS="$LIBS"
  		cf_save_LDFLAGS="$LDFLAGS"
-@@ -5858,13 +5861,13 @@
+@@ -6410,13 +6411,13 @@
  				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}:5861: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:5864: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+-echo "${as_me:-configure}:6413: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:6414: 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 5867 "configure"
-+#line 5870 "configure"
+-#line 6419 "configure"
++#line 6420 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -5877,21 +5880,21 @@
+@@ -6429,21 +6430,21 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5880: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5883: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:6432: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6433: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:5883: \$? = $ac_status" >&5
-+  echo "$as_me:5886: \$? = $ac_status" >&5
+-  echo "$as_me:6435: \$? = $ac_status" >&5
++  echo "$as_me:6436: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5886: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5889: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:6438: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6439: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:5889: \$? = $ac_status" >&5
-+  echo "$as_me:5892: \$? = $ac_status" >&5
+-  echo "$as_me:6441: \$? = $ac_status" >&5
++  echo "$as_me:6442: \$? = $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}:5894: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:5897: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+-echo "${as_me:-configure}:6446: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:6447: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
  
  					cf_cv_find_linkage_utf8=yes
  					cf_cv_library_file_utf8="-lutf8"
-@@ -5933,7 +5936,7 @@
+@@ -6485,7 +6486,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:5936: result: $cf_cv_utf8_lib" >&5
-+echo "$as_me:5939: result: $cf_cv_utf8_lib" >&5
+-echo "$as_me:6488: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:6489: 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
-@@ -5968,7 +5971,7 @@
+@@ -6520,7 +6521,7 @@
  			  cf_save_CPPFLAGS=$CPPFLAGS
  			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  			  cat >conftest.$ac_ext <<_ACEOF
--#line 5971 "configure"
-+#line 5974 "configure"
+-#line 6523 "configure"
++#line 6524 "configure"
  #include "confdefs.h"
  #include 
  int
-@@ -5980,16 +5983,16 @@
+@@ -6532,16 +6533,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:5983: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5986: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:6535: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6536: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:5986: \$? = $ac_status" >&5
-+  echo "$as_me:5989: \$? = $ac_status" >&5
+-  echo "$as_me:6538: \$? = $ac_status" >&5
++  echo "$as_me:6539: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:5989: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5992: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:6541: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6542: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:5992: \$? = $ac_status" >&5
-+  echo "$as_me:5995: \$? = $ac_status" >&5
+-  echo "$as_me:6544: \$? = $ac_status" >&5
++  echo "$as_me:6545: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -6006,7 +6009,7 @@
+@@ -6558,7 +6559,7 @@
  		if test "$cf_have_incdir" = no ; then
  		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
  
--echo "${as_me:-configure}:6009: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:6012: testing adding $cf_add_incdir to include-path ..." 1>&5
+-echo "${as_me:-configure}:6561: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6562: testing adding $cf_add_incdir to include-path ..." 1>&5
  
  		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  
-@@ -6042,7 +6045,7 @@
+@@ -6594,7 +6595,7 @@
  			if test "$cf_have_libdir" = no ; then
  				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
  
--echo "${as_me:-configure}:6045: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:6048: testing adding $cf_add_libdir to library-path ..." 1>&5
+-echo "${as_me:-configure}:6597: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:6598: testing adding $cf_add_libdir to library-path ..." 1>&5
  
  				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
  			fi
-@@ -6072,13 +6075,13 @@
+@@ -6624,13 +6625,13 @@
  cf_have_ncuconfig=no
  
  if test "x${PKG_CONFIG:=none}" != xnone; then
--	echo "$as_me:6075: checking pkg-config for $cf_ncuconfig_root" >&5
-+	echo "$as_me:6078: checking pkg-config for $cf_ncuconfig_root" >&5
+-	echo "$as_me:6627: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:6628: 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:6078: result: yes" >&5
-+		echo "$as_me:6081: result: yes" >&5
+-		echo "$as_me:6630: result: yes" >&5
++		echo "$as_me:6631: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  
--		echo "$as_me:6081: checking if the $cf_ncuconfig_root package files work" >&5
-+		echo "$as_me:6084: checking if the $cf_ncuconfig_root package files work" >&5
+-		echo "$as_me:6633: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:6634: 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
  
-@@ -6104,7 +6107,7 @@
+@@ -6656,7 +6657,7 @@
  LIBS="$cf_add_libs"
  
  		cat >conftest.$ac_ext <<_ACEOF
--#line 6107 "configure"
-+#line 6110 "configure"
+-#line 6659 "configure"
++#line 6660 "configure"
  #include "confdefs.h"
  #include <${cf_cv_ncurses_header:-curses.h}>
  int
-@@ -6116,37 +6119,37 @@
+@@ -6668,37 +6669,37 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6119: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6122: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:6671: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6672: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:6122: \$? = $ac_status" >&5
-+  echo "$as_me:6125: \$? = $ac_status" >&5
+-  echo "$as_me:6674: \$? = $ac_status" >&5
++  echo "$as_me:6675: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6125: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6128: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:6677: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6678: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:6128: \$? = $ac_status" >&5
-+  echo "$as_me:6131: \$? = $ac_status" >&5
+-  echo "$as_me:6680: \$? = $ac_status" >&5
++  echo "$as_me:6681: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    if test "$cross_compiling" = yes; then
    cf_have_ncuconfig=maybe
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 6134 "configure"
-+#line 6137 "configure"
+-#line 6686 "configure"
++#line 6687 "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:6141: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6144: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:6693: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6694: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:6144: \$? = $ac_status" >&5
-+  echo "$as_me:6147: \$? = $ac_status" >&5
+-  echo "$as_me:6696: \$? = $ac_status" >&5
++  echo "$as_me:6697: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:6146: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6149: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:6698: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6699: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:6149: \$? = $ac_status" >&5
-+  echo "$as_me:6152: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_have_ncuconfig=yes
- else
-@@ -6163,7 +6166,7 @@
- cf_have_ncuconfig=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--		echo "$as_me:6166: result: $cf_have_ncuconfig" >&5
-+		echo "$as_me:6169: 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"
-@@ -6181,7 +6184,7 @@
- 		fi
- 
- 	else
--		echo "$as_me:6184: result: no" >&5
-+		echo "$as_me:6187: result: no" >&5
- echo "${ECHO_T}no" >&6
- 		NCURSES_CONFIG_PKG=none
- 	fi
-@@ -6197,7 +6200,7 @@
-   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:6200: checking for $ac_word" >&5
-+echo "$as_me:6203: 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
-@@ -6212,7 +6215,7 @@
-   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:6215: found $ac_dir/$ac_word" >&5
-+echo "$as_me:6218: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -6220,10 +6223,10 @@
- fi
- NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
- if test -n "$NCURSES_CONFIG"; then
--  echo "$as_me:6223: result: $NCURSES_CONFIG" >&5
-+  echo "$as_me:6226: result: $NCURSES_CONFIG" >&5
- echo "${ECHO_T}$NCURSES_CONFIG" >&6
- else
--  echo "$as_me:6226: result: no" >&5
-+  echo "$as_me:6229: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -6236,7 +6239,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:6239: checking for $ac_word" >&5
-+echo "$as_me:6242: 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
-@@ -6251,7 +6254,7 @@
-   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:6254: found $ac_dir/$ac_word" >&5
-+echo "$as_me:6257: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -6259,10 +6262,10 @@
- fi
- ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
- if test -n "$ac_ct_NCURSES_CONFIG"; then
--  echo "$as_me:6262: result: $ac_ct_NCURSES_CONFIG" >&5
-+  echo "$as_me:6265: result: $ac_ct_NCURSES_CONFIG" >&5
- echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
- else
--  echo "$as_me:6265: result: no" >&5
-+  echo "$as_me:6268: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -6295,7 +6298,7 @@
- 
- 		# even with config script, some packages use no-override for curses.h
- 
--echo "$as_me:6298: checking if we have identified curses headers" >&5
-+echo "$as_me:6301: 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
-@@ -6307,7 +6310,7 @@
- 	curses.h $cf_cv_screen/curses.h
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 6310 "configure"
-+#line 6313 "configure"
- #include "confdefs.h"
- #include <${cf_header}>
- int
-@@ -6319,16 +6322,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6322: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6325: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6325: \$? = $ac_status" >&5
-+  echo "$as_me:6328: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6328: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6331: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6331: \$? = $ac_status" >&5
-+  echo "$as_me:6334: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_header=$cf_header; break
- else
-@@ -6339,11 +6342,11 @@
- done
- 
- fi
--echo "$as_me:6342: result: $cf_cv_ncurses_header" >&5
-+echo "$as_me:6345: 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:6346: error: No curses header-files found" >&5
-+	{ { echo "$as_me:6349: error: No curses header-files found" >&5
- echo "$as_me: error: No curses header-files found" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -6353,23 +6356,23 @@
- for ac_header in $cf_cv_ncurses_header
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:6356: checking for $ac_header" >&5
-+echo "$as_me:6359: 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 6362 "configure"
-+#line 6365 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:6366: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:6369: \"$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:6372: \$? = $ac_status" >&5
-+  echo "$as_me:6375: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -6388,7 +6391,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:6391: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:6394: 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 <conftest.$ac_ext <<_ACEOF
--#line 6444 "configure"
-+#line 6447 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -6453,16 +6456,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6456: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6459: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6459: \$? = $ac_status" >&5
-+  echo "$as_me:6462: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6462: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6465: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6465: \$? = $ac_status" >&5
-+  echo "$as_me:6468: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -6479,7 +6482,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:6482: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:6485: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -6498,7 +6501,7 @@
- 
- }
- 
--echo "$as_me:6501: checking for $cf_ncuhdr_root header in include-path" >&5
-+echo "$as_me:6504: 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
-@@ -6510,7 +6513,7 @@
- 	do
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 6513 "configure"
-+#line 6516 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -6534,16 +6537,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6537: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6540: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6540: \$? = $ac_status" >&5
-+  echo "$as_me:6543: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6543: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6546: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6546: \$? = $ac_status" >&5
-+  echo "$as_me:6549: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_h=$cf_header
- 
-@@ -6558,14 +6561,14 @@
- 	done
- 
- fi
--echo "$as_me:6561: result: $cf_cv_ncurses_h" >&5
-+echo "$as_me:6564: 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:6568: checking for $cf_ncuhdr_root include-path" >&5
-+echo "$as_me:6571: 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
-@@ -6683,7 +6686,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 6686 "configure"
-+#line 6689 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -6695,16 +6698,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6698: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6701: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
 -  echo "$as_me:6701: \$? = $ac_status" >&5
-+  echo "$as_me:6704: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6704: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6707: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6707: \$? = $ac_status" >&5
-+  echo "$as_me:6710: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -6721,7 +6724,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:6724: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:6727: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -6744,7 +6747,7 @@
- 		do
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 6747 "configure"
-+#line 6750 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -6768,16 +6771,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6771: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6774: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6774: \$? = $ac_status" >&5
-+  echo "$as_me:6777: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6777: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6780: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6780: \$? = $ac_status" >&5
-+  echo "$as_me:6783: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_h2=$cf_header
- 
-@@ -6798,12 +6801,12 @@
- 		CPPFLAGS="$cf_save2_CPPFLAGS"
- 		test "$cf_cv_ncurses_h2" != no && break
- 	done
--	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6801: error: not found" >&5
-+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6804: error: not found" >&5
- echo "$as_me: error: not found" >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
--echo "$as_me:6806: result: $cf_cv_ncurses_h2" >&5
-+echo "$as_me:6809: 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%/[^/]*$%%'`
-@@ -6836,7 +6839,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 6839 "configure"
-+#line 6842 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -6848,16 +6851,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6851: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6854: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6854: \$? = $ac_status" >&5
-+  echo "$as_me:6857: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6857: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6860: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6860: \$? = $ac_status" >&5
-+  echo "$as_me:6863: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -6874,7 +6877,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:6877: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:6880: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -6922,7 +6925,7 @@
- 	;;
- esac
- 
--echo "$as_me:6925: checking for terminfo header" >&5
-+echo "$as_me:6928: 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
-@@ -6940,7 +6943,7 @@
- for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 6943 "configure"
-+#line 6946 "configure"
- #include "confdefs.h"
- #include 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -6955,16 +6958,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6958: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6961: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6961: \$? = $ac_status" >&5
-+  echo "$as_me:6964: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6964: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6967: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6967: \$? = $ac_status" >&5
-+  echo "$as_me:6970: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_term_header="$cf_test"
-@@ -6980,7 +6983,7 @@
- done
- 
- fi
--echo "$as_me:6983: result: $cf_cv_term_header" >&5
-+echo "$as_me:6986: result: $cf_cv_term_header" >&5
- echo "${ECHO_T}$cf_cv_term_header" >&6
- 
- # Set definitions to allow ifdef'ing to accommodate subdirectories
-@@ -7018,7 +7021,7 @@
- #define NCURSES 1
- EOF
- 
--echo "$as_me:7021: checking for ncurses version" >&5
-+echo "$as_me:7024: 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
-@@ -7044,10 +7047,10 @@
- #endif
- EOF
- 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
--	{ (eval echo "$as_me:7047: \"$cf_try\"") >&5
-+	{ (eval echo "$as_me:7050: \"$cf_try\"") >&5
-   (eval $cf_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7050: \$? = $ac_status" >&5
-+  echo "$as_me:7053: \$? = $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%".*%%'`
-@@ -7057,7 +7060,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7060 "configure"
-+#line 7063 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -7082,15 +7085,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:7085: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7088: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7088: \$? = $ac_status" >&5
-+  echo "$as_me:7091: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:7090: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7093: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7093: \$? = $ac_status" >&5
-+  echo "$as_me:7096: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_ncurses_version=`cat $cf_tempfile`
-@@ -7104,7 +7107,7 @@
- 	rm -f $cf_tempfile
- 
- fi
--echo "$as_me:7107: result: $cf_cv_ncurses_version" >&5
-+echo "$as_me:7110: result: $cf_cv_ncurses_version" >&5
- echo "${ECHO_T}$cf_cv_ncurses_version" >&6
- test "$cf_cv_ncurses_version" = no ||
- cat >>confdefs.h <<\EOF
-@@ -7117,7 +7120,7 @@
- 	# to link gpm.
- cf_ncurses_LIBS=""
- cf_ncurses_SAVE="$LIBS"
--echo "$as_me:7120: checking for Gpm_Open in -lgpm" >&5
-+echo "$as_me:7123: 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
-@@ -7125,7 +7128,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 7128 "configure"
-+#line 7131 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -7144,16 +7147,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7147: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7150: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7150: \$? = $ac_status" >&5
-+  echo "$as_me:7153: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7153: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7156: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7156: \$? = $ac_status" >&5
-+  echo "$as_me:7159: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_Gpm_Open=yes
- else
-@@ -7164,10 +7167,10 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:7167: result: $ac_cv_lib_gpm_Gpm_Open" >&5
-+echo "$as_me:7170: 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:7170: checking for initscr in -lgpm" >&5
-+  echo "$as_me:7173: 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
-@@ -7175,7 +7178,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 7178 "configure"
-+#line 7181 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -7194,16 +7197,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7197: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7200: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7200: \$? = $ac_status" >&5
-+  echo "$as_me:7203: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7203: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7206: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7206: \$? = $ac_status" >&5
-+  echo "$as_me:7209: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_initscr=yes
- else
-@@ -7214,7 +7217,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:7217: result: $ac_cv_lib_gpm_initscr" >&5
-+echo "$as_me:7220: 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"
-@@ -7229,7 +7232,7 @@
- 	# 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:7232: checking for tgoto in -lmytinfo" >&5
-+		echo "$as_me:7235: 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
-@@ -7237,7 +7240,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmytinfo  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 7240 "configure"
-+#line 7243 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -7256,16 +7259,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7259: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7262: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7262: \$? = $ac_status" >&5
-+  echo "$as_me:7265: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7265: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7268: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7268: \$? = $ac_status" >&5
-+  echo "$as_me:7271: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_mytinfo_tgoto=yes
- else
-@@ -7276,7 +7279,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:7279: result: $ac_cv_lib_mytinfo_tgoto" >&5
-+echo "$as_me:7282: 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"
-@@ -7325,13 +7328,13 @@
- 
- 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
- 	cf_libdir=""
--	echo "$as_me:7328: checking for initscr" >&5
-+	echo "$as_me:7331: 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 7334 "configure"
-+#line 7337 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char initscr (); below.  */
-@@ -7362,16 +7365,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7365: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7368: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7368: \$? = $ac_status" >&5
-+  echo "$as_me:7371: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7371: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7374: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7374: \$? = $ac_status" >&5
-+  echo "$as_me:7377: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_initscr=yes
- else
-@@ -7381,18 +7384,18 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:7384: result: $ac_cv_func_initscr" >&5
-+echo "$as_me:7387: 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:7391: checking for initscr in -l$cf_nculib_root" >&5
-+		echo "$as_me:7394: 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 7395 "configure"
-+#line 7398 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -7404,25 +7407,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7407: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7410: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7410: \$? = $ac_status" >&5
-+  echo "$as_me:7413: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7413: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7416: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7416: \$? = $ac_status" >&5
-+  echo "$as_me:7419: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:7418: result: yes" >&5
-+  echo "$as_me:7421: 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:7425: result: no" >&5
-+echo "$as_me:7428: result: no" >&5
- echo "${ECHO_T}no" >&6
- 
- cf_search=
-@@ -7490,11 +7493,11 @@
- 
- 			for cf_libdir in $cf_search
- 			do
--				echo "$as_me:7493: checking for -l$cf_nculib_root in $cf_libdir" >&5
-+				echo "$as_me:7496: 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 7497 "configure"
-+#line 7500 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -7506,25 +7509,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7509: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7512: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7512: \$? = $ac_status" >&5
-+  echo "$as_me:7515: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7515: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7518: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7518: \$? = $ac_status" >&5
-+  echo "$as_me:7521: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:7520: result: yes" >&5
-+  echo "$as_me:7523: 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:7527: result: no" >&5
-+echo "$as_me:7530: result: no" >&5
- echo "${ECHO_T}no" >&6
- 					 LIBS="$cf_save_LIBS"
- fi
-@@ -7539,7 +7542,7 @@
- eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
- 
- if test $cf_found_library = no ; then
--	{ { echo "$as_me:7542: error: Cannot link $cf_nculib_root library" >&5
-+	{ { echo "$as_me:7545: error: Cannot link $cf_nculib_root library" >&5
- echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -7547,7 +7550,7 @@
- fi
- 
- if test -n "$cf_ncurses_LIBS" ; then
--	echo "$as_me:7550: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
-+	echo "$as_me:7553: 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
-@@ -7557,7 +7560,7 @@
- 		fi
- 	done
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 7560 "configure"
-+#line 7563 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -7569,23 +7572,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7572: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7575: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7575: \$? = $ac_status" >&5
-+  echo "$as_me:7578: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7578: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7581: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7581: \$? = $ac_status" >&5
-+  echo "$as_me:7584: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:7583: result: yes" >&5
-+  echo "$as_me:7586: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:7588: result: no" >&5
-+echo "$as_me:7591: result: no" >&5
- echo "${ECHO_T}no" >&6
- 		 LIBS="$cf_ncurses_SAVE"
- fi
-@@ -7610,13 +7613,13 @@
- cf_have_ncuconfig=no
- 
- if test "x${PKG_CONFIG:=none}" != xnone; then
--	echo "$as_me:7613: checking pkg-config for $cf_ncuconfig_root" >&5
-+	echo "$as_me:7616: 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:7616: result: yes" >&5
-+		echo "$as_me:7619: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
--		echo "$as_me:7619: checking if the $cf_ncuconfig_root package files work" >&5
-+		echo "$as_me:7622: 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
- 
-@@ -7642,7 +7645,7 @@
- LIBS="$cf_add_libs"
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 7645 "configure"
-+#line 7648 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -7654,37 +7657,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7657: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7660: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7660: \$? = $ac_status" >&5
-+  echo "$as_me:7663: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7663: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7666: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7666: \$? = $ac_status" >&5
-+  echo "$as_me:7669: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   if test "$cross_compiling" = yes; then
-   cf_have_ncuconfig=maybe
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7672 "configure"
-+#line 7675 "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:7679: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7682: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7682: \$? = $ac_status" >&5
-+  echo "$as_me:7685: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:7684: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7687: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7687: \$? = $ac_status" >&5
-+  echo "$as_me:7690: \$? = $ac_status" >&5
++  echo "$as_me:6702: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_have_ncuconfig=yes
  else
-@@ -7701,7 +7704,7 @@
+@@ -6715,7 +6716,7 @@
  cf_have_ncuconfig=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--		echo "$as_me:7704: result: $cf_have_ncuconfig" >&5
-+		echo "$as_me:7707: result: $cf_have_ncuconfig" >&5
+-		echo "$as_me:6718: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:6719: 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"
-@@ -7719,7 +7722,7 @@
+@@ -6733,7 +6734,7 @@
  		fi
  
  	else
--		echo "$as_me:7722: result: no" >&5
-+		echo "$as_me:7725: result: no" >&5
+-		echo "$as_me:6736: result: no" >&5
++		echo "$as_me:6737: result: no" >&5
  echo "${ECHO_T}no" >&6
  		NCURSES_CONFIG_PKG=none
  	fi
-@@ -7735,7 +7738,7 @@
+@@ -6749,7 +6750,7 @@
    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:7738: checking for $ac_word" >&5
-+echo "$as_me:7741: checking for $ac_word" >&5
+-echo "$as_me:6752: checking for $ac_word" >&5
++echo "$as_me:6753: 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
-@@ -7750,7 +7753,7 @@
+@@ -6764,7 +6765,7 @@
    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:7753: found $ac_dir/$ac_word" >&5
-+echo "$as_me:7756: found $ac_dir/$ac_word" >&5
+-echo "$as_me:6767: found $ac_dir/$ac_word" >&5
++echo "$as_me:6768: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -7758,10 +7761,10 @@
+@@ -6772,10 +6773,10 @@
  fi
  NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
  if test -n "$NCURSES_CONFIG"; then
--  echo "$as_me:7761: result: $NCURSES_CONFIG" >&5
-+  echo "$as_me:7764: result: $NCURSES_CONFIG" >&5
+-  echo "$as_me:6775: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:6776: result: $NCURSES_CONFIG" >&5
  echo "${ECHO_T}$NCURSES_CONFIG" >&6
  else
--  echo "$as_me:7764: result: no" >&5
-+  echo "$as_me:7767: result: no" >&5
+-  echo "$as_me:6778: result: no" >&5
++  echo "$as_me:6779: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -7774,7 +7777,7 @@
+@@ -6788,7 +6789,7 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
--echo "$as_me:7777: checking for $ac_word" >&5
-+echo "$as_me:7780: checking for $ac_word" >&5
+-echo "$as_me:6791: checking for $ac_word" >&5
++echo "$as_me:6792: 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
-@@ -7789,7 +7792,7 @@
+@@ -6803,7 +6804,7 @@
    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:7792: found $ac_dir/$ac_word" >&5
-+echo "$as_me:7795: found $ac_dir/$ac_word" >&5
+-echo "$as_me:6806: found $ac_dir/$ac_word" >&5
++echo "$as_me:6807: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -7797,10 +7800,10 @@
+@@ -6811,10 +6812,10 @@
  fi
  ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
  if test -n "$ac_ct_NCURSES_CONFIG"; then
--  echo "$as_me:7800: result: $ac_ct_NCURSES_CONFIG" >&5
-+  echo "$as_me:7803: result: $ac_ct_NCURSES_CONFIG" >&5
+-  echo "$as_me:6814: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:6815: result: $ac_ct_NCURSES_CONFIG" >&5
  echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
  else
--  echo "$as_me:7803: result: no" >&5
-+  echo "$as_me:7806: result: no" >&5
+-  echo "$as_me:6817: result: no" >&5
++  echo "$as_me:6818: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -7833,7 +7836,7 @@
+@@ -6847,7 +6848,7 @@
  
  		# even with config script, some packages use no-override for curses.h
  
--echo "$as_me:7836: checking if we have identified curses headers" >&5
-+echo "$as_me:7839: checking if we have identified curses headers" >&5
+-echo "$as_me:6850: checking if we have identified curses headers" >&5
++echo "$as_me:6851: 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
-@@ -7845,7 +7848,7 @@
+@@ -6859,7 +6860,7 @@
  	curses.h $cf_cv_screen/curses.h
  do
  cat >conftest.$ac_ext <<_ACEOF
--#line 7848 "configure"
-+#line 7851 "configure"
+-#line 6862 "configure"
++#line 6863 "configure"
  #include "confdefs.h"
  #include <${cf_header}>
  int
-@@ -7857,16 +7860,16 @@
+@@ -6871,16 +6872,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7860: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7863: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:6874: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6875: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:7863: \$? = $ac_status" >&5
-+  echo "$as_me:7866: \$? = $ac_status" >&5
+-  echo "$as_me:6877: \$? = $ac_status" >&5
++  echo "$as_me:6878: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7866: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7869: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:6880: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6881: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:7869: \$? = $ac_status" >&5
-+  echo "$as_me:7872: \$? = $ac_status" >&5
+-  echo "$as_me:6883: \$? = $ac_status" >&5
++  echo "$as_me:6884: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_ncurses_header=$cf_header; break
  else
-@@ -7877,11 +7880,11 @@
+@@ -6891,11 +6892,11 @@
  done
  
  fi
--echo "$as_me:7880: result: $cf_cv_ncurses_header" >&5
-+echo "$as_me:7883: result: $cf_cv_ncurses_header" >&5
+-echo "$as_me:6894: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:6895: 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:7884: error: No curses header-files found" >&5
-+	{ { echo "$as_me:7887: error: No curses header-files found" >&5
+-	{ { echo "$as_me:6898: error: No curses header-files found" >&5
++	{ { echo "$as_me:6899: error: No curses header-files found" >&5
  echo "$as_me: error: No curses header-files found" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -7891,23 +7894,23 @@
+@@ -6905,23 +6906,23 @@
  for ac_header in $cf_cv_ncurses_header
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:7894: checking for $ac_header" >&5
-+echo "$as_me:7897: checking for $ac_header" >&5
+-echo "$as_me:6908: checking for $ac_header" >&5
++echo "$as_me:6909: 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 7900 "configure"
-+#line 7903 "configure"
+-#line 6914 "configure"
++#line 6915 "configure"
  #include "confdefs.h"
  #include <$ac_header>
  _ACEOF
--if { (eval echo "$as_me:7904: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:7907: \"$ac_cpp conftest.$ac_ext\"") >&5
+-if { (eval echo "$as_me:6918: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:6919: \"$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:7910: \$? = $ac_status" >&5
-+  echo "$as_me:7913: \$? = $ac_status" >&5
+-  echo "$as_me:6924: \$? = $ac_status" >&5
++  echo "$as_me:6925: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -7926,7 +7929,7 @@
+@@ -6940,7 +6941,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
--echo "$as_me:7929: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:7932: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "$as_me:6943: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:6944: 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 <conftest.$ac_ext <<_ACEOF
--#line 7982 "configure"
-+#line 7985 "configure"
+-#line 6996 "configure"
++#line 6997 "configure"
  #include "confdefs.h"
  #include 
  int
-@@ -7991,16 +7994,16 @@
+@@ -7005,16 +7006,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7994: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7997: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:7008: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7009: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:7997: \$? = $ac_status" >&5
-+  echo "$as_me:8000: \$? = $ac_status" >&5
+-  echo "$as_me:7011: \$? = $ac_status" >&5
++  echo "$as_me:7012: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8000: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8003: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:7014: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7015: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:8003: \$? = $ac_status" >&5
-+  echo "$as_me:8006: \$? = $ac_status" >&5
+-  echo "$as_me:7017: \$? = $ac_status" >&5
++  echo "$as_me:7018: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -8017,7 +8020,7 @@
+@@ -7031,7 +7032,7 @@
  		if test "$cf_have_incdir" = no ; then
  		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
  
--echo "${as_me:-configure}:8020: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:8023: testing adding $cf_add_incdir to include-path ..." 1>&5
+-echo "${as_me:-configure}:7034: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:7035: testing adding $cf_add_incdir to include-path ..." 1>&5
  
  		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  
-@@ -8036,7 +8039,7 @@
+@@ -7050,7 +7051,7 @@
  
  }
  
--echo "$as_me:8039: checking for $cf_ncuhdr_root header in include-path" >&5
-+echo "$as_me:8042: checking for $cf_ncuhdr_root header in include-path" >&5
+-echo "$as_me:7053: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:7054: 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
-@@ -8048,7 +8051,7 @@
+@@ -7062,7 +7063,7 @@
  	do
  
  	cat >conftest.$ac_ext <<_ACEOF
--#line 8051 "configure"
-+#line 8054 "configure"
+-#line 7065 "configure"
++#line 7066 "configure"
  #include "confdefs.h"
  
  #include <$cf_header>
-@@ -8072,16 +8075,16 @@
+@@ -7086,16 +7087,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8075: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8078: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:7089: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7090: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:8078: \$? = $ac_status" >&5
-+  echo "$as_me:8081: \$? = $ac_status" >&5
+-  echo "$as_me:7092: \$? = $ac_status" >&5
++  echo "$as_me:7093: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8081: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8084: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:7095: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7096: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:8084: \$? = $ac_status" >&5
-+  echo "$as_me:8087: \$? = $ac_status" >&5
+-  echo "$as_me:7098: \$? = $ac_status" >&5
++  echo "$as_me:7099: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_ncurses_h=$cf_header
  
-@@ -8096,14 +8099,14 @@
+@@ -7110,14 +7111,14 @@
  	done
  
  fi
--echo "$as_me:8099: result: $cf_cv_ncurses_h" >&5
-+echo "$as_me:8102: result: $cf_cv_ncurses_h" >&5
+-echo "$as_me:7113: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:7114: 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:8106: checking for $cf_ncuhdr_root include-path" >&5
-+echo "$as_me:8109: checking for $cf_ncuhdr_root include-path" >&5
+-echo "$as_me:7120: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:7121: 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
-@@ -8221,7 +8224,7 @@
+@@ -7235,7 +7236,7 @@
  			  cf_save_CPPFLAGS=$CPPFLAGS
  			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  			  cat >conftest.$ac_ext <<_ACEOF
--#line 8224 "configure"
-+#line 8227 "configure"
+-#line 7238 "configure"
++#line 7239 "configure"
  #include "confdefs.h"
  #include 
  int
-@@ -8233,16 +8236,16 @@
+@@ -7247,16 +7248,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8236: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8239: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:7250: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7251: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:8239: \$? = $ac_status" >&5
-+  echo "$as_me:8242: \$? = $ac_status" >&5
+-  echo "$as_me:7253: \$? = $ac_status" >&5
++  echo "$as_me:7254: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8242: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8245: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:7256: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7257: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:8245: \$? = $ac_status" >&5
-+  echo "$as_me:8248: \$? = $ac_status" >&5
+-  echo "$as_me:7259: \$? = $ac_status" >&5
++  echo "$as_me:7260: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -8259,7 +8262,7 @@
+@@ -7273,7 +7274,7 @@
  		if test "$cf_have_incdir" = no ; then
  		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
  
--echo "${as_me:-configure}:8262: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:8265: testing adding $cf_add_incdir to include-path ..." 1>&5
+-echo "${as_me:-configure}:7276: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:7277: testing adding $cf_add_incdir to include-path ..." 1>&5
  
  		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  
-@@ -8282,7 +8285,7 @@
+@@ -7296,7 +7297,7 @@
  		do
  
  	cat >conftest.$ac_ext <<_ACEOF
--#line 8285 "configure"
-+#line 8288 "configure"
+-#line 7299 "configure"
++#line 7300 "configure"
  #include "confdefs.h"
  
  #include <$cf_header>
-@@ -8306,16 +8309,16 @@
+@@ -7320,16 +7321,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8309: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8312: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:7323: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7324: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:8312: \$? = $ac_status" >&5
-+  echo "$as_me:8315: \$? = $ac_status" >&5
+-  echo "$as_me:7326: \$? = $ac_status" >&5
++  echo "$as_me:7327: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8315: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8318: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:7329: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7330: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:8318: \$? = $ac_status" >&5
-+  echo "$as_me:8321: \$? = $ac_status" >&5
+-  echo "$as_me:7332: \$? = $ac_status" >&5
++  echo "$as_me:7333: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_ncurses_h2=$cf_header
  
-@@ -8336,12 +8339,12 @@
+@@ -7350,12 +7351,12 @@
  		CPPFLAGS="$cf_save2_CPPFLAGS"
  		test "$cf_cv_ncurses_h2" != no && break
  	done
--	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8339: error: not found" >&5
-+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8342: error: not found" >&5
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:7353: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:7354: error: not found" >&5
  echo "$as_me: error: not found" >&2;}
     { (exit 1); exit 1; }; }
  
  fi
--echo "$as_me:8344: result: $cf_cv_ncurses_h2" >&5
-+echo "$as_me:8347: result: $cf_cv_ncurses_h2" >&5
+-echo "$as_me:7358: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:7359: 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%/[^/]*$%%'`
-@@ -8374,7 +8377,7 @@
+@@ -7388,7 +7389,7 @@
  			  cf_save_CPPFLAGS=$CPPFLAGS
  			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  			  cat >conftest.$ac_ext <<_ACEOF
--#line 8377 "configure"
-+#line 8380 "configure"
+-#line 7391 "configure"
++#line 7392 "configure"
  #include "confdefs.h"
  #include 
  int
-@@ -8386,16 +8389,16 @@
+@@ -7400,16 +7401,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8389: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8392: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:7403: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7404: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:8392: \$? = $ac_status" >&5
-+  echo "$as_me:8395: \$? = $ac_status" >&5
+-  echo "$as_me:7406: \$? = $ac_status" >&5
++  echo "$as_me:7407: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8395: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8398: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:7409: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7410: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:8398: \$? = $ac_status" >&5
-+  echo "$as_me:8401: \$? = $ac_status" >&5
+-  echo "$as_me:7412: \$? = $ac_status" >&5
++  echo "$as_me:7413: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -8412,7 +8415,7 @@
+@@ -7426,7 +7427,7 @@
  		if test "$cf_have_incdir" = no ; then
  		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
  
--echo "${as_me:-configure}:8415: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:8418: testing adding $cf_add_incdir to include-path ..." 1>&5
+-echo "${as_me:-configure}:7429: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:7430: testing adding $cf_add_incdir to include-path ..." 1>&5
  
  		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  
-@@ -8460,7 +8463,7 @@
+@@ -7474,7 +7475,7 @@
  	;;
  esac
  
--echo "$as_me:8463: checking for terminfo header" >&5
-+echo "$as_me:8466: checking for terminfo header" >&5
+-echo "$as_me:7477: checking for terminfo header" >&5
++echo "$as_me:7478: 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
-@@ -8478,7 +8481,7 @@
+@@ -7492,7 +7493,7 @@
  for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
  do
  cat >conftest.$ac_ext <<_ACEOF
--#line 8481 "configure"
-+#line 8484 "configure"
+-#line 7495 "configure"
++#line 7496 "configure"
  #include "confdefs.h"
  #include 
  #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -8493,16 +8496,16 @@
+@@ -7507,16 +7508,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8496: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8499: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:7510: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7511: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:8499: \$? = $ac_status" >&5
-+  echo "$as_me:8502: \$? = $ac_status" >&5
+-  echo "$as_me:7513: \$? = $ac_status" >&5
++  echo "$as_me:7514: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8502: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8505: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:7516: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7517: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:8505: \$? = $ac_status" >&5
-+  echo "$as_me:8508: \$? = $ac_status" >&5
+-  echo "$as_me:7519: \$? = $ac_status" >&5
++  echo "$as_me:7520: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
  	cf_cv_term_header="$cf_test"
-@@ -8518,7 +8521,7 @@
+@@ -7532,7 +7533,7 @@
  done
  
  fi
--echo "$as_me:8521: result: $cf_cv_term_header" >&5
-+echo "$as_me:8524: result: $cf_cv_term_header" >&5
+-echo "$as_me:7535: result: $cf_cv_term_header" >&5
++echo "$as_me:7536: result: $cf_cv_term_header" >&5
  echo "${ECHO_T}$cf_cv_term_header" >&6
  
  # Set definitions to allow ifdef'ing to accommodate subdirectories
-@@ -8556,7 +8559,7 @@
+@@ -7570,7 +7571,7 @@
  #define NCURSES 1
  EOF
  
--echo "$as_me:8559: checking for ncurses version" >&5
-+echo "$as_me:8562: checking for ncurses version" >&5
+-echo "$as_me:7573: checking for ncurses version" >&5
++echo "$as_me:7574: 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
-@@ -8582,10 +8585,10 @@
+@@ -7596,10 +7597,10 @@
  #endif
  EOF
  	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
--	{ (eval echo "$as_me:8585: \"$cf_try\"") >&5
-+	{ (eval echo "$as_me:8588: \"$cf_try\"") >&5
+-	{ (eval echo "$as_me:7599: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:7600: \"$cf_try\"") >&5
    (eval $cf_try) 2>&5
    ac_status=$?
--  echo "$as_me:8588: \$? = $ac_status" >&5
-+  echo "$as_me:8591: \$? = $ac_status" >&5
+-  echo "$as_me:7602: \$? = $ac_status" >&5
++  echo "$as_me:7603: \$? = $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%".*%%'`
-@@ -8595,7 +8598,7 @@
+@@ -7609,7 +7610,7 @@
  
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 8598 "configure"
-+#line 8601 "configure"
+-#line 7612 "configure"
++#line 7613 "configure"
  #include "confdefs.h"
  
  #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -8620,15 +8623,15 @@
+@@ -7634,15 +7635,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
--if { (eval echo "$as_me:8623: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8626: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:7637: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7638: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:8626: \$? = $ac_status" >&5
-+  echo "$as_me:8629: \$? = $ac_status" >&5
+-  echo "$as_me:7640: \$? = $ac_status" >&5
++  echo "$as_me:7641: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:8628: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8631: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:7642: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7643: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:8631: \$? = $ac_status" >&5
-+  echo "$as_me:8634: \$? = $ac_status" >&5
+-  echo "$as_me:7645: \$? = $ac_status" >&5
++  echo "$as_me:7646: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
  	cf_cv_ncurses_version=`cat $cf_tempfile`
-@@ -8642,7 +8645,7 @@
+@@ -7656,7 +7657,7 @@
  	rm -f $cf_tempfile
  
  fi
--echo "$as_me:8645: result: $cf_cv_ncurses_version" >&5
-+echo "$as_me:8648: result: $cf_cv_ncurses_version" >&5
+-echo "$as_me:7659: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:7660: result: $cf_cv_ncurses_version" >&5
  echo "${ECHO_T}$cf_cv_ncurses_version" >&6
  test "$cf_cv_ncurses_version" = no ||
  cat >>confdefs.h <<\EOF
-@@ -8655,7 +8658,7 @@
+@@ -7669,7 +7670,7 @@
  	# to link gpm.
  cf_ncurses_LIBS=""
  cf_ncurses_SAVE="$LIBS"
--echo "$as_me:8658: checking for Gpm_Open in -lgpm" >&5
-+echo "$as_me:8661: checking for Gpm_Open in -lgpm" >&5
+-echo "$as_me:7672: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:7673: 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
-@@ -8663,7 +8666,7 @@
+@@ -7677,7 +7678,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lgpm  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 8666 "configure"
-+#line 8669 "configure"
+-#line 7680 "configure"
++#line 7681 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -8682,16 +8685,16 @@
+@@ -7696,16 +7697,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8685: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8688: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:7699: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7700: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:8688: \$? = $ac_status" >&5
-+  echo "$as_me:8691: \$? = $ac_status" >&5
+-  echo "$as_me:7702: \$? = $ac_status" >&5
++  echo "$as_me:7703: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8691: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8694: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:7705: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7706: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:8694: \$? = $ac_status" >&5
-+  echo "$as_me:8697: \$? = $ac_status" >&5
+-  echo "$as_me:7708: \$? = $ac_status" >&5
++  echo "$as_me:7709: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_gpm_Gpm_Open=yes
  else
-@@ -8702,10 +8705,10 @@
+@@ -7716,10 +7717,10 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:8705: result: $ac_cv_lib_gpm_Gpm_Open" >&5
-+echo "$as_me:8708: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+-echo "$as_me:7719: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:7720: 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:8708: checking for initscr in -lgpm" >&5
-+  echo "$as_me:8711: checking for initscr in -lgpm" >&5
+-  echo "$as_me:7722: checking for initscr in -lgpm" >&5
++  echo "$as_me:7723: 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
-@@ -8713,7 +8716,7 @@
+@@ -7727,7 +7728,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lgpm  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 8716 "configure"
-+#line 8719 "configure"
+-#line 7730 "configure"
++#line 7731 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -8732,16 +8735,16 @@
+@@ -7746,16 +7747,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8735: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8738: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:7749: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7750: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:8738: \$? = $ac_status" >&5
-+  echo "$as_me:8741: \$? = $ac_status" >&5
+-  echo "$as_me:7752: \$? = $ac_status" >&5
++  echo "$as_me:7753: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8741: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8744: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:7755: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7756: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:8744: \$? = $ac_status" >&5
-+  echo "$as_me:8747: \$? = $ac_status" >&5
+-  echo "$as_me:7758: \$? = $ac_status" >&5
++  echo "$as_me:7759: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_gpm_initscr=yes
  else
-@@ -8752,7 +8755,7 @@
+@@ -7766,7 +7767,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:8755: result: $ac_cv_lib_gpm_initscr" >&5
-+echo "$as_me:8758: result: $ac_cv_lib_gpm_initscr" >&5
+-echo "$as_me:7769: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:7770: 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"
-@@ -8767,7 +8770,7 @@
+@@ -7781,7 +7782,7 @@
  	# 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:8770: checking for tgoto in -lmytinfo" >&5
-+		echo "$as_me:8773: checking for tgoto in -lmytinfo" >&5
+-		echo "$as_me:7784: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:7785: 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
-@@ -8775,7 +8778,7 @@
+@@ -7789,7 +7790,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lmytinfo  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 8778 "configure"
-+#line 8781 "configure"
+-#line 7792 "configure"
++#line 7793 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -8794,16 +8797,16 @@
+@@ -7808,16 +7809,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8797: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8800: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:7811: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7812: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:8800: \$? = $ac_status" >&5
-+  echo "$as_me:8803: \$? = $ac_status" >&5
+-  echo "$as_me:7814: \$? = $ac_status" >&5
++  echo "$as_me:7815: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8803: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8806: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:7817: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7818: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:8806: \$? = $ac_status" >&5
-+  echo "$as_me:8809: \$? = $ac_status" >&5
+-  echo "$as_me:7820: \$? = $ac_status" >&5
++  echo "$as_me:7821: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_mytinfo_tgoto=yes
  else
-@@ -8814,7 +8817,7 @@
+@@ -7828,7 +7829,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:8817: result: $ac_cv_lib_mytinfo_tgoto" >&5
-+echo "$as_me:8820: result: $ac_cv_lib_mytinfo_tgoto" >&5
+-echo "$as_me:7831: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:7832: 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"
-@@ -8863,13 +8866,13 @@
+@@ -7877,13 +7878,13 @@
  
  	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
  	cf_libdir=""
--	echo "$as_me:8866: checking for initscr" >&5
-+	echo "$as_me:8869: checking for initscr" >&5
+-	echo "$as_me:7880: checking for initscr" >&5
++	echo "$as_me:7881: 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 8872 "configure"
-+#line 8875 "configure"
+-#line 7886 "configure"
++#line 7887 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char initscr (); below.  */
-@@ -8900,16 +8903,16 @@
+@@ -7914,16 +7915,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8903: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8906: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:7917: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7918: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:8906: \$? = $ac_status" >&5
-+  echo "$as_me:8909: \$? = $ac_status" >&5
+-  echo "$as_me:7920: \$? = $ac_status" >&5
++  echo "$as_me:7921: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8909: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8912: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:7923: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7924: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:8912: \$? = $ac_status" >&5
-+  echo "$as_me:8915: \$? = $ac_status" >&5
+-  echo "$as_me:7926: \$? = $ac_status" >&5
++  echo "$as_me:7927: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_initscr=yes
  else
-@@ -8919,18 +8922,18 @@
+@@ -7933,18 +7934,18 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:8922: result: $ac_cv_func_initscr" >&5
-+echo "$as_me:8925: result: $ac_cv_func_initscr" >&5
+-echo "$as_me:7936: result: $ac_cv_func_initscr" >&5
++echo "$as_me:7937: 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:8929: checking for initscr in -l$cf_nculib_root" >&5
-+		echo "$as_me:8932: checking for initscr in -l$cf_nculib_root" >&5
+-		echo "$as_me:7943: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:7944: 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 8933 "configure"
-+#line 8936 "configure"
+-#line 7947 "configure"
++#line 7948 "configure"
  #include "confdefs.h"
  #include <${cf_cv_ncurses_header:-curses.h}>
  int
-@@ -8942,25 +8945,25 @@
+@@ -7956,25 +7957,25 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8945: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8948: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:7959: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7960: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:8948: \$? = $ac_status" >&5
-+  echo "$as_me:8951: \$? = $ac_status" >&5
+-  echo "$as_me:7962: \$? = $ac_status" >&5
++  echo "$as_me:7963: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8951: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8954: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:7965: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7966: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:8954: \$? = $ac_status" >&5
-+  echo "$as_me:8957: \$? = $ac_status" >&5
+-  echo "$as_me:7968: \$? = $ac_status" >&5
++  echo "$as_me:7969: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
--  echo "$as_me:8956: result: yes" >&5
-+  echo "$as_me:8959: result: yes" >&5
+-  echo "$as_me:7970: result: yes" >&5
++  echo "$as_me:7971: 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:8963: result: no" >&5
-+echo "$as_me:8966: result: no" >&5
+-echo "$as_me:7977: result: no" >&5
++echo "$as_me:7978: result: no" >&5
  echo "${ECHO_T}no" >&6
  
  cf_search=
-@@ -9028,11 +9031,11 @@
+@@ -8042,11 +8043,11 @@
  
  			for cf_libdir in $cf_search
  			do
--				echo "$as_me:9031: checking for -l$cf_nculib_root in $cf_libdir" >&5
-+				echo "$as_me:9034: checking for -l$cf_nculib_root in $cf_libdir" >&5
+-				echo "$as_me:8045: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:8046: 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 9035 "configure"
-+#line 9038 "configure"
+-#line 8049 "configure"
++#line 8050 "configure"
  #include "confdefs.h"
  #include <${cf_cv_ncurses_header:-curses.h}>
  int
-@@ -9044,25 +9047,25 @@
+@@ -8058,25 +8059,25 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9047: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9050: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:8061: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8062: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:9050: \$? = $ac_status" >&5
-+  echo "$as_me:9053: \$? = $ac_status" >&5
+-  echo "$as_me:8064: \$? = $ac_status" >&5
++  echo "$as_me:8065: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9053: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9056: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:8067: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8068: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:9056: \$? = $ac_status" >&5
-+  echo "$as_me:9059: \$? = $ac_status" >&5
+-  echo "$as_me:8070: \$? = $ac_status" >&5
++  echo "$as_me:8071: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
--  echo "$as_me:9058: result: yes" >&5
-+  echo "$as_me:9061: result: yes" >&5
+-  echo "$as_me:8072: result: yes" >&5
++  echo "$as_me:8073: 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:9065: result: no" >&5
-+echo "$as_me:9068: result: no" >&5
+-echo "$as_me:8079: result: no" >&5
++echo "$as_me:8080: result: no" >&5
  echo "${ECHO_T}no" >&6
  					 LIBS="$cf_save_LIBS"
  fi
-@@ -9077,7 +9080,7 @@
+@@ -8091,7 +8092,7 @@
  eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
  
  if test $cf_found_library = no ; then
--	{ { echo "$as_me:9080: error: Cannot link $cf_nculib_root library" >&5
-+	{ { echo "$as_me:9083: error: Cannot link $cf_nculib_root library" >&5
+-	{ { echo "$as_me:8094: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:8095: error: Cannot link $cf_nculib_root library" >&5
  echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -9085,7 +9088,7 @@
+@@ -8099,7 +8100,7 @@
  fi
  
  if test -n "$cf_ncurses_LIBS" ; then
--	echo "$as_me:9088: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
-+	echo "$as_me:9091: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+-	echo "$as_me:8102: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:8103: 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
-@@ -9095,7 +9098,7 @@
+@@ -8109,7 +8110,7 @@
  		fi
  	done
  	cat >conftest.$ac_ext <<_ACEOF
--#line 9098 "configure"
-+#line 9101 "configure"
+-#line 8112 "configure"
++#line 8113 "configure"
  #include "confdefs.h"
  #include <${cf_cv_ncurses_header:-curses.h}>
  int
-@@ -9107,23 +9110,23 @@
+@@ -8121,23 +8122,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9110: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9113: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:8124: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8125: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:9113: \$? = $ac_status" >&5
-+  echo "$as_me:9116: \$? = $ac_status" >&5
+-  echo "$as_me:8127: \$? = $ac_status" >&5
++  echo "$as_me:8128: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9116: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9119: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:8130: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8131: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:9119: \$? = $ac_status" >&5
-+  echo "$as_me:9122: \$? = $ac_status" >&5
+-  echo "$as_me:8133: \$? = $ac_status" >&5
++  echo "$as_me:8134: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
--  echo "$as_me:9121: result: yes" >&5
-+  echo "$as_me:9124: result: yes" >&5
+-  echo "$as_me:8135: result: yes" >&5
++  echo "$as_me:8136: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  else
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
--echo "$as_me:9126: result: no" >&5
-+echo "$as_me:9129: result: no" >&5
+-echo "$as_me:8140: result: no" >&5
++echo "$as_me:8141: result: no" >&5
  echo "${ECHO_T}no" >&6
  		 LIBS="$cf_ncurses_SAVE"
  fi
-@@ -9143,7 +9146,7 @@
+@@ -8162,13 +8163,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:8165: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:8166: 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:8168: result: yes" >&5
++		echo "$as_me:8169: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:8171: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:8172: 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
+ 
+@@ -8194,7 +8195,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 8197 "configure"
++#line 8198 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8206,37 +8207,37 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8209: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8210: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8212: \$? = $ac_status" >&5
++  echo "$as_me:8213: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:8215: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8216: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8218: \$? = $ac_status" >&5
++  echo "$as_me:8219: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 8224 "configure"
++#line 8225 "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:8231: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8232: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8234: \$? = $ac_status" >&5
++  echo "$as_me:8235: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:8236: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8237: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8239: \$? = $ac_status" >&5
++  echo "$as_me:8240: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -8253,7 +8254,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-		echo "$as_me:8256: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:8257: 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"
+@@ -8271,7 +8272,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:8274: result: no" >&5
++		echo "$as_me:8275: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -8287,7 +8288,7 @@
+   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:8290: checking for $ac_word" >&5
++echo "$as_me:8291: 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
+@@ -8302,7 +8303,7 @@
+   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:8305: found $ac_dir/$ac_word" >&5
++echo "$as_me:8306: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8310,10 +8311,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:8313: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:8314: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:8316: result: no" >&5
++  echo "$as_me:8317: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8326,7 +8327,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:8329: checking for $ac_word" >&5
++echo "$as_me:8330: 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
+@@ -8341,7 +8342,7 @@
+   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:8344: found $ac_dir/$ac_word" >&5
++echo "$as_me:8345: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8349,10 +8350,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:8352: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:8353: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:8355: result: no" >&5
++  echo "$as_me:8356: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8385,7 +8386,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:8388: checking if we have identified curses headers" >&5
++echo "$as_me:8389: 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
+@@ -8397,7 +8398,7 @@
+ 	curses.h $cf_cv_screen/curses.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8400 "configure"
++#line 8401 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -8409,16 +8410,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8412: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8413: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8415: \$? = $ac_status" >&5
++  echo "$as_me:8416: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8418: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8419: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8421: \$? = $ac_status" >&5
++  echo "$as_me:8422: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -8429,11 +8430,11 @@
+ done
+ 
+ fi
+-echo "$as_me:8432: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:8433: 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:8436: error: No curses header-files found" >&5
++	{ { echo "$as_me:8437: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -8443,23 +8444,23 @@
+ for ac_header in $cf_cv_ncurses_header
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:8446: checking for $ac_header" >&5
++echo "$as_me:8447: 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 8452 "configure"
++#line 8453 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8456: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:8457: \"$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:8462: \$? = $ac_status" >&5
++  echo "$as_me:8463: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8478,7 +8479,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:8481: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:8482: 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 <conftest.$ac_ext <<_ACEOF
+-#line 8534 "configure"
++#line 8535 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8543,16 +8544,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8546: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8547: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8549: \$? = $ac_status" >&5
++  echo "$as_me:8550: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8552: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8553: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8555: \$? = $ac_status" >&5
++  echo "$as_me:8556: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -8569,7 +8570,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:8572: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8573: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8588,7 +8589,7 @@
+ 
+ }
+ 
+-echo "$as_me:8591: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:8592: 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
+@@ -8600,7 +8601,7 @@
+ 	do
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 8603 "configure"
++#line 8604 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -8624,16 +8625,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8627: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8628: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8630: \$? = $ac_status" >&5
++  echo "$as_me:8631: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8633: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8634: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8636: \$? = $ac_status" >&5
++  echo "$as_me:8637: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -8648,14 +8649,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:8651: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:8652: 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:8658: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:8659: 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
+@@ -8773,7 +8774,7 @@
+ 			  cf_save_CPPFLAGS=$CPPFLAGS
+ 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 8776 "configure"
++#line 8777 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8785,16 +8786,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8788: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8789: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8791: \$? = $ac_status" >&5
++  echo "$as_me:8792: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8794: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8795: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8797: \$? = $ac_status" >&5
++  echo "$as_me:8798: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -8811,7 +8812,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:8814: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8815: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8834,7 +8835,7 @@
+ 		do
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 8837 "configure"
++#line 8838 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -8858,16 +8859,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8861: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8862: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8864: \$? = $ac_status" >&5
++  echo "$as_me:8865: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8867: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8868: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8870: \$? = $ac_status" >&5
++  echo "$as_me:8871: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -8888,12 +8889,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8891: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8892: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:8896: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:8897: 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%/[^/]*$%%'`
+@@ -8926,7 +8927,7 @@
+ 			  cf_save_CPPFLAGS=$CPPFLAGS
+ 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 8929 "configure"
++#line 8930 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8938,16 +8939,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8941: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8942: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8944: \$? = $ac_status" >&5
++  echo "$as_me:8945: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8947: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8948: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8950: \$? = $ac_status" >&5
++  echo "$as_me:8951: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -8964,7 +8965,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:8967: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8968: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -9012,7 +9013,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:9015: checking for terminfo header" >&5
++echo "$as_me:9016: 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
+@@ -9030,7 +9031,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9033 "configure"
++#line 9034 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -9045,16 +9046,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9048: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9049: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9051: \$? = $ac_status" >&5
++  echo "$as_me:9052: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9054: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9055: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9057: \$? = $ac_status" >&5
++  echo "$as_me:9058: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -9070,7 +9071,7 @@
+ done
+ 
+ fi
+-echo "$as_me:9073: result: $cf_cv_term_header" >&5
++echo "$as_me:9074: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -9108,7 +9109,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:9111: checking for ncurses version" >&5
++echo "$as_me:9112: 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
+@@ -9134,10 +9135,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:9137: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:9138: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9140: \$? = $ac_status" >&5
++  echo "$as_me:9141: \$? = $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%".*%%'`
+@@ -9147,7 +9148,7 @@
+ 
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9150 "configure"
++#line 9151 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -9172,15 +9173,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:9175: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9176: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9178: \$? = $ac_status" >&5
++  echo "$as_me:9179: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:9180: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9181: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9183: \$? = $ac_status" >&5
++  echo "$as_me:9184: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -9194,7 +9195,7 @@
+ 	rm -f $cf_tempfile
+ 
+ fi
+-echo "$as_me:9197: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:9198: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -9207,7 +9208,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:9210: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:9211: 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
+@@ -9215,7 +9216,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9218 "configure"
++#line 9219 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -9234,16 +9235,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9237: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9238: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9240: \$? = $ac_status" >&5
++  echo "$as_me:9241: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9243: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9244: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9246: \$? = $ac_status" >&5
++  echo "$as_me:9247: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -9254,10 +9255,10 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9257: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:9258: 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:9260: checking for initscr in -lgpm" >&5
++  echo "$as_me:9261: 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
+@@ -9265,7 +9266,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9268 "configure"
++#line 9269 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -9284,16 +9285,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9287: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9288: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9290: \$? = $ac_status" >&5
++  echo "$as_me:9291: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9293: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9294: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9296: \$? = $ac_status" >&5
++  echo "$as_me:9297: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -9304,7 +9305,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9307: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:9308: 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"
+@@ -9319,7 +9320,7 @@
+ 	# 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:9322: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:9323: 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
+@@ -9327,7 +9328,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9330 "configure"
++#line 9331 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -9346,16 +9347,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9349: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9350: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9352: \$? = $ac_status" >&5
++  echo "$as_me:9353: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9355: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9356: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9358: \$? = $ac_status" >&5
++  echo "$as_me:9359: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -9366,7 +9367,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9369: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:9370: 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"
+@@ -9415,13 +9416,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
+ 	cf_libdir=""
+-	echo "$as_me:9418: checking for initscr" >&5
++	echo "$as_me:9419: 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 9424 "configure"
++#line 9425 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char initscr (); below.  */
+@@ -9452,16 +9453,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9455: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9456: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9458: \$? = $ac_status" >&5
++  echo "$as_me:9459: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9461: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9462: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9464: \$? = $ac_status" >&5
++  echo "$as_me:9465: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -9471,18 +9472,18 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:9474: result: $ac_cv_func_initscr" >&5
++echo "$as_me:9475: 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:9481: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:9482: 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 9485 "configure"
++#line 9486 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9494,25 +9495,25 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9497: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9498: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9500: \$? = $ac_status" >&5
++  echo "$as_me:9501: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9503: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9504: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9506: \$? = $ac_status" >&5
++  echo "$as_me:9507: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:9508: result: yes" >&5
++  echo "$as_me:9509: 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:9515: result: no" >&5
++echo "$as_me:9516: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -9580,11 +9581,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:9583: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:9584: 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 9587 "configure"
++#line 9588 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9596,25 +9597,25 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9599: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9600: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9602: \$? = $ac_status" >&5
++  echo "$as_me:9603: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9605: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9606: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9608: \$? = $ac_status" >&5
++  echo "$as_me:9609: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:9610: result: yes" >&5
++  echo "$as_me:9611: 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:9617: result: no" >&5
++echo "$as_me:9618: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -9629,7 +9630,7 @@
+ eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
+ 
+ if test $cf_found_library = no ; then
+-	{ { echo "$as_me:9632: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:9633: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -9637,7 +9638,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:9640: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:9641: 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
+@@ -9647,7 +9648,7 @@
+ 		fi
+ 	done
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 9650 "configure"
++#line 9651 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9659,23 +9660,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9662: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9663: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9665: \$? = $ac_status" >&5
++  echo "$as_me:9666: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9668: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9669: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9671: \$? = $ac_status" >&5
++  echo "$as_me:9672: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:9673: result: yes" >&5
++  echo "$as_me:9674: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:9678: result: no" >&5
++echo "$as_me:9679: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -9695,7 +9696,7 @@
  
  	;;
  (pdcurses)
--	echo "$as_me:9146: checking for X" >&5
-+	echo "$as_me:9149: checking for X" >&5
+-	echo "$as_me:9698: checking for X" >&5
++	echo "$as_me:9699: checking for X" >&5
  echo $ECHO_N "checking for X... $ECHO_C" >&6
  
  # Check whether --with-x or --without-x was given.
-@@ -9240,17 +9243,17 @@
+@@ -9792,17 +9793,17 @@
    # 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 9243 "configure"
-+#line 9246 "configure"
+-#line 9795 "configure"
++#line 9796 "configure"
  #include "confdefs.h"
  #include 
  _ACEOF
--if { (eval echo "$as_me:9247: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:9250: \"$ac_cpp conftest.$ac_ext\"") >&5
+-if { (eval echo "$as_me:9799: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:9800: \"$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:9253: \$? = $ac_status" >&5
-+  echo "$as_me:9256: \$? = $ac_status" >&5
+-  echo "$as_me:9805: \$? = $ac_status" >&5
++  echo "$as_me:9806: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -9283,7 +9286,7 @@
+@@ -9835,7 +9836,7 @@
    ac_save_LIBS=$LIBS
    LIBS="-lXt $LIBS"
    cat >conftest.$ac_ext <<_ACEOF
--#line 9286 "configure"
-+#line 9289 "configure"
+-#line 9838 "configure"
++#line 9839 "configure"
  #include "confdefs.h"
  #include 
  int
-@@ -9295,16 +9298,16 @@
+@@ -9847,16 +9848,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9298: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9301: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:9850: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9851: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:9301: \$? = $ac_status" >&5
-+  echo "$as_me:9304: \$? = $ac_status" >&5
+-  echo "$as_me:9853: \$? = $ac_status" >&5
++  echo "$as_me:9854: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9304: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9307: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:9856: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9857: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:9307: \$? = $ac_status" >&5
-+  echo "$as_me:9310: \$? = $ac_status" >&5
+-  echo "$as_me:9859: \$? = $ac_status" >&5
++  echo "$as_me:9860: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    LIBS=$ac_save_LIBS
  # We can link X programs with no special library path.
-@@ -9342,7 +9345,7 @@
+@@ -9894,7 +9895,7 @@
  fi # $with_x != no
  
  if test "$have_x" != yes; then
--  echo "$as_me:9345: result: $have_x" >&5
-+  echo "$as_me:9348: result: $have_x" >&5
+-  echo "$as_me:9897: result: $have_x" >&5
++  echo "$as_me:9898: result: $have_x" >&5
  echo "${ECHO_T}$have_x" >&6
    no_x=yes
  else
-@@ -9352,7 +9355,7 @@
+@@ -9904,7 +9905,7 @@
    # 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:9355: result: libraries $x_libraries, headers $x_includes" >&5
-+  echo "$as_me:9358: result: libraries $x_libraries, headers $x_includes" >&5
+-  echo "$as_me:9907: result: libraries $x_libraries, headers $x_includes" >&5
++  echo "$as_me:9908: result: libraries $x_libraries, headers $x_includes" >&5
  echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
  fi
  
-@@ -9376,11 +9379,11 @@
+@@ -9928,11 +9929,11 @@
      # others require no space.  Words are not sufficient . . . .
      case `(uname -sr) 2>/dev/null` in
      "SunOS 5"*)
--      echo "$as_me:9379: checking whether -R must be followed by a space" >&5
-+      echo "$as_me:9382: checking whether -R must be followed by a space" >&5
+-      echo "$as_me:9931: checking whether -R must be followed by a space" >&5
++      echo "$as_me:9932: 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 9383 "configure"
-+#line 9386 "configure"
+-#line 9935 "configure"
++#line 9936 "configure"
  #include "confdefs.h"
  
  int
-@@ -9392,16 +9395,16 @@
+@@ -9944,16 +9945,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9395: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9398: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:9947: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9948: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:9398: \$? = $ac_status" >&5
-+  echo "$as_me:9401: \$? = $ac_status" >&5
+-  echo "$as_me:9950: \$? = $ac_status" >&5
++  echo "$as_me:9951: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9401: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9404: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:9953: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9954: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:9404: \$? = $ac_status" >&5
-+  echo "$as_me:9407: \$? = $ac_status" >&5
+-  echo "$as_me:9956: \$? = $ac_status" >&5
++  echo "$as_me:9957: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_R_nospace=yes
  else
-@@ -9411,13 +9414,13 @@
+@@ -9963,13 +9964,13 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
        if test $ac_R_nospace = yes; then
--	echo "$as_me:9414: result: no" >&5
-+	echo "$as_me:9417: result: no" >&5
+-	echo "$as_me:9966: result: no" >&5
++	echo "$as_me:9967: 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 9420 "configure"
-+#line 9423 "configure"
+-#line 9972 "configure"
++#line 9973 "configure"
  #include "confdefs.h"
  
  int
-@@ -9429,16 +9432,16 @@
+@@ -9981,16 +9982,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9432: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9435: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:9984: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9985: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:9435: \$? = $ac_status" >&5
-+  echo "$as_me:9438: \$? = $ac_status" >&5
+-  echo "$as_me:9987: \$? = $ac_status" >&5
++  echo "$as_me:9988: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9438: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9441: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:9990: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9991: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:9441: \$? = $ac_status" >&5
-+  echo "$as_me:9444: \$? = $ac_status" >&5
+-  echo "$as_me:9993: \$? = $ac_status" >&5
++  echo "$as_me:9994: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_R_space=yes
  else
-@@ -9448,11 +9451,11 @@
+@@ -10000,11 +10001,11 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  	if test $ac_R_space = yes; then
--	  echo "$as_me:9451: result: yes" >&5
-+	  echo "$as_me:9454: result: yes" >&5
+-	  echo "$as_me:10003: result: yes" >&5
++	  echo "$as_me:10004: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  	  X_LIBS="$X_LIBS -R $x_libraries"
  	else
--	  echo "$as_me:9455: result: neither works" >&5
-+	  echo "$as_me:9458: result: neither works" >&5
+-	  echo "$as_me:10007: result: neither works" >&5
++	  echo "$as_me:10008: result: neither works" >&5
  echo "${ECHO_T}neither works" >&6
  	fi
        fi
-@@ -9472,7 +9475,7 @@
+@@ -10024,7 +10025,7 @@
      # the Alpha needs dnet_stub (dnet does not exist).
      ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
      cat >conftest.$ac_ext <<_ACEOF
--#line 9475 "configure"
-+#line 9478 "configure"
+-#line 10027 "configure"
++#line 10028 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -9491,22 +9494,22 @@
+@@ -10043,22 +10044,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9494: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9497: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:10046: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10047: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:9497: \$? = $ac_status" >&5
-+  echo "$as_me:9500: \$? = $ac_status" >&5
+-  echo "$as_me:10049: \$? = $ac_status" >&5
++  echo "$as_me:10050: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9500: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9503: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:10052: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10053: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:9503: \$? = $ac_status" >&5
-+  echo "$as_me:9506: \$? = $ac_status" >&5
+-  echo "$as_me:10055: \$? = $ac_status" >&5
++  echo "$as_me:10056: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
--echo "$as_me:9509: checking for dnet_ntoa in -ldnet" >&5
-+echo "$as_me:9512: checking for dnet_ntoa in -ldnet" >&5
+-echo "$as_me:10061: checking for dnet_ntoa in -ldnet" >&5
++echo "$as_me:10062: 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
-@@ -9514,7 +9517,7 @@
+@@ -10066,7 +10067,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldnet  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 9517 "configure"
-+#line 9520 "configure"
+-#line 10069 "configure"
++#line 10070 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -9533,16 +9536,16 @@
+@@ -10085,16 +10086,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9536: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9539: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:10088: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10089: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:9539: \$? = $ac_status" >&5
-+  echo "$as_me:9542: \$? = $ac_status" >&5
+-  echo "$as_me:10091: \$? = $ac_status" >&5
++  echo "$as_me:10092: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9542: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9545: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:10094: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10095: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:9545: \$? = $ac_status" >&5
-+  echo "$as_me:9548: \$? = $ac_status" >&5
+-  echo "$as_me:10097: \$? = $ac_status" >&5
++  echo "$as_me:10098: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_dnet_dnet_ntoa=yes
  else
-@@ -9553,14 +9556,14 @@
+@@ -10105,14 +10106,14 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:9556: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
-+echo "$as_me:9559: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+-echo "$as_me:10108: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "$as_me:10109: 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:9563: checking for dnet_ntoa in -ldnet_stub" >&5
-+      echo "$as_me:9566: checking for dnet_ntoa in -ldnet_stub" >&5
+-      echo "$as_me:10115: checking for dnet_ntoa in -ldnet_stub" >&5
++      echo "$as_me:10116: 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
-@@ -9568,7 +9571,7 @@
+@@ -10120,7 +10121,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldnet_stub  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 9571 "configure"
-+#line 9574 "configure"
+-#line 10123 "configure"
++#line 10124 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -9587,16 +9590,16 @@
+@@ -10139,16 +10140,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9590: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9593: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:10142: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10143: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:9593: \$? = $ac_status" >&5
-+  echo "$as_me:9596: \$? = $ac_status" >&5
+-  echo "$as_me:10145: \$? = $ac_status" >&5
++  echo "$as_me:10146: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9596: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9599: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:10148: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10149: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:9599: \$? = $ac_status" >&5
-+  echo "$as_me:9602: \$? = $ac_status" >&5
+-  echo "$as_me:10151: \$? = $ac_status" >&5
++  echo "$as_me:10152: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_dnet_stub_dnet_ntoa=yes
  else
-@@ -9607,7 +9610,7 @@
+@@ -10159,7 +10160,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:9610: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
-+echo "$as_me:9613: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+-echo "$as_me:10162: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "$as_me:10163: 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"
-@@ -9626,13 +9629,13 @@
+@@ -10178,13 +10179,13 @@
      # 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:9629: checking for gethostbyname" >&5
-+    echo "$as_me:9632: checking for gethostbyname" >&5
+-    echo "$as_me:10181: checking for gethostbyname" >&5
++    echo "$as_me:10182: 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 9635 "configure"
-+#line 9638 "configure"
+-#line 10187 "configure"
++#line 10188 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char gethostbyname (); below.  */
-@@ -9663,16 +9666,16 @@
+@@ -10215,16 +10216,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9666: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9669: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:10218: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10219: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:9669: \$? = $ac_status" >&5
-+  echo "$as_me:9672: \$? = $ac_status" >&5
+-  echo "$as_me:10221: \$? = $ac_status" >&5
++  echo "$as_me:10222: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9672: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9675: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:10224: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10225: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:9675: \$? = $ac_status" >&5
-+  echo "$as_me:9678: \$? = $ac_status" >&5
+-  echo "$as_me:10227: \$? = $ac_status" >&5
++  echo "$as_me:10228: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_gethostbyname=yes
  else
-@@ -9682,11 +9685,11 @@
+@@ -10234,11 +10235,11 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:9685: result: $ac_cv_func_gethostbyname" >&5
-+echo "$as_me:9688: result: $ac_cv_func_gethostbyname" >&5
+-echo "$as_me:10237: result: $ac_cv_func_gethostbyname" >&5
++echo "$as_me:10238: 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:9689: checking for gethostbyname in -lnsl" >&5
-+      echo "$as_me:9692: checking for gethostbyname in -lnsl" >&5
+-      echo "$as_me:10241: checking for gethostbyname in -lnsl" >&5
++      echo "$as_me:10242: 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
-@@ -9694,7 +9697,7 @@
+@@ -10246,7 +10247,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lnsl  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 9697 "configure"
-+#line 9700 "configure"
+-#line 10249 "configure"
++#line 10250 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -9713,16 +9716,16 @@
+@@ -10265,16 +10266,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9716: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9719: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:10268: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10269: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:9719: \$? = $ac_status" >&5
-+  echo "$as_me:9722: \$? = $ac_status" >&5
+-  echo "$as_me:10271: \$? = $ac_status" >&5
++  echo "$as_me:10272: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9722: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9725: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:10274: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10275: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:9725: \$? = $ac_status" >&5
-+  echo "$as_me:9728: \$? = $ac_status" >&5
+-  echo "$as_me:10277: \$? = $ac_status" >&5
++  echo "$as_me:10278: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_nsl_gethostbyname=yes
  else
-@@ -9733,14 +9736,14 @@
+@@ -10285,14 +10286,14 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:9736: result: $ac_cv_lib_nsl_gethostbyname" >&5
-+echo "$as_me:9739: result: $ac_cv_lib_nsl_gethostbyname" >&5
+-echo "$as_me:10288: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "$as_me:10289: 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:9743: checking for gethostbyname in -lbsd" >&5
-+        echo "$as_me:9746: checking for gethostbyname in -lbsd" >&5
+-        echo "$as_me:10295: checking for gethostbyname in -lbsd" >&5
++        echo "$as_me:10296: 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
-@@ -9748,7 +9751,7 @@
+@@ -10300,7 +10301,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lbsd  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 9751 "configure"
-+#line 9754 "configure"
+-#line 10303 "configure"
++#line 10304 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -9767,16 +9770,16 @@
+@@ -10319,16 +10320,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9770: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9773: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:10322: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10323: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:9773: \$? = $ac_status" >&5
-+  echo "$as_me:9776: \$? = $ac_status" >&5
+-  echo "$as_me:10325: \$? = $ac_status" >&5
++  echo "$as_me:10326: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9776: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9779: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:10328: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10329: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:9779: \$? = $ac_status" >&5
-+  echo "$as_me:9782: \$? = $ac_status" >&5
+-  echo "$as_me:10331: \$? = $ac_status" >&5
++  echo "$as_me:10332: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_bsd_gethostbyname=yes
  else
-@@ -9787,7 +9790,7 @@
+@@ -10339,7 +10340,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:9790: result: $ac_cv_lib_bsd_gethostbyname" >&5
-+echo "$as_me:9793: result: $ac_cv_lib_bsd_gethostbyname" >&5
+-echo "$as_me:10342: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "$as_me:10343: 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"
-@@ -9803,13 +9806,13 @@
+@@ -10355,13 +10356,13 @@
      # 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:9806: checking for connect" >&5
-+    echo "$as_me:9809: checking for connect" >&5
+-    echo "$as_me:10358: checking for connect" >&5
++    echo "$as_me:10359: 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 9812 "configure"
-+#line 9815 "configure"
+-#line 10364 "configure"
++#line 10365 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char connect (); below.  */
-@@ -9840,16 +9843,16 @@
+@@ -10392,16 +10393,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9843: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9846: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:10395: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10396: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:9846: \$? = $ac_status" >&5
-+  echo "$as_me:9849: \$? = $ac_status" >&5
+-  echo "$as_me:10398: \$? = $ac_status" >&5
++  echo "$as_me:10399: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9849: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9852: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:10401: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10402: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:9852: \$? = $ac_status" >&5
-+  echo "$as_me:9855: \$? = $ac_status" >&5
+-  echo "$as_me:10404: \$? = $ac_status" >&5
++  echo "$as_me:10405: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_connect=yes
  else
-@@ -9859,11 +9862,11 @@
+@@ -10411,11 +10412,11 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:9862: result: $ac_cv_func_connect" >&5
-+echo "$as_me:9865: result: $ac_cv_func_connect" >&5
+-echo "$as_me:10414: result: $ac_cv_func_connect" >&5
++echo "$as_me:10415: 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:9866: checking for connect in -lsocket" >&5
-+      echo "$as_me:9869: checking for connect in -lsocket" >&5
+-      echo "$as_me:10418: checking for connect in -lsocket" >&5
++      echo "$as_me:10419: 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
-@@ -9871,7 +9874,7 @@
+@@ -10423,7 +10424,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 9874 "configure"
-+#line 9877 "configure"
+-#line 10426 "configure"
++#line 10427 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -9890,16 +9893,16 @@
+@@ -10442,16 +10443,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9893: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9896: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:10445: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10446: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:9896: \$? = $ac_status" >&5
-+  echo "$as_me:9899: \$? = $ac_status" >&5
+-  echo "$as_me:10448: \$? = $ac_status" >&5
++  echo "$as_me:10449: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9899: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9902: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:10451: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10452: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:9902: \$? = $ac_status" >&5
-+  echo "$as_me:9905: \$? = $ac_status" >&5
+-  echo "$as_me:10454: \$? = $ac_status" >&5
++  echo "$as_me:10455: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_socket_connect=yes
  else
-@@ -9910,7 +9913,7 @@
+@@ -10462,7 +10463,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:9913: result: $ac_cv_lib_socket_connect" >&5
-+echo "$as_me:9916: result: $ac_cv_lib_socket_connect" >&5
+-echo "$as_me:10465: result: $ac_cv_lib_socket_connect" >&5
++echo "$as_me:10466: 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"
-@@ -9919,13 +9922,13 @@
+@@ -10471,13 +10472,13 @@
      fi
  
      # Guillermo Gomez says -lposix is necessary on A/UX.
--    echo "$as_me:9922: checking for remove" >&5
-+    echo "$as_me:9925: checking for remove" >&5
+-    echo "$as_me:10474: checking for remove" >&5
++    echo "$as_me:10475: 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 9928 "configure"
-+#line 9931 "configure"
+-#line 10480 "configure"
++#line 10481 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char remove (); below.  */
-@@ -9956,16 +9959,16 @@
+@@ -10508,16 +10509,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9959: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9962: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:10511: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10512: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:9962: \$? = $ac_status" >&5
-+  echo "$as_me:9965: \$? = $ac_status" >&5
+-  echo "$as_me:10514: \$? = $ac_status" >&5
++  echo "$as_me:10515: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9965: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9968: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:10517: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10518: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:9968: \$? = $ac_status" >&5
-+  echo "$as_me:9971: \$? = $ac_status" >&5
+-  echo "$as_me:10520: \$? = $ac_status" >&5
++  echo "$as_me:10521: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_remove=yes
  else
-@@ -9975,11 +9978,11 @@
+@@ -10527,11 +10528,11 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:9978: result: $ac_cv_func_remove" >&5
-+echo "$as_me:9981: result: $ac_cv_func_remove" >&5
+-echo "$as_me:10530: result: $ac_cv_func_remove" >&5
++echo "$as_me:10531: 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:9982: checking for remove in -lposix" >&5
-+      echo "$as_me:9985: checking for remove in -lposix" >&5
+-      echo "$as_me:10534: checking for remove in -lposix" >&5
++      echo "$as_me:10535: 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
-@@ -9987,7 +9990,7 @@
+@@ -10539,7 +10540,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lposix  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 9990 "configure"
-+#line 9993 "configure"
+-#line 10542 "configure"
++#line 10543 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -10006,16 +10009,16 @@
+@@ -10558,16 +10559,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:10009: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10012: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:10561: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10562: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:10012: \$? = $ac_status" >&5
-+  echo "$as_me:10015: \$? = $ac_status" >&5
+-  echo "$as_me:10564: \$? = $ac_status" >&5
++  echo "$as_me:10565: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:10015: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10018: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:10567: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10568: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:10018: \$? = $ac_status" >&5
-+  echo "$as_me:10021: \$? = $ac_status" >&5
+-  echo "$as_me:10570: \$? = $ac_status" >&5
++  echo "$as_me:10571: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_posix_remove=yes
  else
-@@ -10026,7 +10029,7 @@
+@@ -10578,7 +10579,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:10029: result: $ac_cv_lib_posix_remove" >&5
-+echo "$as_me:10032: result: $ac_cv_lib_posix_remove" >&5
+-echo "$as_me:10581: result: $ac_cv_lib_posix_remove" >&5
++echo "$as_me:10582: 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"
-@@ -10035,13 +10038,13 @@
+@@ -10587,13 +10588,13 @@
      fi
  
      # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
--    echo "$as_me:10038: checking for shmat" >&5
-+    echo "$as_me:10041: checking for shmat" >&5
+-    echo "$as_me:10590: checking for shmat" >&5
++    echo "$as_me:10591: 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 10044 "configure"
-+#line 10047 "configure"
+-#line 10596 "configure"
++#line 10597 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char shmat (); below.  */
-@@ -10072,16 +10075,16 @@
+@@ -10624,16 +10625,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:10075: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10078: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:10627: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10628: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:10078: \$? = $ac_status" >&5
-+  echo "$as_me:10081: \$? = $ac_status" >&5
+-  echo "$as_me:10630: \$? = $ac_status" >&5
++  echo "$as_me:10631: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:10081: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10084: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:10633: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10634: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:10084: \$? = $ac_status" >&5
-+  echo "$as_me:10087: \$? = $ac_status" >&5
+-  echo "$as_me:10636: \$? = $ac_status" >&5
++  echo "$as_me:10637: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_shmat=yes
  else
-@@ -10091,11 +10094,11 @@
+@@ -10643,11 +10644,11 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:10094: result: $ac_cv_func_shmat" >&5
-+echo "$as_me:10097: result: $ac_cv_func_shmat" >&5
+-echo "$as_me:10646: result: $ac_cv_func_shmat" >&5
++echo "$as_me:10647: 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:10098: checking for shmat in -lipc" >&5
-+      echo "$as_me:10101: checking for shmat in -lipc" >&5
+-      echo "$as_me:10650: checking for shmat in -lipc" >&5
++      echo "$as_me:10651: 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
-@@ -10103,7 +10106,7 @@
+@@ -10655,7 +10656,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lipc  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 10106 "configure"
-+#line 10109 "configure"
+-#line 10658 "configure"
++#line 10659 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -10122,16 +10125,16 @@
+@@ -10674,16 +10675,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:10125: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10128: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:10677: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10678: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:10128: \$? = $ac_status" >&5
-+  echo "$as_me:10131: \$? = $ac_status" >&5
+-  echo "$as_me:10680: \$? = $ac_status" >&5
++  echo "$as_me:10681: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:10131: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10134: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:10683: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10684: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:10134: \$? = $ac_status" >&5
-+  echo "$as_me:10137: \$? = $ac_status" >&5
+-  echo "$as_me:10686: \$? = $ac_status" >&5
++  echo "$as_me:10687: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_ipc_shmat=yes
  else
-@@ -10142,7 +10145,7 @@
+@@ -10694,7 +10695,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:10145: result: $ac_cv_lib_ipc_shmat" >&5
-+echo "$as_me:10148: result: $ac_cv_lib_ipc_shmat" >&5
+-echo "$as_me:10697: result: $ac_cv_lib_ipc_shmat" >&5
++echo "$as_me:10698: 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"
-@@ -10160,7 +10163,7 @@
+@@ -10712,7 +10713,7 @@
    # 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:10163: checking for IceConnectionNumber in -lICE" >&5
-+  echo "$as_me:10166: checking for IceConnectionNumber in -lICE" >&5
+-  echo "$as_me:10715: checking for IceConnectionNumber in -lICE" >&5
++  echo "$as_me:10716: 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
-@@ -10168,7 +10171,7 @@
+@@ -10720,7 +10721,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lICE $X_EXTRA_LIBS $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 10171 "configure"
-+#line 10174 "configure"
+-#line 10723 "configure"
++#line 10724 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -10187,16 +10190,16 @@
+@@ -10739,16 +10740,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:10190: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10193: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:10742: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10743: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:10193: \$? = $ac_status" >&5
-+  echo "$as_me:10196: \$? = $ac_status" >&5
+-  echo "$as_me:10745: \$? = $ac_status" >&5
++  echo "$as_me:10746: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:10196: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10199: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:10748: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10749: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:10199: \$? = $ac_status" >&5
-+  echo "$as_me:10202: \$? = $ac_status" >&5
+-  echo "$as_me:10751: \$? = $ac_status" >&5
++  echo "$as_me:10752: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_ICE_IceConnectionNumber=yes
  else
-@@ -10207,7 +10210,7 @@
+@@ -10759,7 +10760,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:10210: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
-+echo "$as_me:10213: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+-echo "$as_me:10762: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "$as_me:10763: 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"
-@@ -10219,7 +10222,7 @@
+@@ -10771,7 +10772,7 @@
  
  cf_x_athena=${cf_x_athena:-Xaw}
  
--echo "$as_me:10222: checking if you want to link with Xaw 3d library" >&5
-+echo "$as_me:10225: checking if you want to link with Xaw 3d library" >&5
+-echo "$as_me:10774: checking if you want to link with Xaw 3d library" >&5
++echo "$as_me:10775: 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=
  
-@@ -10230,14 +10233,14 @@
+@@ -10782,14 +10783,14 @@
  fi;
  if test "$withval" = yes ; then
  	cf_x_athena=Xaw3d
--	echo "$as_me:10233: result: yes" >&5
-+	echo "$as_me:10236: result: yes" >&5
+-	echo "$as_me:10785: result: yes" >&5
++	echo "$as_me:10786: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  else
--	echo "$as_me:10236: result: no" >&5
-+	echo "$as_me:10239: result: no" >&5
+-	echo "$as_me:10788: result: no" >&5
++	echo "$as_me:10789: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
--echo "$as_me:10240: checking if you want to link with Xaw 3d xft library" >&5
-+echo "$as_me:10243: checking if you want to link with Xaw 3d xft library" >&5
+-echo "$as_me:10792: checking if you want to link with Xaw 3d xft library" >&5
++echo "$as_me:10793: 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=
  
-@@ -10248,14 +10251,14 @@
+@@ -10800,14 +10801,14 @@
  fi;
  if test "$withval" = yes ; then
  	cf_x_athena=Xaw3dxft
--	echo "$as_me:10251: result: yes" >&5
-+	echo "$as_me:10254: result: yes" >&5
+-	echo "$as_me:10803: result: yes" >&5
++	echo "$as_me:10804: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  else
--	echo "$as_me:10254: result: no" >&5
-+	echo "$as_me:10257: result: no" >&5
+-	echo "$as_me:10806: result: no" >&5
++	echo "$as_me:10807: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
--echo "$as_me:10258: checking if you want to link with neXT Athena library" >&5
-+echo "$as_me:10261: checking if you want to link with neXT Athena library" >&5
+-echo "$as_me:10810: checking if you want to link with neXT Athena library" >&5
++echo "$as_me:10811: 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=
  
-@@ -10266,14 +10269,14 @@
+@@ -10818,14 +10819,14 @@
  fi;
  if test "$withval" = yes ; then
  	cf_x_athena=neXtaw
--	echo "$as_me:10269: result: yes" >&5
-+	echo "$as_me:10272: result: yes" >&5
+-	echo "$as_me:10821: result: yes" >&5
++	echo "$as_me:10822: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  else
--	echo "$as_me:10272: result: no" >&5
-+	echo "$as_me:10275: result: no" >&5
+-	echo "$as_me:10824: result: no" >&5
++	echo "$as_me:10825: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
--echo "$as_me:10276: checking if you want to link with Athena-Plus library" >&5
-+echo "$as_me:10279: checking if you want to link with Athena-Plus library" >&5
+-echo "$as_me:10828: checking if you want to link with Athena-Plus library" >&5
++echo "$as_me:10829: 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=
  
-@@ -10284,10 +10287,10 @@
+@@ -10836,10 +10837,10 @@
  fi;
  if test "$withval" = yes ; then
  	cf_x_athena=XawPlus
--	echo "$as_me:10287: result: yes" >&5
-+	echo "$as_me:10290: result: yes" >&5
+-	echo "$as_me:10839: result: yes" >&5
++	echo "$as_me:10840: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  else
--	echo "$as_me:10290: result: no" >&5
-+	echo "$as_me:10293: result: no" >&5
+-	echo "$as_me:10842: result: no" >&5
++	echo "$as_me:10843: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -10307,17 +10310,17 @@
+@@ -10859,17 +10860,17 @@
  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}:10310: testing found package $cf_athena_pkg ..." 1>&5
-+echo "${as_me:-configure}:10313: testing found package $cf_athena_pkg ..." 1>&5
+-echo "${as_me:-configure}:10862: testing found package $cf_athena_pkg ..." 1>&5
++echo "${as_me:-configure}:10863: 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}:10316: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
-+echo "${as_me:-configure}:10319: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+-echo "${as_me:-configure}:10868: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:10869: 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}:10320: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
-+echo "${as_me:-configure}:10323: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+-echo "${as_me:-configure}:10872: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:10873: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
  
  cf_fix_cppflags=no
  cf_new_cflags=
-@@ -10428,20 +10431,20 @@
+@@ -10980,20 +10981,20 @@
  			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}:10431: testing ..trimmed $LIBS ..." 1>&5
-+echo "${as_me:-configure}:10434: testing ..trimmed $LIBS ..." 1>&5
+-echo "${as_me:-configure}:10983: testing ..trimmed $LIBS ..." 1>&5
++echo "${as_me:-configure}:10984: testing ..trimmed $LIBS ..." 1>&5
  
  			;;
  		esac
  	done
  
--echo "$as_me:10437: checking for usable $cf_x_athena/Xmu package" >&5
-+echo "$as_me:10440: checking for usable $cf_x_athena/Xmu package" >&5
+-echo "$as_me:10989: checking for usable $cf_x_athena/Xmu package" >&5
++echo "$as_me:10990: 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 10444 "configure"
-+#line 10447 "configure"
+-#line 10996 "configure"
++#line 10997 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -10457,16 +10460,16 @@
+@@ -11009,16 +11010,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:10460: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10463: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:11012: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11013: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:10463: \$? = $ac_status" >&5
-+  echo "$as_me:10466: \$? = $ac_status" >&5
+-  echo "$as_me:11015: \$? = $ac_status" >&5
++  echo "$as_me:11016: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:10466: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10469: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:11018: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11019: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:10469: \$? = $ac_status" >&5
-+  echo "$as_me:10472: \$? = $ac_status" >&5
+-  echo "$as_me:11021: \$? = $ac_status" >&5
++  echo "$as_me:11022: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_xaw_compat=yes
  else
-@@ -10476,7 +10479,7 @@
+@@ -11028,7 +11029,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:10479: result: $cf_cv_xaw_compat" >&5
-+echo "$as_me:10482: result: $cf_cv_xaw_compat" >&5
+-echo "$as_me:11031: result: $cf_cv_xaw_compat" >&5
++echo "$as_me:11032: result: $cf_cv_xaw_compat" >&5
  echo "${ECHO_T}$cf_cv_xaw_compat" >&6
  
  			if test "$cf_cv_xaw_compat" = no
-@@ -10488,7 +10491,7 @@
+@@ -11040,7 +11041,7 @@
  				(*)
  					test -n "$verbose" && echo "	work around broken package" 1>&6
  
--echo "${as_me:-configure}:10491: testing work around broken package ..." 1>&5
-+echo "${as_me:-configure}:10494: testing work around broken package ..." 1>&5
+-echo "${as_me:-configure}:11043: testing work around broken package ..." 1>&5
++echo "${as_me:-configure}:11044: testing work around broken package ..." 1>&5
  
  					cf_save_xmu="$LIBS"
  					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
-@@ -10496,17 +10499,17 @@
+@@ -11048,17 +11049,17 @@
  if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xmu; then
  	test -n "$verbose" && echo "	found package xmu" 1>&6
  
--echo "${as_me:-configure}:10499: testing found package xmu ..." 1>&5
-+echo "${as_me:-configure}:10502: testing found package xmu ..." 1>&5
+-echo "${as_me:-configure}:11051: testing found package xmu ..." 1>&5
++echo "${as_me:-configure}:11052: 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}:10505: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
-+echo "${as_me:-configure}:10508: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+-echo "${as_me:-configure}:11057: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:11058: 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}:10509: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
-+echo "${as_me:-configure}:10512: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+-echo "${as_me:-configure}:11061: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:11062: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
  
  cf_fix_cppflags=no
  cf_new_cflags=
-@@ -10606,12 +10609,12 @@
+@@ -11158,12 +11159,12 @@
  
  test -n "$verbose" && echo "	...before $LIBS" 1>&6
  
--echo "${as_me:-configure}:10609: testing ...before $LIBS ..." 1>&5
-+echo "${as_me:-configure}:10612: testing ...before $LIBS ..." 1>&5
+-echo "${as_me:-configure}:11161: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:11162: 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}:10614: testing ...after  $LIBS ..." 1>&5
-+echo "${as_me:-configure}:10617: testing ...after  $LIBS ..." 1>&5
+-echo "${as_me:-configure}:11166: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:11167: testing ...after  $LIBS ..." 1>&5
  
  else
  	cf_pkgconfig_incs=
-@@ -10619,12 +10622,12 @@
+@@ -11171,12 +11172,12 @@
  
  test -n "$verbose" && echo "	...before $LIBS" 1>&6
  
--echo "${as_me:-configure}:10622: testing ...before $LIBS ..." 1>&5
-+echo "${as_me:-configure}:10625: testing ...before $LIBS ..." 1>&5
+-echo "${as_me:-configure}:11174: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:11175: 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}:10627: testing ...after  $LIBS ..." 1>&5
-+echo "${as_me:-configure}:10630: testing ...after  $LIBS ..." 1>&5
+-echo "${as_me:-configure}:11179: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:11180: testing ...after  $LIBS ..." 1>&5
  
  fi
  
-@@ -10635,7 +10638,7 @@
+@@ -11187,7 +11188,7 @@
  			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}:10638: testing ..trimmed $LIBS ..." 1>&5
-+echo "${as_me:-configure}:10641: testing ..trimmed $LIBS ..." 1>&5
+-echo "${as_me:-configure}:11190: testing ..trimmed $LIBS ..." 1>&5
++echo "${as_me:-configure}:11191: testing ..trimmed $LIBS ..." 1>&5
  
  			;;
  		esac
-@@ -10660,17 +10663,17 @@
+@@ -11212,17 +11213,17 @@
  if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then
  	test -n "$verbose" && echo "	found package Xext" 1>&6
  
--echo "${as_me:-configure}:10663: testing found package Xext ..." 1>&5
-+echo "${as_me:-configure}:10666: testing found package Xext ..." 1>&5
+-echo "${as_me:-configure}:11215: testing found package Xext ..." 1>&5
++echo "${as_me:-configure}:11216: 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}:10669: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
-+echo "${as_me:-configure}:10672: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+-echo "${as_me:-configure}:11221: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:11222: 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}:10673: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
-+echo "${as_me:-configure}:10676: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+-echo "${as_me:-configure}:11225: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:11226: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
  
  cf_fix_cppflags=no
  cf_new_cflags=
-@@ -10771,7 +10774,7 @@
+@@ -11323,7 +11324,7 @@
  	cf_pkgconfig_incs=
  	cf_pkgconfig_libs=
  
--	echo "$as_me:10774: checking for XextCreateExtension in -lXext" >&5
-+	echo "$as_me:10777: checking for XextCreateExtension in -lXext" >&5
+-	echo "$as_me:11326: checking for XextCreateExtension in -lXext" >&5
++	echo "$as_me:11327: 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
-@@ -10779,7 +10782,7 @@
+@@ -11331,7 +11332,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lXext  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 10782 "configure"
-+#line 10785 "configure"
+-#line 11334 "configure"
++#line 11335 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -10798,16 +10801,16 @@
+@@ -11350,16 +11351,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:10801: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10804: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:11353: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11354: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:10804: \$? = $ac_status" >&5
-+  echo "$as_me:10807: \$? = $ac_status" >&5
+-  echo "$as_me:11356: \$? = $ac_status" >&5
++  echo "$as_me:11357: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:10807: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10810: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:11359: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11360: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:10810: \$? = $ac_status" >&5
-+  echo "$as_me:10813: \$? = $ac_status" >&5
+-  echo "$as_me:11362: \$? = $ac_status" >&5
++  echo "$as_me:11363: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_Xext_XextCreateExtension=yes
  else
-@@ -10818,7 +10821,7 @@
+@@ -11370,7 +11371,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:10821: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
-+echo "$as_me:10824: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+-echo "$as_me:11373: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
++echo "$as_me:11374: 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
  
-@@ -10854,17 +10857,17 @@
+@@ -11406,17 +11407,17 @@
  if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
  	test -n "$verbose" && echo "	found package x11" 1>&6
  
--echo "${as_me:-configure}:10857: testing found package x11 ..." 1>&5
-+echo "${as_me:-configure}:10860: testing found package x11 ..." 1>&5
+-echo "${as_me:-configure}:11409: testing found package x11 ..." 1>&5
++echo "${as_me:-configure}:11410: 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}:10863: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
-+echo "${as_me:-configure}:10866: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+-echo "${as_me:-configure}:11415: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:11416: 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}:10867: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
-+echo "${as_me:-configure}:10870: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+-echo "${as_me:-configure}:11419: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:11420: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
  
  cf_fix_cppflags=no
  cf_new_cflags=
-@@ -10964,24 +10967,24 @@
+@@ -11516,24 +11517,24 @@
  else
  	cf_pkgconfig_incs=
  	cf_pkgconfig_libs=
--	{ echo "$as_me:10967: WARNING: unable to find X11 library" >&5
-+	{ echo "$as_me:10970: WARNING: unable to find X11 library" >&5
+-	{ echo "$as_me:11519: WARNING: unable to find X11 library" >&5
++	{ echo "$as_me:11520: 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}:10974: testing found package ice ..." 1>&5
-+echo "${as_me:-configure}:10977: testing found package ice ..." 1>&5
+-echo "${as_me:-configure}:11526: testing found package ice ..." 1>&5
++echo "${as_me:-configure}:11527: 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}:10980: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
-+echo "${as_me:-configure}:10983: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+-echo "${as_me:-configure}:11532: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:11533: 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}:10984: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
-+echo "${as_me:-configure}:10987: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+-echo "${as_me:-configure}:11536: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:11537: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
  
  cf_fix_cppflags=no
  cf_new_cflags=
-@@ -11081,24 +11084,24 @@
+@@ -11633,24 +11634,24 @@
  else
  	cf_pkgconfig_incs=
  	cf_pkgconfig_libs=
--	{ echo "$as_me:11084: WARNING: unable to find ICE library" >&5
-+	{ echo "$as_me:11087: WARNING: unable to find ICE library" >&5
+-	{ echo "$as_me:11636: WARNING: unable to find ICE library" >&5
++	{ echo "$as_me:11637: 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}:11091: testing found package sm ..." 1>&5
-+echo "${as_me:-configure}:11094: testing found package sm ..." 1>&5
+-echo "${as_me:-configure}:11643: testing found package sm ..." 1>&5
++echo "${as_me:-configure}:11644: 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}:11097: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
-+echo "${as_me:-configure}:11100: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+-echo "${as_me:-configure}:11649: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:11650: 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}:11101: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
-+echo "${as_me:-configure}:11104: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+-echo "${as_me:-configure}:11653: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:11654: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
  
  cf_fix_cppflags=no
  cf_new_cflags=
-@@ -11198,24 +11201,24 @@
+@@ -11750,24 +11751,24 @@
  else
  	cf_pkgconfig_incs=
  	cf_pkgconfig_libs=
--	{ echo "$as_me:11201: WARNING: unable to find SM library" >&5
-+	{ echo "$as_me:11204: WARNING: unable to find SM library" >&5
+-	{ echo "$as_me:11753: WARNING: unable to find SM library" >&5
++	{ echo "$as_me:11754: 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}:11208: testing found package xt ..." 1>&5
-+echo "${as_me:-configure}:11211: testing found package xt ..." 1>&5
+-echo "${as_me:-configure}:11760: testing found package xt ..." 1>&5
++echo "${as_me:-configure}:11761: 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}:11214: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
-+echo "${as_me:-configure}:11217: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+-echo "${as_me:-configure}:11766: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:11767: 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}:11218: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
-+echo "${as_me:-configure}:11221: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+-echo "${as_me:-configure}:11770: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:11771: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
  
  cf_fix_cppflags=no
  cf_new_cflags=
-@@ -11315,7 +11318,7 @@
+@@ -11867,7 +11868,7 @@
  else
  	cf_pkgconfig_incs=
  	cf_pkgconfig_libs=
--	{ echo "$as_me:11318: WARNING: unable to find Xt library" >&5
-+	{ echo "$as_me:11321: WARNING: unable to find Xt library" >&5
+-	{ echo "$as_me:11870: WARNING: unable to find Xt library" >&5
++	{ echo "$as_me:11871: WARNING: unable to find Xt library" >&5
  echo "$as_me: WARNING: unable to find Xt library" >&2;}
  fi
  
-@@ -11326,17 +11329,17 @@
+@@ -11878,17 +11879,17 @@
  if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
  	test -n "$verbose" && echo "	found package xt" 1>&6
  
--echo "${as_me:-configure}:11329: testing found package xt ..." 1>&5
-+echo "${as_me:-configure}:11332: testing found package xt ..." 1>&5
+-echo "${as_me:-configure}:11881: testing found package xt ..." 1>&5
++echo "${as_me:-configure}:11882: 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}:11335: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
-+echo "${as_me:-configure}:11338: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+-echo "${as_me:-configure}:11887: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:11888: 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}:11339: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
-+echo "${as_me:-configure}:11342: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+-echo "${as_me:-configure}:11891: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:11892: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
  
  cf_fix_cppflags=no
  cf_new_cflags=
-@@ -11437,14 +11440,14 @@
+@@ -11989,14 +11990,14 @@
  		;;
  	(*)
  # we have an "xt" package, but it may omit Xt's dependency on X11
--echo "$as_me:11440: checking for usable X dependency" >&5
-+echo "$as_me:11443: checking for usable X dependency" >&5
+-echo "$as_me:11992: checking for usable X dependency" >&5
++echo "$as_me:11993: 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 11447 "configure"
-+#line 11450 "configure"
+-#line 11999 "configure"
++#line 12000 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -11463,16 +11466,16 @@
+@@ -12015,16 +12016,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11466: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11469: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:12018: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12019: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:11469: \$? = $ac_status" >&5
-+  echo "$as_me:11472: \$? = $ac_status" >&5
+-  echo "$as_me:12021: \$? = $ac_status" >&5
++  echo "$as_me:12022: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11472: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11475: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:12024: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12025: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:11475: \$? = $ac_status" >&5
-+  echo "$as_me:11478: \$? = $ac_status" >&5
+-  echo "$as_me:12027: \$? = $ac_status" >&5
++  echo "$as_me:12028: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_xt_x11_compat=yes
  else
-@@ -11482,30 +11485,30 @@
+@@ -12034,30 +12035,30 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:11485: result: $cf_cv_xt_x11_compat" >&5
-+echo "$as_me:11488: result: $cf_cv_xt_x11_compat" >&5
+-echo "$as_me:12037: result: $cf_cv_xt_x11_compat" >&5
++echo "$as_me:12038: 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}:11491: testing work around broken X11 dependency ..." 1>&5
-+echo "${as_me:-configure}:11494: testing work around broken X11 dependency ..." 1>&5
+-echo "${as_me:-configure}:12043: testing work around broken X11 dependency ..." 1>&5
++echo "${as_me:-configure}:12044: 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}:11498: testing found package x11 ..." 1>&5
-+echo "${as_me:-configure}:11501: testing found package x11 ..." 1>&5
+-echo "${as_me:-configure}:12050: testing found package x11 ..." 1>&5
++echo "${as_me:-configure}:12051: 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}:11504: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
-+echo "${as_me:-configure}:11507: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+-echo "${as_me:-configure}:12056: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:12057: 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}:11508: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
-+echo "${as_me:-configure}:11511: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+-echo "${as_me:-configure}:12060: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:12061: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
  
  cf_fix_cppflags=no
  cf_new_cflags=
-@@ -11608,12 +11611,12 @@
+@@ -12160,12 +12161,12 @@
  
  test -n "$verbose" && echo "	...before $LIBS" 1>&6
  
--echo "${as_me:-configure}:11611: testing ...before $LIBS ..." 1>&5
-+echo "${as_me:-configure}:11614: testing ...before $LIBS ..." 1>&5
+-echo "${as_me:-configure}:12163: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:12164: 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}:11616: testing ...after  $LIBS ..." 1>&5
-+echo "${as_me:-configure}:11619: testing ...after  $LIBS ..." 1>&5
+-echo "${as_me:-configure}:12168: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:12169: testing ...after  $LIBS ..." 1>&5
  
  fi
  
-@@ -11621,14 +11624,14 @@
+@@ -12173,14 +12174,14 @@
  		;;
  	esac
  
--echo "$as_me:11624: checking for usable X Toolkit package" >&5
-+echo "$as_me:11627: checking for usable X Toolkit package" >&5
+-echo "$as_me:12176: checking for usable X Toolkit package" >&5
++echo "$as_me:12177: 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 11631 "configure"
-+#line 11634 "configure"
+-#line 12183 "configure"
++#line 12184 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -11643,16 +11646,16 @@
+@@ -12195,16 +12196,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11646: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11649: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:12198: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12199: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:11649: \$? = $ac_status" >&5
-+  echo "$as_me:11652: \$? = $ac_status" >&5
+-  echo "$as_me:12201: \$? = $ac_status" >&5
++  echo "$as_me:12202: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11652: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11655: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:12204: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12205: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:11655: \$? = $ac_status" >&5
-+  echo "$as_me:11658: \$? = $ac_status" >&5
+-  echo "$as_me:12207: \$? = $ac_status" >&5
++  echo "$as_me:12208: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_xt_ice_compat=yes
  else
-@@ -11662,7 +11665,7 @@
+@@ -12214,7 +12215,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:11665: result: $cf_cv_xt_ice_compat" >&5
-+echo "$as_me:11668: result: $cf_cv_xt_ice_compat" >&5
+-echo "$as_me:12217: result: $cf_cv_xt_ice_compat" >&5
++echo "$as_me:12218: result: $cf_cv_xt_ice_compat" >&5
  echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
  
  	if test "$cf_cv_xt_ice_compat" = no
-@@ -11676,22 +11679,22 @@
+@@ -12228,22 +12229,22 @@
  			(*)
  				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
  
--echo "${as_me:-configure}:11679: testing work around broken ICE dependency ..." 1>&5
-+echo "${as_me:-configure}:11682: testing work around broken ICE dependency ..." 1>&5
+-echo "${as_me:-configure}:12231: testing work around broken ICE dependency ..." 1>&5
++echo "${as_me:-configure}:12232: 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}:11684: testing found package ice ..." 1>&5
-+echo "${as_me:-configure}:11687: testing found package ice ..." 1>&5
+-echo "${as_me:-configure}:12236: testing found package ice ..." 1>&5
++echo "${as_me:-configure}:12237: 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}:11690: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
-+echo "${as_me:-configure}:11693: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+-echo "${as_me:-configure}:12242: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:12243: 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}:11694: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
-+echo "${as_me:-configure}:11697: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+-echo "${as_me:-configure}:12246: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:12247: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
  
  cf_fix_cppflags=no
  cf_new_cflags=
-@@ -11790,17 +11793,17 @@
+@@ -12342,17 +12343,17 @@
  if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
  	test -n "$verbose" && echo "	found package sm" 1>&6
  
--echo "${as_me:-configure}:11793: testing found package sm ..." 1>&5
-+echo "${as_me:-configure}:11796: testing found package sm ..." 1>&5
+-echo "${as_me:-configure}:12345: testing found package sm ..." 1>&5
++echo "${as_me:-configure}:12346: 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}:11799: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
-+echo "${as_me:-configure}:11802: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+-echo "${as_me:-configure}:12351: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:12352: 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}:11803: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
-+echo "${as_me:-configure}:11806: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+-echo "${as_me:-configure}:12355: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:12356: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
  
  cf_fix_cppflags=no
  cf_new_cflags=
-@@ -11909,12 +11912,12 @@
+@@ -12461,12 +12462,12 @@
  
  test -n "$verbose" && echo "	...before $LIBS" 1>&6
  
--echo "${as_me:-configure}:11912: testing ...before $LIBS ..." 1>&5
-+echo "${as_me:-configure}:11915: testing ...before $LIBS ..." 1>&5
+-echo "${as_me:-configure}:12464: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:12465: 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}:11917: testing ...after  $LIBS ..." 1>&5
-+echo "${as_me:-configure}:11920: testing ...after  $LIBS ..." 1>&5
+-echo "${as_me:-configure}:12469: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:12470: testing ...after  $LIBS ..." 1>&5
  
  fi
  
-@@ -11934,7 +11937,7 @@
+@@ -12486,7 +12487,7 @@
  
  test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
  
--echo "${as_me:-configure}:11937: testing checking additions to CFLAGS ..." 1>&5
-+echo "${as_me:-configure}:11940: testing checking additions to CFLAGS ..." 1>&5
+-echo "${as_me:-configure}:12489: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:12490: testing checking additions to CFLAGS ..." 1>&5
  
  cf_check_cflags="$CFLAGS"
  cf_check_cppflags="$CPPFLAGS"
-@@ -12005,7 +12008,7 @@
+@@ -12557,7 +12558,7 @@
  if test -n "$cf_new_cflags" ; then
  	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
  
--echo "${as_me:-configure}:12008: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
-+echo "${as_me:-configure}:12011: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+-echo "${as_me:-configure}:12560: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:12561: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
  
  	CFLAGS="$CFLAGS $cf_new_cflags"
  fi
-@@ -12013,7 +12016,7 @@
+@@ -12565,7 +12566,7 @@
  if test -n "$cf_new_cppflags" ; then
  	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
  
--echo "${as_me:-configure}:12016: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
-+echo "${as_me:-configure}:12019: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+-echo "${as_me:-configure}:12568: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:12569: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
  
  	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
  fi
-@@ -12021,14 +12024,14 @@
+@@ -12573,14 +12574,14 @@
  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}:12024: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
-+echo "${as_me:-configure}:12027: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+-echo "${as_me:-configure}:12576: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:12577: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
  
  	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
  fi
  
  if test "x$cf_check_cflags" != "x$CFLAGS" ; then
  cat >conftest.$ac_ext <<_ACEOF
--#line 12031 "configure"
-+#line 12034 "configure"
+-#line 12583 "configure"
++#line 12584 "configure"
  #include "confdefs.h"
  #include 
  int
-@@ -12040,16 +12043,16 @@
+@@ -12592,16 +12593,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12043: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12046: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:12595: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12596: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:12046: \$? = $ac_status" >&5
-+  echo "$as_me:12049: \$? = $ac_status" >&5
+-  echo "$as_me:12598: \$? = $ac_status" >&5
++  echo "$as_me:12599: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12049: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12052: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:12601: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12602: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:12052: \$? = $ac_status" >&5
-+  echo "$as_me:12055: \$? = $ac_status" >&5
+-  echo "$as_me:12604: \$? = $ac_status" >&5
++  echo "$as_me:12605: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -12057,12 +12060,12 @@
+@@ -12609,12 +12610,12 @@
  cat conftest.$ac_ext >&5
  test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
  
--echo "${as_me:-configure}:12060: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
-+echo "${as_me:-configure}:12063: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+-echo "${as_me:-configure}:12612: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:12613: 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}:12065: testing but keeping change to \$CPPFLAGS ..." 1>&5
-+echo "${as_me:-configure}:12068: testing but keeping change to \$CPPFLAGS ..." 1>&5
+-echo "${as_me:-configure}:12617: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:12618: testing but keeping change to \$CPPFLAGS ..." 1>&5
  
  	 fi
  	 CFLAGS="$cf_check_flags"
-@@ -12070,13 +12073,13 @@
+@@ -12622,13 +12623,13 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
  
--	echo "$as_me:12073: checking for XOpenDisplay" >&5
-+	echo "$as_me:12076: checking for XOpenDisplay" >&5
+-	echo "$as_me:12625: checking for XOpenDisplay" >&5
++	echo "$as_me:12626: 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 12079 "configure"
-+#line 12082 "configure"
+-#line 12631 "configure"
++#line 12632 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char XOpenDisplay (); below.  */
-@@ -12107,16 +12110,16 @@
+@@ -12659,16 +12660,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12110: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12113: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:12662: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12663: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:12113: \$? = $ac_status" >&5
-+  echo "$as_me:12116: \$? = $ac_status" >&5
+-  echo "$as_me:12665: \$? = $ac_status" >&5
++  echo "$as_me:12666: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12116: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12119: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:12668: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12669: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:12119: \$? = $ac_status" >&5
-+  echo "$as_me:12122: \$? = $ac_status" >&5
+-  echo "$as_me:12671: \$? = $ac_status" >&5
++  echo "$as_me:12672: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_XOpenDisplay=yes
  else
-@@ -12126,13 +12129,13 @@
+@@ -12678,13 +12679,13 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:12129: result: $ac_cv_func_XOpenDisplay" >&5
-+echo "$as_me:12132: result: $ac_cv_func_XOpenDisplay" >&5
+-echo "$as_me:12681: result: $ac_cv_func_XOpenDisplay" >&5
++echo "$as_me:12682: 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:12135: checking for XOpenDisplay in -lX11" >&5
-+	echo "$as_me:12138: checking for XOpenDisplay in -lX11" >&5
+-	echo "$as_me:12687: checking for XOpenDisplay in -lX11" >&5
++	echo "$as_me:12688: 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
-@@ -12140,7 +12143,7 @@
+@@ -12692,7 +12693,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 12143 "configure"
-+#line 12146 "configure"
+-#line 12695 "configure"
++#line 12696 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -12159,16 +12162,16 @@
+@@ -12711,16 +12712,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12162: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12165: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:12714: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12715: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:12165: \$? = $ac_status" >&5
-+  echo "$as_me:12168: \$? = $ac_status" >&5
+-  echo "$as_me:12717: \$? = $ac_status" >&5
++  echo "$as_me:12718: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12168: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12171: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:12720: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12721: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:12171: \$? = $ac_status" >&5
-+  echo "$as_me:12174: \$? = $ac_status" >&5
+-  echo "$as_me:12723: \$? = $ac_status" >&5
++  echo "$as_me:12724: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_X11_XOpenDisplay=yes
  else
-@@ -12179,7 +12182,7 @@
+@@ -12731,7 +12732,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:12182: result: $ac_cv_lib_X11_XOpenDisplay" >&5
-+echo "$as_me:12185: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+-echo "$as_me:12734: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:12735: 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
  
-@@ -12203,13 +12206,13 @@
+@@ -12755,13 +12756,13 @@
  
  fi
  
--	echo "$as_me:12206: checking for XtAppInitialize" >&5
-+	echo "$as_me:12209: checking for XtAppInitialize" >&5
+-	echo "$as_me:12758: checking for XtAppInitialize" >&5
++	echo "$as_me:12759: 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 12212 "configure"
-+#line 12215 "configure"
+-#line 12764 "configure"
++#line 12765 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char XtAppInitialize (); below.  */
-@@ -12240,16 +12243,16 @@
+@@ -12792,16 +12793,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12243: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12246: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:12795: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12796: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:12246: \$? = $ac_status" >&5
-+  echo "$as_me:12249: \$? = $ac_status" >&5
+-  echo "$as_me:12798: \$? = $ac_status" >&5
++  echo "$as_me:12799: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12249: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12252: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:12801: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12802: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:12252: \$? = $ac_status" >&5
-+  echo "$as_me:12255: \$? = $ac_status" >&5
+-  echo "$as_me:12804: \$? = $ac_status" >&5
++  echo "$as_me:12805: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_XtAppInitialize=yes
  else
-@@ -12259,13 +12262,13 @@
+@@ -12811,13 +12812,13 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:12262: result: $ac_cv_func_XtAppInitialize" >&5
-+echo "$as_me:12265: result: $ac_cv_func_XtAppInitialize" >&5
+-echo "$as_me:12814: result: $ac_cv_func_XtAppInitialize" >&5
++echo "$as_me:12815: 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:12268: checking for XtAppInitialize in -lXt" >&5
-+	echo "$as_me:12271: checking for XtAppInitialize in -lXt" >&5
+-	echo "$as_me:12820: checking for XtAppInitialize in -lXt" >&5
++	echo "$as_me:12821: 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
-@@ -12273,7 +12276,7 @@
+@@ -12825,7 +12826,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 12276 "configure"
-+#line 12279 "configure"
+-#line 12828 "configure"
++#line 12829 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -12292,16 +12295,16 @@
+@@ -12844,16 +12845,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12295: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12298: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:12847: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12848: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:12298: \$? = $ac_status" >&5
-+  echo "$as_me:12301: \$? = $ac_status" >&5
+-  echo "$as_me:12850: \$? = $ac_status" >&5
++  echo "$as_me:12851: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12301: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12304: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:12853: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12854: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:12304: \$? = $ac_status" >&5
-+  echo "$as_me:12307: \$? = $ac_status" >&5
+-  echo "$as_me:12856: \$? = $ac_status" >&5
++  echo "$as_me:12857: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_Xt_XtAppInitialize=yes
  else
-@@ -12312,7 +12315,7 @@
+@@ -12864,7 +12865,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:12315: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
-+echo "$as_me:12318: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+-echo "$as_me:12867: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
++echo "$as_me:12868: 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
  
-@@ -12329,7 +12332,7 @@
+@@ -12881,7 +12882,7 @@
  fi
  
  if test $cf_have_X_LIBS = no ; then
--	{ echo "$as_me:12332: WARNING: Unable to successfully link X Toolkit library (-lXt) with
-+	{ echo "$as_me:12335: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+-	{ echo "$as_me:12884: WARNING: Unable to successfully link X Toolkit library (-lXt) with
++	{ echo "$as_me:12885: 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
-@@ -12351,14 +12354,14 @@
+@@ -12903,14 +12904,14 @@
  		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:12354: checking for $cf_test in $cf_path" >&5
-+			echo "$as_me:12357: checking for $cf_test in $cf_path" >&5
+-			echo "$as_me:12906: checking for $cf_test in $cf_path" >&5
++			echo "$as_me:12907: 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:12357: checking for $cf_test" >&5
-+			echo "$as_me:12360: checking for $cf_test" >&5
+-			echo "$as_me:12909: checking for $cf_test" >&5
++			echo "$as_me:12910: checking for $cf_test" >&5
  echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
  		fi
  		cat >conftest.$ac_ext <<_ACEOF
--#line 12361 "configure"
-+#line 12364 "configure"
+-#line 12913 "configure"
++#line 12914 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -12372,16 +12375,16 @@
+@@ -12924,16 +12925,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12375: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12378: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:12927: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12928: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:12378: \$? = $ac_status" >&5
-+  echo "$as_me:12381: \$? = $ac_status" >&5
+-  echo "$as_me:12930: \$? = $ac_status" >&5
++  echo "$as_me:12931: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12381: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12384: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:12933: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12934: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:12384: \$? = $ac_status" >&5
-+  echo "$as_me:12387: \$? = $ac_status" >&5
+-  echo "$as_me:12936: \$? = $ac_status" >&5
++  echo "$as_me:12937: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -12390,7 +12393,7 @@
+@@ -12942,7 +12943,7 @@
  cf_result=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
--		echo "$as_me:12393: result: $cf_result" >&5
-+		echo "$as_me:12396: result: $cf_result" >&5
+-		echo "$as_me:12945: result: $cf_result" >&5
++		echo "$as_me:12946: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
  		if test "$cf_result" = yes ; then
  			cf_x_athena_inc=$cf_path
-@@ -12402,7 +12405,7 @@
+@@ -12954,7 +12955,7 @@
  done
  
  if test -z "$cf_x_athena_inc" ; then
--	{ echo "$as_me:12405: WARNING: Unable to successfully find Athena header files with test program" >&5
-+	{ echo "$as_me:12408: WARNING: Unable to successfully find Athena header files with test program" >&5
+-	{ echo "$as_me:12957: WARNING: Unable to successfully find Athena header files with test program" >&5
++	{ echo "$as_me:12958: 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"
-@@ -12448,7 +12451,7 @@
+@@ -13000,7 +13001,7 @@
  done
  LIBS="$cf_add_libs"
  
--				echo "$as_me:12451: checking for $cf_libs in $cf_path" >&5
-+				echo "$as_me:12454: checking for $cf_libs in $cf_path" >&5
+-				echo "$as_me:13003: checking for $cf_libs in $cf_path" >&5
++				echo "$as_me:13004: checking for $cf_libs in $cf_path" >&5
  echo $ECHO_N "checking for $cf_libs in $cf_path... $ECHO_C" >&6
  			else
  
-@@ -12468,11 +12471,11 @@
+@@ -13020,11 +13021,11 @@
  done
  LIBS="$cf_add_libs"
  
--				echo "$as_me:12471: checking for $cf_test in $cf_libs" >&5
-+				echo "$as_me:12474: checking for $cf_test in $cf_libs" >&5
+-				echo "$as_me:13023: checking for $cf_test in $cf_libs" >&5
++				echo "$as_me:13024: 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 12475 "configure"
-+#line 12478 "configure"
+-#line 13027 "configure"
++#line 13028 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -12488,16 +12491,16 @@
+@@ -13040,16 +13041,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12491: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12494: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:13043: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13044: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:12494: \$? = $ac_status" >&5
-+  echo "$as_me:12497: \$? = $ac_status" >&5
+-  echo "$as_me:13046: \$? = $ac_status" >&5
++  echo "$as_me:13047: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12497: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12500: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:13049: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13050: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:12500: \$? = $ac_status" >&5
-+  echo "$as_me:12503: \$? = $ac_status" >&5
+-  echo "$as_me:13052: \$? = $ac_status" >&5
++  echo "$as_me:13053: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -12506,7 +12509,7 @@
+@@ -13058,7 +13059,7 @@
  cf_result=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--			echo "$as_me:12509: result: $cf_result" >&5
-+			echo "$as_me:12512: result: $cf_result" >&5
+-			echo "$as_me:13061: result: $cf_result" >&5
++			echo "$as_me:13062: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
  			if test "$cf_result" = yes ; then
  				cf_x_athena_lib="$cf_libs"
-@@ -12520,7 +12523,7 @@
+@@ -13072,7 +13073,7 @@
  done
  
  if test -z "$cf_x_athena_lib" ; then
--	{ { echo "$as_me:12523: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
-+	{ { echo "$as_me:12526: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+-	{ { echo "$as_me:13075: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
++	{ { echo "$as_me:13076: 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
-@@ -12538,7 +12541,7 @@
+@@ -13090,7 +13091,7 @@
    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:12541: checking for $ac_word" >&5
-+echo "$as_me:12544: checking for $ac_word" >&5
+-echo "$as_me:13093: checking for $ac_word" >&5
++echo "$as_me:13094: 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
-@@ -12553,7 +12556,7 @@
+@@ -13105,7 +13106,7 @@
    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:12556: found $ac_dir/$ac_word" >&5
-+echo "$as_me:12559: found $ac_dir/$ac_word" >&5
+-echo "$as_me:13108: found $ac_dir/$ac_word" >&5
++echo "$as_me:13109: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -12561,10 +12564,10 @@
+@@ -13113,10 +13114,10 @@
  fi
  XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
  if test -n "$XCURSES_CONFIG"; then
--  echo "$as_me:12564: result: $XCURSES_CONFIG" >&5
-+  echo "$as_me:12567: result: $XCURSES_CONFIG" >&5
+-  echo "$as_me:13116: result: $XCURSES_CONFIG" >&5
++  echo "$as_me:13117: result: $XCURSES_CONFIG" >&5
  echo "${ECHO_T}$XCURSES_CONFIG" >&6
  else
--  echo "$as_me:12567: result: no" >&5
-+  echo "$as_me:12570: result: no" >&5
+-  echo "$as_me:13119: result: no" >&5
++  echo "$as_me:13120: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -12577,7 +12580,7 @@
+@@ -13129,7 +13130,7 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
--echo "$as_me:12580: checking for $ac_word" >&5
-+echo "$as_me:12583: checking for $ac_word" >&5
+-echo "$as_me:13132: checking for $ac_word" >&5
++echo "$as_me:13133: 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
-@@ -12592,7 +12595,7 @@
+@@ -13144,7 +13145,7 @@
    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:12595: found $ac_dir/$ac_word" >&5
-+echo "$as_me:12598: found $ac_dir/$ac_word" >&5
+-echo "$as_me:13147: found $ac_dir/$ac_word" >&5
++echo "$as_me:13148: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -12600,10 +12603,10 @@
+@@ -13152,10 +13153,10 @@
  fi
  ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
  if test -n "$ac_ct_XCURSES_CONFIG"; then
--  echo "$as_me:12603: result: $ac_ct_XCURSES_CONFIG" >&5
-+  echo "$as_me:12606: result: $ac_ct_XCURSES_CONFIG" >&5
+-  echo "$as_me:13155: result: $ac_ct_XCURSES_CONFIG" >&5
++  echo "$as_me:13156: result: $ac_ct_XCURSES_CONFIG" >&5
  echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
  else
--  echo "$as_me:12606: result: no" >&5
-+  echo "$as_me:12609: result: no" >&5
+-  echo "$as_me:13158: result: no" >&5
++  echo "$as_me:13159: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -12642,7 +12645,7 @@
+@@ -13194,7 +13195,7 @@
  
  test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
  
--echo "${as_me:-configure}:12645: testing checking additions to CFLAGS ..." 1>&5
-+echo "${as_me:-configure}:12648: testing checking additions to CFLAGS ..." 1>&5
+-echo "${as_me:-configure}:13197: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:13198: testing checking additions to CFLAGS ..." 1>&5
  
  cf_check_cflags="$CFLAGS"
  cf_check_cppflags="$CPPFLAGS"
-@@ -12713,7 +12716,7 @@
+@@ -13265,7 +13266,7 @@
  if test -n "$cf_new_cflags" ; then
  	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
  
--echo "${as_me:-configure}:12716: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
-+echo "${as_me:-configure}:12719: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+-echo "${as_me:-configure}:13268: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:13269: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
  
  	CFLAGS="$CFLAGS $cf_new_cflags"
  fi
-@@ -12721,7 +12724,7 @@
+@@ -13273,7 +13274,7 @@
  if test -n "$cf_new_cppflags" ; then
  	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
  
--echo "${as_me:-configure}:12724: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
-+echo "${as_me:-configure}:12727: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+-echo "${as_me:-configure}:13276: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:13277: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
  
  	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
  fi
-@@ -12729,14 +12732,14 @@
+@@ -13281,14 +13282,14 @@
  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}:12732: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
-+echo "${as_me:-configure}:12735: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+-echo "${as_me:-configure}:13284: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:13285: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
  
  	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
  fi
  
  if test "x$cf_check_cflags" != "x$CFLAGS" ; then
  cat >conftest.$ac_ext <<_ACEOF
--#line 12739 "configure"
-+#line 12742 "configure"
+-#line 13291 "configure"
++#line 13292 "configure"
  #include "confdefs.h"
  #include 
  int
-@@ -12748,16 +12751,16 @@
+@@ -13300,16 +13301,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12751: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12754: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:13303: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13304: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:12754: \$? = $ac_status" >&5
-+  echo "$as_me:12757: \$? = $ac_status" >&5
+-  echo "$as_me:13306: \$? = $ac_status" >&5
++  echo "$as_me:13307: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12757: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12760: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:13309: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13310: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:12760: \$? = $ac_status" >&5
-+  echo "$as_me:12763: \$? = $ac_status" >&5
+-  echo "$as_me:13312: \$? = $ac_status" >&5
++  echo "$as_me:13313: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -12765,12 +12768,12 @@
+@@ -13317,12 +13318,12 @@
  cat conftest.$ac_ext >&5
  test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
  
--echo "${as_me:-configure}:12768: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
-+echo "${as_me:-configure}:12771: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+-echo "${as_me:-configure}:13320: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:13321: 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}:12773: testing but keeping change to \$CPPFLAGS ..." 1>&5
-+echo "${as_me:-configure}:12776: testing but keeping change to \$CPPFLAGS ..." 1>&5
+-echo "${as_me:-configure}:13325: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:13326: testing but keeping change to \$CPPFLAGS ..." 1>&5
  
  	 fi
  	 CFLAGS="$cf_check_flags"
-@@ -12778,7 +12781,7 @@
+@@ -13330,7 +13331,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
  
--echo "$as_me:12781: checking for XOpenDisplay in -lX11" >&5
-+echo "$as_me:12784: checking for XOpenDisplay in -lX11" >&5
+-echo "$as_me:13333: checking for XOpenDisplay in -lX11" >&5
++echo "$as_me:13334: 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
-@@ -12786,7 +12789,7 @@
+@@ -13338,7 +13339,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 12789 "configure"
-+#line 12792 "configure"
+-#line 13341 "configure"
++#line 13342 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -12805,16 +12808,16 @@
+@@ -13357,16 +13358,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12808: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12811: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:13360: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13361: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:12811: \$? = $ac_status" >&5
-+  echo "$as_me:12814: \$? = $ac_status" >&5
+-  echo "$as_me:13363: \$? = $ac_status" >&5
++  echo "$as_me:13364: \$? = $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:12817: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:13366: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13367: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:12817: \$? = $ac_status" >&5
-+  echo "$as_me:12820: \$? = $ac_status" >&5
+-  echo "$as_me:13369: \$? = $ac_status" >&5
++  echo "$as_me:13370: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_X11_XOpenDisplay=yes
  else
-@@ -12825,7 +12828,7 @@
+@@ -13377,7 +13378,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:12828: result: $ac_cv_lib_X11_XOpenDisplay" >&5
-+echo "$as_me:12831: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+-echo "$as_me:13380: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:13381: 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
  
-@@ -12847,7 +12850,7 @@
+@@ -13399,7 +13400,7 @@
  
  fi
  
--echo "$as_me:12850: checking for XCurses library" >&5
-+echo "$as_me:12853: checking for XCurses library" >&5
+-echo "$as_me:13402: checking for XCurses library" >&5
++echo "$as_me:13403: 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
-@@ -12870,7 +12873,7 @@
+@@ -13422,7 +13423,7 @@
  LIBS="$cf_add_libs"
  
  cat >conftest.$ac_ext <<_ACEOF
--#line 12873 "configure"
-+#line 12876 "configure"
+-#line 13425 "configure"
++#line 13426 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -12885,16 +12888,16 @@
+@@ -13437,16 +13438,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12888: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12891: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:13440: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13441: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:12891: \$? = $ac_status" >&5
-+  echo "$as_me:12894: \$? = $ac_status" >&5
+-  echo "$as_me:13443: \$? = $ac_status" >&5
++  echo "$as_me:13444: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12894: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12897: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:13446: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13447: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:12897: \$? = $ac_status" >&5
-+  echo "$as_me:12900: \$? = $ac_status" >&5
+-  echo "$as_me:13449: \$? = $ac_status" >&5
++  echo "$as_me:13450: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_lib_XCurses=yes
  else
-@@ -12905,7 +12908,7 @@
+@@ -13457,7 +13458,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  
  fi
--echo "$as_me:12908: result: $cf_cv_lib_XCurses" >&5
-+echo "$as_me:12911: result: $cf_cv_lib_XCurses" >&5
+-echo "$as_me:13460: result: $cf_cv_lib_XCurses" >&5
++echo "$as_me:13461: result: $cf_cv_lib_XCurses" >&5
  echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
  
  fi
-@@ -12920,23 +12923,23 @@
+@@ -13472,23 +13473,23 @@
  #define XCURSES 1
  EOF
  
--	echo "$as_me:12923: checking for xcurses.h" >&5
-+	echo "$as_me:12926: checking for xcurses.h" >&5
+-	echo "$as_me:13475: checking for xcurses.h" >&5
++	echo "$as_me:13476: 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 12929 "configure"
-+#line 12932 "configure"
+-#line 13481 "configure"
++#line 13482 "configure"
  #include "confdefs.h"
  #include 
  _ACEOF
--if { (eval echo "$as_me:12933: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:12936: \"$ac_cpp conftest.$ac_ext\"") >&5
+-if { (eval echo "$as_me:13485: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:13486: \"$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:12939: \$? = $ac_status" >&5
-+  echo "$as_me:12942: \$? = $ac_status" >&5
+-  echo "$as_me:13491: \$? = $ac_status" >&5
++  echo "$as_me:13492: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -12955,7 +12958,7 @@
+@@ -13507,7 +13508,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
--echo "$as_me:12958: result: $ac_cv_header_xcurses_h" >&5
-+echo "$as_me:12961: result: $ac_cv_header_xcurses_h" >&5
+-echo "$as_me:13510: result: $ac_cv_header_xcurses_h" >&5
++echo "$as_me:13511: 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
  
-@@ -12966,14 +12969,14 @@
+@@ -13518,14 +13519,14 @@
  fi
  
  else
--	{ { echo "$as_me:12969: error: Cannot link with XCurses" >&5
-+	{ { echo "$as_me:12972: error: Cannot link with XCurses" >&5
+-	{ { echo "$as_me:13521: error: Cannot link with XCurses" >&5
++	{ { echo "$as_me:13522: error: Cannot link with XCurses" >&5
  echo "$as_me: error: Cannot link with XCurses" >&2;}
     { (exit 1); exit 1; }; }
  fi
  
  	;;
  (*)
--	{ { echo "$as_me:12976: error: unexpected screen-value: $cf_cv_screen" >&5
-+	{ { echo "$as_me:12979: error: unexpected screen-value: $cf_cv_screen" >&5
+-	{ { echo "$as_me:13528: error: unexpected screen-value: $cf_cv_screen" >&5
++	{ { echo "$as_me:13529: error: unexpected screen-value: $cf_cv_screen" >&5
  echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
     { (exit 1); exit 1; }; }
  	;;
-@@ -12985,14 +12988,14 @@
+@@ -13533,7 +13534,7 @@
+ 
+ : ${cf_nculib_root:=$cf_cv_screen}
+ as_ac_Lib=`echo "ac_cv_lib_$cf_nculib_root''__nc_init_pthreads" | $as_tr_sh`
+-echo "$as_me:13536: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5
++echo "$as_me:13537: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5
+ echo $ECHO_N "checking for _nc_init_pthreads in -l$cf_nculib_root... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13541,7 +13542,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_nculib_root  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13544 "configure"
++#line 13545 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13560,16 +13561,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13563: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13564: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13566: \$? = $ac_status" >&5
++  echo "$as_me:13567: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13569: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13570: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13572: \$? = $ac_status" >&5
++  echo "$as_me:13573: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -13580,7 +13581,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13583: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:13584: 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
+   cf_cv_ncurses_pthreads=yes
+@@ -13615,14 +13616,14 @@
  	;;
  (curses|curses_*)
  
--echo "$as_me:12988: checking for NetBSD form.h" >&5
-+echo "$as_me:12991: checking for NetBSD form.h" >&5
+-echo "$as_me:13618: checking for NetBSD form.h" >&5
++echo "$as_me:13619: checking for NetBSD form.h" >&5
  echo $ECHO_N "checking for NetBSD form.h... $ECHO_C" >&6
  if test "${cf_cv_netbsd_form_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
  cat >conftest.$ac_ext <<_ACEOF
--#line 12995 "configure"
-+#line 12998 "configure"
+-#line 13625 "configure"
++#line 13626 "configure"
  #include "confdefs.h"
  
  #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -13011,16 +13014,16 @@
+@@ -13641,16 +13642,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13014: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13017: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:13644: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13645: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:13017: \$? = $ac_status" >&5
-+  echo "$as_me:13020: \$? = $ac_status" >&5
+-  echo "$as_me:13647: \$? = $ac_status" >&5
++  echo "$as_me:13648: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13020: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13023: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:13650: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13651: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:13023: \$? = $ac_status" >&5
-+  echo "$as_me:13026: \$? = $ac_status" >&5
+-  echo "$as_me:13653: \$? = $ac_status" >&5
++  echo "$as_me:13654: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_netbsd_form_h=yes
  
-@@ -13032,7 +13035,7 @@
+@@ -13662,7 +13663,7 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  
  fi
--echo "$as_me:13035: result: $cf_cv_netbsd_form_h" >&5
-+echo "$as_me:13038: result: $cf_cv_netbsd_form_h" >&5
+-echo "$as_me:13665: result: $cf_cv_netbsd_form_h" >&5
++echo "$as_me:13666: result: $cf_cv_netbsd_form_h" >&5
  echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
  
  test "$cf_cv_netbsd_form_h" = yes &&
-@@ -13040,14 +13043,14 @@
+@@ -13670,14 +13671,14 @@
  #define HAVE_NETBSD_FORM_H 1
  EOF
  
--echo "$as_me:13043: checking for NetBSD menu.h" >&5
-+echo "$as_me:13046: checking for NetBSD menu.h" >&5
+-echo "$as_me:13673: checking for NetBSD menu.h" >&5
++echo "$as_me:13674: checking for NetBSD menu.h" >&5
  echo $ECHO_N "checking for NetBSD menu.h... $ECHO_C" >&6
  if test "${cf_cv_netbsd_menu_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
  cat >conftest.$ac_ext <<_ACEOF
--#line 13050 "configure"
-+#line 13053 "configure"
+-#line 13680 "configure"
++#line 13681 "configure"
  #include "confdefs.h"
  
  #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -13065,16 +13068,16 @@
+@@ -13695,16 +13696,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13068: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13071: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:13698: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13699: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:13071: \$? = $ac_status" >&5
-+  echo "$as_me:13074: \$? = $ac_status" >&5
+-  echo "$as_me:13701: \$? = $ac_status" >&5
++  echo "$as_me:13702: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13074: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13077: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:13704: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13705: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:13077: \$? = $ac_status" >&5
-+  echo "$as_me:13080: \$? = $ac_status" >&5
+-  echo "$as_me:13707: \$? = $ac_status" >&5
++  echo "$as_me:13708: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_netbsd_menu_h=yes
  
-@@ -13086,7 +13089,7 @@
+@@ -13716,7 +13717,7 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  
  fi
--echo "$as_me:13089: result: $cf_cv_netbsd_menu_h" >&5
-+echo "$as_me:13092: result: $cf_cv_netbsd_menu_h" >&5
+-echo "$as_me:13719: result: $cf_cv_netbsd_menu_h" >&5
++echo "$as_me:13720: result: $cf_cv_netbsd_menu_h" >&5
  echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
  
  test "$cf_cv_netbsd_menu_h" = yes &&
-@@ -13104,7 +13107,7 @@
+@@ -13734,7 +13735,7 @@
  	# look for curses-related libraries
  
  as_ac_Lib=`echo "ac_cv_lib_panel$cf_cv_libtype''_new_panel" | $as_tr_sh`
--echo "$as_me:13107: checking for new_panel in -lpanel$cf_cv_libtype" >&5
-+echo "$as_me:13110: checking for new_panel in -lpanel$cf_cv_libtype" >&5
+-echo "$as_me:13737: checking for new_panel in -lpanel$cf_cv_libtype" >&5
++echo "$as_me:13738: checking for new_panel in -lpanel$cf_cv_libtype" >&5
  echo $ECHO_N "checking for new_panel in -lpanel$cf_cv_libtype... $ECHO_C" >&6
  if eval "test \"\${$as_ac_Lib+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13112,7 +13115,7 @@
+@@ -13742,7 +13743,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lpanel$cf_cv_libtype  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 13115 "configure"
-+#line 13118 "configure"
+-#line 13745 "configure"
++#line 13746 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -13131,16 +13134,16 @@
+@@ -13761,16 +13762,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13134: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13137: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:13764: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13765: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:13137: \$? = $ac_status" >&5
-+  echo "$as_me:13140: \$? = $ac_status" >&5
+-  echo "$as_me:13767: \$? = $ac_status" >&5
++  echo "$as_me:13768: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13140: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13143: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:13770: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13771: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:13143: \$? = $ac_status" >&5
-+  echo "$as_me:13146: \$? = $ac_status" >&5
+-  echo "$as_me:13773: \$? = $ac_status" >&5
++  echo "$as_me:13774: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_Lib=yes"
  else
-@@ -13151,7 +13154,7 @@
+@@ -13781,7 +13782,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:13154: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-+echo "$as_me:13157: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+-echo "$as_me:13784: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:13785: 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
  
-@@ -13180,7 +13183,7 @@
+@@ -13810,7 +13811,7 @@
  fi
  
  as_ac_Lib=`echo "ac_cv_lib_menu$cf_cv_libtype''_menu_driver" | $as_tr_sh`
--echo "$as_me:13183: checking for menu_driver in -lmenu$cf_cv_libtype" >&5
-+echo "$as_me:13186: checking for menu_driver in -lmenu$cf_cv_libtype" >&5
+-echo "$as_me:13813: checking for menu_driver in -lmenu$cf_cv_libtype" >&5
++echo "$as_me:13814: checking for menu_driver in -lmenu$cf_cv_libtype" >&5
  echo $ECHO_N "checking for menu_driver in -lmenu$cf_cv_libtype... $ECHO_C" >&6
  if eval "test \"\${$as_ac_Lib+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13188,7 +13191,7 @@
+@@ -13818,7 +13819,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lmenu$cf_cv_libtype  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 13191 "configure"
-+#line 13194 "configure"
+-#line 13821 "configure"
++#line 13822 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -13207,16 +13210,16 @@
+@@ -13837,16 +13838,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13210: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13213: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:13840: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13841: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:13213: \$? = $ac_status" >&5
-+  echo "$as_me:13216: \$? = $ac_status" >&5
+-  echo "$as_me:13843: \$? = $ac_status" >&5
++  echo "$as_me:13844: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13216: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13219: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:13846: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13847: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:13219: \$? = $ac_status" >&5
-+  echo "$as_me:13222: \$? = $ac_status" >&5
+-  echo "$as_me:13849: \$? = $ac_status" >&5
++  echo "$as_me:13850: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_Lib=yes"
  else
-@@ -13227,7 +13230,7 @@
+@@ -13857,7 +13858,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:13230: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-+echo "$as_me:13233: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+-echo "$as_me:13860: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:13861: 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
  
-@@ -13256,7 +13259,7 @@
+@@ -13886,7 +13887,7 @@
  fi
  
  as_ac_Lib=`echo "ac_cv_lib_form$cf_cv_libtype''_form_driver" | $as_tr_sh`
--echo "$as_me:13259: checking for form_driver in -lform$cf_cv_libtype" >&5
-+echo "$as_me:13262: checking for form_driver in -lform$cf_cv_libtype" >&5
+-echo "$as_me:13889: checking for form_driver in -lform$cf_cv_libtype" >&5
++echo "$as_me:13890: checking for form_driver in -lform$cf_cv_libtype" >&5
  echo $ECHO_N "checking for form_driver in -lform$cf_cv_libtype... $ECHO_C" >&6
  if eval "test \"\${$as_ac_Lib+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13264,7 +13267,7 @@
+@@ -13894,7 +13895,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lform$cf_cv_libtype  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 13267 "configure"
-+#line 13270 "configure"
+-#line 13897 "configure"
++#line 13898 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -13283,16 +13286,16 @@
+@@ -13913,16 +13914,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13286: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13289: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:13916: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13917: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:13289: \$? = $ac_status" >&5
-+  echo "$as_me:13292: \$? = $ac_status" >&5
+-  echo "$as_me:13919: \$? = $ac_status" >&5
++  echo "$as_me:13920: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13292: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13295: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:13922: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13923: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:13295: \$? = $ac_status" >&5
-+  echo "$as_me:13298: \$? = $ac_status" >&5
+-  echo "$as_me:13925: \$? = $ac_status" >&5
++  echo "$as_me:13926: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_Lib=yes"
  else
-@@ -13303,7 +13306,7 @@
+@@ -13933,7 +13934,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:13306: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-+echo "$as_me:13309: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+-echo "$as_me:13936: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:13937: 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
  
-@@ -13343,23 +13346,23 @@
+@@ -13973,23 +13974,23 @@
  
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:13346: checking for $ac_header" >&5
-+echo "$as_me:13349: checking for $ac_header" >&5
+-echo "$as_me:13976: checking for $ac_header" >&5
++echo "$as_me:13977: 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 13352 "configure"
-+#line 13355 "configure"
+-#line 13982 "configure"
++#line 13983 "configure"
  #include "confdefs.h"
  #include <$ac_header>
  _ACEOF
--if { (eval echo "$as_me:13356: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:13359: \"$ac_cpp conftest.$ac_ext\"") >&5
+-if { (eval echo "$as_me:13986: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:13987: \"$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:13362: \$? = $ac_status" >&5
-+  echo "$as_me:13365: \$? = $ac_status" >&5
+-  echo "$as_me:13992: \$? = $ac_status" >&5
++  echo "$as_me:13993: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -13378,7 +13381,7 @@
+@@ -14008,7 +14009,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
--echo "$as_me:13381: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:13384: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "$as_me:14011: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:14012: 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 <&5
-+echo "$as_me:13397: checking for ANSI C header files" >&5
+-echo "$as_me:14024: checking for ANSI C header files" >&5
++echo "$as_me:14025: 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 13400 "configure"
-+#line 13403 "configure"
+-#line 14030 "configure"
++#line 14031 "configure"
  #include "confdefs.h"
  #include 
  #include 
-@@ -13405,13 +13408,13 @@
+@@ -14035,13 +14036,13 @@
  #include 
  
  _ACEOF
--if { (eval echo "$as_me:13408: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:13411: \"$ac_cpp conftest.$ac_ext\"") >&5
+-if { (eval echo "$as_me:14038: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:14039: \"$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:13414: \$? = $ac_status" >&5
-+  echo "$as_me:13417: \$? = $ac_status" >&5
+-  echo "$as_me:14044: \$? = $ac_status" >&5
++  echo "$as_me:14045: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -13433,7 +13436,7 @@
+@@ -14063,7 +14064,7 @@
  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 13436 "configure"
-+#line 13439 "configure"
+-#line 14066 "configure"
++#line 14067 "configure"
  #include "confdefs.h"
  #include 
  
-@@ -13451,7 +13454,7 @@
+@@ -14081,7 +14082,7 @@
  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 13454 "configure"
-+#line 13457 "configure"
+-#line 14084 "configure"
++#line 14085 "configure"
  #include "confdefs.h"
  #include 
  
-@@ -13472,7 +13475,7 @@
+@@ -14102,7 +14103,7 @@
    :
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 13475 "configure"
-+#line 13478 "configure"
+-#line 14105 "configure"
++#line 14106 "configure"
  #include "confdefs.h"
  #include 
  #if ((' ' & 0x0FF) == 0x020)
-@@ -13498,15 +13501,15 @@
+@@ -14128,15 +14129,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
--if { (eval echo "$as_me:13501: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13504: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:14131: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14132: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:13504: \$? = $ac_status" >&5
-+  echo "$as_me:13507: \$? = $ac_status" >&5
+-  echo "$as_me:14134: \$? = $ac_status" >&5
++  echo "$as_me:14135: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:13506: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13509: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:14136: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14137: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:13509: \$? = $ac_status" >&5
-+  echo "$as_me:13512: \$? = $ac_status" >&5
+-  echo "$as_me:14139: \$? = $ac_status" >&5
++  echo "$as_me:14140: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -13519,7 +13522,7 @@
+@@ -14149,7 +14150,7 @@
  fi
  fi
  fi
--echo "$as_me:13522: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:13525: result: $ac_cv_header_stdc" >&5
+-echo "$as_me:14152: result: $ac_cv_header_stdc" >&5
++echo "$as_me:14153: result: $ac_cv_header_stdc" >&5
  echo "${ECHO_T}$ac_cv_header_stdc" >&6
  if test $ac_cv_header_stdc = yes; then
  
-@@ -13529,13 +13532,13 @@
+@@ -14159,13 +14160,13 @@
  
  fi
  
--echo "$as_me:13532: checking whether time.h and sys/time.h may both be included" >&5
-+echo "$as_me:13535: checking whether time.h and sys/time.h may both be included" >&5
+-echo "$as_me:14162: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:14163: 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 13538 "configure"
-+#line 13541 "configure"
+-#line 14168 "configure"
++#line 14169 "configure"
  #include "confdefs.h"
  #include 
  #include 
-@@ -13551,16 +13554,16 @@
+@@ -14181,16 +14182,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13554: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13557: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:14184: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14185: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:13557: \$? = $ac_status" >&5
-+  echo "$as_me:13560: \$? = $ac_status" >&5
+-  echo "$as_me:14187: \$? = $ac_status" >&5
++  echo "$as_me:14188: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13560: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13563: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:14190: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14191: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:13563: \$? = $ac_status" >&5
-+  echo "$as_me:13566: \$? = $ac_status" >&5
+-  echo "$as_me:14193: \$? = $ac_status" >&5
++  echo "$as_me:14194: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_header_time=yes
  else
-@@ -13570,7 +13573,7 @@
+@@ -14200,7 +14201,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
--echo "$as_me:13573: result: $ac_cv_header_time" >&5
-+echo "$as_me:13576: result: $ac_cv_header_time" >&5
+-echo "$as_me:14203: result: $ac_cv_header_time" >&5
++echo "$as_me:14204: result: $ac_cv_header_time" >&5
  echo "${ECHO_T}$ac_cv_header_time" >&6
  if test $ac_cv_header_time = yes; then
  
-@@ -13593,23 +13596,23 @@
+@@ -14223,23 +14224,23 @@
  
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:13596: checking for $ac_header" >&5
-+echo "$as_me:13599: checking for $ac_header" >&5
+-echo "$as_me:14226: checking for $ac_header" >&5
++echo "$as_me:14227: 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 13602 "configure"
-+#line 13605 "configure"
+-#line 14232 "configure"
++#line 14233 "configure"
  #include "confdefs.h"
  #include <$ac_header>
  _ACEOF
--if { (eval echo "$as_me:13606: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:13609: \"$ac_cpp conftest.$ac_ext\"") >&5
+-if { (eval echo "$as_me:14236: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:14237: \"$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:13612: \$? = $ac_status" >&5
-+  echo "$as_me:13615: \$? = $ac_status" >&5
+-  echo "$as_me:14242: \$? = $ac_status" >&5
++  echo "$as_me:14243: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -13628,7 +13631,7 @@
+@@ -14258,7 +14259,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
--echo "$as_me:13631: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:13634: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "$as_me:14261: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:14262: 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 <&5
-+echo "$as_me:13647: checking for $ac_header" >&5
+-echo "$as_me:14274: checking for $ac_header" >&5
++echo "$as_me:14275: 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 13650 "configure"
-+#line 13653 "configure"
+-#line 14280 "configure"
++#line 14281 "configure"
  #include "confdefs.h"
  #include <$ac_header>
  _ACEOF
--if { (eval echo "$as_me:13654: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:13657: \"$ac_cpp conftest.$ac_ext\"") >&5
+-if { (eval echo "$as_me:14284: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:14285: \"$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:13660: \$? = $ac_status" >&5
-+  echo "$as_me:13663: \$? = $ac_status" >&5
+-  echo "$as_me:14290: \$? = $ac_status" >&5
++  echo "$as_me:14291: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -13676,7 +13679,7 @@
+@@ -14306,7 +14307,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
--echo "$as_me:13679: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:13682: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "$as_me:14309: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:14310: 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 <&5
-+echo "$as_me:13692: checking for header declaring getopt variables" >&5
+-echo "$as_me:14319: checking for header declaring getopt variables" >&5
++echo "$as_me:14320: checking for header declaring getopt variables" >&5
  echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6
  if test "${cf_cv_getopt_header+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13696,7 +13699,7 @@
+@@ -14326,7 +14327,7 @@
  for cf_header in stdio.h stdlib.h unistd.h getopt.h
  do
  cat >conftest.$ac_ext <<_ACEOF
--#line 13699 "configure"
-+#line 13702 "configure"
+-#line 14329 "configure"
++#line 14330 "configure"
  #include "confdefs.h"
  
  #include <$cf_header>
-@@ -13709,16 +13712,16 @@
+@@ -14339,16 +14340,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13712: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13715: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:14342: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14343: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:13715: \$? = $ac_status" >&5
-+  echo "$as_me:13718: \$? = $ac_status" >&5
+-  echo "$as_me:14345: \$? = $ac_status" >&5
++  echo "$as_me:14346: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13718: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13721: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:14348: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14349: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:13721: \$? = $ac_status" >&5
-+  echo "$as_me:13724: \$? = $ac_status" >&5
+-  echo "$as_me:14351: \$? = $ac_status" >&5
++  echo "$as_me:14352: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_getopt_header=$cf_header
   break
-@@ -13730,7 +13733,7 @@
+@@ -14360,7 +14361,7 @@
  done
  
  fi
--echo "$as_me:13733: result: $cf_cv_getopt_header" >&5
-+echo "$as_me:13736: result: $cf_cv_getopt_header" >&5
+-echo "$as_me:14363: result: $cf_cv_getopt_header" >&5
++echo "$as_me:14364: result: $cf_cv_getopt_header" >&5
  echo "${ECHO_T}$cf_cv_getopt_header" >&6
  if test $cf_cv_getopt_header != none ; then
  
-@@ -13753,13 +13756,13 @@
+@@ -14383,13 +14384,13 @@
  
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:13756: checking for $ac_func" >&5
-+echo "$as_me:13759: checking for $ac_func" >&5
+-echo "$as_me:14386: checking for $ac_func" >&5
++echo "$as_me:14387: 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 13762 "configure"
-+#line 13765 "configure"
+-#line 14392 "configure"
++#line 14393 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func (); below.  */
-@@ -13790,16 +13793,16 @@
+@@ -14420,16 +14421,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13793: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13796: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:14423: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14424: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:13796: \$? = $ac_status" >&5
-+  echo "$as_me:13799: \$? = $ac_status" >&5
+-  echo "$as_me:14426: \$? = $ac_status" >&5
++  echo "$as_me:14427: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13799: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13802: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:14429: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14430: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:13802: \$? = $ac_status" >&5
-+  echo "$as_me:13805: \$? = $ac_status" >&5
+-  echo "$as_me:14432: \$? = $ac_status" >&5
++  echo "$as_me:14433: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_var=yes"
  else
-@@ -13809,7 +13812,7 @@
+@@ -14439,7 +14440,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:13812: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:13815: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "$as_me:14442: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:14443: 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 <&5
-+	{ { echo "$as_me:13826: error: getopt is required for building programs" >&5
+-	{ { echo "$as_me:14453: error: getopt is required for building programs" >&5
++	{ { echo "$as_me:14454: error: getopt is required for building programs" >&5
  echo "$as_me: error: getopt is required for building programs" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -13839,13 +13842,13 @@
+@@ -14469,13 +14470,13 @@
  
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:13842: checking for $ac_func" >&5
-+echo "$as_me:13845: checking for $ac_func" >&5
+-echo "$as_me:14472: checking for $ac_func" >&5
++echo "$as_me:14473: 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 13848 "configure"
-+#line 13851 "configure"
+-#line 14478 "configure"
++#line 14479 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func (); below.  */
-@@ -13876,16 +13879,16 @@
+@@ -14506,16 +14507,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13879: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13882: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:14509: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14510: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:13882: \$? = $ac_status" >&5
-+  echo "$as_me:13885: \$? = $ac_status" >&5
+-  echo "$as_me:14512: \$? = $ac_status" >&5
++  echo "$as_me:14513: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13885: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13888: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:14515: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14516: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:13888: \$? = $ac_status" >&5
-+  echo "$as_me:13891: \$? = $ac_status" >&5
+-  echo "$as_me:14518: \$? = $ac_status" >&5
++  echo "$as_me:14519: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_var=yes"
  else
-@@ -13895,7 +13898,7 @@
+@@ -14525,7 +14526,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:13898: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:13901: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "$as_me:14528: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:14529: 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 <&5
-+echo "$as_me:13913: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
- echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
+-echo "$as_me:14540: checking definition to turn on extended curses functions" >&5
++echo "$as_me:14541: 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
- else
+@@ -14545,7 +14546,7 @@
  
+ cf_cv_need_xopen_extension=unknown
  cat >conftest.$ac_ext <<_ACEOF
--#line 13917 "configure"
-+#line 13920 "configure"
+-#line 14548 "configure"
++#line 14549 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -13936,23 +13939,23 @@
+@@ -14571,16 +14572,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13939: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13942: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:14574: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14575: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:13942: \$? = $ac_status" >&5
-+  echo "$as_me:13945: \$? = $ac_status" >&5
+-  echo "$as_me:14577: \$? = $ac_status" >&5
++  echo "$as_me:14578: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13945: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13948: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:14580: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14581: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:13948: \$? = $ac_status" >&5
-+  echo "$as_me:13951: \$? = $ac_status" >&5
+-  echo "$as_me:14583: \$? = $ac_status" >&5
++  echo "$as_me:14584: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-   cf_cv_need_xopen_extension=no
+   cf_cv_need_xopen_extension=none
  else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 13955 "configure"
-+#line 13958 "configure"
- #include "confdefs.h"
- 
- #define _XOPEN_SOURCE_EXTENDED
-@@ -13974,16 +13977,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13977: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13980: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13980: \$? = $ac_status" >&5
-+  echo "$as_me:13983: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13983: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13986: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13986: \$? = $ac_status" >&5
-+  echo "$as_me:13989: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_need_xopen_extension=yes
- else
-@@ -13995,11 +13998,11 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:13998: result: $cf_cv_need_xopen_extension" >&5
-+echo "$as_me:14001: result: $cf_cv_need_xopen_extension" >&5
- echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
- test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
- 
--echo "$as_me:14002: checking for term.h" >&5
-+echo "$as_me:14005: 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
-@@ -14020,7 +14023,7 @@
- for cf_header in $cf_header_list
- do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 14023 "configure"
-+#line 14026 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -14034,16 +14037,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14037: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14040: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14040: \$? = $ac_status" >&5
-+  echo "$as_me:14043: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14043: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14046: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14046: \$? = $ac_status" >&5
-+  echo "$as_me:14049: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_term_header=$cf_header
- 	 break
-@@ -14062,7 +14065,7 @@
- 	for cf_header in ncurses/term.h ncursesw/term.h
+@@ -14590,7 +14591,7 @@
+ 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
  	do
  		cat >conftest.$ac_ext <<_ACEOF
--#line 14065 "configure"
-+#line 14068 "configure"
+-#line 14593 "configure"
++#line 14594 "configure"
  #include "confdefs.h"
  
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -14080,16 +14083,16 @@
+ #define $cf_try_xopen_extension 1
+@@ -14612,16 +14613,16 @@
  }
  _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14083: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14086: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14615: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14616: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:14086: \$? = $ac_status" >&5
-+  echo "$as_me:14089: \$? = $ac_status" >&5
+-  echo "$as_me:14618: \$? = $ac_status" >&5
++  echo "$as_me:14619: \$? = $ac_status" >&5
    (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14089: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14092: \"$ac_try\"") >&5
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14621: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14622: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:14092: \$? = $ac_status" >&5
-+  echo "$as_me:14095: \$? = $ac_status" >&5
+-  echo "$as_me:14624: \$? = $ac_status" >&5
++  echo "$as_me:14625: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-   cf_cv_term_header=$cf_header
- 			 break
-@@ -14104,7 +14107,7 @@
- esac
+   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
+ else
+@@ -14635,7 +14636,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  
  fi
--echo "$as_me:14107: result: $cf_cv_term_header" >&5
-+echo "$as_me:14110: result: $cf_cv_term_header" >&5
- echo "${ECHO_T}$cf_cv_term_header" >&6
+-echo "$as_me:14638: result: $cf_cv_need_xopen_extension" >&5
++echo "$as_me:14639: result: $cf_cv_need_xopen_extension" >&5
+ echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
  
- case $cf_cv_term_header in
-@@ -14131,7 +14134,7 @@
+ case $cf_cv_need_xopen_extension in
+@@ -14644,7 +14645,7 @@
  	;;
  esac
  
--echo "$as_me:14134: checking for unctrl.h" >&5
-+echo "$as_me:14137: 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 "$as_me:14647: checking for term.h" >&5
++echo "$as_me:14648: 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
-@@ -14152,7 +14155,7 @@
+@@ -14665,7 +14666,7 @@
  for cf_header in $cf_header_list
  do
  	cat >conftest.$ac_ext <<_ACEOF
--#line 14155 "configure"
-+#line 14158 "configure"
+-#line 14668 "configure"
++#line 14669 "configure"
  #include "confdefs.h"
  
  #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -14166,16 +14169,16 @@
+@@ -14679,16 +14680,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14169: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14172: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:14682: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14683: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:14172: \$? = $ac_status" >&5
-+  echo "$as_me:14175: \$? = $ac_status" >&5
+-  echo "$as_me:14685: \$? = $ac_status" >&5
++  echo "$as_me:14686: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14175: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14178: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:14688: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14689: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:14178: \$? = $ac_status" >&5
-+  echo "$as_me:14181: \$? = $ac_status" >&5
+-  echo "$as_me:14691: \$? = $ac_status" >&5
++  echo "$as_me:14692: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_term_header=$cf_header
+ 	 break
+@@ -14707,7 +14708,7 @@
+ 	for cf_header in ncurses/term.h ncursesw/term.h
+ 	do
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 14710 "configure"
++#line 14711 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -14725,16 +14726,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14728: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14729: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14731: \$? = $ac_status" >&5
++  echo "$as_me:14732: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14734: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14735: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14737: \$? = $ac_status" >&5
++  echo "$as_me:14738: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_term_header=$cf_header
+ 			 break
+@@ -14749,7 +14750,7 @@
+ esac
+ 
+ fi
+-echo "$as_me:14752: result: $cf_cv_term_header" >&5
++echo "$as_me:14753: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ case $cf_cv_term_header in
+@@ -14776,7 +14777,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:14779: checking for unctrl.h" >&5
++echo "$as_me:14780: 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
+@@ -14797,7 +14798,7 @@
+ for cf_header in $cf_header_list
+ do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 14800 "configure"
++#line 14801 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -14811,16 +14812,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14814: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14815: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14817: \$? = $ac_status" >&5
++  echo "$as_me:14818: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14820: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14821: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14823: \$? = $ac_status" >&5
++  echo "$as_me:14824: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_unctrl_header=$cf_header
  	 break
-@@ -14188,12 +14191,12 @@
+@@ -14833,12 +14834,12 @@
  done
  
  fi
--echo "$as_me:14191: result: $cf_cv_unctrl_header" >&5
-+echo "$as_me:14194: result: $cf_cv_unctrl_header" >&5
+-echo "$as_me:14836: result: $cf_cv_unctrl_header" >&5
++echo "$as_me:14837: result: $cf_cv_unctrl_header" >&5
  echo "${ECHO_T}$cf_cv_unctrl_header" >&6
  
  case $cf_cv_unctrl_header in
  (no)
--	{ echo "$as_me:14196: WARNING: unctrl.h header not found" >&5
-+	{ echo "$as_me:14199: WARNING: unctrl.h header not found" >&5
+-	{ echo "$as_me:14841: WARNING: unctrl.h header not found" >&5
++	{ echo "$as_me:14842: WARNING: unctrl.h header not found" >&5
  echo "$as_me: WARNING: unctrl.h header not found" >&2;}
  	;;
  esac
-@@ -14267,10 +14270,10 @@
+@@ -14913,10 +14914,10 @@
  
  cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
  
--	echo "$as_me:14270: checking for ${cf_func}" >&5
-+	echo "$as_me:14273: checking for ${cf_func}" >&5
+-	echo "$as_me:14916: checking for ${cf_func}" >&5
++	echo "$as_me:14917: checking for ${cf_func}" >&5
  echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
  
--echo "${as_me:-configure}:14273: testing ${cf_func} ..." 1>&5
-+echo "${as_me:-configure}:14276: testing ${cf_func} ..." 1>&5
+-echo "${as_me:-configure}:14919: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:14920: testing ${cf_func} ..." 1>&5
  
  	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14279,7 +14282,7 @@
+@@ -14925,7 +14926,7 @@
  		eval cf_result='$ac_cv_func_'$cf_func
  		if test ".$cf_result" != ".no"; then
  			cat >conftest.$ac_ext <<_ACEOF
--#line 14282 "configure"
-+#line 14285 "configure"
+-#line 14928 "configure"
++#line 14929 "configure"
  #include "confdefs.h"
  
  #ifdef HAVE_XCURSES
-@@ -14312,16 +14315,16 @@
+@@ -14958,16 +14959,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14315: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14318: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:14961: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14962: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:14318: \$? = $ac_status" >&5
-+  echo "$as_me:14321: \$? = $ac_status" >&5
+-  echo "$as_me:14964: \$? = $ac_status" >&5
++  echo "$as_me:14965: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14321: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14324: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:14967: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14968: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:14324: \$? = $ac_status" >&5
-+  echo "$as_me:14327: \$? = $ac_status" >&5
+-  echo "$as_me:14970: \$? = $ac_status" >&5
++  echo "$as_me:14971: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -14337,7 +14340,7 @@
+@@ -14983,7 +14984,7 @@
  
  	# use the computed/retrieved cache-value:
  	eval 'cf_result=$cf_cv_func_'$cf_func
--	echo "$as_me:14340: result: $cf_result" >&5
-+	echo "$as_me:14343: result: $cf_result" >&5
+-	echo "$as_me:14986: result: $cf_result" >&5
++	echo "$as_me:14987: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
  	if test $cf_result != no; then
  		cat >>confdefs.h <&5
-+	echo "$as_me:14358: checking for ${cf_func}" >&5
+-	echo "$as_me:15001: checking for ${cf_func}" >&5
++	echo "$as_me:15002: checking for ${cf_func}" >&5
  echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
  
--echo "${as_me:-configure}:14358: testing ${cf_func} ..." 1>&5
-+echo "${as_me:-configure}:14361: testing ${cf_func} ..." 1>&5
+-echo "${as_me:-configure}:15004: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:15005: testing ${cf_func} ..." 1>&5
  
  	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14364,7 +14367,7 @@
+@@ -15010,7 +15011,7 @@
  		eval cf_result='$ac_cv_func_'$cf_func
  		if test ".$cf_result" != ".no"; then
  			cat >conftest.$ac_ext <<_ACEOF
--#line 14367 "configure"
-+#line 14370 "configure"
+-#line 15013 "configure"
++#line 15014 "configure"
  #include "confdefs.h"
  
  #ifdef HAVE_XCURSES
-@@ -14397,16 +14400,16 @@
+@@ -15043,16 +15044,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14400: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14403: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:15046: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15047: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:14403: \$? = $ac_status" >&5
-+  echo "$as_me:14406: \$? = $ac_status" >&5
+-  echo "$as_me:15049: \$? = $ac_status" >&5
++  echo "$as_me:15050: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14406: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14409: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:15052: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15053: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:14409: \$? = $ac_status" >&5
-+  echo "$as_me:14412: \$? = $ac_status" >&5
+-  echo "$as_me:15055: \$? = $ac_status" >&5
++  echo "$as_me:15056: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -14422,7 +14425,7 @@
+@@ -15068,7 +15069,7 @@
  
  	# use the computed/retrieved cache-value:
  	eval 'cf_result=$cf_cv_func_'$cf_func
--	echo "$as_me:14425: result: $cf_result" >&5
-+	echo "$as_me:14428: result: $cf_result" >&5
+-	echo "$as_me:15071: result: $cf_result" >&5
++	echo "$as_me:15072: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
  	if test $cf_result != no; then
  		cat >>confdefs.h <conftest.$ac_ext <<_ACEOF
--#line 14449 "configure"
-+#line 14452 "configure"
+-#line 15095 "configure"
++#line 15096 "configure"
  #include "confdefs.h"
  
  #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -14466,21 +14469,21 @@
+@@ -15112,21 +15113,21 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14469: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14472: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:15115: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15116: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:14472: \$? = $ac_status" >&5
-+  echo "$as_me:14475: \$? = $ac_status" >&5
+-  echo "$as_me:15118: \$? = $ac_status" >&5
++  echo "$as_me:15119: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14475: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14478: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:15121: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15122: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:14478: \$? = $ac_status" >&5
-+  echo "$as_me:14481: \$? = $ac_status" >&5
+-  echo "$as_me:15124: \$? = $ac_status" >&5
++  echo "$as_me:15125: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
  		test -n "$verbose" && echo "	prototype $cf_ret func($cf_arg value)" 1>&6
  
--echo "${as_me:-configure}:14483: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
-+echo "${as_me:-configure}:14486: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
+-echo "${as_me:-configure}:15129: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
++echo "${as_me:-configure}:15130: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
  
  		cat >>confdefs.h <&5
-+echo "$as_me:14506: checking for ncurses extended functions" >&5
+-echo "$as_me:15149: checking for ncurses extended functions" >&5
++echo "$as_me:15150: checking for ncurses extended functions" >&5
  echo $ECHO_N "checking for ncurses extended functions... $ECHO_C" >&6
  if test "${cf_cv_ncurses_ext_funcs+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
  cat >conftest.$ac_ext <<_ACEOF
--#line 14510 "configure"
-+#line 14513 "configure"
+-#line 15156 "configure"
++#line 15157 "configure"
  #include "confdefs.h"
  
  #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -14522,16 +14525,16 @@
+@@ -15168,16 +15169,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14525: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14528: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:15171: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15172: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:14528: \$? = $ac_status" >&5
-+  echo "$as_me:14531: \$? = $ac_status" >&5
+-  echo "$as_me:15174: \$? = $ac_status" >&5
++  echo "$as_me:15175: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14531: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14534: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:15177: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15178: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:14534: \$? = $ac_status" >&5
-+  echo "$as_me:14537: \$? = $ac_status" >&5
+-  echo "$as_me:15180: \$? = $ac_status" >&5
++  echo "$as_me:15181: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_ncurses_ext_funcs=defined
  else
-@@ -14539,7 +14542,7 @@
+@@ -15185,7 +15186,7 @@
  cat conftest.$ac_ext >&5
  
  cat >conftest.$ac_ext <<_ACEOF
--#line 14542 "configure"
-+#line 14545 "configure"
+-#line 15188 "configure"
++#line 15189 "configure"
  #include "confdefs.h"
  
  #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -14564,16 +14567,16 @@
+@@ -15210,16 +15211,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14567: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14570: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:15213: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15214: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:14570: \$? = $ac_status" >&5
-+  echo "$as_me:14573: \$? = $ac_status" >&5
+-  echo "$as_me:15216: \$? = $ac_status" >&5
++  echo "$as_me:15217: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14573: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14576: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:15219: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15220: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:14576: \$? = $ac_status" >&5
-+  echo "$as_me:14579: \$? = $ac_status" >&5
+-  echo "$as_me:15222: \$? = $ac_status" >&5
++  echo "$as_me:15223: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_ncurses_ext_funcs=yes
  else
-@@ -14587,7 +14590,7 @@
+@@ -15233,7 +15234,7 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  
  fi
--echo "$as_me:14590: result: $cf_cv_ncurses_ext_funcs" >&5
-+echo "$as_me:14593: result: $cf_cv_ncurses_ext_funcs" >&5
+-echo "$as_me:15236: result: $cf_cv_ncurses_ext_funcs" >&5
++echo "$as_me:15237: result: $cf_cv_ncurses_ext_funcs" >&5
  echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6
  test "$cf_cv_ncurses_ext_funcs" = yes &&
  cat >>confdefs.h <<\EOF
-@@ -14601,11 +14604,11 @@
+@@ -15247,11 +15248,11 @@
  	if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
  	then
  		cf_define_xpg5=no
--		echo "$as_me:14604: checking if _XPG5 should be defined to enable wide-characters" >&5
-+		echo "$as_me:14607: checking if _XPG5 should be defined to enable wide-characters" >&5
+-		echo "$as_me:15250: checking if _XPG5 should be defined to enable wide-characters" >&5
++		echo "$as_me:15251: checking if _XPG5 should be defined to enable wide-characters" >&5
  echo $ECHO_N "checking if _XPG5 should be defined to enable wide-characters... $ECHO_C" >&6
  
  		cat >conftest.$ac_ext <<_ACEOF
--#line 14608 "configure"
-+#line 14611 "configure"
+-#line 15254 "configure"
++#line 15255 "configure"
  #include "confdefs.h"
  
  #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -14618,16 +14621,16 @@
+@@ -15264,16 +15265,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14621: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14624: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:15267: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15268: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:14624: \$? = $ac_status" >&5
-+  echo "$as_me:14627: \$? = $ac_status" >&5
+-  echo "$as_me:15270: \$? = $ac_status" >&5
++  echo "$as_me:15271: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14627: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14630: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:15273: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15274: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:14630: \$? = $ac_status" >&5
-+  echo "$as_me:14633: \$? = $ac_status" >&5
+-  echo "$as_me:15276: \$? = $ac_status" >&5
++  echo "$as_me:15277: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -14636,7 +14639,7 @@
+@@ -15282,7 +15283,7 @@
  cf_save_cppflags="$CPPFLAGS"
  			 CPPFLAGS="$CPPFLAGS -D_XPG5"
  			 cat >conftest.$ac_ext <<_ACEOF
--#line 14639 "configure"
-+#line 14642 "configure"
+-#line 15285 "configure"
++#line 15286 "configure"
  #include "confdefs.h"
  
  #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -14649,16 +14652,16 @@
+@@ -15295,16 +15296,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14652: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14655: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:15298: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15299: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:14655: \$? = $ac_status" >&5
-+  echo "$as_me:14658: \$? = $ac_status" >&5
+-  echo "$as_me:15301: \$? = $ac_status" >&5
++  echo "$as_me:15302: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14658: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14661: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:15304: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15305: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:14661: \$? = $ac_status" >&5
-+  echo "$as_me:14664: \$? = $ac_status" >&5
+-  echo "$as_me:15307: \$? = $ac_status" >&5
++  echo "$as_me:15308: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_define_xpg5=yes
  else
-@@ -14669,7 +14672,7 @@
+@@ -15315,7 +15316,7 @@
  			 CPPFLAGS="$cf_save_cppflags"
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
--		echo "$as_me:14672: result: $cf_define_xpg5" >&5
-+		echo "$as_me:14675: result: $cf_define_xpg5" >&5
+-		echo "$as_me:15318: result: $cf_define_xpg5" >&5
++		echo "$as_me:15319: result: $cf_define_xpg5" >&5
  echo "${ECHO_T}$cf_define_xpg5" >&6
  
  		if test "$cf_define_xpg5" = yes
-@@ -14678,14 +14681,14 @@
+@@ -15324,14 +15325,14 @@
  		fi
  	fi
  
--	echo "$as_me:14681: checking for wide-character functions" >&5
-+	echo "$as_me:14684: checking for wide-character functions" >&5
+-	echo "$as_me:15327: checking for wide-character functions" >&5
++	echo "$as_me:15328: checking for wide-character functions" >&5
  echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6
  if test "${cf_cv_widechar_funcs+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
  	cat >conftest.$ac_ext <<_ACEOF
--#line 14688 "configure"
-+#line 14691 "configure"
+-#line 15334 "configure"
++#line 15335 "configure"
  #include "confdefs.h"
  
  #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -14702,16 +14705,16 @@
+@@ -15348,16 +15349,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14705: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14708: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:15351: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15352: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:14708: \$? = $ac_status" >&5
-+  echo "$as_me:14711: \$? = $ac_status" >&5
+-  echo "$as_me:15354: \$? = $ac_status" >&5
++  echo "$as_me:15355: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14711: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14714: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:15357: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15358: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:14714: \$? = $ac_status" >&5
-+  echo "$as_me:14717: \$? = $ac_status" >&5
+-  echo "$as_me:15360: \$? = $ac_status" >&5
++  echo "$as_me:15361: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_widechar_funcs=yes
  else
-@@ -14722,7 +14725,7 @@
+@@ -15368,7 +15369,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  
  fi
--echo "$as_me:14725: result: $cf_cv_widechar_funcs" >&5
-+echo "$as_me:14728: result: $cf_cv_widechar_funcs" >&5
+-echo "$as_me:15371: result: $cf_cv_widechar_funcs" >&5
++echo "$as_me:15372: result: $cf_cv_widechar_funcs" >&5
  echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
  	if test "$cf_cv_widechar_funcs" != no ; then
  
-@@ -14743,14 +14746,14 @@
+@@ -15389,14 +15390,14 @@
  
  fi
  
--echo "$as_me:14746: checking if $cf_cv_screen library uses pthreads" >&5
-+echo "$as_me:14749: checking if $cf_cv_screen library uses pthreads" >&5
+-echo "$as_me:15392: checking if $cf_cv_screen library uses pthreads" >&5
++echo "$as_me:15393: checking if $cf_cv_screen library uses pthreads" >&5
  echo $ECHO_N "checking if $cf_cv_screen library uses pthreads... $ECHO_C" >&6
  if test "${cf_cv_use_pthreads+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
  cat >conftest.$ac_ext <<_ACEOF
--#line 14753 "configure"
-+#line 14756 "configure"
+-#line 15399 "configure"
++#line 15400 "configure"
  #include "confdefs.h"
  
  #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -14768,16 +14771,16 @@
+@@ -15414,16 +15415,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14771: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14774: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:15417: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15418: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:14774: \$? = $ac_status" >&5
-+  echo "$as_me:14777: \$? = $ac_status" >&5
+-  echo "$as_me:15420: \$? = $ac_status" >&5
++  echo "$as_me:15421: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14777: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14780: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:15423: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15424: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:14780: \$? = $ac_status" >&5
-+  echo "$as_me:14783: \$? = $ac_status" >&5
+-  echo "$as_me:15426: \$? = $ac_status" >&5
++  echo "$as_me:15427: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_use_pthreads=yes
  else
-@@ -14788,20 +14791,20 @@
+@@ -15434,20 +15435,20 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  
  fi
--echo "$as_me:14791: result: $cf_cv_use_pthreads" >&5
-+echo "$as_me:14794: result: $cf_cv_use_pthreads" >&5
+-echo "$as_me:15437: result: $cf_cv_use_pthreads" >&5
++echo "$as_me:15438: result: $cf_cv_use_pthreads" >&5
  echo "${ECHO_T}$cf_cv_use_pthreads" >&6
  test $cf_cv_use_pthreads = yes && cat >>confdefs.h <<\EOF
  #define USE_PTHREADS 1
  EOF
  
--echo "$as_me:14797: checking if sys/time.h works with sys/select.h" >&5
-+echo "$as_me:14800: checking if sys/time.h works with sys/select.h" >&5
+-echo "$as_me:15443: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:15444: checking if sys/time.h works with sys/select.h" >&5
  echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
  if test "${cf_cv_sys_time_select+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
  cat >conftest.$ac_ext <<_ACEOF
--#line 14804 "configure"
-+#line 14807 "configure"
+-#line 15450 "configure"
++#line 15451 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -14821,16 +14824,16 @@
+@@ -15467,16 +15468,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14824: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14827: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:15470: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15471: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:14827: \$? = $ac_status" >&5
-+  echo "$as_me:14830: \$? = $ac_status" >&5
+-  echo "$as_me:15473: \$? = $ac_status" >&5
++  echo "$as_me:15474: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14830: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14833: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:15476: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15477: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:14833: \$? = $ac_status" >&5
-+  echo "$as_me:14836: \$? = $ac_status" >&5
+-  echo "$as_me:15479: \$? = $ac_status" >&5
++  echo "$as_me:15480: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_sys_time_select=yes
  else
-@@ -14842,7 +14845,7 @@
+@@ -15488,7 +15489,7 @@
  
  fi
  
--echo "$as_me:14845: result: $cf_cv_sys_time_select" >&5
-+echo "$as_me:14848: result: $cf_cv_sys_time_select" >&5
+-echo "$as_me:15491: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:15492: result: $cf_cv_sys_time_select" >&5
  echo "${ECHO_T}$cf_cv_sys_time_select" >&6
  test "$cf_cv_sys_time_select" = yes &&
  cat >>confdefs.h <<\EOF
-@@ -14851,7 +14854,7 @@
+@@ -15497,7 +15498,7 @@
  
  # special check for test/ditto.c
  
--echo "$as_me:14854: checking for openpty in -lutil" >&5
-+echo "$as_me:14857: checking for openpty in -lutil" >&5
+-echo "$as_me:15500: checking for openpty in -lutil" >&5
++echo "$as_me:15501: checking for openpty in -lutil" >&5
  echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
  if test "${ac_cv_lib_util_openpty+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14859,7 +14862,7 @@
+@@ -15505,7 +15506,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lutil  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 14862 "configure"
-+#line 14865 "configure"
+-#line 15508 "configure"
++#line 15509 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14878,16 +14881,16 @@
+@@ -15524,16 +15525,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14881: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14884: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:15527: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15528: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:14884: \$? = $ac_status" >&5
-+  echo "$as_me:14887: \$? = $ac_status" >&5
+-  echo "$as_me:15530: \$? = $ac_status" >&5
++  echo "$as_me:15531: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14887: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14890: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:15533: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15534: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:14890: \$? = $ac_status" >&5
-+  echo "$as_me:14893: \$? = $ac_status" >&5
+-  echo "$as_me:15536: \$? = $ac_status" >&5
++  echo "$as_me:15537: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_util_openpty=yes
  else
-@@ -14898,7 +14901,7 @@
+@@ -15544,7 +15545,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:14901: result: $ac_cv_lib_util_openpty" >&5
-+echo "$as_me:14904: result: $ac_cv_lib_util_openpty" >&5
+-echo "$as_me:15547: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:15548: result: $ac_cv_lib_util_openpty" >&5
  echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
  if test $ac_cv_lib_util_openpty = yes; then
    cf_cv_lib_util=yes
-@@ -14906,7 +14909,7 @@
+@@ -15552,7 +15553,7 @@
    cf_cv_lib_util=no
  fi
  
--echo "$as_me:14909: checking for openpty header" >&5
-+echo "$as_me:14912: checking for openpty header" >&5
+-echo "$as_me:15555: checking for openpty header" >&5
++echo "$as_me:15556: checking for openpty header" >&5
  echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
  if test "${cf_cv_func_openpty+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14933,7 +14936,7 @@
+@@ -15579,7 +15580,7 @@
  	for cf_header in pty.h libutil.h util.h
  	do
  	cat >conftest.$ac_ext <<_ACEOF
--#line 14936 "configure"
-+#line 14939 "configure"
+-#line 15582 "configure"
++#line 15583 "configure"
  #include "confdefs.h"
  
  #include <$cf_header>
-@@ -14950,16 +14953,16 @@
+@@ -15596,16 +15597,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14953: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14956: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:15599: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15600: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:14956: \$? = $ac_status" >&5
-+  echo "$as_me:14959: \$? = $ac_status" >&5
+-  echo "$as_me:15602: \$? = $ac_status" >&5
++  echo "$as_me:15603: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14959: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14962: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:15605: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15606: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:14962: \$? = $ac_status" >&5
-+  echo "$as_me:14965: \$? = $ac_status" >&5
+-  echo "$as_me:15608: \$? = $ac_status" >&5
++  echo "$as_me:15609: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
  		cf_cv_func_openpty=$cf_header
-@@ -14977,7 +14980,7 @@
+@@ -15623,7 +15624,7 @@
  	LIBS="$cf_save_LIBS"
  
  fi
--echo "$as_me:14980: result: $cf_cv_func_openpty" >&5
-+echo "$as_me:14983: result: $cf_cv_func_openpty" >&5
+-echo "$as_me:15626: result: $cf_cv_func_openpty" >&5
++echo "$as_me:15627: result: $cf_cv_func_openpty" >&5
  echo "${ECHO_T}$cf_cv_func_openpty" >&6
  
  if test "$cf_cv_func_openpty" != no ; then
-@@ -15011,7 +15014,7 @@
+@@ -15657,7 +15658,7 @@
  	fi
  fi
  
--echo "$as_me:15014: checking for function curses_version" >&5
-+echo "$as_me:15017: checking for function curses_version" >&5
+-echo "$as_me:15660: checking for function curses_version" >&5
++echo "$as_me:15661: 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
-@@ -15021,7 +15024,7 @@
+@@ -15667,7 +15668,7 @@
    cf_cv_func_curses_version=unknown
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 15024 "configure"
-+#line 15027 "configure"
+-#line 15670 "configure"
++#line 15671 "configure"
  #include "confdefs.h"
  
  #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -15034,15 +15037,15 @@
+@@ -15680,15 +15681,15 @@
  
  _ACEOF
  rm -f conftest$ac_exeext
--if { (eval echo "$as_me:15037: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15040: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:15683: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15684: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:15040: \$? = $ac_status" >&5
-+  echo "$as_me:15043: \$? = $ac_status" >&5
+-  echo "$as_me:15686: \$? = $ac_status" >&5
++  echo "$as_me:15687: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:15042: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15045: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:15688: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15689: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:15045: \$? = $ac_status" >&5
-+  echo "$as_me:15048: \$? = $ac_status" >&5
+-  echo "$as_me:15691: \$? = $ac_status" >&5
++  echo "$as_me:15692: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_func_curses_version=yes
  
-@@ -15057,14 +15060,14 @@
+@@ -15703,14 +15704,14 @@
  fi
  rm -f core
  fi
--echo "$as_me:15060: result: $cf_cv_func_curses_version" >&5
-+echo "$as_me:15063: result: $cf_cv_func_curses_version" >&5
+-echo "$as_me:15706: result: $cf_cv_func_curses_version" >&5
++echo "$as_me:15707: result: $cf_cv_func_curses_version" >&5
  echo "${ECHO_T}$cf_cv_func_curses_version" >&6
  test "$cf_cv_func_curses_version" = yes &&
  cat >>confdefs.h <<\EOF
  #define HAVE_CURSES_VERSION 1
  EOF
  
--echo "$as_me:15067: checking for alternate character set array" >&5
-+echo "$as_me:15070: checking for alternate character set array" >&5
+-echo "$as_me:15713: checking for alternate character set array" >&5
++echo "$as_me:15714: checking for alternate character set array" >&5
  echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6
  if test "${cf_cv_curses_acs_map+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15074,7 +15077,7 @@
+@@ -15720,7 +15721,7 @@
  for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
  do
  cat >conftest.$ac_ext <<_ACEOF
--#line 15077 "configure"
-+#line 15080 "configure"
+-#line 15723 "configure"
++#line 15724 "configure"
  #include "confdefs.h"
  
  #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -15090,16 +15093,16 @@
+@@ -15736,16 +15737,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15093: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15096: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:15739: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15740: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:15096: \$? = $ac_status" >&5
-+  echo "$as_me:15099: \$? = $ac_status" >&5
+-  echo "$as_me:15742: \$? = $ac_status" >&5
++  echo "$as_me:15743: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15099: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15102: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:15745: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15746: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:15102: \$? = $ac_status" >&5
-+  echo "$as_me:15105: \$? = $ac_status" >&5
+-  echo "$as_me:15748: \$? = $ac_status" >&5
++  echo "$as_me:15749: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_curses_acs_map=$name; break
  else
-@@ -15110,7 +15113,7 @@
+@@ -15756,7 +15757,7 @@
  done
  
  fi
--echo "$as_me:15113: result: $cf_cv_curses_acs_map" >&5
-+echo "$as_me:15116: result: $cf_cv_curses_acs_map" >&5
+-echo "$as_me:15759: result: $cf_cv_curses_acs_map" >&5
++echo "$as_me:15760: result: $cf_cv_curses_acs_map" >&5
  echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
  
  test "$cf_cv_curses_acs_map" != unknown &&
-@@ -15120,7 +15123,7 @@
+@@ -15766,7 +15767,7 @@
  
  if test "$cf_enable_widec" = yes; then
  
--echo "$as_me:15123: checking for wide alternate character set array" >&5
-+echo "$as_me:15126: checking for wide alternate character set array" >&5
+-echo "$as_me:15769: checking for wide alternate character set array" >&5
++echo "$as_me:15770: checking for wide alternate character set array" >&5
  echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6
  if test "${cf_cv_curses_wacs_map+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15130,7 +15133,7 @@
+@@ -15776,7 +15777,7 @@
  	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
  	do
  	cat >conftest.$ac_ext <<_ACEOF
--#line 15133 "configure"
-+#line 15136 "configure"
+-#line 15779 "configure"
++#line 15780 "configure"
  #include "confdefs.h"
  
  #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -15146,16 +15149,16 @@
+@@ -15792,16 +15793,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15149: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15152: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:15795: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15796: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:15152: \$? = $ac_status" >&5
-+  echo "$as_me:15155: \$? = $ac_status" >&5
+-  echo "$as_me:15798: \$? = $ac_status" >&5
++  echo "$as_me:15799: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15155: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15158: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:15801: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15802: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:15158: \$? = $ac_status" >&5
-+  echo "$as_me:15161: \$? = $ac_status" >&5
+-  echo "$as_me:15804: \$? = $ac_status" >&5
++  echo "$as_me:15805: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_curses_wacs_map=$name
  	 break
-@@ -15166,7 +15169,7 @@
+@@ -15812,7 +15813,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  	done
  fi
--echo "$as_me:15169: result: $cf_cv_curses_wacs_map" >&5
-+echo "$as_me:15172: result: $cf_cv_curses_wacs_map" >&5
+-echo "$as_me:15815: result: $cf_cv_curses_wacs_map" >&5
++echo "$as_me:15816: result: $cf_cv_curses_wacs_map" >&5
  echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
  
  test "$cf_cv_curses_wacs_map" != unknown &&
-@@ -15174,7 +15177,7 @@
+@@ -15820,7 +15821,7 @@
  #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
  EOF
  
--echo "$as_me:15177: checking for wide alternate character constants" >&5
-+echo "$as_me:15180: checking for wide alternate character constants" >&5
+-echo "$as_me:15823: checking for wide alternate character constants" >&5
++echo "$as_me:15824: checking for wide alternate character constants" >&5
  echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6
  if test "${cf_cv_curses_wacs_symbols+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15184,7 +15187,7 @@
+@@ -15830,7 +15831,7 @@
  if test "$cf_cv_curses_wacs_map" != unknown
  then
  	cat >conftest.$ac_ext <<_ACEOF
--#line 15187 "configure"
-+#line 15190 "configure"
+-#line 15833 "configure"
++#line 15834 "configure"
  #include "confdefs.h"
  
  #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -15201,16 +15204,16 @@
+@@ -15847,16 +15848,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15204: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15207: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:15850: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15851: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:15207: \$? = $ac_status" >&5
-+  echo "$as_me:15210: \$? = $ac_status" >&5
+-  echo "$as_me:15853: \$? = $ac_status" >&5
++  echo "$as_me:15854: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15210: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15213: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:15856: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15857: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:15213: \$? = $ac_status" >&5
-+  echo "$as_me:15216: \$? = $ac_status" >&5
+-  echo "$as_me:15859: \$? = $ac_status" >&5
++  echo "$as_me:15860: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_curses_wacs_symbols=yes
  else
-@@ -15220,7 +15223,7 @@
+@@ -15866,7 +15867,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  else
  	cat >conftest.$ac_ext <<_ACEOF
--#line 15223 "configure"
-+#line 15226 "configure"
+-#line 15869 "configure"
++#line 15870 "configure"
  #include "confdefs.h"
  
  #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -15236,16 +15239,16 @@
+@@ -15882,16 +15883,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15239: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15242: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:15885: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15886: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:15242: \$? = $ac_status" >&5
-+  echo "$as_me:15245: \$? = $ac_status" >&5
+-  echo "$as_me:15888: \$? = $ac_status" >&5
++  echo "$as_me:15889: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15245: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15248: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:15891: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15892: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:15248: \$? = $ac_status" >&5
-+  echo "$as_me:15251: \$? = $ac_status" >&5
+-  echo "$as_me:15894: \$? = $ac_status" >&5
++  echo "$as_me:15895: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_curses_wacs_symbols=yes
  else
-@@ -15256,7 +15259,7 @@
+@@ -15902,7 +15903,7 @@
  fi
  
  fi
--echo "$as_me:15259: result: $cf_cv_curses_wacs_symbols" >&5
-+echo "$as_me:15262: result: $cf_cv_curses_wacs_symbols" >&5
+-echo "$as_me:15905: result: $cf_cv_curses_wacs_symbols" >&5
++echo "$as_me:15906: result: $cf_cv_curses_wacs_symbols" >&5
  echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
  
  test "$cf_cv_curses_wacs_symbols" != no &&
-@@ -15266,10 +15269,10 @@
+@@ -15912,10 +15913,10 @@
  
  fi
  
--echo "$as_me:15269: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:15272: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+-echo "$as_me:15915: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:15916: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
  echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
--#line 15272 "configure"
-+#line 15275 "configure"
+-#line 15918 "configure"
++#line 15919 "configure"
  #include "confdefs.h"
  
  #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -15287,16 +15290,16 @@
+@@ -15933,16 +15934,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15290: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15293: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:15936: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15937: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:15293: \$? = $ac_status" >&5
-+  echo "$as_me:15296: \$? = $ac_status" >&5
+-  echo "$as_me:15939: \$? = $ac_status" >&5
++  echo "$as_me:15940: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15296: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15299: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:15942: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15943: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:15299: \$? = $ac_status" >&5
-+  echo "$as_me:15302: \$? = $ac_status" >&5
+-  echo "$as_me:15945: \$? = $ac_status" >&5
++  echo "$as_me:15946: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -15305,7 +15308,7 @@
+@@ -15951,7 +15952,7 @@
  cf_result=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:15308: result: $cf_result" >&5
-+echo "$as_me:15311: result: $cf_result" >&5
+-echo "$as_me:15954: result: $cf_result" >&5
++echo "$as_me:15955: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
  if test $cf_result = yes ; then
  
-@@ -15326,14 +15329,14 @@
+@@ -15972,14 +15973,14 @@
  if test "$cf_enable_widec" = yes; then
  
  # This is needed on Tru64 5.0 to declare mbstate_t
--echo "$as_me:15329: checking if we must include wchar.h to declare mbstate_t" >&5
-+echo "$as_me:15332: checking if we must include wchar.h to declare mbstate_t" >&5
+-echo "$as_me:15975: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:15976: 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_mbstate_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
  cat >conftest.$ac_ext <<_ACEOF
--#line 15336 "configure"
-+#line 15339 "configure"
+-#line 15982 "configure"
++#line 15983 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -15351,23 +15354,23 @@
+@@ -15997,23 +15998,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15354: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15357: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:16000: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16001: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:15357: \$? = $ac_status" >&5
-+  echo "$as_me:15360: \$? = $ac_status" >&5
+-  echo "$as_me:16003: \$? = $ac_status" >&5
++  echo "$as_me:16004: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15360: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15363: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:16006: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16007: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:15363: \$? = $ac_status" >&5
-+  echo "$as_me:15366: \$? = $ac_status" >&5
+-  echo "$as_me:16009: \$? = $ac_status" >&5
++  echo "$as_me:16010: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_mbstate_t=no
  else
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
  cat >conftest.$ac_ext <<_ACEOF
--#line 15370 "configure"
-+#line 15373 "configure"
+-#line 16016 "configure"
++#line 16017 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -15386,16 +15389,16 @@
+@@ -16032,16 +16033,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15389: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15392: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:16035: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16036: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:15392: \$? = $ac_status" >&5
-+  echo "$as_me:15395: \$? = $ac_status" >&5
+-  echo "$as_me:16038: \$? = $ac_status" >&5
++  echo "$as_me:16039: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15395: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15398: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:16041: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16042: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:15398: \$? = $ac_status" >&5
-+  echo "$as_me:15401: \$? = $ac_status" >&5
+-  echo "$as_me:16044: \$? = $ac_status" >&5
++  echo "$as_me:16045: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_mbstate_t=yes
  else
-@@ -15407,7 +15410,7 @@
+@@ -16053,7 +16054,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
--echo "$as_me:15410: result: $cf_cv_mbstate_t" >&5
-+echo "$as_me:15413: result: $cf_cv_mbstate_t" >&5
+-echo "$as_me:16056: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:16057: result: $cf_cv_mbstate_t" >&5
  echo "${ECHO_T}$cf_cv_mbstate_t" >&6
  
  if test "$cf_cv_mbstate_t" = yes ; then
-@@ -15430,14 +15433,14 @@
+@@ -16076,14 +16077,14 @@
  fi
  
  # This is needed on Tru64 5.0 to declare wchar_t
--echo "$as_me:15433: checking if we must include wchar.h to declare wchar_t" >&5
-+echo "$as_me:15436: checking if we must include wchar.h to declare wchar_t" >&5
+-echo "$as_me:16079: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:16080: checking if we must include wchar.h to declare wchar_t" >&5
  echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
  if test "${cf_cv_wchar_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
  cat >conftest.$ac_ext <<_ACEOF
--#line 15440 "configure"
-+#line 15443 "configure"
+-#line 16086 "configure"
++#line 16087 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -15455,23 +15458,23 @@
+@@ -16101,23 +16102,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15458: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15461: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:16104: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16105: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:15461: \$? = $ac_status" >&5
-+  echo "$as_me:15464: \$? = $ac_status" >&5
+-  echo "$as_me:16107: \$? = $ac_status" >&5
++  echo "$as_me:16108: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15464: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15467: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:16110: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16111: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:15467: \$? = $ac_status" >&5
-+  echo "$as_me:15470: \$? = $ac_status" >&5
+-  echo "$as_me:16113: \$? = $ac_status" >&5
++  echo "$as_me:16114: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_wchar_t=no
  else
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
  cat >conftest.$ac_ext <<_ACEOF
--#line 15474 "configure"
-+#line 15477 "configure"
+-#line 16120 "configure"
++#line 16121 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -15490,16 +15493,16 @@
+@@ -16136,16 +16137,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15493: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15496: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:16139: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16140: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:15496: \$? = $ac_status" >&5
-+  echo "$as_me:15499: \$? = $ac_status" >&5
+-  echo "$as_me:16142: \$? = $ac_status" >&5
++  echo "$as_me:16143: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15499: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15502: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:16145: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16146: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:15502: \$? = $ac_status" >&5
-+  echo "$as_me:15505: \$? = $ac_status" >&5
+-  echo "$as_me:16148: \$? = $ac_status" >&5
++  echo "$as_me:16149: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_wchar_t=yes
  else
-@@ -15511,7 +15514,7 @@
+@@ -16157,7 +16158,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
--echo "$as_me:15514: result: $cf_cv_wchar_t" >&5
-+echo "$as_me:15517: result: $cf_cv_wchar_t" >&5
+-echo "$as_me:16160: result: $cf_cv_wchar_t" >&5
++echo "$as_me:16161: result: $cf_cv_wchar_t" >&5
  echo "${ECHO_T}$cf_cv_wchar_t" >&6
  
  if test "$cf_cv_wchar_t" = yes ; then
-@@ -15534,14 +15537,14 @@
+@@ -16180,14 +16181,14 @@
  fi
  
  # This is needed on Tru64 5.0 to declare wint_t
--echo "$as_me:15537: checking if we must include wchar.h to declare wint_t" >&5
-+echo "$as_me:15540: checking if we must include wchar.h to declare wint_t" >&5
+-echo "$as_me:16183: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:16184: checking if we must include wchar.h to declare wint_t" >&5
  echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
  if test "${cf_cv_wint_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
  cat >conftest.$ac_ext <<_ACEOF
--#line 15544 "configure"
-+#line 15547 "configure"
+-#line 16190 "configure"
++#line 16191 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -15559,23 +15562,23 @@
+@@ -16205,23 +16206,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15562: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15565: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:16208: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16209: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:15565: \$? = $ac_status" >&5
-+  echo "$as_me:15568: \$? = $ac_status" >&5
+-  echo "$as_me:16211: \$? = $ac_status" >&5
++  echo "$as_me:16212: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15568: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15571: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:16214: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16215: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:15571: \$? = $ac_status" >&5
-+  echo "$as_me:15574: \$? = $ac_status" >&5
+-  echo "$as_me:16217: \$? = $ac_status" >&5
++  echo "$as_me:16218: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_wint_t=no
  else
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
  cat >conftest.$ac_ext <<_ACEOF
--#line 15578 "configure"
-+#line 15581 "configure"
+-#line 16224 "configure"
++#line 16225 "configure"
  #include "confdefs.h"
  
  #include 
-@@ -15594,16 +15597,16 @@
+@@ -16240,16 +16241,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15597: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15600: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:16243: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16244: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:15600: \$? = $ac_status" >&5
-+  echo "$as_me:15603: \$? = $ac_status" >&5
+-  echo "$as_me:16246: \$? = $ac_status" >&5
++  echo "$as_me:16247: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15603: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15606: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:16249: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16250: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:15606: \$? = $ac_status" >&5
-+  echo "$as_me:15609: \$? = $ac_status" >&5
+-  echo "$as_me:16252: \$? = $ac_status" >&5
++  echo "$as_me:16253: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_wint_t=yes
  else
-@@ -15615,7 +15618,7 @@
+@@ -16261,7 +16262,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
--echo "$as_me:15618: result: $cf_cv_wint_t" >&5
-+echo "$as_me:15621: result: $cf_cv_wint_t" >&5
+-echo "$as_me:16264: result: $cf_cv_wint_t" >&5
++echo "$as_me:16265: result: $cf_cv_wint_t" >&5
  echo "${ECHO_T}$cf_cv_wint_t" >&6
  
  if test "$cf_cv_wint_t" = yes ; then
-@@ -15639,10 +15642,10 @@
+@@ -16285,10 +16286,10 @@
  
  	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
  
--echo "$as_me:15642: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:15645: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+-echo "$as_me:16288: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:16289: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
  echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
--#line 15645 "configure"
-+#line 15648 "configure"
+-#line 16291 "configure"
++#line 16292 "configure"
  #include "confdefs.h"
  
  #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -15660,16 +15663,16 @@
+@@ -16306,16 +16307,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15663: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15666: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:16309: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16310: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:15666: \$? = $ac_status" >&5
-+  echo "$as_me:15669: \$? = $ac_status" >&5
+-  echo "$as_me:16312: \$? = $ac_status" >&5
++  echo "$as_me:16313: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15669: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15672: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:16315: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16316: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:15672: \$? = $ac_status" >&5
-+  echo "$as_me:15675: \$? = $ac_status" >&5
+-  echo "$as_me:16318: \$? = $ac_status" >&5
++  echo "$as_me:16319: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -15678,7 +15681,7 @@
+@@ -16324,7 +16325,7 @@
  cf_result=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:15681: result: $cf_result" >&5
-+echo "$as_me:15684: result: $cf_result" >&5
+-echo "$as_me:16327: result: $cf_result" >&5
++echo "$as_me:16328: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
  if test $cf_result = yes ; then
  
-@@ -15700,10 +15703,10 @@
+@@ -16346,10 +16347,10 @@
  
  	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
  
--echo "$as_me:15703: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:15706: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+-echo "$as_me:16349: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:16350: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
  echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
--#line 15706 "configure"
-+#line 15709 "configure"
+-#line 16352 "configure"
++#line 16353 "configure"
  #include "confdefs.h"
  
  #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -15721,16 +15724,16 @@
+@@ -16367,16 +16368,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15724: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15727: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:16370: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16371: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:15727: \$? = $ac_status" >&5
-+  echo "$as_me:15730: \$? = $ac_status" >&5
+-  echo "$as_me:16373: \$? = $ac_status" >&5
++  echo "$as_me:16374: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15730: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15733: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:16376: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16377: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:15733: \$? = $ac_status" >&5
-+  echo "$as_me:15736: \$? = $ac_status" >&5
+-  echo "$as_me:16379: \$? = $ac_status" >&5
++  echo "$as_me:16380: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -15739,7 +15742,7 @@
+@@ -16385,7 +16386,7 @@
  cf_result=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:15742: result: $cf_result" >&5
-+echo "$as_me:15745: result: $cf_result" >&5
+-echo "$as_me:16388: result: $cf_result" >&5
++echo "$as_me:16389: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
  if test $cf_result = yes ; then
  
-@@ -15761,10 +15764,10 @@
+@@ -16407,10 +16408,10 @@
  
  	if test "$NCURSES_OK_WINT_T" = 0 ; then
  
--echo "$as_me:15764: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:15767: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+-echo "$as_me:16410: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:16411: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
  echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
--#line 15767 "configure"
-+#line 15770 "configure"
+-#line 16413 "configure"
++#line 16414 "configure"
  #include "confdefs.h"
  
  #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -15782,16 +15785,16 @@
+@@ -16428,16 +16429,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15785: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15788: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:16431: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16432: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:15788: \$? = $ac_status" >&5
-+  echo "$as_me:15791: \$? = $ac_status" >&5
+-  echo "$as_me:16434: \$? = $ac_status" >&5
++  echo "$as_me:16435: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15791: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15794: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:16437: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16438: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:15794: \$? = $ac_status" >&5
-+  echo "$as_me:15797: \$? = $ac_status" >&5
+-  echo "$as_me:16440: \$? = $ac_status" >&5
++  echo "$as_me:16441: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -15800,7 +15803,7 @@
+@@ -16446,7 +16447,7 @@
  cf_result=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:15803: result: $cf_result" >&5
-+echo "$as_me:15806: result: $cf_result" >&5
+-echo "$as_me:16449: result: $cf_result" >&5
++echo "$as_me:16450: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
  if test $cf_result = yes ; then
  
-@@ -15821,11 +15824,11 @@
+@@ -16467,11 +16468,11 @@
  	fi
  fi
  
--echo "$as_me:15824: checking for data ospeed declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:15827: checking for data ospeed declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+-echo "$as_me:16470: checking for data ospeed declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:16471: checking for data ospeed declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
  echo $ECHO_N "checking for data ospeed declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
  
  cat >conftest.$ac_ext <<_ACEOF
--#line 15828 "configure"
-+#line 15831 "configure"
+-#line 16474 "configure"
++#line 16475 "configure"
  #include "confdefs.h"
  
  #ifdef HAVE_XCURSES
-@@ -15853,16 +15856,16 @@
+@@ -16499,16 +16500,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15856: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15859: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:16502: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16503: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:15859: \$? = $ac_status" >&5
-+  echo "$as_me:15862: \$? = $ac_status" >&5
+-  echo "$as_me:16505: \$? = $ac_status" >&5
++  echo "$as_me:16506: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15862: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15865: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:16508: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16509: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:15865: \$? = $ac_status" >&5
-+  echo "$as_me:15868: \$? = $ac_status" >&5
+-  echo "$as_me:16511: \$? = $ac_status" >&5
++  echo "$as_me:16512: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -15871,7 +15874,7 @@
+@@ -16517,7 +16518,7 @@
  cf_result=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:15874: result: $cf_result" >&5
-+echo "$as_me:15877: result: $cf_result" >&5
+-echo "$as_me:16520: result: $cf_result" >&5
++echo "$as_me:16521: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
  
  if test $cf_result = yes ; then
-@@ -15883,14 +15886,14 @@
+@@ -16529,14 +16530,14 @@
  EOF
  
  else
--	echo "$as_me:15886: checking for data ospeed in library" >&5
-+	echo "$as_me:15889: checking for data ospeed in library" >&5
+-	echo "$as_me:16532: checking for data ospeed in library" >&5
++	echo "$as_me:16533: checking for data ospeed in library" >&5
  echo $ECHO_N "checking for data ospeed in library... $ECHO_C" >&6
  	# BSD linkers insist on making weak linkage, but resolve at runtime.
  	if test "$cross_compiling" = yes; then
  
  	# cross-compiling
  	cat >conftest.$ac_ext <<_ACEOF
--#line 15893 "configure"
-+#line 15896 "configure"
+-#line 16539 "configure"
++#line 16540 "configure"
  #include "confdefs.h"
  
  #ifdef HAVE_XCURSES
-@@ -15923,16 +15926,16 @@
+@@ -16569,16 +16570,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15926: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15929: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:16572: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16573: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:15929: \$? = $ac_status" >&5
-+  echo "$as_me:15932: \$? = $ac_status" >&5
+-  echo "$as_me:16575: \$? = $ac_status" >&5
++  echo "$as_me:16576: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15932: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15935: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:16578: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16579: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:15935: \$? = $ac_status" >&5
-+  echo "$as_me:15938: \$? = $ac_status" >&5
+-  echo "$as_me:16581: \$? = $ac_status" >&5
++  echo "$as_me:16582: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -15944,7 +15947,7 @@
+@@ -16590,7 +16591,7 @@
  
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 15947 "configure"
-+#line 15950 "configure"
+-#line 16593 "configure"
++#line 16594 "configure"
  #include "confdefs.h"
  
  #ifdef HAVE_XCURSES
-@@ -15970,15 +15973,15 @@
+@@ -16616,15 +16617,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
--if { (eval echo "$as_me:15973: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15976: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:16619: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16620: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:15976: \$? = $ac_status" >&5
-+  echo "$as_me:15979: \$? = $ac_status" >&5
+-  echo "$as_me:16622: \$? = $ac_status" >&5
++  echo "$as_me:16623: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:15978: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15981: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:16624: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16625: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:15981: \$? = $ac_status" >&5
-+  echo "$as_me:15984: \$? = $ac_status" >&5
+-  echo "$as_me:16627: \$? = $ac_status" >&5
++  echo "$as_me:16628: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -15989,7 +15992,7 @@
+@@ -16635,7 +16636,7 @@
  fi
  rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
--	echo "$as_me:15992: result: $cf_result" >&5
-+	echo "$as_me:15995: result: $cf_result" >&5
+-	echo "$as_me:16638: result: $cf_result" >&5
++	echo "$as_me:16639: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
  	if test $cf_result = yes ; then
  
-@@ -16002,11 +16005,11 @@
+@@ -16648,11 +16649,11 @@
  	fi
  fi
  
--echo "$as_me:16005: checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:16008: checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+-echo "$as_me:16651: checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:16652: checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
  echo $ECHO_N "checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
  
  cat >conftest.$ac_ext <<_ACEOF
--#line 16009 "configure"
-+#line 16012 "configure"
+-#line 16655 "configure"
++#line 16656 "configure"
  #include "confdefs.h"
  
  #ifdef HAVE_XCURSES
-@@ -16034,16 +16037,16 @@
+@@ -16680,16 +16681,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16037: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16040: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:16683: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16684: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:16040: \$? = $ac_status" >&5
-+  echo "$as_me:16043: \$? = $ac_status" >&5
+-  echo "$as_me:16686: \$? = $ac_status" >&5
++  echo "$as_me:16687: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16043: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16046: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:16689: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16690: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:16046: \$? = $ac_status" >&5
-+  echo "$as_me:16049: \$? = $ac_status" >&5
+-  echo "$as_me:16692: \$? = $ac_status" >&5
++  echo "$as_me:16693: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -16052,7 +16055,7 @@
+@@ -16698,7 +16699,7 @@
  cf_result=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:16055: result: $cf_result" >&5
-+echo "$as_me:16058: result: $cf_result" >&5
+-echo "$as_me:16701: result: $cf_result" >&5
++echo "$as_me:16702: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
  
  if test $cf_result = yes ; then
-@@ -16064,14 +16067,14 @@
+@@ -16710,14 +16711,14 @@
  EOF
  
  else
--	echo "$as_me:16067: checking for data boolnames in library" >&5
-+	echo "$as_me:16070: checking for data boolnames in library" >&5
+-	echo "$as_me:16713: checking for data boolnames in library" >&5
++	echo "$as_me:16714: checking for data boolnames in library" >&5
  echo $ECHO_N "checking for data boolnames in library... $ECHO_C" >&6
  	# BSD linkers insist on making weak linkage, but resolve at runtime.
  	if test "$cross_compiling" = yes; then
  
  	# cross-compiling
  	cat >conftest.$ac_ext <<_ACEOF
--#line 16074 "configure"
-+#line 16077 "configure"
+-#line 16720 "configure"
++#line 16721 "configure"
  #include "confdefs.h"
  
  #ifdef HAVE_XCURSES
-@@ -16104,16 +16107,16 @@
+@@ -16750,16 +16751,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16107: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16110: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:16753: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16754: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:16110: \$? = $ac_status" >&5
-+  echo "$as_me:16113: \$? = $ac_status" >&5
+-  echo "$as_me:16756: \$? = $ac_status" >&5
++  echo "$as_me:16757: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16113: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16116: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:16759: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16760: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:16116: \$? = $ac_status" >&5
-+  echo "$as_me:16119: \$? = $ac_status" >&5
+-  echo "$as_me:16762: \$? = $ac_status" >&5
++  echo "$as_me:16763: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -16125,7 +16128,7 @@
+@@ -16771,7 +16772,7 @@
  
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 16128 "configure"
-+#line 16131 "configure"
+-#line 16774 "configure"
++#line 16775 "configure"
  #include "confdefs.h"
  
  #ifdef HAVE_XCURSES
-@@ -16151,15 +16154,15 @@
+@@ -16797,15 +16798,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16154: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16157: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:16800: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16801: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:16157: \$? = $ac_status" >&5
-+  echo "$as_me:16160: \$? = $ac_status" >&5
+-  echo "$as_me:16803: \$? = $ac_status" >&5
++  echo "$as_me:16804: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16159: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16162: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:16805: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16806: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:16162: \$? = $ac_status" >&5
-+  echo "$as_me:16165: \$? = $ac_status" >&5
+-  echo "$as_me:16808: \$? = $ac_status" >&5
++  echo "$as_me:16809: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -16170,7 +16173,7 @@
+@@ -16816,7 +16817,7 @@
  fi
  rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
--	echo "$as_me:16173: result: $cf_result" >&5
-+	echo "$as_me:16176: result: $cf_result" >&5
+-	echo "$as_me:16819: result: $cf_result" >&5
++	echo "$as_me:16820: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
  	if test $cf_result = yes ; then
  
-@@ -16183,11 +16186,11 @@
+@@ -16829,11 +16830,11 @@
  	fi
  fi
  
--echo "$as_me:16186: checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:16189: checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+-echo "$as_me:16832: checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:16833: checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
  echo $ECHO_N "checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
  
  cat >conftest.$ac_ext <<_ACEOF
--#line 16190 "configure"
-+#line 16193 "configure"
+-#line 16836 "configure"
++#line 16837 "configure"
  #include "confdefs.h"
  
  #ifdef HAVE_XCURSES
-@@ -16215,16 +16218,16 @@
+@@ -16861,16 +16862,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16218: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16221: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:16864: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16865: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:16221: \$? = $ac_status" >&5
-+  echo "$as_me:16224: \$? = $ac_status" >&5
+-  echo "$as_me:16867: \$? = $ac_status" >&5
++  echo "$as_me:16868: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16224: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16227: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:16870: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16871: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:16227: \$? = $ac_status" >&5
-+  echo "$as_me:16230: \$? = $ac_status" >&5
+-  echo "$as_me:16873: \$? = $ac_status" >&5
++  echo "$as_me:16874: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -16233,7 +16236,7 @@
+@@ -16879,7 +16880,7 @@
  cf_result=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:16236: result: $cf_result" >&5
-+echo "$as_me:16239: result: $cf_result" >&5
+-echo "$as_me:16882: result: $cf_result" >&5
++echo "$as_me:16883: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
  
  if test $cf_result = yes ; then
-@@ -16245,14 +16248,14 @@
+@@ -16891,14 +16892,14 @@
  EOF
  
  else
--	echo "$as_me:16248: checking for data boolfnames in library" >&5
-+	echo "$as_me:16251: checking for data boolfnames in library" >&5
+-	echo "$as_me:16894: checking for data boolfnames in library" >&5
++	echo "$as_me:16895: checking for data boolfnames in library" >&5
  echo $ECHO_N "checking for data boolfnames in library... $ECHO_C" >&6
  	# BSD linkers insist on making weak linkage, but resolve at runtime.
  	if test "$cross_compiling" = yes; then
  
  	# cross-compiling
  	cat >conftest.$ac_ext <<_ACEOF
--#line 16255 "configure"
-+#line 16258 "configure"
+-#line 16901 "configure"
++#line 16902 "configure"
  #include "confdefs.h"
  
  #ifdef HAVE_XCURSES
-@@ -16285,16 +16288,16 @@
+@@ -16931,16 +16932,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16288: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16291: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:16934: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16935: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:16291: \$? = $ac_status" >&5
-+  echo "$as_me:16294: \$? = $ac_status" >&5
+-  echo "$as_me:16937: \$? = $ac_status" >&5
++  echo "$as_me:16938: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16294: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16297: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:16940: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16941: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:16297: \$? = $ac_status" >&5
-+  echo "$as_me:16300: \$? = $ac_status" >&5
+-  echo "$as_me:16943: \$? = $ac_status" >&5
++  echo "$as_me:16944: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -16306,7 +16309,7 @@
+@@ -16952,7 +16953,7 @@
  
  else
    cat >conftest.$ac_ext <<_ACEOF
--#line 16309 "configure"
-+#line 16312 "configure"
+-#line 16955 "configure"
++#line 16956 "configure"
  #include "confdefs.h"
  
  #ifdef HAVE_XCURSES
-@@ -16332,15 +16335,15 @@
+@@ -16978,15 +16979,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16335: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16338: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:16981: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16982: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:16338: \$? = $ac_status" >&5
-+  echo "$as_me:16341: \$? = $ac_status" >&5
+-  echo "$as_me:16984: \$? = $ac_status" >&5
++  echo "$as_me:16985: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16340: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16343: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:16986: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16987: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:16343: \$? = $ac_status" >&5
-+  echo "$as_me:16346: \$? = $ac_status" >&5
+-  echo "$as_me:16989: \$? = $ac_status" >&5
++  echo "$as_me:16990: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -16351,7 +16354,7 @@
+@@ -16997,7 +16998,7 @@
  fi
  rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
--	echo "$as_me:16354: result: $cf_result" >&5
-+	echo "$as_me:16357: result: $cf_result" >&5
+-	echo "$as_me:17000: result: $cf_result" >&5
++	echo "$as_me:17001: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
  	if test $cf_result = yes ; then
  
-@@ -16366,7 +16369,7 @@
+@@ -17010,11 +17011,11 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:17013: checking for data ttytype declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:17014: checking for data ttytype declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for data ttytype declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17017 "configure"
++#line 17018 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -17042,16 +17043,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17045: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17046: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17048: \$? = $ac_status" >&5
++  echo "$as_me:17049: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17051: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17052: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17054: \$? = $ac_status" >&5
++  echo "$as_me:17055: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -17060,7 +17061,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:17063: result: $cf_result" >&5
++echo "$as_me:17064: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ if test $cf_result = yes ; then
+@@ -17072,14 +17073,14 @@
+ EOF
+ 
+ else
+-	echo "$as_me:17075: checking for data ttytype in library" >&5
++	echo "$as_me:17076: checking for data ttytype in library" >&5
+ echo $ECHO_N "checking for data ttytype in library... $ECHO_C" >&6
+ 	# BSD linkers insist on making weak linkage, but resolve at runtime.
+ 	if test "$cross_compiling" = yes; then
+ 
+ 	# cross-compiling
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 17082 "configure"
++#line 17083 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -17112,16 +17113,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17115: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17116: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17118: \$? = $ac_status" >&5
++  echo "$as_me:17119: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17121: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17122: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17124: \$? = $ac_status" >&5
++  echo "$as_me:17125: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -17133,7 +17134,7 @@
+ 
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 17136 "configure"
++#line 17137 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -17159,15 +17160,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:17162: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17163: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17165: \$? = $ac_status" >&5
++  echo "$as_me:17166: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:17167: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17168: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17170: \$? = $ac_status" >&5
++  echo "$as_me:17171: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -17178,7 +17179,7 @@
+ fi
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+-	echo "$as_me:17181: result: $cf_result" >&5
++	echo "$as_me:17182: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test $cf_result = yes ; then
+ 
+@@ -17193,7 +17194,7 @@
  
  if ( test "$GCC" = yes || test "$GXX" = yes )
  then
--echo "$as_me:16369: checking if you want to turn on gcc warnings" >&5
-+echo "$as_me:16372: checking if you want to turn on gcc warnings" >&5
+-echo "$as_me:17196: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:17197: 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.
-@@ -16383,7 +16386,7 @@
+@@ -17210,7 +17211,7 @@
  	with_warnings=no
  
  fi;
--echo "$as_me:16386: result: $with_warnings" >&5
-+echo "$as_me:16389: result: $with_warnings" >&5
+-echo "$as_me:17213: result: $with_warnings" >&5
++echo "$as_me:17214: result: $with_warnings" >&5
  echo "${ECHO_T}$with_warnings" >&6
  if test "$with_warnings" = "yes"
  then
-@@ -16406,10 +16409,10 @@
+@@ -17233,10 +17234,10 @@
  EOF
  if test "$GCC" = yes
  then
--	{ echo "$as_me:16409: checking for $CC __attribute__ directives..." >&5
-+	{ echo "$as_me:16412: checking for $CC __attribute__ directives..." >&5
+-	{ echo "$as_me:17236: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:17237: checking for $CC __attribute__ directives..." >&5
  echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
  cat > conftest.$ac_ext <&5
-+		if { (eval echo "$as_me:16464: \"$ac_compile\"") >&5
+-		if { (eval echo "$as_me:17288: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17289: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:16464: \$? = $ac_status" >&5
-+  echo "$as_me:16467: \$? = $ac_status" >&5
+-  echo "$as_me:17291: \$? = $ac_status" >&5
++  echo "$as_me:17292: \$? = $ac_status" >&5
    (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:16466: result: ... $cf_attribute" >&5
-+			test -n "$verbose" && echo "$as_me:16469: result: ... $cf_attribute" >&5
+-			test -n "$verbose" && echo "$as_me:17293: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:17294: result: ... $cf_attribute" >&5
  echo "${ECHO_T}... $cf_attribute" >&6
  			cat conftest.h >>confdefs.h
  			case $cf_attribute in
-@@ -16527,12 +16530,12 @@
+@@ -17354,12 +17355,12 @@
  if test "$GCC" = yes ; then
  	case $host_os in
  	(linux*|gnu*)
--		echo "$as_me:16530: checking if this is really Intel C compiler" >&5
-+		echo "$as_me:16533: checking if this is really Intel C compiler" >&5
+-		echo "$as_me:17357: checking if this is really Intel C compiler" >&5
++		echo "$as_me:17358: 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 16535 "configure"
-+#line 16538 "configure"
+-#line 17362 "configure"
++#line 17363 "configure"
  #include "confdefs.h"
  
  int
-@@ -16549,16 +16552,16 @@
+@@ -17376,16 +17377,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16552: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16555: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:17379: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17380: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:16555: \$? = $ac_status" >&5
-+  echo "$as_me:16558: \$? = $ac_status" >&5
+-  echo "$as_me:17382: \$? = $ac_status" >&5
++  echo "$as_me:17383: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16558: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16561: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:17385: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17386: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:16561: \$? = $ac_status" >&5
-+  echo "$as_me:16564: \$? = $ac_status" >&5
+-  echo "$as_me:17388: \$? = $ac_status" >&5
++  echo "$as_me:17389: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    INTEL_COMPILER=yes
  cf_save_CFLAGS="$cf_save_CFLAGS -we147"
-@@ -16569,7 +16572,7 @@
+@@ -17396,7 +17397,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  		CFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:16572: result: $INTEL_COMPILER" >&5
-+		echo "$as_me:16575: result: $INTEL_COMPILER" >&5
+-		echo "$as_me:17399: result: $INTEL_COMPILER" >&5
++		echo "$as_me:17400: result: $INTEL_COMPILER" >&5
  echo "${ECHO_T}$INTEL_COMPILER" >&6
  		;;
  	esac
-@@ -16578,12 +16581,12 @@
+@@ -17405,12 +17406,12 @@
  CLANG_COMPILER=no
  
  if test "$GCC" = yes ; then
--	echo "$as_me:16581: checking if this is really Clang C compiler" >&5
-+	echo "$as_me:16584: checking if this is really Clang C compiler" >&5
+-	echo "$as_me:17408: checking if this is really Clang C compiler" >&5
++	echo "$as_me:17409: 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 16586 "configure"
-+#line 16589 "configure"
+-#line 17413 "configure"
++#line 17414 "configure"
  #include "confdefs.h"
  
  int
-@@ -16600,16 +16603,16 @@
+@@ -17427,16 +17428,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16603: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16606: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:17430: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17431: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:16606: \$? = $ac_status" >&5
-+  echo "$as_me:16609: \$? = $ac_status" >&5
+-  echo "$as_me:17433: \$? = $ac_status" >&5
++  echo "$as_me:17434: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16609: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16612: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:17436: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17437: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:16612: \$? = $ac_status" >&5
-+  echo "$as_me:16615: \$? = $ac_status" >&5
+-  echo "$as_me:17439: \$? = $ac_status" >&5
++  echo "$as_me:17440: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    CLANG_COMPILER=yes
  cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
-@@ -16620,12 +16623,12 @@
+@@ -17447,12 +17448,12 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  	CFLAGS="$cf_save_CFLAGS"
--	echo "$as_me:16623: result: $CLANG_COMPILER" >&5
-+	echo "$as_me:16626: result: $CLANG_COMPILER" >&5
+-	echo "$as_me:17450: result: $CLANG_COMPILER" >&5
++	echo "$as_me:17451: result: $CLANG_COMPILER" >&5
  echo "${ECHO_T}$CLANG_COMPILER" >&6
  fi
  
  cat > conftest.$ac_ext <&5
-+	{ echo "$as_me:16648: checking for $CC warning options..." >&5
+-	{ echo "$as_me:17472: checking for $CC warning options..." >&5
++	{ echo "$as_me:17473: checking for $CC warning options..." >&5
  echo "$as_me: checking for $CC warning options..." >&6;}
  	cf_save_CFLAGS="$CFLAGS"
  	EXTRA_CFLAGS="-Wall"
-@@ -16658,12 +16661,12 @@
+@@ -17485,12 +17486,12 @@
  		wd981
  	do
  		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:16661: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:16664: \"$ac_compile\"") >&5
+-		if { (eval echo "$as_me:17488: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17489: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:16664: \$? = $ac_status" >&5
-+  echo "$as_me:16667: \$? = $ac_status" >&5
+-  echo "$as_me:17491: \$? = $ac_status" >&5
++  echo "$as_me:17492: \$? = $ac_status" >&5
    (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:16666: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:16669: result: ... -$cf_opt" >&5
+-			test -n "$verbose" && echo "$as_me:17493: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17494: result: ... -$cf_opt" >&5
  echo "${ECHO_T}... -$cf_opt" >&6
  			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
  		fi
-@@ -16672,7 +16675,7 @@
+@@ -17499,7 +17500,7 @@
  
  elif test "$GCC" = yes
  then
--	{ echo "$as_me:16675: checking for $CC warning options..." >&5
-+	{ echo "$as_me:16678: checking for $CC warning options..." >&5
+-	{ echo "$as_me:17502: checking for $CC warning options..." >&5
++	{ echo "$as_me:17503: checking for $CC warning options..." >&5
  echo "$as_me: checking for $CC warning options..." >&6;}
  	cf_save_CFLAGS="$CFLAGS"
  	EXTRA_CFLAGS=
-@@ -16696,12 +16699,12 @@
+@@ -17523,12 +17524,12 @@
  		Wundef $cf_gcc_warnings $cf_warn_CONST
  	do
  		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:16699: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:16702: \"$ac_compile\"") >&5
+-		if { (eval echo "$as_me:17526: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17527: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:16702: \$? = $ac_status" >&5
-+  echo "$as_me:16705: \$? = $ac_status" >&5
+-  echo "$as_me:17529: \$? = $ac_status" >&5
++  echo "$as_me:17530: \$? = $ac_status" >&5
    (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:16704: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:16707: result: ... -$cf_opt" >&5
+-			test -n "$verbose" && echo "$as_me:17531: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17532: result: ... -$cf_opt" >&5
  echo "${ECHO_T}... -$cf_opt" >&6
  			case $cf_opt in
  			(Wcast-qual)
-@@ -16712,7 +16715,7 @@
+@@ -17539,7 +17540,7 @@
  				([34].*)
  					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
  
--echo "${as_me:-configure}:16715: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:16718: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+-echo "${as_me:-configure}:17542: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17543: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
  
  					continue;;
  				esac
-@@ -16722,7 +16725,7 @@
+@@ -17549,7 +17550,7 @@
  				([12].*)
  					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
  
--echo "${as_me:-configure}:16725: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:16728: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+-echo "${as_me:-configure}:17552: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17553: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
  
  					continue;;
  				esac
-@@ -16738,7 +16741,7 @@
+@@ -17565,7 +17566,7 @@
  fi
  fi
  
--echo "$as_me:16741: checking if you want to use dmalloc for testing" >&5
-+echo "$as_me:16744: checking if you want to use dmalloc for testing" >&5
+-echo "$as_me:17568: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:17569: 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.
-@@ -16755,7 +16758,7 @@
+@@ -17582,7 +17583,7 @@
  else
    with_dmalloc=
  fi;
--echo "$as_me:16758: result: ${with_dmalloc:-no}" >&5
-+echo "$as_me:16761: result: ${with_dmalloc:-no}" >&5
+-echo "$as_me:17585: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:17586: result: ${with_dmalloc:-no}" >&5
  echo "${ECHO_T}${with_dmalloc:-no}" >&6
  
  case .$with_cflags in
-@@ -16849,23 +16852,23 @@
+@@ -17676,23 +17677,23 @@
  esac
  
  if test "$with_dmalloc" = yes ; then
--	echo "$as_me:16852: checking for dmalloc.h" >&5
-+	echo "$as_me:16855: checking for dmalloc.h" >&5
+-	echo "$as_me:17679: checking for dmalloc.h" >&5
++	echo "$as_me:17680: 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 16858 "configure"
-+#line 16861 "configure"
+-#line 17685 "configure"
++#line 17686 "configure"
  #include "confdefs.h"
  #include 
  _ACEOF
--if { (eval echo "$as_me:16862: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:16865: \"$ac_cpp conftest.$ac_ext\"") >&5
+-if { (eval echo "$as_me:17689: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17690: \"$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:16868: \$? = $ac_status" >&5
-+  echo "$as_me:16871: \$? = $ac_status" >&5
+-  echo "$as_me:17695: \$? = $ac_status" >&5
++  echo "$as_me:17696: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -16884,11 +16887,11 @@
+@@ -17711,11 +17712,11 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
--echo "$as_me:16887: result: $ac_cv_header_dmalloc_h" >&5
-+echo "$as_me:16890: result: $ac_cv_header_dmalloc_h" >&5
+-echo "$as_me:17714: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:17715: 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:16891: checking for dmalloc_debug in -ldmalloc" >&5
-+echo "$as_me:16894: checking for dmalloc_debug in -ldmalloc" >&5
+-echo "$as_me:17718: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:17719: 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
-@@ -16896,7 +16899,7 @@
+@@ -17723,7 +17724,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldmalloc  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 16899 "configure"
-+#line 16902 "configure"
+-#line 17726 "configure"
++#line 17727 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -16915,16 +16918,16 @@
+@@ -17742,16 +17743,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16918: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16921: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:17745: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17746: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:16921: \$? = $ac_status" >&5
-+  echo "$as_me:16924: \$? = $ac_status" >&5
+-  echo "$as_me:17748: \$? = $ac_status" >&5
++  echo "$as_me:17749: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16924: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16927: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:17751: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17752: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:16927: \$? = $ac_status" >&5
-+  echo "$as_me:16930: \$? = $ac_status" >&5
+-  echo "$as_me:17754: \$? = $ac_status" >&5
++  echo "$as_me:17755: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_dmalloc_dmalloc_debug=yes
  else
-@@ -16935,7 +16938,7 @@
+@@ -17762,7 +17763,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:16938: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
-+echo "$as_me:16941: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+-echo "$as_me:17765: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:17766: 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 <&5
-+echo "$as_me:16956: checking if you want to use dbmalloc for testing" >&5
+-echo "$as_me:17780: checking if you want to use dbmalloc for testing" >&5
++echo "$as_me:17781: 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.
-@@ -16967,7 +16970,7 @@
+@@ -17794,7 +17795,7 @@
  else
    with_dbmalloc=
  fi;
--echo "$as_me:16970: result: ${with_dbmalloc:-no}" >&5
-+echo "$as_me:16973: result: ${with_dbmalloc:-no}" >&5
+-echo "$as_me:17797: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:17798: result: ${with_dbmalloc:-no}" >&5
  echo "${ECHO_T}${with_dbmalloc:-no}" >&6
  
  case .$with_cflags in
-@@ -17061,23 +17064,23 @@
+@@ -17888,23 +17889,23 @@
  esac
  
  if test "$with_dbmalloc" = yes ; then
--	echo "$as_me:17064: checking for dbmalloc.h" >&5
-+	echo "$as_me:17067: checking for dbmalloc.h" >&5
+-	echo "$as_me:17891: checking for dbmalloc.h" >&5
++	echo "$as_me:17892: 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 17070 "configure"
-+#line 17073 "configure"
+-#line 17897 "configure"
++#line 17898 "configure"
  #include "confdefs.h"
  #include 
  _ACEOF
--if { (eval echo "$as_me:17074: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:17077: \"$ac_cpp conftest.$ac_ext\"") >&5
+-if { (eval echo "$as_me:17901: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17902: \"$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:17080: \$? = $ac_status" >&5
-+  echo "$as_me:17083: \$? = $ac_status" >&5
+-  echo "$as_me:17907: \$? = $ac_status" >&5
++  echo "$as_me:17908: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -17096,11 +17099,11 @@
+@@ -17923,11 +17924,11 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
--echo "$as_me:17099: result: $ac_cv_header_dbmalloc_h" >&5
-+echo "$as_me:17102: result: $ac_cv_header_dbmalloc_h" >&5
+-echo "$as_me:17926: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:17927: 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:17103: checking for debug_malloc in -ldbmalloc" >&5
-+echo "$as_me:17106: checking for debug_malloc in -ldbmalloc" >&5
+-echo "$as_me:17930: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:17931: 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
-@@ -17108,7 +17111,7 @@
+@@ -17935,7 +17936,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldbmalloc  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
--#line 17111 "configure"
-+#line 17114 "configure"
+-#line 17938 "configure"
++#line 17939 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -17127,16 +17130,16 @@
+@@ -17954,16 +17955,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17130: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17133: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:17957: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17958: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:17133: \$? = $ac_status" >&5
-+  echo "$as_me:17136: \$? = $ac_status" >&5
+-  echo "$as_me:17960: \$? = $ac_status" >&5
++  echo "$as_me:17961: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17136: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17139: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:17963: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17964: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:17139: \$? = $ac_status" >&5
-+  echo "$as_me:17142: \$? = $ac_status" >&5
+-  echo "$as_me:17966: \$? = $ac_status" >&5
++  echo "$as_me:17967: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_dbmalloc_debug_malloc=yes
  else
-@@ -17147,7 +17150,7 @@
+@@ -17974,7 +17975,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:17150: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
-+echo "$as_me:17153: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+-echo "$as_me:17977: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:17978: 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 <&5
-+echo "$as_me:17168: checking if you want to use valgrind for testing" >&5
+-echo "$as_me:17992: checking if you want to use valgrind for testing" >&5
++echo "$as_me:17993: checking if you want to use valgrind for testing" >&5
  echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
  
  # Check whether --with-valgrind or --without-valgrind was given.
-@@ -17179,7 +17182,7 @@
+@@ -18006,7 +18007,7 @@
  else
    with_valgrind=
  fi;
--echo "$as_me:17182: result: ${with_valgrind:-no}" >&5
-+echo "$as_me:17185: result: ${with_valgrind:-no}" >&5
+-echo "$as_me:18009: result: ${with_valgrind:-no}" >&5
++echo "$as_me:18010: result: ${with_valgrind:-no}" >&5
  echo "${ECHO_T}${with_valgrind:-no}" >&6
  
  case .$with_cflags in
-@@ -17272,7 +17275,7 @@
+@@ -18099,7 +18100,7 @@
  	;;
  esac
  
--echo "$as_me:17275: checking if you want to perform memory-leak testing" >&5
-+echo "$as_me:17278: checking if you want to perform memory-leak testing" >&5
+-echo "$as_me:18102: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:18103: checking if you want to perform memory-leak testing" >&5
  echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
  
  # Check whether --enable-leaks or --disable-leaks was given.
-@@ -17282,7 +17285,7 @@
+@@ -18109,7 +18110,7 @@
  else
    : ${with_no_leaks:=no}
  fi;
--echo "$as_me:17285: result: $with_no_leaks" >&5
-+echo "$as_me:17288: result: $with_no_leaks" >&5
+-echo "$as_me:18112: result: $with_no_leaks" >&5
++echo "$as_me:18113: result: $with_no_leaks" >&5
  echo "${ECHO_T}$with_no_leaks" >&6
  
  if test "$with_no_leaks" = yes ; then
-@@ -17298,7 +17301,7 @@
+@@ -18125,7 +18126,7 @@
  fi
  
  LD_RPATH_OPT=
--echo "$as_me:17301: checking for an rpath option" >&5
-+echo "$as_me:17304: checking for an rpath option" >&5
+-echo "$as_me:18128: checking for an rpath option" >&5
++echo "$as_me:18129: checking for an rpath option" >&5
  echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
  case $cf_cv_system_name in
  (irix*)
-@@ -17329,12 +17332,12 @@
+@@ -18156,12 +18157,12 @@
  (*)
  	;;
  esac
--echo "$as_me:17332: result: $LD_RPATH_OPT" >&5
-+echo "$as_me:17335: result: $LD_RPATH_OPT" >&5
+-echo "$as_me:18159: result: $LD_RPATH_OPT" >&5
++echo "$as_me:18160: result: $LD_RPATH_OPT" >&5
  echo "${ECHO_T}$LD_RPATH_OPT" >&6
  
  case "x$LD_RPATH_OPT" in
  (x-R*)
--	echo "$as_me:17337: checking if we need a space after rpath option" >&5
-+	echo "$as_me:17340: checking if we need a space after rpath option" >&5
+-	echo "$as_me:18164: checking if we need a space after rpath option" >&5
++	echo "$as_me:18165: 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"
  
-@@ -17355,7 +17358,7 @@
+@@ -18182,7 +18183,7 @@
  LIBS="$cf_add_libs"
  
  	cat >conftest.$ac_ext <<_ACEOF
--#line 17358 "configure"
-+#line 17361 "configure"
+-#line 18185 "configure"
++#line 18186 "configure"
  #include "confdefs.h"
  
  int
-@@ -17367,16 +17370,16 @@
+@@ -18194,16 +18195,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17370: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17373: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:18197: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18198: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:17373: \$? = $ac_status" >&5
-+  echo "$as_me:17376: \$? = $ac_status" >&5
+-  echo "$as_me:18200: \$? = $ac_status" >&5
++  echo "$as_me:18201: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17376: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17379: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:18203: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18204: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:17379: \$? = $ac_status" >&5
-+  echo "$as_me:17382: \$? = $ac_status" >&5
+-  echo "$as_me:18206: \$? = $ac_status" >&5
++  echo "$as_me:18207: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_rpath_space=no
  else
-@@ -17386,13 +17389,13 @@
+@@ -18213,13 +18214,13 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  	LIBS="$cf_save_LIBS"
--	echo "$as_me:17389: result: $cf_rpath_space" >&5
-+	echo "$as_me:17392: result: $cf_rpath_space" >&5
+-	echo "$as_me:18216: result: $cf_rpath_space" >&5
++	echo "$as_me:18217: 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:17395: checking if rpath-hack should be disabled" >&5
-+echo "$as_me:17398: checking if rpath-hack should be disabled" >&5
+-echo "$as_me:18222: checking if rpath-hack should be disabled" >&5
++echo "$as_me:18223: 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.
-@@ -17409,21 +17412,21 @@
+@@ -18236,21 +18237,21 @@
  	cf_disable_rpath_hack=no
  
  fi;
--echo "$as_me:17412: result: $cf_disable_rpath_hack" >&5
-+echo "$as_me:17415: result: $cf_disable_rpath_hack" >&5
+-echo "$as_me:18239: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:18240: 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:17416: checking for updated LDFLAGS" >&5
-+echo "$as_me:17419: checking for updated LDFLAGS" >&5
+-echo "$as_me:18243: checking for updated LDFLAGS" >&5
++echo "$as_me:18244: 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:17419: result: maybe" >&5
-+	echo "$as_me:17422: result: maybe" >&5
+-	echo "$as_me:18246: result: maybe" >&5
++	echo "$as_me:18247: 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:17426: checking for $ac_word" >&5
-+echo "$as_me:17429: checking for $ac_word" >&5
+-echo "$as_me:18253: checking for $ac_word" >&5
++echo "$as_me:18254: 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
-@@ -17438,7 +17441,7 @@
+@@ -18265,7 +18266,7 @@
    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:17441: found $ac_dir/$ac_word" >&5
-+echo "$as_me:17444: found $ac_dir/$ac_word" >&5
+-echo "$as_me:18268: found $ac_dir/$ac_word" >&5
++echo "$as_me:18269: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -17446,10 +17449,10 @@
+@@ -18273,10 +18274,10 @@
  fi
  cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
  if test -n "$cf_ldd_prog"; then
--  echo "$as_me:17449: result: $cf_ldd_prog" >&5
-+  echo "$as_me:17452: result: $cf_ldd_prog" >&5
+-  echo "$as_me:18276: result: $cf_ldd_prog" >&5
++  echo "$as_me:18277: result: $cf_ldd_prog" >&5
  echo "${ECHO_T}$cf_ldd_prog" >&6
  else
--  echo "$as_me:17452: result: no" >&5
-+  echo "$as_me:17455: result: no" >&5
+-  echo "$as_me:18279: result: no" >&5
++  echo "$as_me:18280: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -17463,7 +17466,7 @@
+@@ -18290,7 +18291,7 @@
  		cf_rpath_oops=
  
  cat >conftest.$ac_ext <<_ACEOF
--#line 17466 "configure"
-+#line 17469 "configure"
+-#line 18293 "configure"
++#line 18294 "configure"
  #include "confdefs.h"
  #include 
  int
-@@ -17475,16 +17478,16 @@
+@@ -18302,16 +18303,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17478: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17481: \"$ac_link\"") >&5
+-if { (eval echo "$as_me:18305: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18306: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:17481: \$? = $ac_status" >&5
-+  echo "$as_me:17484: \$? = $ac_status" >&5
+-  echo "$as_me:18308: \$? = $ac_status" >&5
++  echo "$as_me:18309: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17484: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17487: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:18311: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18312: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
--  echo "$as_me:17487: \$? = $ac_status" >&5
-+  echo "$as_me:17490: \$? = $ac_status" >&5
+-  echo "$as_me:18314: \$? = $ac_status" >&5
++  echo "$as_me:18315: \$? = $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`
-@@ -17512,7 +17515,7 @@
+@@ -18339,7 +18340,7 @@
  					then
  						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
  
--echo "${as_me:-configure}:17515: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
-+echo "${as_me:-configure}:17518: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+-echo "${as_me:-configure}:18342: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:18343: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
  
  						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
  						break
-@@ -17524,11 +17527,11 @@
+@@ -18351,11 +18352,11 @@
  
  	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
  
--echo "${as_me:-configure}:17527: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:17530: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+-echo "${as_me:-configure}:18354: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:18355: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
  
  test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
  
--echo "${as_me:-configure}:17531: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:17534: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+-echo "${as_me:-configure}:18358: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:18359: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
  
  cf_rpath_dst=
  for cf_rpath_src in $LDFLAGS
-@@ -17565,7 +17568,7 @@
+@@ -18392,7 +18393,7 @@
  			then
  				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
  
--echo "${as_me:-configure}:17568: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
-+echo "${as_me:-configure}:17571: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+-echo "${as_me:-configure}:18395: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:18396: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
  
  				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
  			fi
-@@ -17578,11 +17581,11 @@
+@@ -18405,11 +18406,11 @@
  
  test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
  
--echo "${as_me:-configure}:17581: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:17584: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+-echo "${as_me:-configure}:18408: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:18409: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
  
  test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
  
--echo "${as_me:-configure}:17585: testing ...checking LIBS $LIBS ..." 1>&5
-+echo "${as_me:-configure}:17588: testing ...checking LIBS $LIBS ..." 1>&5
+-echo "${as_me:-configure}:18412: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:18413: testing ...checking LIBS $LIBS ..." 1>&5
  
  cf_rpath_dst=
  for cf_rpath_src in $LIBS
-@@ -17619,7 +17622,7 @@
+@@ -18446,7 +18447,7 @@
  			then
  				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
  
--echo "${as_me:-configure}:17622: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
-+echo "${as_me:-configure}:17625: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+-echo "${as_me:-configure}:18449: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:18450: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
  
  				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
  			fi
-@@ -17632,14 +17635,14 @@
+@@ -18459,14 +18460,14 @@
  
  test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
  
--echo "${as_me:-configure}:17635: testing ...checked LIBS $LIBS ..." 1>&5
-+echo "${as_me:-configure}:17638: testing ...checked LIBS $LIBS ..." 1>&5
+-echo "${as_me:-configure}:18462: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:18463: testing ...checked LIBS $LIBS ..." 1>&5
  
  	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
  
--echo "${as_me:-configure}:17639: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:17642: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+-echo "${as_me:-configure}:18466: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:18467: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
  
  else
--	echo "$as_me:17642: result: no" >&5
-+	echo "$as_me:17645: result: no" >&5
+-	echo "$as_me:18469: result: no" >&5
++	echo "$as_me:18470: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -17729,7 +17732,7 @@
+@@ -18556,7 +18557,7 @@
  : ${CONFIG_STATUS=./config.status}
  ac_clean_files_save=$ac_clean_files
  ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ echo "$as_me:17732: creating $CONFIG_STATUS" >&5
-+{ echo "$as_me:17735: creating $CONFIG_STATUS" >&5
+-{ echo "$as_me:18559: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:18560: creating $CONFIG_STATUS" >&5
  echo "$as_me: creating $CONFIG_STATUS" >&6;}
  cat >$CONFIG_STATUS <<_ACEOF
  #! $SHELL
-@@ -17905,7 +17908,7 @@
+@@ -18732,7 +18733,7 @@
      echo "$ac_cs_version"; exit 0 ;;
    --he | --h)
      # Conflict between --help and --header
--    { { echo "$as_me:17908: error: ambiguous option: $1
-+    { { echo "$as_me:17911: error: ambiguous option: $1
+-    { { echo "$as_me:18735: error: ambiguous option: $1
++    { { echo "$as_me:18736: 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;}
-@@ -17924,7 +17927,7 @@
+@@ -18751,7 +18752,7 @@
      ac_need_defaults=false;;
  
    # This is an error.
--  -*) { { echo "$as_me:17927: error: unrecognized option: $1
-+  -*) { { echo "$as_me:17930: error: unrecognized option: $1
+-  -*) { { echo "$as_me:18754: error: unrecognized option: $1
++  -*) { { echo "$as_me:18755: 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;}
-@@ -17974,7 +17977,7 @@
+@@ -18801,7 +18802,7 @@
    "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
    "ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ncurses_cfg.h:ncurses_tst.hin" ;;
--  *) { { echo "$as_me:17977: error: invalid argument: $ac_config_target" >&5
-+  *) { { echo "$as_me:17980: error: invalid argument: $ac_config_target" >&5
+-  *) { { echo "$as_me:18804: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:18805: error: invalid argument: $ac_config_target" >&5
  echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
     { (exit 1); exit 1; }; };;
    esac
-@@ -18265,7 +18268,7 @@
+@@ -19092,7 +19093,7 @@
    esac
  
    if test x"$ac_file" != x-; then
--    { echo "$as_me:18268: creating $ac_file" >&5
-+    { echo "$as_me:18271: creating $ac_file" >&5
+-    { echo "$as_me:19095: creating $ac_file" >&5
++    { echo "$as_me:19096: creating $ac_file" >&5
  echo "$as_me: creating $ac_file" >&6;}
      rm -f "$ac_file"
    fi
-@@ -18283,7 +18286,7 @@
+@@ -19110,7 +19111,7 @@
        -) echo $tmp/stdin ;;
        [\\/$]*)
           # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:18286: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:18289: error: cannot find input file: $f" >&5
+-         test -f "$f" || { { echo "$as_me:19113: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:19114: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
           echo $f;;
-@@ -18296,7 +18299,7 @@
+@@ -19123,7 +19124,7 @@
             echo $srcdir/$f
           else
             # /dev/null tree
--           { { echo "$as_me:18299: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:18302: error: cannot find input file: $f" >&5
+-           { { echo "$as_me:19126: error: cannot find input file: $f" >&5
++           { { echo "$as_me:19127: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
           fi;;
-@@ -18312,7 +18315,7 @@
+@@ -19139,7 +19140,7 @@
        if test -n "$ac_seen"; then
          ac_used=`grep '@datarootdir@' $ac_item`
          if test -z "$ac_used"; then
--          { echo "$as_me:18315: WARNING: datarootdir was used implicitly but not set:
-+          { echo "$as_me:18318: WARNING: datarootdir was used implicitly but not set:
+-          { echo "$as_me:19142: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:19143: 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;}
-@@ -18321,7 +18324,7 @@
+@@ -19148,7 +19149,7 @@
        fi
        ac_seen=`grep '${datarootdir}' $ac_item`
        if test -n "$ac_seen"; then
--        { echo "$as_me:18324: WARNING: datarootdir was used explicitly but not set:
-+        { echo "$as_me:18327: WARNING: datarootdir was used explicitly but not set:
+-        { echo "$as_me:19151: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:19152: 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;}
-@@ -18358,7 +18361,7 @@
+@@ -19185,7 +19186,7 @@
              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:18361: WARNING: Variable $ac_name is used but was not set:
-+              { echo "$as_me:18364: WARNING: Variable $ac_name is used but was not set:
+-              { echo "$as_me:19188: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:19189: 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;}
-@@ -18369,7 +18372,7 @@
+@@ -19196,7 +19197,7 @@
      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:18372: WARNING: Some variables may not be substituted:
-+      { echo "$as_me:18375: WARNING: Some variables may not be substituted:
+-      { echo "$as_me:19199: WARNING: Some variables may not be substituted:
++      { echo "$as_me:19200: WARNING: Some variables may not be substituted:
  $ac_seen" >&5
  echo "$as_me: WARNING: Some variables may not be substituted:
  $ac_seen" >&2;}
-@@ -18418,7 +18421,7 @@
+@@ -19245,7 +19246,7 @@
    * )   ac_file_in=$ac_file.in ;;
    esac
  
--  test x"$ac_file" != x- && { echo "$as_me:18421: creating $ac_file" >&5
-+  test x"$ac_file" != x- && { echo "$as_me:18424: creating $ac_file" >&5
+-  test x"$ac_file" != x- && { echo "$as_me:19248: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:19249: creating $ac_file" >&5
  echo "$as_me: creating $ac_file" >&6;}
  
    # First look for the input files in the build tree, otherwise in the
-@@ -18429,7 +18432,7 @@
+@@ -19256,7 +19257,7 @@
        -) echo $tmp/stdin ;;
        [\\/$]*)
           # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:18432: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:18435: error: cannot find input file: $f" >&5
+-         test -f "$f" || { { echo "$as_me:19259: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:19260: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
           echo $f;;
-@@ -18442,7 +18445,7 @@
+@@ -19269,7 +19270,7 @@
             echo $srcdir/$f
           else
             # /dev/null tree
--           { { echo "$as_me:18445: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:18448: error: cannot find input file: $f" >&5
+-           { { echo "$as_me:19272: error: cannot find input file: $f" >&5
++           { { echo "$as_me:19273: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
           fi;;
-@@ -18500,7 +18503,7 @@
+@@ -19327,7 +19328,7 @@
    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:18503: $ac_file is unchanged" >&5
-+      { echo "$as_me:18506: $ac_file is unchanged" >&5
+-      { echo "$as_me:19330: $ac_file is unchanged" >&5
++      { echo "$as_me:19331: $ac_file is unchanged" >&5
  echo "$as_me: $ac_file is unchanged" >&6;}
      else
        ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+Index: test/demo_defkey.c
+Prereq:  1.25 
+--- ncurses-6.0-20170114+/test/demo_defkey.c	2016-09-10 21:22:01.000000000 +0000
++++ ncurses-6.0-20170121/test/demo_defkey.c	2017-01-21 22:07:43.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2002-2013,2016 Free Software Foundation, Inc.              *
++ * Copyright (c) 2002-2016,2017 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: demo_defkey.c,v 1.25 2016/09/10 21:22:01 tom Exp $
++ * $Id: demo_defkey.c,v 1.26 2017/01/21 22:07:43 tom Exp $
+  *
+  * Demonstrate the define_key() function.
+  * Thomas Dickey - 2002/11/23
+@@ -108,7 +108,7 @@
+ 		char temp[80];
+ 		_nc_STRNCPY(temp, visichar(string[n]), sizeof(temp) - 2);
+ 		if (pass) {
+-		    _nc_STRCAT(result, temp, sizeof(temp));
++		    _nc_STRCAT(result, temp, need);
+ 		} else {
+ 		    need += strlen(temp);
+ 		}
diff --git a/ncurses.spec b/ncurses.spec
index a87b6b4..d8bdf73 100644
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -3,7 +3,7 @@
 %define        patchver %(echo %version | cut -d. -f 3)
 %define        tack_ver 1.07
 Name:          ncurses
-Version:       6.0.20160213
+Version:       6.0.20170121
 Release:       1mamba
 Summary:       A CRT screen handling and optimization package
 Group:         System/Libraries
@@ -13,31 +13,26 @@ Packager:      Silvan Calarco 
 URL:           http://www.gnu.org/directory/GNU/ncurses.html
 Source0:       http://ftp.gnu.org/pub/gnu/ncurses/ncurses-%{majver}.tar.gz
 %if "%{?patchver}" != ""
-#Source1:       ftp://dickey.his.com/ncurses/5.9/patch-%{majver}-20150808.sh.gz
-Source2:       ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20150810.patch.gz
-Source3:       ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20150815.patch.gz
-Source4:       ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20150822.patch.gz
-Source5:       ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20150905.patch.gz
-Source6:       ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20150912.patch.gz
-Source7:       ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20150919.patch.gz
-Source8:       ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20150926.patch.gz
-Source9:       ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20151010.patch.gz
-Source10:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20151017.patch.gz
-Source11:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20151024.patch.gz
-Source12:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20151101.patch.gz
-Source13:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20151107.patch.gz
-Source14:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20151121.patch.gz
-Source15:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20151128.patch.gz
-Source16:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20151205.patch.gz
-Source17:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20151212.patch.gz
-Source18:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20151219.patch.gz
-Source19:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20151226.patch.gz
-Source20:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20160102.patch.gz
-Source21:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20160116.patch.gz
-Source22:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20160123.patch.gz
-Source23:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20160130.patch.gz
-Source24:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20160206.patch.gz
-Source25:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-%{patchver}.patch.gz
+Source1:       ftp://dickey.his.com/ncurses/%{majver}/patch-%{majver}-20160910.sh.gz
+Source2:       ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20160917.patch.gz
+Source3:       ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20160924.patch.gz
+Source4:       ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161001.patch.gz
+Source5:       ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161008.patch.gz
+Source6:       ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161015.patch.gz
+Source7:       ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161022.patch.gz
+Source8:       ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161029.patch.gz
+Source9:       ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161105.patch.gz
+Source10:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161112.patch.gz
+Source11:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161119.patch.gz
+Source12:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161126.patch.gz
+Source13:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161203.patch.gz
+Source14:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161210.patch.gz
+Source15:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161217.patch.gz
+Source16:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161224.patch.gz
+Source17:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161231.patch.gz
+Source18:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20170107.patch.gz
+Source19:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20170114.patch.gz
+Source20:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-%{patchver}.patch.gz
 %endif
 License:       MIT
 ## AUTOBUILDREQ-BEGIN
@@ -81,8 +76,7 @@ The header files and libraries for developing applications that use the ncurses
 %setup -q -n %{name}-%{majver}
 
 %if "%{?patchver}" != ""
-#gunzip -c %{SOURCE1} > update.sh
-#sh ./update.sh
+gunzip -c %{SOURCE1} | bash
 
 gunzip -c %{SOURCE2} | patch -p1
 gunzip -c %{SOURCE3} | patch -p1
@@ -103,11 +97,6 @@ gunzip -c %{SOURCE17} | patch -p1
 gunzip -c %{SOURCE18} | patch -p1
 gunzip -c %{SOURCE19} | patch -p1
 gunzip -c %{SOURCE20} | patch -p1
-gunzip -c %{SOURCE21} | patch -p1
-gunzip -c %{SOURCE22} | patch -p1
-gunzip -c %{SOURCE23} | patch -p1
-gunzip -c %{SOURCE24} | patch -p1
-gunzip -c %{SOURCE25} | patch -p1
 %endif
 
 %build
@@ -280,6 +269,12 @@ done
 %defattr(-,root,root)
 
 %changelog
+* Fri Jan 27 2017 Silvan Calarco  6.0.20170121-1mamba
+- update to 6.0.20170121
+
+* Fri Jan 27 2017 Silvan Calarco  6.0.20160910-1mamba
+- update to 6.0.20160910
+
 * Sat Feb 20 2016 Silvan Calarco  6.0.20160213-1mamba
 - update to 6.0.20160213
 
diff --git a/patch-6.0-20160910.sh.gz b/patch-6.0-20160910.sh.gz
new file mode 100644
index 0000000000000000000000000000000000000000..e672f2ed287a113ed70f2ca0d99cdc412ee7ba19
GIT binary patch
literal 469710
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
z
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
    `N#=*mWssi9kubVaXYCMt!@N=OAtUh
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ˣ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�st1%D
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%0AGXD-WCFr5l_a7PD0*>ZizF}VZ-;#Kfh3E
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
z
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	w2E
zpK`I$%0u@Cr{c2YYKslab|`b+D!{h9aZc6)5h1dp`(npCjrg1<46oAllPqffnT|{^
ziyfya4qzs*F;H0q;ev`DLmqF2s$FDFaxpR_1loVK?Ij$X7F
zb2k@>Y_y+j{q#?~zql4z=M-&&;*1^|&Ag9q)zI8)&R*gL#A3SMGvKkbe?PYr5R4tS
z$4SBs#^#?_E5^l*a9z6=wwwF0&Tpi1IjX9}#aRE22moY~J*M}d<#3Cy;@vxP`YN+0
z_yYecp`V#eWS~5VnEv=5@&Ymv9E$Y`#pfd&#J2r#1YiED2o?JAhJmiPOF;^Ss{B3q
zXVh>%IQ$ZeG{s&}z*pKiId#c!>~~lMOs_bc|MK3jaVh+5nPUbFo90D${?$l|&Bm==
zQlU4JGq)}-N|ny5pUz&g3NDHAnpfFJl*pjqw9>A-_$4?$cg&0XVX%U99~FiGiX73UK@_56YYrS>)f>D`
z)WV#D_SGm9=pkZ&%Uqy>lUGqOHFQ#Sg9lv>
zQ1M+!U8zud^Trdd%V(rgASDNED~7dQQcm^MRRtFu65M&^%j+zfJguDq=Uq-Zg#b5w
z;x5AG2d@uNisMjOUV;&paT?o}97XYiG++SMC^Op
zynba~H`(RiYLD{x!5g!;hl7eUp#mF=R`bh($_wMg`L~z!9)sg9@H$DVO#(@Jy;y0A
zI`=qAua5^5KEDh-F})0x2Mu0>pZvYiRFON^>4iPYao&qpUY!>WF!#<*hjo{?JD*r8
zP3IGq13ZT-MNFt^*;7NlGxj<8Xlzw%aK{d!0Ou>7O?>lcGr06^x;7AJuy=Up9MIdW
zy`tcIH;ysJ7V-i9s`c%Zd4AqxX;0+};66b|m*(~o%5T=r9r>il0A3T}x!iHe3wGFR
zTO>|266C*nnvaV+&OBDiz%+Q|PQZ@@Ii#EbJ(21!g8Pp?3uMR1(SX1QTOG_s$P&H%
zJ)QerP6#_{+eMzj{&FW$^|+Yfnj(Z`Wdy>b2&Z2kr=ME7g
zEId2
zmVM=w?WU_%O%1*InGa6ZL3xbdWM)}@^xkLo&E%sD3ZmB?zOlA3vvd@D2&k)u&|;er
zkWM>VZ=_#sRZL{}nXjN%G7hY)d82Sbd=!yPmoIk_FDh2>RL=!&HUVa5V`_b&+M#(8
z0Rv^7?h@oSv1!<2+?>?hp|tq;69Z;g?hb#ukrIlH({)hm`MlTda)zqj@pCMI92j=H
zp8Nj3nzI&a@7*g=>aRx9z8_`H+QUlUF^xp~xSeb~>x^2D&02}lox_t$
z*NJoG`+B)H4qEq@&D$G&eM!=&2D+G}M7ZuADW9KN{&k?N31m)=itWSBbu~fmQJ-3p
zshp20Gl!iO%kJ~Wx#*ex=C+M<-|5*-MenM|YSJp|E;*8!ZN^J;YSahc-a&OzYTnmw
zylyt@&adjRnbX_?tS#ZC?VB%`n;^c;_ZJl4*A~O{ZhleB>9ZbskeKC=9~sZnpdyCzJZOVxiw5
z76mo0>hbT!ug}LRsWo((r5<%OrHK80?{jilb$yXT1*R#E&oeLPbhz%nH`p~c-@RTR
z%Vw_U4R-hT-d@_t^~6VCoI-!gR&LU26zlfAqvM8u{=UC~cm4Gr0|!XC&~ch?{=umu
z2jJ+9n4`ex6#baJa^&u@fyix)1(y!4T5qpBdS}(0-udp6MqF+u2Ifl)*nC?EyAHmk
zg&#sa#|>aj;)TqDP~!@$x}O(ox`qJ~d!^@BD-ONuHXV6v$CC~*zEoexS-%Me>_Fri
zTF$OP=-rFPHcRv2bNUyX{4OYxQ=8vcGu`1pakKEZk6tT%YaNI!P^W^X`SmJ>8KI5i
z*A2`<2xlsxjPUria(cF~XMcOJ-@9kT;uMw&I%pTJ=XSG7bG@rDFFotM
zu;;w
zFV(hmz-h|siIh}et|A^QnzH)@33~+0;Y#q84`hdG_2m#|er-*8;d;q7uREC5ga9ra
zApZ6P>mOEhsuuF+f&MsA!npwkeE8QF)}4>k<|Fkc7$DBW>)Cr$+C4Cp3z+kme@_ll
zf%=Xc-vEqYgvp%nT4l~^a~63j5x@M1=0MKfdI8;a{=pT$|Bg)5m6=YJ_+P1|LbQL_
zcQ7+6BCtd*DRmW&%KOO-KSI*d-CyMTlELpo2(W-{AriYR9VJo=`Z#Qn$Hd3hj<6XT=);l?w+W0cVztSqjEuLDi4=6`KwhLNFgMV
zCvIF^_VZZT@~`nc^_39IM9{e%wcK^4b)H|DK58$vEH?Wv+}=<*qbBrox|(hd$nCi3
zab0$Oj=+PE%&P!Sr3zE?C)fcixk_EDfBOad{ASo$og}(q?(C!@b;(`!J+ECXHRp=w
zDdYEndGir55789)a9-Y>d@9EJS1vtje|tJ>X7S>@ioU-o>wTCe_P?xwWy#&o^hrAC
z{8BWdA58F0?#TnuCa!OWHg%25k%jn&XDr{GmqWhMvhel;IWtUl6BMxa5wfgGMhS{g
zE19aZ4Tpvx@V#%ZE6-rWgbRQ;K*K}(%Vm5s+(KM@&-=qU8>l>4MtlZ4fK^>eaW~zL
z)yJ9eJvU_cSSv?+2W|(Re|g+-&tF@gml^U^PNm!egFol65h?#QA8(b+u$D-SJSdib
zvjn8OKvp(1oHy_Duv28;snI3BE?V8*17;57!T>vKIt-Y^s&nE1A|uY1pBlb+9-+ol
zK~~kSW_8`}-jl^Ih$lR^^qaz8N%M}3I`&7Mx~Y9IIe@c59#FKRC@+UT^gsmKB6DYx
z1?p{{#w#R=%EInhJ!7ZBl&~l!-Pod9hku%EIrJU_RwsR=f916ujqu6{&;rkV`~sHJ
z|LwtLDF#8?**7#mDw=8Gs!2Ujwi~yOZsCt_hhj
zM3a6W@$>$%aD#qxtugw?)O7FikNk5`_vghm35Y(O_Z#5)%f^pbmDhUsjSQo*XZ^Ka
z9qEP7B*$Bg)btn(uUi^}X4@{(10&2v@NMFJNdaFj7Eul~A1bok
z_7_v9_XbcTPyD7bLWzB4!1oeQXTY7O$O^xPT!oKY=LU9H+oYa*gv>;JZQ=g?7iex`~z<#DF;(yecc?-dl5e|I7N4%8u)lj
zZj20koQAJp)fa2D(nhq|ne?2~T*j_5*$-^BIX4L>Ui*
z#+Sc0A~m6lXmg>0yGC9!ue*9Fp;}^@x6ib(@UW@^D
z2$rj+k0s^2XXn7=o}%1@%ywKYMgJ>Vq&55ELN|qu^`uUCKbCBgrLQ!fG@ZMAXTXX4wI_cH!Q@T>lH*zQ9WA;Y
z@BsLMbI!efOq`neRiF#c-*6wu31xU)7E1olgu$d06MMJ|r0*t{a;L7eaX`d$y(gTj
z|LeK#8rKI}WSXkdZ>gLlyMvj#axs?HCZ$&{Wu(Uk`?B3ih@n~_skXx6VHopYH)#}k
z(zMAQ=}?Ovj0fRo-hX{keHL@hH|O|VL6&K8n*-!jr`KM!GqiS)%GUbo7G%ldna$=-V?m@&ch_->15`6Z&ptp2vpVQ)O}U%Wbb!qMwe*((1l(o
zi}&wX>$imPi}ZDox7ca*WM0Hv#rwM5yV&km-NWE?yrYKP_Pw?$C>EwV?%(k;N#51&
zi?p@+^&!2BwyP%~?JzC1AzwcCQj9?y=!@OW%l^~->aW_UZ~|hF*8+RYjZl%m(bI-i
zc%Tc-?j|JgnZI4JtSGT@2#gA(;uC+Jv|MMdXK8<-S$Xi1(qo-M@z1uM!YZFiDz&ab
ziIbQ2LN)08ss17>+-qoV=U1;4Xu#t?iCEhvU<$Bdcv(A^$=1TLrzWvn?sb44DDEER
zv6_CjG#?GG;vi!49W}6a`TK){6x-Ok|1e%m3y$AI7=AxsneOQ8@_42bSNA)_1RFs3
z`ejDQ{z_Hwvfw(DNwp6<)aSr=+kcH?*Sk1-ddWFl@MsIn%E5F0@<5CIAtU(ZR1CcA
zME3PWaG|A0aq~aQPqlncQkApfa*-;DUA}F{8i5sLkqP7x@D;6d`>xF~Ivod^;Tvl@
z%L*f_=tqTwJ9+=ST%uVVNmZl<
zlrJd87^+oyv;M%6KR5$h4nuC_mSAqjeqP8oV**xX-GX1uif;YC(y%y?V8QjJ2`ot}
zA~GTK7(Y=Onxoes%@@u}DQlYsG!4Gy@^WpVW~PS#zW$ywA<4%sfcjfr9y6T4p7Ouo
za4VDVtVK~o(fR1f$b5oan+Q25w61{Qa)vkO@14a;QA(x}*XtI6M1Ry%3N3lk!LFOW
z;RYGw*q;Hv&|jADRv7JSK9X`6)(1wH{+?kM(vwG{OO8Akg82y)Sm@&!<$F^LnuPPwxf1hna4L^E+*
zyp9EDqj95RLG)>Wq<&HH^yUd?U7oE-pfmECXYIdTfab?=gA&`BARJEIa0q|O&sU%B
zahbO`;=0=>|5y4B9>qV~=%P}wS@r`tY46hh{K1P+&(R_~wDFhU34MdcrVsR0u%P9xBQO;T__WXoVTS&;_6;HHyLl`r9N{3W
zE;S0jvqan>9nR}ql;hn)kvo}MI9}I798{O()}&kR?puEG9M~iRy@uGv)rkQYyA*L0$_K$JD!i@AE`<=R@gufx4O?m
zuTkZ;R#P1AYWFBkz|)^HOkF3G^j2(}
z%Dhk;|4jdTIrW_VR_2{C2;19}pbeuE?U|9-^MS
zZMiRp0H%R*e=mW(a7f8ZT!V+Q$tjLauHn2!-s^V~0#-say|V=~k*&QAVU
zpUGBjWK1ozelqNfBjEZIsZtA*Ex+@kK^^*nUjab
zk!{5BM1rgw(psByl>_WoeQ#fREk6r=z#VEX5x^;M`5w++KdP`gR7wIRz5&aU(|_C5
zdMr}H`6~#!MGtWOh*n__`)>78v!!fMwjKfoP8)d9f&bII??8U#@V;HMSzm^!qI@^g
zwJcLItH!W?VuH!`E2n8U-A4|WoM#j+^*#5|)`=F97fDk&vYz1wZqqxblLL5tL~R2!
z>e2aZ(|4yCEU9z?cdCY#5cwXK|4LK$WWw*}9oi`{{Z4J`W(V;__$5X^P6d8H4Rc{f
z)XGjAUKUsb+^?3D{kq#f_FvSQX#=0(-MP;pK4T7RpPa`kW@w8bNZ$fFU&G1tMQ*H+
zHVBSfSd|}|JlpH2wBb^S*elJZNegWFO##K?CMw13dyE%=a_}XJJ
z_w|zMj=rNdGV4-Bbn+tM@9Vgn;+!bqa?|fC(T%c*}-l_LVp^gN_;wR2Me3TU2=fTna95Wl-Mco!Rx=RufBgN*!*!8
z@^rH5fERYf?A)3u?|d29p^K+1Yoyh@50+OCNszB@0+-?LUu?OrbwPDV$_KO9gCfHW
z;aiN+P0vgiGO0mGlIn@&Fpimg_341O$c9%~`eCnEc|?cFT9{RvV5xF3T5!^8@D=X=V4p@-9cP&&jxV4#YXgN?}3wRf^NyO#$`XO@>#$=V7t
zF>^2(IyYXoKE&bcV)+g@_f&)2RUMl!RsAvFR^hX0(_|agG|Cn&T)DrWxS))Q_vikoaw`WKOJv!Ii3*-3sj8KS~p;X<4@$nAH_{Ao8|J0=cSvi
zB&C0CG^B)|Ag~LI?qE~+XS{Y1dnICr$g4f3UoIL>Zwjl?z#~S^Lqq&ms)W9g-3E3r
zsf(n-n1qq-EF^Jvh*G*91w)hAMUvh6BcZ|Eicz#}*tAKy^RnQlW0h^Eq6sZ={m0UL
zr=AM|o@vVX$OB*|InhJN4EYy$A@A$Lc?=~7VK3J8SJwiqU1vaLV+enHSNpHO)Z+1q
zKkaqr$y)PySmrw?@ZO-45xISs1@@qN1MLzLom>n$BLAD@U`}8h`|%;TL_io@5Sug3+Bz;_t=-&!ItRrvV1XUokAy{KdGq0
zB={l|qa140)sbXF`>T}he$+oFlL>~0uO%a{Q+%FT%r$j#s$X8=UdJUpQFgHh{ATDI
zlI2K`x2v|D`S{zU;t;1G82__kN1C|9t^Kxb7@(XUCGx0~{kH62(jRbnXY9u=&Z{I`
z0iH1)S;NCEW!&?{51^y{4Yl*&{iG6J`L63BQl(J32zN`Cq?&s3+n<%wV2E__Cv7}|
z$R$uCn+$YBBrHK2ZpHUTtQj|>aXXZ?8&7W@9Q`G;r@#H7^GT7L_zCq1V>3$RU|wVv
zD9-yUfJXe6156u@<){yJo{vj>8Kp2E$lYf3iw^(o%cqc?9_Qr+*=HR;NQ%8qjs)h5
z*}ph&p(_lOuqQYu7j$IbqW)R;%|X9<%_$Vek-r8ys|GNV77`kJvCes`QaCKhjgT4-
zw-h+0sFqT#Vpl$W9ayt3OZLB#j>fT#_)%&uW!bq6znj-+BXcOnwg{?5n#RnJXsfk`
zy*Sjv7Q4l0e*M1sef`)d;Q-Bm4+mauf4o)TJ
za7z5wMwi9#e`U4mjTX6hF~$RmidH&T3)E5z^U8eQ3(O`aQgIqs)wp4=bw5_$7u3`&BWGcM6AhjVSITIa!oCZQ<_0zuGfEe
zRQ=OCPS=z}fW`S}6Z3Z@(s^anAw(-xA(LKI-g;!>#wOt@9~M}oiC8$~t6T28`UAj<
z%L}UXOHS@D_8Y-3DWd@-C4*zp<*}IJ_Du1}*Mf;)m6Xo*75B#LiB5VXJ2zLW^sm%+
zURzW}VUX(|YHPN;H~sbg6r9QOi_0^Eohi892EOcKQGcs~xXwGcEyd2o{=(wQr86|>
zd3dz%`%hz`9@=R2o8swL%5-=nTg2smU)_zs
zLr>y$V>svugx4GV_TIQe?1$b*5wYlul}N4K#ED}G0?vt$eCUMD0mpVjmPBh_e42vr
zUF`mQ2Q62&PI#RH?$5g8p-tf{!#I`=5qxv_h#H#S$S+P^6lwEd-uA3nXpS+84}aYe
zmdbEW1YqFlJ6sF5%e%1gfJy1v-U4%@`9H=>Nq&DVwL0X3KtU)E!8%uIf3+RCUrdUi
z=Zc%2fcL&#l$v8Rd24oBVA5}{LkRqoxUs2UfAWl97cG_D!SqMTUiQbo(sXJYT)xg=
z>mcZImoA)K0JYhlA89M%L|)q8nkX+6yipu$!@IXsUO3Y4(T=Zk5Z6XaDij@l*B<4P
ze`}4oZ7ui|ykZ*t*~_PoORA64K@A90N1rHp_O|<1Dm=;cs-UFUhrXSH;X@)H;cV0i
z|2f4T=OfuYNA)}R2P-v+)7GLah;b7N@rz7t${8@5RKp_%i80EhIb~YR<6`ZWUv|Iv
z`Ie&btVD~1?OwoX(#eG`;9hei{VS=;YQDw1^a4_yKTjn#N%_f&FDgDA=L`{sphUhZ
zoUmc;`V~&*0{Y;&E!I>!rpNbZaBNzTT
zXzh>&_5q}fL%Dax^t8PNK4q5L)VgItR*H)-cpad>;gLRjU`tkRkUNeQsY#Jy;V6}Hjj{iKFlLPUbl>iR#h7r9Hst!
zuN-?dhYTEy_xmb!aPo`hi2leX-v8=)Z)M4WU`x!OuXxZ}YtcYMYmJ6hjNJ_`9daYc
zbr}43;y#BKjdAXDH-M_lBMMcS4apmKRgy24>rLnzG8h=&DaM@-P;Z0{QsArCq>!c0
z{+^puR_x!a`nql(zA1ZPj~!OApu|#enKk^#UFc$*85l0uZO_uSpTE;*-%cjhF37&f
z_ghO%C$WZoZk<~0MX;G|`?zrl8`?_~SDSo^bAApD|8kA1|DA*qNAMNtShh}UK2bj`
zrC(t42kRkbkWvZezS0J!qdWu!hlYQvHFC)vx)=BxM&H)ATCaW>+8^6tZ|wdq`D=t+#0;HN
zwGTi-jBqKZ+pOUEsy*6W9`y#3OL@TJBoD`-Ti=(wR}+O^)Qk1A3lXIcAz*Ho&B&IJ
zzE)B9Gu-{F=9PaA(^CXlhpgipsUto8N&$<(r+Ha0+le$YmLaFV?J3f;LA6e*HE?hVB5WMS(gQ%QdeCBlL1>e8(-}+bs7F0XGK&olu
z^a;{Lh8~Qm5|yo;%S>F7G8C1bm9$jg?~4&7M{g7{phR<_
zypKLXBY`W5b2lKb4Nx4FYVHLwRaS~AkJGQ8t2(FY%ZZBMaj@j^z~eyS*$JVM5PD%Fl8c;}O`{tKlz(b}!}P;m5N3?lO`{%2)*0G1KJB
z{bxn73=XfbVE@iK5Xr^J1L{<7-1$wf)~M@8HKo}VK<421MNEN)tFfJs>}M%Xs$bjd
zNDHNS@!S(T`XL_r#M#M3wkq16qpuXkkuS^Z26{285-eWnr%jb2=pP3vF&q|u8s5IR
z)+P1~&_{Qinsr7?;?<%YI?$VNf=-Wc-AP}0o(mP7kuUFOMMiT#M249(XMfM#NnE~A
zHf5;1`jDdjWSX4>W?Ma)7xCBTiQR+_Ux!M4JbZa$ZTv24>i7dV5UWPCCCWp|
zS3)618kHza(FcA|yCyxIrd;2k)-%D7#yW>+36C+HkksZ3u
z<@zgD=lVK02B9cR-vq{AC_!QaUDL4w20VMIi3bQ*OVQPYXCI`cx3>z??VsNo@l=Bg;F9JCV(ARw|d%Xp;
zWaWXqA9dS!)_=7nbosEGJM=bYHZlw{Ipbj%z3^Br5NFeHxeU~qM0|yogPM)@>xw)F
zWhT1yS7Ea+d*8|UW(XjU4c|m=uOM6^d9)*nz=QA^Cr7QD2{Pj=7PVMsNadQ)dGTMC
zWM8|}GryE-4@}J`<7aAc3p{ig7M%_`4x2>v?-tQYnIoK5%2J0vpF}_d^!`_c0H%oP
zkRuRYi1_-mV{`X>DJyjs@xPnqv+pw(ewmNFfU0f_e_DJnBF+k*7tgQ3n?JQ_uWPHR
zz5+_CymW&bg>ed}cc8?j@{05G>OUy{kvjGjwacbtp8AtsbZF%8#yI%X`4$c2DNpP_
zge21?xbSnWzp)iSWnfx~Rwp6ATSU5s;!8L0Gxst`O3
z)$<;fA~!u>H=*tK3^Y+%KRfyw_AP>w5WS;DL;TEs1mIPKnJsoEk>nx5Od
z?TcW-r2^>8kquGLO4g&>Vk!d}fBV;#wQfdxYv;k=U8PNxyXPaw0z+=%rD}LbI7Nka
zF2!9I@TIjchxrVuOGVJ@YD^SMB4J?`g~s#Expi1aDS`NjL~@}d}abG=K_a0{_C}Hz|`ivNWw|&*LcqWlR9oz2y5~eDud~gj%YCOx$P_4uMyiKI10pU>$W+dI}6@V36@{uge(rgeQdensIsU7lqFoTR-hXsd|i
zujwLdkeptd_ZPAbureG=8@96Anv1PD~prVXD#x+mHZ5B=4P92ESH`jrve<
z!?d%?RgsQtM+!dvVQBi{OmYZe!t3|k2|%Ga3B)nfF7r%3d3lU%Yre5!VpirCS#CNF
z?>|v*n5TR}qtbu~K*i6oRol%1dvqm7e1%&{%r@oA
zT}}1GN;KX0QN@uEQ`s~1wA#W=Sl)DO>fhh`c@4{vz065{_4;@jEb^i4`d0K^+|dFA
zBcNT_#`_9yvJOej`3QR0@YcM<^J<5wZ3j3UcmGVLnLFN5|L90}cDO=<-}n*EELZTW
zPictq=Aa$MEV&DIM8@NW|(E$vX@O2CS)eMm19@dv7*G}8Nf!1
z8|VOq?*atKl9n$zWSV8Mh{?uO*5NB`O|r}j>wZBbw#Tg)8RURwT1FMHxIy4wsUIAl
z6w9iD_s&1x$!DFS-h$94`4?NDX)X4TEDq-I*Gu^+EoomY;%JHwg(S7+qbn6zul>pE
ze-&u6zdY<4ZtW|-1dFIxsHmq+J6@_J6i27EV^6_
zFfw5ik4morGy||yJl&oh18=lU`d$6LJZpPpdzzmLYfX2wUdL4%SLVBj2t!+A&sax{
z_qn-hhG=@xH&g)o)W-k
zLG>@T*h(Ty+Y|s+Go?d=+O?bx`V-h_OfVt^Ys8`d?I9D=
zX+}3Fh@t|?&0n}9X{ShAl&wN+C!g26jcAN%pKTr0)l#y&B~;O%AEyBAm%n8^k=rCc
z;n^nb{Pl|*9egMgJxi4z^JrZw$FmKxq@x)W)?A`cLvy|#tzqoHy3l9O$gEZhk?1NK
zt34S$8Ph&28-y8TF-ei
zu2zcZ*Mh998jB&TAi|dje|ZhfRke5{wFKapT-LrhI?N*abiQ@;X(6;7L|!V=-?uTh
z1b^+xrK-G+^aZ8bU89zCgS^i@SwgMp+dOD%oNFfcqes-=Tc)#)VdXYvioRwK!wYy~
zu)_8mP@~}egsI
zpB_8ky*X0D83RIEn6E%SN8Y%fp
z&BOZl*5MOPl(cL0VtoTS{*_AAsEi*pf^MP
zc&09`x!b4*3b_4t?K&cIhz<(F%NhpIiS^Czb-~esdZD?}QF9_#yQ9_Zb#rtB)fqS1
zm1%Kt)>~a;<-v=O2_MF)4}4$QLm)%DnYbr9jGfk$u=(P5Hj2mi>+1A;8L9WT2_C23
zjy?cZf%&<$t=1Lmk=XWWR3%GnLJW3s(f17Gb9{4enH0S_R_WyK)!BR?5qx~|{LVN5
z7%1qX@9l)l;*h#~Ai5RN7=m0pt!Ua|>Se@|gx5)W?rf3-W6Q3%0Tf!V6mk@L6H8jb
zy@utuFQyks{2pH!7%s1?lmUPj)F5~N>Ys;wt4*uY-*(~)X3WMU*tS?JchJ}$@k^Wx
ztiW04WR0l*R{UEsB+2hdz~$4w>L+^pWy*>iyt+!A3O8vgPTP5G8rE+&A)Iq`pSl2s
zlEjC(IRJ-`51CuA^sk#VSS$^`p9Uj%28;85LllAK@R3neAGI7yy)_!aCFo=6()!Ij
zTNiSK<+?vW_G;wo`^Qh?98;{)f+uecmaXq`O(1nQ#xVgu4sf!?
zH2r5)>2o6)i~UvNgzeKz$`tThl$d+5N4;8!`zfV{aVi2N9hUJ4pd}&(cS3JXhx@O3
z*+Es%*_zN@s#OZL!0_uQ*TC>vl(
zWUIXo=I@AqzFad6pm~q>$gA$!*&4&qxVQJ>wLYB*}d_`wz6$d?l~X
zvd@#cPJz?O<+2GByMJC()Jp9OdzH_yZl)J7eaAWRDh=R`E!lmFQQm^}Bk^4OTS*&D
zb`VE1H>)Cu&i?wgwByz_5TQt*QAaoBo`9-^`MR?r<;95sK6=_+?$&A>vyk&R0|0b5$M3e9fV(^X47bC=cP!alIKyT9MgZD5Zy#&dv)2b-UZKBJ
z8X=AiNfHD%#U#r<%<-zKEL}8C8Or^7*%Fl$WmH;hm$DhiSU0eJm_@$a_96e)TM8RZ
zLAQH})D@ugBjWc56)m7db1`*aCr=POFnLjwdt-$=A6MTkJ-efIdi7e`fvR368t=$<
zPkpdNrBMQ5I3VYgK8z-F{2|^pr5zrXKWItv+p1%7FlW47UZrVf^Y3+OpQNbSr+MW=
zMTx08DI4NIdIm5uLbC{dU>UgYtnfATws!KneNp&t5BSi5#`aRglQ5W!8H85yL6Xiy
zJRB_01@7|&aESXmrxd#%d7a$ayJqsfolO5%ox1bP2|b?WYx<>OU8Bb_2VM@ruOQmr
zj$aB!XQ?0W0YZEFeG6HkMsJ~Y@_+mG3Z`!?h_EhL)-?ao+G3firKs8uqfkk2-ROn+
z-|U4EQ%K>HJEI-s=Lhobzi27)wIM!KkcPE&%bb~ZUF=u6;o3e%|LS;pI^Oi9Q_j6P
zg0d)}kR4RE=1WTdDlRx&PbK3T8qKzhzf4bIaA62oRq@LV3CBz_V;!~SXNKoFq>lQ!
z@mg$J%6YSd$5Cq1Ju*yUhxv`Qn{6$uaV0IC_C%?;Gju^?;`6N~xDxczK^H;!tJJ#x
ztDfG>uNO&%J}RNx+u;|T2j<5v@P?|w`icDVlW?M=U?K1(WMbA-{n2tLc`05-f)SmGCQVLlQ5wX*YC!6`dq0VP
zK@J880{yvO0+aqle;4-if-h4(7hNCE7X*Oag#l{B4=En~gLw1X!b+ebYZ}WwVJivX
zO2sz&AOt0YyaSjc**$~Y@xo4MtHJ`_pe+GXiDe;IuRe!9KRorPFddcPXazE*(*p^C
z>$VLdv`wFiZT7Nkig*)dV6bMCSu^ALvaUa5Xg10f%4l2jTsV>Jzd1<
zEzeG0en~eZz~eXa0-j)OIefQL-&N%A++25r-`;BV757RJu>rh_@5J+P{PE9Fze{PZ
zwZ{oPS|KGSJe1n=Jt7hT=5MX1|Efx{lwb`@F&(`g`}o4dl9(SyImT2;f40poWS0g%
z^?WC+W~^z1C(`*<>0b{|W?&1l3ds=;Kj8j;4pAZTiAZ|-q#Iixy}_YHDk_Ee3#;5F
zI~=VHX|swqQq2LmLthyPT?DTT`;g2BclC>0ljll~Z4eZ>LVrdkPiiR&bzxuGk{nWG
z#rNEOH?kEsVmJ+*Uv@{g8cg2kC?yfV(1z8p&4
zJ&z&7wq&e!P!|s%XBii=GW8iThI
z_B%(b?@HDjcuQcgx=4u}4B;TVrvj>!h?S5BnR>}vWxhOi>JcDnZjY+69_zCE?J!3r
z5c2Yb%d4q8>B&xwgRBzGA0ftaZp85;`uZ|jZ85Pl{yiN
zDsxSWu602?_b*QDMgRuFGP*w~e|hRvdu)eDT#tB9kt-A;vaz$aJh4Z=I?HN7A;+7=E
z7lV11DSQXdyl}qzX36p8-20^Uue}_A#yIH)8IM+Ihbb2J9PBGA;^pxfZ-{KT|lol|}m$P@^
zwy1wqg7fhQ!@@wqfq7#=afLKJzD;Vp!@#*NF%o=SM+ocZDFy0@rFYiBn{&s}@^6MR
z3IGd@^5o4PCWT)+F}hWTce5f7KQiA%#q1
znu7g!qxLZC8hGLe1%XG1jcIm5x%ySm*I4gZuNa*6+PqZ$w%A{#K=qJ<_m^%h+=tVwH(^=Ce6NP``~Ili6i#rt5-ZcYyOX(|4$&0n^eSGpq&WAZV6vNc-<
z&6b-am?~0p>EdC-J$9Kv_hzZTG9;8e`>1%m`OkI5v%MrZZhoKb1xQ_pXjR!)XTnR4
z&!etmjnfeQ-*!xB%?payXcb(_z`DL_Px|UxZ+yU|mf5q}MCKftuvbVK(o;W;t^Q!g
z1r!B3r7xAH5HTt4h+zLJ~vQf0;;AjGLqg9DGe)?8o3o+or7DWA
zKQmvAyza1fgrMfZZ8(%00MpRzPbHJ)E@fT^fPM~rMbYSVGjtw%Y4rPH??z`g>K7eu
zQ>nK%Px{Y}YxAex%C-8v5|>Hb9NLkgp50IFmjE_NP3Vp7UQJ)^naf5lU!~c^`?b-H2&}4o8uJC;0VO$7Hyyr~Eu8C8uvjDivDj
ztdZB+@mWF=E
zzVf|$)fsGJMb@>51wGW^twENwdUYzHP?|Nh3eryt-eYSW*NCxWfmKyWcqaa|HQ22&
zY`3JKnQHihR-2BAf+N0;%FG$*2~IHpYx=G?;#1b6@;KzC(V#=n?=LJnkKcXg^B;Z;
zbHk6TVZiKae_oAz#Db*HPhhJ^0H$IRV*7HO!rx1S9pyx#&2fQ6;&9YOZ}_CW8j)q0
zEpzM
z_t9vXcBA+`5s!^gK!_83xsHrE?Xie?63BLL2J>S$m_#Px8?XuUx0}^{mXGj8Do3Jf
zP^Pi#`p?hfoO2x?`&e?o=cy>R)E$SK@Qp-hreTb%vmAe@>All>rvJKdnw3t4CN!h^
z4?gDYk*=^}>*>mBG=9EM<{!G`cN7z@rq(Be8waWW-0GhHbr%Mi4K2RBMt`-%W6eCv
z3tX6Pt5~kT^YO5dLw3lS1gz)i2ztPG@7!>S4@|O@e-*|>uC%RO=AZ7W8*4{B^#aWChNZ$N%399qt`(jIV!!_v#pre4SgG(NV6zApx9vnAXt6tZ+OD!5vZKq<~X?;-*^?q@OqU^o8$D6HGP^Iegmkow9C
z#FgCS%$UForTB~QILPWTUQ6e}3W<)7R6k}Tuizgg
z6#3#8P2*65^@hIIj~C7K89Ku|5b*DHWy^`h(~gFOB>e5#=Z#OLbYZPDn2{OmuU`$ZMoST|+v3+}F@J>FJlke%BE4W@
zB#nU6+Hc({<#vLqya*b+GFWO!$W_!|b>Go=Q`uB^?6xC6M^zyi5=6_{-5*Ev(C@@5
z{iG8YY!bki5b$tqlNGlCLw#PA8|62*JZ=?y=4HQO0PkP_cQrk{s)SqVmM-il6=V-8
zb6H0Rj6vXx=s!jd8u#D&T4%5>pljc3bp}utaBJ>b{jaxzk}}J|SV`eqpKc1e^c%2;
ziQQJxhmc0{=*tF38zf-={j!R1*rGFjVvMrnYCJDTUnQM!&WJa^dg-^BN@Cr0avcO(
z9s>ULbr4jJa-^~gis>V@hl2@wBYuDu?^f7=uCRM>B{9-BO9{btHx8c)E^m`Fuh`eU
zC-R{o%%QDoV;$VS)~kyZ_g#D!D%BS0?5`~(fjizxcD)ja^d$;@@|ut3;niz*smk2p
zR2eg_vF8VVz$!zMb|Cv1e7%@cE8po)aNhN&uXR*IkirF)c~YqCd65bF(YO5?_aE-M
zml{rcsip_%&r1Q68SM*D%I()=i(9UD=qg8wU&ZV7PLf%_v37+na|->W#XjKQt3~Yn
z4h_*HMurfn00H&>39&HLUD*uIDxD2Hnp!bB;IB@NBzUkxB;!r{Nj4iuW}NP!pvexkA_mxq#8>Y#KWko#8llmv!KTz~5
z303#t&id@eTqn4J0R$ua+|U6o*pQxhuU`AsbKrRYPfF7eVzxOZ(x=o)q`nPNP6
z9&1RJy$^2HHu|=k(inEuNbTwg+hDw5Xd(MUpGw>
z5%k=jmkkzY%(`#|I58N0iW+GCfg&0lR4cxCFtu#LVopyQv%M#(DV}8os?V>P^Tofj
zOtQjb!Ybwz#A=JVDcR3oKx0l%gg#H2uFSglw?1iFE(+TetMDL6EbUb!^otL)<3eXhJtc76A{oG&c%4LY2V^
zNs~*2kk{2j;bf1?#c?#)+9UUi(fB6AWOr=#Q?5zPXDezv7@CBcZ?sr;EOQ}Me_Q0q
zzs}|7Fd1|<6%9w)2cK28>9H9lbx56kHd@EgVZW3w%O9&I5aBj>-7MYHN;gwK7c!avHZT*I6U8b+R{>1a<1u4uea{T*+ug!8?QG&5;Ld14)ndt
zDsyiG0~k=sJ_w*tWA=yzg{UnI^s$1MG7A6uUFes6}-LaD8D(3pKk#j)C1
zSqQ9?Ah2i#>X$!Ci5M&5F1dK
zI~JTI_4^J6g|&WT9R|Mr+x2!81m=0->x5ng_8MXhHS%+KE}2!Yrlbt5tVD%kM9N$m
zSj!0!D*d`%s0se74Kcr{%)F4ah0vfX
ziLw-X6C{q0r{_!fdcg~Xc_)1m%|}Hq!ma1bIZPP7++l~x-#cGh>U9U;_N
z0eB`w;?Dz1cM9@cvh$9kq?6&yTU-K5UCDb#ns~%1$U_aY+q?~d5|q|m`(v8}zKr84CV1GRzx^?fLL6#WjlaA0{RT`LLM#9aZ?sUl
zx^y9>`szoEAwY;kB{S?on@)Q@64dOV-umTe@G?D^ml;E3rgtdRxgpoT*R;wlfcsm5tot=_^V?|uZ4L=f!fFuz&iYUF|9
zq5RAxn3Gyrf{_5RLLy~xK{a2Ay+!aQSWNDR;7mbRwu
zq)CmPjGsh@Z$P8IG(CFjf@}xE-`*0QmHtzC`2vG0N3n+_Xr&-|5ZTev)CMceW6Xe0)R@xe9}mmEubC|0TmpSq53F%
z6Fn<0`}GY5fo#N&#fbEHajlEmpxh)k5r&i@INRLW{`2`w4ov7%K$qCi80rm*NEhk8
zi?gi`3{3lR-e7-q>QGK9WwF@FeHA;9(5PR})@#yjK|*%{o@@9@S(`L=`(y7L^oyI_
zWN)fC;P2df*GlD?r`KOg)3c+rqlgN$A(88THH^B8r|&4gn6(KksE_tA+w4J*fp%8r
zRT0#b4Xw)@M^_MJO?*O-aDz#luAWj
z`q~cQyYXLZJ+hrwsot?1ia!)B5Etm*JQ|G3`CXIXjq@F_PjMO3p~){LR)wPhMzY4(
z>jC`X+fCP4PkfVn)J-Ab1LY`>8g;@r{@xk>?O*d0F4rIwQh&pj*#L)Swqfc50D>Yl
z<=gEi*e{?oEx%cPd5kR(#ws8ka{eN6(YDynMNu?3KaYQTFbV&H&`|TiHqCVP7P4c~0-5-}2yPe^vlYdE}a9da$^tqU-z;I80DQvJ!Nd$Nh=1I{PL2bm`uF2f?5IwQ4x{zDz5LL
zaXW$y49{Q|4-N$7GWsiWRXE*d=EemC{Vf>JuPD6C;BMx;y~Yp|&i9)o9EDK~=0-jb
zJLg7FdbD-KSV)D<`L)OH=zKG!L06~dl%R$ZNxm}|-JC<}N|1;>U}n(k
z(XEL-3Obh(7DFp&94*uBa=?em}0pnGkBP
zl-5(p6UoCq5o3ROY!O#y0Vm@QK%I(TR}KPJO@+9Wze;6wLhoOPb7KG?|G2NqLZV`LSIZlgV20^!p|eU`4qsib>TAI1VweCzm)@{
z`-+T$fKfq(L!ENvH?T~6iAL<{>jS=srGlz~Nw=RJK#iuw$#~V6#Xhh9W)aRpa&d&r
zYm^mb$Q~2YV4m1WO6LlzJPts_-TE?
zS+@b7JP-hrATk{8Wm5?!PxN19#5T5n=6uldYJxVF%T;4;nY2RqZABdd9TQjV+xY-8!0?j+;uEpgx
z$yr|qZPoS%-OK$W_2)`+BPO0oTkRosTC0f3fbyA^Lk<+l;`i$~TC6N+If=5eLWY-t
zi!V-`#B(2bZ(4@$WKM-MuK?^PYKV{J6MD|7(si@zFj{_a(3LyIC#QsBlYdp?$WM72
zAn0mBL_-8#lq8WFVHvhT@=I5vaX!IIKg~n3T*nl_%)?>v8f*ht{#7PW(=lo|?TcAl
z{*wo(c7c7etbpVw
z>z*+4CcEc{GbO7@_?f9vLuCIIQzp04^Y>phdW>oH7XN*)D~Wq7;cM3^7~m`5W>c;d
z)f7j#ag$ctg7H@$hM_=yl#?XEz*j3aP}ybdZhkDtAEVVuhf5`f)CYLR9d5#y)dF0G
zbgF5$d1T)`dvWD^x+woTN|8bYh7euk&0!bkR=(FudV4xsK52;g_+`W_kFnPT@>qBnx(7lpZ0Ad?W;3
zHu&^KUViOCV2$m#nG4p|(_=OTs|PF)f$Qv_C(}yg5x-|zw0gwmq8vt|F^cNHs)e@m
z-X6(=G?KBl!ixBo<1rW8;!42EU~z!Pb74_+T
z;pt6v59b?!9MaKQn4->BJX=^;@?1!&}ZQ5Dk4U=YZ>
z9uPPwXYC)JPu$PEVOwj*FIUl#tW0{6YunkrWHTg7G!Pv$Uqt(2$Kv13n9N6EICZ%H
zF;Pu@0&dw6P8#-iPK=_NmyO=8oA=9vYktP?E2^Zv?|5I&)$Yv~9EXT|9q76IowL|4
z-*L@uzehmYFEi@?I_q-4Z}8Svh9_(hOFR2jQtZ-^>WKvJSvix&bN`K&YAr3%c8FA@
zCnF_J#t5s-po|Q0U06BB@b_91Bns@rYAECymx+QO`Le$^^PCN2B9(|FFEQtd
zr9DWV7FIh8v>oW8`P)ys$B(zO?eG12tb^x*MA2CM)zq*6dG52OJ|AO%DwhmC)XKkE
z<2I4WQF{3D#y0bn)|C8)UQ>FiIl$>8iTEr|#F9Ka
z1rx;K5lD2_hrlzQ$JoT&Uth9T!#k4(TTGi4pN;A>U*h+3ceJl}d@0hSxu#+l9wJS;e$9ccg;HP4C%+LNy=Kov)
zFXEm08O3}MBxPfZ6SqvC09>%$Q)yZOm$WxZ3eA_(q64iIuvV7O#jeB0{M*kojfEv#
z>bW|P(<#YqoVB3H>Z+hyv{hq9mibp(L(;CVBncaxj}S^}#cRv{x@gOXJ2{CjOgWOk
zVMDkNSPa4TN&Nh4kB6u@{y}BVPyi@SorUZm5rO|GBz`fqFvXd>`T)ycbMevUQftIG
z+FU3EtYu4+=L$!v_ciioy)R5)Wek-dY|zS#1bn8;z-QPdGCKB)(8XCT>K93gQ$
zP8&c3ucrt(!M<<|2MAAsHs9`_dvX3ch*2q-g|X{#I1Y{{jU+F6YM*{n*+vZd7G#Sw3giMLdYO}{a)EC*_zv76t7RH~HZ06Tt^wojZZ;_n6u
zbd(ucP^|ccgp|DRL4HwDwn-;Df4Qk))SL4JC;@z4ck1WwT%x5=NYhK=tRPgV-C3wk
z7}YGTd$yKU{G9-MNFMnzr&KqVcuz;??UDX+kzZcEeeM``PlR;A`+}*3ZDIyq`w_{4
zTts~SReb+DsU?qZ73MV2kzZT*i-NAh({4nx%wUATZ~?3xU*6N?S&o#NsC|~Ao8xcy
z+kN}1w(ma;)ezoWU5s3Q?>i}J`@y%MBYA~wdLiY
z3f$`g?bdibP?=UL7%qvcT$*mogplew}$pq=A-Wxje
z3UCGs>*s@UuBoD6RANO%6=eADd`~6@I0DL!l8*lr6gHH4jkC+Md6`xpaYVz6*dUx<
z1KCW?A7p
z33+MuZ@iA>@AO%4JNrko{oElPF~gP7xJuF}g3q1&SPC?f*Yvs_{Pn91AD%SW=Z3yN
zpYyPa|LoxjeF5FbU1}f>l-E5NnJ=)i2o=lbE&Lpe
z3X3tU*T0iGq~~&yzuC+cxo3_yCJA$Ysxtos#l?wL-cFvbsAwQrV=(2PEPhpwkiegD
zY}AUg1T!@(yU=RcB_pQvEswj}di*tZxNGPhdwp#3&zJ)4xm{TUzDo0W)Pw}`ul^hN
z3$0nP6Hk*_EQt7&n>R969aQs=a?s$~w>RHc3WT1S*`^_;90w8NVig7BNOkUL7VNkmJG(2BvL2N>|KUf07
zm7|J-HKh^{PC7?mI%N5`>yISHaZkWdpHx1SI1&`7YHmbU+OsE~w>O(G_$Ua+8CDls
z$PMem0$ya2mi<3Bceu^mNb(22=KXP;NwchQS40ltg5No^hCTd{td*I#d0++r*1GQx
zhcSTmW#B!m3q%$^E}nr~>s)1n41G#1*KV966S?DUoo5Lb5qo)2e{9`4Nh;R_#rC&q
zfuQ91vc|5zpFf7cIlO#skd?Be2>UL;%D%=vYvAYe-WwaDsY=xqGu5WcN!xpE2cx3y
z%j3~@x*k$|@~P*4aAg)sUw+nh3TLM>4{m%Fs|FtJmBRYHVb#zeFFO2)5=zxXj05?@
z`)7>6DDbt&bvt!r6nC2T#n6=D(UhcUKt==;%B-rlk-*@;op+Y56!lr6)7ABLHeEX>
z&?R*b7Ldu?4E_33zWR&TB2qzs*Ry{NNvS_9qndxGQ*>;1u6e05G8w8qjId^}cA>ZK
zYbvT1@O!KKHh*>VCDS5v!D8>zL0hsrk3R?P+g=iM#;9?{nlOBT=aNh7hDh~Ar#0FP
z0`Bmdw6w5V6S!QTD(8p}lLHw4-UG87#|L2?u?sw(>r2PRArp#eBj~lki`xFAUlly^~Jy@TiG;yH~M~v6oHL;PPMPhqpHc*?uj#kygt0yc2J6SKu1w*6qw&7>6&G0BIuQCY^ltA&|2f&aF(>^nlG5^D
zH^=XLH);qfm`_-Ro5t|31@X^~@Q8A5N&~W);f5$qO3mB3^c{2eidZfGD*)fuS!C7%
zn!AOz{ifU_wV?=o>{gAkj%;T<0$GEdzf-;ppw^29*5
zO6y)A^v;qr5&6qwb8MFBZKELj-KhbyhDoow9ca~a~BDC)-
z8det{F~#{icn~VvtMhl$tI{XX-O{F*t=ZsbR5I{Y_jly=BFzPnx=8US>S1}g)>K+~
zFIqk)aRpz8GscOPP{CSD8IbUxK6DTO#J_jY(d+?HR6j#5kj>X>eU2K_?70&dcwMa8
zk}NmV2#4#TC&ZiHawUz#a&vJo_E#e*G-!GBvw8242+3fo54>j2G%sUb9WIB8sm%Ds
z7d`8-`8vquJrV{Wm>$M+ui8`gwlmVs6Za+elD+CdhpCf66m7*~>ARc~HI%pHgg4t}
zakLgWFJL(4`cbdC|I!SzWLKj=3_&0DJkssx*O8{qt0+;e)hVs_`C2!EQi(DbYozSX
zU9g}Q6)!pzULQn-;Qe0Joo~I1KqOSRxuK1E=Gto(%-1ECc|njNZTW8?w&y8PCrKDa
z`gekR;P}41m!-dg$h#WtMZq3amCi!IYuzczrigp^*jQtq@^EFM+oy1W$~gS;n9CK7
z7@$AKR4Dp%oSq!}&LdCX?RzDD@AGP|ST{wAAx^pw3q|?s&^TZ8PqhA3=PonMP!5XO
ztg35yb8#e--dXwYiSoXqHO{p!4)?d5q3Ku3{)+4)T8W>1)a=iHuNC!y<*`yxO4^)2
zCMFTLyb%xZilS$&1H?}~BW}I&8KHysH!f{p(o36uUF;9I+0iijieiIj%lIgr>knn{
ztSLy;v)U}&W#h}`LPfF|>;!EG@*qo``vmKM)nD$2(_u1_>&+K>Y`%n8BG(-yxq3P0
z*0w%r%zjQ%qF$DnQ2g^T45?emCdwhUsS}WzVDO
zTpIwWCi8-^EkXIKh$&@HRb*evtUk7G3n9+vqeDX(<@=bWo<5KJA(^}*NkV;p`CT9+tDBwHe!xO0mDK6p
zfv^5mU88g;vc1EUC6Nu+-=3iI7vqA$(%rmKEku=&x+!Wy01P}CS0y#;yOAg`dSfjk
zk0X9#-Wb5t9XaO}f|8uYJ?w-Led=;tLP)V$gE+PMFNK#6kvd}f;C$8m?dmO>6w<#T
z@03K(4|r=mv;0kXeSi}Ol6$%*gS}13v9fZhW};7ypc0qIk=EaT%7eMeHlzSVU+;Wc
zMCWNcnvdWfrf>XNNvm@SuCg4z!xmxL+7sOEOJ9hnbZ2cXy)p@Ik0cgD;J_H*TEV|%peY2Ncjx4q+B)@c51
z0z0w#(NPdk$16+qymbdTdjwM85QX^stK>2$cX#HwCL;{%NDYSI_c6U!Vq%}A{4Fjk
zoMI2Hn>ME-4m`WtSaWWX8UDsOP=KAhI>x7#eCP#)kN5OKC}(mnNnSU~iI3}^US5J-
z+7C__4)H6k!EA1^q
z?0s|xFd}vQt6;wTHungd3cv{V=AWL%e3!c^Zy!h~Tm|Z>6)^{mZP3M}OfdV|MBzF{
zJo?YKiWc#Mzsiwuv?V_Kb9Nu+1Hp$n244nzoYxOgzemCWT6;2oLJwO`FMdFUh#5P;wDyt+sBRv@Lvb-^EEX(
zT&P|3X)3bP^@9SG#{T0y7;p+hr2z!jS>TqE`-$NkGhk%Qzou~G@6e!@Ks$V`#c
z&;&2o{!Ezhn08F^@+8U9@O*|4H9Y&?mm;evS9^VE?dJ?h<2lBX-rC77Sf
zv{)_W9(QuDd`w#kG|L_0pfBXmYU;oSh_vfJx
o{^S4okN@+(|NH;@umADC{9pg&zyAmGKZJk(FWxkXMNoDL0DhxNEC2ui

literal 0
HcmV?d00001