diff --git a/ncurses-6.0-20160917.patch b/ncurses-6.0-20160917.patch deleted file mode 100644 index e56f0e0..0000000 --- a/ncurses-6.0-20160917.patch +++ /dev/null @@ -1,481 +0,0 @@ -# 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 deleted file mode 100644 index 725c297..0000000 --- a/ncurses-6.0-20160924.patch +++ /dev/null @@ -1,478 +0,0 @@ -# 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 deleted file mode 100644 index e2ba724..0000000 --- a/ncurses-6.0-20161001.patch +++ /dev/null @@ -1,5340 +0,0 @@ -# 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 deleted file mode 100644 index dade22b..0000000 --- a/ncurses-6.0-20161008.patch +++ /dev/null @@ -1,15174 +0,0 @@ -# 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 deleted file mode 100644 index a205f48..0000000 --- a/ncurses-6.0-20161015.patch +++ /dev/null @@ -1,5094 +0,0 @@ -# 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
deleted file mode 100644
index 52c183e..0000000
--- a/ncurses-6.0-20161022.patch
+++ /dev/null
@@ -1,1804 +0,0 @@
-# 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
deleted file mode 100644
index 754c47f..0000000
--- a/ncurses-6.0-20161029.patch
+++ /dev/null
@@ -1,782 +0,0 @@
-# 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
deleted file mode 100644
index 2dcc344..0000000
--- a/ncurses-6.0-20161105.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-# 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
deleted file mode 100644
index 6fc2478..0000000
--- a/ncurses-6.0-20161112.patch
+++ /dev/null
@@ -1,1166 +0,0 @@
-# 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
deleted file mode 100644
index a938290..0000000
--- a/ncurses-6.0-20161119.patch
+++ /dev/null
@@ -1,1034 +0,0 @@
-# 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
deleted file mode 100644
index 9a0c0c7..0000000
--- a/ncurses-6.0-20161126.patch
+++ /dev/null
@@ -1,1307 +0,0 @@
-# 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
deleted file mode 100644
index 0b5ae3b..0000000
--- a/ncurses-6.0-20161203.patch
+++ /dev/null
@@ -1,1173 +0,0 @@
-# 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
deleted file mode 100644
index 25ffe53..0000000
--- a/ncurses-6.0-20161210.patch
+++ /dev/null
@@ -1,14551 +0,0 @@
-# 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
deleted file mode 100644
index 636e2af..0000000
--- a/ncurses-6.0-20161217.patch
+++ /dev/null
@@ -1,445 +0,0 @@
-# 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
deleted file mode 100644
index 228ab77..0000000
--- a/ncurses-6.0-20161224.patch
+++ /dev/null
@@ -1,1402 +0,0 @@
-# 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
deleted file mode 100644
index 66d3e83..0000000
--- a/ncurses-6.0-20161231.patch
+++ /dev/null
@@ -1,16453 +0,0 @@
-# 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
deleted file mode 100644
index 3845d69..0000000
--- a/ncurses-6.0-20170107.patch
+++ /dev/null
@@ -1,6071 +0,0 @@
-# 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
deleted file mode 100644
index 7327320..0000000
--- a/ncurses-6.0-20170114.patch
+++ /dev/null
@@ -1,959 +0,0 @@
-# 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-20170121.patch b/ncurses-6.0-20170121.patch
deleted file mode 100644
index 7d0f328..0000000
--- a/ncurses-6.0-20170121.patch
+++ /dev/null
@@ -1,22852 +0,0 @@
-# ncurses 6.0 - patch 20170121 - 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-20170121.patch.gz
-# patch by Thomas E. Dickey 
-# created  Sun Jan 22 02:22:50 UTC 2017
-# ------------------------------------------------------------------------------
-# 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.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.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
-@@ -1627,7 +1627,7 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--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_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*
- AC_TRY_RUN([
- #include 
-+#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 < conftest.$ac_ext <
- #include 
- 
-@@ -11379,16 +11380,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:11388: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11389: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11391: \$? = $ac_status" >&5
-+  echo "$as_me:11392: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_struct_dirent64=yes
- else
-@@ -11399,7 +11400,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--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
-@@ -11409,7 +11410,7 @@
- 	fi
- 
- ### Enable compiling-in rcs id's
--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.
-@@ -11419,7 +11420,7 @@
- else
-   with_rcs_ids=no
- fi;
--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
-@@ -11429,7 +11430,7 @@
- ###############################################################################
- 
- ### Note that some functions (such as const) are normally disabled anyway.
--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.
-@@ -11439,7 +11440,7 @@
- else
-   with_ext_funcs=yes
- fi;
--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
-@@ -11457,7 +11458,7 @@
- fi
- 
- ###   use option --enable-const to turn on use of const beyond that in XSI.
--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.
-@@ -11467,7 +11468,7 @@
- else
-   with_ext_const=no
- fi;
--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
-@@ -11477,7 +11478,7 @@
- ###############################################################################
- # These options are relatively safe to experiment with.
- 
--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.
-@@ -11487,7 +11488,7 @@
- else
-   with_develop=no
- fi;
--echo "$as_me:11490: result: $with_develop" >&5
-+echo "$as_me:11491: result: $with_develop" >&5
- echo "${ECHO_T}$with_develop" >&6
- 
- ###############################################################################
-@@ -11496,7 +11497,7 @@
- # This is still experimental (20080329), but should ultimately be moved to
- # the script-block --with-normal, etc.
- 
--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.
-@@ -11506,27 +11507,27 @@
- else
-   with_pthread=no
- fi;
--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: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 11519 "configure"
-+#line 11520 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--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: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
-@@ -11545,7 +11546,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--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
- 
-@@ -11555,7 +11556,7 @@
- 
- 	for cf_lib_pthread in pthread c_r
- 	do
--	    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"
- 
-@@ -11576,7 +11577,7 @@
- LIBS="$cf_add_libs"
- 
- 	    cat >conftest.$ac_ext <<_ACEOF
--#line 11579 "configure"
-+#line 11580 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -11593,16 +11594,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:11602: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11603: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11605: \$? = $ac_status" >&5
-+  echo "$as_me:11606: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   with_pthread=yes
- else
-@@ -11612,7 +11613,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	    LIBS="$cf_save_LIBS"
--	    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
-@@ -11640,7 +11641,7 @@
- EOF
- 
- 	else
--	    { { 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
-@@ -11649,7 +11650,7 @@
- 
- fi
- 
--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.
-@@ -11659,18 +11660,18 @@
- else
-   use_weak_symbols=no
- fi;
--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: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 11673 "configure"
-+#line 11674 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -11696,16 +11697,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:11705: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11706: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11708: \$? = $ac_status" >&5
-+  echo "$as_me:11709: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_weak_symbols=yes
- else
-@@ -11716,7 +11717,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--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
-@@ -11745,13 +11746,13 @@
- fi
- 
- # OpenSUSE is installing ncurses6, using reentrant option.
--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 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.  */
-@@ -11782,16 +11783,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:11791: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11792: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -11801,7 +11802,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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
-@@ -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: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.
-@@ -11823,7 +11824,7 @@
- else
-   with_reentrant=$assume_reentrant
- fi;
--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
-@@ -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: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.
-@@ -11856,7 +11857,7 @@
- else
-   NCURSES_WRAP_PREFIX=_nc_
- fi;
--	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_
-@@ -11870,7 +11871,7 @@
- 
- ###	use option --disable-echo to suppress full display compiling commands
- 
--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.
-@@ -11904,11 +11905,11 @@
- 	ECHO_CC=''
- 
- fi;
--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: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.
-@@ -11916,7 +11917,7 @@
-   enableval="$enable_warnings"
-   with_warnings=$enableval
- fi;
--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
-@@ -11928,12 +11929,12 @@
- if test "$GCC" = yes ; then
- 	case $host_os in
- 	(linux*|gnu*)
--		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 11936 "configure"
-+#line 11937 "configure"
- #include "confdefs.h"
- 
- int
-@@ -11950,16 +11951,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:11959: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11960: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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"
-@@ -11970,7 +11971,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		CFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:11973: result: $INTEL_COMPILER" >&5
-+		echo "$as_me:11974: result: $INTEL_COMPILER" >&5
- echo "${ECHO_T}$INTEL_COMPILER" >&6
- 		;;
- 	esac
-@@ -11979,12 +11980,12 @@
- CLANG_COMPILER=no
- 
- if test "$GCC" = yes ; then
--	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 11987 "configure"
-+#line 11988 "configure"
- #include "confdefs.h"
- 
- int
-@@ -12001,16 +12002,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:12010: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12011: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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"
-@@ -12021,12 +12022,12 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	CFLAGS="$cf_save_CFLAGS"
--	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:12047: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS="-Wall"
-@@ -12059,12 +12060,12 @@
- 		wd981
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		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:12065: \$? = $ac_status" >&5
-+  echo "$as_me:12066: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			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
-@@ -12073,7 +12074,7 @@
- 
- elif test "$GCC" = yes
- then
--	{ 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=
-@@ -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:12100: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:12101: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12103: \$? = $ac_status" >&5
-+  echo "$as_me:12104: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			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)
-@@ -12113,7 +12114,7 @@
- 				([34].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--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
-@@ -12123,7 +12124,7 @@
- 				([12].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--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
-@@ -12156,10 +12157,10 @@
- EOF
- if test "$GCC" = yes
- then
--	{ 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:12212: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12214: \$? = $ac_status" >&5
-+  echo "$as_me:12215: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			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
-@@ -12273,7 +12274,7 @@
- fi
- 
- ###	use option --enable-assertions to turn on generation of assertion code
--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.
-@@ -12283,7 +12284,7 @@
- else
-   with_assertions=no
- fi;
--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
-@@ -12336,7 +12337,7 @@
- 	;;
- esac
- 
--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.
-@@ -12346,7 +12347,7 @@
- else
-   cf_with_trace=$cf_all_traces
- fi;
--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
-@@ -12434,7 +12435,7 @@
- 	ADA_TRACE=FALSE
- fi
- 
--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.
-@@ -12451,7 +12452,7 @@
- 	enable_gnat_projects=yes
- 
- fi;
--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.
-@@ -12459,13 +12460,13 @@
- (*mingw32*)
- 	;;
- (*)
--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 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.  */
-@@ -12496,16 +12497,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:12505: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12506: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12508: \$? = $ac_status" >&5
-+  echo "$as_me:12509: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_gettimeofday=yes
- else
-@@ -12515,7 +12516,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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
-@@ -12524,7 +12525,7 @@
- 
- else
- 
--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
-@@ -12532,7 +12533,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbsd  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 12535 "configure"
-+#line 12536 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -12551,16 +12552,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:12560: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12561: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -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: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
- 
-@@ -12587,13 +12588,13 @@
- esac
- 
- ###	Checks for header files.
--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 12596 "configure"
-+#line 12597 "configure"
- #include "confdefs.h"
- #include 
- #include 
-@@ -12601,13 +12602,13 @@
- #include 
- 
- _ACEOF
--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: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
-@@ -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 12632 "configure"
-+#line 12633 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -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 12650 "configure"
-+#line 12651 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -12668,7 +12669,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12671 "configure"
-+#line 12672 "configure"
- #include "confdefs.h"
- #include 
- #if ((' ' & 0x0FF) == 0x020)
-@@ -12694,15 +12695,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--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:12700: \$? = $ac_status" >&5
-+  echo "$as_me:12701: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (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:12705: \$? = $ac_status" >&5
-+  echo "$as_me:12706: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -12715,7 +12716,7 @@
- fi
- fi
- fi
--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
- 
-@@ -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: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 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:12746: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12747: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  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:12752: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12753: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12755: \$? = $ac_status" >&5
-+  echo "$as_me:12756: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Header=yes"
- else
-@@ -12762,7 +12763,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--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: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 12781 "configure"
-+#line 12782 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12793,16 +12794,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:12802: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12803: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -12812,10 +12813,10 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--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: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
-@@ -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 12827 "configure"
-+#line 12828 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12836,21 +12837,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:12845: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12846: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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 12853 "configure"
-+#line 12854 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12862,16 +12863,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12865: \"$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: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:12872: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12874: \$? = $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
-@@ -12958,12 +12959,12 @@
- ac_cv_sizeof_signed_char=$ac_lo
- else
-   if test "$cross_compiling" = yes; then
--  { { 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 12966 "configure"
-+#line 12967 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12979,15 +12980,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--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:12985: \$? = $ac_status" >&5
-+  echo "$as_me:12986: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (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:12990: \$? = $ac_status" >&5
-+  echo "$as_me:12991: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_signed_char=`cat conftest.val`
- else
-@@ -13003,19 +13004,19 @@
-   ac_cv_sizeof_signed_char=0
- fi
- fi
--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: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 13018 "configure"
-+#line 13019 "configure"
- #include "confdefs.h"
- #include 
- #include 
-@@ -13023,13 +13024,13 @@
- #include 
- 
- _ACEOF
--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: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
-@@ -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 13054 "configure"
-+#line 13055 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -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 13072 "configure"
-+#line 13073 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -13090,7 +13091,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13093 "configure"
-+#line 13094 "configure"
- #include "confdefs.h"
- #include 
- #if ((' ' & 0x0FF) == 0x020)
-@@ -13116,15 +13117,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--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:13122: \$? = $ac_status" >&5
-+  echo "$as_me:13123: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (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:13127: \$? = $ac_status" >&5
-+  echo "$as_me:13128: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -13137,7 +13138,7 @@
- fi
- fi
- fi
--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
- 
-@@ -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: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 13159 "configure"
-+#line 13160 "configure"
- #include "confdefs.h"
- #include 
- #include <$ac_hdr>
-@@ -13171,16 +13172,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:13180: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13181: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13183: \$? = $ac_status" >&5
-+  echo "$as_me:13184: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Header=yes"
- else
-@@ -13190,7 +13191,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--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: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
-@@ -13211,7 +13212,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldir  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 13214 "configure"
-+#line 13215 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -13230,16 +13231,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:13239: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13240: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -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: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: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
-@@ -13265,7 +13266,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lx  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 13268 "configure"
-+#line 13269 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -13284,16 +13285,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:13293: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13294: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -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: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"
-@@ -13312,13 +13313,13 @@
- 
- fi
- 
--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 13321 "configure"
-+#line 13322 "configure"
- #include "confdefs.h"
- #include 
- #include 
-@@ -13334,16 +13335,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:13343: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13344: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13346: \$? = $ac_status" >&5
-+  echo "$as_me:13347: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_header_time=yes
- else
-@@ -13353,7 +13354,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--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
- 
-@@ -13371,13 +13372,13 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ac_main_return=return
- 
--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 13380 "configure"
-+#line 13381 "configure"
- #include "confdefs.h"
- 
- int
-@@ -13435,16 +13436,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:13444: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13445: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13447: \$? = $ac_status" >&5
-+  echo "$as_me:13448: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_const=yes
- else
-@@ -13454,7 +13455,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--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
- 
-@@ -13466,7 +13467,7 @@
- 
- ###	Checks for external-data
- 
--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
-@@ -13474,20 +13475,20 @@
- 
- 	rm -f conftest.a
- 	cat >conftest.$ac_ext <&5
-+	if { (eval echo "$as_me:13481: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  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:13504: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  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
-@@ -13516,10 +13517,10 @@
-   cf_cv_link_dataonly=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13519 "configure"
-+#line 13520 "configure"
- #include "confdefs.h"
- 
--	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:13530: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13531: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  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:13535: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13536: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13538: \$? = $ac_status" >&5
-+  echo "$as_me:13539: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_link_dataonly=yes
- else
-@@ -13550,7 +13551,7 @@
- 
- fi
- 
--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
-@@ -13564,7 +13565,57 @@
- 
- ###	Checks for library functions.
- 
--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
-@@ -13575,15 +13626,18 @@
-   cf_cv_func_mkstemp=maybe
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13578 "configure"
-+#line 13629 "configure"
- #include "confdefs.h"
- 
- #include 
-+#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:13616: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13670: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  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:13621: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13675: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13624: \$? = $ac_status" >&5
-+  echo "$as_me:13678: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_mkstemp=yes
- 
-@@ -13636,16 +13690,16 @@
- fi
- 
- fi
--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: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 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.  */
-@@ -13676,16 +13730,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:13685: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13739: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13688: \$? = $ac_status" >&5
-+  echo "$as_me:13742: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_mkstemp=yes
- else
-@@ -13695,7 +13749,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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
-@@ -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: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
-@@ -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:13736: found $ac_dir/$ac_word" >&5
-+echo "$as_me:13790: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -13742,10 +13796,10 @@
- fi
- gnat_exists=$ac_cv_prog_gnat_exists
- if test -n "$gnat_exists"; then
--  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:13748: result: no" >&5
-+  echo "$as_me:13802: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -13754,12 +13808,12 @@
- 	cf_cv_prog_gnat_correct=no
- else
- 
--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: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
-@@ -13767,7 +13821,7 @@
- 	cf_cv_prog_gnat_correct=yes
- 	;;
- (*)
--	{ 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
- 	;;
-@@ -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: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
-@@ -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:13793: found $ac_dir/$ac_word" >&5
-+echo "$as_me:13847: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -13799,10 +13853,10 @@
- fi
- M4_exists=$ac_cv_prog_M4_exists
- if test -n "$M4_exists"; then
--  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:13805: result: no" >&5
-+  echo "$as_me:13859: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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*
-@@ -13839,14 +13893,14 @@
- fi
- rm -rf conftest* *~conftest*
- 
--		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: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*)
-@@ -13863,10 +13917,10 @@
- 
- 		;;
- 	esac
--	echo "$as_me:13866: result: $ADAFLAGS" >&5
-+	echo "$as_me:13920: result: $ADAFLAGS" >&5
- echo "${ECHO_T}$ADAFLAGS" >&6
- 
--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
-@@ -13876,11 +13930,11 @@
- gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
- 
- fi
--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: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].*)
-@@ -13890,7 +13944,7 @@
- 	cf_gnat_generics=no
- 	;;
- esac
--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
-@@ -13902,7 +13956,7 @@
- 	cf_generic_objects=
- fi
- 
--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
-@@ -13950,7 +14004,7 @@
- rm -rf conftest* *~conftest*
- 
- fi
--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
-@@ -13963,7 +14017,7 @@
- cf_gnat_projects=no
- 
- if test "$enable_gnat_projects" != no ; then
--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]*)
-@@ -14023,15 +14077,15 @@
- 	esac
- 	;;
- esac
--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: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:14034: result: $cf_gnat_libraries" >&5
-+	echo "$as_me:14088: result: $cf_gnat_libraries" >&5
- echo "${ECHO_T}$cf_gnat_libraries" >&6
- fi
- 
-@@ -14051,7 +14105,7 @@
- 	USE_GNAT_LIBRARIES="#"
- fi
- 
--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.
-@@ -14062,12 +14116,12 @@
-   cf_ada_compiler=gnatmake
- fi;
- 
--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: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.
-@@ -14103,7 +14157,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { 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; }; }
- 	;;
-@@ -14112,10 +14166,10 @@
- fi
- eval ADA_INCLUDE="$withval"
- 
--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: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.
-@@ -14151,7 +14205,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { 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; }; }
- 	;;
-@@ -14160,10 +14214,10 @@
- fi
- eval ADA_OBJECTS="$withval"
- 
--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: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.
-@@ -14173,7 +14227,7 @@
- else
-   with_ada_sharedlib=no
- fi;
--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'
-@@ -14189,12 +14243,12 @@
- fi
- 
- 	else
--		{ { 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: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
-@@ -14234,7 +14288,7 @@
- fi
- 
- ### Build up pieces for makefile rules
--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
-@@ -14245,10 +14299,10 @@
- 	(shared)  DFT_ARG_SUFFIX=''   ;;
- 	esac
- 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
--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: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
-@@ -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: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: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
-@@ -14325,7 +14379,7 @@
- 			DFT_OBJ_SUBDIR='obj_s' ;;
- 		esac
- 	esac
--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.
-@@ -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: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
-@@ -14719,7 +14773,7 @@
-     echo "$ac_cs_version"; exit 0 ;;
-   --he | --h)
-     # Conflict between --help and --header
--    { { 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;}
-@@ -14738,7 +14792,7 @@
-     ac_need_defaults=false;;
- 
-   # This is an error.
--  -*) { { 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;}
-@@ -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: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
-@@ -15152,7 +15206,7 @@
-   esac
- 
-   if test x"$ac_file" != x-; then
--    { 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
-@@ -15170,7 +15224,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         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;;
-@@ -15183,7 +15237,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { 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;;
-@@ -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: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;}
-@@ -15208,7 +15262,7 @@
-       fi
-       ac_seen=`grep '${datarootdir}' $ac_item`
-       if test -n "$ac_seen"; then
--        { 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;}
-@@ -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: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;}
-@@ -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: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;}
-@@ -15305,7 +15359,7 @@
-   * )   ac_file_in=$ac_file.in ;;
-   esac
- 
--  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
-@@ -15316,7 +15370,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         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;;
-@@ -15329,7 +15383,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { 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;;
-@@ -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: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.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.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,17 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+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.
-+
- 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-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	20170114
-+5:0:9	6.0	20170121
-Index: aclocal.m4
-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.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
-@@ -551,7 +551,7 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--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_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 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_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 @@
- 
- 	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 <
- #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 
- #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 <
--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
- 
- 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 @@
- 
- 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.
- 
-+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: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 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.  */
-@@ -7619,16 +7669,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:7628: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7678: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7631: \$? = $ac_status" >&5
-+  echo "$as_me:7681: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -7638,7 +7688,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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: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 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.  */
-@@ -7692,16 +7742,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:7701: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7751: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7704: \$? = $ac_status" >&5
-+  echo "$as_me:7754: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -7711,7 +7761,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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: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
-@@ -7735,7 +7785,7 @@
- 			eval 'ac_cv_func_'$cf_func'=error'
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7738 "configure"
-+#line 7788 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -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:7768: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7818: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  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:7773: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7823: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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"
-@@ -7791,7 +7841,7 @@
- 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
- 
- fi
--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
-@@ -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: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.
-@@ -7821,21 +7871,21 @@
- else
-   with_symlinks=no
- fi;
--	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: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:7838: result: $with_links" >&5
-+	echo "$as_me:7888: result: $with_links" >&5
- echo "${ECHO_T}$with_links" >&6
- fi
- 
-@@ -7850,7 +7900,7 @@
- EOF
- 
- ###   use option --enable-broken-linker to force on use of broken-linker support
--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.
-@@ -7860,7 +7910,7 @@
- else
-   with_broken_linker=${BROKEN_LINKER:-no}
- fi;
--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
-@@ -7882,14 +7932,14 @@
- 		BROKEN_LINKER=1
- 		test -n "$verbose" && echo "	cygwin linker is broken anyway" 1>&6
- 
--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: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.
-@@ -7899,7 +7949,7 @@
- else
-   with_bsdpad=no
- fi;
--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
-@@ -7956,14 +8006,14 @@
- 	;;
- (linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin)
- 
--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 7966 "configure"
-+#line 8016 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -7978,16 +8028,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:7987: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8037: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7990: \$? = $ac_status" >&5
-+  echo "$as_me:8040: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -7996,7 +8046,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 7999 "configure"
-+#line 8049 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -8011,16 +8061,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:8020: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8070: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8023: \$? = $ac_status" >&5
-+  echo "$as_me:8073: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -8035,12 +8085,12 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--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
- 
- 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: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}: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 8121 "configure"
-+#line 8171 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -8133,16 +8183,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:8142: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8192: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -8163,7 +8213,7 @@
- 	 esac
- 	 if test "$cf_want_posix_source" = yes ; then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 8166 "configure"
-+#line 8216 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -8178,16 +8228,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:8187: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8237: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8190: \$? = $ac_status" >&5
-+  echo "$as_me:8240: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8198,15 +8248,15 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	 fi
- 
--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}: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 8209 "configure"
-+#line 8259 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -8221,16 +8271,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:8230: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8280: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8233: \$? = $ac_status" >&5
-+  echo "$as_me:8283: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8246,7 +8296,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--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
-@@ -8364,14 +8414,14 @@
- 	;;
- (*)
- 
--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 8374 "configure"
-+#line 8424 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -8390,16 +8440,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:8399: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8449: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8402: \$? = $ac_status" >&5
-+  echo "$as_me:8452: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -8408,7 +8458,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 8411 "configure"
-+#line 8461 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -8427,16 +8477,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:8436: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8486: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8439: \$? = $ac_status" >&5
-+  echo "$as_me:8489: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -8451,7 +8501,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--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
-@@ -8559,16 +8609,16 @@
- 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
- 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
- 
--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}: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 8571 "configure"
-+#line 8621 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -8583,16 +8633,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:8592: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8642: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -8613,7 +8663,7 @@
- 	 esac
- 	 if test "$cf_want_posix_source" = yes ; then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 8616 "configure"
-+#line 8666 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -8628,16 +8678,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:8637: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8687: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8640: \$? = $ac_status" >&5
-+  echo "$as_me:8690: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8648,15 +8698,15 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	 fi
- 
--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}: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 8659 "configure"
-+#line 8709 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -8671,16 +8721,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:8680: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8730: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8683: \$? = $ac_status" >&5
-+  echo "$as_me:8733: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8696,7 +8746,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--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
-@@ -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}: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
-@@ -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}: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
-@@ -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}: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
-@@ -8878,10 +8928,10 @@
- fi
- 
- if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
--	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 8884 "configure"
-+#line 8934 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -8896,16 +8946,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:8905: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8955: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8908: \$? = $ac_status" >&5
-+  echo "$as_me:8958: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_XOPEN_SOURCE_set=yes
- else
-@@ -8914,12 +8964,12 @@
- cf_XOPEN_SOURCE_set=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	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 8922 "configure"
-+#line 8972 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -8934,16 +8984,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:8943: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8993: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -8954,19 +9004,19 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		if test $cf_XOPEN_SOURCE_set_ok = no
- 		then
--			{ 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: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 8969 "configure"
-+#line 9019 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -8985,16 +9035,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:8994: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9044: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8997: \$? = $ac_status" >&5
-+  echo "$as_me:9047: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -9003,7 +9053,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 9006 "configure"
-+#line 9056 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -9022,16 +9072,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:9031: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9081: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9034: \$? = $ac_status" >&5
-+  echo "$as_me:9084: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -9046,7 +9096,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--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
-@@ -9148,14 +9198,14 @@
- 
- # Work around breakage on OS X
- 
--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 9158 "configure"
-+#line 9208 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -9170,23 +9220,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:9179: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9229: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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 9189 "configure"
-+#line 9239 "configure"
- #include "confdefs.h"
- 
- #undef _XOPEN_SOURCE
-@@ -9204,16 +9254,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:9213: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9263: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9216: \$? = $ac_status" >&5
-+  echo "$as_me:9266: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_define_sigwinch=maybe
- else
-@@ -9227,11 +9277,11 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--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: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
-@@ -9242,7 +9292,7 @@
- while test $cf_sigwinch != 1
- do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9245 "configure"
-+#line 9295 "configure"
- #include "confdefs.h"
- 
- #undef _XOPEN_SOURCE
-@@ -9264,16 +9314,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:9273: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9323: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -9287,7 +9337,7 @@
- done
- 
- fi
--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
-@@ -9297,13 +9347,13 @@
- 
- # Checks for CODESET support.
- 
--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 9306 "configure"
-+#line 9356 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -9315,16 +9365,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:9324: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9374: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9327: \$? = $ac_status" >&5
-+  echo "$as_me:9377: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   am_cv_langinfo_codeset=yes
- else
-@@ -9335,7 +9385,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--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
- 
-@@ -9349,7 +9399,7 @@
- NCURSES_OK_WCHAR_T=
- NCURSES_OK_WINT_T=
- 
--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.
-@@ -9359,7 +9409,7 @@
- else
-   with_widec=no
- fi;
--echo "$as_me:9362: result: $with_widec" >&5
-+echo "$as_me:9412: result: $with_widec" >&5
- echo "${ECHO_T}$with_widec" >&6
- 
- NCURSES_WCWIDTH_GRAPHICS=1
-@@ -9377,18 +9427,74 @@
- #define NCURSES_WIDECHAR 1
- EOF
- 
--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 9387 "configure"
-+#line 9488 "configure"
- #include "confdefs.h"
- 
- #include 
-+#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:9404: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9510: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  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:9410: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9516: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -9420,16 +9526,16 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--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: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 9432 "configure"
-+#line 9538 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -9445,16 +9551,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:9454: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9560: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9457: \$? = $ac_status" >&5
-+  echo "$as_me:9563: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=no
- else
-@@ -9463,16 +9569,16 @@
- cf_result=yes
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--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: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 9475 "configure"
-+#line 9581 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -9488,16 +9594,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:9497: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9603: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9500: \$? = $ac_status" >&5
-+  echo "$as_me:9606: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -9506,7 +9612,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	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...
-@@ -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: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 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.  */
-@@ -9700,16 +9806,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:9709: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9815: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9712: \$? = $ac_status" >&5
-+  echo "$as_me:9818: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -9719,7 +9825,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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: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
-@@ -9739,7 +9845,7 @@
- 
- 	cf_save_LIBS="$LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9742 "configure"
-+#line 9848 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -9752,16 +9858,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:9761: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9867: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9764: \$? = $ac_status" >&5
-+  echo "$as_me:9870: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_utf8_lib=yes
- else
-@@ -9773,12 +9879,12 @@
- cf_cv_header_path_utf8=
- cf_cv_library_path_utf8=
- 
--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 9781 "configure"
-+#line 9887 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -9791,16 +9897,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:9800: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9906: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9803: \$? = $ac_status" >&5
-+  echo "$as_me:9909: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_find_linkage_utf8=yes
-@@ -9814,7 +9920,7 @@
- LIBS="-lutf8  $cf_save_LIBS"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 9817 "configure"
-+#line 9923 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -9827,16 +9933,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:9836: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9942: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9839: \$? = $ac_status" >&5
-+  echo "$as_me:9945: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_find_linkage_utf8=yes
-@@ -9853,9 +9959,9 @@
- 
- 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
- 
--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}: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"
-@@ -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}: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 9953 "configure"
-+#line 10059 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -9963,21 +10069,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:9972: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10078: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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}: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"
-@@ -9995,7 +10101,7 @@
- 
- 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
- 
--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"
-@@ -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}: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 10079 "configure"
-+#line 10185 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10089,21 +10195,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:10098: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10204: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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}: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"
-@@ -10145,7 +10251,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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
-@@ -10180,7 +10286,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 10183 "configure"
-+#line 10289 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -10192,16 +10298,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:10201: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10307: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10204: \$? = $ac_status" >&5
-+  echo "$as_me:10310: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -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}: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"
- 
-@@ -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}: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
-@@ -10286,14 +10392,14 @@
- 	fi
- 
- # This is needed on Tru64 5.0 to declare mbstate_t
--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 10296 "configure"
-+#line 10402 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10311,23 +10417,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:10320: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10426: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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 10330 "configure"
-+#line 10436 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10346,16 +10452,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:10355: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10461: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10358: \$? = $ac_status" >&5
-+  echo "$as_me:10464: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_mbstate_t=yes
- else
-@@ -10367,7 +10473,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--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
-@@ -10385,14 +10491,14 @@
- fi
- 
- # This is needed on Tru64 5.0 to declare wchar_t
--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 10395 "configure"
-+#line 10501 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10410,23 +10516,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:10419: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10525: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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 10429 "configure"
-+#line 10535 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10445,16 +10551,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:10454: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10560: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10457: \$? = $ac_status" >&5
-+  echo "$as_me:10563: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_t=yes
- else
-@@ -10466,7 +10572,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--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
-@@ -10489,14 +10595,14 @@
- fi
- 
- # This is needed on Tru64 5.0 to declare wint_t
--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 10499 "configure"
-+#line 10605 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10514,23 +10620,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:10523: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10629: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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 10533 "configure"
-+#line 10639 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10549,16 +10655,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:10558: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10664: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10561: \$? = $ac_status" >&5
-+  echo "$as_me:10667: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wint_t=yes
- else
-@@ -10570,7 +10676,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--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
-@@ -10602,7 +10708,7 @@
- fi
- 
- ###   use option --disable-lp64 to allow long chtype
--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.
-@@ -10612,7 +10718,7 @@
- else
-   with_lp64=$cf_dft_with_lp64
- fi;
--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
-@@ -10628,7 +10734,7 @@
- fi;
- if test "$enable_largefile" != no; then
- 
--  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
-@@ -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 10643 "configure"
-+#line 10749 "configure"
- #include "confdefs.h"
- #include 
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10660,16 +10766,16 @@
- }
- _ACEOF
-      	 rm -f conftest.$ac_objext
--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: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:10669: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10775: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10672: \$? = $ac_status" >&5
-+  echo "$as_me:10778: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10679,16 +10785,16 @@
- rm -f conftest.$ac_objext
-      	 CC="$CC -n32"
-      	 rm -f conftest.$ac_objext
--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: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:10688: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10794: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -10702,13 +10808,13 @@
-        rm -f conftest.$ac_ext
-     fi
- fi
--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: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
-@@ -10716,7 +10822,7 @@
-   while :; do
-   ac_cv_sys_file_offset_bits=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10719 "configure"
-+#line 10825 "configure"
- #include "confdefs.h"
- #include 
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10736,16 +10842,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:10745: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10851: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10748: \$? = $ac_status" >&5
-+  echo "$as_me:10854: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10754,7 +10860,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10757 "configure"
-+#line 10863 "configure"
- #include "confdefs.h"
- #define _FILE_OFFSET_BITS 64
- #include 
-@@ -10775,16 +10881,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:10784: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10890: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -10795,7 +10901,7 @@
-   break
- done
- fi
--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
- 
-@@ -10805,7 +10911,7 @@
- 
- fi
- rm -rf conftest*
--  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
-@@ -10813,7 +10919,7 @@
-   while :; do
-   ac_cv_sys_large_files=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10816 "configure"
-+#line 10922 "configure"
- #include "confdefs.h"
- #include 
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10833,16 +10939,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:10842: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10948: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10845: \$? = $ac_status" >&5
-+  echo "$as_me:10951: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10851,7 +10957,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10854 "configure"
-+#line 10960 "configure"
- #include "confdefs.h"
- #define _LARGE_FILES 1
- #include 
-@@ -10872,16 +10978,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:10881: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10987: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -10892,7 +10998,7 @@
-   break
- done
- fi
--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
- 
-@@ -10905,7 +11011,7 @@
- fi
- 
- 	if test "$enable_largefile" != no ; then
--	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
-@@ -10913,7 +11019,7 @@
-   while :; do
-   ac_cv_sys_largefile_source=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10916 "configure"
-+#line 11022 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -10925,16 +11031,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:10934: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11040: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10937: \$? = $ac_status" >&5
-+  echo "$as_me:11043: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10943,7 +11049,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10946 "configure"
-+#line 11052 "configure"
- #include "confdefs.h"
- #define _LARGEFILE_SOURCE 1
- #include 
-@@ -10956,16 +11062,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:10965: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11071: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -10976,7 +11082,7 @@
-   break
- done
- fi
--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
- 
-@@ -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: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 10999 "configure"
-+#line 11105 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -11008,16 +11114,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:11017: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11123: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11020: \$? = $ac_status" >&5
-+  echo "$as_me:11126: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_fseeko=yes
- else
-@@ -11027,7 +11133,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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
- 
-@@ -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: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 11058 "configure"
-+#line 11164 "configure"
- #include "confdefs.h"
- 
-+#pragma GCC diagnostic error "-Wincompatible-pointer-types"
- #include 
- #include 
- 
-@@ -11076,16 +11183,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:11085: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11192: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11088: \$? = $ac_status" >&5
-+  echo "$as_me:11195: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_struct_dirent64=yes
- else
-@@ -11096,7 +11203,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--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
-@@ -11106,7 +11213,7 @@
- 	fi
- 
- ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
--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.
-@@ -11116,14 +11223,14 @@
- else
-   with_tparm_varargs=yes
- fi;
--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: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.
-@@ -11133,14 +11240,14 @@
- else
-   with_tic_depends=yes
- fi;
--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: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.
-@@ -11171,10 +11278,10 @@
- else
-   NCURSES_BOOL=auto
- fi;
--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: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.
-@@ -11185,11 +11292,11 @@
-   TERMINFO_CAPS=Caps
- fi;
- test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
--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: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.
-@@ -11199,11 +11306,11 @@
- else
-   NCURSES_CHTYPE=$cf_dft_chtype
- fi;
--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: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.
-@@ -11213,11 +11320,11 @@
- else
-   NCURSES_OSPEED=short
- fi;
--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: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.
-@@ -11227,11 +11334,11 @@
- else
-   NCURSES_MMASK_T=$cf_dft_mmask_t
- fi;
--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: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.
-@@ -11241,11 +11348,11 @@
- else
-   NCURSES_CCHARW_MAX=5
- fi;
--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: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.
-@@ -11255,11 +11362,11 @@
- else
-   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
- fi;
--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: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.
-@@ -11269,7 +11376,7 @@
- else
-   with_rcs_ids=no
- fi;
--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
-@@ -11278,7 +11385,7 @@
- 
- ###############################################################################
- 
--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.
-@@ -11367,14 +11474,14 @@
- 	;;
- esac
- 
--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: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: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.
-@@ -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: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
-@@ -11416,10 +11523,10 @@
- 	fi
- fi
- 
--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: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.
-@@ -11430,7 +11537,7 @@
-   MANPAGE_ALIASES=yes
- fi;
- 
--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
-@@ -11444,7 +11551,7 @@
- 
- MANPAGE_SYMLINKS=no
- if test "$MANPAGE_ALIASES" = yes ; then
--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.
-@@ -11457,17 +11564,17 @@
- 
- if test "$$cf_use_symlinks" = no; then
- if test "$MANPAGE_SYMLINKS" = yes ; then
--	{ 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:11466: result: $MANPAGE_SYMLINKS" >&5
-+echo "$as_me:11573: result: $MANPAGE_SYMLINKS" >&5
- echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
- fi
- 
--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.
-@@ -11478,7 +11585,7 @@
-   MANPAGE_TBL=no
- fi;
- 
--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
-@@ -11811,7 +11918,7 @@
- ###############################################################################
- 
- ### Note that some functions (such as const) are normally disabled anyway.
--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.
-@@ -11821,7 +11928,7 @@
- else
-   with_ext_funcs=yes
- fi;
--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
-@@ -11880,7 +11987,7 @@
- 	GENERATED_EXT_FUNCS=
- fi
- 
--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.
-@@ -11890,7 +11997,7 @@
- else
-   with_sp_funcs=$cf_dft_ext_spfuncs
- fi;
--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
-@@ -11905,7 +12012,7 @@
- 	GENERATED_SP_FUNCS=
- fi
- 
--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.
-@@ -11915,7 +12022,7 @@
- else
-   with_term_driver=no
- fi;
--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
- 
-@@ -11924,19 +12031,19 @@
- EOF
- 
- 	if test "x$with_termlib" != xno ; then
--		{ { 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: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: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.
-@@ -11946,7 +12053,7 @@
- else
-   with_ext_const=$cf_dft_ext_const
- fi;
--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
-@@ -11954,7 +12061,7 @@
- fi
- 
- ###   use option --enable-ext-colors to turn on use of colors beyond 16.
--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.
-@@ -11964,12 +12071,12 @@
- else
-   with_ext_colors=$cf_dft_ext_colors
- fi;
--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: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)
-@@ -11979,7 +12086,7 @@
- 	(5.*)
- 		cf_cv_rel_version=6.0
- 		cf_cv_abi_version=6
--		{ 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
-@@ -11995,7 +12102,7 @@
- fi
- 
- ###   use option --enable-ext-mouse to modify coding to support 5-button mice
--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.
-@@ -12005,7 +12112,7 @@
- else
-   with_ext_mouse=$cf_dft_ext_mouse
- fi;
--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
-@@ -12016,7 +12123,7 @@
- 	(5.*)
- 		cf_cv_rel_version=6.0
- 		cf_cv_abi_version=6
--		{ 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
-@@ -12025,7 +12132,7 @@
- fi
- 
- ###   use option --enable-ext-putwin to turn on extended screendumps
--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.
-@@ -12035,7 +12142,7 @@
- else
-   with_ext_putwin=$cf_dft_ext_putwin
- fi;
--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
- 
-@@ -12045,7 +12152,7 @@
- 
- fi
- 
--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.
-@@ -12055,20 +12162,20 @@
- else
-   with_no_padding=$with_ext_funcs
- fi;
--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: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 12071 "configure"
-+#line 12178 "configure"
- #include "confdefs.h"
- #include 
- #include 
-@@ -12076,13 +12183,13 @@
- #include 
- 
- _ACEOF
--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: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
-@@ -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 12107 "configure"
-+#line 12214 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -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 12125 "configure"
-+#line 12232 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -12143,7 +12250,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12146 "configure"
-+#line 12253 "configure"
- #include "confdefs.h"
- #include 
- #if ((' ' & 0x0FF) == 0x020)
-@@ -12169,15 +12276,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--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:12175: \$? = $ac_status" >&5
-+  echo "$as_me:12282: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (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:12180: \$? = $ac_status" >&5
-+  echo "$as_me:12287: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -12190,7 +12297,7 @@
- fi
- fi
- fi
--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
- 
-@@ -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: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 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:12221: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12328: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  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:12227: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12334: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12230: \$? = $ac_status" >&5
-+  echo "$as_me:12337: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Header=yes"
- else
-@@ -12237,7 +12344,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--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: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 12256 "configure"
-+#line 12363 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12268,16 +12375,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:12277: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12384: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -12287,10 +12394,10 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--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: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
-@@ -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 12302 "configure"
-+#line 12409 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12311,21 +12418,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:12320: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12427: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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 12328 "configure"
-+#line 12435 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12337,16 +12444,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:12346: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12453: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12349: \$? = $ac_status" >&5
-+  echo "$as_me:12456: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid; break
- else
-@@ -12362,7 +12469,7 @@
- ac_hi=-1 ac_mid=-1
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 12365 "configure"
-+#line 12472 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12374,16 +12481,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:12383: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12490: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12386: \$? = $ac_status" >&5
-+  echo "$as_me:12493: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=$ac_mid; break
- else
-@@ -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 12402 "configure"
-+#line 12509 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12411,16 +12518,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:12420: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12527: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12423: \$? = $ac_status" >&5
-+  echo "$as_me:12530: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid
- else
-@@ -12433,12 +12540,12 @@
- ac_cv_sizeof_signed_char=$ac_lo
- else
-   if test "$cross_compiling" = yes; then
--  { { 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 12441 "configure"
-+#line 12548 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12454,15 +12561,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--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:12460: \$? = $ac_status" >&5
-+  echo "$as_me:12567: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (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:12465: \$? = $ac_status" >&5
-+  echo "$as_me:12572: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_signed_char=`cat conftest.val`
- else
-@@ -12478,7 +12585,7 @@
-   ac_cv_sizeof_signed_char=0
- fi
- fi
--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: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.
-@@ -12499,12 +12606,12 @@
- else
-   with_signed_char=no
- fi;
--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: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.
-@@ -12514,7 +12621,7 @@
- else
-   with_sigwinch=$with_ext_funcs
- fi;
--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
-@@ -12522,7 +12629,7 @@
- EOF
- 
- ###   use option --enable-tcap-names to allow user to define new capabilities
--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.
-@@ -12532,7 +12639,7 @@
- else
-   with_tcap_names=$with_ext_funcs
- fi;
--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
-@@ -12540,7 +12647,7 @@
- ###############################################################################
- # These options are relatively safe to experiment with.
- 
--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.
-@@ -12550,11 +12657,11 @@
- else
-   with_develop=no
- fi;
--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: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.
-@@ -12564,7 +12671,7 @@
- else
-   enable_hard_tabs=$with_develop
- fi;
--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
-@@ -12572,7 +12679,7 @@
- EOF
- 
- ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
--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.
-@@ -12582,7 +12689,7 @@
- else
-   enable_xmc_glitch=$with_develop
- fi;
--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
-@@ -12592,7 +12699,7 @@
- ###############################################################################
- # These are just experimental, probably should not be in a package:
- 
--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.
-@@ -12602,7 +12709,7 @@
- else
-   with_assumed_color=yes
- fi;
--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
-@@ -12610,7 +12717,7 @@
- EOF
- 
- ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
--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.
-@@ -12620,7 +12727,7 @@
- else
-   with_hashmap=yes
- fi;
--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
-@@ -12628,7 +12735,7 @@
- EOF
- 
- ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
--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.
-@@ -12638,7 +12745,7 @@
- else
-   with_colorfgbg=no
- fi;
--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
-@@ -12646,7 +12753,7 @@
- EOF
- 
- ###   use option --enable-interop to turn on use of bindings used for interop
--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.
-@@ -12656,7 +12763,7 @@
- else
-   with_exp_interop=$cf_dft_interop
- fi;
--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
-@@ -12665,7 +12772,7 @@
- # This is still experimental (20080329), but should ultimately be moved to
- # the script-block --with-normal, etc.
- 
--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.
-@@ -12675,27 +12782,27 @@
- else
-   with_pthread=no
- fi;
--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: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 12688 "configure"
-+#line 12795 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--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: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
-@@ -12714,7 +12821,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--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
- 
-@@ -12724,7 +12831,7 @@
- 
- 	for cf_lib_pthread in pthread c_r
- 	do
--	    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"
- 
-@@ -12745,7 +12852,7 @@
- LIBS="$cf_add_libs"
- 
- 	    cat >conftest.$ac_ext <<_ACEOF
--#line 12748 "configure"
-+#line 12855 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -12762,16 +12869,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:12771: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12878: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12774: \$? = $ac_status" >&5
-+  echo "$as_me:12881: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   with_pthread=yes
- else
-@@ -12781,7 +12888,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	    LIBS="$cf_save_LIBS"
--	    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
-@@ -12809,7 +12916,7 @@
- EOF
- 
- 	else
--	    { { 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
-@@ -12819,13 +12926,13 @@
- fi
- 
- if test "x$with_pthread" != xno; then
--	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 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.  */
-@@ -12856,16 +12963,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:12865: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12972: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -12875,11 +12982,11 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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: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.
-@@ -12889,7 +12996,7 @@
- else
-   use_pthreads_eintr=no
- fi;
--		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
- 
-@@ -12900,7 +13007,7 @@
- 		fi
- fi
- 
--	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.
-@@ -12910,18 +13017,18 @@
- else
-   use_weak_symbols=no
- fi;
--	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: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 12924 "configure"
-+#line 13031 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -12947,16 +13054,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:12956: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13063: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12959: \$? = $ac_status" >&5
-+  echo "$as_me:13066: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_weak_symbols=yes
- else
-@@ -12967,7 +13074,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--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
-@@ -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: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.
-@@ -13010,7 +13117,7 @@
- else
-   with_reentrant=no
- fi;
--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
-@@ -13083,7 +13190,7 @@
- 	(5.*)
- 		cf_cv_rel_version=6.0
- 		cf_cv_abi_version=6
--		{ 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
-@@ -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: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.
-@@ -13108,7 +13215,7 @@
- else
-   NCURSES_WRAP_PREFIX=_nc_
- fi;
--	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_
-@@ -13118,7 +13225,7 @@
- #define NCURSES_WRAP_PREFIX "$NCURSES_WRAP_PREFIX"
- EOF
- 
--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.
-@@ -13128,7 +13235,7 @@
- else
-   with_safe_sprintf=no
- fi;
--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
-@@ -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: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.
-@@ -13148,7 +13255,7 @@
- else
-   with_scroll_hints=yes
- fi;
--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
-@@ -13157,7 +13264,7 @@
- 
- fi
- 
--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.
-@@ -13167,7 +13274,7 @@
- else
-   with_wgetch_events=no
- fi;
--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
-@@ -13178,7 +13285,7 @@
- 
- ###	use option --disable-echo to suppress full display compiling commands
- 
--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.
-@@ -13212,7 +13319,7 @@
- 	ECHO_CC=''
- 
- fi;
--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
-@@ -13224,7 +13331,7 @@
- fi
- 
- ###	use option --enable-warnings to turn on all gcc warnings
--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.
-@@ -13232,7 +13339,7 @@
-   enableval="$enable_warnings"
-   with_warnings=$enableval
- fi;
--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
-@@ -13244,12 +13351,12 @@
- if test "$GCC" = yes ; then
- 	case $host_os in
- 	(linux*|gnu*)
--		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 13252 "configure"
-+#line 13359 "configure"
- #include "confdefs.h"
- 
- int
-@@ -13266,16 +13373,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:13275: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13382: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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"
-@@ -13286,7 +13393,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		CFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:13289: result: $INTEL_COMPILER" >&5
-+		echo "$as_me:13396: result: $INTEL_COMPILER" >&5
- echo "${ECHO_T}$INTEL_COMPILER" >&6
- 		;;
- 	esac
-@@ -13295,12 +13402,12 @@
- CLANG_COMPILER=no
- 
- if test "$GCC" = yes ; then
--	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 13303 "configure"
-+#line 13410 "configure"
- #include "confdefs.h"
- 
- int
-@@ -13317,16 +13424,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:13326: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13433: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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"
-@@ -13337,12 +13444,12 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	CFLAGS="$cf_save_CFLAGS"
--	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:13469: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS="-Wall"
-@@ -13375,12 +13482,12 @@
- 		wd981
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		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:13381: \$? = $ac_status" >&5
-+  echo "$as_me:13488: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			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
-@@ -13389,7 +13496,7 @@
- 
- elif test "$GCC" = yes
- then
--	{ 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=
-@@ -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:13416: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13523: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13419: \$? = $ac_status" >&5
-+  echo "$as_me:13526: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			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)
-@@ -13429,7 +13536,7 @@
- 				([34].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--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
-@@ -13439,7 +13546,7 @@
- 				([12].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--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
-@@ -13459,12 +13566,12 @@
- if test "$GCC" = yes ; then
- 	case $host_os in
- 	(linux*|gnu*)
--		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 13467 "configure"
-+#line 13574 "configure"
- #include "confdefs.h"
- 
- int
-@@ -13481,16 +13588,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:13490: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13597: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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"
-@@ -13501,7 +13608,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		CXXFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:13504: result: $INTEL_CPLUSPLUS" >&5
-+		echo "$as_me:13611: result: $INTEL_CPLUSPLUS" >&5
- echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
- 		;;
- 	esac
-@@ -13510,12 +13617,12 @@
- CLANG_CPLUSPLUS=no
- 
- if test "$GCC" = yes ; then
--	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 13518 "configure"
-+#line 13625 "configure"
- #include "confdefs.h"
- 
- int
-@@ -13532,16 +13639,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:13541: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13648: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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"
-@@ -13552,7 +13659,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	CXXFLAGS="$cf_save_CFLAGS"
--	echo "$as_me:13555: result: $CLANG_CPLUSPLUS" >&5
-+	echo "$as_me:13662: result: $CLANG_CPLUSPLUS" >&5
- echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
- fi
- 
-@@ -13564,7 +13671,7 @@
- ac_main_return=return
- 
- cat > conftest.$ac_ext <&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"
-@@ -13599,12 +13706,12 @@
- 		wd981
- 	do
- 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
--		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:13605: \$? = $ac_status" >&5
-+  echo "$as_me:13712: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			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
-@@ -13613,7 +13720,7 @@
- 
- elif test "$GXX" = yes
- then
--	{ 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"
-@@ -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:13646: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13753: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13649: \$? = $ac_status" >&5
-+  echo "$as_me:13756: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			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: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
-@@ -13688,10 +13795,10 @@
- EOF
- if test "$GCC" = yes
- then
--	{ 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:13850: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13746: \$? = $ac_status" >&5
-+  echo "$as_me:13853: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			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
-@@ -13804,7 +13911,7 @@
- rm -rf conftest*
- fi
- 
--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.
-@@ -13814,7 +13921,7 @@
- else
-   with_string_hacks=no
- fi;
--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
-@@ -13823,15 +13930,15 @@
- #define USE_STRING_HACKS 1
- EOF
- 
--	{ 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
- 
-@@ -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: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 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.  */
-@@ -14054,16 +14161,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:14063: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14170: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14066: \$? = $ac_status" >&5
-+  echo "$as_me:14173: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -14073,7 +14180,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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: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.
-@@ -14096,7 +14203,7 @@
- else
-   with_assertions=no
- fi;
--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
-@@ -14112,7 +14219,7 @@
- 
- ###	use option --disable-leaks to suppress "permanent" leaks, for testing
- 
--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.
-@@ -14129,7 +14236,7 @@
- else
-   with_dmalloc=
- fi;
--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
-@@ -14223,23 +14330,23 @@
- esac
- 
- if test "$with_dmalloc" = yes ; then
--	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 14232 "configure"
-+#line 14339 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--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: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
-@@ -14258,11 +14365,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--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: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
-@@ -14270,7 +14377,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14273 "configure"
-+#line 14380 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14289,16 +14396,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:14298: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14405: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -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: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: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.
-@@ -14341,7 +14448,7 @@
- else
-   with_dbmalloc=
- fi;
--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
-@@ -14435,23 +14542,23 @@
- esac
- 
- if test "$with_dbmalloc" = yes ; then
--	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 14444 "configure"
-+#line 14551 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--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: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
-@@ -14470,11 +14577,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--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: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
-@@ -14482,7 +14589,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldbmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14485 "configure"
-+#line 14592 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14501,16 +14608,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:14510: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14617: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -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: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: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.
-@@ -14553,7 +14660,7 @@
- else
-   with_valgrind=
- fi;
--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
-@@ -14646,7 +14753,7 @@
- 	;;
- esac
- 
--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.
-@@ -14656,7 +14763,7 @@
- else
-   : ${with_no_leaks:=no}
- fi;
--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
-@@ -14708,7 +14815,7 @@
- 	;;
- esac
- 
--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.
-@@ -14718,7 +14825,7 @@
- else
-   cf_with_trace=$cf_all_traces
- fi;
--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
-@@ -14808,7 +14915,7 @@
- 	ADA_TRACE=FALSE
- fi
- 
--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.
-@@ -14825,7 +14932,7 @@
- 	enable_gnat_projects=yes
- 
- fi;
--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.
-@@ -14835,13 +14942,13 @@
- 	LIBS=" -lpsapi $LIBS"
- 	;;
- (*)
--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 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.  */
-@@ -14872,16 +14979,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:14881: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14988: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14884: \$? = $ac_status" >&5
-+  echo "$as_me:14991: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_gettimeofday=yes
- else
-@@ -14891,7 +14998,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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
- 
-@@ -14901,7 +15008,7 @@
- 
- else
- 
--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
-@@ -14909,7 +15016,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbsd  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14912 "configure"
-+#line 15019 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14928,16 +15035,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:14937: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15044: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -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: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
- 
-@@ -14978,17 +15085,18 @@
- 	;;
- esac
- 
--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 14988 "configure"
-+#line 15095 "configure"
- #include "confdefs.h"
- 
- 	#include 
-+	#include 
- 	#include 
- 
- int
-@@ -15000,16 +15108,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:15009: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15117: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15012: \$? = $ac_status" >&5
-+  echo "$as_me:15120: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_need_libm=no
- else
-@@ -15019,7 +15127,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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
-@@ -15027,13 +15135,13 @@
- fi
- 
- ###	Checks for header files.
--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 15036 "configure"
-+#line 15144 "configure"
- #include "confdefs.h"
- #include 
- #include 
-@@ -15041,13 +15149,13 @@
- #include 
- 
- _ACEOF
--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: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
-@@ -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 15072 "configure"
-+#line 15180 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -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 15090 "configure"
-+#line 15198 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -15108,7 +15216,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15111 "configure"
-+#line 15219 "configure"
- #include "confdefs.h"
- #include 
- #if ((' ' & 0x0FF) == 0x020)
-@@ -15134,15 +15242,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--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:15140: \$? = $ac_status" >&5
-+  echo "$as_me:15248: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (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:15145: \$? = $ac_status" >&5
-+  echo "$as_me:15253: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -15155,7 +15263,7 @@
- fi
- fi
- fi
--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
- 
-@@ -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: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 15177 "configure"
-+#line 15285 "configure"
- #include "confdefs.h"
- #include 
- #include <$ac_hdr>
-@@ -15189,16 +15297,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:15198: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15306: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15201: \$? = $ac_status" >&5
-+  echo "$as_me:15309: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Header=yes"
- else
-@@ -15208,7 +15316,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--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: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
-@@ -15229,7 +15337,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldir  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 15232 "configure"
-+#line 15340 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -15248,16 +15356,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:15257: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15365: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -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: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: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
-@@ -15283,7 +15391,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lx  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 15286 "configure"
-+#line 15394 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -15302,16 +15410,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:15311: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15419: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -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: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"
-@@ -15330,13 +15438,13 @@
- 
- fi
- 
--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 15339 "configure"
-+#line 15447 "configure"
- #include "confdefs.h"
- #include 
- #include 
-@@ -15352,16 +15460,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:15361: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15469: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15364: \$? = $ac_status" >&5
-+  echo "$as_me:15472: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_header_time=yes
- else
-@@ -15371,7 +15479,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--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
- 
-@@ -15390,13 +15498,13 @@
- 	;;
- esac
- 
--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 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.  */
-@@ -15427,16 +15535,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:15436: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15544: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15439: \$? = $ac_status" >&5
-+  echo "$as_me:15547: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_regcomp=yes
- else
-@@ -15446,7 +15554,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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
-@@ -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: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
-@@ -15463,7 +15571,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-l$cf_regex_lib  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 15466 "configure"
-+#line 15574 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -15482,16 +15590,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:15491: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15599: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15494: \$? = $ac_status" >&5
-+  echo "$as_me:15602: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Lib=yes"
- else
-@@ -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: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
- 
-@@ -15531,13 +15639,13 @@
- fi
- 
- if test "$cf_regex_func" = no ; then
--	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 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.  */
-@@ -15568,16 +15676,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:15577: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15685: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15580: \$? = $ac_status" >&5
-+  echo "$as_me:15688: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_compile=yes
- else
-@@ -15587,13 +15695,13 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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: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
-@@ -15601,7 +15709,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgen  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 15604 "configure"
-+#line 15712 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -15620,16 +15728,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:15629: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15737: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -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: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
- 
-@@ -15668,11 +15776,11 @@
- fi
- 
- if test "$cf_regex_func" = no ; then
--	{ 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: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
-@@ -15684,7 +15792,7 @@
- 	for cf_regex_hdr in regexp.h regexpr.h
- 	do
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 15687 "configure"
-+#line 15795 "configure"
- #include "confdefs.h"
- #include <$cf_regex_hdr>
- int
-@@ -15699,16 +15807,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:15708: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15816: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -15725,7 +15833,7 @@
- 	for cf_regex_hdr in regex.h
- 	do
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 15728 "configure"
-+#line 15836 "configure"
- #include "confdefs.h"
- #include 
- #include <$cf_regex_hdr>
-@@ -15743,16 +15851,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:15752: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15860: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -15768,11 +15876,11 @@
- esac
- 
- fi
--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: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
-@@ -15811,23 +15919,23 @@
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--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 15820 "configure"
-+#line 15928 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--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: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
-@@ -15846,7 +15954,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--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: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 15868 "configure"
-+#line 15976 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--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: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
-@@ -15894,7 +16002,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--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: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
-@@ -15914,7 +16022,7 @@
- for cf_header in stdio.h stdlib.h unistd.h getopt.h
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 15917 "configure"
-+#line 16025 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -15927,16 +16035,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:15936: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16044: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -15948,7 +16056,7 @@
- done
- 
- fi
--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
- 
-@@ -15969,7 +16077,7 @@
- # Note: even non-Posix ISC needs  to declare fd_set
- if test "x$ISC" = xyes ; then
- 
--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
-@@ -15977,7 +16085,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lcposix  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 15980 "configure"
-+#line 16088 "configure"
- #include "confdefs.h"
- 
- int
-@@ -15989,16 +16097,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:15998: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16106: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -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: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: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
-@@ -16028,7 +16136,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-linet  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 16031 "configure"
-+#line 16139 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -16047,16 +16155,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:16056: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16164: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -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: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
- 
-@@ -16090,14 +16198,14 @@
- fi
- fi
- 
--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 16100 "configure"
-+#line 16208 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -16117,16 +16225,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:16126: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16234: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -16138,7 +16246,7 @@
- 
- fi
- 
--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
-@@ -16153,13 +16261,13 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ac_main_return=return
- 
--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 16162 "configure"
-+#line 16270 "configure"
- #include "confdefs.h"
- 
- int
-@@ -16217,16 +16325,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:16226: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16334: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16229: \$? = $ac_status" >&5
-+  echo "$as_me:16337: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_const=yes
- else
-@@ -16236,7 +16344,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--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
- 
-@@ -16246,7 +16354,7 @@
- 
- fi
- 
--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
-@@ -16254,7 +16362,7 @@
-   ac_cv_c_inline=no
- for ac_kw in inline __inline__ __inline; do
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16257 "configure"
-+#line 16365 "configure"
- #include "confdefs.h"
- #ifndef __cplusplus
- static $ac_kw int static_foo () {return 0; }
-@@ -16263,16 +16371,16 @@
- 
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:16272: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16380: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -16283,7 +16391,7 @@
- done
- 
- fi
--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) ;;
-@@ -16309,7 +16417,7 @@
- 		:
- 	elif test "$GCC" = yes
- 	then
--		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
-@@ -16318,7 +16426,7 @@
- 		cf_save_CFLAGS=$CFLAGS
- 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 16321 "configure"
-+#line 16429 "configure"
- #include "confdefs.h"
- inline int foo(void) { return 1; }
- int
-@@ -16330,16 +16438,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:16339: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16447: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16342: \$? = $ac_status" >&5
-+  echo "$as_me:16450: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gcc_inline=yes
- else
-@@ -16351,7 +16459,7 @@
- 		CFLAGS=$cf_save_CFLAGS
- 
- fi
--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
- 
-@@ -16437,7 +16545,7 @@
- 	fi
- fi
- 
--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
-@@ -16449,7 +16557,7 @@
- 		"int"
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16452 "configure"
-+#line 16560 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -16472,16 +16580,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:16481: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16589: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -16495,7 +16603,7 @@
- 
- fi
- 
--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: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
-@@ -16514,12 +16622,12 @@
-   cf_cv_typeof_chtype=long
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16517 "configure"
-+#line 16625 "configure"
- #include "confdefs.h"
- 
- #define WANT_BITS 31
- #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:16552: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16660: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  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:16557: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16665: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -16572,7 +16680,7 @@
- 
- fi
- 
--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: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 16594 "configure"
-+#line 16702 "configure"
- #include "confdefs.h"
- 
- int
-@@ -16603,16 +16711,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:16612: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16720: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16615: \$? = $ac_status" >&5
-+  echo "$as_me:16723: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_unsigned_literals=yes
- else
-@@ -16624,7 +16732,7 @@
- 
- fi
- 
--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"
-@@ -16640,14 +16748,14 @@
- 
- ###	Checks for external-data
- 
--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 16650 "configure"
-+#line 16758 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_STDLIB_H
-@@ -16665,16 +16773,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:16674: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16782: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16677: \$? = $ac_status" >&5
-+  echo "$as_me:16785: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_dcl_errno=yes
- else
-@@ -16685,7 +16793,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--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
-@@ -16700,14 +16808,14 @@
- 
- # It's possible (for near-UNIX clones) that the data doesn't exist
- 
--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 16710 "configure"
-+#line 16818 "configure"
- #include "confdefs.h"
- 
- #undef errno
-@@ -16722,16 +16830,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:16731: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16839: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16734: \$? = $ac_status" >&5
-+  echo "$as_me:16842: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_errno=yes
- else
-@@ -16742,7 +16850,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--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
-@@ -16755,7 +16863,7 @@
- 
- fi
- 
--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
-@@ -16763,20 +16871,20 @@
- 
- 	rm -f conftest.a
- 	cat >conftest.$ac_ext <&5
-+	if { (eval echo "$as_me:16877: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  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:16900: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  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
-@@ -16805,10 +16913,10 @@
-   cf_cv_link_dataonly=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16808 "configure"
-+#line 16916 "configure"
- #include "confdefs.h"
- 
--	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:16819: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16927: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  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:16824: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16932: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16827: \$? = $ac_status" >&5
-+  echo "$as_me:16935: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_link_dataonly=yes
- else
-@@ -16839,7 +16947,7 @@
- 
- fi
- 
--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
-@@ -16878,13 +16986,13 @@
- 
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--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 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.  */
-@@ -16915,16 +17023,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:16924: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17032: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16927: \$? = $ac_status" >&5
-+  echo "$as_me:17035: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -16934,7 +17042,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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: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: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 16963 "configure"
-+#line 17071 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -16980,16 +17088,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:16989: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17097: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16992: \$? = $ac_status" >&5
-+  echo "$as_me:17100: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cgetent=yes
- else
-@@ -17000,7 +17108,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--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
-@@ -17010,16 +17118,17 @@
- #define HAVE_BSD_CGETENT 1
- EOF
- 
--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 17020 "configure"
-+#line 17128 "configure"
- #include "confdefs.h"
- 
-+#pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
- #include 
- int
- main ()
-@@ -17039,16 +17148,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:17048: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17157: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17051: \$? = $ac_status" >&5
-+  echo "$as_me:17160: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cgetent_const=yes
- else
-@@ -17059,7 +17168,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--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
-@@ -17073,14 +17182,14 @@
- 
- fi
- 
--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 17083 "configure"
-+#line 17192 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -17092,16 +17201,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:17101: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17210: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17104: \$? = $ac_status" >&5
-+  echo "$as_me:17213: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_isascii=yes
- else
-@@ -17112,7 +17221,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--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
-@@ -17120,10 +17229,10 @@
- EOF
- 
- if test "$ac_cv_func_sigaction" = yes; then
--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 17126 "configure"
-+#line 17235 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -17137,16 +17246,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:17146: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17255: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17149: \$? = $ac_status" >&5
-+  echo "$as_me:17258: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   sigact_bad=no
- else
-@@ -17154,7 +17263,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17157 "configure"
-+#line 17266 "configure"
- #include "confdefs.h"
- 
- #define _POSIX_SOURCE
-@@ -17169,16 +17278,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:17178: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17287: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17181: \$? = $ac_status" >&5
-+  echo "$as_me:17290: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   sigact_bad=yes
- 
-@@ -17194,11 +17303,11 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--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: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
-@@ -17208,7 +17317,7 @@
-   cf_cv_func_nanosleep=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17211 "configure"
-+#line 17320 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -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:17236: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17345: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  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:17241: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17350: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17244: \$? = $ac_status" >&5
-+  echo "$as_me:17353: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_nanosleep=yes
- else
-@@ -17253,7 +17362,7 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--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" &&
-@@ -17268,23 +17377,23 @@
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--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 17277 "configure"
-+#line 17386 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--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: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
-@@ -17303,7 +17412,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--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: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 17327 "configure"
-+#line 17436 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--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: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
-@@ -17353,7 +17462,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--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: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 17377 "configure"
-+#line 17486 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -17386,16 +17495,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:17395: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17504: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17398: \$? = $ac_status" >&5
-+  echo "$as_me:17507: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   termios_bad=no
- else
-@@ -17403,7 +17512,7 @@
- cat conftest.$ac_ext >&5
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 17406 "configure"
-+#line 17515 "configure"
- #include "confdefs.h"
- 
- #define _POSIX_SOURCE
-@@ -17417,16 +17526,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:17426: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17535: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17429: \$? = $ac_status" >&5
-+  echo "$as_me:17538: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   termios_bad=unknown
- else
-@@ -17442,19 +17551,19 @@
- 
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	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: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 17457 "configure"
-+#line 17566 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -17482,16 +17591,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:17491: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17600: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17494: \$? = $ac_status" >&5
-+  echo "$as_me:17603: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_tcgetattr=yes
- else
-@@ -17501,21 +17610,21 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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: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 17518 "configure"
-+#line 17627 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -17531,16 +17640,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:17540: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17649: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17543: \$? = $ac_status" >&5
-+  echo "$as_me:17652: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=vsscanf
- else
-@@ -17548,7 +17657,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17551 "configure"
-+#line 17660 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -17570,16 +17679,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:17579: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17688: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17582: \$? = $ac_status" >&5
-+  echo "$as_me:17691: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=vfscanf
- else
-@@ -17587,7 +17696,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17590 "configure"
-+#line 17699 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -17609,16 +17718,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:17618: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17727: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17621: \$? = $ac_status" >&5
-+  echo "$as_me:17730: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=_doscan
- else
-@@ -17633,7 +17742,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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
-@@ -17654,7 +17763,57 @@
- ;;
- esac
- 
--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
-@@ -17665,15 +17824,18 @@
-   cf_cv_func_mkstemp=maybe
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17668 "configure"
-+#line 17827 "configure"
- #include "confdefs.h"
- 
- #include 
-+#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:17706: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17868: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  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:17711: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17873: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17714: \$? = $ac_status" >&5
-+  echo "$as_me:17876: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_mkstemp=yes
- 
-@@ -17726,16 +17888,16 @@
- fi
- 
- fi
--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: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 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.  */
-@@ -17766,16 +17928,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:17775: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17937: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17778: \$? = $ac_status" >&5
-+  echo "$as_me:17940: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_mkstemp=yes
- else
-@@ -17785,7 +17947,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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
-@@ -17806,21 +17968,21 @@
- fi
- 
- if test "x$cross_compiling" = xyes ; then
--	{ 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: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: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 17823 "configure"
-+#line 17985 "configure"
- #include "confdefs.h"
- #include 
- /* If setvbuf has the reversed format, exit 0. */
-@@ -17837,15 +17999,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--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:17843: \$? = $ac_status" >&5
-+  echo "$as_me:18005: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (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:17848: \$? = $ac_status" >&5
-+  echo "$as_me:18010: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_setvbuf_reversed=yes
- else
-@@ -17858,7 +18020,7 @@
- fi
- rm -f core core.* *.core
- fi
--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
- 
-@@ -17869,13 +18031,13 @@
- fi
- 
- fi
--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 17878 "configure"
-+#line 18040 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -17890,16 +18052,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:17899: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18061: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -17909,7 +18071,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--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
-   :
-@@ -17921,13 +18083,13 @@
- 
- fi
- 
--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 17930 "configure"
-+#line 18092 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -17942,16 +18104,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:17951: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18113: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -17961,7 +18123,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--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
-   :
-@@ -17973,14 +18135,14 @@
- 
- fi
- 
--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 17983 "configure"
-+#line 18145 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -17993,16 +18155,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:18002: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18164: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18005: \$? = $ac_status" >&5
-+  echo "$as_me:18167: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_sigaction=yes
- else
-@@ -18013,14 +18175,14 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- 
--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: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
-@@ -18035,7 +18197,7 @@
- 	CPPFLAGS="$cf_save_CPPFLAGS"
- 	test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 18038 "configure"
-+#line 18200 "configure"
- #include "confdefs.h"
- #include 
- #ifdef HAVE_TERMIOS_H
-@@ -18079,16 +18241,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:18088: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18250: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18091: \$? = $ac_status" >&5
-+  echo "$as_me:18253: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sizechange=yes
- else
-@@ -18107,7 +18269,7 @@
- done
- 
- fi
--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
- 
-@@ -18125,13 +18287,13 @@
- 	esac
- fi
- 
--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 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.  */
-@@ -18162,16 +18324,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:18171: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18333: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18174: \$? = $ac_status" >&5
-+  echo "$as_me:18336: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_memmove=yes
- else
-@@ -18181,19 +18343,19 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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: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 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.  */
-@@ -18224,16 +18386,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:18233: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18395: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18236: \$? = $ac_status" >&5
-+  echo "$as_me:18398: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_bcopy=yes
- else
-@@ -18243,11 +18405,11 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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: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
-@@ -18257,10 +18419,10 @@
-   cf_cv_good_bcopy=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18260 "configure"
-+#line 18422 "configure"
- #include "confdefs.h"
- 
--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:18274: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18436: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  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:18279: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18441: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18282: \$? = $ac_status" >&5
-+  echo "$as_me:18444: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_good_bcopy=yes
- else
-@@ -18292,7 +18454,7 @@
- fi
- 
- fi
--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
-@@ -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: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 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.  */
-@@ -18356,16 +18518,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:18365: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18527: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18368: \$? = $ac_status" >&5
-+  echo "$as_me:18530: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -18375,7 +18537,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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: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
-@@ -18395,7 +18557,7 @@
-   cf_cv_working_poll=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18398 "configure"
-+#line 18560 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -18447,15 +18609,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--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:18453: \$? = $ac_status" >&5
-+  echo "$as_me:18615: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (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:18458: \$? = $ac_status" >&5
-+  echo "$as_me:18620: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_working_poll=yes
- else
-@@ -18467,21 +18629,21 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--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: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 18484 "configure"
-+#line 18646 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -18498,16 +18660,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:18507: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18669: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -18517,7 +18679,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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 &&
-@@ -18525,14 +18687,14 @@
- #define HAVE_VA_COPY 1
- EOF
- 
--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 18535 "configure"
-+#line 18697 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -18549,16 +18711,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:18558: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18720: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -18568,7 +18730,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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 &&
-@@ -18576,13 +18738,13 @@
- #define HAVE___VA_COPY 1
- EOF
- 
--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 18585 "configure"
-+#line 18747 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -18597,16 +18759,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:18606: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18768: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -18616,7 +18778,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--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
-   :
-@@ -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: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 18640 "configure"
-+#line 18802 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--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: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
-@@ -18666,7 +18828,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--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: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 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.  */
-@@ -18716,16 +18878,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:18725: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18887: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18728: \$? = $ac_status" >&5
-+  echo "$as_me:18890: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -18735,7 +18897,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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: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
-@@ -18770,15 +18932,15 @@
-       }
- _ACEOF
- rm -f conftest$ac_exeext
--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:18776: \$? = $ac_status" >&5
-+  echo "$as_me:18938: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (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:18781: \$? = $ac_status" >&5
-+  echo "$as_me:18943: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_fork_works=yes
- else
-@@ -18790,7 +18952,7 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--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
-@@ -18804,12 +18966,12 @@
-       ac_cv_func_fork_works=yes
-       ;;
-   esac
--  { 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: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
-@@ -18818,7 +18980,7 @@
-   ac_cv_func_vfork_works=cross
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18821 "configure"
-+#line 18983 "configure"
- #include "confdefs.h"
- /* Thanks to Paul Eggert for this test.  */
- #include 
-@@ -18915,15 +19077,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--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:18921: \$? = $ac_status" >&5
-+  echo "$as_me:19083: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (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:18926: \$? = $ac_status" >&5
-+  echo "$as_me:19088: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_vfork_works=yes
- else
-@@ -18935,13 +19097,13 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--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: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
- 
-@@ -18968,7 +19130,7 @@
- 
- # special check for test/ditto.c
- 
--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
-@@ -18976,7 +19138,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lutil  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 18979 "configure"
-+#line 19141 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -18995,16 +19157,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:19004: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19166: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -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: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
-@@ -19023,7 +19185,7 @@
-   cf_cv_lib_util=no
- fi
- 
--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
-@@ -19050,7 +19212,7 @@
- 	for cf_header in pty.h libutil.h util.h
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19053 "configure"
-+#line 19215 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -19067,16 +19229,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:19076: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19238: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19079: \$? = $ac_status" >&5
-+  echo "$as_me:19241: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 		cf_cv_func_openpty=$cf_header
-@@ -19094,7 +19256,7 @@
- 	LIBS="$cf_save_LIBS"
- 
- fi
--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
-@@ -19164,7 +19326,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 19167 "configure"
-+#line 19329 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -19176,16 +19338,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:19185: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19347: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19188: \$? = $ac_status" >&5
-+  echo "$as_me:19350: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -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}: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"
- 
-@@ -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}: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
-@@ -19249,7 +19411,7 @@
- 	else
- 		case "$with_hashed_db" in
- 		(./*|../*|/*)
--			{ 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;}
- 			;;
- 		(*)
-@@ -19318,7 +19480,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 19321 "configure"
-+#line 19483 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -19330,16 +19492,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:19339: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19501: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19342: \$? = $ac_status" >&5
-+  echo "$as_me:19504: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -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}: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"
- 
-@@ -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}: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
-@@ -19453,23 +19615,23 @@
- 	fi
- esac
- 
--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 19462 "configure"
-+#line 19624 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--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: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
-@@ -19488,11 +19650,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--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: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
-@@ -19503,10 +19665,10 @@
- for cf_db_version in 1 2 3 4 5 6
- do
- 
--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 19509 "configure"
-+#line 19671 "configure"
- #include "confdefs.h"
- 
- $ac_includes_default
-@@ -19536,16 +19698,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:19545: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19707: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -19559,16 +19721,16 @@
- done
- 
- fi
--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: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: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
-@@ -19598,10 +19760,10 @@
- 
- 	fi
- 
--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 19604 "configure"
-+#line 19766 "configure"
- #include "confdefs.h"
- 
- $ac_includes_default
-@@ -19656,16 +19818,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:19665: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19827: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -19685,11 +19847,11 @@
- done
- 
- fi
--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: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
-@@ -19715,7 +19877,7 @@
- 
- else
- 
--	{ { 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; }; }
- 
-@@ -19730,7 +19892,7 @@
- 
- # Just in case, check if the C compiler has a bool type.
- 
--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
-@@ -19738,7 +19900,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19741 "configure"
-+#line 19903 "configure"
- #include "confdefs.h"
- 
- int
-@@ -19750,23 +19912,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:19759: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19921: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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 19769 "configure"
-+#line 19931 "configure"
- #include "confdefs.h"
- 
- #ifndef __BEOS__
-@@ -19782,16 +19944,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:19791: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19953: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -19805,13 +19967,13 @@
- fi
- 
- if test "$cf_cv_header_stdbool_h" = 1
--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:19810: result: no" >&5
-+else	echo "$as_me:19972: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--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
-@@ -19819,7 +19981,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19822 "configure"
-+#line 19984 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -19834,16 +19996,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:19843: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20005: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -19856,9 +20018,9 @@
- fi
- 
- if test "$cf_cv_cc_bool_type" = 1
--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:19861: result: no" >&5
-+else	echo "$as_me:20023: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -19875,10 +20037,10 @@
- 
- 	cf_save="$LIBS"
- 	LIBS="$LIBS $CXXLIBS"
--	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 19881 "configure"
-+#line 20043 "configure"
- #include "confdefs.h"
- 
- 			#include 
-@@ -19892,16 +20054,16 @@
- }
- _ACEOF
- 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:19898: \$? = $ac_status" >&5
-+  echo "$as_me:20060: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { 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:19904: \$? = $ac_status" >&5
-+  echo "$as_me:20066: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_have_libstdcpp=yes
- else
-@@ -19910,7 +20072,7 @@
- cf_have_libstdcpp=no
- fi
- 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"
- 
-@@ -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: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 20093 "configure"
-+#line 20255 "configure"
- #include "confdefs.h"
- 
- #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:20534: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20696: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  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:20540: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20702: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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 20599 "configure"
-+#line 20761 "configure"
- #include "confdefs.h"
- 
- #ifndef __BEOS__
-@@ -20612,16 +20774,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:20621: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20783: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -20635,13 +20797,13 @@
- fi
- 
- if test "$cf_cv_header_stdbool_h" = 1
--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:20640: result: no" >&5
-+else	echo "$as_me:20802: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--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
-@@ -20649,7 +20811,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 20652 "configure"
-+#line 20814 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -20664,16 +20826,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:20673: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20835: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20676: \$? = $ac_status" >&5
-+  echo "$as_me:20838: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_builtin_bool=1
- else
-@@ -20686,13 +20848,13 @@
- fi
- 
- if test "$cf_cv_builtin_bool" = 1
--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:20691: result: no" >&5
-+else	echo "$as_me:20853: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--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
-@@ -20703,7 +20865,7 @@
-   cf_cv_type_of_bool=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20706 "configure"
-+#line 20868 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -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:20748: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20910: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  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:20753: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20915: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -20771,18 +20933,18 @@
- fi
- 
- 	rm -f cf_test.out
--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: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: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"
-@@ -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 20803 "configure"
-+#line 20965 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -20814,16 +20976,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:20823: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20985: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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:21009: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- CXXFLAGS="$cf_save_CXXFLAGS"
- 
- if test -n "$CXX"; then
--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
-@@ -20866,7 +21028,7 @@
-   cf_cv_cpp_param_init=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20869 "configure"
-+#line 21031 "configure"
- #include "confdefs.h"
- 
- class TEST {
-@@ -20881,19 +21043,19 @@
- {
- 	value = x;
- }
--int main() { }
-+int main(void) { }
- 
- _ACEOF
- rm -f conftest$ac_exeext
--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:20891: \$? = $ac_status" >&5
-+  echo "$as_me:21053: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (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:20896: \$? = $ac_status" >&5
-+  echo "$as_me:21058: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cpp_param_init=yes
- else
-@@ -20912,7 +21074,7 @@
- ac_main_return=return
- 
- fi
--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 &&
-@@ -20922,7 +21084,7 @@
- 
- if test -n "$CXX"; then
- 
--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
-@@ -20936,7 +21098,7 @@
- ac_main_return=return
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 20939 "configure"
-+#line 21101 "configure"
- #include "confdefs.h"
- 
- class NCursesPanel
-@@ -20980,16 +21142,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:20989: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21151: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -21007,7 +21169,7 @@
- ac_main_return=return
- 
- fi
--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
-@@ -21056,7 +21218,7 @@
- 	else
- 		if test "$cf_cv_header_stdbool_h" = 1 ; then
- 
--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
-@@ -21067,7 +21229,7 @@
-   cf_cv_type_of_bool=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 21070 "configure"
-+#line 21232 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -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:21112: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21274: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  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:21117: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21279: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -21135,25 +21297,25 @@
- fi
- 
- 	rm -f cf_test.out
--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: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: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: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
-@@ -21182,7 +21344,7 @@
- 
- 	if test "$cf_with_ada" != "no" ; then
- 		if test "$with_libtool" != "no"; then
--			{ 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
-@@ -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: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
-@@ -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:21211: found $ac_dir/$ac_word" >&5
-+echo "$as_me:21373: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -21217,10 +21379,10 @@
- fi
- gnat_exists=$ac_cv_prog_gnat_exists
- if test -n "$gnat_exists"; then
--  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:21223: result: no" >&5
-+  echo "$as_me:21385: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -21229,12 +21391,12 @@
- 	cf_cv_prog_gnat_correct=no
- else
- 
--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: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
-@@ -21242,7 +21404,7 @@
- 	cf_cv_prog_gnat_correct=yes
- 	;;
- (*)
--	{ 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
- 	;;
-@@ -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: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
-@@ -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:21268: found $ac_dir/$ac_word" >&5
-+echo "$as_me:21430: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -21274,10 +21436,10 @@
- fi
- M4_exists=$ac_cv_prog_M4_exists
- if test -n "$M4_exists"; then
--  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:21280: result: no" >&5
-+  echo "$as_me:21442: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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*
-@@ -21314,7 +21476,7 @@
- fi
- rm -rf conftest* *~conftest*
- 
--		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
-@@ -21323,7 +21485,7 @@
- 
-  	ADAFLAGS="$ADAFLAGS -gnatpn"
- 
--	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*)
-@@ -21340,10 +21502,10 @@
- 
- 		;;
- 	esac
--	echo "$as_me:21343: result: $ADAFLAGS" >&5
-+	echo "$as_me:21505: result: $ADAFLAGS" >&5
- echo "${ECHO_T}$ADAFLAGS" >&6
- 
--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
-@@ -21353,11 +21515,11 @@
- gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
- 
- fi
--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: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].*)
-@@ -21367,7 +21529,7 @@
- 	cf_gnat_generics=no
- 	;;
- esac
--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
-@@ -21379,7 +21541,7 @@
- 	cf_generic_objects=
- fi
- 
--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
-@@ -21427,7 +21589,7 @@
- rm -rf conftest* *~conftest*
- 
- fi
--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
-@@ -21440,7 +21602,7 @@
- cf_gnat_projects=no
- 
- if test "$enable_gnat_projects" != no ; then
--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]*)
-@@ -21500,15 +21662,15 @@
- 	esac
- 	;;
- esac
--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: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:21511: result: $cf_gnat_libraries" >&5
-+	echo "$as_me:21673: result: $cf_gnat_libraries" >&5
- echo "${ECHO_T}$cf_gnat_libraries" >&6
- fi
- 
-@@ -21528,7 +21690,7 @@
- 	USE_GNAT_LIBRARIES="#"
- fi
- 
--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.
-@@ -21539,12 +21701,12 @@
-   cf_ada_compiler=gnatmake
- fi;
- 
--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: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.
-@@ -21580,7 +21742,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { 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; }; }
- 	;;
-@@ -21589,10 +21751,10 @@
- fi
- eval ADA_INCLUDE="$withval"
- 
--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: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.
-@@ -21628,7 +21790,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { 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; }; }
- 	;;
-@@ -21637,10 +21799,10 @@
- fi
- eval ADA_OBJECTS="$withval"
- 
--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: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.
-@@ -21650,7 +21812,7 @@
- else
-   with_ada_sharedlib=no
- fi;
--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'
-@@ -21673,13 +21835,13 @@
- 
- # do this "late" to avoid conflict with header-checks
- if test "x$with_widec" = xyes ; then
--	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 21682 "configure"
-+#line 21844 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21694,16 +21856,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:21703: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21865: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -21713,10 +21875,10 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--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: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
-@@ -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 21728 "configure"
-+#line 21890 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21737,21 +21899,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:21746: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21908: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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 21754 "configure"
-+#line 21916 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21763,16 +21925,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:21772: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21934: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21775: \$? = $ac_status" >&5
-+  echo "$as_me:21937: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid; break
- else
-@@ -21788,7 +21950,7 @@
- ac_hi=-1 ac_mid=-1
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 21791 "configure"
-+#line 21953 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21800,16 +21962,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:21809: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21971: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21812: \$? = $ac_status" >&5
-+  echo "$as_me:21974: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=$ac_mid; break
- else
-@@ -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 21828 "configure"
-+#line 21990 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21837,16 +21999,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:21846: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:22008: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21849: \$? = $ac_status" >&5
-+  echo "$as_me:22011: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid
- else
-@@ -21859,12 +22021,12 @@
- ac_cv_sizeof_wchar_t=$ac_lo
- else
-   if test "$cross_compiling" = yes; then
--  { { 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 21867 "configure"
-+#line 22029 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21880,15 +22042,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--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:21886: \$? = $ac_status" >&5
-+  echo "$as_me:22048: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (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:21891: \$? = $ac_status" >&5
-+  echo "$as_me:22053: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_wchar_t=`cat conftest.val`
- else
-@@ -21904,7 +22066,7 @@
-   ac_cv_sizeof_wchar_t=0
- fi
- fi
--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:22087: checking for library subsets" >&5
- echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
- LIB_SUBSETS=
- 
-@@ -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: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
-@@ -21995,7 +22157,7 @@
- fi
- 
- ### Build up pieces for makefile rules
--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
-@@ -22006,10 +22168,10 @@
- 	(shared)  DFT_ARG_SUFFIX=''   ;;
- 	esac
- 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
--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: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
-@@ -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: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: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
-@@ -22086,11 +22248,11 @@
- 			DFT_OBJ_SUBDIR='obj_s' ;;
- 		esac
- 	esac
--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: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++)
-@@ -22158,7 +22320,7 @@
- 	fi
- 
- fi
--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
-@@ -22334,19 +22496,19 @@
- 
- if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
- then
--	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:22346: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:22508: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  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
-@@ -22357,10 +22519,10 @@
- 
- 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 22360 "configure"
-+#line 22522 "configure"
- #include "confdefs.h"
- 
--#line 22363 "configure"
-+#line 22525 "configure"
- #include 
- int cf_ldflags_static(FILE *fp);
- 
-@@ -22375,16 +22537,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:22384: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:22546: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:22387: \$? = $ac_status" >&5
-+  echo "$as_me:22549: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	# some linkers simply ignore the -dynamic
-@@ -22407,7 +22569,7 @@
- 	rm -f libconftest.*
- 	LIBS="$cf_save_LIBS"
- 
--	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
-@@ -22423,7 +22585,7 @@
- 	;;
- esac
- 
--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=
-@@ -22433,7 +22595,7 @@
- then
- 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
- fi
--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
-@@ -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: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
-@@ -22459,7 +22621,7 @@
- ### Construct the list of subdirectories for which we'll customize makefiles
- ### with the appropriate compile-rules.
- 
--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
-@@ -22524,7 +22686,7 @@
- 		fi
- 	fi
- done
--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"
-@@ -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: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
-@@ -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:22761: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:22923: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -22770,10 +22932,10 @@
- TIC_PATH=$ac_cv_path_TIC_PATH
- 
- if test -n "$TIC_PATH"; then
--  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:22776: result: no" >&5
-+  echo "$as_me:22938: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -22781,7 +22943,7 @@
- then
- 	if test "$TIC_PATH" = unknown
- 	then
--		{ 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
-@@ -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}: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//'`
-@@ -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: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
-@@ -22844,7 +23006,7 @@
- 	done
- 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
- done
--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.
-@@ -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}: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
- 
-@@ -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: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
-@@ -23181,7 +23343,7 @@
-     echo "$ac_cs_version"; exit 0 ;;
-   --he | --h)
-     # Conflict between --help and --header
--    { { 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;}
-@@ -23200,7 +23362,7 @@
-     ac_need_defaults=false;;
- 
-   # This is an error.
--  -*) { { 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;}
-@@ -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: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
-@@ -23795,7 +23957,7 @@
-   esac
- 
-   if test x"$ac_file" != x-; then
--    { 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
-@@ -23813,7 +23975,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         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;;
-@@ -23826,7 +23988,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { 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;;
-@@ -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: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;}
-@@ -23851,7 +24013,7 @@
-       fi
-       ac_seen=`grep '${datarootdir}' $ac_item`
-       if test -n "$ac_seen"; then
--        { 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;}
-@@ -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: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;}
-@@ -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: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;}
-@@ -23948,7 +24110,7 @@
-   * )   ac_file_in=$ac_file.in ;;
-   esac
- 
--  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
-@@ -23959,7 +24121,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         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;;
-@@ -23972,7 +24134,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { 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;;
-@@ -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: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\(.*[^/]\)//*[^/][^/]*/*$' \| \
-@@ -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}: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: dist.mk
-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.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
-@@ -37,7 +37,7 @@
- # These define the major/minor/patch versions of ncurses.
- NCURSES_MAJOR = 6
- NCURSES_MINOR = 0
--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: 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)
- 
--       This describes ncurses version 6.0 (patch 20170114).
-+       This describes ncurses version 6.0 (patch 20170121).
- 
- 
- 
-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)
- 
--       This describes ncurses version 6.0 (patch 20170114).
-+       This describes ncurses version 6.0 (patch 20170121).
- 
- 
-

    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)
- 
--       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-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+20170114) unstable; urgency=low
-+ncurses6 (6.0+20170121) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- 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-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+20170114) unstable; urgency=low
-+ncurses6 (6.0+20170121) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- 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-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+20170114) unstable; urgency=low
-+ncurses6 (6.0+20170121) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- 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.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.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  "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-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: 20170114
-+Release: 20170121
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- 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: 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.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.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
-@@ -1941,7 +1941,7 @@
- AC_SUBST(MAKE_LOWER_TAGS)
- ])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
-@@ -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 @@
-  *****************************************************************************/
- 
- /*
-- * $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 3147 "configure"
-+#line 3148 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -3159,16 +3160,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:3168: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3169: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3171: \$? = $ac_status" >&5
-+  echo "$as_me:3172: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -3177,7 +3178,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 3180 "configure"
-+#line 3181 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -3192,16 +3193,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:3201: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3202: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3204: \$? = $ac_status" >&5
-+  echo "$as_me:3205: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -3216,12 +3217,12 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--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_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: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}: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 3302 "configure"
-+#line 3303 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -3314,16 +3315,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:3323: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3324: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -3344,7 +3345,7 @@
- 	 esac
- 	 if test "$cf_want_posix_source" = yes ; then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 3347 "configure"
-+#line 3348 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -3359,16 +3360,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:3368: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3369: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3371: \$? = $ac_status" >&5
-+  echo "$as_me:3372: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -3379,15 +3380,15 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	 fi
- 
--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}: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 3390 "configure"
-+#line 3391 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -3402,16 +3403,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:3411: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3412: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3414: \$? = $ac_status" >&5
-+  echo "$as_me:3415: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -3427,7 +3428,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--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
-@@ -3545,14 +3546,14 @@
- 	;;
- (*)
- 
--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 3555 "configure"
-+#line 3556 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -3571,16 +3572,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:3580: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3581: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3583: \$? = $ac_status" >&5
-+  echo "$as_me:3584: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -3589,7 +3590,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 3592 "configure"
-+#line 3593 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -3608,16 +3609,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:3617: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3618: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3620: \$? = $ac_status" >&5
-+  echo "$as_me:3621: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -3632,7 +3633,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--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
-@@ -3740,16 +3741,16 @@
- 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
- 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
- 
--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
- 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 
- int
-@@ -3764,16 +3765,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:3773: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3774: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -4383,7 +4384,7 @@
- 
- fi
- 
--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: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.
-@@ -4599,7 +4600,7 @@
- else
-   cf_pkg_config=yes
- fi;
--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
-@@ -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: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
-@@ -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:4631: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:4632: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -4639,10 +4640,10 @@
- PKG_CONFIG=$ac_cv_path_PKG_CONFIG
- 
- if test -n "$PKG_CONFIG"; then
--  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:4645: result: no" >&5
-+  echo "$as_me:4646: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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
-@@ -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:4671: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:4672: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -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: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:4686: result: no" >&5
-+  echo "$as_me:4687: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4726,18 +4727,18 @@
- 	PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { 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: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: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.
-@@ -4771,10 +4772,10 @@
- 	ECHO_CC=''
- 
- fi;
--echo "$as_me:4774: result: $enableval" >&5
-+echo "$as_me:4775: result: $enableval" >&5
- echo "${ECHO_T}$enableval" >&6
- 
--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.
-@@ -4784,10 +4785,10 @@
- else
-   NCURSES_WRAP_PREFIX=_nc_
- fi;
--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: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.
-@@ -4804,10 +4805,10 @@
- 	cf_enable_widec=yes
- 
- fi;
--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: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.
-@@ -4817,7 +4818,7 @@
- else
-   cf_cv_curses_dir=no
- fi;
--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" )
-@@ -4848,7 +4849,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { 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; }; }
- 	;;
-@@ -4881,7 +4882,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 4884 "configure"
-+#line 4885 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -4893,16 +4894,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:4902: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4903: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4905: \$? = $ac_status" >&5
-+  echo "$as_me:4906: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -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}: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"
- 
-@@ -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}: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
-@@ -4968,7 +4969,7 @@
- 
- cf_cv_screen=curses
- 
--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.
-@@ -5012,13 +5013,13 @@
- fi;
- fi;
- 
--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: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
-@@ -5044,11 +5045,11 @@
- esac
- 
- fi
--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: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
-@@ -5060,7 +5061,7 @@
- 	curses.h  ncurses/ncurses.h ncurses/curses.h
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 5063 "configure"
-+#line 5064 "configure"
- #include "confdefs.h"
- #include <${cf_header}>
- int
-@@ -5072,16 +5073,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:5081: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5082: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -5092,11 +5093,11 @@
- done
- 
- fi
--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: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
-@@ -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: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 5115 "configure"
-+#line 5116 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--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: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
-@@ -5141,7 +5142,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--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: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
-@@ -5169,7 +5170,7 @@
- for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 5172 "configure"
-+#line 5173 "configure"
- #include "confdefs.h"
- #include 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -5184,16 +5185,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:5193: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5194: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5196: \$? = $ac_status" >&5
-+  echo "$as_me:5197: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_term_header="$cf_test"
-@@ -5209,7 +5210,7 @@
- done
- 
- fi
--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
-@@ -5241,7 +5242,7 @@
- 	;;
- esac
- 
--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
-@@ -5267,10 +5268,10 @@
- #endif
- EOF
- 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
--	{ (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: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%".*%%'`
-@@ -5280,7 +5281,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5283 "configure"
-+#line 5284 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -5305,15 +5306,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--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:5311: \$? = $ac_status" >&5
-+  echo "$as_me:5312: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (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:5316: \$? = $ac_status" >&5
-+  echo "$as_me:5317: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_ncurses_version=`cat $cf_tempfile`
-@@ -5327,17 +5328,17 @@
- 	rm -f $cf_tempfile
- 
- fi
--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: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 5340 "configure"
-+#line 5341 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -5349,16 +5350,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:5358: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5359: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5361: \$? = $ac_status" >&5
-+  echo "$as_me:5362: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -5367,13 +5368,13 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--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: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
-@@ -5381,7 +5382,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmytinfo  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5384 "configure"
-+#line 5385 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5400,16 +5401,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:5409: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5410: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -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: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
- 
-@@ -5450,7 +5451,7 @@
- 	# term.h) for cur_colr
- 	if test "x$cf_cv_screen" = "xcurses_colr"
- 	then
--		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
-@@ -5458,7 +5459,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lcur_colr  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5461 "configure"
-+#line 5462 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5477,16 +5478,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:5486: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5487: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -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: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
- 
-@@ -5521,7 +5522,7 @@
- 
- else
- 
--		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
-@@ -5529,7 +5530,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lHcurses  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5532 "configure"
-+#line 5533 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5548,16 +5549,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:5557: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5558: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -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: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
- 
-@@ -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}: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
-@@ -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}: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
-@@ -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}: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
-@@ -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}: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
-@@ -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: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 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.  */
-@@ -5800,16 +5801,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:5809: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5810: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5812: \$? = $ac_status" >&5
-+  echo "$as_me:5813: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_tgoto=yes
- else
-@@ -5819,7 +5820,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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
-@@ -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: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
-@@ -5836,7 +5837,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-l$cf_term_lib  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5839 "configure"
-+#line 5840 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5855,16 +5856,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:5864: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5865: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5867: \$? = $ac_status" >&5
-+  echo "$as_me:5868: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Lib=yes"
- else
-@@ -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: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
-@@ -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: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
-@@ -5902,7 +5903,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-l$cf_curs_lib  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5905 "configure"
-+#line 5906 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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
-   eval "$as_ac_Lib=yes"
- else
-@@ -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: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
-@@ -5949,16 +5950,16 @@
- 
- 		done
- 	fi
--	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: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 5961 "configure"
-+#line 5962 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -5970,16 +5971,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:5979: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5980: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5982: \$? = $ac_status" >&5
-+  echo "$as_me:5983: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -5988,18 +5989,18 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--		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: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: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 6002 "configure"
-+#line 6003 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -6011,16 +6012,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:6020: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6021: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6023: \$? = $ac_status" >&5
-+  echo "$as_me:6024: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=no
- else
-@@ -6029,7 +6030,7 @@
- 
- 			LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 6032 "configure"
-+#line 6033 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -6041,16 +6042,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:6050: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6051: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6053: \$? = $ac_status" >&5
-+  echo "$as_me:6054: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -6062,7 +6063,7 @@
- 
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--		echo "$as_me:6065: result: $cf_result" >&5
-+		echo "$as_me:6066: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 	fi
- fi
-@@ -6071,7 +6072,7 @@
- 	;;
- (ncursesw*)
- 
--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
-@@ -6079,7 +6080,7 @@
- 
- 	cf_save_LIBS="$LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 6082 "configure"
-+#line 6083 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -6092,16 +6093,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:6101: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6102: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6104: \$? = $ac_status" >&5
-+  echo "$as_me:6105: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_utf8_lib=yes
- else
-@@ -6113,12 +6114,12 @@
- cf_cv_header_path_utf8=
- cf_cv_library_path_utf8=
- 
--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 6121 "configure"
-+#line 6122 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -6131,16 +6132,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:6140: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6141: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6143: \$? = $ac_status" >&5
-+  echo "$as_me:6144: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_find_linkage_utf8=yes
-@@ -6154,7 +6155,7 @@
- LIBS="-lutf8  $cf_save_LIBS"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 6157 "configure"
-+#line 6158 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -6167,16 +6168,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:6176: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6177: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6179: \$? = $ac_status" >&5
-+  echo "$as_me:6180: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_find_linkage_utf8=yes
-@@ -6193,9 +6194,9 @@
- 
- 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
- 
--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}: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"
-@@ -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}: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 6293 "configure"
-+#line 6294 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -6303,21 +6304,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:6312: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6313: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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}: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"
-@@ -6335,7 +6336,7 @@
- 
- 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
- 
--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"
-@@ -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}: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 6419 "configure"
-+#line 6420 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -6429,21 +6430,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:6438: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6439: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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}: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"
-@@ -6485,7 +6486,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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
-@@ -6520,7 +6521,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 6523 "configure"
-+#line 6524 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -6532,16 +6533,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:6541: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6542: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6544: \$? = $ac_status" >&5
-+  echo "$as_me:6545: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -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}: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"
- 
-@@ -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}: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
-@@ -6624,13 +6625,13 @@
- cf_have_ncuconfig=no
- 
- if test "x${PKG_CONFIG:=none}" != xnone; then
--	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:6630: result: yes" >&5
-+		echo "$as_me:6631: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
--		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
- 
-@@ -6656,7 +6657,7 @@
- LIBS="$cf_add_libs"
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 6659 "configure"
-+#line 6660 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -6668,37 +6669,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:6677: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6678: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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 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:6693: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6694: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  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:6698: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6699: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6701: \$? = $ac_status" >&5
-+  echo "$as_me:6702: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_have_ncuconfig=yes
- else
-@@ -6715,7 +6716,7 @@
- cf_have_ncuconfig=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--		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"
-@@ -6733,7 +6734,7 @@
- 		fi
- 
- 	else
--		echo "$as_me:6736: result: no" >&5
-+		echo "$as_me:6737: result: no" >&5
- echo "${ECHO_T}no" >&6
- 		NCURSES_CONFIG_PKG=none
- 	fi
-@@ -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: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
-@@ -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:6767: found $ac_dir/$ac_word" >&5
-+echo "$as_me:6768: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -6772,10 +6773,10 @@
- fi
- NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
- if test -n "$NCURSES_CONFIG"; then
--  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:6778: result: no" >&5
-+  echo "$as_me:6779: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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
-@@ -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:6806: found $ac_dir/$ac_word" >&5
-+echo "$as_me:6807: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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: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:6817: result: no" >&5
-+  echo "$as_me:6818: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -6847,7 +6848,7 @@
- 
- 		# even with config script, some packages use no-override for curses.h
- 
--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
-@@ -6859,7 +6860,7 @@
- 	curses.h $cf_cv_screen/curses.h
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 6862 "configure"
-+#line 6863 "configure"
- #include "confdefs.h"
- #include <${cf_header}>
- int
-@@ -6871,16 +6872,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:6880: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6881: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -6891,11 +6892,11 @@
- done
- 
- fi
--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: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
-@@ -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: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 6914 "configure"
-+#line 6915 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--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: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
-@@ -6940,7 +6941,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--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 6996 "configure"
-+#line 6997 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -7005,16 +7006,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:7014: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7015: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7017: \$? = $ac_status" >&5
-+  echo "$as_me:7018: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -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}: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"
- 
-@@ -7050,7 +7051,7 @@
- 
- }
- 
--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
-@@ -7062,7 +7063,7 @@
- 	do
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 7065 "configure"
-+#line 7066 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -7086,16 +7087,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:7095: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7096: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7098: \$? = $ac_status" >&5
-+  echo "$as_me:7099: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_h=$cf_header
- 
-@@ -7110,14 +7111,14 @@
- 	done
- 
- fi
--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: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
-@@ -7235,7 +7236,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 7238 "configure"
-+#line 7239 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -7247,16 +7248,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:7256: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7257: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7259: \$? = $ac_status" >&5
-+  echo "$as_me:7260: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -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}: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"
- 
-@@ -7296,7 +7297,7 @@
- 		do
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 7299 "configure"
-+#line 7300 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -7320,16 +7321,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:7329: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7330: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7332: \$? = $ac_status" >&5
-+  echo "$as_me:7333: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_h2=$cf_header
- 
-@@ -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: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: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%/[^/]*$%%'`
-@@ -7388,7 +7389,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 7391 "configure"
-+#line 7392 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -7400,16 +7401,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:7409: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7410: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7412: \$? = $ac_status" >&5
-+  echo "$as_me:7413: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -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}: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"
- 
-@@ -7474,7 +7475,7 @@
- 	;;
- esac
- 
--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
-@@ -7492,7 +7493,7 @@
- for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 7495 "configure"
-+#line 7496 "configure"
- #include "confdefs.h"
- #include 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -7507,16 +7508,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:7516: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7517: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7519: \$? = $ac_status" >&5
-+  echo "$as_me:7520: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_term_header="$cf_test"
-@@ -7532,7 +7533,7 @@
- done
- 
- fi
--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
-@@ -7570,7 +7571,7 @@
- #define NCURSES 1
- EOF
- 
--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
-@@ -7596,10 +7597,10 @@
- #endif
- EOF
- 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
--	{ (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: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%".*%%'`
-@@ -7609,7 +7610,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7612 "configure"
-+#line 7613 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -7634,15 +7635,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--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:7640: \$? = $ac_status" >&5
-+  echo "$as_me:7641: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (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:7645: \$? = $ac_status" >&5
-+  echo "$as_me:7646: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_ncurses_version=`cat $cf_tempfile`
-@@ -7656,7 +7657,7 @@
- 	rm -f $cf_tempfile
- 
- fi
--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
-@@ -7669,7 +7670,7 @@
- 	# to link gpm.
- cf_ncurses_LIBS=""
- cf_ncurses_SAVE="$LIBS"
--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
-@@ -7677,7 +7678,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 7680 "configure"
-+#line 7681 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -7696,16 +7697,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:7705: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7706: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -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: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: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
-@@ -7727,7 +7728,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 7730 "configure"
-+#line 7731 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -7746,16 +7747,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:7755: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7756: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -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: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"
-@@ -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: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
-@@ -7789,7 +7790,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmytinfo  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 7792 "configure"
-+#line 7793 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -7808,16 +7809,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:7817: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7818: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -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: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"
-@@ -7877,13 +7878,13 @@
- 
- 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
- 	cf_libdir=""
--	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 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.  */
-@@ -7914,16 +7915,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:7923: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7924: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7926: \$? = $ac_status" >&5
-+  echo "$as_me:7927: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_initscr=yes
- else
-@@ -7933,18 +7934,18 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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: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 7947 "configure"
-+#line 7948 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -7956,25 +7957,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:7965: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7966: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7968: \$? = $ac_status" >&5
-+  echo "$as_me:7969: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  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:7977: result: no" >&5
-+echo "$as_me:7978: result: no" >&5
- echo "${ECHO_T}no" >&6
- 
- cf_search=
-@@ -8042,11 +8043,11 @@
- 
- 			for cf_libdir in $cf_search
- 			do
--				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 8049 "configure"
-+#line 8050 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -8058,25 +8059,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:8067: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8068: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8070: \$? = $ac_status" >&5
-+  echo "$as_me:8071: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  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:8079: result: no" >&5
-+echo "$as_me:8080: result: no" >&5
- echo "${ECHO_T}no" >&6
- 					 LIBS="$cf_save_LIBS"
- fi
-@@ -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: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
-@@ -8099,7 +8100,7 @@
- fi
- 
- if test -n "$cf_ncurses_LIBS" ; then
--	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
-@@ -8109,7 +8110,7 @@
- 		fi
- 	done
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 8112 "configure"
-+#line 8113 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -8121,23 +8122,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:8130: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8131: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8133: \$? = $ac_status" >&5
-+  echo "$as_me:8134: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  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:8140: result: no" >&5
-+echo "$as_me:8141: result: no" >&5
- echo "${ECHO_T}no" >&6
- 		 LIBS="$cf_ncurses_SAVE"
- fi
-@@ -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: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.
-@@ -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 9795 "configure"
-+#line 9796 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--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: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
-@@ -9835,7 +9836,7 @@
-   ac_save_LIBS=$LIBS
-   LIBS="-lXt $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9838 "configure"
-+#line 9839 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -9847,16 +9848,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:9856: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9857: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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.
-@@ -9894,7 +9895,7 @@
- fi # $with_x != no
- 
- if test "$have_x" != yes; then
--  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
-@@ -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: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
- 
-@@ -9928,11 +9929,11 @@
-     # others require no space.  Words are not sufficient . . . .
-     case `(uname -sr) 2>/dev/null` in
-     "SunOS 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 9935 "configure"
-+#line 9936 "configure"
- #include "confdefs.h"
- 
- int
-@@ -9944,16 +9945,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:9953: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9954: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9956: \$? = $ac_status" >&5
-+  echo "$as_me:9957: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_R_nospace=yes
- else
-@@ -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: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 9972 "configure"
-+#line 9973 "configure"
- #include "confdefs.h"
- 
- int
-@@ -9981,16 +9982,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:9990: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9991: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9993: \$? = $ac_status" >&5
-+  echo "$as_me:9994: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_R_space=yes
- else
-@@ -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: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:10007: result: neither works" >&5
-+	  echo "$as_me:10008: result: neither works" >&5
- echo "${ECHO_T}neither works" >&6
- 	fi
-       fi
-@@ -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 10027 "configure"
-+#line 10028 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -10043,22 +10044,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:10052: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10053: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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: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
-@@ -10066,7 +10067,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldnet  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 10069 "configure"
-+#line 10070 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -10085,16 +10086,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:10094: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10095: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -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: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: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
-@@ -10120,7 +10121,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldnet_stub  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 10123 "configure"
-+#line 10124 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -10139,16 +10140,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:10148: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10149: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -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: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"
-@@ -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: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 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.  */
-@@ -10215,16 +10216,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:10224: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10225: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10227: \$? = $ac_status" >&5
-+  echo "$as_me:10228: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_gethostbyname=yes
- else
-@@ -10234,11 +10235,11 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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: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
-@@ -10246,7 +10247,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lnsl  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 10249 "configure"
-+#line 10250 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -10265,16 +10266,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:10274: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10275: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -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: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: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
-@@ -10300,7 +10301,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbsd  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 10303 "configure"
-+#line 10304 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -10319,16 +10320,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:10328: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10329: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -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: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"
-@@ -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: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 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.  */
-@@ -10392,16 +10393,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:10401: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10402: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10404: \$? = $ac_status" >&5
-+  echo "$as_me:10405: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_connect=yes
- else
-@@ -10411,11 +10412,11 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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: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
-@@ -10423,7 +10424,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 10426 "configure"
-+#line 10427 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -10442,16 +10443,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:10451: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10452: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -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: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"
-@@ -10471,13 +10472,13 @@
-     fi
- 
-     # Guillermo Gomez says -lposix is necessary on A/UX.
--    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 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.  */
-@@ -10508,16 +10509,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:10517: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10518: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10520: \$? = $ac_status" >&5
-+  echo "$as_me:10521: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_remove=yes
- else
-@@ -10527,11 +10528,11 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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: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
-@@ -10539,7 +10540,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lposix  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 10542 "configure"
-+#line 10543 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -10558,16 +10559,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:10567: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10568: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -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: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"
-@@ -10587,13 +10588,13 @@
-     fi
- 
-     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
--    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 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.  */
-@@ -10624,16 +10625,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:10633: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10634: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10636: \$? = $ac_status" >&5
-+  echo "$as_me:10637: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_shmat=yes
- else
-@@ -10643,11 +10644,11 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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: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
-@@ -10655,7 +10656,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lipc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 10658 "configure"
-+#line 10659 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -10674,16 +10675,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:10683: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10684: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -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: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"
-@@ -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: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
-@@ -10720,7 +10721,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lICE $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 10723 "configure"
-+#line 10724 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -10739,16 +10740,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:10748: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10749: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -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: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"
-@@ -10771,7 +10772,7 @@
- 
- cf_x_athena=${cf_x_athena:-Xaw}
- 
--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=
- 
-@@ -10782,14 +10783,14 @@
- fi;
- if test "$withval" = yes ; then
- 	cf_x_athena=Xaw3d
--	echo "$as_me:10785: result: yes" >&5
-+	echo "$as_me:10786: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--	echo "$as_me:10788: result: no" >&5
-+	echo "$as_me:10789: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--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=
- 
-@@ -10800,14 +10801,14 @@
- fi;
- if test "$withval" = yes ; then
- 	cf_x_athena=Xaw3dxft
--	echo "$as_me:10803: result: yes" >&5
-+	echo "$as_me:10804: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--	echo "$as_me:10806: result: no" >&5
-+	echo "$as_me:10807: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--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=
- 
-@@ -10818,14 +10819,14 @@
- fi;
- if test "$withval" = yes ; then
- 	cf_x_athena=neXtaw
--	echo "$as_me:10821: result: yes" >&5
-+	echo "$as_me:10822: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--	echo "$as_me:10824: result: no" >&5
-+	echo "$as_me:10825: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--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=
- 
-@@ -10836,10 +10837,10 @@
- fi;
- if test "$withval" = yes ; then
- 	cf_x_athena=XawPlus
--	echo "$as_me:10839: result: yes" >&5
-+	echo "$as_me:10840: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--	echo "$as_me:10842: result: no" >&5
-+	echo "$as_me:10843: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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}: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}: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}: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=
-@@ -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}:10983: testing ..trimmed $LIBS ..." 1>&5
-+echo "${as_me:-configure}:10984: testing ..trimmed $LIBS ..." 1>&5
- 
- 			;;
- 		esac
- 	done
- 
--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 10996 "configure"
-+#line 10997 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -11009,16 +11010,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:11018: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11019: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11021: \$? = $ac_status" >&5
-+  echo "$as_me:11022: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xaw_compat=yes
- else
-@@ -11028,7 +11029,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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
-@@ -11040,7 +11041,7 @@
- 				(*)
- 					test -n "$verbose" && echo "	work around broken package" 1>&6
- 
--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/ .*//'`
-@@ -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}: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}: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}: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=
-@@ -11158,12 +11159,12 @@
- 
- test -n "$verbose" && echo "	...before $LIBS" 1>&6
- 
--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}:11166: testing ...after  $LIBS ..." 1>&5
-+echo "${as_me:-configure}:11167: testing ...after  $LIBS ..." 1>&5
- 
- else
- 	cf_pkgconfig_incs=
-@@ -11171,12 +11172,12 @@
- 
- test -n "$verbose" && echo "	...before $LIBS" 1>&6
- 
--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}:11179: testing ...after  $LIBS ..." 1>&5
-+echo "${as_me:-configure}:11180: testing ...after  $LIBS ..." 1>&5
- 
- fi
- 
-@@ -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}:11190: testing ..trimmed $LIBS ..." 1>&5
-+echo "${as_me:-configure}:11191: testing ..trimmed $LIBS ..." 1>&5
- 
- 			;;
- 		esac
-@@ -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}: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}: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}: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=
-@@ -11323,7 +11324,7 @@
- 	cf_pkgconfig_incs=
- 	cf_pkgconfig_libs=
- 
--	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
-@@ -11331,7 +11332,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lXext  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 11334 "configure"
-+#line 11335 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -11350,16 +11351,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:11359: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11360: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -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: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
- 
-@@ -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}: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}: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}: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=
-@@ -11516,24 +11517,24 @@
- else
- 	cf_pkgconfig_incs=
- 	cf_pkgconfig_libs=
--	{ 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}: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}: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}: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=
-@@ -11633,24 +11634,24 @@
- else
- 	cf_pkgconfig_incs=
- 	cf_pkgconfig_libs=
--	{ 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}: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}: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}: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=
-@@ -11750,24 +11751,24 @@
- else
- 	cf_pkgconfig_incs=
- 	cf_pkgconfig_libs=
--	{ 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}: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}: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}: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=
-@@ -11867,7 +11868,7 @@
- else
- 	cf_pkgconfig_incs=
- 	cf_pkgconfig_libs=
--	{ 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
- 
-@@ -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}: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}: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}: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=
-@@ -11989,14 +11990,14 @@
- 		;;
- 	(*)
- # we have an "xt" package, but it may omit Xt's dependency on X11
--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 11999 "configure"
-+#line 12000 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -12015,16 +12016,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:12024: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12025: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -12034,30 +12035,30 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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}: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}: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}: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}: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=
-@@ -12160,12 +12161,12 @@
- 
- test -n "$verbose" && echo "	...before $LIBS" 1>&6
- 
--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}:12168: testing ...after  $LIBS ..." 1>&5
-+echo "${as_me:-configure}:12169: testing ...after  $LIBS ..." 1>&5
- 
- fi
- 
-@@ -12173,14 +12174,14 @@
- 		;;
- 	esac
- 
--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 12183 "configure"
-+#line 12184 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -12195,16 +12196,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:12204: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12205: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -12214,7 +12215,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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
-@@ -12228,22 +12229,22 @@
- 			(*)
- 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
- 
--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}: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}: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}: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=
-@@ -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}: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}: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}: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=
-@@ -12461,12 +12462,12 @@
- 
- test -n "$verbose" && echo "	...before $LIBS" 1>&6
- 
--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}:12469: testing ...after  $LIBS ..." 1>&5
-+echo "${as_me:-configure}:12470: testing ...after  $LIBS ..." 1>&5
- 
- fi
- 
-@@ -12486,7 +12487,7 @@
- 
- test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
- 
--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"
-@@ -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}: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
-@@ -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}: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
-@@ -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}: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 12583 "configure"
-+#line 12584 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -12592,16 +12593,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:12601: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12602: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12604: \$? = $ac_status" >&5
-+  echo "$as_me:12605: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -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}: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}: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"
-@@ -12622,13 +12623,13 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
- 
--	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 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.  */
-@@ -12659,16 +12660,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:12668: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12669: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12671: \$? = $ac_status" >&5
-+  echo "$as_me:12672: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_XOpenDisplay=yes
- else
-@@ -12678,13 +12679,13 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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: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
-@@ -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 12695 "configure"
-+#line 12696 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -12711,16 +12712,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:12720: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12721: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -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: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
- 
-@@ -12755,13 +12756,13 @@
- 
- fi
- 
--	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 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.  */
-@@ -12792,16 +12793,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:12801: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12802: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12804: \$? = $ac_status" >&5
-+  echo "$as_me:12805: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_XtAppInitialize=yes
- else
-@@ -12811,13 +12812,13 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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: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
-@@ -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 12828 "configure"
-+#line 12829 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -12844,16 +12845,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:12853: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12854: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -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: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
- 
-@@ -12881,7 +12882,7 @@
- fi
- 
- if test $cf_have_X_LIBS = no ; then
--	{ 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
-@@ -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: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: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 12913 "configure"
-+#line 12914 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -12924,16 +12925,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:12933: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12934: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12936: \$? = $ac_status" >&5
-+  echo "$as_me:12937: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -12942,7 +12943,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--		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
-@@ -12954,7 +12955,7 @@
- done
- 
- if test -z "$cf_x_athena_inc" ; then
--	{ 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"
-@@ -13000,7 +13001,7 @@
- done
- LIBS="$cf_add_libs"
- 
--				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
- 
-@@ -13020,11 +13021,11 @@
- done
- LIBS="$cf_add_libs"
- 
--				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 13027 "configure"
-+#line 13028 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -13040,16 +13041,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:13049: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13050: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13052: \$? = $ac_status" >&5
-+  echo "$as_me:13053: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -13058,7 +13059,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--			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"
-@@ -13072,7 +13073,7 @@
- done
- 
- if test -z "$cf_x_athena_lib" ; then
--	{ { 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
-@@ -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: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
-@@ -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:13108: found $ac_dir/$ac_word" >&5
-+echo "$as_me:13109: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -13113,10 +13114,10 @@
- fi
- XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
- if test -n "$XCURSES_CONFIG"; then
--  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:13119: result: no" >&5
-+  echo "$as_me:13120: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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
-@@ -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:13147: found $ac_dir/$ac_word" >&5
-+echo "$as_me:13148: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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: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:13158: result: no" >&5
-+  echo "$as_me:13159: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -13194,7 +13195,7 @@
- 
- test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
- 
--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"
-@@ -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}: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
-@@ -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}: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
-@@ -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}: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 13291 "configure"
-+#line 13292 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -13300,16 +13301,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:13309: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13310: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13312: \$? = $ac_status" >&5
-+  echo "$as_me:13313: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -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}: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}: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"
-@@ -13330,7 +13331,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
- 
--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
-@@ -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 13341 "configure"
-+#line 13342 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -13357,16 +13358,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:13366: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13367: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -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: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
- 
-@@ -13399,7 +13400,7 @@
- 
- fi
- 
--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
-@@ -13422,7 +13423,7 @@
- LIBS="$cf_add_libs"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 13425 "configure"
-+#line 13426 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -13437,16 +13438,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:13446: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13447: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13449: \$? = $ac_status" >&5
-+  echo "$as_me:13450: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_lib_XCurses=yes
- else
-@@ -13457,7 +13458,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--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
-@@ -13472,23 +13473,23 @@
- #define XCURSES 1
- EOF
- 
--	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 13481 "configure"
-+#line 13482 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--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: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
-@@ -13507,7 +13508,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--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
- 
-@@ -13518,14 +13519,14 @@
- fi
- 
- else
--	{ { 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: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; }; }
- 	;;
-@@ -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: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 13625 "configure"
-+#line 13626 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -13641,16 +13642,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:13650: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13651: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13653: \$? = $ac_status" >&5
-+  echo "$as_me:13654: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_netbsd_form_h=yes
- 
-@@ -13662,7 +13663,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--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 &&
-@@ -13670,14 +13671,14 @@
- #define HAVE_NETBSD_FORM_H 1
- EOF
- 
--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 13680 "configure"
-+#line 13681 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -13695,16 +13696,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:13704: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13705: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13707: \$? = $ac_status" >&5
-+  echo "$as_me:13708: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_netbsd_menu_h=yes
- 
-@@ -13716,7 +13717,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--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 &&
-@@ -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: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
-@@ -13742,7 +13743,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lpanel$cf_cv_libtype  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 13745 "configure"
-+#line 13746 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -13761,16 +13762,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:13770: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13771: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13773: \$? = $ac_status" >&5
-+  echo "$as_me:13774: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Lib=yes"
- else
-@@ -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: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
- 
-@@ -13810,7 +13811,7 @@
- fi
- 
- as_ac_Lib=`echo "ac_cv_lib_menu$cf_cv_libtype''_menu_driver" | $as_tr_sh`
--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
-@@ -13818,7 +13819,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmenu$cf_cv_libtype  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 13821 "configure"
-+#line 13822 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -13837,16 +13838,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:13846: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13847: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13849: \$? = $ac_status" >&5
-+  echo "$as_me:13850: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Lib=yes"
- else
-@@ -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: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
- 
-@@ -13886,7 +13887,7 @@
- fi
- 
- as_ac_Lib=`echo "ac_cv_lib_form$cf_cv_libtype''_form_driver" | $as_tr_sh`
--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
-@@ -13894,7 +13895,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lform$cf_cv_libtype  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 13897 "configure"
-+#line 13898 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -13913,16 +13914,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:13922: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13923: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13925: \$? = $ac_status" >&5
-+  echo "$as_me:13926: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Lib=yes"
- else
-@@ -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: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
- 
-@@ -13973,23 +13974,23 @@
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--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 13982 "configure"
-+#line 13983 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--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: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
-@@ -14008,7 +14009,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--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: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 14030 "configure"
-+#line 14031 "configure"
- #include "confdefs.h"
- #include 
- #include 
-@@ -14035,13 +14036,13 @@
- #include 
- 
- _ACEOF
--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: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
-@@ -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 14066 "configure"
-+#line 14067 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -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 14084 "configure"
-+#line 14085 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -14102,7 +14103,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14105 "configure"
-+#line 14106 "configure"
- #include "confdefs.h"
- #include 
- #if ((' ' & 0x0FF) == 0x020)
-@@ -14128,15 +14129,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--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:14134: \$? = $ac_status" >&5
-+  echo "$as_me:14135: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (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:14139: \$? = $ac_status" >&5
-+  echo "$as_me:14140: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -14149,7 +14150,7 @@
- fi
- fi
- fi
--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
- 
-@@ -14159,13 +14160,13 @@
- 
- fi
- 
--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 14168 "configure"
-+#line 14169 "configure"
- #include "confdefs.h"
- #include 
- #include 
-@@ -14181,16 +14182,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:14190: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14191: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14193: \$? = $ac_status" >&5
-+  echo "$as_me:14194: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_header_time=yes
- else
-@@ -14200,7 +14201,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--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
- 
-@@ -14223,23 +14224,23 @@
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--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 14232 "configure"
-+#line 14233 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--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: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
-@@ -14258,7 +14259,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--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: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 14280 "configure"
-+#line 14281 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--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: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
-@@ -14306,7 +14307,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--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: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
-@@ -14326,7 +14327,7 @@
- for cf_header in stdio.h stdlib.h unistd.h getopt.h
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 14329 "configure"
-+#line 14330 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -14339,16 +14340,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:14348: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14349: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -14360,7 +14361,7 @@
- done
- 
- fi
--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
- 
-@@ -14383,13 +14384,13 @@
- 
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--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 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.  */
-@@ -14420,16 +14421,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:14429: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14430: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14432: \$? = $ac_status" >&5
-+  echo "$as_me:14433: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -14439,7 +14440,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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: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
-@@ -14469,13 +14470,13 @@
- 
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--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 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.  */
-@@ -14506,16 +14507,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:14515: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14516: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14518: \$? = $ac_status" >&5
-+  echo "$as_me:14519: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -14525,7 +14526,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--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: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
-@@ -14545,7 +14546,7 @@
- 
- cf_cv_need_xopen_extension=unknown
- cat >conftest.$ac_ext <<_ACEOF
--#line 14548 "configure"
-+#line 14549 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -14571,16 +14572,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:14580: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14581: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14583: \$? = $ac_status" >&5
-+  echo "$as_me:14584: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_need_xopen_extension=none
- else
-@@ -14590,7 +14591,7 @@
- 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
- 	do
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 14593 "configure"
-+#line 14594 "configure"
- #include "confdefs.h"
- 
- #define $cf_try_xopen_extension 1
-@@ -14612,16 +14613,16 @@
- }
- _ACEOF
- 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:14618: \$? = $ac_status" >&5
-+  echo "$as_me:14619: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { 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:14624: \$? = $ac_status" >&5
-+  echo "$as_me:14625: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   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: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_need_xopen_extension in
-@@ -14644,7 +14645,7 @@
- 	;;
- esac
- 
--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
-@@ -14665,7 +14666,7 @@
- for cf_header in $cf_header_list
- do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 14668 "configure"
-+#line 14669 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -14679,16 +14680,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:14688: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14689: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -14833,12 +14834,12 @@
- done
- 
- fi
--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: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
-@@ -14913,10 +14914,10 @@
- 
- cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
- 
--	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}: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
-@@ -14925,7 +14926,7 @@
- 		eval cf_result='$ac_cv_func_'$cf_func
- 		if test ".$cf_result" != ".no"; then
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 14928 "configure"
-+#line 14929 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -14958,16 +14959,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:14967: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14968: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14970: \$? = $ac_status" >&5
-+  echo "$as_me:14971: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -14983,7 +14984,7 @@
- 
- 	# use the computed/retrieved cache-value:
- 	eval 'cf_result=$cf_cv_func_'$cf_func
--	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:15002: checking for ${cf_func}" >&5
- echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
- 
--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
-@@ -15010,7 +15011,7 @@
- 		eval cf_result='$ac_cv_func_'$cf_func
- 		if test ".$cf_result" != ".no"; then
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 15013 "configure"
-+#line 15014 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -15043,16 +15044,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:15052: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15053: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15055: \$? = $ac_status" >&5
-+  echo "$as_me:15056: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -15068,7 +15069,7 @@
- 
- 	# use the computed/retrieved cache-value:
- 	eval 'cf_result=$cf_cv_func_'$cf_func
--	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 15095 "configure"
-+#line 15096 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -15112,21 +15113,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:15121: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15122: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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}: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: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 15156 "configure"
-+#line 15157 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -15168,16 +15169,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:15177: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15178: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -15185,7 +15186,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 15188 "configure"
-+#line 15189 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -15210,16 +15211,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:15219: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15220: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -15233,7 +15234,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--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
-@@ -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: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 15254 "configure"
-+#line 15255 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -15264,16 +15265,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:15273: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15274: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15276: \$? = $ac_status" >&5
-+  echo "$as_me:15277: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -15282,7 +15283,7 @@
- cf_save_cppflags="$CPPFLAGS"
- 			 CPPFLAGS="$CPPFLAGS -D_XPG5"
- 			 cat >conftest.$ac_ext <<_ACEOF
--#line 15285 "configure"
-+#line 15286 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -15295,16 +15296,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:15304: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15305: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15307: \$? = $ac_status" >&5
-+  echo "$as_me:15308: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_define_xpg5=yes
- else
-@@ -15315,7 +15316,7 @@
- 			 CPPFLAGS="$cf_save_cppflags"
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--		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
-@@ -15324,14 +15325,14 @@
- 		fi
- 	fi
- 
--	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 15334 "configure"
-+#line 15335 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -15348,16 +15349,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:15357: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15358: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15360: \$? = $ac_status" >&5
-+  echo "$as_me:15361: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_widechar_funcs=yes
- else
-@@ -15368,7 +15369,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--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
- 
-@@ -15389,14 +15390,14 @@
- 
- fi
- 
--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 15399 "configure"
-+#line 15400 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -15414,16 +15415,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:15423: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15424: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15426: \$? = $ac_status" >&5
-+  echo "$as_me:15427: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_use_pthreads=yes
- else
-@@ -15434,20 +15435,20 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--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: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 15450 "configure"
-+#line 15451 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -15467,16 +15468,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:15476: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15477: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -15488,7 +15489,7 @@
- 
- fi
- 
--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
-@@ -15497,7 +15498,7 @@
- 
- # special check for test/ditto.c
- 
--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
-@@ -15505,7 +15506,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lutil  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 15508 "configure"
-+#line 15509 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -15524,16 +15525,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:15533: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15534: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -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: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
-@@ -15552,7 +15553,7 @@
-   cf_cv_lib_util=no
- fi
- 
--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
-@@ -15579,7 +15580,7 @@
- 	for cf_header in pty.h libutil.h util.h
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 15582 "configure"
-+#line 15583 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -15596,16 +15597,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:15605: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15606: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15608: \$? = $ac_status" >&5
-+  echo "$as_me:15609: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 		cf_cv_func_openpty=$cf_header
-@@ -15623,7 +15624,7 @@
- 	LIBS="$cf_save_LIBS"
- 
- fi
--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
-@@ -15657,7 +15658,7 @@
- 	fi
- fi
- 
--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
-@@ -15667,7 +15668,7 @@
-   cf_cv_func_curses_version=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15670 "configure"
-+#line 15671 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -15680,15 +15681,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--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:15686: \$? = $ac_status" >&5
-+  echo "$as_me:15687: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (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:15691: \$? = $ac_status" >&5
-+  echo "$as_me:15692: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_curses_version=yes
- 
-@@ -15703,14 +15704,14 @@
- fi
- rm -f core
- fi
--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: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
-@@ -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 15723 "configure"
-+#line 15724 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -15736,16 +15737,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:15745: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15746: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -15756,7 +15757,7 @@
- done
- 
- fi
--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 &&
-@@ -15766,7 +15767,7 @@
- 
- if test "$cf_enable_widec" = yes; then
- 
--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
-@@ -15776,7 +15777,7 @@
- 	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 15779 "configure"
-+#line 15780 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -15792,16 +15793,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:15801: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15802: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -15812,7 +15813,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	done
- fi
--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 &&
-@@ -15820,7 +15821,7 @@
- #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
- EOF
- 
--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
-@@ -15830,7 +15831,7 @@
- if test "$cf_cv_curses_wacs_map" != unknown
- then
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 15833 "configure"
-+#line 15834 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -15847,16 +15848,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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: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_curses_wacs_symbols=yes
- else
-@@ -15866,7 +15867,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- else
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 15869 "configure"
-+#line 15870 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -15882,16 +15883,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:15891: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15892: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -15902,7 +15903,7 @@
- fi
- 
- fi
--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 &&
-@@ -15912,10 +15913,10 @@
- 
- fi
- 
--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 15918 "configure"
-+#line 15919 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -15933,16 +15934,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:15942: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15943: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15945: \$? = $ac_status" >&5
-+  echo "$as_me:15946: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -15951,7 +15952,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--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
- 
-@@ -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: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 15982 "configure"
-+#line 15983 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -15997,23 +15998,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:16006: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16007: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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 16016 "configure"
-+#line 16017 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -16032,16 +16033,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:16041: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16042: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16044: \$? = $ac_status" >&5
-+  echo "$as_me:16045: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_mbstate_t=yes
- else
-@@ -16053,7 +16054,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--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
-@@ -16076,14 +16077,14 @@
- fi
- 
- # This is needed on Tru64 5.0 to declare wchar_t
--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 16086 "configure"
-+#line 16087 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -16101,23 +16102,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:16110: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16111: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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 16120 "configure"
-+#line 16121 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -16136,16 +16137,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:16145: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16146: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16148: \$? = $ac_status" >&5
-+  echo "$as_me:16149: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_t=yes
- else
-@@ -16157,7 +16158,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--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
-@@ -16180,14 +16181,14 @@
- fi
- 
- # This is needed on Tru64 5.0 to declare wint_t
--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 16190 "configure"
-+#line 16191 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -16205,23 +16206,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:16214: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16215: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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 16224 "configure"
-+#line 16225 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -16240,16 +16241,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:16249: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16250: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16252: \$? = $ac_status" >&5
-+  echo "$as_me:16253: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wint_t=yes
- else
-@@ -16261,7 +16262,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--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
-@@ -16285,10 +16286,10 @@
- 
- 	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
- 
--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 16291 "configure"
-+#line 16292 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -16306,16 +16307,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:16315: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16316: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16318: \$? = $ac_status" >&5
-+  echo "$as_me:16319: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -16324,7 +16325,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--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
- 
-@@ -16346,10 +16347,10 @@
- 
- 	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
- 
--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 16352 "configure"
-+#line 16353 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -16367,16 +16368,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:16376: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16377: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16379: \$? = $ac_status" >&5
-+  echo "$as_me:16380: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -16385,7 +16386,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--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
- 
-@@ -16407,10 +16408,10 @@
- 
- 	if test "$NCURSES_OK_WINT_T" = 0 ; then
- 
--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 16413 "configure"
-+#line 16414 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -16428,16 +16429,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:16437: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16438: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16440: \$? = $ac_status" >&5
-+  echo "$as_me:16441: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -16446,7 +16447,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--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
- 
-@@ -16467,11 +16468,11 @@
- 	fi
- fi
- 
--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 16474 "configure"
-+#line 16475 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -16499,16 +16500,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:16508: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16509: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16511: \$? = $ac_status" >&5
-+  echo "$as_me:16512: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -16517,7 +16518,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--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
-@@ -16529,14 +16530,14 @@
- EOF
- 
- else
--	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 16539 "configure"
-+#line 16540 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -16569,16 +16570,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:16578: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16579: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16581: \$? = $ac_status" >&5
-+  echo "$as_me:16582: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -16590,7 +16591,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16593 "configure"
-+#line 16594 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -16616,15 +16617,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--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:16622: \$? = $ac_status" >&5
-+  echo "$as_me:16623: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (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:16627: \$? = $ac_status" >&5
-+  echo "$as_me:16628: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -16635,7 +16636,7 @@
- fi
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--	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
- 
-@@ -16648,11 +16649,11 @@
- 	fi
- fi
- 
--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 16655 "configure"
-+#line 16656 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -16680,16 +16681,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:16689: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16690: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16692: \$? = $ac_status" >&5
-+  echo "$as_me:16693: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -16698,7 +16699,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--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
-@@ -16710,14 +16711,14 @@
- EOF
- 
- else
--	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 16720 "configure"
-+#line 16721 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -16750,16 +16751,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext 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='test -s conftest$ac_exeext'
--  { (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:16762: \$? = $ac_status" >&5
-+  echo "$as_me:16763: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -16771,7 +16772,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16774 "configure"
-+#line 16775 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -16797,15 +16798,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--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:16803: \$? = $ac_status" >&5
-+  echo "$as_me:16804: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (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:16808: \$? = $ac_status" >&5
-+  echo "$as_me:16809: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -16816,7 +16817,7 @@
- fi
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--	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
- 
-@@ -16829,11 +16830,11 @@
- 	fi
- fi
- 
--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 16836 "configure"
-+#line 16837 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -16861,16 +16862,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:16870: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16871: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16873: \$? = $ac_status" >&5
-+  echo "$as_me:16874: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -16879,7 +16880,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--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
-@@ -16891,14 +16892,14 @@
- EOF
- 
- else
--	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 16901 "configure"
-+#line 16902 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -16931,16 +16932,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:16940: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16941: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16943: \$? = $ac_status" >&5
-+  echo "$as_me:16944: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -16952,7 +16953,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16955 "configure"
-+#line 16956 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -16978,15 +16979,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--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:16984: \$? = $ac_status" >&5
-+  echo "$as_me:16985: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (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:16989: \$? = $ac_status" >&5
-+  echo "$as_me:16990: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -16997,7 +16998,7 @@
- fi
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--	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
- 
-@@ -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: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.
-@@ -17210,7 +17211,7 @@
- 	with_warnings=no
- 
- fi;
--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
-@@ -17233,10 +17234,10 @@
- EOF
- if test "$GCC" = yes
- then
--	{ 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:17289: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17291: \$? = $ac_status" >&5
-+  echo "$as_me:17292: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			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
-@@ -17354,12 +17355,12 @@
- if test "$GCC" = yes ; then
- 	case $host_os in
- 	(linux*|gnu*)
--		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 17362 "configure"
-+#line 17363 "configure"
- #include "confdefs.h"
- 
- int
-@@ -17376,16 +17377,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:17385: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17386: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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"
-@@ -17396,7 +17397,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		CFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:17399: result: $INTEL_COMPILER" >&5
-+		echo "$as_me:17400: result: $INTEL_COMPILER" >&5
- echo "${ECHO_T}$INTEL_COMPILER" >&6
- 		;;
- 	esac
-@@ -17405,12 +17406,12 @@
- CLANG_COMPILER=no
- 
- if test "$GCC" = yes ; then
--	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 17413 "configure"
-+#line 17414 "configure"
- #include "confdefs.h"
- 
- int
-@@ -17427,16 +17428,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--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: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:17436: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17437: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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"
-@@ -17447,12 +17448,12 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	CFLAGS="$cf_save_CFLAGS"
--	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:17473: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS="-Wall"
-@@ -17485,12 +17486,12 @@
- 		wd981
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		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:17491: \$? = $ac_status" >&5
-+  echo "$as_me:17492: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			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
-@@ -17499,7 +17500,7 @@
- 
- elif test "$GCC" = yes
- then
--	{ 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=
-@@ -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:17526: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:17527: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17529: \$? = $ac_status" >&5
-+  echo "$as_me:17530: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			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)
-@@ -17539,7 +17540,7 @@
- 				([34].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--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
-@@ -17549,7 +17550,7 @@
- 				([12].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--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
-@@ -17565,7 +17566,7 @@
- fi
- fi
- 
--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.
-@@ -17582,7 +17583,7 @@
- else
-   with_dmalloc=
- fi;
--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
-@@ -17676,23 +17677,23 @@
- esac
- 
- if test "$with_dmalloc" = yes ; then
--	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 17685 "configure"
-+#line 17686 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--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: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
-@@ -17711,11 +17712,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--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: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
-@@ -17723,7 +17724,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 17726 "configure"
-+#line 17727 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -17742,16 +17743,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:17751: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17752: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -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: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: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.
-@@ -17794,7 +17795,7 @@
- else
-   with_dbmalloc=
- fi;
--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
-@@ -17888,23 +17889,23 @@
- esac
- 
- if test "$with_dbmalloc" = yes ; then
--	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 17897 "configure"
-+#line 17898 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--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: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
-@@ -17923,11 +17924,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--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: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
-@@ -17935,7 +17936,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldbmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 17938 "configure"
-+#line 17939 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -17954,16 +17955,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:17963: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17964: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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
-@@ -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: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: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.
-@@ -18006,7 +18007,7 @@
- else
-   with_valgrind=
- fi;
--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
-@@ -18099,7 +18100,7 @@
- 	;;
- esac
- 
--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.
-@@ -18109,7 +18110,7 @@
- else
-   : ${with_no_leaks:=no}
- fi;
--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
-@@ -18125,7 +18126,7 @@
- fi
- 
- LD_RPATH_OPT=
--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*)
-@@ -18156,12 +18157,12 @@
- (*)
- 	;;
- esac
--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: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"
- 
-@@ -18182,7 +18183,7 @@
- LIBS="$cf_add_libs"
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 18185 "configure"
-+#line 18186 "configure"
- #include "confdefs.h"
- 
- int
-@@ -18194,16 +18195,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:18203: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18204: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18206: \$? = $ac_status" >&5
-+  echo "$as_me:18207: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_rpath_space=no
- else
-@@ -18213,13 +18214,13 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	LIBS="$cf_save_LIBS"
--	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: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.
-@@ -18236,21 +18237,21 @@
- 	cf_disable_rpath_hack=no
- 
- fi;
--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: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: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: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
-@@ -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:18268: found $ac_dir/$ac_word" >&5
-+echo "$as_me:18269: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -18273,10 +18274,10 @@
- fi
- cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
- if test -n "$cf_ldd_prog"; then
--  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:18279: result: no" >&5
-+  echo "$as_me:18280: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -18290,7 +18291,7 @@
- 		cf_rpath_oops=
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 18293 "configure"
-+#line 18294 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -18302,16 +18303,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--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: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:18311: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18312: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  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`
-@@ -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}: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
-@@ -18351,11 +18352,11 @@
- 
- 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
- 
--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}: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
-@@ -18392,7 +18393,7 @@
- 			then
- 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
- 
--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
-@@ -18405,11 +18406,11 @@
- 
- test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
- 
--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}: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
-@@ -18446,7 +18447,7 @@
- 			then
- 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
- 
--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
-@@ -18459,14 +18460,14 @@
- 
- test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
- 
--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}: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:18469: result: no" >&5
-+	echo "$as_me:18470: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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
-@@ -18732,7 +18733,7 @@
-     echo "$ac_cs_version"; exit 0 ;;
-   --he | --h)
-     # Conflict between --help and --header
--    { { 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;}
-@@ -18751,7 +18752,7 @@
-     ac_need_defaults=false;;
- 
-   # This is an error.
--  -*) { { 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;}
-@@ -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: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
-@@ -19092,7 +19093,7 @@
-   esac
- 
-   if test x"$ac_file" != x-; then
--    { 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
-@@ -19110,7 +19111,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         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;;
-@@ -19123,7 +19124,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { 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;;
-@@ -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: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;}
-@@ -19148,7 +19149,7 @@
-       fi
-       ac_seen=`grep '${datarootdir}' $ac_item`
-       if test -n "$ac_seen"; then
--        { 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;}
-@@ -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: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;}
-@@ -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: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;}
-@@ -19245,7 +19246,7 @@
-   * )   ac_file_in=$ac_file.in ;;
-   esac
- 
--  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
-@@ -19256,7 +19257,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         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;;
-@@ -19269,7 +19270,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { 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;;
-@@ -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: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-6.1-20190615.patch b/ncurses-6.1-20190615.patch
new file mode 100644
index 0000000..d79adfb
--- /dev/null
+++ b/ncurses-6.1-20190615.patch
@@ -0,0 +1,1437 @@
+# ncurses 6.1 - patch 20190615 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.1 is at
+# 	ftp.gnu.org:/pub/gnu
+#
+# Patches for ncurses 6.1 can be found at
+# 	ftp://ftp.invisible-island.net/ncurses/6.1
+#	http://invisible-mirror.net/archives/ncurses/6.1 
+#
+# ------------------------------------------------------------------------------
+# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20190615.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Jun 16 00:13:35 UTC 2019
+# ------------------------------------------------------------------------------
+# NEWS                                  |    6 
+# VERSION                               |    2 
+# dist.mk                               |    4 
+# doc/html/ada/funcs/T.htm              |    2 
+# 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_variables.3x.html   |   12 
+# 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/menu_spacing.3x.html     |    6 
+# 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              |   55 ++-
+# doc/html/man/terminfo.5.html          |  503 +++++++++++++++++---------------
+# doc/html/man/tic.1m.html              |    4 
+# doc/html/man/toe.1m.html              |    2 
+# doc/html/man/tput.1.html              |    2 
+# doc/html/man/tset.1.html              |    2 
+# doc/html/man/user_caps.5.html         |    4 
+# man/tabs.1                            |   49 ++-
+# 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 
+# package/ncursest.spec                 |    2 
+# 31 files changed, 407 insertions(+), 288 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.3329 
+--- ncurses-6.1-20190609+/NEWS	2019-06-09 20:07:36.000000000 +0000
++++ ncurses-6.1-20190615/NEWS	2019-06-15 23:39:53.000000000 +0000
+@@ -25,7 +25,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.3329 2019/06/09 20:07:36 tom Exp $
++-- $Id: NEWS,v 1.3332 2019/06/15 23:39:53 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.
+ 
++20190615
++	+ expand the portability section of the man/tabs.1 manual page.
++	+ regenerate HTML manpages.
++
+ 20190609
+ 	+ add mintty, mintty-direct (adapted from patch by Thomas Wolff).
+ 	  Some of the suggested user-defined capabilities are commented-out,
+Index: VERSION
+--- ncurses-6.1-20190609+/VERSION	2019-06-09 20:06:01.000000000 +0000
++++ ncurses-6.1-20190615/VERSION	2019-06-15 12:46:35.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.1	20190609
++5:0:10	6.1	20190615
+Index: dist.mk
+Prereq:  1.1287 
+--- ncurses-6.1-20190609+/dist.mk	2019-06-09 20:06:01.000000000 +0000
++++ ncurses-6.1-20190615/dist.mk	2019-06-15 12:46:35.000000000 +0000
+@@ -25,7 +25,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1287 2019/06/09 20:06:01 tom Exp $
++# $Id: dist.mk,v 1.1288 2019/06/15 12:46: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 = 1
+-NCURSES_PATCH = 20190609
++NCURSES_PATCH = 20190615
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/ada/funcs/T.htm
+--- ncurses-6.1-20190609+/doc/html/ada/funcs/T.htm	2019-03-23 23:10:16.000000000 +0000
++++ ncurses-6.1-20190615/doc/html/ada/funcs/T.htm	2019-06-15 23:31:13.000000000 +0000
+@@ -20,8 +20,8 @@
+ 
  • tgetnum
+ 
  • tgetstr -  terminal_interface-curses-termcap.adb:108
+ 
  • tgetstr -  terminal_interface-curses-termcap.adb:129
+-
  • tgoto
+ 
  • TGoto
++
  • tgoto
+ 
  • tigetflag
+ 
  • tigetstr -  terminal_interface-curses-terminfo.adb:87
+ 
  • tigetstr -  terminal_interface-curses-terminfo.adb:108
+Index: doc/html/man/adacurses6-config.1.html
+--- ncurses-6.1-20190609+/doc/html/man/adacurses6-config.1.html	2019-05-18 23:58:24.000000000 +0000
++++ ncurses-6.1-20190615/doc/html/man/adacurses6-config.1.html	2019-06-15 23:31:08.000000000 +0000
+@@ -125,7 +125,7 @@
+

    • SEE ALSO

    +        curses(3x)
+ 
+-       This describes ncurses version 6.1 (patch 20190518).
++       This describes ncurses version 6.1 (patch 20190615).
+ 
+ 
+ 
+Index: doc/html/man/captoinfo.1m.html
+--- ncurses-6.1-20190609+/doc/html/man/captoinfo.1m.html	2019-05-18 23:58:24.000000000 +0000
++++ ncurses-6.1-20190615/doc/html/man/captoinfo.1m.html	2019-06-15 23:31:08.000000000 +0000
+@@ -190,7 +190,7 @@
+

    SEE ALSO

    +        infocmp(1m), curses(3x), terminfo(5)
+ 
+-       This describes ncurses version 6.1 (patch 20190518).
++       This describes ncurses version 6.1 (patch 20190615).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/clear.1.html
+--- ncurses-6.1-20190609+/doc/html/man/clear.1.html	2019-05-18 23:58:24.000000000 +0000
++++ ncurses-6.1-20190615/doc/html/man/clear.1.html	2019-06-15 23:31:08.000000000 +0000
+@@ -148,7 +148,7 @@
+

    SEE ALSO

    +        tput(1), terminfo(5)
+ 
+-       This describes ncurses version 6.1 (patch 20190518).
++       This describes ncurses version 6.1 (patch 20190615).
+ 
+ 
+ 
+Index: doc/html/man/curs_variables.3x.html
+--- ncurses-6.1-20190609+/doc/html/man/curs_variables.3x.html	2019-03-16 19:34:45.000000000 +0000
++++ ncurses-6.1-20190615/doc/html/man/curs_variables.3x.html	2019-06-15 23:31:10.000000000 +0000
+@@ -26,7 +26,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_variables.3x,v 1.12 2019/02/16 23:43:23 tom Exp @
++  * @Id: curs_variables.3x,v 1.13 2019/06/01 22:51:21 tom Exp @
+ -->
+ 
+ 
+@@ -158,14 +158,18 @@
+            ch(3x) as well as the physical screen with mvcur(3x).
+ 
+        o   This implementation uses the current value of TABSIZE only for  up-
+-           dating  the  virtual  screen.   It  uses the terminal description's
+-           init_tabs capability  for  computing  tab  stops  on  the  physical
+-           screen.
++           dating  the  virtual screen.  It uses the terminal description's it
++           (init_tabs) capability for computing hardware tabs (i.e., tab stops
++           on the physical screen).
+ 
+        o   Other  implementations  differ.  For instance, NetBSD curses allows
+            TABSIZE to be set through an environment variable.  This  implemen-
+            tation does not.
+ 
++           NetBSD curses does not support hardware tabs; it uses the init_tabs
++           capability and the TABSIZE variable only for updating  the  virtual
++           screen.
++
+        ESCDELAY is an extension in AIX curses:
+ 
+        o   In AIX, the units for ESCDELAY are fifths of a millisecond.
+Index: doc/html/man/form.3x.html
+--- ncurses-6.1-20190609+/doc/html/man/form.3x.html	2019-05-18 23:58:26.000000000 +0000
++++ ncurses-6.1-20190615/doc/html/man/form.3x.html	2019-06-15 23:31:10.000000000 +0000
+@@ -246,7 +246,7 @@
+        curses(3x)  and  related  pages  whose names begin "form_" for detailed
+        descriptions of the entry points.
+ 
+-       This describes ncurses version 6.1 (patch 20190518).
++       This describes ncurses version 6.1 (patch 20190615).
+ 
+ 
+ 
+Index: doc/html/man/infocmp.1m.html
+--- ncurses-6.1-20190609+/doc/html/man/infocmp.1m.html	2019-05-18 23:58:26.000000000 +0000
++++ ncurses-6.1-20190615/doc/html/man/infocmp.1m.html	2019-06-15 23:31:11.000000000 +0000
+@@ -481,7 +481,7 @@
+ 
+        https://invisible-island.net/ncurses/tctest.html
+ 
+-       This describes ncurses version 6.1 (patch 20190518).
++       This describes ncurses version 6.1 (patch 20190615).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/infotocap.1m.html
+--- ncurses-6.1-20190609+/doc/html/man/infotocap.1m.html	2019-05-18 23:58:26.000000000 +0000
++++ ncurses-6.1-20190615/doc/html/man/infotocap.1m.html	2019-06-15 23:31:11.000000000 +0000
+@@ -85,7 +85,7 @@
+

    SEE ALSO

    +        curses(3x), tic(1m), infocmp(1m), terminfo(5)
+ 
+-       This describes ncurses version 6.1 (patch 20190518).
++       This describes ncurses version 6.1 (patch 20190615).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/menu.3x.html
+--- ncurses-6.1-20190609+/doc/html/man/menu.3x.html	2019-05-18 23:58:26.000000000 +0000
++++ ncurses-6.1-20190615/doc/html/man/menu.3x.html	2019-06-15 23:31:11.000000000 +0000
+@@ -221,7 +221,7 @@
+        curses(3x)  and  related  pages  whose names begin "menu_" for detailed
+        descriptions of the entry points.
+ 
+-       This describes ncurses version 6.1 (patch 20190518).
++       This describes ncurses version 6.1 (patch 20190615).
+ 
+ 
+ 
+Index: doc/html/man/menu_spacing.3x.html
+--- ncurses-6.1-20190609+/doc/html/man/menu_spacing.3x.html	2019-03-16 19:34:46.000000000 +0000
++++ ncurses-6.1-20190615/doc/html/man/menu_spacing.3x.html	2019-06-15 23:31:11.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -74,7 +74,7 @@
+        lines  between item rows, these lines will contain the pad character in
+        the appropriate positions.  The spc_columns parameter controls the num-
+        ber  of  blanks  between  columns of items.  It must not be larger than
+-       TABSIZE.  A value of 0 for all the spacing values resets  them  to  the
++       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 simply not returned.
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.1-20190609+/doc/html/man/ncurses.3x.html	2019-05-18 23:58:27.000000000 +0000
++++ ncurses-6.1-20190615/doc/html/man/ncurses.3x.html	2019-06-15 23:31:12.000000000 +0000
+@@ -59,7 +59,7 @@
+        method of updating  character  screens  with  reasonable  optimization.
+        This  implementation  is  "new  curses"  (ncurses)  and is the approved
+        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
+-       This describes ncurses version 6.1 (patch 20190518).
++       This describes ncurses version 6.1 (patch 20190615).
+ 
+        The  ncurses  library emulates the curses library of System V Release 4
+        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
+Index: doc/html/man/ncurses6-config.1.html
+--- ncurses-6.1-20190609+/doc/html/man/ncurses6-config.1.html	2019-05-18 23:58:27.000000000 +0000
++++ ncurses-6.1-20190615/doc/html/man/ncurses6-config.1.html	2019-06-15 23:31:12.000000000 +0000
+@@ -112,7 +112,7 @@
+

    SEE ALSO

    +        curses(3x)
+ 
+-       This describes ncurses version 6.1 (patch 20190518).
++       This describes ncurses version 6.1 (patch 20190615).
+ 
+ 
+ 
+Index: doc/html/man/panel.3x.html
+--- ncurses-6.1-20190609+/doc/html/man/panel.3x.html	2019-05-18 23:58:27.000000000 +0000
++++ ncurses-6.1-20190615/doc/html/man/panel.3x.html	2019-06-15 23:31:12.000000000 +0000
+@@ -204,7 +204,7 @@
+

    SEE ALSO

    +        curses(3x), curs_variables(3x),
+ 
+-       This describes ncurses version 6.1 (patch 20190518).
++       This describes ncurses version 6.1 (patch 20190615).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/tabs.1.html
+--- ncurses-6.1-20190609+/doc/html/man/tabs.1.html	2019-05-18 23:58:27.000000000 +0000
++++ ncurses-6.1-20190615/doc/html/man/tabs.1.html	2019-06-15 23:31:12.000000000 +0000
+@@ -26,7 +26,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: tabs.1,v 1.20 2019/02/16 23:56:38 tom Exp @
++  * @Id: tabs.1,v 1.25 2019/06/15 23:08:12 tom Exp @
+ -->
+ 
+ 
+@@ -70,7 +70,13 @@
+        tions running in the terminal, if at all.  Curses and other full-screen
+        applications  may  use  hardware tabs in optimizing their output to the
+        terminal.  If the hardware tabstops differ from the information in  the
+-       terminal database, the result is unpredictable.
++       terminal  database, the result is unpredictable.  Before running curses
++       programs, you should either reset tab-stops to the standard interval
++
++           tabs -8
++
++       or use the reset program, since the normal initialization sequences  do
++       not ensure that tab-stops are reset.
+ 
+ 
+

    OPTIONS

    +@@ -151,26 +157,51 @@
+        (POSIX.1-2008) describes a tabs utility.  However
+ 
+        o   This  standard describes a +m option, to set a terminal's left-mar-
+-           gin.  Very few of the entries in the terminal database provide this
+-           capability.
++           gin.  Very few of the entries in the terminal database provide  the
++           smgl  (set_left_margin)  or smglp (set_left_margin_parm) capability
++           needed to support the feature.
+ 
+-       o   There  is no counterpart in X/Open Curses Issue 7 for this utility,
++       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  provided  by
++       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 terminals may not accept an  arbi-
+-       trary  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 be that long.
++       A tabs utility appeared in PWB/Unix 1.0 (1977), and thereafter in  3BSD
++       (1979).  It supported a single "-n" option (to cause the first tab stop
++       to be set on the left margin).  That option is not documented by POSIX.
++       Initially, tabs used built-in tables rather than the terminal database,
++       to support a half-dozen terminal types.  It also had built-in logic  to
++       support  the left-margin, as well as a feature for copying the tab set-
++       tings from a file.
++
++       Later versions of Unix, e.g., SVr4,  added  support  for  the  terminal
++       database,  but  kept the tables, as a fallback.  In an earlier develop-
++       ment effort, the tab-stop initialization provided by  tset  (1982)  and
++       incorporated into tput uses the terminal database,
++
++       POSIX  documents  no  limits on the number of tab stops.  Documentation
++       for other implementations states that there is a limit on the number of
++       tab  stops.  While some terminals 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 be that long.
++
++       The  Rationale section of the POSIX documentation goes into some detail
++       about the ways the committee considered redesigning the tabs  and  tput
++       utilities, without proposing an improved solution.  It comments that
++
++            no  known  historical  version  of tabs supports the capability of
++            setting arbitrary tab stops.
++
++       However, the Explicit Lists described in this manual page  were  imple-
++       mented  in  PWB/Unix.  Those provide the capability of setting abitrary
++       tab stops.
+ 
+ 
+

    SEE ALSO

    +        tset(1), infocmp(1m), curses(3x), terminfo(5).
+ 
+-       This describes ncurses version 6.1 (patch 20190518).
++       This describes ncurses version 6.1 (patch 20190615).
+ 
+ 
+ 
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.1-20190609+/doc/html/man/terminfo.5.html	2019-05-18 23:58:27.000000000 +0000
++++ ncurses-6.1-20190615/doc/html/man/terminfo.5.html	2019-06-15 23:31:12.000000000 +0000
+@@ -33,7 +33,7 @@
+   ****************************************************************************
+   * @Id: terminfo.head,v 1.35 2018/07/28 22:29:09 tom Exp @
+   * Head of terminfo man page ends here
+-  * @Id: terminfo.tail,v 1.90 2019/01/20 20:21:46 tom Exp @
++  * @Id: terminfo.tail,v 1.93 2019/06/01 22:32:15 tom Exp @
+   * Beginning of terminfo.tail file
+   * This file is part of ncurses.
+   * See "terminfo.head" for copyright.
+@@ -74,7 +74,7 @@
+        Terminfo describes terminals by giving a set of capabilities which they
+        have, by specifying how to perform screen operations, and by specifying
+        padding  requirements  and  initialization  sequences.   This describes
+-       ncurses version 6.1 (patch 20190518).
++       ncurses version 6.1 (patch 20190615).
+ 
+ 
+

    Terminfo Entry Syntax

    +@@ -1326,7 +1326,7 @@
+        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 carriage return, control M.)  If there is a code to pro-
++       this  will  be carriage return, control/M.)  If there is a code to pro-
+        duce 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
+@@ -1862,29 +1862,42 @@
+ 
+ 
+

    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 preceding 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  properly 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,  initialization  strings
+-       for  the  terminal, iprog, the path name of a program to be run to ini-
+-       tialize the terminal, and if, the name of a file containing  long  ini-
+-       tialization  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 pro-
+-       gram, each time the user logs in.  They will be printed in the  follow-
+-       ing order:
++       A few capabilities are used only for tabs:
++
++       o   If  the  terminal  has hardware tabs, the command to advance to the
++           next tab stop can be given as ht (usually control/I).
++
++       o   A "back-tab" command which moves leftward to the preceding 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 properly set.
++
++       o   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.
++
++           The it capability 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
++
++       o   is1, is2, and is3, initialization strings for the terminal,
++
++       o   iprog, the path name of a program to be run to initialize the  ter-
++           minal,
++
++       o   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 will be printed in the following order:
+ 
+               run the program
+                      iprog
+@@ -1903,92 +1916,114 @@
+               and finally
+                      output is3.
+ 
+-       Most  initialization  is  done with is2.  Special terminal modes can be
+-       set up without duplicating strings by putting the common  sequences  in
++       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 is3.
+ 
+-       A  set  of  sequences  that  does a harder reset from a totally unknown
++       A set of sequences that does a harder  reset  from  a  totally  unknown
+        state can be given as rs1, rs2, rf and rs3, analogous 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 produce annoying
+-       effects on the screen and are not necessary when logging in.  For exam-
+-       ple, 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., instead of is1, etc.  If
+-       any of rs1, rs2, rs3, or rf reset capability strings are  missing,  the
++       and is3 respectively.  These strings are output by  the  reset  program
++       (an  alias of tset), which is used when the terminal gets into a wedged
++       state.  Commands are normally placed in rs1, rs2 rs3  and  rf  only  if
++       they  produce 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., instead of  is1,  etc.   If
++       any  of  rs1, rs2, rs3, or rf reset capability strings are missing, the
+        reset program falls back upon the corresponding initialization capabil-
+        ity string.
+ 
+-       If there are commands to set and clear tab stops, they can be given  as
++       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 complex sequence is needed to  set  the  tabs
++       of  every  row).   If a more complex sequence is needed to set the tabs
+        than can be described by this, the sequence can be placed in is2 or if.
+ 
++       The tput reset command uses the same capability strings  as  the  reset
++       command,  although  the two programs (tput and reset) provide different
++       command-line options.
++
++       In practice, these terminfo capabilities are not often used in initial-
++       ization of tabs (though they are required for the tabs program):
++
++       o   Almost all hardware terminals (at least those which supported tabs)
++           initialized those to every eight columns:
++
++           The only exception was the AT&T 2300  series,  which  set  tabs  to
++           every five columns.
++
++       o   In  particular, developers of the hardware terminals which are com-
++           monly used as models for modern terminal emulators  provided  docu-
++           mentation demonstrating that eight columns were the standard.
++
++       o   Because of this, the terminal initialization programs tput and tset
++           use  the  tbc  (clear_all_tabs)  and  hts  (set_tab)   capabilities
++           directly  only when the it (init_tabs) capability is set to a value
++           other than eight.
++
+ 
+

    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 VT100s).  These may require padding char-
++       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  char-
+        acters after certain 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 its input buffers are
+-       close to full), set xon.  This capability suppresses  the  emission  of
+-       padding.   You can also set it for memory-mapped console devices effec-
+-       tively that do not have a  speed  limit.   Padding  information  should
++       automatically emits ^S back to the host  when  its  input  buffers  are
++       close  to  full),  set xon.  This capability suppresses the emission of
++       padding.  You can also set it for memory-mapped console devices  effec-
++       tively  that  do  not  have  a speed limit.  Padding information should
+        still be included so that routines can make better decisions about rel-
+        ative 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
++       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) character as  a  pad,
+-       then  this  can  be  given as pad.  Only the first character of the pad
++       If  the  terminal requires other than a null (zero) character 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
++       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
++       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
++       status line of this kind, as would  a  24-line  VT100  with  a  23-line
+        scrolling region set up on initialization.  This situation is indicated
+        by the hs capability.
+ 
+-       Some  terminals  with status lines need special sequences to 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 capability fsl must return to the main-screen  cursor  posi-
+-       tions  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
++       Some terminals with status lines need special sequences to  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  capability fsl must return to the main-screen cursor posi-
++       tions 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  specify  it  with  the
++       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 specified as dsl.
+ 
+-       The  boolean  capability  eslok  specifies that escape sequences, tabs,
++       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.
++       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.
++       Many terminals have alternate character sets useful for  forms-drawing.
+        Terminfo and curses have built-in support for most of the drawing char-
+-       acters  supported  by  the  VT100,  with  some characters from the AT&T
+-       4410v1 added.  This alternate character set may  be  specified  by  the
++       acters 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     acsc     acsc
+@@ -2004,7 +2039,6 @@
+          degree symbol               ACS_DEGREE     \         f        0x66
+          plus/minus                  ACS_PLMINUS    #         g        0x67
+          board of squares            ACS_BOARD      #         h        0x68
+-
+          lantern symbol              ACS_LANTERN    #         i        0x69
+          lower right corner          ACS_LRCORNER   +         j        0x6a
+          upper right corner          ACS_URCORNER   +         k        0x6b
+@@ -2030,34 +2064,34 @@
+ 
+        A few notes apply to the table itself:
+ 
+-       o   X/Open  Curses  incorrectly  states that the mapping for lantern is
+-           uppercase "I" although Unix implementations use the  lowercase  "i"
++       o   X/Open Curses incorrectly states that the mapping  for  lantern  is
++           uppercase  "I"  although Unix implementations use the lowercase "i"
+            mapping.
+ 
+-       o   The  DEC  VT100  implemented graphics using the alternate character
+-           set feature, temporarily switching modes and sending characters  in
++       o   The DEC VT100 implemented graphics using  the  alternate  character
++           set  feature, temporarily switching modes and sending characters in
+            the range 0x60 (96) to 0x7e (126) (the acsc Value column in the ta-
+            ble).
+ 
+        o   The AT&T terminal added graphics characters outside that range.
+ 
+-           Some of the characters within the range do  not  match  the  VT100;
+-           presumably  they  were  used in the AT&T terminal: board of squares
+-           replaces the VT100 newline symbol, while  lantern  symbol  replaces
++           Some  of  the  characters  within the range do not match the VT100;
++           presumably they were used in the AT&T terminal:  board  of  squares
++           replaces  the  VT100  newline symbol, while lantern symbol replaces
+            the VT100 vertical tab symbol.  The other VT100 symbols for control
+-           characters (horizontal tab, carriage return and line-feed) are  not
++           characters  (horizontal tab, carriage return and line-feed) are not
+            (re)used in curses.
+ 
+-       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
++       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
+        corresponding graphic.  Then read off the VT100/your terminal character
+        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
++       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":
+@@ -2066,43 +2100,43 @@
+            is usually 8), and can set character-cell foreground and background
+            characters independently, mixing them into N * N color-pairs.
+ 
+-       o   On  HP-like  terminals,  the user must set each color pair up sepa-
+-           rately (foreground and background are not independently  settable).
++       o   On HP-like terminals, the user must set each color  pair  up  sepa-
++           rately  (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
++       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
++       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 cur-
+-       rent  background  color  rather  than  the power-up default background;
++       rent background color rather  than  the  power-up  default  background;
+        these should have the boolean capability bce.
+ 
+        While the curses library works with color pairs (reflecting the inabil-
+-       ity  of  some  devices to set foreground and background colors indepen-
++       ity of some devices to set foreground and  background  colors  indepen-
+        dently), there are separate capabilities for setting these features:
+ 
+-       o   To change the current foreground or  background  color  on  a  Tek-
+-           tronix-type  terminal,  use  setaf  (set ANSI foreground) and setab
+-           (set ANSI background) or setf (set foreground) and setb (set  back-
+-           ground).   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 foreground, they should be coded as setaf  and  setab,  respec-
++       o   To  change  the  current  foreground  or background color on a Tek-
++           tronix-type terminal, use setaf (set  ANSI  foreground)  and  setab
++           (set  ANSI background) or setf (set foreground) and setb (set back-
++           ground).  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  foreground,  they  should be coded as setaf and setab, respec-
+            tively.
+ 
+-       o   If  the  terminal supports other escape sequences to set background
+-           and foreground, they should be coded  as  setf  and  setb,  respec-
+-           tively.   The  vidputs  and the refresh(3x) functions use the setaf
++       o   If the terminal supports other escape sequences to  set  background
++           and  foreground,  they  should  be  coded as setf and setb, respec-
++           tively.  The vidputs and the refresh(3x) functions  use  the  setaf
+            and setab capabilities if they are defined.
+ 
+-       The setaf/setab and setf/setb capabilities take a single numeric  argu-
+-       ment  each.  Argument values 0-7 of setaf/setab 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
++       The  setaf/setab and setf/setb capabilities take a single numeric argu-
++       ment each.  Argument values 0-7 of setaf/setab 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 loca-
+        tions in color space.
+ 
+@@ -2112,6 +2146,7 @@
+                     green     COLOR_GREEN       2     0,max,0
+                     yellow    COLOR_YELLOW      3     max,max,0
+                     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
+@@ -2132,28 +2167,28 @@
+        It is important to not confuse the two sets of color capabilities; oth-
+        erwise red/blue will be interchanged on the display.
+ 
+-       On  an  HP-like terminal, use scp with a color-pair number parameter to
++       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
++       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
++           which describe the color.  These three parameters default to  being
+            interpreted as RGB (Red, Green, Blue) values.  If the boolean capa-
+-           bility  hls  is  present,  they are instead as HLS (Hue, Lightness,
++           bility 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
++       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 num-
+-           ber (0 to max_pairs - 1), and two triples  describing  first  back-
+-           ground  and then foreground colors.  These parameters must be (Red,
++           ber  (0  to  max_pairs - 1), and two triples describing first back-
++           ground 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  reg-
+-       ister  these collisions with the ncv capability.  This is a bit-mask of
+-       attributes not to be used when colors are enabled.  The  correspondence
++       On  some color terminals, colors collide with highlights.  You can reg-
++       ister these collisions with the ncv capability.  This is a bit-mask  of
++       attributes  not to be used when colors are enabled.  The correspondence
+        with the attributes understood by curses is as follows:
+ 
+                   Attribute              Bit   Decimal      Set by
+@@ -2174,134 +2209,134 @@
+                   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.
++       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 and optimizes
++       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) character as  a  pad,
+-       then  this  can  be  given as pad.  Only the first character of the pad
++       If  the  terminal requires other than a null (zero) character as a pad,
++       then this can be given as pad.  Only the first  character  of  the  pad
+        string is used.  If the terminal 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 napms if the terminal has no
++       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 napms if the terminal has  no
+        pad character.
+ 
+-       If the terminal can move up or down half a line, this can be  indicated
++       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 use-
+        ful for superscripts and subscripts on hard-copy terminals.  If a hard-
+-       copy  terminal  can eject to the next page (form feed), give this as ff
+-       (usually control L).
++       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 charac-
+-       ters) this can be indicated with the  parameterized  string  rep.   The
+-       first  parameter  is the character to be repeated and the second is the
++       If  there  is  a  command to repeat a given character a given number of
++       times (to save time transmitting a large number  of  identical  charac-
++       ters)  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 prototype command  character
+-       is  chosen  which is used in all capabilities.  This character is given
+-       in the cmdch capability to identify it.  The  following  convention  is
++       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  capability to identify it.  The following convention is
+        supported on some UNIX systems: The environment is to be searched for a
+-       CC variable, and if found, all occurrences of the  prototype  character
++       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 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 sequences are
++       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  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 will assume that the 8th bit is parity and  it
+-       will  usually be cleared.  If strings exist to turn this "meta mode" on
++       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
+        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
++       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 virtual terminal
++       If the terminal is one of those supported by the UNIX virtual  terminal
+        protocol, the terminal number can be given as vt.
+ 
+-       Media copy strings which control an auxiliary printer connected to  the
+-       terminal  can  be  given as mc0: print the contents 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 terminal  screen
+-       when  the  printer  is  on.   A variation mc5p takes one parameter, and
++       Media  copy strings which control an auxiliary printer connected to the
++       terminal can be given as mc0: print the contents 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 terminal screen
++       when the printer is on.  A variation  mc5p  takes  one  parameter,  and
+        leaves the printer on for as many characters as the value of the param-
+        eter, then turns the printer off.  The parameter should not exceed 255.
+-       All text, including mc4, is transparently passed to the  printer  while
++       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 be displayed
++       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
++       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
++       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-
++       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 stand-
+-       out  mode  it  is instead necessary to use delete and insert line.  The
++       out mode it is instead necessary to use delete and  insert  line.   The
+        ncurses implementation ignores this glitch.
+ 
+-       The Beehive Superbee, which is unable to correctly transmit the  escape
+-       or  control  C  characters, has xsb, indicating 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,
++       The  Beehive Superbee, which is unable to correctly transmit the escape
++       or control/C characters, has xsb, indicating 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 adding more  capa-
++       Other  specific terminal problems may be corrected by adding more capa-
+        bilities of the form xx.
+ 
+ 
+

    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.   Unfor-
+-       tunately,  the  termcap translations are much more strictly limited (to
+-       1023 bytes), thus termcap translations of  long  terminfo  entries  can
++       Long terminfo entries are unlikely to be a problem; to date,  no  entry
++       has  even approached terminfo's 4096-byte string-table maximum.  Unfor-
++       tunately, the termcap translations are much more strictly  limited  (to
++       1023  bytes),  thus  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 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 is  searching  for  is,
++       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 is searching for is,
+        several bad things can happen.
+ 
+-       Some  termcap libraries print a warning message or exit if they find an
++       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
++       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
++       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 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 particular terminal.  This is the
+-       length of the entry as it exists in /etc/termcap, minus the  backslash-
++       The  "before tc expansion" length is the most important one, because it
++       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 tgetent strips out while reading it.  Some termcap
+        libraries strip off the final newline, too (GNU termcap does not).  Now
+        suppose:
+@@ -2310,87 +2345,87 @@
+ 
+        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
++       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
++       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 vulnera-
+-       ble; modern telnets pass along values like the terminal type  automati-
+-       cally.   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
++       Then  tgetent  will  overwrite  memory, perhaps its stack, and probably
++       core dump the program.  Programs like telnet are particularly  vulnera-
++       ble;  modern telnets pass along values like the terminal type automati-
++       cally.  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.
+ 
+-       The  "after  tc  expansion"  length  will  have a similar effect to the
++       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" expansion once it is found the terminal
++       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,  it will have this effect even for users of some other
+-       terminal types and users whose TERM variable does not  have  a  termcap
++       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, it will have this effect even for users of  some  other
++       terminal  types  and  users whose TERM variable does not have a termcap
+        entry.
+ 
+-       When  in  -C (translate to termcap) mode, the ncurses implementation 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
++       When in -C (translate to termcap) mode, the ncurses  implementation  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) 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 HP-UX  and  AIX)  which  diverged
+-       from  System  V terminfo after SVr1, and have added extension capabili-
+-       ties to the string table that (in the binary format) collide with  Sys-
++       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  capabili-
++       ties  to the string table that (in the binary format) collide with Sys-
+        tem V and XSI Curses extensions.
+ 
+ 
+

    EXTENSIONS

    +-       Searching   for  terminal  descriptions  in  $HOME/.terminfo  and  TER-
++       Searching  for  terminal  descriptions  in  $HOME/.terminfo  and   TER-
+        MINFO_DIRS is not supported by older implementations.
+ 
+-       Some SVr4 curses implementations, and all  previous  to  SVr4,  do  not
++       Some  SVr4  curses  implementations,  and  all previous to SVr4, do not
+        interpret the %A and %O operators in parameter 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  possibility that an XPG4 implementation making the opposite inter-
+-       pretation may need terminfo entries  made  for  ncurses  to  have  msgr
++       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 possibility that an XPG4 implementation making the opposite  inter-
++       pretation  may  need  terminfo  entries  made  for ncurses to have msgr
+        turned off.
+ 
+        The ncurses library handles insert-character and insert-character modes
+-       in a slightly non-standard way to get better  update  efficiency.   See
++       in  a  slightly  non-standard way to get better update efficiency.  See
+        the Insert/Delete Character subsection above.
+ 
+-       The  parameter  substitutions  for  set_clock and display_clock are not
+-       documented in SVr4 or the XSI Curses standard.  They are  deduced  from
++       The parameter substitutions for set_clock  and  display_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 library 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
++       Be careful assigning the kmous capability.  The ncurses  library  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  applications  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
++       X/Open  Curses  does  not  mention italics.  Portable applications 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
++       Different commercial ports of terminfo  and  curses  support  different
+        subsets of the XSI Curses standard and (in some cases) different exten-
+        sion sets.  Here is a summary, accurate as of October 1995:
+ 
+@@ -2400,15 +2435,15 @@
+            capability (set_pglen).
+ 
+        o   SVr1, Ultrix -- These support a restricted subset of terminfo capa-
+-           bilities.   The  booleans  end  with  xon_xoff;  the  numerics with
++           bilities.  The  booleans  end  with  xon_xoff;  the  numerics  with
+            width_status_line; and the strings with prtr_non.
+ 
+-       o   HP/UX -- Supports the  SVr1  subset,  plus  the  SVr[234]  numerics
+-           num_labels,   label_height,  label_width,  plus  function  keys  11
+-           through 63, plus plab_norm,  label_on,  and  label_off,  plus  some
++       o   HP/UX  --  Supports  the  SVr1  subset,  plus the SVr[234] numerics
++           num_labels,  label_height,  label_width,  plus  function  keys   11
++           through  63,  plus  plab_norm,  label_on,  and label_off, plus some
+            incompatible extensions in the string table.
+ 
+-       o   AIX  -- Supports the SVr1 subset, plus function keys 11 through 63,
++       o   AIX -- Supports the SVr1 subset, plus function keys 11 through  63,
+            plus a number of incompatible string table extensions.
+ 
+        o   OSF -- Supports both the SVr4 set and the AIX extensions.
+@@ -2419,8 +2454,8 @@
+ 
+ 
+

    SEE ALSO

    +-       tic(1m), infocmp(1m), curses(3x), curs_color(3x),  printf(3),  term(5).
+-       term_variables(3x).  user_caps(5).
++       tabs(1m),  tic(1m), infocmp(1m), curses(3x), curs_color(3x), curs_vari-
++       ables(3x), printf(3), term(5).  term_variables(3x).  user_caps(5).
+ 
+ 
+

    AUTHORS

    +Index: doc/html/man/tic.1m.html
+--- ncurses-6.1-20190609+/doc/html/man/tic.1m.html	2019-05-18 23:58:28.000000000 +0000
++++ ncurses-6.1-20190615/doc/html/man/tic.1m.html	2019-06-15 23:31:12.000000000 +0000
+@@ -26,7 +26,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: tic.1m,v 1.68 2019/05/18 21:59:56 tom Exp @
++  * @Id: tic.1m,v 1.69 2019/05/18 22:48:40 tom Exp @
+ -->
+ 
+ 
+@@ -365,7 +365,7 @@
+        infocmp(1m),   captoinfo(1m),   infotocap(1m),   toe(1m),   curses(3x),
+        term(5).  terminfo(5).  user_caps(5).
+ 
+-       This describes ncurses version 6.1 (patch 20190518).
++       This describes ncurses version 6.1 (patch 20190615).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/toe.1m.html
+--- ncurses-6.1-20190609+/doc/html/man/toe.1m.html	2019-05-18 23:58:28.000000000 +0000
++++ ncurses-6.1-20190615/doc/html/man/toe.1m.html	2019-06-15 23:31:12.000000000 +0000
+@@ -113,7 +113,7 @@
+        tic(1m), infocmp(1m), captoinfo(1m),  infotocap(1m),  curses(3x),  ter-
+        minfo(5).
+ 
+-       This describes ncurses version 6.1 (patch 20190518).
++       This describes ncurses version 6.1 (patch 20190615).
+ 
+ 
+ 
+Index: doc/html/man/tput.1.html
+--- ncurses-6.1-20190609+/doc/html/man/tput.1.html	2019-05-18 23:58:28.000000000 +0000
++++ ncurses-6.1-20190615/doc/html/man/tput.1.html	2019-06-15 23:31:12.000000000 +0000
+@@ -522,7 +522,7 @@
+

    SEE ALSO

    +        clear(1), stty(1), tabs(1), tset(1), terminfo(5), curs_termcap(3x).
+ 
+-       This describes ncurses version 6.1 (patch 20190518).
++       This describes ncurses version 6.1 (patch 20190615).
+ 
+ 
+ 
+Index: doc/html/man/tset.1.html
+--- ncurses-6.1-20190609+/doc/html/man/tset.1.html	2019-05-18 23:58:28.000000000 +0000
++++ ncurses-6.1-20190615/doc/html/man/tset.1.html	2019-06-15 23:31:12.000000000 +0000
+@@ -389,7 +389,7 @@
+        csh(1),  sh(1),  stty(1),   curs_terminfo(3x),   tty(4),   terminfo(5),
+        ttys(5), environ(7)
+ 
+-       This describes ncurses version 6.1 (patch 20190518).
++       This describes ncurses version 6.1 (patch 20190615).
+ 
+ 
+ 
+Index: doc/html/man/user_caps.5.html
+--- ncurses-6.1-20190609+/doc/html/man/user_caps.5.html	2019-05-18 23:58:28.000000000 +0000
++++ ncurses-6.1-20190615/doc/html/man/user_caps.5.html	2019-06-15 23:31:12.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: man/tabs.1
+Prereq:  1.20 
+--- ncurses-6.1-20190609+/man/tabs.1	2019-02-16 23:56:38.000000000 +0000
++++ ncurses-6.1-20190615/man/tabs.1	2019-06-15 23:08:12.000000000 +0000
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tabs.1,v 1.20 2019/02/16 23:56:38 tom Exp $
++.\" $Id: tabs.1,v 1.25 2019/06/15 23:08:12 tom Exp $
+ .TH @TABS@ 1 ""
+ .ds n 5
+ .ie \n(.g .ds `` \(lq
+@@ -76,6 +76,15 @@
+ in optimizing their output to the terminal.
+ If the hardware tabstops differ from the information in the terminal
+ database, the result is unpredictable.
++Before running curses programs,
++you should either reset tab-stops to the standard interval
++.NS
++tabs -8
++.NE
++.PP
++or use the \fB@RESET@\fP program,
++since the normal initialization sequences do not ensure that tab-stops
++are reset.
+ .SH OPTIONS
+ .SS General Options
+ .TP 5
+@@ -165,7 +174,10 @@
+ However
+ .bP
+ This standard describes a \fB+m\fP option, to set a terminal's left-margin.
+-Very few of the entries in the terminal database provide this capability.
++Very few of the entries in the terminal database provide the
++\fBsmgl\fP (\fBset_left_margin\fP) or
++\fBsmglp\fP (\fBset_left_margin_parm\fP)
++capability needed to support the feature.
+ .bP
+ There is no counterpart in X/Open Curses Issue 7 for this utility,
+ unlike \fB@TPUT@(1)\fP.
+@@ -173,11 +185,44 @@
+ The \fB\-d\fP (debug) and \fB\-n\fP (no-op) options are extensions not provided
+ by other implementations.
+ .PP
++A \fBtabs\fP utility appeared in PWB/Unix 1.0 (1977),
++and thereafter in 3BSD (1979).
++It supported a single \*(``\-n\*('' option
++(to cause the first tab stop to be set on the left margin).
++That option is not documented by POSIX.
++Initially, \fBtabs\fP used built-in tables rather than the terminal database,
++to support a half-dozen terminal types.
++It also had built-in logic to support the left-margin,
++as well as a feature for copying the tab settings from a file.
++.PP
++Later versions of Unix, e.g., SVr4,
++added support for the terminal database,
++but kept the tables, as a fallback.
++In an earlier development effort,
++the tab-stop initialization provided by \fBtset\fP (1982)
++and incorporated into \fBtput\fP uses the terminal database,
++.PP
++POSIX documents no limits on the number of tab stops.
+ Documentation for other implementations states that there is a limit on the
+ number of tab stops.
+ While some terminals 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 be that long.
++.PP
++The \fIRationale\fP section of the POSIX documentation goes into some
++detail about the ways the committee considered redesigning the
++\fBtabs\fP and \fBtput\fP utilities,
++without proposing an improved solution.
++It comments that
++.RS 5
++.PP
++no known historical version of tabs supports the capability of setting
++arbitrary tab stops.
++.RE
++.PP
++However, the \fIExplicit Lists\fP described in this manual page
++were implemented in PWB/Unix.
++Those provide the capability of setting abitrary tab stops.
+ .SH SEE ALSO
+ \fB@TSET@\fR(1),
+ \fB@INFOCMP@\fR(1M),
+Index: package/debian-mingw/changelog
+--- ncurses-6.1-20190609+/package/debian-mingw/changelog	2019-06-09 20:06:01.000000000 +0000
++++ ncurses-6.1-20190615/package/debian-mingw/changelog	2019-06-15 12:46:35.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.1+20190609) unstable; urgency=low
++ncurses6 (6.1+20190615) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 09 Jun 2019 16:06:01 -0400
++ -- Thomas E. Dickey   Sat, 15 Jun 2019 08:46:35 -0400
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.1-20190609+/package/debian-mingw64/changelog	2019-06-09 20:06:01.000000000 +0000
++++ ncurses-6.1-20190615/package/debian-mingw64/changelog	2019-06-15 12:46:35.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.1+20190609) unstable; urgency=low
++ncurses6 (6.1+20190615) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 09 Jun 2019 16:06:01 -0400
++ -- Thomas E. Dickey   Sat, 15 Jun 2019 08:46:35 -0400
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.1-20190609+/package/debian/changelog	2019-06-09 20:06:01.000000000 +0000
++++ ncurses-6.1-20190615/package/debian/changelog	2019-06-15 12:46:35.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.1+20190609) unstable; urgency=low
++ncurses6 (6.1+20190615) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 09 Jun 2019 16:06:01 -0400
++ -- Thomas E. Dickey   Sat, 15 Jun 2019 08:46:35 -0400
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.333 
+--- ncurses-6.1-20190609+/package/mingw-ncurses.nsi	2019-06-09 20:06:01.000000000 +0000
++++ ncurses-6.1-20190615/package/mingw-ncurses.nsi	2019-06-15 12:46:35.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.333 2019/06/09 20:06:01 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.334 2019/06/15 12:46:35 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "1"
+ !define VERSION_YYYY  "2019"
+-!define VERSION_MMDD  "0609"
++!define VERSION_MMDD  "0615"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.1-20190609+/package/mingw-ncurses.spec	2019-06-09 20:06:01.000000000 +0000
++++ ncurses-6.1-20190615/package/mingw-ncurses.spec	2019-06-15 12:46:35.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.1
+-Release: 20190609
++Release: 20190615
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.1-20190609+/package/ncurses.spec	2019-06-09 20:06:01.000000000 +0000
++++ ncurses-6.1-20190615/package/ncurses.spec	2019-06-15 12:46:35.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.1
+-Release: 20190609
++Release: 20190615
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncursest.spec
+--- ncurses-6.1-20190609+/package/ncursest.spec	2019-06-09 20:06:01.000000000 +0000
++++ ncurses-6.1-20190615/package/ncursest.spec	2019-06-15 12:46:35.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.1
+-Release: 20190609
++Release: 20190615
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/ncurses-6.1-20190623.patch b/ncurses-6.1-20190623.patch
new file mode 100644
index 0000000..ab00b8e
--- /dev/null
+++ b/ncurses-6.1-20190623.patch
@@ -0,0 +1,8026 @@
+# ncurses 6.1 - patch 20190623 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.1 is at
+# 	ftp.gnu.org:/pub/gnu
+#
+# Patches for ncurses 6.1 can be found at
+# 	ftp://ftp.invisible-island.net/ncurses/6.1
+#	http://invisible-mirror.net/archives/ncurses/6.1 
+#
+# ------------------------------------------------------------------------------
+# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20190623.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Jun 23 23:43:23 UTC 2019
+# ------------------------------------------------------------------------------
+# NEWS                                  |   13 
+# VERSION                               |    2 
+# aclocal.m4                            |  224 ++-
+# config.guess                          |   89 -
+# config.sub                            |    9 
+# configure                             | 2322 +++++++++++++++++++-------------
+# configure.in                          |   12 
+# 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              |   36 
+# 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 
+# include/nc_mingw.h                    |    6 
+# include/ncurses_defs                  |    3 
+# man/man_db.renames                    |    3 
+# man/tabs.1                            |   16 
+# ncurses/base/lib_initscr.c            |   21 
+# ncurses/curses.priv.h                 |    6 
+# ncurses/tinfo/lib_acs.c               |    4 
+# ncurses/tinfo/lib_setup.c             |   31 
+# ncurses/tty/tty_update.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 
+# package/ncursest.spec                 |    2 
+# test/test_sgr.c                       |   11 
+# 41 files changed, 1812 insertions(+), 1056 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.3332 
+--- ncurses-6.1-20190615+/NEWS	2019-06-15 23:39:53.000000000 +0000
++++ ncurses-6.1-20190623/NEWS	2019-06-23 21:18:23.000000000 +0000
+@@ -25,7 +25,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.3332 2019/06/15 23:39:53 tom Exp $
++-- $Id: NEWS,v 1.3337 2019/06/23 21:18:23 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.
+ 
++20190623
++	+ improve the tabs.1 manual page to distinguish the PWB/Unix and 7th
++	  Edition versions of the tabs utility.
++	+ add configure check for getenv() to work around implementation shown
++	  in Emscripten #6766, use that to optionally suppress START_TRACE
++	  macro, whose call to getenv() may not work properly (report by Ilya
++	  Ig Petrov).
++	+ modify initialization functions to avoid relying upon persistent
++	  data for the result from getenv().
++	+ update config.guess, config.sub
++
+ 20190615
+ 	+ expand the portability section of the man/tabs.1 manual page.
+ 	+ regenerate HTML manpages.
+Index: VERSION
+--- ncurses-6.1-20190615+/VERSION	2019-06-15 12:46:35.000000000 +0000
++++ ncurses-6.1-20190623/VERSION	2019-06-23 15:31:40.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.1	20190615
++5:0:10	6.1	20190623
+Index: aclocal.m4
+Prereq:  1.862 
+--- ncurses-6.1-20190615+/aclocal.m4	2019-03-30 21:53:01.000000000 +0000
++++ ncurses-6.1-20190623/aclocal.m4	2019-06-23 19:53:31.000000000 +0000
+@@ -28,7 +28,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.862 2019/03/30 21:53:01 tom Exp $
++dnl $Id: aclocal.m4,v 1.869 2019/06/23 19:53:31 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -925,6 +925,35 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_CHECK_ENVIRON version: 3 updated: 2010/05/26 16:44:57
++dnl ----------------
++dnl Check for data that is usually declared in , e.g., the 'environ'
++dnl variable.  Define a DECL_xxx symbol if we must declare it ourselves.
++dnl
++dnl $1 = the name to check
++dnl $2 = the assumed type
++AC_DEFUN([CF_CHECK_ENVIRON],
++[
++AC_CACHE_CHECK(if external $1 is declared, cf_cv_dcl_$1,[
++    AC_TRY_COMPILE([
++#ifdef HAVE_STDLIB_H
++#include 
++#endif
++#include  ],
++    ifelse([$2],,int,[$2]) x = (ifelse([$2],,int,[$2])) $1,
++    [cf_cv_dcl_$1=yes],
++    [cf_cv_dcl_$1=no])
++])
++
++if test "$cf_cv_dcl_$1" = no ; then
++    CF_UPPER(cf_result,decl_$1)
++    AC_DEFINE_UNQUOTED($cf_result)
++fi
++
++# It's possible (for near-UNIX clones) that the data doesn't exist
++CF_CHECK_EXTERN_DATA($1,ifelse([$2],,int,[$2]))
++])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_CHECK_ERRNO version: 12 updated: 2015/04/18 08:56:57
+ dnl --------------
+ dnl Check for data that is usually declared in  or , e.g.,
+@@ -982,6 +1011,132 @@
+ 
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_CHECK_GETENV version: 1 updated: 2019/06/23 15:28:15
++dnl ---------------
++dnl Check if repeated getenv calls return the same pointer, e.g., it does not
++dnl discard the previous pointer when returning a new one.
++AC_DEFUN([CF_CHECK_GETENV],
++[
++AC_REQUIRE([CF_CHECK_ENVIRON])
++AC_CHECK_FUNC( getenv, ,, AC_MSG_ERROR(getenv not found) )
++AC_CHECK_FUNCS( putenv setenv strdup )
++AC_CACHE_CHECK(if getenv returns consistent values,cf_cv_consistent_getenv,[
++AC_TRY_RUN([
++#include 
++#include 
++#include 
++#include 
++#include 
++
++#if defined(HAVE_ENVIRON) && defined(DECL_ENVIRON) && !defined(environ)
++extern char **environ;	/* POSIX, but some systems are not... */
++#endif
++
++#if defined(HAVE_STRDUP)
++#define str_alloc(s) strdup(s)
++#else
++#define str_alloc(s) strcpy(malloc(strlen(s) + 1, s))
++#endif
++
++static void set_value(const char *name, const char *value)
++{
++#if defined(HAVE_SETENV)
++	setenv(name, value, 1);
++#elif defined(HAVE_PUTENV)
++	char buffer[1024];
++	sprintf(buffer, "%s=%s", name, value);
++	putenv(str_alloc(buffer));
++#else
++#error neither putenv/setenv found
++#endif
++}
++int main(void)
++{
++	int pass;
++	size_t numenv, limit, j;
++	char **mynames;
++	char **myvalues;
++	char **mypointer;
++	char *equals;
++	for (numenv = 0; environ[numenv]; ++numenv) ;
++	limit = numenv + 10;
++	mynames = (char **) calloc(limit + 1, sizeof(char *));
++	myvalues = (char **) calloc(limit + 1, sizeof(char *));
++	mypointer = (char **) calloc(limit + 1, sizeof(char *));
++#if defined(HAVE_ENVIRON)
++	for (j = 0; environ[j]; ++j) {
++		mynames[j] = str_alloc(environ[j]);
++		equals = strchr(mynames[j], '=');
++		if (equals != 0) {
++			*equals++ = '\0';
++			myvalues[j] = str_alloc(equals);
++		} else {
++			myvalues[j] = str_alloc("");
++		}
++	}
++#endif
++	for (j = numenv; j < limit; ++j) {
++		char name[80];
++		char value[80];
++		size_t found;
++		size_t k = 0;
++		do {
++			size_t jk;
++			found = 0;
++			sprintf(name, "TERM%lu", (unsigned long) k);
++			for (jk = 0; jk < j; ++jk) {
++				if (!strcmp(name, mynames[jk])) {
++					found = 1;
++					++k;
++					break;
++				}
++			}
++		} while (found);
++		sprintf(value, "%lu:%p", (unsigned long) k, &mynames[j]);
++		set_value(name, value);
++		mynames[j] = str_alloc(name);
++		myvalues[j] = str_alloc(value);
++	}
++	for (pass = 0; pass < 3; ++pass) {
++		for (j = 0; j < limit; ++j) {
++			char *value = getenv(mynames[j]);
++			if (pass) {
++				if (value == 0) {
++					fprintf(stderr, "getenv returned null for %s\n", mynames[j]);
++					${cf_cv_main_return:-return}(1);
++				} else if (value != mypointer[j]) {
++					fprintf(stderr, "getenv returned different pointer for %s\n", mynames[j]);
++					${cf_cv_main_return:-return}(1);
++				} else if (strcmp(value, myvalues[j])) {
++					fprintf(stderr, "getenv returned different value for %s\n", mynames[j]);
++					${cf_cv_main_return:-return}(1);
++				}
++			} else {
++				size_t k;
++				mypointer[j] = value;
++				for (k = 0; k < j; ++k) {
++					if (mypointer[j] == mypointer[k]) {
++						fprintf(stderr, "getenv returned same pointer for %s and %s\n", mynames[j], mynames[k]);
++						${cf_cv_main_return:-return}(1);
++					}
++				}
++			}
++		}
++	}
++	${cf_cv_main_return:-return}(0);
++}
++],
++[cf_cv_consistent_getenv=yes],
++[cf_cv_consistent_getenv=no],
++[cf_cv_consistent_getenv=unknown])
++])
++
++if test "x$cf_cv_consistent_getenv" = xno
++then
++	AC_DEFINE(HAVE_CONSISTENT_GETENV,1,[Define to 1 if getenv repeatably returns the same value for a given name])
++fi
++])dnl
++dnl ---------------------------------------------------------------------------
+ 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
+@@ -1253,6 +1408,60 @@
+ fi
+ ])
+ dnl ---------------------------------------------------------------------------
++dnl CF_CONST_X_STRING version: 1 updated: 2019/04/08 17:50:29
++dnl -----------------
++dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most
++dnl character-strings.
++dnl
++dnl It is ambiguous because the specification accommodated the pre-ANSI
++dnl compilers bundled by more than one vendor in lieu of providing a standard C
++dnl compiler other than by costly add-ons.  Because of this, the specification
++dnl did not take into account the use of const for telling the compiler that
++dnl string literals would be in readonly memory.
++dnl
++dnl As a workaround, one could (starting with X11R5) define XTSTRINGDEFINES, to
++dnl let the compiler decide how to represent Xt's strings which were #define'd. 
++dnl That does not solve the problem of using the block of Xt's strings which
++dnl are compiled into the library (and is less efficient than one might want).
++dnl
++dnl Xt specification 7 introduces the _CONST_X_STRING symbol which is used both
++dnl when compiling the library and compiling using the library, to tell the
++dnl compiler that String is const.
++AC_DEFUN([CF_CONST_X_STRING],
++[
++AC_TRY_COMPILE(
++[
++#include 
++#include 
++],
++[String foo = malloc(1)],[
++
++AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[
++	AC_TRY_COMPILE(
++		[
++#define _CONST_X_STRING	/* X11R7.8 (perhaps) */
++#undef  XTSTRINGDEFINES	/* X11R5 and later */
++#include 
++#include 
++		],[String foo = malloc(1); *foo = 0],[
++			cf_cv_const_x_string=no
++		],[
++			cf_cv_const_x_string=yes
++		])
++])
++
++case $cf_cv_const_x_string in
++(no)
++	CF_APPEND_TEXT(CPPFLAGS,-DXTSTRINGDEFINES)
++	;;
++(*)
++	CF_APPEND_TEXT(CPPFLAGS,-D_CONST_X_STRING)
++	;;
++esac
++
++])
++])dnl
++dnl ---------------------------------------------------------------------------
+ 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
+@@ -2343,7 +2552,7 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_GCC_WARNINGS version: 33 updated: 2018/06/20 20:23:13
++dnl CF_GCC_WARNINGS version: 35 updated: 2019/06/16 09:45:01
+ dnl ---------------
+ dnl Check if the compiler supports useful warning options.  There's a few that
+ dnl we don't use, simply because they're too noisy:
+@@ -2367,12 +2576,11 @@
+ AC_REQUIRE([CF_GCC_VERSION])
+ CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS)
+ CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS)
+-
++if test "x$have_x" = xyes; then CF_CONST_X_STRING fi
+ cat > conftest.$ac_ext < /dev/null 2> /dev/null && \
++		! xcode-select --print-path > /dev/null 2> /dev/null ; then
++	    # Avoid executing cc if there is no toolchain installed as
++	    # cc will be a stub that puts up a graphical alert
++	    # prompting the user to install developer tools.
++	    CC_FOR_BUILD=no_compiler_found
++	else
++	    set_cc_for_build
+ 	fi
+-	if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
+-	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
+-		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+-		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+-		       grep IS_64BIT_ARCH >/dev/null
+-		then
+-		    case $UNAME_PROCESSOR in
+-			i386) UNAME_PROCESSOR=x86_64 ;;
+-			powerpc) UNAME_PROCESSOR=powerpc64 ;;
+-		    esac
+-		fi
+-		# On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
+-		if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
+-		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+-		       grep IS_PPC >/dev/null
+-		then
+-		    UNAME_PROCESSOR=powerpc
+-		fi
++	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
++	    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
++		   (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
++		   grep IS_64BIT_ARCH >/dev/null
++	    then
++		case $UNAME_PROCESSOR in
++		    i386) UNAME_PROCESSOR=x86_64 ;;
++		    powerpc) UNAME_PROCESSOR=powerpc64 ;;
++		esac
++	    fi
++	    # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
++	    if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
++		   (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
++		   grep IS_PPC >/dev/null
++	    then
++		UNAME_PROCESSOR=powerpc
+ 	    fi
+ 	elif test "$UNAME_PROCESSOR" = i386 ; then
+-	    # Avoid executing cc on OS X 10.9, as it ships with a stub
+-	    # that puts up a graphical alert prompting to install
+-	    # developer tools.  Any system running Mac OS X 10.7 or
+-	    # later (Darwin 11 and later) is required to have a 64-bit
+-	    # processor. This is not true of the ARM version of Darwin
+-	    # that Apple uses in portable devices.
+-	    UNAME_PROCESSOR=x86_64
++	    # uname -m returns i386 or x86_64
++	    UNAME_PROCESSOR=$UNAME_MACHINE
+ 	fi
+ 	echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
+ 	exit ;;
+@@ -1468,6 +1472,14 @@
+ #include 
+ #include 
+ #endif
++#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
++#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
++#include 
++#if defined(_SIZE_T_) || defined(SIGLOST)
++#include 
++#endif
++#endif
++#endif
+ main ()
+ {
+ #if defined (sony)
+@@ -1555,18 +1567,23 @@
+   printf ("vax-dec-bsd\n"); exit (0);
+ #endif
+ #else
++#if defined(_SIZE_T_) || defined(SIGLOST)
++  struct utsname un;
++  uname (&un);
++  printf ("vax-dec-ultrix%s\n", un.release); exit (0);
++#else
+   printf ("vax-dec-ultrix\n"); exit (0);
+ #endif
+ #endif
++#endif
+ #if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
+ #if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
+-#include 
+-#if defined(_SIZE_T_) /* >= ULTRIX4 */
+-  printf ("mips-dec-ultrix4\n"); exit (0);
++#if defined(_SIZE_T_) || defined(SIGLOST)
++  struct utsname *un;
++  uname (&un);
++  printf ("mips-dec-ultrix%s\n", un.release); exit (0);
+ #else
+-#if defined(ULTRIX3) || defined(ultrix3) || defined(SIGLOST)
+-  printf ("mips-dec-ultrix3\n"); exit (0);
+-#endif
++  printf ("mips-dec-ultrix\n"); exit (0);
+ #endif
+ #endif
+ #endif
+Index: config.sub
+--- ncurses-6.1-20190615+/config.sub	2019-03-28 21:31:13.000000000 +0000
++++ ncurses-6.1-20190623/config.sub	2019-05-23 01:27:51.000000000 +0000
+@@ -2,7 +2,7 @@
+ # Configuration validation subroutine script.
+ #   Copyright 1992-2019 Free Software Foundation, Inc.
+ 
+-timestamp='2019-01-05'
++timestamp='2019-05-23'
+ 
+ # 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
+@@ -1172,7 +1172,7 @@
+ 			| asmjs \
+ 			| ba \
+ 			| be32 | be64 \
+-			| bfin | bs2000 \
++			| bfin | bpf | bs2000 \
+ 			| c[123]* | c30 | [cjt]90 | c4x \
+ 			| c8051 | clipper | craynv | csky | cydra \
+ 			| d10v | d30v | dlx | dsp16xx \
+@@ -1247,7 +1247,8 @@
+ 			| v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
+ 			| vax \
+ 			| visium \
+-			| w65 | wasm32 \
++			| w65 \
++			| wasm32 | wasm64 \
+ 			| we32k \
+ 			| x86 | x86_64 | xc16x | xgate | xps100 \
+ 			| xstormy16 | xtensa* \
+@@ -1367,7 +1368,7 @@
+ 	     | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
+ 	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
+ 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
+-	     | midnightbsd* | amdhsa* | unleashed* | emscripten*)
++	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi*)
+ 	# Remember, each alternative MUST END IN *, to match a version number.
+ 		;;
+ 	qnx*)
+Index: configure
+--- ncurses-6.1-20190615+/configure	2019-03-30 21:50:56.000000000 +0000
++++ ncurses-6.1-20190623/configure	2019-06-23 21:27:11.000000000 +0000
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+-# From configure.in Revision: 1.678 .
++# From configure.in Revision: 1.682 .
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by Autoconf 2.52.20181006.
+ #
+@@ -15116,11 +15116,111 @@
+ echo "${ECHO_T}$CLANG_COMPILER" >&6
+ fi
+ 
++if test "x$have_x" = xyes; then
++cat >conftest.$ac_ext <<_ACEOF
++#line 15121 "configure"
++#include "confdefs.h"
++
++#include 
++#include 
++
++int
++main (void)
++{
++String foo = malloc(1)
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:15136: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:15139: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:15142: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:15145: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++
++echo "$as_me:15148: checking for X11/Xt const-feature" >&5
++echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
++if test "${cf_cv_const_x_string+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++	cat >conftest.$ac_ext <<_ACEOF
++#line 15155 "configure"
++#include "confdefs.h"
++
++#define _CONST_X_STRING	/* X11R7.8 (perhaps) */
++#undef  XTSTRINGDEFINES	/* X11R5 and later */
++#include 
++#include 
++
++int
++main (void)
++{
++String foo = malloc(1); *foo = 0
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:15172: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:15175: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:15178: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:15181: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++
++			cf_cv_const_x_string=no
++
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++
++			cf_cv_const_x_string=yes
++
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
++
++fi
++echo "$as_me:15196: result: $cf_cv_const_x_string" >&5
++echo "${ECHO_T}$cf_cv_const_x_string" >&6
++
++case $cf_cv_const_x_string in
++(no)
++
++	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
++	CPPFLAGS="${CPPFLAGS}-DXTSTRINGDEFINES"
++
++	;;
++(*)
++
++	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
++	CPPFLAGS="${CPPFLAGS}-D_CONST_X_STRING"
++
++	;;
++esac
++
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
++ fi
+ cat > conftest.$ac_ext <&5
++	{ echo "$as_me:15237: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="-Wall"
+@@ -15150,21 +15250,20 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:15153: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:15253: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15156: \$? = $ac_status" >&5
++  echo "$as_me:15256: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:15158: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:15258: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+ 	done
+ 	CFLAGS="$cf_save_CFLAGS"
+-
+ elif test "$GCC" = yes
+ then
+-	{ echo "$as_me:15167: checking for $CC warning options..." >&5
++	{ echo "$as_me:15266: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS=
+@@ -15188,26 +15287,20 @@
+ 		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:15191: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:15290: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15194: \$? = $ac_status" >&5
++  echo "$as_me:15293: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:15196: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:15295: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case $cf_opt in
+-			(Wcast-qual)
+-
+-	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+-	CPPFLAGS="${CPPFLAGS}-DXTSTRINGDEFINES"
+-
+-				;;
+ 			(Winline)
+ 				case $GCC_VERSION in
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:15210: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:15303: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -15217,7 +15310,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:15220: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:15313: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -15237,12 +15330,12 @@
+ if test "$GCC" = yes ; then
+ 	case $host_os in
+ 	(linux*|gnu*)
+-		echo "$as_me:15240: checking if this is really Intel C++ compiler" >&5
++		echo "$as_me:15333: 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 15245 "configure"
++#line 15338 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -15259,16 +15352,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15262: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15355: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15265: \$? = $ac_status" >&5
++  echo "$as_me:15358: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15268: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15361: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15271: \$? = $ac_status" >&5
++  echo "$as_me:15364: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   INTEL_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -15279,7 +15372,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 		CXXFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:15282: result: $INTEL_CPLUSPLUS" >&5
++		echo "$as_me:15375: result: $INTEL_CPLUSPLUS" >&5
+ echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
+ 		;;
+ 	esac
+@@ -15288,12 +15381,12 @@
+ CLANG_CPLUSPLUS=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:15291: checking if this is really Clang C++ compiler" >&5
++	echo "$as_me:15384: 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 15296 "configure"
++#line 15389 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -15310,16 +15403,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15313: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15406: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15316: \$? = $ac_status" >&5
++  echo "$as_me:15409: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15319: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15412: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15322: \$? = $ac_status" >&5
++  echo "$as_me:15415: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   CLANG_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
+@@ -15330,7 +15423,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 	CXXFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:15333: result: $CLANG_CPLUSPLUS" >&5
++	echo "$as_me:15426: result: $CLANG_CPLUSPLUS" >&5
+ echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
+ fi
+ 
+@@ -15342,7 +15435,7 @@
+ ac_main_return=return
+ 
+ cat > conftest.$ac_ext <&5
++	{ echo "$as_me:15456: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-Wall"
+@@ -15377,12 +15470,12 @@
+ 		wd981
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:15380: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:15473: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15383: \$? = $ac_status" >&5
++  echo "$as_me:15476: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:15385: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:15478: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		fi
+@@ -15391,7 +15484,7 @@
+ 
+ elif test "$GXX" = yes
+ then
+-	{ echo "$as_me:15394: checking for $CXX warning options..." >&5
++	{ echo "$as_me:15487: checking for $CXX warning options..." >&5
+ echo "$as_me: checking for $CXX warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-W -Wall"
+@@ -15421,16 +15514,16 @@
+ 		Wundef $cf_gxx_extra_warnings Wno-unused
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
+-		if { (eval echo "$as_me:15424: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:15517: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15427: \$? = $ac_status" >&5
++  echo "$as_me:15520: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:15429: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:15522: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		else
+-			test -n "$verbose" && echo "$as_me:15433: result: ... no -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:15526: result: ... no -$cf_opt" >&5
+ echo "${ECHO_T}... no -$cf_opt" >&6
+ 		fi
+ 	done
+@@ -15466,10 +15559,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:15469: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:15562: 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:15614: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15524: \$? = $ac_status" >&5
++  echo "$as_me:15617: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:15526: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:15619: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case $cf_attribute in
+@@ -15582,7 +15675,7 @@
+ rm -rf conftest*
+ fi
+ 
+-echo "$as_me:15585: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:15678: 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.
+@@ -15592,7 +15685,7 @@
+ else
+   with_string_hacks=no
+ fi;
+-echo "$as_me:15595: result: $with_string_hacks" >&5
++echo "$as_me:15688: result: $with_string_hacks" >&5
+ echo "${ECHO_T}$with_string_hacks" >&6
+ 
+ if test "x$with_string_hacks" = "xyes"; then
+@@ -15601,15 +15694,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+ 
+-	{ echo "$as_me:15604: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++	{ echo "$as_me:15697: 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:15606: checking for strlcat" >&5
++	echo "$as_me:15699: 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 15612 "configure"
++#line 15705 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -15640,16 +15733,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15643: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15736: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15646: \$? = $ac_status" >&5
++  echo "$as_me:15739: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15649: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15742: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15652: \$? = $ac_status" >&5
++  echo "$as_me:15745: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_strlcat=yes
+ else
+@@ -15659,7 +15752,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:15662: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:15755: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test $ac_cv_func_strlcat = yes; then
+ 
+@@ -15669,7 +15762,7 @@
+ 
+ else
+ 
+-		echo "$as_me:15672: checking for strlcat in -lbsd" >&5
++		echo "$as_me:15765: 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
+@@ -15677,7 +15770,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15680 "configure"
++#line 15773 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -15696,16 +15789,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15699: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15792: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15702: \$? = $ac_status" >&5
++  echo "$as_me:15795: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15705: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15798: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15708: \$? = $ac_status" >&5
++  echo "$as_me:15801: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -15716,7 +15809,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:15719: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:15812: 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
+ 
+@@ -15739,23 +15832,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:15742: checking for $ac_header" >&5
++echo "$as_me:15835: 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 15748 "configure"
++#line 15841 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:15752: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:15845: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:15758: \$? = $ac_status" >&5
++  echo "$as_me:15851: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -15774,7 +15867,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:15777: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:15870: 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:15891: 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 15804 "configure"
++#line 15897 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -15832,16 +15925,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15835: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15928: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15838: \$? = $ac_status" >&5
++  echo "$as_me:15931: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15841: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15934: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15844: \$? = $ac_status" >&5
++  echo "$as_me:15937: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -15851,7 +15944,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:15854: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:15947: 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:15960: 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.
+@@ -15874,7 +15967,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:15877: result: $with_assertions" >&5
++echo "$as_me:15970: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -15890,7 +15983,7 @@
+ 
+ ###	use option --disable-leaks to suppress "permanent" leaks, for testing
+ 
+-echo "$as_me:15893: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:15986: 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.
+@@ -15907,7 +16000,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:15910: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:16003: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case .$with_cflags in
+@@ -16021,23 +16114,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:16024: checking for dmalloc.h" >&5
++	echo "$as_me:16117: 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 16030 "configure"
++#line 16123 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:16034: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:16127: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:16040: \$? = $ac_status" >&5
++  echo "$as_me:16133: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16056,11 +16149,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:16059: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:16152: 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:16063: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:16156: 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
+@@ -16068,7 +16161,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16071 "configure"
++#line 16164 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16087,16 +16180,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16090: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16183: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16093: \$? = $ac_status" >&5
++  echo "$as_me:16186: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16096: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16189: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16099: \$? = $ac_status" >&5
++  echo "$as_me:16192: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -16107,7 +16200,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16110: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:16203: 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:16218: 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.
+@@ -16139,7 +16232,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:16142: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:16235: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case .$with_cflags in
+@@ -16253,23 +16346,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:16256: checking for dbmalloc.h" >&5
++	echo "$as_me:16349: 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 16262 "configure"
++#line 16355 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:16266: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:16359: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:16272: \$? = $ac_status" >&5
++  echo "$as_me:16365: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16288,11 +16381,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:16291: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:16384: 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:16295: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:16388: 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
+@@ -16300,7 +16393,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16303 "configure"
++#line 16396 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16319,16 +16412,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16322: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16415: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16325: \$? = $ac_status" >&5
++  echo "$as_me:16418: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16328: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16421: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16331: \$? = $ac_status" >&5
++  echo "$as_me:16424: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -16339,7 +16432,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16342: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:16435: 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:16450: 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.
+@@ -16371,7 +16464,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:16374: result: ${with_valgrind:-no}" >&5
++echo "$as_me:16467: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case .$with_cflags in
+@@ -16484,7 +16577,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:16487: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:16580: 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.
+@@ -16494,7 +16587,7 @@
+ else
+   : ${with_no_leaks:=no}
+ fi;
+-echo "$as_me:16497: result: $with_no_leaks" >&5
++echo "$as_me:16590: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$with_no_leaks" = yes ; then
+@@ -16546,7 +16639,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:16549: checking whether to add trace feature to all models" >&5
++echo "$as_me:16642: 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.
+@@ -16556,7 +16649,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:16559: result: $cf_with_trace" >&5
++echo "$as_me:16652: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "x$cf_with_trace" = xyes ; then
+@@ -16670,7 +16763,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:16673: checking if we want to use GNAT projects" >&5
++echo "$as_me:16766: 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.
+@@ -16687,7 +16780,7 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:16690: result: $enable_gnat_projects" >&5
++echo "$as_me:16783: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+ 
+ ###	Checks for libraries.
+@@ -16697,13 +16790,13 @@
+ 	LIBS=" -lpsapi $LIBS"
+ 	;;
+ (*)
+-echo "$as_me:16700: checking for gettimeofday" >&5
++echo "$as_me:16793: 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 16706 "configure"
++#line 16799 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16734,16 +16827,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16737: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16830: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16740: \$? = $ac_status" >&5
++  echo "$as_me:16833: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16743: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16836: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16746: \$? = $ac_status" >&5
++  echo "$as_me:16839: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -16753,7 +16846,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:16756: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:16849: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test $ac_cv_func_gettimeofday = yes; then
+ 
+@@ -16763,7 +16856,7 @@
+ 
+ else
+ 
+-echo "$as_me:16766: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:16859: 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
+@@ -16771,7 +16864,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16774 "configure"
++#line 16867 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16790,16 +16883,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16793: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16886: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16796: \$? = $ac_status" >&5
++  echo "$as_me:16889: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16799: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16892: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16802: \$? = $ac_status" >&5
++  echo "$as_me:16895: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -16810,7 +16903,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16813: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:16906: 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
+ 
+@@ -16840,14 +16933,14 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:16843: checking if -lm needed for math functions" >&5
++echo "$as_me:16936: 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 16850 "configure"
++#line 16943 "configure"
+ #include "confdefs.h"
+ 
+ 	#include 
+@@ -16863,16 +16956,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16866: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16959: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16869: \$? = $ac_status" >&5
++  echo "$as_me:16962: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16872: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16965: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16875: \$? = $ac_status" >&5
++  echo "$as_me:16968: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_need_libm=no
+ else
+@@ -16882,7 +16975,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:16885: result: $cf_cv_need_libm" >&5
++echo "$as_me:16978: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+ if test "$cf_cv_need_libm" = yes
+ then
+@@ -16890,13 +16983,13 @@
+ fi
+ 
+ ###	Checks for header files.
+-echo "$as_me:16893: checking for ANSI C header files" >&5
++echo "$as_me:16986: 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 16899 "configure"
++#line 16992 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -16904,13 +16997,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:16907: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17000: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:16913: \$? = $ac_status" >&5
++  echo "$as_me:17006: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16932,7 +17025,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 16935 "configure"
++#line 17028 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -16950,7 +17043,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 16953 "configure"
++#line 17046 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -16971,7 +17064,7 @@
+   :
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 16974 "configure"
++#line 17067 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -16997,15 +17090,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:17000: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17093: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17003: \$? = $ac_status" >&5
++  echo "$as_me:17096: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:17005: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17098: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17008: \$? = $ac_status" >&5
++  echo "$as_me:17101: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -17018,7 +17111,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:17021: result: $ac_cv_header_stdc" >&5
++echo "$as_me:17114: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -17031,13 +17124,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:17034: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:17127: 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 17040 "configure"
++#line 17133 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$ac_hdr>
+@@ -17052,16 +17145,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17055: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17148: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17058: \$? = $ac_status" >&5
++  echo "$as_me:17151: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17061: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17154: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17064: \$? = $ac_status" >&5
++  echo "$as_me:17157: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -17071,7 +17164,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:17074: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:17167: 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:17180: 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
+@@ -17092,7 +17185,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17095 "configure"
++#line 17188 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17111,16 +17204,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17114: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17207: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17117: \$? = $ac_status" >&5
++  echo "$as_me:17210: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17120: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17213: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17123: \$? = $ac_status" >&5
++  echo "$as_me:17216: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -17131,14 +17224,14 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17134: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:17227: 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:17141: checking for opendir in -lx" >&5
++  echo "$as_me:17234: 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
+@@ -17146,7 +17239,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17149 "configure"
++#line 17242 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17165,16 +17258,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17168: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17261: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17171: \$? = $ac_status" >&5
++  echo "$as_me:17264: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17174: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17267: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17177: \$? = $ac_status" >&5
++  echo "$as_me:17270: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -17185,7 +17278,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17188: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:17281: 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"
+@@ -17193,13 +17286,13 @@
+ 
+ fi
+ 
+-echo "$as_me:17196: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:17289: 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 17202 "configure"
++#line 17295 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -17215,16 +17308,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17218: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17311: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17221: \$? = $ac_status" >&5
++  echo "$as_me:17314: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17224: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17317: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17227: \$? = $ac_status" >&5
++  echo "$as_me:17320: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -17234,7 +17327,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:17237: result: $ac_cv_header_time" >&5
++echo "$as_me:17330: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -17253,13 +17346,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17256: checking for regcomp" >&5
++echo "$as_me:17349: 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 17262 "configure"
++#line 17355 "configure"
+ #include "confdefs.h"
+ #define regcomp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17290,16 +17383,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17293: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17386: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17296: \$? = $ac_status" >&5
++  echo "$as_me:17389: \$? = $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:17392: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17302: \$? = $ac_status" >&5
++  echo "$as_me:17395: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_regcomp=yes
+ else
+@@ -17309,7 +17402,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:17312: result: $ac_cv_func_regcomp" >&5
++echo "$as_me:17405: 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
+@@ -17318,7 +17411,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:17321: checking for regcomp in -l$cf_regex_lib" >&5
++echo "$as_me:17414: 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
+@@ -17326,7 +17419,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_regex_lib  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17329 "configure"
++#line 17422 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17345,16 +17438,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17348: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17441: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17351: \$? = $ac_status" >&5
++  echo "$as_me:17444: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17354: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17447: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17357: \$? = $ac_status" >&5
++  echo "$as_me:17450: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -17365,7 +17458,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17368: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:17461: 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
+ 
+@@ -17394,13 +17487,13 @@
+ fi
+ 
+ if test "$cf_regex_func" = no ; then
+-	echo "$as_me:17397: checking for compile" >&5
++	echo "$as_me:17490: 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 17403 "configure"
++#line 17496 "configure"
+ #include "confdefs.h"
+ #define compile autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17431,16 +17524,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17434: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17527: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17437: \$? = $ac_status" >&5
++  echo "$as_me:17530: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17440: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17533: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17443: \$? = $ac_status" >&5
++  echo "$as_me:17536: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_compile=yes
+ else
+@@ -17450,13 +17543,13 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:17453: result: $ac_cv_func_compile" >&5
++echo "$as_me:17546: 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:17459: checking for compile in -lgen" >&5
++		echo "$as_me:17552: 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
+@@ -17464,7 +17557,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgen  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17467 "configure"
++#line 17560 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17483,16 +17576,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17486: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17579: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17489: \$? = $ac_status" >&5
++  echo "$as_me:17582: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17492: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17585: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17495: \$? = $ac_status" >&5
++  echo "$as_me:17588: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gen_compile=yes
+ else
+@@ -17503,7 +17596,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17506: result: $ac_cv_lib_gen_compile" >&5
++echo "$as_me:17599: 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
+ 
+@@ -17531,11 +17624,11 @@
+ fi
+ 
+ if test "$cf_regex_func" = no ; then
+-	{ echo "$as_me:17534: WARNING: cannot find regular expression library" >&5
++	{ echo "$as_me:17627: WARNING: cannot find regular expression library" >&5
+ echo "$as_me: WARNING: cannot find regular expression library" >&2;}
+ fi
+ 
+-echo "$as_me:17538: checking for regular-expression headers" >&5
++echo "$as_me:17631: 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
+@@ -17547,7 +17640,7 @@
+ 	for cf_regex_hdr in regexp.h regexpr.h
+ 	do
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 17550 "configure"
++#line 17643 "configure"
+ #include "confdefs.h"
+ #include <$cf_regex_hdr>
+ int
+@@ -17562,16 +17655,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17565: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17658: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17568: \$? = $ac_status" >&5
++  echo "$as_me:17661: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17571: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17664: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17574: \$? = $ac_status" >&5
++  echo "$as_me:17667: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -17588,7 +17681,7 @@
+ 	for cf_regex_hdr in regex.h
+ 	do
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 17591 "configure"
++#line 17684 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$cf_regex_hdr>
+@@ -17606,16 +17699,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17609: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17702: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17612: \$? = $ac_status" >&5
++  echo "$as_me:17705: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17615: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17708: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17618: \$? = $ac_status" >&5
++  echo "$as_me:17711: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -17631,11 +17724,11 @@
+ esac
+ 
+ fi
+-echo "$as_me:17634: result: $cf_cv_regex_hdrs" >&5
++echo "$as_me:17727: result: $cf_cv_regex_hdrs" >&5
+ echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
+ 
+ case $cf_cv_regex_hdrs in
+-	(no)		{ echo "$as_me:17638: WARNING: no regular expression header found" >&5
++	(no)		{ echo "$as_me:17731: WARNING: no regular expression header found" >&5
+ echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
+ 	(regex.h)
+ cat >>confdefs.h <<\EOF
+@@ -17674,23 +17767,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:17677: checking for $ac_header" >&5
++echo "$as_me:17770: 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 17683 "configure"
++#line 17776 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:17687: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17780: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:17693: \$? = $ac_status" >&5
++  echo "$as_me:17786: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17709,7 +17802,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:17712: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:17805: 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:17818: 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 17731 "configure"
++#line 17824 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:17735: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17828: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:17741: \$? = $ac_status" >&5
++  echo "$as_me:17834: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17757,7 +17850,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:17760: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:17853: 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:17863: 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
+@@ -17777,7 +17870,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17780 "configure"
++#line 17873 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -17790,16 +17883,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17793: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17886: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17796: \$? = $ac_status" >&5
++  echo "$as_me:17889: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17799: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17892: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17802: \$? = $ac_status" >&5
++  echo "$as_me:17895: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -17811,7 +17904,7 @@
+ done
+ 
+ fi
+-echo "$as_me:17814: result: $cf_cv_getopt_header" >&5
++echo "$as_me:17907: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test $cf_cv_getopt_header != none ; then
+ 
+@@ -17828,11 +17921,411 @@
+ 
+ fi
+ 
++echo "$as_me:17924: checking if external environ is declared" >&5
++echo $ECHO_N "checking if external environ is declared... $ECHO_C" >&6
++if test "${cf_cv_dcl_environ+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++    cat >conftest.$ac_ext <<_ACEOF
++#line 17931 "configure"
++#include "confdefs.h"
++
++#ifdef HAVE_STDLIB_H
++#include 
++#endif
++#include 
++int
++main (void)
++{
++int x = (int) environ
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:17947: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:17950: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:17953: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:17956: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  cf_cv_dcl_environ=yes
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++cf_cv_dcl_environ=no
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
++
++fi
++echo "$as_me:17967: result: $cf_cv_dcl_environ" >&5
++echo "${ECHO_T}$cf_cv_dcl_environ" >&6
++
++if test "$cf_cv_dcl_environ" = no ; then
++
++cf_result=`echo "decl_environ" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
++
++    cat >>confdefs.h <&5
++echo $ECHO_N "checking if external environ exists... $ECHO_C" >&6
++if test "${cf_cv_have_environ+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++	cat >conftest.$ac_ext <<_ACEOF
++#line 17989 "configure"
++#include "confdefs.h"
++
++#undef environ
++extern int environ;
++
++int
++main (void)
++{
++environ = 2
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:18004: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:18007: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:18010: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:18013: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  cf_cv_have_environ=yes
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++cf_cv_have_environ=no
++fi
++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++
++fi
++echo "$as_me:18024: result: $cf_cv_have_environ" >&5
++echo "${ECHO_T}$cf_cv_have_environ" >&6
++
++if test "$cf_cv_have_environ" = yes ; then
++
++cf_result=`echo "have_environ" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
++
++	cat >>confdefs.h <&5
++echo $ECHO_N "checking for getenv... $ECHO_C" >&6
++if test "${ac_cv_func_getenv+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++#line 18043 "configure"
++#include "confdefs.h"
++#define getenv autoconf_temporary
++#include 	/* least-intrusive standard header which defines gcc2 __stub macros */
++#undef getenv
++
++#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 getenv (void);
++
++int
++main (void)
++{
++
++/* The GNU C library defines stubs 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_getenv) || defined (__stub___getenv)
++#error found stub for getenv
++#endif
++
++	return getenv ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:18074: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:18077: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:18080: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:18083: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_getenv=yes
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++ac_cv_func_getenv=no
++fi
++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:18093: result: $ac_cv_func_getenv" >&5
++echo "${ECHO_T}$ac_cv_func_getenv" >&6
++
++for ac_func in putenv setenv strdup
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:18099: 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 18105 "configure"
++#include "confdefs.h"
++#define $ac_func autoconf_temporary
++#include 	/* least-intrusive standard header which defines gcc2 __stub macros */
++#undef $ac_func
++
++#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 (void);
++
++int
++main (void)
++{
++
++/* The GNU C library defines stubs 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)
++#error found stub for $ac_func
++#endif
++
++	return $ac_func ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:18136: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:18139: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:18142: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:18145: \$? = $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:18155: 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 getenv returns consistent values... $ECHO_C" >&6
++if test "${cf_cv_consistent_getenv+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++if test "$cross_compiling" = yes; then
++  cf_cv_consistent_getenv=unknown
++else
++  cat >conftest.$ac_ext <<_ACEOF
++#line 18175 "configure"
++#include "confdefs.h"
++
++#include 
++#include 
++#include 
++#include 
++#include 
++
++#if defined(HAVE_ENVIRON) && defined(DECL_ENVIRON) && !defined(environ)
++extern char **environ;	/* POSIX, but some systems are not... */
++#endif
++
++#if defined(HAVE_STRDUP)
++#define str_alloc(s) strdup(s)
++#else
++#define str_alloc(s) strcpy(malloc(strlen(s) + 1, s))
++#endif
++
++static void set_value(const char *name, const char *value)
++{
++#if defined(HAVE_SETENV)
++	setenv(name, value, 1);
++#elif defined(HAVE_PUTENV)
++	char buffer[1024];
++	sprintf(buffer, "%s=%s", name, value);
++	putenv(str_alloc(buffer));
++#else
++#error neither putenv/setenv found
++#endif
++}
++int main(void)
++{
++	int pass;
++	size_t numenv, limit, j;
++	char **mynames;
++	char **myvalues;
++	char **mypointer;
++	char *equals;
++	for (numenv = 0; environ[numenv]; ++numenv) ;
++	limit = numenv + 10;
++	mynames = (char **) calloc(limit + 1, sizeof(char *));
++	myvalues = (char **) calloc(limit + 1, sizeof(char *));
++	mypointer = (char **) calloc(limit + 1, sizeof(char *));
++#if defined(HAVE_ENVIRON)
++	for (j = 0; environ[j]; ++j) {
++		mynames[j] = str_alloc(environ[j]);
++		equals = strchr(mynames[j], '=');
++		if (equals != 0) {
++			*equals++ = '\0';
++			myvalues[j] = str_alloc(equals);
++		} else {
++			myvalues[j] = str_alloc("");
++		}
++	}
++#endif
++	for (j = numenv; j < limit; ++j) {
++		char name[80];
++		char value[80];
++		size_t found;
++		size_t k = 0;
++		do {
++			size_t jk;
++			found = 0;
++			sprintf(name, "TERM%lu", (unsigned long) k);
++			for (jk = 0; jk < j; ++jk) {
++				if (!strcmp(name, mynames[jk])) {
++					found = 1;
++					++k;
++					break;
++				}
++			}
++		} while (found);
++		sprintf(value, "%lu:%p", (unsigned long) k, &mynames[j]);
++		set_value(name, value);
++		mynames[j] = str_alloc(name);
++		myvalues[j] = str_alloc(value);
++	}
++	for (pass = 0; pass < 3; ++pass) {
++		for (j = 0; j < limit; ++j) {
++			char *value = getenv(mynames[j]);
++			if (pass) {
++				if (value == 0) {
++					fprintf(stderr, "getenv returned null for %s\n", mynames[j]);
++					${cf_cv_main_return:-return}(1);
++				} else if (value != mypointer[j]) {
++					fprintf(stderr, "getenv returned different pointer for %s\n", mynames[j]);
++					${cf_cv_main_return:-return}(1);
++				} else if (strcmp(value, myvalues[j])) {
++					fprintf(stderr, "getenv returned different value for %s\n", mynames[j]);
++					${cf_cv_main_return:-return}(1);
++				}
++			} else {
++				size_t k;
++				mypointer[j] = value;
++				for (k = 0; k < j; ++k) {
++					if (mypointer[j] == mypointer[k]) {
++						fprintf(stderr, "getenv returned same pointer for %s and %s\n", mynames[j], mynames[k]);
++						${cf_cv_main_return:-return}(1);
++					}
++				}
++			}
++		}
++	}
++	${cf_cv_main_return:-return}(0);
++}
++
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:18284: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:18287: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:18289: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:18292: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  cf_cv_consistent_getenv=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_consistent_getenv=no
++fi
++rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++
++fi
++echo "$as_me:18305: result: $cf_cv_consistent_getenv" >&5
++echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
++
++if test "x$cf_cv_consistent_getenv" = xno
++then
++
++cat >>confdefs.h <<\EOF
++#define HAVE_CONSISTENT_GETENV 1
++EOF
++
++fi
++
++if test "x$cf_cv_consistent_getenv" = xno && \
++	test "x$cf_with_trace" = xyes
++then
++	{ echo "$as_me:18320: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
++echo "$as_me: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&2;}
++fi
++
+ # check for ISC (this may also define _POSIX_SOURCE)
+ # Note: even non-Posix ISC needs  to declare fd_set
+ if test "x$ISC" = xyes ; then
+ 
+-echo "$as_me:17835: checking for main in -lcposix" >&5
++echo "$as_me:18328: 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
+@@ -17840,7 +18333,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lcposix  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17843 "configure"
++#line 18336 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17852,16 +18345,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17855: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18348: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17858: \$? = $ac_status" >&5
++  echo "$as_me:18351: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17861: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18354: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17864: \$? = $ac_status" >&5
++  echo "$as_me:18357: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_cposix_main=yes
+ else
+@@ -17872,7 +18365,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17875: result: $ac_cv_lib_cposix_main" >&5
++echo "$as_me:18368: 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:18379: 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
+@@ -17891,7 +18384,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-linet  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17894 "configure"
++#line 18387 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17910,16 +18403,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17913: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18406: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17916: \$? = $ac_status" >&5
++  echo "$as_me:18409: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17919: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18412: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17922: \$? = $ac_status" >&5
++  echo "$as_me:18415: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_inet_bzero=yes
+ else
+@@ -17930,7 +18423,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17933: result: $ac_cv_lib_inet_bzero" >&5
++echo "$as_me:18426: 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
+ 
+@@ -17953,14 +18446,14 @@
+ fi
+ fi
+ 
+-echo "$as_me:17956: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:18449: 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 17963 "configure"
++#line 18456 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17980,16 +18473,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17983: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18476: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17986: \$? = $ac_status" >&5
++  echo "$as_me:18479: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17989: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18482: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17992: \$? = $ac_status" >&5
++  echo "$as_me:18485: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -18001,7 +18494,7 @@
+ 
+ fi
+ 
+-echo "$as_me:18004: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:18497: 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
+@@ -18016,13 +18509,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return=return
+ 
+-echo "$as_me:18019: checking for an ANSI C-conforming const" >&5
++echo "$as_me:18512: 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 18025 "configure"
++#line 18518 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18080,16 +18573,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18083: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18576: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18086: \$? = $ac_status" >&5
++  echo "$as_me:18579: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18089: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18582: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18092: \$? = $ac_status" >&5
++  echo "$as_me:18585: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -18099,7 +18592,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:18102: result: $ac_cv_c_const" >&5
++echo "$as_me:18595: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -18109,7 +18602,7 @@
+ 
+ fi
+ 
+-echo "$as_me:18112: checking for inline" >&5
++echo "$as_me:18605: 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
+@@ -18117,7 +18610,7 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 18120 "configure"
++#line 18613 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo () {return 0; }
+@@ -18126,16 +18619,16 @@
+ 
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18129: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18622: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18132: \$? = $ac_status" >&5
++  echo "$as_me:18625: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18135: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18628: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18138: \$? = $ac_status" >&5
++  echo "$as_me:18631: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -18146,7 +18639,7 @@
+ done
+ 
+ fi
+-echo "$as_me:18149: result: $ac_cv_c_inline" >&5
++echo "$as_me:18642: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -18172,7 +18665,7 @@
+ 		:
+ 	elif test "$GCC" = yes
+ 	then
+-		echo "$as_me:18175: checking if $CC supports options to tune inlining" >&5
++		echo "$as_me:18668: 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
+@@ -18181,7 +18674,7 @@
+ 		cf_save_CFLAGS=$CFLAGS
+ 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 18184 "configure"
++#line 18677 "configure"
+ #include "confdefs.h"
+ inline int foo(void) { return 1; }
+ int
+@@ -18193,16 +18686,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18196: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18689: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18199: \$? = $ac_status" >&5
++  echo "$as_me:18692: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18202: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18695: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18205: \$? = $ac_status" >&5
++  echo "$as_me:18698: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gcc_inline=yes
+ else
+@@ -18214,7 +18707,7 @@
+ 		CFLAGS=$cf_save_CFLAGS
+ 
+ fi
+-echo "$as_me:18217: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:18710: result: $cf_cv_gcc_inline" >&5
+ echo "${ECHO_T}$cf_cv_gcc_inline" >&6
+ 		if test "$cf_cv_gcc_inline" = yes ; then
+ 
+@@ -18320,7 +18813,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:18323: checking for signal global datatype" >&5
++echo "$as_me:18816: 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
+@@ -18332,7 +18825,7 @@
+ 		"int"
+ 	do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 18335 "configure"
++#line 18828 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -18355,16 +18848,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18358: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18851: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18361: \$? = $ac_status" >&5
++  echo "$as_me:18854: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18364: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18857: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18367: \$? = $ac_status" >&5
++  echo "$as_me:18860: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -18378,7 +18871,7 @@
+ 
+ fi
+ 
+-echo "$as_me:18381: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:18874: 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:18883: 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
+@@ -18397,7 +18890,7 @@
+   cf_cv_typeof_chtype=long
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 18400 "configure"
++#line 18893 "configure"
+ #include "confdefs.h"
+ 
+ #define WANT_BITS 31
+@@ -18432,15 +18925,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:18435: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18928: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18438: \$? = $ac_status" >&5
++  echo "$as_me:18931: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:18440: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18933: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18443: \$? = $ac_status" >&5
++  echo "$as_me:18936: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_typeof_chtype=`cat cf_test.out`
+ else
+@@ -18455,7 +18948,7 @@
+ 
+ fi
+ 
+-echo "$as_me:18458: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:18951: result: $cf_cv_typeof_chtype" >&5
+ echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:18963: 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 18477 "configure"
++#line 18970 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18486,16 +18979,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18489: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18982: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18492: \$? = $ac_status" >&5
++  echo "$as_me:18985: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18495: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18988: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18498: \$? = $ac_status" >&5
++  echo "$as_me:18991: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_unsigned_literals=yes
+ else
+@@ -18507,7 +19000,7 @@
+ 
+ fi
+ 
+-echo "$as_me:18510: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:19003: result: $cf_cv_unsigned_literals" >&5
+ echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
+ 
+ cf_cv_1UL="1"
+@@ -18523,14 +19016,14 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:18526: checking if external errno is declared" >&5
++echo "$as_me:19019: 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 18533 "configure"
++#line 19026 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_STDLIB_H
+@@ -18548,16 +19041,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18551: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19044: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18554: \$? = $ac_status" >&5
++  echo "$as_me:19047: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18557: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19050: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18560: \$? = $ac_status" >&5
++  echo "$as_me:19053: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_dcl_errno=yes
+ else
+@@ -18568,7 +19061,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:18571: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:19064: result: $cf_cv_dcl_errno" >&5
+ echo "${ECHO_T}$cf_cv_dcl_errno" >&6
+ 
+ if test "$cf_cv_dcl_errno" = no ; then
+@@ -18583,14 +19076,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:18586: checking if external errno exists" >&5
++echo "$as_me:19079: 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 18593 "configure"
++#line 19086 "configure"
+ #include "confdefs.h"
+ 
+ #undef errno
+@@ -18605,16 +19098,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18608: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19101: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18611: \$? = $ac_status" >&5
++  echo "$as_me:19104: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18614: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19107: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18617: \$? = $ac_status" >&5
++  echo "$as_me:19110: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_errno=yes
+ else
+@@ -18625,7 +19118,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:18628: result: $cf_cv_have_errno" >&5
++echo "$as_me:19121: result: $cf_cv_have_errno" >&5
+ echo "${ECHO_T}$cf_cv_have_errno" >&6
+ 
+ if test "$cf_cv_have_errno" = yes ; then
+@@ -18638,7 +19131,7 @@
+ 
+ fi
+ 
+-echo "$as_me:18641: checking if data-only library module links" >&5
++echo "$as_me:19134: 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
+@@ -18646,20 +19139,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:19145: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18655: \$? = $ac_status" >&5
++  echo "$as_me:19148: \$? = $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:19168: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18678: \$? = $ac_status" >&5
++  echo "$as_me:19171: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -18688,7 +19181,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 18691 "configure"
++#line 19184 "configure"
+ #include "confdefs.h"
+ 
+ 	int main(void)
+@@ -18699,15 +19192,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:18702: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19195: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18705: \$? = $ac_status" >&5
++  echo "$as_me:19198: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:18707: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19200: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18710: \$? = $ac_status" >&5
++  echo "$as_me:19203: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -18722,7 +19215,7 @@
+ 
+ fi
+ 
+-echo "$as_me:18725: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:19218: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -18764,13 +19257,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:18767: checking for $ac_func" >&5
++echo "$as_me:19260: 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 18773 "configure"
++#line 19266 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18801,16 +19294,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18804: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19297: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18807: \$? = $ac_status" >&5
++  echo "$as_me:19300: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18810: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19303: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18813: \$? = $ac_status" >&5
++  echo "$as_me:19306: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -18820,7 +19313,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:18823: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:19316: 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:19328: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -18841,7 +19334,7 @@
+ then
+ 	if test "x$ac_cv_func_vsnprintf" = xyes
+ 	then
+-		{ echo "$as_me:18844: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
++		{ echo "$as_me:19337: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+ echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
+ 	else
+ 
+@@ -18854,14 +19347,14 @@
+ 
+ if test "x$with_getcap" = "xyes" ; then
+ 
+-echo "$as_me:18857: checking for terminal-capability database functions" >&5
++echo "$as_me:19350: 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 18864 "configure"
++#line 19357 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -18881,16 +19374,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18884: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19377: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18887: \$? = $ac_status" >&5
++  echo "$as_me:19380: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18890: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19383: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18893: \$? = $ac_status" >&5
++  echo "$as_me:19386: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cgetent=yes
+ else
+@@ -18901,7 +19394,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:18904: result: $cf_cv_cgetent" >&5
++echo "$as_me:19397: result: $cf_cv_cgetent" >&5
+ echo "${ECHO_T}$cf_cv_cgetent" >&6
+ 
+ if test "$cf_cv_cgetent" = yes
+@@ -18911,14 +19404,14 @@
+ #define HAVE_BSD_CGETENT 1
+ EOF
+ 
+-echo "$as_me:18914: checking if cgetent uses const parameter" >&5
++echo "$as_me:19407: 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 18921 "configure"
++#line 19414 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
+@@ -18941,16 +19434,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18944: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19437: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18947: \$? = $ac_status" >&5
++  echo "$as_me:19440: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18950: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19443: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18953: \$? = $ac_status" >&5
++  echo "$as_me:19446: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cgetent_const=yes
+ else
+@@ -18961,7 +19454,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:18964: result: $cf_cv_cgetent_const" >&5
++echo "$as_me:19457: result: $cf_cv_cgetent_const" >&5
+ echo "${ECHO_T}$cf_cv_cgetent_const" >&6
+ 	if test "$cf_cv_cgetent_const" = yes
+ 	then
+@@ -18975,14 +19468,14 @@
+ 
+ fi
+ 
+-echo "$as_me:18978: checking for isascii" >&5
++echo "$as_me:19471: 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 18985 "configure"
++#line 19478 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -18994,16 +19487,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18997: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19490: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19000: \$? = $ac_status" >&5
++  echo "$as_me:19493: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19003: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19496: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19006: \$? = $ac_status" >&5
++  echo "$as_me:19499: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_isascii=yes
+ else
+@@ -19014,7 +19507,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:19017: result: $cf_cv_have_isascii" >&5
++echo "$as_me:19510: result: $cf_cv_have_isascii" >&5
+ echo "${ECHO_T}$cf_cv_have_isascii" >&6
+ test "$cf_cv_have_isascii" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -19022,10 +19515,10 @@
+ EOF
+ 
+ if test "$ac_cv_func_sigaction" = yes; then
+-echo "$as_me:19025: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:19518: 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 19028 "configure"
++#line 19521 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19039,16 +19532,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19042: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19535: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19045: \$? = $ac_status" >&5
++  echo "$as_me:19538: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19048: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19541: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19051: \$? = $ac_status" >&5
++  echo "$as_me:19544: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   sigact_bad=no
+ else
+@@ -19056,7 +19549,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19059 "configure"
++#line 19552 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -19071,16 +19564,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19074: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19567: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19077: \$? = $ac_status" >&5
++  echo "$as_me:19570: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19080: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19573: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19083: \$? = $ac_status" >&5
++  echo "$as_me:19576: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   sigact_bad=yes
+ 
+@@ -19096,11 +19589,11 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:19099: result: $sigact_bad" >&5
++echo "$as_me:19592: result: $sigact_bad" >&5
+ echo "${ECHO_T}$sigact_bad" >&6
+ fi
+ 
+-echo "$as_me:19103: checking if nanosleep really works" >&5
++echo "$as_me:19596: 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
+@@ -19110,7 +19603,7 @@
+   cf_cv_func_nanosleep=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 19113 "configure"
++#line 19606 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19135,15 +19628,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:19138: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19631: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19141: \$? = $ac_status" >&5
++  echo "$as_me:19634: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:19143: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19636: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19146: \$? = $ac_status" >&5
++  echo "$as_me:19639: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_nanosleep=yes
+ else
+@@ -19155,7 +19648,7 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:19158: result: $cf_cv_func_nanosleep" >&5
++echo "$as_me:19651: result: $cf_cv_func_nanosleep" >&5
+ echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
+ 
+ test "$cf_cv_func_nanosleep" = "yes" &&
+@@ -19172,23 +19665,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:19175: checking for $ac_header" >&5
++echo "$as_me:19668: 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 19181 "configure"
++#line 19674 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:19185: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:19678: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:19191: \$? = $ac_status" >&5
++  echo "$as_me:19684: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -19207,7 +19700,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:19210: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:19703: 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:19720: 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 19230 "configure"
++#line 19723 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -19239,16 +19732,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19242: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19735: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19245: \$? = $ac_status" >&5
++  echo "$as_me:19738: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19248: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19741: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19251: \$? = $ac_status" >&5
++  echo "$as_me:19744: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   termios_bad=no
+ else
+@@ -19256,7 +19749,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 19259 "configure"
++#line 19752 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -19270,16 +19763,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19273: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19766: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19276: \$? = $ac_status" >&5
++  echo "$as_me:19769: \$? = $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:19772: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19282: \$? = $ac_status" >&5
++  echo "$as_me:19775: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   termios_bad=unknown
+ else
+@@ -19295,19 +19788,19 @@
+ 
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-	echo "$as_me:19298: result: $termios_bad" >&5
++	echo "$as_me:19791: result: $termios_bad" >&5
+ echo "${ECHO_T}$termios_bad" >&6
+ 	fi
+ fi
+ 
+-echo "$as_me:19303: checking for tcgetattr" >&5
++echo "$as_me:19796: 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 19310 "configure"
++#line 19803 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19335,16 +19828,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19338: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19831: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19341: \$? = $ac_status" >&5
++  echo "$as_me:19834: \$? = $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:19837: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19347: \$? = $ac_status" >&5
++  echo "$as_me:19840: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_tcgetattr=yes
+ else
+@@ -19354,21 +19847,21 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:19357: result: $cf_cv_have_tcgetattr" >&5
++echo "$as_me:19850: 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:19364: checking for vsscanf function or workaround" >&5
++echo "$as_me:19857: 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 19371 "configure"
++#line 19864 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19384,16 +19877,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19387: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19880: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19390: \$? = $ac_status" >&5
++  echo "$as_me:19883: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19393: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19886: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19396: \$? = $ac_status" >&5
++  echo "$as_me:19889: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_vsscanf=vsscanf
+ else
+@@ -19401,7 +19894,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19404 "configure"
++#line 19897 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19423,16 +19916,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19426: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19919: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19429: \$? = $ac_status" >&5
++  echo "$as_me:19922: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19432: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19925: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19435: \$? = $ac_status" >&5
++  echo "$as_me:19928: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_vsscanf=vfscanf
+ else
+@@ -19440,7 +19933,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19443 "configure"
++#line 19936 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19462,16 +19955,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19465: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19958: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19468: \$? = $ac_status" >&5
++  echo "$as_me:19961: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19471: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19964: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19474: \$? = $ac_status" >&5
++  echo "$as_me:19967: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_vsscanf=_doscan
+ else
+@@ -19486,7 +19979,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:19489: result: $cf_cv_func_vsscanf" >&5
++echo "$as_me:19982: result: $cf_cv_func_vsscanf" >&5
+ echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
+ 
+ case $cf_cv_func_vsscanf in
+@@ -19512,23 +20005,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:19515: checking for $ac_header" >&5
++echo "$as_me:20008: 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 19521 "configure"
++#line 20014 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:19525: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:20018: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:19531: \$? = $ac_status" >&5
++  echo "$as_me:20024: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -19547,7 +20040,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:19550: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:20043: 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:20053: 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
+@@ -19568,7 +20061,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 19571 "configure"
++#line 20064 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19609,15 +20102,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:19612: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20105: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19615: \$? = $ac_status" >&5
++  echo "$as_me:20108: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:19617: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20110: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19620: \$? = $ac_status" >&5
++  echo "$as_me:20113: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -19632,16 +20125,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:19635: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:20128: 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:19638: checking for mkstemp" >&5
++	echo "$as_me:20131: 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 19644 "configure"
++#line 20137 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19672,16 +20165,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19675: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20168: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19678: \$? = $ac_status" >&5
++  echo "$as_me:20171: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19681: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20174: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19684: \$? = $ac_status" >&5
++  echo "$as_me:20177: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -19691,7 +20184,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:19694: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:20187: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -19712,21 +20205,21 @@
+ fi
+ 
+ if test "x$cross_compiling" = xyes ; then
+-	{ echo "$as_me:19715: WARNING: cross compiling: assume setvbuf params not reversed" >&5
++	{ echo "$as_me:20208: 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:19718: checking whether setvbuf arguments are reversed" >&5
++	echo "$as_me:20211: 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:19724: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:20217: 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 19729 "configure"
++#line 20222 "configure"
+ #include "confdefs.h"
+ #include 
+ /* If setvbuf has the reversed format, exit 0. */
+@@ -19743,15 +20236,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:19746: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20239: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19749: \$? = $ac_status" >&5
++  echo "$as_me:20242: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:19751: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20244: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19754: \$? = $ac_status" >&5
++  echo "$as_me:20247: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_setvbuf_reversed=yes
+ else
+@@ -19764,7 +20257,7 @@
+ fi
+ rm -f core core.* *.core
+ fi
+-echo "$as_me:19767: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:20260: 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
+ 
+@@ -19775,13 +20268,13 @@
+ fi
+ 
+ fi
+-echo "$as_me:19778: checking for intptr_t" >&5
++echo "$as_me:20271: 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 19784 "configure"
++#line 20277 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -19796,16 +20289,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19799: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20292: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19802: \$? = $ac_status" >&5
++  echo "$as_me:20295: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19805: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20298: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19808: \$? = $ac_status" >&5
++  echo "$as_me:20301: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_intptr_t=yes
+ else
+@@ -19815,7 +20308,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:19818: result: $ac_cv_type_intptr_t" >&5
++echo "$as_me:20311: 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
+   :
+@@ -19827,13 +20320,13 @@
+ 
+ fi
+ 
+-echo "$as_me:19830: checking for ssize_t" >&5
++echo "$as_me:20323: 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 19836 "configure"
++#line 20329 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -19848,16 +20341,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19851: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20344: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19854: \$? = $ac_status" >&5
++  echo "$as_me:20347: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19857: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20350: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19860: \$? = $ac_status" >&5
++  echo "$as_me:20353: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_ssize_t=yes
+ else
+@@ -19867,7 +20360,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:19870: result: $ac_cv_type_ssize_t" >&5
++echo "$as_me:20363: 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
+   :
+@@ -19879,14 +20372,14 @@
+ 
+ fi
+ 
+-echo "$as_me:19882: checking for type sigaction_t" >&5
++echo "$as_me:20375: 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 19889 "configure"
++#line 20382 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19899,16 +20392,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19902: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20395: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19905: \$? = $ac_status" >&5
++  echo "$as_me:20398: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19908: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20401: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19911: \$? = $ac_status" >&5
++  echo "$as_me:20404: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_type_sigaction=yes
+ else
+@@ -19919,14 +20412,14 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+-echo "$as_me:19922: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:20415: 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:19929: checking declaration of size-change" >&5
++echo "$as_me:20422: 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
+@@ -19947,7 +20440,7 @@
+ 
+ 	fi
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 19950 "configure"
++#line 20443 "configure"
+ #include "confdefs.h"
+ #include 
+ #ifdef HAVE_TERMIOS_H
+@@ -19993,16 +20486,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19996: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20489: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19999: \$? = $ac_status" >&5
++  echo "$as_me:20492: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20002: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20495: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20005: \$? = $ac_status" >&5
++  echo "$as_me:20498: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_sizechange=yes
+ else
+@@ -20021,7 +20514,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20024: result: $cf_cv_sizechange" >&5
++echo "$as_me:20517: result: $cf_cv_sizechange" >&5
+ echo "${ECHO_T}$cf_cv_sizechange" >&6
+ if test "$cf_cv_sizechange" != no ; then
+ 
+@@ -20039,13 +20532,13 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:20042: checking for memmove" >&5
++echo "$as_me:20535: 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 20048 "configure"
++#line 20541 "configure"
+ #include "confdefs.h"
+ #define memmove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20076,16 +20569,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20079: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20572: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20082: \$? = $ac_status" >&5
++  echo "$as_me:20575: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20085: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20578: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20088: \$? = $ac_status" >&5
++  echo "$as_me:20581: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_memmove=yes
+ else
+@@ -20095,19 +20588,19 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:20098: result: $ac_cv_func_memmove" >&5
++echo "$as_me:20591: 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:20104: checking for bcopy" >&5
++echo "$as_me:20597: 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 20110 "configure"
++#line 20603 "configure"
+ #include "confdefs.h"
+ #define bcopy autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20138,16 +20631,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20141: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20634: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20144: \$? = $ac_status" >&5
++  echo "$as_me:20637: \$? = $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:20640: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20150: \$? = $ac_status" >&5
++  echo "$as_me:20643: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_bcopy=yes
+ else
+@@ -20157,11 +20650,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:20160: result: $ac_cv_func_bcopy" >&5
++echo "$as_me:20653: 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:20164: checking if bcopy does overlapping moves" >&5
++	echo "$as_me:20657: 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
+@@ -20171,7 +20664,7 @@
+   cf_cv_good_bcopy=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 20174 "configure"
++#line 20667 "configure"
+ #include "confdefs.h"
+ 
+ int main(void) {
+@@ -20185,15 +20678,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:20188: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20681: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20191: \$? = $ac_status" >&5
++  echo "$as_me:20684: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:20193: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20686: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20196: \$? = $ac_status" >&5
++  echo "$as_me:20689: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_good_bcopy=yes
+ else
+@@ -20206,7 +20699,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:20209: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:20702: result: $cf_cv_good_bcopy" >&5
+ echo "${ECHO_T}$cf_cv_good_bcopy" >&6
+ 
+ else
+@@ -20233,13 +20726,13 @@
+ for ac_func in posix_openpt
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:20236: checking for $ac_func" >&5
++echo "$as_me:20729: 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 20242 "configure"
++#line 20735 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20270,16 +20763,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20273: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20766: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20276: \$? = $ac_status" >&5
++  echo "$as_me:20769: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20279: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20772: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20282: \$? = $ac_status" >&5
++  echo "$as_me:20775: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -20289,7 +20782,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:20292: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:20785: 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:20795: 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
+@@ -20309,7 +20802,7 @@
+   cf_cv_working_poll=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 20312 "configure"
++#line 20805 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20361,15 +20854,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:20364: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20857: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20367: \$? = $ac_status" >&5
++  echo "$as_me:20860: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:20369: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20862: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20372: \$? = $ac_status" >&5
++  echo "$as_me:20865: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_working_poll=yes
+ else
+@@ -20381,21 +20874,21 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:20384: result: $cf_cv_working_poll" >&5
++echo "$as_me:20877: 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:20391: checking for va_copy" >&5
++echo "$as_me:20884: 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 20398 "configure"
++#line 20891 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20412,16 +20905,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20415: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20908: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20418: \$? = $ac_status" >&5
++  echo "$as_me:20911: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20421: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20914: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20424: \$? = $ac_status" >&5
++  echo "$as_me:20917: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_va_copy=yes
+ else
+@@ -20431,7 +20924,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:20434: result: $cf_cv_have_va_copy" >&5
++echo "$as_me:20927: result: $cf_cv_have_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have_va_copy" >&6
+ 
+ if test "$cf_cv_have_va_copy" = yes;
+@@ -20443,14 +20936,14 @@
+ 
+ else # !cf_cv_have_va_copy
+ 
+-echo "$as_me:20446: checking for __va_copy" >&5
++echo "$as_me:20939: 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 20453 "configure"
++#line 20946 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20467,16 +20960,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20470: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20963: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20473: \$? = $ac_status" >&5
++  echo "$as_me:20966: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20476: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20969: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20479: \$? = $ac_status" >&5
++  echo "$as_me:20972: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have___va_copy=yes
+ else
+@@ -20486,7 +20979,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:20489: result: $cf_cv_have___va_copy" >&5
++echo "$as_me:20982: result: $cf_cv_have___va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___va_copy" >&6
+ 
+ if test "$cf_cv_have___va_copy" = yes
+@@ -20498,14 +20991,14 @@
+ 
+ else # !cf_cv_have___va_copy
+ 
+-echo "$as_me:20501: checking for __builtin_va_copy" >&5
++echo "$as_me:20994: checking for __builtin_va_copy" >&5
+ echo $ECHO_N "checking for __builtin_va_copy... $ECHO_C" >&6
+ if test "${cf_cv_have___builtin_va_copy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 20508 "configure"
++#line 21001 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20522,16 +21015,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20525: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21018: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20528: \$? = $ac_status" >&5
++  echo "$as_me:21021: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20531: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21024: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20534: \$? = $ac_status" >&5
++  echo "$as_me:21027: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have___builtin_va_copy=yes
+ else
+@@ -20541,7 +21034,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:20544: result: $cf_cv_have___builtin_va_copy" >&5
++echo "$as_me:21037: result: $cf_cv_have___builtin_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___builtin_va_copy" >&6
+ 
+ test "$cf_cv_have___builtin_va_copy" = yes &&
+@@ -20559,14 +21052,14 @@
+ 	;;
+ 
+ (*)
+-	echo "$as_me:20562: checking if we can simply copy va_list" >&5
++	echo "$as_me:21055: checking if we can simply copy va_list" >&5
+ echo $ECHO_N "checking if we can simply copy va_list... $ECHO_C" >&6
+ if test "${cf_cv_pointer_va_list+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 20569 "configure"
++#line 21062 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20583,16 +21076,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20586: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21079: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20589: \$? = $ac_status" >&5
++  echo "$as_me:21082: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20592: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21085: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20595: \$? = $ac_status" >&5
++  echo "$as_me:21088: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_pointer_va_list=yes
+ else
+@@ -20602,19 +21095,19 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:20605: result: $cf_cv_pointer_va_list" >&5
++echo "$as_me:21098: result: $cf_cv_pointer_va_list" >&5
+ echo "${ECHO_T}$cf_cv_pointer_va_list" >&6
+ 
+ 	if test "$cf_cv_pointer_va_list" = no
+ 	then
+-		echo "$as_me:20610: checking if we can copy va_list indirectly" >&5
++		echo "$as_me:21103: checking if we can copy va_list indirectly" >&5
+ echo $ECHO_N "checking if we can copy va_list indirectly... $ECHO_C" >&6
+ if test "${cf_cv_array_va_list+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 20617 "configure"
++#line 21110 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20631,16 +21124,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20634: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21127: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20637: \$? = $ac_status" >&5
++  echo "$as_me:21130: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20640: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21133: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20643: \$? = $ac_status" >&5
++  echo "$as_me:21136: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_array_va_list=yes
+ else
+@@ -20650,7 +21143,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:20653: result: $cf_cv_array_va_list" >&5
++echo "$as_me:21146: result: $cf_cv_array_va_list" >&5
+ echo "${ECHO_T}$cf_cv_array_va_list" >&6
+ 		test "$cf_cv_array_va_list" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -20661,13 +21154,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:20664: checking for pid_t" >&5
++echo "$as_me:21157: 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 20670 "configure"
++#line 21163 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -20682,16 +21175,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20685: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21178: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20688: \$? = $ac_status" >&5
++  echo "$as_me:21181: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20691: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21184: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20694: \$? = $ac_status" >&5
++  echo "$as_me:21187: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_pid_t=yes
+ else
+@@ -20701,7 +21194,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:20704: result: $ac_cv_type_pid_t" >&5
++echo "$as_me:21197: 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
+   :
+@@ -20716,23 +21209,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:20719: checking for $ac_header" >&5
++echo "$as_me:21212: 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 20725 "configure"
++#line 21218 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20729: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:21222: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:20735: \$? = $ac_status" >&5
++  echo "$as_me:21228: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20751,7 +21244,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:20754: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:21247: 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:21260: 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 20773 "configure"
++#line 21266 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20801,16 +21294,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20804: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21297: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20807: \$? = $ac_status" >&5
++  echo "$as_me:21300: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20810: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21303: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20813: \$? = $ac_status" >&5
++  echo "$as_me:21306: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -20820,7 +21313,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:20823: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:21316: 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:21328: 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
+@@ -20855,15 +21348,15 @@
+       }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:20858: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21351: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20861: \$? = $ac_status" >&5
++  echo "$as_me:21354: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:20863: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21356: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20866: \$? = $ac_status" >&5
++  echo "$as_me:21359: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_fork_works=yes
+ else
+@@ -20875,7 +21368,7 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:20878: result: $ac_cv_func_fork_works" >&5
++echo "$as_me:21371: result: $ac_cv_func_fork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+ 
+ fi
+@@ -20889,12 +21382,12 @@
+       ac_cv_func_fork_works=yes
+       ;;
+   esac
+-  { echo "$as_me:20892: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:21385: 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:20897: checking for working vfork" >&5
++  echo "$as_me:21390: 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
+@@ -20903,7 +21396,7 @@
+   ac_cv_func_vfork_works=cross
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 20906 "configure"
++#line 21399 "configure"
+ #include "confdefs.h"
+ /* Thanks to Paul Eggert for this test.  */
+ #include 
+@@ -21000,15 +21493,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:21003: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21496: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21006: \$? = $ac_status" >&5
++  echo "$as_me:21499: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:21008: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21501: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21011: \$? = $ac_status" >&5
++  echo "$as_me:21504: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_vfork_works=yes
+ else
+@@ -21020,13 +21513,13 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:21023: result: $ac_cv_func_vfork_works" >&5
++echo "$as_me:21516: 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:21029: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:21522: 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
+ 
+@@ -21051,7 +21544,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21054: checking if fopen accepts explicit binary mode" >&5
++echo "$as_me:21547: checking if fopen accepts explicit binary mode" >&5
+ echo $ECHO_N "checking if fopen accepts explicit binary mode... $ECHO_C" >&6
+ if test "${cf_cv_fopen_bin_r+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21061,7 +21554,7 @@
+   cf_cv_fopen_bin_r=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 21064 "configure"
++#line 21557 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21079,9 +21572,8 @@
+ 			for (p = 0; p < 256; ++p) {
+ 				q = fgetc(fp);
+ 				if (q != p) {
+-					fprintf(stderr, "OOPS:%d ->%d\n", p, q);
+-					//rc = 1;
+-					//break;
++					rc = 1;
++					break;
+ 				}
+ 			}
+ 		} else {
+@@ -21095,15 +21587,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:21098: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21590: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21101: \$? = $ac_status" >&5
++  echo "$as_me:21593: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:21103: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21595: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21106: \$? = $ac_status" >&5
++  echo "$as_me:21598: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_fopen_bin_r=yes
+ else
+@@ -21116,7 +21608,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:21119: result: $cf_cv_fopen_bin_r" >&5
++echo "$as_me:21611: result: $cf_cv_fopen_bin_r" >&5
+ echo "${ECHO_T}$cf_cv_fopen_bin_r" >&6
+ test "x$cf_cv_fopen_bin_r" != xno && cat >>confdefs.h <<\EOF
+ #define USE_FOPEN_BIN_R 1
+@@ -21124,7 +21616,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:21127: checking for openpty in -lutil" >&5
++echo "$as_me:21619: 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
+@@ -21132,7 +21624,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 21135 "configure"
++#line 21627 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21151,16 +21643,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21154: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21646: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21157: \$? = $ac_status" >&5
++  echo "$as_me:21649: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:21160: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21652: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21163: \$? = $ac_status" >&5
++  echo "$as_me:21655: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -21171,7 +21663,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21174: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:21666: 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
+@@ -21179,7 +21671,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:21182: checking for openpty header" >&5
++echo "$as_me:21674: 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
+@@ -21206,7 +21698,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 21209 "configure"
++#line 21701 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -21223,16 +21715,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21226: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21718: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21229: \$? = $ac_status" >&5
++  echo "$as_me:21721: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:21232: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21724: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21235: \$? = $ac_status" >&5
++  echo "$as_me:21727: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -21250,7 +21742,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:21253: result: $cf_cv_func_openpty" >&5
++echo "$as_me:21745: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -21323,7 +21815,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 21326 "configure"
++#line 21818 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -21335,16 +21827,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:21338: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21830: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21341: \$? = $ac_status" >&5
++  echo "$as_me:21833: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:21344: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21836: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21347: \$? = $ac_status" >&5
++  echo "$as_me:21839: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -21361,7 +21853,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}:21364: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:21856: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -21397,7 +21889,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}:21400: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:21892: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -21408,7 +21900,7 @@
+ 	else
+ 		case "$with_hashed_db" in
+ 		(./*|../*|/*)
+-			{ echo "$as_me:21411: WARNING: no such directory $with_hashed_db" >&5
++			{ echo "$as_me:21903: WARNING: no such directory $with_hashed_db" >&5
+ echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
+ 			;;
+ 		(*)
+@@ -21480,7 +21972,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 21483 "configure"
++#line 21975 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -21492,16 +21984,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:21495: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21987: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21498: \$? = $ac_status" >&5
++  echo "$as_me:21990: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:21501: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21993: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21504: \$? = $ac_status" >&5
++  echo "$as_me:21996: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -21518,7 +22010,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}:21521: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:22013: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -21598,7 +22090,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}:21601: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:22093: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -21615,23 +22107,23 @@
+ 	fi
+ esac
+ 
+-echo "$as_me:21618: checking for db.h" >&5
++echo "$as_me:22110: 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 21624 "configure"
++#line 22116 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:21628: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:22120: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:21634: \$? = $ac_status" >&5
++  echo "$as_me:22126: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -21650,11 +22142,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:21653: result: $ac_cv_header_db_h" >&5
++echo "$as_me:22145: 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:21657: checking for version of db" >&5
++echo "$as_me:22149: 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
+@@ -21665,10 +22157,10 @@
+ for cf_db_version in 1 2 3 4 5 6
+ do
+ 
+-echo "${as_me:-configure}:21668: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me:-configure}:22160: testing checking for db version $cf_db_version ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 21671 "configure"
++#line 22163 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21698,16 +22190,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:21701: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22193: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21704: \$? = $ac_status" >&5
++  echo "$as_me:22196: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:21707: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22199: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21710: \$? = $ac_status" >&5
++  echo "$as_me:22202: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_hashed_db_version=$cf_db_version
+@@ -21721,16 +22213,16 @@
+ done
+ 
+ fi
+-echo "$as_me:21724: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:22216: 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:21728: error: Cannot determine version of db" >&5
++	{ { echo "$as_me:22220: 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:21733: checking for db libraries" >&5
++echo "$as_me:22225: 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
+@@ -21760,10 +22252,10 @@
+ 
+ 	fi
+ 
+-echo "${as_me:-configure}:21763: testing checking for library "$cf_db_libs" ..." 1>&5
++echo "${as_me:-configure}:22255: testing checking for library "$cf_db_libs" ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 21766 "configure"
++#line 22258 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21818,16 +22310,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21821: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22313: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21824: \$? = $ac_status" >&5
++  echo "$as_me:22316: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:21827: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22319: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21830: \$? = $ac_status" >&5
++  echo "$as_me:22322: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	if test -n "$cf_db_libs" ; then
+@@ -21847,11 +22339,11 @@
+ done
+ 
+ fi
+-echo "$as_me:21850: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:22342: 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:21854: error: Cannot determine library for db" >&5
++		{ { echo "$as_me:22346: 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
+@@ -21877,7 +22369,7 @@
+ 
+ else
+ 
+-	{ { echo "$as_me:21880: error: Cannot find db.h" >&5
++	{ { echo "$as_me:22372: error: Cannot find db.h" >&5
+ echo "$as_me: error: Cannot find db.h" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -21892,7 +22384,7 @@
+ 
+ # Just in case, check if the C compiler has a bool type.
+ 
+-echo "$as_me:21895: checking if we should include stdbool.h" >&5
++echo "$as_me:22387: 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
+@@ -21900,7 +22392,7 @@
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 21903 "configure"
++#line 22395 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21912,23 +22404,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:21915: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22407: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21918: \$? = $ac_status" >&5
++  echo "$as_me:22410: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:21921: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22413: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21924: \$? = $ac_status" >&5
++  echo "$as_me:22416: \$? = $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 21931 "configure"
++#line 22423 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -21944,16 +22436,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:21947: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22439: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21950: \$? = $ac_status" >&5
++  echo "$as_me:22442: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:21953: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22445: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21956: \$? = $ac_status" >&5
++  echo "$as_me:22448: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -21967,13 +22459,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:21970: result: yes" >&5
++then	echo "$as_me:22462: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:21972: result: no" >&5
++else	echo "$as_me:22464: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:21976: checking for builtin bool type" >&5
++echo "$as_me:22468: 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
+@@ -21981,7 +22473,7 @@
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 21984 "configure"
++#line 22476 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21996,16 +22488,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:21999: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22491: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22002: \$? = $ac_status" >&5
++  echo "$as_me:22494: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:22005: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22497: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22008: \$? = $ac_status" >&5
++  echo "$as_me:22500: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cc_bool_type=1
+ else
+@@ -22018,9 +22510,9 @@
+ fi
+ 
+ if test "$cf_cv_cc_bool_type" = 1
+-then	echo "$as_me:22021: result: yes" >&5
++then	echo "$as_me:22513: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:22023: result: no" >&5
++else	echo "$as_me:22515: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -22037,10 +22529,10 @@
+ 
+ 	cf_save="$LIBS"
+ 	LIBS="$LIBS $CXXLIBS"
+-	echo "$as_me:22040: checking if we already have C++ library" >&5
++	echo "$as_me:22532: 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 22043 "configure"
++#line 22535 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -22054,16 +22546,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:22057: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22549: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22060: \$? = $ac_status" >&5
++  echo "$as_me:22552: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:22063: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22555: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22066: \$? = $ac_status" >&5
++  echo "$as_me:22558: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_have_libstdcpp=yes
+ else
+@@ -22072,7 +22564,7 @@
+ cf_have_libstdcpp=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-	echo "$as_me:22075: result: $cf_have_libstdcpp" >&5
++	echo "$as_me:22567: result: $cf_have_libstdcpp" >&5
+ echo "${ECHO_T}$cf_have_libstdcpp" >&6
+ 	LIBS="$cf_save"
+ 
+@@ -22091,7 +22583,7 @@
+ 			;;
+ 		esac
+ 
+-		echo "$as_me:22094: checking for library $cf_stdcpp_libname" >&5
++		echo "$as_me:22586: 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
+@@ -22117,7 +22609,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 22120 "configure"
++#line 22612 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -22131,16 +22623,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:22134: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22626: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22137: \$? = $ac_status" >&5
++  echo "$as_me:22629: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:22140: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22632: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22143: \$? = $ac_status" >&5
++  echo "$as_me:22635: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_libstdcpp=yes
+ else
+@@ -22152,7 +22644,7 @@
+ 			LIBS="$cf_save"
+ 
+ fi
+-echo "$as_me:22155: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:22647: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ 		test "$cf_cv_libstdcpp" = yes && {
+ cf_add_libs="-l$cf_stdcpp_libname"
+@@ -22174,7 +22666,7 @@
+ 	fi
+ fi
+ 
+-	echo "$as_me:22177: checking whether $CXX understands -c and -o together" >&5
++	echo "$as_me:22669: 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
+@@ -22189,15 +22681,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:22192: \"$ac_try\"") >&5
++if { (eval echo "$as_me:22684: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22195: \$? = $ac_status" >&5
++  echo "$as_me:22687: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:22197: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:22689: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22200: \$? = $ac_status" >&5
++  echo "$as_me:22692: \$? = $ac_status" >&5
+   (exit $ac_status); };
+ then
+   eval cf_cv_prog_CXX_c_o=yes
+@@ -22208,10 +22700,10 @@
+ 
+ fi
+ if test $cf_cv_prog_CXX_c_o = yes; then
+-  echo "$as_me:22211: result: yes" >&5
++  echo "$as_me:22703: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:22214: result: no" >&5
++  echo "$as_me:22706: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -22231,7 +22723,7 @@
+ 	;;
+ esac
+ if test "$GXX" = yes; then
+-	echo "$as_me:22234: checking for lib$cf_gpp_libname" >&5
++	echo "$as_me:22726: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ 	cf_save="$LIBS"
+ 
+@@ -22252,7 +22744,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 22255 "configure"
++#line 22747 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_gpp_libname/builtin.h>
+@@ -22266,16 +22758,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:22269: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22761: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22272: \$? = $ac_status" >&5
++  echo "$as_me:22764: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:22275: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22767: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22278: \$? = $ac_status" >&5
++  echo "$as_me:22770: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -22312,7 +22804,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 22315 "configure"
++#line 22807 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22326,16 +22818,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:22329: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22821: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22332: \$? = $ac_status" >&5
++  echo "$as_me:22824: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:22335: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22827: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22338: \$? = $ac_status" >&5
++  echo "$as_me:22830: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -22368,7 +22860,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 	LIBS="$cf_save"
+-	echo "$as_me:22371: result: $cf_cxx_library" >&5
++	echo "$as_me:22863: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+ 
+@@ -22384,7 +22876,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:22387: checking how to run the C++ preprocessor" >&5
++echo "$as_me:22879: 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
+@@ -22401,18 +22893,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 22404 "configure"
++#line 22896 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:22409: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:22901: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:22415: \$? = $ac_status" >&5
++  echo "$as_me:22907: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -22435,17 +22927,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 22438 "configure"
++#line 22930 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:22442: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:22934: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:22448: \$? = $ac_status" >&5
++  echo "$as_me:22940: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -22482,7 +22974,7 @@
+ else
+   ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:22485: result: $CXXCPP" >&5
++echo "$as_me:22977: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -22492,18 +22984,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 22495 "configure"
++#line 22987 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:22500: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:22992: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:22506: \$? = $ac_status" >&5
++  echo "$as_me:22998: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -22526,17 +23018,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 22529 "configure"
++#line 23021 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:22533: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:23025: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:22539: \$? = $ac_status" >&5
++  echo "$as_me:23031: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -22564,7 +23056,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:22567: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++  { { echo "$as_me:23059: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -22579,23 +23071,23 @@
+ for ac_header in typeinfo
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:22582: checking for $ac_header" >&5
++echo "$as_me:23074: 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 22588 "configure"
++#line 23080 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:22592: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:23084: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:22598: \$? = $ac_status" >&5
++  echo "$as_me:23090: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -22614,7 +23106,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:22617: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:23109: 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:23122: 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 22636 "configure"
++#line 23128 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:22640: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:23132: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:22646: \$? = $ac_status" >&5
++  echo "$as_me:23138: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -22662,7 +23154,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:22665: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:23157: 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:23168: 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 22679 "configure"
++#line 23171 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22693,16 +23185,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:22696: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23188: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22699: \$? = $ac_status" >&5
++  echo "$as_me:23191: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:22702: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23194: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22705: \$? = $ac_status" >&5
++  echo "$as_me:23197: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_iostream_namespace=yes
+ else
+@@ -22711,7 +23203,7 @@
+ cf_iostream_namespace=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-	echo "$as_me:22714: result: $cf_iostream_namespace" >&5
++	echo "$as_me:23206: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+ 	if test "$cf_iostream_namespace" = yes ; then
+ 
+@@ -22722,7 +23214,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:22725: checking if we should include stdbool.h" >&5
++echo "$as_me:23217: 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
+@@ -22730,7 +23222,7 @@
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 22733 "configure"
++#line 23225 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -22742,23 +23234,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:22745: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23237: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22748: \$? = $ac_status" >&5
++  echo "$as_me:23240: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:22751: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23243: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22754: \$? = $ac_status" >&5
++  echo "$as_me:23246: \$? = $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 22761 "configure"
++#line 23253 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -22774,16 +23266,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:22777: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23269: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22780: \$? = $ac_status" >&5
++  echo "$as_me:23272: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:22783: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23275: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22786: \$? = $ac_status" >&5
++  echo "$as_me:23278: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -22797,13 +23289,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:22800: result: yes" >&5
++then	echo "$as_me:23292: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:22802: result: no" >&5
++else	echo "$as_me:23294: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:22806: checking for builtin bool type" >&5
++echo "$as_me:23298: 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
+@@ -22811,7 +23303,7 @@
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 22814 "configure"
++#line 23306 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22826,16 +23318,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:22829: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23321: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22832: \$? = $ac_status" >&5
++  echo "$as_me:23324: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:22835: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23327: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22838: \$? = $ac_status" >&5
++  echo "$as_me:23330: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_builtin_bool=1
+ else
+@@ -22848,13 +23340,13 @@
+ fi
+ 
+ if test "$cf_cv_builtin_bool" = 1
+-then	echo "$as_me:22851: result: yes" >&5
++then	echo "$as_me:23343: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:22853: result: no" >&5
++else	echo "$as_me:23345: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:22857: checking for size of bool" >&5
++echo "$as_me:23349: 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
+@@ -22865,7 +23357,7 @@
+   cf_cv_type_of_bool=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 22868 "configure"
++#line 23360 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22907,15 +23399,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:22910: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23402: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22913: \$? = $ac_status" >&5
++  echo "$as_me:23405: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:22915: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23407: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22918: \$? = $ac_status" >&5
++  echo "$as_me:23410: \$? = $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
+@@ -22933,18 +23425,18 @@
+ fi
+ 
+ 	rm -f cf_test.out
+-echo "$as_me:22936: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:23428: 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:22942: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:23434: 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:22947: checking for special defines needed for etip.h" >&5
++echo "$as_me:23439: 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"
+@@ -22962,7 +23454,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 22965 "configure"
++#line 23457 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22976,16 +23468,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:22979: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23471: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22982: \$? = $ac_status" >&5
++  echo "$as_me:23474: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:22985: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23477: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22988: \$? = $ac_status" >&5
++  echo "$as_me:23480: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	test -n "$cf_math" && cat >>confdefs.h <&5
++echo "$as_me:23501: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ CXXFLAGS="$cf_save_CXXFLAGS"
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:23014: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:23506: 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
+@@ -23028,7 +23520,7 @@
+   cf_cv_cpp_param_init=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 23031 "configure"
++#line 23523 "configure"
+ #include "confdefs.h"
+ 
+ class TEST {
+@@ -23047,15 +23539,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:23050: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23542: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23053: \$? = $ac_status" >&5
++  echo "$as_me:23545: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:23055: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23547: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23058: \$? = $ac_status" >&5
++  echo "$as_me:23550: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cpp_param_init=yes
+ else
+@@ -23074,7 +23566,7 @@
+ ac_main_return=return
+ 
+ fi
+-echo "$as_me:23077: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:23569: result: $cf_cv_cpp_param_init" >&5
+ echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
+ fi
+ test "$cf_cv_cpp_param_init" = yes &&
+@@ -23084,7 +23576,7 @@
+ 
+ if test -n "$CXX"; then
+ 
+-echo "$as_me:23087: checking if $CXX accepts static_cast" >&5
++echo "$as_me:23579: 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
+@@ -23098,7 +23590,7 @@
+ ac_main_return=return
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 23101 "configure"
++#line 23593 "configure"
+ #include "confdefs.h"
+ 
+ class NCursesPanel
+@@ -23142,16 +23634,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:23145: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23637: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23148: \$? = $ac_status" >&5
++  echo "$as_me:23640: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:23151: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23643: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23154: \$? = $ac_status" >&5
++  echo "$as_me:23646: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cpp_static_cast=yes
+ else
+@@ -23169,7 +23661,7 @@
+ ac_main_return=return
+ 
+ fi
+-echo "$as_me:23172: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:23664: result: $cf_cv_cpp_static_cast" >&5
+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
+ 
+ fi
+@@ -23218,7 +23710,7 @@
+ 	else
+ 		if test "$cf_cv_header_stdbool_h" = 1 ; then
+ 
+-echo "$as_me:23221: checking for size of bool" >&5
++echo "$as_me:23713: 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
+@@ -23229,7 +23721,7 @@
+   cf_cv_type_of_bool=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 23232 "configure"
++#line 23724 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23271,15 +23763,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:23274: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23766: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23277: \$? = $ac_status" >&5
++  echo "$as_me:23769: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:23279: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23771: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23282: \$? = $ac_status" >&5
++  echo "$as_me:23774: \$? = $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
+@@ -23297,25 +23789,25 @@
+ fi
+ 
+ 	rm -f cf_test.out
+-echo "$as_me:23300: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:23792: 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:23306: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:23798: 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:23312: checking for fallback type of bool" >&5
++			echo "$as_me:23804: 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:23318: result: $cf_cv_type_of_bool" >&5
++			echo "$as_me:23810: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ 		fi
+ 	fi
+@@ -23344,7 +23836,7 @@
+ 
+ 	if test "$cf_with_ada" != "no" ; then
+ 		if test "$with_libtool" != "no"; then
+-			{ echo "$as_me:23347: WARNING: libtool does not support Ada - disabling feature" >&5
++			{ echo "$as_me:23839: 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
+@@ -23356,7 +23848,7 @@
+ cf_ada_config="#"
+ # 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:23359: checking for $ac_word" >&5
++echo "$as_me:23851: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_gnatmake_exists+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -23371,7 +23863,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_gnatmake_exists="yes"
+-echo "$as_me:23374: found $ac_dir/$ac_word" >&5
++echo "$as_me:23866: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -23380,10 +23872,10 @@
+ fi
+ gnatmake_exists=$ac_cv_prog_gnatmake_exists
+ if test -n "$gnatmake_exists"; then
+-  echo "$as_me:23383: result: $gnatmake_exists" >&5
++  echo "$as_me:23875: result: $gnatmake_exists" >&5
+ echo "${ECHO_T}$gnatmake_exists" >&6
+ else
+-  echo "$as_me:23386: result: no" >&5
++  echo "$as_me:23878: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -23393,7 +23885,7 @@
+ else
+ 	# Extract the first word of "gprconfig", so it can be a program name with args.
+ set dummy gprconfig; ac_word=$2
+-echo "$as_me:23396: checking for $ac_word" >&5
++echo "$as_me:23888: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_gprconfig_exists+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -23408,7 +23900,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_gprconfig_exists="yes"
+-echo "$as_me:23411: found $ac_dir/$ac_word" >&5
++echo "$as_me:23903: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -23417,10 +23909,10 @@
+ fi
+ gprconfig_exists=$ac_cv_prog_gprconfig_exists
+ if test -n "$gprconfig_exists"; then
+-  echo "$as_me:23420: result: $gprconfig_exists" >&5
++  echo "$as_me:23912: result: $gprconfig_exists" >&5
+ echo "${ECHO_T}$gprconfig_exists" >&6
+ else
+-  echo "$as_me:23423: result: no" >&5
++  echo "$as_me:23915: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -23433,7 +23925,7 @@
+ 			cd conftest.src
+ 			for cf_gprconfig in Ada C
+ 			do
+-				echo "$as_me:23436: checking for gprconfig name for $cf_gprconfig" >&5
++				echo "$as_me:23928: checking for gprconfig name for $cf_gprconfig" >&5
+ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
+ 				if test $cf_gprconfig = C
+ 				then
+@@ -23452,10 +23944,10 @@
+ 				if test -n "$cf_gprconfig_value"
+ 				then
+ 					eval cf_ada_config_$cf_gprconfig=$cf_gprconfig_value
+-					echo "$as_me:23455: result: $cf_gprconfig_value" >&5
++					echo "$as_me:23947: result: $cf_gprconfig_value" >&5
+ echo "${ECHO_T}$cf_gprconfig_value" >&6
+ 				else
+-					echo "$as_me:23458: result: missing" >&5
++					echo "$as_me:23950: result: missing" >&5
+ echo "${ECHO_T}missing" >&6
+ 					cf_ada_config="#"
+ 					break
+@@ -23471,12 +23963,12 @@
+ 	if test "x$cf_ada_config" != "x#"
+ 	then
+ 
+-echo "$as_me:23474: checking for gnat version" >&5
++echo "$as_me:23966: 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:23479: result: $cf_gnat_version" >&5
++echo "$as_me:23971: result: $cf_gnat_version" >&5
+ echo "${ECHO_T}$cf_gnat_version" >&6
+ 
+ case $cf_gnat_version in
+@@ -23484,7 +23976,7 @@
+ 	cf_cv_prog_gnat_correct=yes
+ 	;;
+ (*)
+-	{ echo "$as_me:23487: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
++	{ echo "$as_me:23979: 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
+ 	;;
+@@ -23492,7 +23984,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:23495: checking for $ac_word" >&5
++echo "$as_me:23987: 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
+@@ -23507,7 +23999,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_M4_exists="yes"
+-echo "$as_me:23510: found $ac_dir/$ac_word" >&5
++echo "$as_me:24002: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -23516,10 +24008,10 @@
+ fi
+ M4_exists=$ac_cv_prog_M4_exists
+ if test -n "$M4_exists"; then
+-  echo "$as_me:23519: result: $M4_exists" >&5
++  echo "$as_me:24011: result: $M4_exists" >&5
+ echo "${ECHO_T}$M4_exists" >&6
+ else
+-  echo "$as_me:23522: result: no" >&5
++  echo "$as_me:24014: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -23528,7 +24020,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:23531: checking if GNAT works" >&5
++			echo "$as_me:24023: checking if GNAT works" >&5
+ echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+ 
+ rm -rf conftest* *~conftest*
+@@ -23556,7 +24048,7 @@
+ fi
+ rm -rf conftest* *~conftest*
+ 
+-			echo "$as_me:23559: result: $cf_cv_prog_gnat_correct" >&5
++			echo "$as_me:24051: result: $cf_cv_prog_gnat_correct" >&5
+ echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
+ 		fi
+ 	else
+@@ -23568,7 +24060,7 @@
+ 
+  	ADAFLAGS="$ADAFLAGS -gnatpn"
+ 
+-	echo "$as_me:23571: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:24063: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -23585,10 +24077,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:23588: result: $ADAFLAGS" >&5
++	echo "$as_me:24080: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:23591: checking if GNATPREP supports -T option" >&5
++echo "$as_me:24083: 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
+@@ -23598,11 +24090,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:23601: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:24093: 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:23605: checking if GNAT supports generics" >&5
++echo "$as_me:24097: 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].*)
+@@ -23612,7 +24104,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:23615: result: $cf_gnat_generics" >&5
++echo "$as_me:24107: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -23624,7 +24116,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:23627: checking if GNAT supports SIGINT" >&5
++echo "$as_me:24119: 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
+@@ -23672,7 +24164,7 @@
+ rm -rf conftest* *~conftest*
+ 
+ fi
+-echo "$as_me:23675: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:24167: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test $cf_cv_gnat_sigint = yes ; then
+@@ -23685,7 +24177,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:23688: checking if GNAT supports project files" >&5
++echo "$as_me:24180: 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]*)
+@@ -23748,15 +24240,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:23751: result: $cf_gnat_projects" >&5
++echo "$as_me:24243: 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:23757: checking if GNAT supports libraries" >&5
++	echo "$as_me:24249: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:23759: result: $cf_gnat_libraries" >&5
++	echo "$as_me:24251: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -23776,7 +24268,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:23779: checking for ada-compiler" >&5
++echo "$as_me:24271: 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.
+@@ -23787,12 +24279,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:23790: result: $cf_ada_compiler" >&5
++echo "$as_me:24282: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 			cf_ada_package=terminal_interface
+ 
+-echo "$as_me:23795: checking for ada-include" >&5
++echo "$as_me:24287: 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.
+@@ -23828,7 +24320,7 @@
+ 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:23831: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:24323: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -23837,10 +24329,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:23840: result: $ADA_INCLUDE" >&5
++echo "$as_me:24332: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:23843: checking for ada-objects" >&5
++echo "$as_me:24335: 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.
+@@ -23876,7 +24368,7 @@
+ 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:23879: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:24371: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -23885,10 +24377,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:23888: result: $ADA_OBJECTS" >&5
++echo "$as_me:24380: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:23891: checking if an Ada95 shared-library should be built" >&5
++echo "$as_me:24383: 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.
+@@ -23898,14 +24390,14 @@
+ else
+   with_ada_sharedlib=no
+ fi;
+-echo "$as_me:23901: result: $with_ada_sharedlib" >&5
++echo "$as_me:24393: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ 
+ if test "x$with_ada_sharedlib" != xno
+ then
+ 	if test "x$cf_gnat_projects" != xyes
+ 	then
+-		{ echo "$as_me:23908: WARNING: disabling shared-library since GNAT projects are not supported" >&5
++		{ echo "$as_me:24400: WARNING: disabling shared-library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;}
+ 		with_ada_sharedlib=no
+ 	fi
+@@ -23931,13 +24423,13 @@
+ 
+ # do this "late" to avoid conflict with header-checks
+ if test "x$with_widec" = xyes ; then
+-	echo "$as_me:23934: checking for wchar_t" >&5
++	echo "$as_me:24426: 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 23940 "configure"
++#line 24432 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23952,16 +24444,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:23955: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24447: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23958: \$? = $ac_status" >&5
++  echo "$as_me:24450: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:23961: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24453: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23964: \$? = $ac_status" >&5
++  echo "$as_me:24456: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_wchar_t=yes
+ else
+@@ -23971,10 +24463,10 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:23974: result: $ac_cv_type_wchar_t" >&5
++echo "$as_me:24466: result: $ac_cv_type_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
+ 
+-echo "$as_me:23977: checking size of wchar_t" >&5
++echo "$as_me:24469: 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
+@@ -23983,7 +24475,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 23986 "configure"
++#line 24478 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23995,21 +24487,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:23998: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24490: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24001: \$? = $ac_status" >&5
++  echo "$as_me:24493: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:24004: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24496: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24007: \$? = $ac_status" >&5
++  echo "$as_me:24499: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 24012 "configure"
++#line 24504 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24021,16 +24513,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:24024: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24516: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24027: \$? = $ac_status" >&5
++  echo "$as_me:24519: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:24030: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24522: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24033: \$? = $ac_status" >&5
++  echo "$as_me:24525: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -24046,7 +24538,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 24049 "configure"
++#line 24541 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24058,16 +24550,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:24061: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24553: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24064: \$? = $ac_status" >&5
++  echo "$as_me:24556: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:24067: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24559: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24070: \$? = $ac_status" >&5
++  echo "$as_me:24562: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -24083,7 +24575,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 24086 "configure"
++#line 24578 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24095,16 +24587,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:24098: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24590: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24101: \$? = $ac_status" >&5
++  echo "$as_me:24593: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:24104: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24596: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24107: \$? = $ac_status" >&5
++  echo "$as_me:24599: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -24117,12 +24609,12 @@
+ ac_cv_sizeof_wchar_t=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:24120: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:24612: 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 24125 "configure"
++#line 24617 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24138,15 +24630,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:24141: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24633: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24144: \$? = $ac_status" >&5
++  echo "$as_me:24636: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:24146: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24638: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24149: \$? = $ac_status" >&5
++  echo "$as_me:24641: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_wchar_t=`cat conftest.val`
+ else
+@@ -24162,7 +24654,7 @@
+   ac_cv_sizeof_wchar_t=0
+ fi
+ fi
+-echo "$as_me:24165: result: $ac_cv_sizeof_wchar_t" >&5
++echo "$as_me:24657: result: $ac_cv_sizeof_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:24675: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+ 
+@@ -24222,7 +24714,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:24225: result: $LIB_SUBSETS" >&5
++echo "$as_me:24717: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+ 
+ ### Construct the list of include-directories to be generated
+@@ -24253,7 +24745,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:24256: checking default library suffix" >&5
++echo "$as_me:24748: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -24264,10 +24756,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:24267: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:24759: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:24270: checking default library-dependency suffix" >&5
++echo "$as_me:24762: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -24325,10 +24817,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:24328: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:24820: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:24331: checking default object directory" >&5
++echo "$as_me:24823: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -24344,11 +24836,11 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:24347: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:24839: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ if test "x$cf_with_cxx" = xyes ; then
+-echo "$as_me:24351: checking c++ library-dependency suffix" >&5
++echo "$as_me:24843: 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++)
+@@ -24416,7 +24908,7 @@
+ 	fi
+ 
+ fi
+-echo "$as_me:24419: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:24911: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+ 
+ fi
+@@ -24592,19 +25084,19 @@
+ 
+ if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
+ then
+-	echo "$as_me:24595: checking if linker supports switching between static/dynamic" >&5
++	echo "$as_me:25087: 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:24604: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:25096: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24607: \$? = $ac_status" >&5
++  echo "$as_me:25099: \$? = $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
+@@ -24615,10 +25107,10 @@
+ 
+ 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 24618 "configure"
++#line 25110 "configure"
+ #include "confdefs.h"
+ 
+-#line 24621 "configure"
++#line 25113 "configure"
+ #include 
+ int cf_ldflags_static(FILE *fp);
+ 
+@@ -24633,16 +25125,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:24636: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25128: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24639: \$? = $ac_status" >&5
++  echo "$as_me:25131: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:24642: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25134: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24645: \$? = $ac_status" >&5
++  echo "$as_me:25137: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	# some linkers simply ignore the -dynamic
+@@ -24665,7 +25157,7 @@
+ 	rm -f libconftest.*
+ 	LIBS="$cf_save_LIBS"
+ 
+-	echo "$as_me:24668: result: $cf_ldflags_static" >&5
++	echo "$as_me:25160: result: $cf_ldflags_static" >&5
+ echo "${ECHO_T}$cf_ldflags_static" >&6
+ 
+ 	if test $cf_ldflags_static != yes
+@@ -24681,7 +25173,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:24684: checking where we will install curses.h" >&5
++echo "$as_me:25176: checking where we will install curses.h" >&5
+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
+ 
+ includesubdir=
+@@ -24691,7 +25183,7 @@
+ then
+ 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
+ fi
+-echo "$as_me:24694: result: ${includedir}${includesubdir}" >&5
++echo "$as_me:25186: result: ${includedir}${includesubdir}" >&5
+ echo "${ECHO_T}${includedir}${includesubdir}" >&6
+ 
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -24699,7 +25191,7 @@
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+-	{ echo "$as_me:24702: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++	{ echo "$as_me:25194: 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
+@@ -24717,7 +25209,7 @@
+ ### Construct the list of subdirectories for which we'll customize makefiles
+ ### with the appropriate compile-rules.
+ 
+-echo "$as_me:24720: checking for src modules" >&5
++echo "$as_me:25212: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+ 
+ # dependencies and linker-arguments for test-programs
+@@ -24782,7 +25274,7 @@
+ 		fi
+ 	fi
+ done
+-echo "$as_me:24785: result: $cf_cv_src_modules" >&5
++echo "$as_me:25277: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+ 
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+@@ -25019,7 +25511,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:25022: checking for $ac_word" >&5
++echo "$as_me:25514: 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
+@@ -25036,7 +25528,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:25039: found $ac_dir/$ac_word" >&5
++   echo "$as_me:25531: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -25048,10 +25540,10 @@
+ TIC_PATH=$ac_cv_path_TIC_PATH
+ 
+ if test -n "$TIC_PATH"; then
+-  echo "$as_me:25051: result: $TIC_PATH" >&5
++  echo "$as_me:25543: result: $TIC_PATH" >&5
+ echo "${ECHO_T}$TIC_PATH" >&6
+ else
+-  echo "$as_me:25054: result: no" >&5
++  echo "$as_me:25546: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -25059,7 +25551,7 @@
+ then
+ 	if test "$TIC_PATH" = unknown
+ 	then
+-		{ echo "$as_me:25062: WARNING: no tic program found for fallbacks" >&5
++		{ echo "$as_me:25554: WARNING: no tic program found for fallbacks" >&5
+ echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
+ 	fi
+ fi
+@@ -25095,7 +25587,7 @@
+ 	(*-D_XOPEN_SOURCE_EXTENDED*)
+ 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
+ 
+-echo "${as_me:-configure}:25098: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
++echo "${as_me:-configure}:25590: 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//'`
+@@ -25106,7 +25598,7 @@
+ 
+ # Help to automatically enable the extended curses features when using either
+ # the *-config or the ".pc" files by adding defines.
+-echo "$as_me:25109: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
++echo "$as_me:25601: 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
+@@ -25122,7 +25614,7 @@
+ 	done
+ 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
+ done
+-echo "$as_me:25125: result: $PKG_CFLAGS" >&5
++echo "$as_me:25617: result: $PKG_CFLAGS" >&5
+ echo "${ECHO_T}$PKG_CFLAGS" >&6
+ 
+ # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
+@@ -25185,7 +25677,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}:25188: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
++echo "${as_me:-configure}:25680: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
+ 
+ fi
+ 
+@@ -25295,7 +25787,7 @@
+ : ${CONFIG_STATUS=./config.status}
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:25298: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:25790: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >$CONFIG_STATUS <<_ACEOF
+ #! $SHELL
+@@ -25471,7 +25963,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:25474: error: ambiguous option: $1
++    { { echo "$as_me:25966: 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;}
+@@ -25490,7 +25982,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:25493: error: unrecognized option: $1
++  -*) { { echo "$as_me:25985: 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;}
+@@ -25610,7 +26102,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:25613: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:26105: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -26104,7 +26596,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:26107: creating $ac_file" >&5
++    { echo "$as_me:26599: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -26122,7 +26614,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:26125: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:26617: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -26135,7 +26627,7 @@
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+-           { { echo "$as_me:26138: error: cannot find input file: $f" >&5
++           { { echo "$as_me:26630: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -26151,7 +26643,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' $ac_item`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:26154: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:26646: 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;}
+@@ -26160,7 +26652,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' $ac_item`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:26163: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:26655: 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;}
+@@ -26197,7 +26689,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:26200: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:26692: 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;}
+@@ -26208,7 +26700,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:26211: WARNING: Some variables may not be substituted:
++      { echo "$as_me:26703: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -26257,7 +26749,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:26260: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:26752: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -26268,7 +26760,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:26271: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:26763: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -26281,7 +26773,7 @@
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+-           { { echo "$as_me:26284: error: cannot find input file: $f" >&5
++           { { echo "$as_me:26776: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -26339,7 +26831,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:26342: $ac_file is unchanged" >&5
++      { echo "$as_me:26834: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -26684,7 +27176,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}:26687: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:27179: testing overriding CXX_MODEL to SHARED ..." 1>&5
+ 
+ 					with_shared_cxx=yes
+ 					;;
+Index: configure.in
+Prereq:  1.679 
+--- ncurses-6.1-20190615+/configure.in	2019-03-30 21:44:53.000000000 +0000
++++ ncurses-6.1-20190623/configure.in	2019-06-23 21:26:48.000000000 +0000
+@@ -28,14 +28,14 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: configure.in,v 1.679 2019/03/30 21:44:53 tom Exp $
++dnl $Id: configure.in,v 1.682 2019/06/23 21:26:48 tom Exp $
+ dnl Process this file with autoconf to produce a configure script.
+ dnl
+ dnl See https://invisible-island.net/autoconf/ for additional information.
+ dnl
+ dnl ---------------------------------------------------------------------------
+ AC_PREREQ(2.52.20170501)
+-AC_REVISION($Revision: 1.679 $)
++AC_REVISION($Revision: 1.682 $)
+ AC_INIT(ncurses/base/lib_initscr.c)
+ AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
+ 
+@@ -1643,6 +1643,14 @@
+ 
+ CF_GETOPT_HEADER
+ 
++CF_CHECK_ENVIRON(environ)
++CF_CHECK_GETENV
++if test "x$cf_cv_consistent_getenv" = xno && \
++	test "x$cf_with_trace" = xyes
++then
++	AC_MSG_WARN(The NCURSES_TRACE environment variable is not supported with this configuration)
++fi
++
+ # check for ISC (this may also define _POSIX_SOURCE)
+ # Note: even non-Posix ISC needs  to declare fd_set
+ if test "x$ISC" = xyes ; then
+Index: dist.mk
+Prereq:  1.1288 
+--- ncurses-6.1-20190615+/dist.mk	2019-06-15 12:46:35.000000000 +0000
++++ ncurses-6.1-20190623/dist.mk	2019-06-23 15:31:40.000000000 +0000
+@@ -25,7 +25,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1288 2019/06/15 12:46:35 tom Exp $
++# $Id: dist.mk,v 1.1290 2019/06/23 15:31:40 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 = 1
+-NCURSES_PATCH = 20190615
++NCURSES_PATCH = 20190623
+ 
+ # 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.1-20190615+/doc/html/man/adacurses6-config.1.html	2019-06-15 23:31:08.000000000 +0000
++++ ncurses-6.1-20190623/doc/html/man/adacurses6-config.1.html	2019-06-23 21:16:02.000000000 +0000
+@@ -125,7 +125,7 @@
+

    SEE ALSO

    +        curses(3x)
+ 
+-       This describes ncurses version 6.1 (patch 20190615).
++       This describes ncurses version 6.1 (patch 20190623).
+ 
+ 
+ 
+Index: doc/html/man/captoinfo.1m.html
+--- ncurses-6.1-20190615+/doc/html/man/captoinfo.1m.html	2019-06-15 23:31:08.000000000 +0000
++++ ncurses-6.1-20190623/doc/html/man/captoinfo.1m.html	2019-06-23 21:16:02.000000000 +0000
+@@ -190,7 +190,7 @@
+

    SEE ALSO

    +        infocmp(1m), curses(3x), terminfo(5)
+ 
+-       This describes ncurses version 6.1 (patch 20190615).
++       This describes ncurses version 6.1 (patch 20190623).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/clear.1.html
+--- ncurses-6.1-20190615+/doc/html/man/clear.1.html	2019-06-15 23:31:08.000000000 +0000
++++ ncurses-6.1-20190623/doc/html/man/clear.1.html	2019-06-23 21:16:02.000000000 +0000
+@@ -148,7 +148,7 @@
+

    SEE ALSO

    +        tput(1), terminfo(5)
+ 
+-       This describes ncurses version 6.1 (patch 20190615).
++       This describes ncurses version 6.1 (patch 20190623).
+ 
+ 
+ 
+Index: doc/html/man/form.3x.html
+--- ncurses-6.1-20190615+/doc/html/man/form.3x.html	2019-06-15 23:31:10.000000000 +0000
++++ ncurses-6.1-20190623/doc/html/man/form.3x.html	2019-06-23 21:16:04.000000000 +0000
+@@ -246,7 +246,7 @@
+        curses(3x)  and  related  pages  whose names begin "form_" for detailed
+        descriptions of the entry points.
+ 
+-       This describes ncurses version 6.1 (patch 20190615).
++       This describes ncurses version 6.1 (patch 20190623).
+ 
+ 
+ 
+Index: doc/html/man/infocmp.1m.html
+--- ncurses-6.1-20190615+/doc/html/man/infocmp.1m.html	2019-06-15 23:31:11.000000000 +0000
++++ ncurses-6.1-20190623/doc/html/man/infocmp.1m.html	2019-06-23 21:16:04.000000000 +0000
+@@ -481,7 +481,7 @@
+ 
+        https://invisible-island.net/ncurses/tctest.html
+ 
+-       This describes ncurses version 6.1 (patch 20190615).
++       This describes ncurses version 6.1 (patch 20190623).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/infotocap.1m.html
+--- ncurses-6.1-20190615+/doc/html/man/infotocap.1m.html	2019-06-15 23:31:11.000000000 +0000
++++ ncurses-6.1-20190623/doc/html/man/infotocap.1m.html	2019-06-23 21:16:04.000000000 +0000
+@@ -85,7 +85,7 @@
+

    SEE ALSO

    +        curses(3x), tic(1m), infocmp(1m), terminfo(5)
+ 
+-       This describes ncurses version 6.1 (patch 20190615).
++       This describes ncurses version 6.1 (patch 20190623).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/menu.3x.html
+--- ncurses-6.1-20190615+/doc/html/man/menu.3x.html	2019-06-15 23:31:11.000000000 +0000
++++ ncurses-6.1-20190623/doc/html/man/menu.3x.html	2019-06-23 21:16:05.000000000 +0000
+@@ -221,7 +221,7 @@
+        curses(3x)  and  related  pages  whose names begin "menu_" for detailed
+        descriptions of the entry points.
+ 
+-       This describes ncurses version 6.1 (patch 20190615).
++       This describes ncurses version 6.1 (patch 20190623).
+ 
+ 
+ 
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.1-20190615+/doc/html/man/ncurses.3x.html	2019-06-15 23:31:12.000000000 +0000
++++ ncurses-6.1-20190623/doc/html/man/ncurses.3x.html	2019-06-23 21:16:05.000000000 +0000
+@@ -59,7 +59,7 @@
+        method of updating  character  screens  with  reasonable  optimization.
+        This  implementation  is  "new  curses"  (ncurses)  and is the approved
+        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
+-       This describes ncurses version 6.1 (patch 20190615).
++       This describes ncurses version 6.1 (patch 20190623).
+ 
+        The  ncurses  library emulates the curses library of System V Release 4
+        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
+Index: doc/html/man/ncurses6-config.1.html
+--- ncurses-6.1-20190615+/doc/html/man/ncurses6-config.1.html	2019-06-15 23:31:12.000000000 +0000
++++ ncurses-6.1-20190623/doc/html/man/ncurses6-config.1.html	2019-06-23 21:16:05.000000000 +0000
+@@ -112,7 +112,7 @@
+

    SEE ALSO

    +        curses(3x)
+ 
+-       This describes ncurses version 6.1 (patch 20190615).
++       This describes ncurses version 6.1 (patch 20190623).
+ 
+ 
+ 
+Index: doc/html/man/panel.3x.html
+--- ncurses-6.1-20190615+/doc/html/man/panel.3x.html	2019-06-15 23:31:12.000000000 +0000
++++ ncurses-6.1-20190623/doc/html/man/panel.3x.html	2019-06-23 21:16:05.000000000 +0000
+@@ -204,7 +204,7 @@
+

    SEE ALSO

    +        curses(3x), curs_variables(3x),
+ 
+-       This describes ncurses version 6.1 (patch 20190615).
++       This describes ncurses version 6.1 (patch 20190623).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/tabs.1.html
+--- ncurses-6.1-20190615+/doc/html/man/tabs.1.html	2019-06-15 23:31:12.000000000 +0000
++++ ncurses-6.1-20190623/doc/html/man/tabs.1.html	2019-06-23 21:16:06.000000000 +0000
+@@ -26,7 +26,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: tabs.1,v 1.25 2019/06/15 23:08:12 tom Exp @
++  * @Id: tabs.1,v 1.26 2019/06/23 21:01:12 tom Exp @
+ -->
+ 
+ 
+@@ -167,24 +167,28 @@
+        The  -d  (debug)  and -n (no-op) options are extensions not provided by
+        other implementations.
+ 
+-       A tabs utility appeared in PWB/Unix 1.0 (1977), and thereafter in  3BSD
+-       (1979).  It supported a single "-n" option (to cause the first tab stop
++       A tabs utility appeared in PWB/Unix 1.0 (1977).  There  was  a  reduced
++       version  of  the  tabs  utility in Unix 7th edition and in 3BSD (1979).
++       The latter supported a single "-n" option (to cause the first tab  stop
+        to be set on the left margin).  That option is not documented by POSIX.
+-       Initially, tabs used built-in tables rather than the terminal database,
+-       to support a half-dozen terminal types.  It also had built-in logic  to
+-       support  the left-margin, as well as a feature for copying the tab set-
+-       tings from a file.
+-
+-       Later versions of Unix, e.g., SVr4,  added  support  for  the  terminal
+-       database,  but  kept the tables, as a fallback.  In an earlier develop-
+-       ment effort, the tab-stop initialization provided by  tset  (1982)  and
++
++       The  PWB/Unix  tabs  utility,  which was included in System III (1980),
++       used built-in tables rather than the terminal database,  to  support  a
++       half-dozen  terminal  types.  It also had built-in logic to support the
++       left-margin, as well as a feature for copying the tab settings  from  a
++       file.
++
++       Later  versions  of  Unix,  e.g.,  SVr4, added support for the terminal
++       database, but kept the tables, as a fallback.  In an  earlier  develop-
++       ment  effort,  the  tab-stop initialization provided by tset (1982) and
+        incorporated into tput uses the terminal database,
+ 
+-       POSIX  documents  no  limits on the number of tab stops.  Documentation
++       POSIX documents no limits on the number of  tab  stops.   Documentation
+        for other implementations states that there is a limit on the number of
+-       tab  stops.  While some terminals 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 be that long.
++       tab stops (e.g., 20 in PWB/Unix's tabs utility).  While some  terminals
++       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 be that long.
+ 
+        The  Rationale section of the POSIX documentation goes into some detail
+        about the ways the committee considered redesigning the tabs  and  tput
+@@ -201,7 +205,7 @@
+

    SEE ALSO

    +        tset(1), infocmp(1m), curses(3x), terminfo(5).
+ 
+-       This describes ncurses version 6.1 (patch 20190615).
++       This describes ncurses version 6.1 (patch 20190623).
+ 
+ 
+ 
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.1-20190615+/doc/html/man/terminfo.5.html	2019-06-15 23:31:12.000000000 +0000
++++ ncurses-6.1-20190623/doc/html/man/terminfo.5.html	2019-06-23 21:16:06.000000000 +0000
+@@ -74,7 +74,7 @@
+        Terminfo describes terminals by giving a set of capabilities which they
+        have, by specifying how to perform screen operations, and by specifying
+        padding  requirements  and  initialization  sequences.   This describes
+-       ncurses version 6.1 (patch 20190615).
++       ncurses version 6.1 (patch 20190623).
+ 
+ 
+

    Terminfo Entry Syntax

    +Index: doc/html/man/tic.1m.html
+--- ncurses-6.1-20190615+/doc/html/man/tic.1m.html	2019-06-15 23:31:12.000000000 +0000
++++ ncurses-6.1-20190623/doc/html/man/tic.1m.html	2019-06-23 21:16:06.000000000 +0000
+@@ -365,7 +365,7 @@
+        infocmp(1m),   captoinfo(1m),   infotocap(1m),   toe(1m),   curses(3x),
+        term(5).  terminfo(5).  user_caps(5).
+ 
+-       This describes ncurses version 6.1 (patch 20190615).
++       This describes ncurses version 6.1 (patch 20190623).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/toe.1m.html
+--- ncurses-6.1-20190615+/doc/html/man/toe.1m.html	2019-06-15 23:31:12.000000000 +0000
++++ ncurses-6.1-20190623/doc/html/man/toe.1m.html	2019-06-23 21:16:06.000000000 +0000
+@@ -113,7 +113,7 @@
+        tic(1m), infocmp(1m), captoinfo(1m),  infotocap(1m),  curses(3x),  ter-
+        minfo(5).
+ 
+-       This describes ncurses version 6.1 (patch 20190615).
++       This describes ncurses version 6.1 (patch 20190623).
+ 
+ 
+ 
+Index: doc/html/man/tput.1.html
+--- ncurses-6.1-20190615+/doc/html/man/tput.1.html	2019-06-15 23:31:12.000000000 +0000
++++ ncurses-6.1-20190623/doc/html/man/tput.1.html	2019-06-23 21:16:06.000000000 +0000
+@@ -522,7 +522,7 @@
+

    SEE ALSO

    +        clear(1), stty(1), tabs(1), tset(1), terminfo(5), curs_termcap(3x).
+ 
+-       This describes ncurses version 6.1 (patch 20190615).
++       This describes ncurses version 6.1 (patch 20190623).
+ 
+ 
+ 
+Index: doc/html/man/tset.1.html
+--- ncurses-6.1-20190615+/doc/html/man/tset.1.html	2019-06-15 23:31:12.000000000 +0000
++++ ncurses-6.1-20190623/doc/html/man/tset.1.html	2019-06-23 21:16:06.000000000 +0000
+@@ -389,7 +389,7 @@
+        csh(1),  sh(1),  stty(1),   curs_terminfo(3x),   tty(4),   terminfo(5),
+        ttys(5), environ(7)
+ 
+-       This describes ncurses version 6.1 (patch 20190615).
++       This describes ncurses version 6.1 (patch 20190623).
+ 
+ 
+ 
+Index: include/nc_mingw.h
+Prereq:  1.5 
+--- ncurses-6.1-20190615+/include/nc_mingw.h	2018-06-24 00:06:37.000000000 +0000
++++ ncurses-6.1-20190623/include/nc_mingw.h	2019-06-23 19:55:08.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2008-2017,2018 Free Software Foundation, Inc.              *
++ * Copyright (c) 2008-2018,2019 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: Thomas Dickey, 2008-on                                           *
+  ****************************************************************************/
+ 
+-/* $Id: nc_mingw.h,v 1.5 2018/06/24 00:06:37 tom Exp $ */
++/* $Id: nc_mingw.h,v 1.6 2019/06/23 19:55:08 tom Exp $ */
+ 
+ #ifndef NC_MINGW_H
+ #define NC_MINGW_H 1
+@@ -63,7 +63,7 @@
+ #define getlogin() "username"
+ 
+ #undef wcwidth
+-#define wcwidth(ucs) _nc_wcwidth(ucs)
++#define wcwidth(ucs) _nc_wcwidth((wchar_t)(ucs))
+ extern int _nc_wcwidth(wchar_t);
+ 
+ #endif /* _WIN32 */
+Index: include/ncurses_defs
+Prereq:  1.90 
+--- ncurses-6.1-20190615+/include/ncurses_defs	2019-04-13 22:52:57.000000000 +0000
++++ ncurses-6.1-20190623/include/ncurses_defs	2019-06-23 15:19:43.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: ncurses_defs,v 1.90 2019/04/13 22:52:57 tom Exp $
++# $Id: ncurses_defs,v 1.91 2019/06/23 15:19:43 tom Exp $
+ ##############################################################################
+ # Copyright (c) 2000-2018,2019 Free Software Foundation, Inc.                #
+ #                                                                            #
+@@ -52,6 +52,7 @@
+ HAVE_CHGAT	1
+ HAVE_COLOR_CONTENT	1
+ HAVE_COLOR_SET	1
++HAVE_CONSISTENT_GETENV
+ HAVE_COPYWIN	1
+ HAVE_CURSCR	1
+ HAVE_CURSES_DATA_TABSIZE	1
+Index: man/man_db.renames
+Prereq:  1.53 
+--- ncurses-6.1-20190615+/man/man_db.renames	2019-01-21 09:25:24.000000000 +0000
++++ ncurses-6.1-20190623/man/man_db.renames	2019-06-23 19:12:27.000000000 +0000
+@@ -25,7 +25,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: man_db.renames,v 1.53 2019/01/21 09:25:24 tom Exp $
++# $Id: man_db.renames,v 1.54 2019/06/23 19:12:27 tom Exp $
+ # Manual-page renamings for the man_db program
+ #
+ # Files:
+@@ -171,6 +171,7 @@
+ wresize.3x			wresize.3ncurses
+ #
+ # Other:
++tabs.1m				tabs.1
+ tack.1m				tack.1
+ #
+ getty.1				getty.8
+Index: man/tabs.1
+Prereq:  1.25 
+--- ncurses-6.1-20190615+/man/tabs.1	2019-06-15 23:08:12.000000000 +0000
++++ ncurses-6.1-20190623/man/tabs.1	2019-06-23 21:01:12.000000000 +0000
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tabs.1,v 1.25 2019/06/15 23:08:12 tom Exp $
++.\" $Id: tabs.1,v 1.26 2019/06/23 21:01:12 tom Exp $
+ .TH @TABS@ 1 ""
+ .ds n 5
+ .ie \n(.g .ds `` \(lq
+@@ -185,12 +185,15 @@
+ The \fB\-d\fP (debug) and \fB\-n\fP (no-op) options are extensions not provided
+ by other implementations.
+ .PP
+-A \fBtabs\fP utility appeared in PWB/Unix 1.0 (1977),
+-and thereafter in 3BSD (1979).
+-It supported a single \*(``\-n\*('' option
++A \fBtabs\fP utility appeared in PWB/Unix 1.0 (1977).
++There was a reduced version of the \fBtabs\fP utility
++in Unix 7th edition and in 3BSD (1979).
++The latter supported a single \*(``\-n\*('' option
+ (to cause the first tab stop to be set on the left margin).
+ That option is not documented by POSIX.
+-Initially, \fBtabs\fP used built-in tables rather than the terminal database,
++.PP
++The PWB/Unix \fBtabs\fP utility, which was included in System III (1980),
++used built-in tables rather than the terminal database,
+ to support a half-dozen terminal types.
+ It also had built-in logic to support the left-margin,
+ as well as a feature for copying the tab settings from a file.
+@@ -204,7 +207,8 @@
+ .PP
+ POSIX documents no limits on the number of tab stops.
+ Documentation for other implementations states that there is a limit on the
+-number of tab stops.
++number of tab stops
++(e.g., 20 in PWB/Unix's \fBtabs\fP utility).
+ While some terminals 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 be that long.
+Index: ncurses/base/lib_initscr.c
+Prereq:  1.43 
+--- ncurses-6.1-20190615+/ncurses/base/lib_initscr.c	2017-06-17 18:42:45.000000000 +0000
++++ ncurses-6.1-20190623/ncurses/base/lib_initscr.c	2019-06-22 00:02:01.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2017,2019 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: Zeyd M. Ben-Halim  1992,1995               *
+  *     and: Eric S. Raymond                          *
+- *     and: Thomas E. Dickey                        1996-2003               *
++ *     and: Thomas E. Dickey                        1996-on                 *
+  ****************************************************************************/
+ 
+ /*
+@@ -45,7 +45,7 @@
+ #include 		/* needed for ISC */
+ #endif
+ 
+-MODULE_ID("$Id: lib_initscr.c,v 1.43 2017/06/17 18:42:45 tom Exp $")
++MODULE_ID("$Id: lib_initscr.c,v 1.44 2019/06/22 00:02:01 tom Exp $")
+ 
+ NCURSES_EXPORT(WINDOW *)
+ initscr(void)
+@@ -60,14 +60,18 @@
+ 
+     /* Portable applications must not call initscr() more than once */
+     if (!_nc_globals.init_screen) {
+-	NCURSES_CONST char *name;
++	const char *env;
++	char *name;
+ 
+ 	_nc_globals.init_screen = TRUE;
+ 
+-	if ((name = getenv("TERM")) == 0
+-	    || *name == '\0') {
+-	    static char unknown_name[] = "unknown";
+-	    name = unknown_name;
++	if ((env = getenv("TERM")) == 0
++	    || *env == '\0') {
++	    env = "unknown";
++	}
++	if ((name = strdup(env)) == NULL) {
++	    fprintf(stderr, "Error opening allocating $TERM.\n");
++	    ExitProgram(EXIT_FAILURE);
+ 	}
+ #ifdef __CYGWIN__
+ 	/*
+@@ -97,6 +101,7 @@
+ #else
+ 	def_prog_mode();
+ #endif
++	free(name);
+     }
+     result = stdscr;
+     _nc_unlock_global(curses);
+Index: ncurses/curses.priv.h
+Prereq:  1.623 
+--- ncurses-6.1-20190615+/ncurses/curses.priv.h	2019-06-01 23:41:36.000000000 +0000
++++ ncurses-6.1-20190623/ncurses/curses.priv.h	2019-06-23 15:20:49.000000000 +0000
+@@ -34,7 +34,7 @@
+  ****************************************************************************/
+ 
+ /*
+- * $Id: curses.priv.h,v 1.623 2019/06/01 23:41:36 tom Exp $
++ * $Id: curses.priv.h,v 1.624 2019/06/23 15:20:49 tom Exp $
+  *
+  *	curses.priv.h
+  *
+@@ -1766,12 +1766,16 @@
+ #define TPUTS_TRACE(s)	_nc_tputs_trace = s;
+ #endif
+ 
++#ifdef HAVE_CONSISTENT_GETENV
+ #define START_TRACE() \
+ 	if ((_nc_tracing & TRACE_MAXIMUM) == 0) { \
+ 	    int t = _nc_getenv_num("NCURSES_TRACE"); \
+ 	    if (t >= 0) \
+ 		trace((unsigned) t); \
+ 	}
++#else
++#define START_TRACE() /* nothing */
++#endif
+ 
+ /*
+  * Many of the _tracef() calls use static buffers; lock the trace state before
+Index: ncurses/tinfo/lib_acs.c
+Prereq:  1.48 
+--- ncurses-6.1-20190615+/ncurses/tinfo/lib_acs.c	2019-05-04 23:03:08.000000000 +0000
++++ ncurses-6.1-20190623/ncurses/tinfo/lib_acs.c	2019-06-23 16:22:10.000000000 +0000
+@@ -39,7 +39,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_acs.c,v 1.48 2019/05/04 23:03:08 tom Exp $")
++MODULE_ID("$Id: lib_acs.c,v 1.49 2019/06/23 16:22:10 tom Exp $")
+ 
+ #if BROKEN_LINKER || USE_REENTRANT
+ #define MyBuffer _nc_prescreen.real_acs_map
+@@ -317,7 +317,7 @@
+ 	result = 1;
+ 	break;
+     default:
+-	result = (wcwidth) (ch);
++	result = wcwidth(ch);
+ 	break;
+     }
+     return result;
+Index: ncurses/tinfo/lib_setup.c
+Prereq:  1.199 
+--- ncurses-6.1-20190615+/ncurses/tinfo/lib_setup.c	2019-03-23 23:42:20.000000000 +0000
++++ ncurses-6.1-20190623/ncurses/tinfo/lib_setup.c	2019-06-22 00:15:32.000000000 +0000
+@@ -48,7 +48,7 @@
+ #include 
+ #endif
+ 
+-MODULE_ID("$Id: lib_setup.c,v 1.199 2019/03/23 23:42:20 tom Exp $")
++MODULE_ID("$Id: lib_setup.c,v 1.200 2019/06/22 00:15:32 tom Exp $")
+ 
+ /****************************************************************************
+  *
+@@ -628,6 +628,7 @@
+ #endif
+     TERMINAL *termp;
+     SCREEN *sp = 0;
++    char *myname;
+     int code = ERR;
+ 
+     START_TRACE();
+@@ -656,14 +657,15 @@
+ #endif
+ 	}
+     }
++    myname = strdup(tname);
+ 
+-    if (strlen(tname) > MAX_NAME_SIZE) {
++    if (strlen(myname) > MAX_NAME_SIZE) {
+ 	ret_error(TGETENT_ERR,
+ 		  "TERM environment must be <= %d characters.\n",
+ 		  MAX_NAME_SIZE);
+     }
+ 
+-    T(("your terminal name is %s", tname));
++    T(("your terminal name is %s", myname));
+ 
+     /*
+      * Allow output redirection.  This is what SVr3 does.  If stdout is
+@@ -692,8 +694,8 @@
+ 	&& (termp != 0)
+ 	&& termp->Filedes == Filedes
+ 	&& termp->_termname != 0
+-	&& !strcmp(termp->_termname, tname)
+-	&& _nc_name_match(TerminalType(termp).term_names, tname, "|")) {
++	&& !strcmp(termp->_termname, myname)
++	&& _nc_name_match(TerminalType(termp).term_names, myname, "|")) {
+ 	T(("reusing existing terminal information and mode-settings"));
+ 	code = OK;
+ #ifdef USE_TERM_DRIVER
+@@ -735,17 +737,17 @@
+ #ifdef USE_TERM_DRIVER
+ 	INIT_TERM_DRIVER();
+ 	TCB = (TERMINAL_CONTROL_BLOCK *) termp;
+-	code = _nc_globals.term_driver(TCB, tname, errret);
++	code = _nc_globals.term_driver(TCB, myname, errret);
+ 	if (code == OK) {
+ 	    termp->Filedes = (short) Filedes;
+-	    termp->_termname = strdup(tname);
++	    termp->_termname = strdup(myname);
+ 	} else {
+ 	    ret_error0(errret ? *errret : TGETENT_ERR,
+ 		       "Could not find any driver to handle this terminal.\n");
+ 	}
+ #else
+ #if NCURSES_USE_DATABASE || NCURSES_USE_TERMCAP
+-	status = _nc_setup_tinfo(tname, &TerminalType(termp));
++	status = _nc_setup_tinfo(myname, &TerminalType(termp));
+ 	T(("_nc_setup_tinfo returns %d", status));
+ #else
+ 	T(("no database available"));
+@@ -754,7 +756,7 @@
+ 
+ 	/* try fallback list if entry on disk */
+ 	if (status != TGETENT_YES) {
+-	    const TERMTYPE2 *fallback = _nc_fallback2(tname);
++	    const TERMTYPE2 *fallback = _nc_fallback2(myname);
+ 
+ 	    if (fallback) {
+ 		T(("found fallback entry"));
+@@ -768,7 +770,7 @@
+ 	    if (status == TGETENT_ERR) {
+ 		ret_error0(status, "terminals database is inaccessible\n");
+ 	    } else if (status == TGETENT_NO) {
+-		ret_error1(status, "unknown terminal type.\n", tname);
++		ret_error1(status, "unknown terminal type.\n", myname);
+ 	    }
+ 	}
+ #if NCURSES_EXT_NUMBERS
+@@ -779,7 +781,7 @@
+ #endif
+ 
+ 	termp->Filedes = (short) Filedes;
+-	termp->_termname = strdup(tname);
++	termp->_termname = strdup(myname);
+ 
+ 	set_curterm(termp);
+ 
+@@ -826,15 +828,16 @@
+ 	if ((VALID_STRING(cursor_address)
+ 	     || (VALID_STRING(cursor_down) && VALID_STRING(cursor_home)))
+ 	    && VALID_STRING(clear_screen)) {
+-	    ret_error1(TGETENT_YES, "terminal is not really generic.\n", tname);
++	    ret_error1(TGETENT_YES, "terminal is not really generic.\n", myname);
+ 	} else {
+ 	    del_curterm(termp);
+-	    ret_error1(TGETENT_NO, "I need something more specific.\n", tname);
++	    ret_error1(TGETENT_NO, "I need something more specific.\n", myname);
+ 	}
+     } else if (hard_copy) {
+-	ret_error1(TGETENT_YES, "I can't handle hardcopy terminals.\n", tname);
++	ret_error1(TGETENT_YES, "I can't handle hardcopy terminals.\n", myname);
+     }
+ #endif
++    free(myname);
+     returnCode(code);
+ }
+ 
+Index: ncurses/tty/tty_update.c
+Prereq:  1.303 
+--- ncurses-6.1-20190615+/ncurses/tty/tty_update.c	2019-06-01 23:42:36.000000000 +0000
++++ ncurses-6.1-20190623/ncurses/tty/tty_update.c	2019-06-23 16:22:17.000000000 +0000
+@@ -84,7 +84,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: tty_update.c,v 1.303 2019/06/01 23:42:36 tom Exp $")
++MODULE_ID("$Id: tty_update.c,v 1.304 2019/06/23 16:22:17 tom Exp $")
+ 
+ /*
+  * This define controls the line-breakout optimization.  Every once in a
+@@ -210,7 +210,7 @@
+ }
+ 
+ #if !NCURSES_WCWIDTH_GRAPHICS
+-#define is_wacs_value(ch) (_nc_wacs_width(ch) == 1 && (wcwidth)(ch) > 1)
++#define is_wacs_value(ch) (_nc_wacs_width(ch) == 1 && wcwidth(ch) > 1)
+ #endif /* !NCURSES_WCWIDTH_GRAPHICS */
+ 
+ static NCURSES_INLINE void
+Index: package/debian-mingw/changelog
+--- ncurses-6.1-20190615+/package/debian-mingw/changelog	2019-06-15 12:46:35.000000000 +0000
++++ ncurses-6.1-20190623/package/debian-mingw/changelog	2019-06-23 15:31:40.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.1+20190615) unstable; urgency=low
++ncurses6 (6.1+20190623) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 15 Jun 2019 08:46:35 -0400
++ -- Thomas E. Dickey   Sun, 23 Jun 2019 11:31:40 -0400
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.1-20190615+/package/debian-mingw64/changelog	2019-06-15 12:46:35.000000000 +0000
++++ ncurses-6.1-20190623/package/debian-mingw64/changelog	2019-06-23 15:31:40.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.1+20190615) unstable; urgency=low
++ncurses6 (6.1+20190623) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 15 Jun 2019 08:46:35 -0400
++ -- Thomas E. Dickey   Sun, 23 Jun 2019 11:31:40 -0400
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.1-20190615+/package/debian/changelog	2019-06-15 12:46:35.000000000 +0000
++++ ncurses-6.1-20190623/package/debian/changelog	2019-06-23 15:31:40.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.1+20190615) unstable; urgency=low
++ncurses6 (6.1+20190623) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 15 Jun 2019 08:46:35 -0400
++ -- Thomas E. Dickey   Sun, 23 Jun 2019 11:31:40 -0400
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.334 
+--- ncurses-6.1-20190615+/package/mingw-ncurses.nsi	2019-06-15 12:46:35.000000000 +0000
++++ ncurses-6.1-20190623/package/mingw-ncurses.nsi	2019-06-23 15:31:40.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.334 2019/06/15 12:46:35 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.336 2019/06/23 15:31:40 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "1"
+ !define VERSION_YYYY  "2019"
+-!define VERSION_MMDD  "0615"
++!define VERSION_MMDD  "0623"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.1-20190615+/package/mingw-ncurses.spec	2019-06-15 12:46:35.000000000 +0000
++++ ncurses-6.1-20190623/package/mingw-ncurses.spec	2019-06-23 15:31:40.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.1
+-Release: 20190615
++Release: 20190623
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.1-20190615+/package/ncurses.spec	2019-06-15 12:46:35.000000000 +0000
++++ ncurses-6.1-20190623/package/ncurses.spec	2019-06-23 15:31:40.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.1
+-Release: 20190615
++Release: 20190623
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncursest.spec
+--- ncurses-6.1-20190615+/package/ncursest.spec	2019-06-15 12:46:35.000000000 +0000
++++ ncurses-6.1-20190623/package/ncursest.spec	2019-06-23 15:31:40.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.1
+-Release: 20190615
++Release: 20190623
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: test/test_sgr.c
+Prereq:  1.11 
+--- ncurses-6.1-20190615+/test/test_sgr.c	2017-06-24 18:35:25.000000000 +0000
++++ ncurses-6.1-20190623/test/test_sgr.c	2019-06-22 00:20:06.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2015-2016,2017 Free Software Foundation, Inc.              *
++ * Copyright (c) 2015-2017,2019 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.11 2017/06/24 18:35:25 tom Exp $
++ * $Id: test_sgr.c,v 1.12 2019/06/22 00:20:06 tom Exp $
+  *
+  * A simple demo of the sgr/sgr0 terminal capabilities.
+  */
+@@ -182,22 +182,23 @@
+     char *my_bold;
+     char *my_revs;
+     char *my_smso;
++    char *my_name = strdup(name);
+ 
+     if (db_list) {
+ 	putenv(next_dbitem());
+     }
+ 
+     if (!q_opt)
+-	printf("Terminal type \"%s\"\n", name);
++	printf("Terminal type \"%s\"\n", my_name);
+ 
+     if (no_init) {
+ 	START_TRACE();
+     } else {
+-	setupterm((NCURSES_CONST char *) name, 1, (int *) 0);
++	setupterm((NCURSES_CONST char *) my_name, 1, (int *) 0);
+     }
+ 
+     if (!q_opt) {
+-	if (strcmp(name, ttytype))
++	if (strcmp(my_name, ttytype))
+ 	    printf("... actual \"%s\"\n", ttytype);
+     }
+ 
diff --git a/ncurses-6.1-20190630.patch b/ncurses-6.1-20190630.patch
new file mode 100644
index 0000000..049994e
--- /dev/null
+++ b/ncurses-6.1-20190630.patch
@@ -0,0 +1,17671 @@
+# ncurses 6.1 - patch 20190630 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.1 is at
+# 	ftp.gnu.org:/pub/gnu
+#
+# Patches for ncurses 6.1 can be found at
+# 	ftp://ftp.invisible-island.net/ncurses/6.1
+#	http://invisible-mirror.net/archives/ncurses/6.1 
+#
+# ------------------------------------------------------------------------------
+# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20190630.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Jun 30 23:48:04 UTC 2019
+# ------------------------------------------------------------------------------
+# INSTALL                          |   18 
+# NEWS                             |   11 
+# VERSION                          |    2 
+# aclocal.m4                       |   73 
+# configure                        | 4805 +++++++++++++++++++------------------
+# configure.in                     |   30 
+# dist.mk                          |    4 
+# misc/run_tic.in                  |    6 
+# misc/terminfo.src                |  855 +++---
+# ncurses/Makefile.in              |    7 
+# ncurses/tinfo/MKfallback.sh      |   11 
+# ncurses/tinfo/write_entry.c      |    7 
+# package/debian-mingw/changelog   |    4 
+# package/debian-mingw/rules       |    2 
+# package/debian-mingw64/changelog |    4 
+# package/debian-mingw64/rules     |    2 
+# package/debian/changelog         |    4 
+# package/mingw-ncurses.nsi        |    4 
+# package/mingw-ncurses.spec       |    7 
+# package/ncurses.spec             |    2 
+# package/ncursest.spec            |    2 
+# progs/tic.c                      |    7 
+# 22 files changed, 3173 insertions(+), 2694 deletions(-)
+# ------------------------------------------------------------------------------
+Index: INSTALL
+Prereq:  1.212 
+--- ncurses-6.1-20190623+/INSTALL	2019-01-19 17:42:30.000000000 +0000
++++ ncurses-6.1-20190630/INSTALL	2019-06-30 15:28:56.000000000 +0000
+@@ -25,7 +25,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: INSTALL,v 1.212 2019/01/19 17:42:30 tom Exp $
++-- $Id: INSTALL,v 1.213 2019/06/30 15:28:56 tom Exp $
+ ---------------------------------------------------------------------
+              How to install Ncurses/Terminfo on your system
+ ---------------------------------------------------------------------
+@@ -903,6 +903,8 @@
+ 	Specify a list of fallback terminal descriptions which will be
+ 	compiled into the ncurses library.  See CONFIGURING FALLBACK ENTRIES.
+ 
++	See also "--with-tic-path" and "--with-infocmp-path".
++
+     --with-gpm
+ 	use Alessandro Rubini's GPM library to provide mouse support on the
+ 	Linux console.  Prior to ncurses 5.5, this introduced a dependency on
+@@ -954,6 +956,10 @@
+ 
+ 	See also the --enable-getcap option.
+ 
++    --with-infocmp-path[=XXX]
++	Use this option to override the automatic detection of tic in your
++	$PATH when building fallbacks (see "--with-fallbacks").
++
+     --with-install-prefix=XXX
+ 	Allows you to specify an alternate location for installing ncurses
+ 	after building it.  The value you specify is prepended to the "real"
+@@ -1173,6 +1179,10 @@
+ 	Specify a search-list of termcap files which will be compiled into the
+ 	ncurses library (default:  /etc/termcap:/usr/share/misc/termcap)
+ 
++    --with-tic-path[=XXX]
++	Use this option to override the automatic detection of tic in your
++	$PATH when building fallbacks (see "--with-fallbacks").
++
+     --with-ticlib[=XXX]
+ 	When building the ncurses library, build a separate library for
+ 	the modules that are used only by the utility programs.  Normally
+@@ -2120,9 +2130,10 @@
+ 			$TERMINFO \
+ 			../misc/terminfo.src \
+ 			`which tic` \
++			`which infocmp` \
+ 			linux vt100 xterm >fallback.c
+ 
+-	The first three parameters of the script are normally supplied by
++	The first four parameters of the script are normally supplied by
+ 	the configured makefiles via the "--with-fallbacks" option.  They
+ 	are
+ 
+@@ -2130,6 +2141,8 @@
+ 		2) the source for the terminfo entries
+ 		3) the location of the tic program, used to create a terminfo
+ 		   database.
++		4) the location of the infocmp program, used to print a terminfo
++		   description.
+ 
+ 	Then just rebuild and reinstall the library as you would normally.
+ 	You can restore the default empty fallback list with
+@@ -2138,6 +2151,7 @@
+ 			$TERMINFO \
+ 			../misc/terminfo.src \
+ 			`which tic` \
++			`which infocmp` \
+ 			>fallback.c
+ 
+ 	The overhead for an empty fallback list is one trivial stub function.
+Index: NEWS
+Prereq:  1.3337 
+--- ncurses-6.1-20190623+/NEWS	2019-06-23 21:18:23.000000000 +0000
++++ ncurses-6.1-20190630/NEWS	2019-06-30 10:45:10.000000000 +0000
+@@ -25,7 +25,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.3337 2019/06/23 21:18:23 tom Exp $
++-- $Id: NEWS,v 1.3342 2019/06/30 10:45:10 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.
+ 
++20190630
++	+ add --with-tic-path and --with-infocmp-path to work around problems
++	  building fallback source using pre-6.0 tic/infocmp.
++	+ add a check in tic for paired indn/rin
++	+ correct a buffer-limit in write_entry.c for systems that use caseless
++	  filenames.
++	+ add ms-terminal -TD
++	+ add vscode, vscode-direct -TD
++
+ 20190623
+ 	+ improve the tabs.1 manual page to distinguish the PWB/Unix and 7th
+ 	  Edition versions of the tabs utility.
+Index: VERSION
+--- ncurses-6.1-20190623+/VERSION	2019-06-23 15:31:40.000000000 +0000
++++ ncurses-6.1-20190630/VERSION	2019-06-30 01:30:19.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.1	20190623
++5:0:10	6.1	20190630
+Index: aclocal.m4
+Prereq:  1.869 
+--- ncurses-6.1-20190623+/aclocal.m4	2019-06-23 19:53:31.000000000 +0000
++++ ncurses-6.1-20190630/aclocal.m4	2019-06-30 23:46:29.000000000 +0000
+@@ -28,7 +28,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.869 2019/06/23 19:53:31 tom Exp $
++dnl $Id: aclocal.m4,v 1.876 2019/06/30 23:46:29 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -5606,6 +5606,51 @@
+ 	AC_MSG_RESULT($PATH_SEPARATOR)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_PATH_PROG version: 10 updated: 2019/06/30 19:44:43
++dnl ------------
++dnl Check for a given program, defining corresponding symbol.
++dnl	$1 = environment variable, which is suffixed by "_PATH" in the #define.
++dnl	$2 = program name to find.
++dnl	$3 = optional list of additional program names to test.
++dnl $4 = $PATH
++dnl
++dnl If there is more than one token in the result, #define the remaining tokens
++dnl to $1_ARGS.  We need this for 'install' in particular.
++dnl
++dnl FIXME: we should allow this to be overridden by environment variables
++dnl
++AC_DEFUN([CF_PATH_PROG],[
++AC_REQUIRE([CF_PATHSEP])
++test -z "[$]$1" && $1=$2
++AC_PATH_PROGS($1,[$]$1 $2 ifelse($3,,,$3),[$]$1, ifelse($4,,,$4))
++
++cf_path_prog=""
++cf_path_args=""
++IFS="${IFS:- 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
++for cf_temp in $ac_cv_path_$1
++do
++	if test -z "$cf_path_prog" ; then
++		if test "$with_full_paths" = yes ; then
++			CF_PATH_SYNTAX(cf_temp,break)
++			cf_path_prog="$cf_temp"
++		else
++			cf_path_prog="`basename $cf_temp`"
++		fi
++	elif test -z "$cf_path_args" ; then
++		cf_path_args="$cf_temp"
++	else
++		cf_path_args="$cf_path_args $cf_temp"
++	fi
++done
++IFS="$cf_save_ifs"
++
++if test -n "$cf_path_prog" ; then
++	CF_MSG_LOG(defining path for ${cf_path_prog})
++	AC_DEFINE_UNQUOTED($1_PATH,"$cf_path_prog",Define to pathname $1)
++	test -n "$cf_path_args" && AC_DEFINE_UNQUOTED($1_ARGS,"$cf_path_args",Define to provide args for $1)
++fi
++])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_PATH_SYNTAX version: 16 updated: 2015/04/18 08:56:57
+ dnl --------------
+ dnl Check the argument to see that it looks like a pathname.  Rewrite it if it
+@@ -8317,6 +8362,32 @@
+ AC_SUBST(PKG_CONFIG_LIBDIR)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_WITH_PATH_PROG version: 1 updated: 2019/06/30 19:44:43
++dnl -----------------
++dnl Check for a given program, like CF_PATH_PROG, but allow override using a
++dnl "--with-xxx" option.
++dnl
++dnl Parameters:
++dnl		$1 = environment variable to set/update
++dnl		$2 = program name
++dnl		$3 = help-text
++dnl		$4 = $PATH
++AC_DEFUN([CF_WITH_PATH_PROG],[
++AC_ARG_WITH($2-path,
++	[  --with-$2-path=XXX     specify path of $2 ifelse($3,,,$3)],
++	[AC_MSG_CHECKING(for $2 program ifelse($3,,,$3))
++		$1=$withval
++		AC_MSG_RESULT([$]$1)
++		CF_PATH_SYNTAX($1)
++	],
++	[CF_PATH_PROG($1,$2,,ifelse($4,,,$4))
++		if test -z "[$]$1"
++		then
++			AC_MSG_WARN(no $2 program found ifelse($3,,,$3))
++		fi
++	])
++])
++dnl ---------------------------------------------------------------------------
+ dnl CF_WITH_PTHREAD version: 7 updated: 2015/04/18 08:56:57
+ dnl ---------------
+ dnl Check for POSIX thread library.
+Index: configure
+--- ncurses-6.1-20190623+/configure	2019-06-23 21:27:11.000000000 +0000
++++ ncurses-6.1-20190630/configure	2019-06-30 15:34:11.000000000 +0000
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+-# From configure.in Revision: 1.682 .
++# From configure.in Revision: 1.688 .
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by Autoconf 2.52.20181006.
+ #
+@@ -767,6 +767,8 @@
+   --with-database=XXX     specify terminfo source to install
+   --with-hashed-db        specify hashed-database library
+   --with-fallbacks=XXX    specify list of fallback terminal descriptions
++  --with-tic-path=XXX     specify path of tic for fallbacks
++  --with-infocmp-path=XXX     specify path of infocmp for fallbacks
+   --without-xterm-new     specify if xterm terminfo should be old version
+   --with-xterm-kbs=XXX    specify if xterm backspace sends BS or DEL
+   --with-terminfo-dirs=XXX specify list of terminfo directories (default: DATADIR/terminfo)
+@@ -1053,7 +1055,7 @@
+ fi
+ for ac_site_file in $CONFIG_SITE; do
+   if test -r "$ac_site_file"; then
+-    { echo "$as_me:1056: loading site script $ac_site_file" >&5
++    { echo "$as_me:1058: 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"
+@@ -1064,7 +1066,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:1067: loading cache $cache_file" >&5
++    { echo "$as_me:1069: loading cache $cache_file" >&5
+ echo "$as_me: loading cache $cache_file" >&6;}
+     case $cache_file in
+       [\\/]* | ?:[\\/]* ) . $cache_file;;
+@@ -1072,7 +1074,7 @@
+     esac
+   fi
+ else
+-  { echo "$as_me:1075: creating cache $cache_file" >&5
++  { echo "$as_me:1077: creating cache $cache_file" >&5
+ echo "$as_me: creating cache $cache_file" >&6;}
+   >$cache_file
+ fi
+@@ -1088,21 +1090,21 @@
+   eval ac_new_val="\$ac_env_${ac_var}_value"
+   case $ac_old_set,$ac_new_set in
+     set,)
+-      { echo "$as_me:1091: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++      { echo "$as_me:1093: 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:1095: error: \`$ac_var' was not set in the previous run" >&5
++      { echo "$as_me:1097: 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:1101: error: \`$ac_var' has changed since the previous run:" >&5
++        { echo "$as_me:1103: 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:1103:   former value:  $ac_old_val" >&5
++        { echo "$as_me:1105:   former value:  $ac_old_val" >&5
+ echo "$as_me:   former value:  $ac_old_val" >&2;}
+-        { echo "$as_me:1105:   current value: $ac_new_val" >&5
++        { echo "$as_me:1107:   current value: $ac_new_val" >&5
+ echo "$as_me:   current value: $ac_new_val" >&2;}
+         ac_cache_corrupted=:
+       fi;;
+@@ -1121,9 +1123,9 @@
+   fi
+ done
+ if $ac_cache_corrupted; then
+-  { echo "$as_me:1124: error: changes in the environment can compromise the build" >&5
++  { echo "$as_me:1126: 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:1126: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++  { { echo "$as_me:1128: 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
+@@ -1144,10 +1146,10 @@
+ echo "#! $SHELL" >conftest.sh
+ echo  "exit 0"   >>conftest.sh
+ chmod +x conftest.sh
+-if { (echo "$as_me:1147: PATH=\".;.\"; conftest.sh") >&5
++if { (echo "$as_me:1149: PATH=\".;.\"; conftest.sh") >&5
+   (PATH=".;."; conftest.sh) 2>&5
+   ac_status=$?
+-  echo "$as_me:1150: \$? = $ac_status" >&5
++  echo "$as_me:1152: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   ac_path_separator=';'
+ else
+@@ -1160,7 +1162,7 @@
+ 
+ top_builddir=`pwd`
+ 
+-echo "$as_me:1163: checking for egrep" >&5
++echo "$as_me:1165: 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
+@@ -1170,11 +1172,11 @@
+ 		else ac_cv_prog_egrep='egrep'
+ 	fi
+ fi
+-echo "$as_me:1173: result: $ac_cv_prog_egrep" >&5
++echo "$as_me:1175: 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:1177: error: No egrep program found" >&5
++	test -z "$EGREP" && { { echo "$as_me:1179: error: No egrep program found" >&5
+ echo "$as_me: error: No egrep program found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -1184,11 +1186,11 @@
+ cf_cv_abi_version=${NCURSES_MAJOR}
+ cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
+ cf_cv_timestamp=`date`
+-echo "$as_me:1187: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
++echo "$as_me:1189: 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:1191: checking for package version" >&5
++	echo "$as_me:1193: 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...
+@@ -1200,39 +1202,39 @@
+ 	VERSION="$cf_field1"
+ 
+ 	VERSION_MAJOR=`echo "$cf_field2" | sed -e 's/\..*//'`
+-	test -z "$VERSION_MAJOR" && { { echo "$as_me:1203: error: missing major-version" >&5
++	test -z "$VERSION_MAJOR" && { { echo "$as_me:1205: 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:1208: error: missing minor-version" >&5
++	test -z "$VERSION_MINOR" && { { echo "$as_me:1210: error: missing minor-version" >&5
+ echo "$as_me: error: missing minor-version" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-	echo "$as_me:1212: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
++	echo "$as_me:1214: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
+ echo "${ECHO_T}${VERSION_MAJOR}.${VERSION_MINOR}" >&6
+ 
+-	echo "$as_me:1215: checking for package patch date" >&5
++	echo "$as_me:1217: 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:1220: error: missing patch-date $VERSION_PATCH" >&5
++		{ { echo "$as_me:1222: 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:1227: error: illegal patch-date $VERSION_PATCH" >&5
++		{ { echo "$as_me:1229: 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:1232: result: $VERSION_PATCH" >&5
++	echo "$as_me:1234: result: $VERSION_PATCH" >&5
+ echo "${ECHO_T}$VERSION_PATCH" >&6
+ else
+-	{ { echo "$as_me:1235: error: did not find $srcdir/VERSION" >&5
++	{ { echo "$as_me:1237: error: did not find $srcdir/VERSION" >&5
+ echo "$as_me: error: did not find $srcdir/VERSION" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1240,19 +1242,19 @@
+ # show the actual data that we have for versions:
+ test -n "$verbose" && echo "	ABI VERSION $VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:1243: testing ABI VERSION $VERSION ..." 1>&5
++echo "${as_me:-configure}:1245: testing ABI VERSION $VERSION ..." 1>&5
+ 
+ test -n "$verbose" && echo "	VERSION_MAJOR $VERSION_MAJOR" 1>&6
+ 
+-echo "${as_me:-configure}:1247: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
++echo "${as_me:-configure}:1249: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
+ 
+ test -n "$verbose" && echo "	VERSION_MINOR $VERSION_MINOR" 1>&6
+ 
+-echo "${as_me:-configure}:1251: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
++echo "${as_me:-configure}:1253: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
+ 
+ test -n "$verbose" && echo "	VERSION_PATCH $VERSION_PATCH" 1>&6
+ 
+-echo "${as_me:-configure}:1255: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
++echo "${as_me:-configure}:1257: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
+ 
+ 	cf_PACKAGE=NCURSES
+ 	PACKAGE=ncurses
+@@ -1276,7 +1278,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:1279: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
++  { echo "$as_me:1281: 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;
+@@ -1289,13 +1291,13 @@
+   ([0-9]*)
+  	;;
+   (*)
+-	{ { echo "$as_me:1292: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
++	{ { echo "$as_me:1294: 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:1298: error: Release major-version value is empty" >&5
++  { { echo "$as_me:1300: error: Release major-version value is empty" >&5
+ echo "$as_me: error: Release major-version value is empty" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1305,13 +1307,13 @@
+   ([0-9]*)
+  	;;
+   (*)
+-	{ { echo "$as_me:1308: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
++	{ { echo "$as_me:1310: 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:1314: error: Release minor-version value is empty" >&5
++  { { echo "$as_me:1316: error: Release minor-version value is empty" >&5
+ echo "$as_me: error: Release minor-version value is empty" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1324,7 +1326,7 @@
+ 
+ 	if test "x$cf_cv_abi_version" != "x$withval"
+ 	then
+-		{ echo "$as_me:1327: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
++		{ echo "$as_me:1329: 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.*)
+@@ -1343,13 +1345,13 @@
+   ([0-9]*)
+  	;;
+   (*)
+-	{ { echo "$as_me:1346: error: ABI version is not a number: $cf_cv_abi_version" >&5
++	{ { echo "$as_me:1348: 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:1352: error: ABI version value is empty" >&5
++  { { echo "$as_me:1354: error: ABI version value is empty" >&5
+ echo "$as_me: error: ABI version value is empty" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1380,7 +1382,7 @@
+   fi
+ done
+ if test -z "$ac_aux_dir"; then
+-  { { echo "$as_me:1383: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
++  { { echo "$as_me:1385: 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
+@@ -1390,11 +1392,11 @@
+ 
+ # Make sure we can run config.sub.
+ $ac_config_sub sun4 >/dev/null 2>&1 ||
+-  { { echo "$as_me:1393: error: cannot run $ac_config_sub" >&5
++  { { echo "$as_me:1395: error: cannot run $ac_config_sub" >&5
+ echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:1397: checking build system type" >&5
++echo "$as_me:1399: 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
+@@ -1403,23 +1405,23 @@
+ test -z "$ac_cv_build_alias" &&
+   ac_cv_build_alias=`$ac_config_guess`
+ test -z "$ac_cv_build_alias" &&
+-  { { echo "$as_me:1406: error: cannot guess build type; you must specify one" >&5
++  { { echo "$as_me:1408: 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:1410: error: $ac_config_sub $ac_cv_build_alias failed." >&5
++  { { echo "$as_me:1412: 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:1415: result: $ac_cv_build" >&5
++echo "$as_me:1417: 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:1422: checking host system type" >&5
++echo "$as_me:1424: 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
+@@ -1428,12 +1430,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:1431: error: $ac_config_sub $ac_cv_host_alias failed" >&5
++  { { echo "$as_me:1433: 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:1436: result: $ac_cv_host" >&5
++echo "$as_me:1438: 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/'`
+@@ -1441,7 +1443,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:1444: checking target system type" >&5
++	echo "$as_me:1446: 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
+@@ -1450,12 +1452,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:1453: error: $ac_config_sub $ac_cv_target_alias failed" >&5
++  { { echo "$as_me:1455: 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:1458: result: $ac_cv_target" >&5
++echo "$as_me:1460: 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/'`
+@@ -1487,13 +1489,13 @@
+ fi
+ 
+ test -z "$system_name" && system_name="$cf_cv_system_name"
+-test -n "$cf_cv_system_name" && echo "$as_me:1490: result: Configuring for $cf_cv_system_name" >&5
++test -n "$cf_cv_system_name" && echo "$as_me:1492: 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:1494: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
++	echo "$as_me:1496: 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:1496: error: \"Please remove config.cache and try again.\"" >&5
++	{ { echo "$as_me:1498: 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
+@@ -1501,7 +1503,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:1504: WARNING: overriding system type to $withval" >&5
++  { echo "$as_me:1506: 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
+@@ -1513,7 +1515,7 @@
+ 
+ ###	Default install-location
+ 
+-echo "$as_me:1516: checking for prefix" >&5
++echo "$as_me:1518: 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
+@@ -1525,11 +1527,11 @@
+ 		;;
+ 	esac
+ fi
+-echo "$as_me:1528: result: $prefix" >&5
++echo "$as_me:1530: result: $prefix" >&5
+ echo "${ECHO_T}$prefix" >&6
+ 
+ if test "x$prefix" = "xNONE" ; then
+-echo "$as_me:1532: checking for default include-directory" >&5
++echo "$as_me:1534: 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 \
+@@ -1552,7 +1554,7 @@
+ 	fi
+ 	test -n "$verbose"  && echo "	tested $cf_dir" 1>&6
+ done
+-echo "$as_me:1555: result: $includedir" >&5
++echo "$as_me:1557: result: $includedir" >&5
+ echo "${ECHO_T}$includedir" >&6
+ fi
+ 
+@@ -1615,7 +1617,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:1618: checking for $ac_word" >&5
++echo "$as_me:1620: 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
+@@ -1630,7 +1632,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:1633: found $ac_dir/$ac_word" >&5
++echo "$as_me:1635: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1638,10 +1640,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1641: result: $CC" >&5
++  echo "$as_me:1643: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1644: result: no" >&5
++  echo "$as_me:1646: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1654,7 +1656,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:1657: checking for $ac_word" >&5
++echo "$as_me:1659: 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
+@@ -1669,7 +1671,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:1672: found $ac_dir/$ac_word" >&5
++echo "$as_me:1674: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1677,10 +1679,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:1680: result: $ac_ct_CC" >&5
++  echo "$as_me:1682: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:1683: result: no" >&5
++  echo "$as_me:1685: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1690,32 +1692,32 @@
+   CC=$ac_ct_CC
+ fi
+ 
+-test -z "$CC" && { { echo "$as_me:1693: error: no acceptable cc found in \$PATH" >&5
++test -z "$CC" && { { echo "$as_me:1695: 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:1698:" \
++echo "$as_me:1700:" \
+      "checking for C compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:1701: \"$ac_compiler --version &5\"") >&5
++{ (eval echo "$as_me:1703: \"$ac_compiler --version &5\"") >&5
+   (eval $ac_compiler --version &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1704: \$? = $ac_status" >&5
++  echo "$as_me:1706: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:1706: \"$ac_compiler -v &5\"") >&5
++{ (eval echo "$as_me:1708: \"$ac_compiler -v &5\"") >&5
+   (eval $ac_compiler -v &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1709: \$? = $ac_status" >&5
++  echo "$as_me:1711: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:1711: \"$ac_compiler -V &5\"") >&5
++{ (eval echo "$as_me:1713: \"$ac_compiler -V &5\"") >&5
+   (eval $ac_compiler -V &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1714: \$? = $ac_status" >&5
++  echo "$as_me:1716: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 1718 "configure"
++#line 1720 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1731,13 +1733,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:1734: checking for C compiler default output" >&5
++echo "$as_me:1736: 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:1737: \"$ac_link_default\"") >&5
++if { (eval echo "$as_me:1739: \"$ac_link_default\"") >&5
+   (eval $ac_link_default) 2>&5
+   ac_status=$?
+-  echo "$as_me:1740: \$? = $ac_status" >&5
++  echo "$as_me:1742: \$? = $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
+@@ -1760,34 +1762,34 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-{ { echo "$as_me:1763: error: C compiler cannot create executables" >&5
++{ { echo "$as_me:1765: 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:1769: result: $ac_file" >&5
++echo "$as_me:1771: 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:1774: checking whether the C compiler works" >&5
++echo "$as_me:1776: 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:1780: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1782: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1783: \$? = $ac_status" >&5
++  echo "$as_me:1785: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+     cross_compiling=no
+   else
+     if test "$cross_compiling" = maybe; then
+ 	cross_compiling=yes
+     else
+-	{ { echo "$as_me:1790: error: cannot run C compiled programs.
++	{ { echo "$as_me:1792: 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;}
+@@ -1795,24 +1797,24 @@
+     fi
+   fi
+ fi
+-echo "$as_me:1798: result: yes" >&5
++echo "$as_me:1800: 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:1805: checking whether we are cross compiling" >&5
++echo "$as_me:1807: checking whether we are cross compiling" >&5
+ echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:1807: result: $cross_compiling" >&5
++echo "$as_me:1809: result: $cross_compiling" >&5
+ echo "${ECHO_T}$cross_compiling" >&6
+ 
+-echo "$as_me:1810: checking for executable suffix" >&5
++echo "$as_me:1812: checking for executable suffix" >&5
+ echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+-if { (eval echo "$as_me:1812: \"$ac_link\"") >&5
++if { (eval echo "$as_me:1814: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:1815: \$? = $ac_status" >&5
++  echo "$as_me:1817: \$? = $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
+@@ -1828,25 +1830,25 @@
+   esac
+ done
+ else
+-  { { echo "$as_me:1831: error: cannot compute EXEEXT: cannot compile and link" >&5
++  { { echo "$as_me:1833: 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:1837: result: $ac_cv_exeext" >&5
++echo "$as_me:1839: 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:1843: checking for object suffix" >&5
++echo "$as_me:1845: 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 1849 "configure"
++#line 1851 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1858,10 +1860,10 @@
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (eval echo "$as_me:1861: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1863: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1864: \$? = $ac_status" >&5
++  echo "$as_me:1866: \$? = $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
+@@ -1873,24 +1875,24 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-{ { echo "$as_me:1876: error: cannot compute OBJEXT: cannot compile" >&5
++{ { echo "$as_me:1878: 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:1883: result: $ac_cv_objext" >&5
++echo "$as_me:1885: result: $ac_cv_objext" >&5
+ echo "${ECHO_T}$ac_cv_objext" >&6
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-echo "$as_me:1887: checking whether we are using the GNU C compiler" >&5
++echo "$as_me:1889: 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 1893 "configure"
++#line 1895 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1905,16 +1907,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1908: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1910: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1911: \$? = $ac_status" >&5
++  echo "$as_me:1913: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1914: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1916: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1917: \$? = $ac_status" >&5
++  echo "$as_me:1919: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_compiler_gnu=yes
+ else
+@@ -1926,19 +1928,19 @@
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:1929: result: $ac_cv_c_compiler_gnu" >&5
++echo "$as_me:1931: 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:1935: checking whether $CC accepts -g" >&5
++echo "$as_me:1937: 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 1941 "configure"
++#line 1943 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1950,16 +1952,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1953: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1955: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1956: \$? = $ac_status" >&5
++  echo "$as_me:1958: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1959: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1961: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1962: \$? = $ac_status" >&5
++  echo "$as_me:1964: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_prog_cc_g=yes
+ else
+@@ -1969,7 +1971,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:1972: result: $ac_cv_prog_cc_g" >&5
++echo "$as_me:1974: 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
+@@ -1996,16 +1998,16 @@
+ #endif
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1999: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2001: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2002: \$? = $ac_status" >&5
++  echo "$as_me:2004: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2005: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2007: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2008: \$? = $ac_status" >&5
++  echo "$as_me:2010: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   for ac_declaration in \
+    ''\
+@@ -2017,7 +2019,7 @@
+    'void exit (int);'
+ do
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2020 "configure"
++#line 2022 "configure"
+ #include "confdefs.h"
+ #include 
+ $ac_declaration
+@@ -2030,16 +2032,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2033: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2035: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2036: \$? = $ac_status" >&5
++  echo "$as_me:2038: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2039: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2041: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2042: \$? = $ac_status" >&5
++  echo "$as_me:2044: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -2049,7 +2051,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2052 "configure"
++#line 2054 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -2061,16 +2063,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2064: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2066: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2067: \$? = $ac_status" >&5
++  echo "$as_me:2069: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2070: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2072: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2073: \$? = $ac_status" >&5
++  echo "$as_me:2075: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -2100,15 +2102,15 @@
+ 
+ GCC_VERSION=none
+ if test "$GCC" = yes ; then
+-	echo "$as_me:2103: checking version of $CC" >&5
++	echo "$as_me:2105: 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:2107: result: $GCC_VERSION" >&5
++	echo "$as_me:2109: result: $GCC_VERSION" >&5
+ echo "${ECHO_T}$GCC_VERSION" >&6
+ fi
+ 
+-echo "$as_me:2111: checking for $CC option to accept ANSI C" >&5
++echo "$as_me:2113: 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
+@@ -2116,7 +2118,7 @@
+   ac_cv_prog_cc_stdc=no
+ ac_save_CC=$CC
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 2119 "configure"
++#line 2121 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -2165,16 +2167,16 @@
+ do
+   CC="$ac_save_CC $ac_arg"
+   rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2168: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2170: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2171: \$? = $ac_status" >&5
++  echo "$as_me:2173: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2174: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2176: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2177: \$? = $ac_status" >&5
++  echo "$as_me:2179: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_prog_cc_stdc=$ac_arg
+ break
+@@ -2191,10 +2193,10 @@
+ 
+ case "x$ac_cv_prog_cc_stdc" in
+   x|xno)
+-    echo "$as_me:2194: result: none needed" >&5
++    echo "$as_me:2196: result: none needed" >&5
+ echo "${ECHO_T}none needed" >&6 ;;
+   *)
+-    echo "$as_me:2197: result: $ac_cv_prog_cc_stdc" >&5
++    echo "$as_me:2199: result: $ac_cv_prog_cc_stdc" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+     CC="$CC $ac_cv_prog_cc_stdc" ;;
+ esac
+@@ -2202,13 +2204,13 @@
+ # This should have been defined by AC_PROG_CC
+ : ${CC:=cc}
+ 
+-echo "$as_me:2205: checking \$CFLAGS variable" >&5
++echo "$as_me:2207: checking \$CFLAGS variable" >&5
+ echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
+ case "x$CFLAGS" in
+ (*-[IUD]*)
+-	echo "$as_me:2209: result: broken" >&5
++	echo "$as_me:2211: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+-	{ echo "$as_me:2211: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
++	{ echo "$as_me:2213: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+ echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;}
+ 	cf_flags="$CFLAGS"
+ 	CFLAGS=
+@@ -2316,18 +2318,18 @@
+ 	done
+ 	;;
+ (*)
+-	echo "$as_me:2319: result: ok" >&5
++	echo "$as_me:2321: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ 	;;
+ esac
+ 
+-echo "$as_me:2324: checking \$CC variable" >&5
++echo "$as_me:2326: checking \$CC variable" >&5
+ echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
+ case "$CC" in
+ (*[\ \	]-*)
+-	echo "$as_me:2328: result: broken" >&5
++	echo "$as_me:2330: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+-	{ echo "$as_me:2330: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
++	{ echo "$as_me:2332: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+ echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
+ 	# humor him...
+ 	cf_prog=`echo "$CC" | sed -e 's/	/ /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'`
+@@ -2444,19 +2446,19 @@
+ 	done
+ 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
+ 
+-echo "${as_me:-configure}:2447: testing resulting CC: '$CC' ..." 1>&5
++echo "${as_me:-configure}:2449: testing resulting CC: '$CC' ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
+ 
+-echo "${as_me:-configure}:2451: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
++echo "${as_me:-configure}:2453: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
+ 
+-echo "${as_me:-configure}:2455: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
++echo "${as_me:-configure}:2457: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+ 
+ 	;;
+ (*)
+-	echo "$as_me:2459: result: ok" >&5
++	echo "$as_me:2461: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ 	;;
+ esac
+@@ -2467,7 +2469,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:2470: checking how to run the C preprocessor" >&5
++echo "$as_me:2472: 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
+@@ -2488,18 +2490,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 2491 "configure"
++#line 2493 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2496: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:2498: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:2502: \$? = $ac_status" >&5
++  echo "$as_me:2504: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2522,17 +2524,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2525 "configure"
++#line 2527 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:2529: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:2531: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:2535: \$? = $ac_status" >&5
++  echo "$as_me:2537: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2569,7 +2571,7 @@
+ else
+   ac_cv_prog_CPP=$CPP
+ fi
+-echo "$as_me:2572: result: $CPP" >&5
++echo "$as_me:2574: result: $CPP" >&5
+ echo "${ECHO_T}$CPP" >&6
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+@@ -2579,18 +2581,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 2582 "configure"
++#line 2584 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2587: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:2589: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:2593: \$? = $ac_status" >&5
++  echo "$as_me:2595: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2613,17 +2615,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2616 "configure"
++#line 2618 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:2620: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:2622: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:2626: \$? = $ac_status" >&5
++  echo "$as_me:2628: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2651,7 +2653,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:2654: error: C preprocessor \"$CPP\" fails sanity check" >&5
++  { { echo "$as_me:2656: error: C preprocessor \"$CPP\" fails sanity check" >&5
+ echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -2664,14 +2666,14 @@
+ ac_main_return=return
+ 
+ if test $ac_cv_c_compiler_gnu = yes; then
+-    echo "$as_me:2667: checking whether $CC needs -traditional" >&5
++    echo "$as_me:2669: 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 2674 "configure"
++#line 2676 "configure"
+ #include "confdefs.h"
+ #include 
+ int Autoconf = TIOCGETP;
+@@ -2686,7 +2688,7 @@
+ 
+   if test $ac_cv_prog_gcc_traditional = no; then
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 2689 "configure"
++#line 2691 "configure"
+ #include "confdefs.h"
+ #include 
+ int Autoconf = TCGETA;
+@@ -2699,14 +2701,14 @@
+ 
+   fi
+ fi
+-echo "$as_me:2702: result: $ac_cv_prog_gcc_traditional" >&5
++echo "$as_me:2704: 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:2709: checking whether $CC understands -c and -o together" >&5
++echo "$as_me:2711: 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
+@@ -2721,15 +2723,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:2724: \"$ac_try\"") >&5
++if { (eval echo "$as_me:2726: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2727: \$? = $ac_status" >&5
++  echo "$as_me:2729: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:2729: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:2731: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2732: \$? = $ac_status" >&5
++  echo "$as_me:2734: \$? = $ac_status" >&5
+   (exit $ac_status); };
+ then
+   eval cf_cv_prog_CC_c_o=yes
+@@ -2740,10 +2742,10 @@
+ 
+ fi
+ if test $cf_cv_prog_CC_c_o = yes; then
+-  echo "$as_me:2743: result: yes" >&5
++  echo "$as_me:2745: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:2746: result: no" >&5
++  echo "$as_me:2748: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2757,7 +2759,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:2760: checking for $ac_word" >&5
++echo "$as_me:2762: 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
+@@ -2774,7 +2776,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:2777: found $ac_dir/$ac_word" >&5
++   echo "$as_me:2779: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -2785,10 +2787,10 @@
+ LDCONFIG=$ac_cv_path_LDCONFIG
+ 
+ if test -n "$LDCONFIG"; then
+-  echo "$as_me:2788: result: $LDCONFIG" >&5
++  echo "$as_me:2790: result: $LDCONFIG" >&5
+ echo "${ECHO_T}$LDCONFIG" >&6
+ else
+-  echo "$as_me:2791: result: no" >&5
++  echo "$as_me:2793: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2796,7 +2798,7 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:2799: checking if you want to ensure bool is consistent with C++" >&5
++echo "$as_me:2801: 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.
+@@ -2806,7 +2808,7 @@
+ else
+   cf_with_cxx=yes
+ fi;
+-echo "$as_me:2809: result: $cf_with_cxx" >&5
++echo "$as_me:2811: result: $cf_with_cxx" >&5
+ echo "${ECHO_T}$cf_with_cxx" >&6
+ if test "X$cf_with_cxx" = Xno ; then
+ 	CXX=""
+@@ -2824,7 +2826,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:2827: checking for $ac_word" >&5
++echo "$as_me:2829: 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
+@@ -2839,7 +2841,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:2842: found $ac_dir/$ac_word" >&5
++echo "$as_me:2844: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2847,10 +2849,10 @@
+ fi
+ CXX=$ac_cv_prog_CXX
+ if test -n "$CXX"; then
+-  echo "$as_me:2850: result: $CXX" >&5
++  echo "$as_me:2852: result: $CXX" >&5
+ echo "${ECHO_T}$CXX" >&6
+ else
+-  echo "$as_me:2853: result: no" >&5
++  echo "$as_me:2855: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2863,7 +2865,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:2866: checking for $ac_word" >&5
++echo "$as_me:2868: 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
+@@ -2878,7 +2880,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:2881: found $ac_dir/$ac_word" >&5
++echo "$as_me:2883: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2886,10 +2888,10 @@
+ fi
+ ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+ if test -n "$ac_ct_CXX"; then
+-  echo "$as_me:2889: result: $ac_ct_CXX" >&5
++  echo "$as_me:2891: result: $ac_ct_CXX" >&5
+ echo "${ECHO_T}$ac_ct_CXX" >&6
+ else
+-  echo "$as_me:2892: result: no" >&5
++  echo "$as_me:2894: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2901,32 +2903,32 @@
+ fi
+ 
+ # Provide some information about the compiler.
+-echo "$as_me:2904:" \
++echo "$as_me:2906:" \
+      "checking for C++ compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:2907: \"$ac_compiler --version &5\"") >&5
++{ (eval echo "$as_me:2909: \"$ac_compiler --version &5\"") >&5
+   (eval $ac_compiler --version &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:2910: \$? = $ac_status" >&5
++  echo "$as_me:2912: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:2912: \"$ac_compiler -v &5\"") >&5
++{ (eval echo "$as_me:2914: \"$ac_compiler -v &5\"") >&5
+   (eval $ac_compiler -v &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:2915: \$? = $ac_status" >&5
++  echo "$as_me:2917: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:2917: \"$ac_compiler -V &5\"") >&5
++{ (eval echo "$as_me:2919: \"$ac_compiler -V &5\"") >&5
+   (eval $ac_compiler -V &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:2920: \$? = $ac_status" >&5
++  echo "$as_me:2922: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ 
+-echo "$as_me:2923: checking whether we are using the GNU C++ compiler" >&5
++echo "$as_me:2925: 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 2929 "configure"
++#line 2931 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2941,16 +2943,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2944: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2946: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2947: \$? = $ac_status" >&5
++  echo "$as_me:2949: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2950: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2952: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2953: \$? = $ac_status" >&5
++  echo "$as_me:2955: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_compiler_gnu=yes
+ else
+@@ -2962,19 +2964,19 @@
+ ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:2965: result: $ac_cv_cxx_compiler_gnu" >&5
++echo "$as_me:2967: 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:2971: checking whether $CXX accepts -g" >&5
++echo "$as_me:2973: 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 2977 "configure"
++#line 2979 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2986,16 +2988,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2989: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2991: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2992: \$? = $ac_status" >&5
++  echo "$as_me:2994: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2995: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2997: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2998: \$? = $ac_status" >&5
++  echo "$as_me:3000: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_prog_cxx_g=yes
+ else
+@@ -3005,7 +3007,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:3008: result: $ac_cv_prog_cxx_g" >&5
++echo "$as_me:3010: 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
+@@ -3032,7 +3034,7 @@
+    'void exit (int);'
+ do
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 3035 "configure"
++#line 3037 "configure"
+ #include "confdefs.h"
+ #include 
+ $ac_declaration
+@@ -3045,16 +3047,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3048: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3050: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3051: \$? = $ac_status" >&5
++  echo "$as_me:3053: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3054: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3056: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3057: \$? = $ac_status" >&5
++  echo "$as_me:3059: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -3064,7 +3066,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 3067 "configure"
++#line 3069 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -3076,16 +3078,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3079: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3081: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3082: \$? = $ac_status" >&5
++  echo "$as_me:3084: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3085: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3087: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3088: \$? = $ac_status" >&5
++  echo "$as_me:3090: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -3119,7 +3121,7 @@
+ 	then
+ 		# Several of the C++ configurations do not work, particularly when
+ 		# cross-compiling (20140913 -TD)
+-		echo "$as_me:3122: checking if $CXX works" >&5
++		echo "$as_me:3124: checking if $CXX works" >&5
+ echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
+ 
+ 		save_CPPFLAGS="$CPPFLAGS"
+@@ -3127,7 +3129,7 @@
+ 		CPPFLAGS="$CPPFLAGS -I${cf_includedir}"
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 3130 "configure"
++#line 3132 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -3144,16 +3146,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3147: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3149: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3150: \$? = $ac_status" >&5
++  echo "$as_me:3152: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3153: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3155: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3156: \$? = $ac_status" >&5
++  echo "$as_me:3158: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cxx_works=yes
+ else
+@@ -3164,11 +3166,11 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 		CPPFLAGS="$save_CPPFLAGS"
+ 
+-		echo "$as_me:3167: result: $cf_cxx_works" >&5
++		echo "$as_me:3169: result: $cf_cxx_works" >&5
+ echo "${ECHO_T}$cf_cxx_works" >&6
+ 		if test "x$cf_cxx_works" = xno
+ 		then
+-			{ echo "$as_me:3171: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5
++			{ echo "$as_me:3173: 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
+@@ -3184,7 +3186,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:3187: checking for $ac_word" >&5
++echo "$as_me:3189: 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
+@@ -3201,7 +3203,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:3204: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3206: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -3212,17 +3214,17 @@
+ CXX=$ac_cv_path_CXX
+ 
+ if test -n "$CXX"; then
+-  echo "$as_me:3215: result: $CXX" >&5
++  echo "$as_me:3217: result: $CXX" >&5
+ echo "${ECHO_T}$CXX" >&6
+ else
+-  echo "$as_me:3218: result: no" >&5
++  echo "$as_me:3220: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ 	fi
+ 	case "x$CXX" in
+ 	(x|xg++)
+-		{ echo "$as_me:3225: WARNING: You don't have any C++ compiler, too bad" >&5
++		{ echo "$as_me:3227: 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="";
+ 		;;
+@@ -3231,7 +3233,7 @@
+ 
+ GXX_VERSION=none
+ if test "$GXX" = yes; then
+-	echo "$as_me:3234: checking version of ${CXX:-g++}" >&5
++	echo "$as_me:3236: 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.].*//'`"
+ 	if test -z "$GXX_VERSION"
+@@ -3239,7 +3241,7 @@
+ 		GXX_VERSION=unknown
+ 		GXX=no
+ 	fi
+-	echo "$as_me:3242: result: $GXX_VERSION" >&5
++	echo "$as_me:3244: result: $GXX_VERSION" >&5
+ echo "${ECHO_T}$GXX_VERSION" >&6
+ fi
+ 
+@@ -3247,12 +3249,12 @@
+ (1*|2.[0-6]*)
+ 	# GXX=""; CXX=""; ac_cv_prog_gxx=no
+ 	# cf_cxx_library=no
+-	{ echo "$as_me:3250: WARNING: templates do not work" >&5
++	{ echo "$as_me:3252: WARNING: templates do not work" >&5
+ echo "$as_me: WARNING: templates do not work" >&2;}
+ 	;;
+ esac
+ 
+-echo "$as_me:3255: checking if you want to build C++ binding and demo" >&5
++echo "$as_me:3257: 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.
+@@ -3262,15 +3264,15 @@
+ else
+   cf_with_cxx_binding=$cf_with_cxx
+ fi;
+-echo "$as_me:3265: result: $cf_with_cxx_binding" >&5
++echo "$as_me:3267: result: $cf_with_cxx_binding" >&5
+ echo "${ECHO_T}$cf_with_cxx_binding" >&6
+ 
+-echo "$as_me:3268: checking if you want to build with Ada95" >&5
++echo "$as_me:3270: 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:3270: result: $cf_with_ada" >&5
++echo "$as_me:3272: result: $cf_with_ada" >&5
+ echo "${ECHO_T}$cf_with_ada" >&6
+ 
+-echo "$as_me:3273: checking if you want to install terminal database" >&5
++echo "$as_me:3275: 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.
+@@ -3280,10 +3282,10 @@
+ else
+   cf_with_db_install=yes
+ fi;
+-echo "$as_me:3283: result: $cf_with_db_install" >&5
++echo "$as_me:3285: result: $cf_with_db_install" >&5
+ echo "${ECHO_T}$cf_with_db_install" >&6
+ 
+-echo "$as_me:3286: checking if you want to install manpages" >&5
++echo "$as_me:3288: 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.
+@@ -3293,10 +3295,10 @@
+ else
+   cf_with_manpages=yes
+ fi;
+-echo "$as_me:3296: result: $cf_with_manpages" >&5
++echo "$as_me:3298: result: $cf_with_manpages" >&5
+ echo "${ECHO_T}$cf_with_manpages" >&6
+ 
+-echo "$as_me:3299: checking if you want to build programs such as tic" >&5
++echo "$as_me:3301: 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.
+@@ -3306,18 +3308,18 @@
+ else
+   cf_with_progs=yes
+ fi;
+-echo "$as_me:3309: result: $cf_with_progs" >&5
++echo "$as_me:3311: result: $cf_with_progs" >&5
+ echo "${ECHO_T}$cf_with_progs" >&6
+ 
+ if test -f $srcdir/tack/tack.h; then
+ 	if test "x$cross_compiling" = xyes ; then
+ 		test -n "$verbose" && echo "	ignoring tack because we are cross-compiling" 1>&6
+ 
+-echo "${as_me:-configure}:3316: testing ignoring tack because we are cross-compiling ..." 1>&5
++echo "${as_me:-configure}:3318: testing ignoring tack because we are cross-compiling ..." 1>&5
+ 
+ 		cf_with_tack=no
+ 	else
+-		echo "$as_me:3320: checking if you want to build the tack program" >&5
++		echo "$as_me:3322: checking if you want to build the tack program" >&5
+ echo $ECHO_N "checking if you want to build the tack program... $ECHO_C" >&6
+ 
+ # Check whether --with-tack or --without-tack was given.
+@@ -3327,14 +3329,14 @@
+ else
+   cf_with_tack=$cf_with_progs
+ fi;
+-		echo "$as_me:3330: result: $cf_with_tack" >&5
++		echo "$as_me:3332: result: $cf_with_tack" >&5
+ echo "${ECHO_T}$cf_with_tack" >&6
+ 	fi
+ else
+ 	cf_with_tack=no
+ fi
+ 
+-echo "$as_me:3337: checking if you want to build test-programs" >&5
++echo "$as_me:3339: 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.
+@@ -3344,10 +3346,10 @@
+ else
+   cf_with_tests=yes
+ fi;
+-echo "$as_me:3347: result: $cf_with_tests" >&5
++echo "$as_me:3349: result: $cf_with_tests" >&5
+ echo "${ECHO_T}$cf_with_tests" >&6
+ 
+-echo "$as_me:3350: checking if you wish to install curses.h" >&5
++echo "$as_me:3352: 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.
+@@ -3357,7 +3359,7 @@
+ else
+   with_curses_h=yes
+ fi;
+-echo "$as_me:3360: result: $with_curses_h" >&5
++echo "$as_me:3362: result: $with_curses_h" >&5
+ echo "${ECHO_T}$with_curses_h" >&6
+ 
+ modules_to_build="ncurses"
+@@ -3382,7 +3384,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:3385: checking for $ac_word" >&5
++echo "$as_me:3387: 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
+@@ -3397,7 +3399,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_AWK="$ac_prog"
+-echo "$as_me:3400: found $ac_dir/$ac_word" >&5
++echo "$as_me:3402: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3405,21 +3407,21 @@
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+-  echo "$as_me:3408: result: $AWK" >&5
++  echo "$as_me:3410: result: $AWK" >&5
+ echo "${ECHO_T}$AWK" >&6
+ else
+-  echo "$as_me:3411: result: no" >&5
++  echo "$as_me:3413: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+   test -n "$AWK" && break
+ done
+ 
+-test -z "$AWK" && { { echo "$as_me:3418: error: No awk program found" >&5
++test -z "$AWK" && { { echo "$as_me:3420: error: No awk program found" >&5
+ echo "$as_me: error: No awk program found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:3422: checking for egrep" >&5
++echo "$as_me:3424: 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
+@@ -3429,11 +3431,11 @@
+ 		else ac_cv_prog_egrep='egrep'
+ 	fi
+ fi
+-echo "$as_me:3432: result: $ac_cv_prog_egrep" >&5
++echo "$as_me:3434: 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:3436: error: No egrep program found" >&5
++	test -z "$EGREP" && { { echo "$as_me:3438: error: No egrep program found" >&5
+ echo "$as_me: error: No egrep program found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -3449,7 +3451,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:3452: checking for a BSD compatible install" >&5
++echo "$as_me:3454: 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
+@@ -3498,7 +3500,7 @@
+     INSTALL=$ac_install_sh
+   fi
+ fi
+-echo "$as_me:3501: result: $INSTALL" >&5
++echo "$as_me:3503: result: $INSTALL" >&5
+ echo "${ECHO_T}$INSTALL" >&6
+ 
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -3523,7 +3525,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:3526: checking for $ac_word" >&5
++echo "$as_me:3528: 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
+@@ -3538,7 +3540,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LINT="$ac_prog"
+-echo "$as_me:3541: found $ac_dir/$ac_word" >&5
++echo "$as_me:3543: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3546,28 +3548,28 @@
+ fi
+ LINT=$ac_cv_prog_LINT
+ if test -n "$LINT"; then
+-  echo "$as_me:3549: result: $LINT" >&5
++  echo "$as_me:3551: result: $LINT" >&5
+ echo "${ECHO_T}$LINT" >&6
+ else
+-  echo "$as_me:3552: result: no" >&5
++  echo "$as_me:3554: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+   test -n "$LINT" && break
+ done
+ 
+-echo "$as_me:3559: checking whether ln -s works" >&5
++echo "$as_me:3561: 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:3563: result: yes" >&5
++  echo "$as_me:3565: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:3566: result: no, using $LN_S" >&5
++  echo "$as_me:3568: result: no, using $LN_S" >&5
+ echo "${ECHO_T}no, using $LN_S" >&6
+ fi
+ 
+-echo "$as_me:3570: checking if $LN_S -f options work" >&5
++echo "$as_me:3572: 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
+@@ -3579,12 +3581,12 @@
+ 	cf_prog_ln_sf=no
+ fi
+ rm -f conf$$.dst conf$$src
+-echo "$as_me:3582: result: $cf_prog_ln_sf" >&5
++echo "$as_me:3584: 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:3587: checking for long file names" >&5
++echo "$as_me:3589: 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
+@@ -3623,7 +3625,7 @@
+   rm -rf $ac_xdir 2>/dev/null
+ done
+ fi
+-echo "$as_me:3626: result: $ac_cv_sys_long_file_names" >&5
++echo "$as_me:3628: 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
+ 
+@@ -3642,7 +3644,7 @@
+   withval="$with_config_suffix"
+   case "x$withval" in
+ 	(xyes|xno)
+-		{ echo "$as_me:3645: WARNING: expected a value for config-suffix option" >&5
++		{ echo "$as_me:3647: WARNING: expected a value for config-suffix option" >&5
+ echo "$as_me: WARNING: expected a value for config-suffix option" >&2;}
+ 		;;
+ 	(*)	cf_config_suffix="$withval"
+@@ -3652,7 +3654,7 @@
+ 
+ # If we find pkg-config, check if we should install the ".pc" files.
+ 
+-echo "$as_me:3655: checking if you want to use pkg-config" >&5
++echo "$as_me:3657: 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.
+@@ -3662,7 +3664,7 @@
+ else
+   cf_pkg_config=yes
+ fi;
+-echo "$as_me:3665: result: $cf_pkg_config" >&5
++echo "$as_me:3667: result: $cf_pkg_config" >&5
+ echo "${ECHO_T}$cf_pkg_config" >&6
+ 
+ case $cf_pkg_config in
+@@ -3674,7 +3676,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:3677: checking for $ac_word" >&5
++echo "$as_me:3679: 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
+@@ -3691,7 +3693,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:3694: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3696: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -3702,10 +3704,10 @@
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ 
+ if test -n "$PKG_CONFIG"; then
+-  echo "$as_me:3705: result: $PKG_CONFIG" >&5
++  echo "$as_me:3707: result: $PKG_CONFIG" >&5
+ echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+-  echo "$as_me:3708: result: no" >&5
++  echo "$as_me:3710: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3714,7 +3716,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:3717: checking for $ac_word" >&5
++echo "$as_me:3719: 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
+@@ -3731,7 +3733,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:3734: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3736: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -3743,10 +3745,10 @@
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+ 
+ if test -n "$ac_pt_PKG_CONFIG"; then
+-  echo "$as_me:3746: result: $ac_pt_PKG_CONFIG" >&5
++  echo "$as_me:3748: result: $ac_pt_PKG_CONFIG" >&5
+ echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+ else
+-  echo "$as_me:3749: result: no" >&5
++  echo "$as_me:3751: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3789,24 +3791,24 @@
+ 	PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:3792: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++	{ { echo "$as_me:3794: 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:3799: WARNING: pkg-config is not installed" >&5
++	{ echo "$as_me:3801: 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:3805: checking for pkg-config library directory" >&5
++	echo "$as_me:3807: checking for pkg-config library directory" >&5
+ echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
+ 	;;
+ (*)
+-	echo "$as_me:3809: checking for $PKG_CONFIG library directory" >&5
++	echo "$as_me:3811: checking for $PKG_CONFIG library directory" >&5
+ echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
+ 	;;
+ esac
+@@ -3861,18 +3863,18 @@
+ 
+ 	test -n "$verbose" && echo "	list..." 1>&6
+ 
+-echo "${as_me:-configure}:3864: testing list... ..." 1>&5
++echo "${as_me:-configure}:3866: 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}:3870: testing checking $cf_config/pkgconfig ..." 1>&5
++echo "${as_me:-configure}:3872: testing checking $cf_config/pkgconfig ..." 1>&5
+ 
+ 		if test -d $cf_config/pkgconfig
+ 		then
+ 			PKG_CONFIG_LIBDIR=$cf_config/pkgconfig
+-			echo "$as_me:3875: checking done" >&5
++			echo "$as_me:3877: checking done" >&5
+ echo $ECHO_N "checking done... $ECHO_C" >&6
+ 			break
+ 		fi
+@@ -3883,16 +3885,16 @@
+ esac
+ 
+ if test "x$PKG_CONFIG_LIBDIR" != xno ; then
+-	echo "$as_me:3886: result: $PKG_CONFIG_LIBDIR" >&5
++	echo "$as_me:3888: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ fi
+ 
+ if test "x$PKG_CONFIG" != xnone
+ then
+-	echo "$as_me:3892: checking if we should install .pc files for $PKG_CONFIG" >&5
++	echo "$as_me:3894: 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:3895: checking if we should install .pc files" >&5
++	echo "$as_me:3897: checking if we should install .pc files" >&5
+ echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6
+ fi
+ 
+@@ -3903,7 +3905,7 @@
+ else
+   enable_pc_files=no
+ fi;
+-echo "$as_me:3906: result: $enable_pc_files" >&5
++echo "$as_me:3908: result: $enable_pc_files" >&5
+ echo "${ECHO_T}$enable_pc_files" >&6
+ 
+ if test "x$enable_pc_files" != xno
+@@ -3911,7 +3913,7 @@
+ 	MAKE_PC_FILES=
+ 	case "x$PKG_CONFIG_LIBDIR" in
+ 	(xno|xyes)
+-		{ echo "$as_me:3914: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
++		{ echo "$as_me:3916: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
+ echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
+ 		;;
+ 	(*)
+@@ -3941,7 +3943,7 @@
+ 	PKG_CONFIG_LIBDIR=`echo $PKG_CONFIG_LIBDIR | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:3944: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5
++	{ { echo "$as_me:3946: 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; }; }
+ 	;;
+@@ -3955,7 +3957,7 @@
+ 
+ if test -z "$MAKE_PC_FILES"
+ then
+-	echo "$as_me:3958: checking for suffix to add to pc-files" >&5
++	echo "$as_me:3960: 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.
+@@ -3970,13 +3972,13 @@
+ 	esac
+ fi;
+ 	test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
+-	echo "$as_me:3973: result: $PC_MODULE_SUFFIX" >&5
++	echo "$as_me:3975: result: $PC_MODULE_SUFFIX" >&5
+ echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
+ 	test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
+ 
+ fi
+ 
+-echo "$as_me:3979: checking if we should assume mixed-case filenames" >&5
++echo "$as_me:3981: 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.
+@@ -3986,11 +3988,11 @@
+ else
+   enable_mixedcase=auto
+ fi;
+-echo "$as_me:3989: result: $enable_mixedcase" >&5
++echo "$as_me:3991: result: $enable_mixedcase" >&5
+ echo "${ECHO_T}$enable_mixedcase" >&6
+ if test "$enable_mixedcase" = "auto" ; then
+ 
+-echo "$as_me:3993: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:3995: 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
+@@ -4017,7 +4019,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:4020: result: $cf_cv_mixedcase" >&5
++echo "$as_me:4022: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -4036,7 +4038,7 @@
+ fi
+ 
+ # do this after mixed-case option (tags/TAGS is not as important as tic).
+-echo "$as_me:4039: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:4041: 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
+@@ -4056,11 +4058,11 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "$as_me:4059: result: yes" >&5
++  echo "$as_me:4061: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+   SET_MAKE=
+ else
+-  echo "$as_me:4063: result: no" >&5
++  echo "$as_me:4065: result: no" >&5
+ echo "${ECHO_T}no" >&6
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+@@ -4069,7 +4071,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:4072: checking for $ac_word" >&5
++echo "$as_me:4074: 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
+@@ -4084,7 +4086,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CTAGS="$ac_prog"
+-echo "$as_me:4087: found $ac_dir/$ac_word" >&5
++echo "$as_me:4089: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4092,10 +4094,10 @@
+ fi
+ CTAGS=$ac_cv_prog_CTAGS
+ if test -n "$CTAGS"; then
+-  echo "$as_me:4095: result: $CTAGS" >&5
++  echo "$as_me:4097: result: $CTAGS" >&5
+ echo "${ECHO_T}$CTAGS" >&6
+ else
+-  echo "$as_me:4098: result: no" >&5
++  echo "$as_me:4100: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4106,7 +4108,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:4109: 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_ETAGS+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4121,7 +4123,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ETAGS="$ac_prog"
+-echo "$as_me:4124: found $ac_dir/$ac_word" >&5
++echo "$as_me:4126: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4129,10 +4131,10 @@
+ fi
+ ETAGS=$ac_cv_prog_ETAGS
+ if test -n "$ETAGS"; then
+-  echo "$as_me:4132: result: $ETAGS" >&5
++  echo "$as_me:4134: result: $ETAGS" >&5
+ echo "${ECHO_T}$ETAGS" >&6
+ else
+-  echo "$as_me:4135: result: no" >&5
++  echo "$as_me:4137: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4141,7 +4143,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:4144: 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_MAKE_LOWER_TAGS+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4156,7 +4158,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:4159: found $ac_dir/$ac_word" >&5
++echo "$as_me:4161: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4165,17 +4167,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+-  echo "$as_me:4168: result: $MAKE_LOWER_TAGS" >&5
++  echo "$as_me:4170: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+-  echo "$as_me:4171: result: no" >&5
++  echo "$as_me:4173: 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:4178: checking for $ac_word" >&5
++echo "$as_me:4180: 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
+@@ -4190,7 +4192,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:4193: found $ac_dir/$ac_word" >&5
++echo "$as_me:4195: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4199,10 +4201,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+-  echo "$as_me:4202: result: $MAKE_UPPER_TAGS" >&5
++  echo "$as_me:4204: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+-  echo "$as_me:4205: result: no" >&5
++  echo "$as_me:4207: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4222,7 +4224,7 @@
+ 	MAKE_LOWER_TAGS="#"
+ fi
+ 
+-echo "$as_me:4225: checking for makeflags variable" >&5
++echo "$as_me:4227: 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
+@@ -4252,7 +4254,7 @@
+ 			;;
+ 		(*)
+ 
+-echo "${as_me:-configure}:4255: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
++echo "${as_me:-configure}:4257: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+ 
+ 			;;
+ 		esac
+@@ -4260,13 +4262,13 @@
+ 	rm -f cf_makeflags.tmp
+ 
+ fi
+-echo "$as_me:4263: result: $cf_cv_makeflags" >&5
++echo "$as_me:4265: 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:4269: checking for $ac_word" >&5
++echo "$as_me:4271: 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
+@@ -4281,7 +4283,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:4284: found $ac_dir/$ac_word" >&5
++echo "$as_me:4286: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4289,10 +4291,10 @@
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+-  echo "$as_me:4292: result: $RANLIB" >&5
++  echo "$as_me:4294: result: $RANLIB" >&5
+ echo "${ECHO_T}$RANLIB" >&6
+ else
+-  echo "$as_me:4295: result: no" >&5
++  echo "$as_me:4297: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4301,7 +4303,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:4304: checking for $ac_word" >&5
++echo "$as_me:4306: 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
+@@ -4316,7 +4318,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:4319: found $ac_dir/$ac_word" >&5
++echo "$as_me:4321: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4325,10 +4327,10 @@
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+-  echo "$as_me:4328: result: $ac_ct_RANLIB" >&5
++  echo "$as_me:4330: result: $ac_ct_RANLIB" >&5
+ echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+-  echo "$as_me:4331: result: no" >&5
++  echo "$as_me:4333: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4340,7 +4342,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:4343: checking for $ac_word" >&5
++echo "$as_me:4345: 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
+@@ -4355,7 +4357,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:4358: found $ac_dir/$ac_word" >&5
++echo "$as_me:4360: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4363,10 +4365,10 @@
+ fi
+ LD=$ac_cv_prog_LD
+ if test -n "$LD"; then
+-  echo "$as_me:4366: result: $LD" >&5
++  echo "$as_me:4368: result: $LD" >&5
+ echo "${ECHO_T}$LD" >&6
+ else
+-  echo "$as_me:4369: result: no" >&5
++  echo "$as_me:4371: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4375,7 +4377,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:4378: checking for $ac_word" >&5
++echo "$as_me:4380: 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
+@@ -4390,7 +4392,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:4393: found $ac_dir/$ac_word" >&5
++echo "$as_me:4395: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4399,10 +4401,10 @@
+ fi
+ ac_ct_LD=$ac_cv_prog_ac_ct_LD
+ if test -n "$ac_ct_LD"; then
+-  echo "$as_me:4402: result: $ac_ct_LD" >&5
++  echo "$as_me:4404: result: $ac_ct_LD" >&5
+ echo "${ECHO_T}$ac_ct_LD" >&6
+ else
+-  echo "$as_me:4405: result: no" >&5
++  echo "$as_me:4407: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4414,7 +4416,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:4417: checking for $ac_word" >&5
++echo "$as_me:4419: 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
+@@ -4429,7 +4431,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:4432: found $ac_dir/$ac_word" >&5
++echo "$as_me:4434: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4437,10 +4439,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:4440: result: $AR" >&5
++  echo "$as_me:4442: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:4443: result: no" >&5
++  echo "$as_me:4445: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4449,7 +4451,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:4452: checking for $ac_word" >&5
++echo "$as_me:4454: 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
+@@ -4464,7 +4466,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:4467: found $ac_dir/$ac_word" >&5
++echo "$as_me:4469: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4473,10 +4475,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:4476: result: $ac_ct_AR" >&5
++  echo "$as_me:4478: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:4479: result: no" >&5
++  echo "$as_me:4481: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4488,7 +4490,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:4491: checking for $ac_word" >&5
++echo "$as_me:4493: 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
+@@ -4503,7 +4505,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:4506: found $ac_dir/$ac_word" >&5
++echo "$as_me:4508: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4511,10 +4513,10 @@
+ fi
+ NM=$ac_cv_prog_NM
+ if test -n "$NM"; then
+-  echo "$as_me:4514: result: $NM" >&5
++  echo "$as_me:4516: result: $NM" >&5
+ echo "${ECHO_T}$NM" >&6
+ else
+-  echo "$as_me:4517: result: no" >&5
++  echo "$as_me:4519: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4523,7 +4525,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:4526: checking for $ac_word" >&5
++echo "$as_me:4528: 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
+@@ -4538,7 +4540,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:4541: found $ac_dir/$ac_word" >&5
++echo "$as_me:4543: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4547,10 +4549,10 @@
+ fi
+ ac_ct_NM=$ac_cv_prog_ac_ct_NM
+ if test -n "$ac_ct_NM"; then
+-  echo "$as_me:4550: result: $ac_ct_NM" >&5
++  echo "$as_me:4552: result: $ac_ct_NM" >&5
+ echo "${ECHO_T}$ac_ct_NM" >&6
+ else
+-  echo "$as_me:4553: result: no" >&5
++  echo "$as_me:4555: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4562,7 +4564,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:4565: checking for $ac_word" >&5
++echo "$as_me:4567: 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
+@@ -4577,7 +4579,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:4580: found $ac_dir/$ac_word" >&5
++echo "$as_me:4582: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4585,10 +4587,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:4588: result: $AR" >&5
++  echo "$as_me:4590: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:4591: result: no" >&5
++  echo "$as_me:4593: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4597,7 +4599,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:4600: checking for $ac_word" >&5
++echo "$as_me:4602: 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
+@@ -4612,7 +4614,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:4615: found $ac_dir/$ac_word" >&5
++echo "$as_me:4617: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4621,10 +4623,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:4624: result: $ac_ct_AR" >&5
++  echo "$as_me:4626: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:4627: result: no" >&5
++  echo "$as_me:4629: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4633,7 +4635,7 @@
+   AR="$ac_cv_prog_AR"
+ fi
+ 
+-echo "$as_me:4636: checking for options to update archives" >&5
++echo "$as_me:4638: 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
+@@ -4656,13 +4658,13 @@
+ 		rm -f conftest.a
+ 
+ 		cat >conftest.$ac_ext <&5
++		if { (eval echo "$as_me:4664: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4665: \$? = $ac_status" >&5
++  echo "$as_me:4667: \$? = $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
+@@ -4673,7 +4675,7 @@
+ 		else
+ 			test -n "$verbose" && echo "	cannot compile test-program" 1>&6
+ 
+-echo "${as_me:-configure}:4676: testing cannot compile test-program ..." 1>&5
++echo "${as_me:-configure}:4678: testing cannot compile test-program ..." 1>&5
+ 
+ 			break
+ 		fi
+@@ -4681,7 +4683,7 @@
+ 	rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
+ 
+ fi
+-echo "$as_me:4684: result: $cf_cv_ar_flags" >&5
++echo "$as_me:4686: result: $cf_cv_ar_flags" >&5
+ echo "${ECHO_T}$cf_cv_ar_flags" >&6
+ 
+ if test -n "$ARFLAGS" ; then
+@@ -4692,7 +4694,7 @@
+ 	ARFLAGS=$cf_cv_ar_flags
+ fi
+ 
+-echo "$as_me:4695: checking if you have specified an install-prefix" >&5
++echo "$as_me:4697: 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.
+@@ -4705,7 +4707,7 @@
+ 		;;
+ 	esac
+ fi;
+-echo "$as_me:4708: result: $DESTDIR" >&5
++echo "$as_me:4710: result: $DESTDIR" >&5
+ echo "${ECHO_T}$DESTDIR" >&6
+ 
+ ###############################################################################
+@@ -4733,7 +4735,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:4736: checking for $ac_word" >&5
++echo "$as_me:4738: 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
+@@ -4748,7 +4750,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:4751: found $ac_dir/$ac_word" >&5
++echo "$as_me:4753: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4756,10 +4758,10 @@
+ fi
+ BUILD_CC=$ac_cv_prog_BUILD_CC
+ if test -n "$BUILD_CC"; then
+-  echo "$as_me:4759: result: $BUILD_CC" >&5
++  echo "$as_me:4761: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ else
+-  echo "$as_me:4762: result: no" >&5
++  echo "$as_me:4764: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4768,12 +4770,12 @@
+ test -n "$BUILD_CC" || BUILD_CC="none"
+ 
+ fi;
+-	echo "$as_me:4771: checking for native build C compiler" >&5
++	echo "$as_me:4773: checking for native build C compiler" >&5
+ echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
+-	echo "$as_me:4773: result: $BUILD_CC" >&5
++	echo "$as_me:4775: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ 
+-	echo "$as_me:4776: checking for native build C preprocessor" >&5
++	echo "$as_me:4778: 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.
+@@ -4783,10 +4785,10 @@
+ else
+   BUILD_CPP='${BUILD_CC} -E'
+ fi;
+-	echo "$as_me:4786: result: $BUILD_CPP" >&5
++	echo "$as_me:4788: result: $BUILD_CPP" >&5
+ echo "${ECHO_T}$BUILD_CPP" >&6
+ 
+-	echo "$as_me:4789: checking for native build C flags" >&5
++	echo "$as_me:4791: 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.
+@@ -4794,10 +4796,10 @@
+   withval="$with_build_cflags"
+   BUILD_CFLAGS="$withval"
+ fi;
+-	echo "$as_me:4797: result: $BUILD_CFLAGS" >&5
++	echo "$as_me:4799: result: $BUILD_CFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CFLAGS" >&6
+ 
+-	echo "$as_me:4800: checking for native build C preprocessor-flags" >&5
++	echo "$as_me:4802: 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.
+@@ -4805,10 +4807,10 @@
+   withval="$with_build_cppflags"
+   BUILD_CPPFLAGS="$withval"
+ fi;
+-	echo "$as_me:4808: result: $BUILD_CPPFLAGS" >&5
++	echo "$as_me:4810: result: $BUILD_CPPFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
+ 
+-	echo "$as_me:4811: checking for native build linker-flags" >&5
++	echo "$as_me:4813: 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.
+@@ -4816,10 +4818,10 @@
+   withval="$with_build_ldflags"
+   BUILD_LDFLAGS="$withval"
+ fi;
+-	echo "$as_me:4819: result: $BUILD_LDFLAGS" >&5
++	echo "$as_me:4821: result: $BUILD_LDFLAGS" >&5
+ echo "${ECHO_T}$BUILD_LDFLAGS" >&6
+ 
+-	echo "$as_me:4822: checking for native build linker-libraries" >&5
++	echo "$as_me:4824: 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.
+@@ -4827,7 +4829,7 @@
+   withval="$with_build_libs"
+   BUILD_LIBS="$withval"
+ fi;
+-	echo "$as_me:4830: result: $BUILD_LIBS" >&5
++	echo "$as_me:4832: result: $BUILD_LIBS" >&5
+ echo "${ECHO_T}$BUILD_LIBS" >&6
+ 
+ 	# this assumes we're on Unix.
+@@ -4837,7 +4839,7 @@
+ 	: ${BUILD_CC:='${CC}'}
+ 
+ 	if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
+-		{ { echo "$as_me:4840: error: Cross-build requires two compilers.
++		{ { echo "$as_me:4842: 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;}
+@@ -4862,7 +4864,7 @@
+ ### shared, for example.
+ cf_list_models=""
+ 
+-echo "$as_me:4865: checking if libtool -version-number should be used" >&5
++echo "$as_me:4867: 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.
+@@ -4879,7 +4881,7 @@
+ 	cf_libtool_version=yes
+ 
+ fi;
+-echo "$as_me:4882: result: $cf_libtool_version" >&5
++echo "$as_me:4884: result: $cf_libtool_version" >&5
+ echo "${ECHO_T}$cf_libtool_version" >&6
+ 
+ if test "$cf_libtool_version" = yes ; then
+@@ -4888,25 +4890,25 @@
+ 	LIBTOOL_VERSION="-version-info"
+ 	case "x$VERSION" in
+ 	(x)
+-		{ echo "$as_me:4891: WARNING: VERSION was not set" >&5
++		{ echo "$as_me:4893: 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}:4898: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:4900: 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}:4905: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:4907: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+ 
+ 		;;
+ 	(*)
+-		{ echo "$as_me:4909: WARNING: unexpected VERSION value: $VERSION" >&5
++		{ echo "$as_me:4911: WARNING: unexpected VERSION value: $VERSION" >&5
+ echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
+ 		;;
+ 	esac
+@@ -4928,7 +4930,7 @@
+ LIB_INSTALL=
+ LIB_UNINSTALL=
+ 
+-echo "$as_me:4931: checking if you want to build libraries with libtool" >&5
++echo "$as_me:4933: 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.
+@@ -4938,7 +4940,7 @@
+ else
+   with_libtool=no
+ fi;
+-echo "$as_me:4941: result: $with_libtool" >&5
++echo "$as_me:4943: result: $with_libtool" >&5
+ echo "${ECHO_T}$with_libtool" >&6
+ if test "$with_libtool" != "no"; then
+ 
+@@ -4969,7 +4971,7 @@
+ 	with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:4972: error: expected a pathname, not \"$with_libtool\"" >&5
++	{ { echo "$as_me:4974: error: expected a pathname, not \"$with_libtool\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -4982,7 +4984,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:4985: checking for $ac_word" >&5
++echo "$as_me:4987: 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
+@@ -4997,7 +4999,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:5000: found $ac_dir/$ac_word" >&5
++echo "$as_me:5002: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5005,10 +5007,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+-  echo "$as_me:5008: result: $LIBTOOL" >&5
++  echo "$as_me:5010: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+-  echo "$as_me:5011: result: no" >&5
++  echo "$as_me:5013: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5021,7 +5023,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:5024: checking for $ac_word" >&5
++echo "$as_me:5026: 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
+@@ -5036,7 +5038,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:5039: found $ac_dir/$ac_word" >&5
++echo "$as_me:5041: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5044,10 +5046,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+-  echo "$as_me:5047: result: $ac_ct_LIBTOOL" >&5
++  echo "$as_me:5049: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+-  echo "$as_me:5050: result: no" >&5
++  echo "$as_me:5052: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5078,7 +5080,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:5081: checking for $ac_word" >&5
++echo "$as_me:5083: 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
+@@ -5093,7 +5095,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:5096: found $ac_dir/$ac_word" >&5
++echo "$as_me:5098: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5101,10 +5103,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+-  echo "$as_me:5104: result: $LIBTOOL" >&5
++  echo "$as_me:5106: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+-  echo "$as_me:5107: result: no" >&5
++  echo "$as_me:5109: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5117,7 +5119,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:5120: checking for $ac_word" >&5
++echo "$as_me:5122: 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
+@@ -5132,7 +5134,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:5135: found $ac_dir/$ac_word" >&5
++echo "$as_me:5137: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5140,10 +5142,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+-  echo "$as_me:5143: result: $ac_ct_LIBTOOL" >&5
++  echo "$as_me:5145: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+-  echo "$as_me:5146: result: no" >&5
++  echo "$as_me:5148: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5165,7 +5167,7 @@
+ 		fi
+ 	fi
+ 	if test -z "$LIBTOOL" ; then
+-		{ { echo "$as_me:5168: error: Cannot find libtool" >&5
++		{ { echo "$as_me:5170: error: Cannot find libtool" >&5
+ echo "$as_me: error: Cannot find libtool" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -5181,7 +5183,7 @@
+ 
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+ then
+-	echo "$as_me:5184: checking version of $LIBTOOL" >&5
++	echo "$as_me:5186: checking version of $LIBTOOL" >&5
+ echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
+ 
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+@@ -5192,15 +5194,15 @@
+ fi
+ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
+ 
+-	echo "$as_me:5195: result: $cf_cv_libtool_version" >&5
++	echo "$as_me:5197: 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:5198: error: This is not GNU libtool" >&5
++		{ { echo "$as_me:5200: 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:5203: error: GNU libtool has not been found" >&5
++	{ { echo "$as_me:5205: error: GNU libtool has not been found" >&5
+ echo "$as_me: error: GNU libtool has not been found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -5236,7 +5238,7 @@
+ 
+ else
+ 
+-echo "$as_me:5239: checking if you want to build shared libraries" >&5
++echo "$as_me:5241: 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.
+@@ -5246,11 +5248,11 @@
+ else
+   with_shared=no
+ fi;
+-echo "$as_me:5249: result: $with_shared" >&5
++echo "$as_me:5251: 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:5253: checking if you want to build static libraries" >&5
++echo "$as_me:5255: 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.
+@@ -5260,11 +5262,11 @@
+ else
+   with_normal=yes
+ fi;
+-echo "$as_me:5263: result: $with_normal" >&5
++echo "$as_me:5265: 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:5267: checking if you want to build debug libraries" >&5
++echo "$as_me:5269: 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.
+@@ -5274,11 +5276,11 @@
+ else
+   with_debug=yes
+ fi;
+-echo "$as_me:5277: result: $with_debug" >&5
++echo "$as_me:5279: 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:5281: checking if you want to build profiling libraries" >&5
++echo "$as_me:5283: 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.
+@@ -5288,7 +5290,7 @@
+ else
+   with_profile=no
+ fi;
+-echo "$as_me:5291: result: $with_profile" >&5
++echo "$as_me:5293: result: $with_profile" >&5
+ echo "${ECHO_T}$with_profile" >&6
+ test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
+ 
+@@ -5296,7 +5298,7 @@
+ 
+ if test "X$cf_with_cxx_binding" != Xno; then
+ if test "x$with_shared" = "xyes"; then
+-echo "$as_me:5299: checking if you want to build C++ shared libraries" >&5
++echo "$as_me:5301: 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.
+@@ -5306,26 +5308,26 @@
+ else
+   with_shared_cxx=no
+ fi;
+-echo "$as_me:5309: result: $with_shared_cxx" >&5
++echo "$as_me:5311: result: $with_shared_cxx" >&5
+ echo "${ECHO_T}$with_shared_cxx" >&6
+ fi
+ fi
+ 
+ ###############################################################################
+ 
+-echo "$as_me:5316: checking for specified models" >&5
++echo "$as_me:5318: 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:5320: result: $cf_list_models" >&5
++echo "$as_me:5322: 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:5325: checking for default model" >&5
++echo "$as_me:5327: 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:5328: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:5330: result: $DFT_LWR_MODEL" >&5
+ echo "${ECHO_T}$DFT_LWR_MODEL" >&6
+ 
+ DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+@@ -5339,7 +5341,7 @@
+ LIB_DIR=../lib
+ LIB_2ND=../../lib
+ 
+-echo "$as_me:5342: checking if you want to have a library-prefix" >&5
++echo "$as_me:5344: 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.
+@@ -5349,7 +5351,7 @@
+ else
+   with_lib_prefix=auto
+ fi;
+-echo "$as_me:5352: result: $with_lib_prefix" >&5
++echo "$as_me:5354: result: $with_lib_prefix" >&5
+ echo "${ECHO_T}$with_lib_prefix" >&6
+ 
+ if test $with_lib_prefix = auto
+@@ -5377,19 +5379,19 @@
+ 
+ LIB_SUFFIX=
+ 
+-	echo "$as_me:5380: checking for PATH separator" >&5
++	echo "$as_me:5382: 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:5387: result: $PATH_SEPARATOR" >&5
++	echo "$as_me:5389: result: $PATH_SEPARATOR" >&5
+ echo "${ECHO_T}$PATH_SEPARATOR" >&6
+ 
+ ###############################################################################
+ 
+-echo "$as_me:5392: checking if you want to build a separate terminfo library" >&5
++echo "$as_me:5394: 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.
+@@ -5399,10 +5401,10 @@
+ else
+   with_termlib=no
+ fi;
+-echo "$as_me:5402: result: $with_termlib" >&5
++echo "$as_me:5404: result: $with_termlib" >&5
+ echo "${ECHO_T}$with_termlib" >&6
+ 
+-echo "$as_me:5405: checking if you want to build a separate tic library" >&5
++echo "$as_me:5407: 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.
+@@ -5412,7 +5414,7 @@
+ else
+   with_ticlib=no
+ fi;
+-echo "$as_me:5415: result: $with_ticlib" >&5
++echo "$as_me:5417: result: $with_ticlib" >&5
+ echo "${ECHO_T}$with_ticlib" >&6
+ 
+ if test X"$CC_G_OPT" = X"" ; then
+@@ -5425,7 +5427,7 @@
+ 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
+ fi
+ 
+-echo "$as_me:5428: checking for default loader flags" >&5
++echo "$as_me:5430: 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=''   ;;
+@@ -5434,13 +5436,13 @@
+ (profile) LD_MODEL='-pg';;
+ (shared)  LD_MODEL=''   ;;
+ esac
+-echo "$as_me:5437: result: $LD_MODEL" >&5
++echo "$as_me:5439: result: $LD_MODEL" >&5
+ echo "${ECHO_T}$LD_MODEL" >&6
+ 
+ case $DFT_LWR_MODEL in
+ (shared)
+ 
+-echo "$as_me:5443: checking if rpath option should be used" >&5
++echo "$as_me:5445: 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.
+@@ -5450,10 +5452,10 @@
+ else
+   cf_cv_enable_rpath=no
+ fi;
+-echo "$as_me:5453: result: $cf_cv_enable_rpath" >&5
++echo "$as_me:5455: result: $cf_cv_enable_rpath" >&5
+ echo "${ECHO_T}$cf_cv_enable_rpath" >&6
+ 
+-echo "$as_me:5456: checking if shared libraries should be relinked during install" >&5
++echo "$as_me:5458: 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.
+@@ -5463,7 +5465,7 @@
+ else
+   cf_cv_do_relink=yes
+ fi;
+-echo "$as_me:5466: result: $cf_cv_do_relink" >&5
++echo "$as_me:5468: result: $cf_cv_do_relink" >&5
+ echo "${ECHO_T}$cf_cv_do_relink" >&6
+ 	;;
+ esac
+@@ -5474,7 +5476,7 @@
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+-	echo "$as_me:5477: checking for an rpath option" >&5
++	echo "$as_me:5479: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case $cf_cv_system_name in
+ 	(irix*)
+@@ -5505,12 +5507,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:5508: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:5510: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:5513: checking if we need a space after rpath option" >&5
++		echo "$as_me:5515: 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"
+ 
+@@ -5531,7 +5533,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 5534 "configure"
++#line 5536 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -5543,16 +5545,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5546: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5548: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5549: \$? = $ac_status" >&5
++  echo "$as_me:5551: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5552: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5554: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5555: \$? = $ac_status" >&5
++  echo "$as_me:5557: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_rpath_space=no
+ else
+@@ -5562,7 +5564,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:5565: result: $cf_rpath_space" >&5
++		echo "$as_me:5567: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ 		;;
+@@ -5584,7 +5586,7 @@
+ 	cf_ld_rpath_opt=
+ 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+ 
+-	echo "$as_me:5587: checking if release/abi version should be used for shared libs" >&5
++	echo "$as_me:5589: 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.
+@@ -5599,9 +5601,9 @@
+ 		cf_cv_shlib_version=$withval
+ 		;;
+ 	(*)
+-		echo "$as_me:5602: result: $withval" >&5
++		echo "$as_me:5604: result: $withval" >&5
+ echo "${ECHO_T}$withval" >&6
+-		{ { echo "$as_me:5604: error: option value must be one of: rel, abi, or auto" >&5
++		{ { echo "$as_me:5606: 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; }; }
+ 		;;
+@@ -5610,7 +5612,7 @@
+ else
+   cf_cv_shlib_version=auto
+ fi;
+-	echo "$as_me:5613: result: $cf_cv_shlib_version" >&5
++	echo "$as_me:5615: result: $cf_cv_shlib_version" >&5
+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
+ 
+ 	cf_cv_rm_so_locs=no
+@@ -5633,14 +5635,14 @@
+ 
+ 	if test "$cf_try_fPIC" = yes
+ 	then
+-		echo "$as_me:5636: checking which $CC option to use" >&5
++		echo "$as_me:5638: 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 5643 "configure"
++#line 5645 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5652,16 +5654,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5655: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5657: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5658: \$? = $ac_status" >&5
++  echo "$as_me:5660: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5661: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5663: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5664: \$? = $ac_status" >&5
++  echo "$as_me:5666: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -5670,7 +5672,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 		done
+-		echo "$as_me:5673: result: $CC_SHARED_OPTS" >&5
++		echo "$as_me:5675: result: $CC_SHARED_OPTS" >&5
+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ 		CFLAGS="$cf_save_CFLAGS"
+ 	fi
+@@ -5741,7 +5743,7 @@
+ 		MK_SHARED_LIB='${CC} ${LDFLAGS} ${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:5744: checking if ld -search_paths_first works" >&5
++		echo "$as_me:5746: 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
+@@ -5750,7 +5752,7 @@
+ 			cf_save_LDFLAGS=$LDFLAGS
+ 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 5753 "configure"
++#line 5755 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -5762,16 +5764,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5765: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5767: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5768: \$? = $ac_status" >&5
++  echo "$as_me:5770: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5771: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5773: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5774: \$? = $ac_status" >&5
++  echo "$as_me:5776: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ldflags_search_paths_first=yes
+ else
+@@ -5782,7 +5784,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 				LDFLAGS=$cf_save_LDFLAGS
+ fi
+-echo "$as_me:5785: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:5787: 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"
+@@ -6007,7 +6009,7 @@
+ 			do
+ 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ 				cat >conftest.$ac_ext <<_ACEOF
+-#line 6010 "configure"
++#line 6012 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6019,16 +6021,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6022: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6024: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6025: \$? = $ac_status" >&5
++  echo "$as_me:6027: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6028: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6030: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6031: \$? = $ac_status" >&5
++  echo "$as_me:6033: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -6065,7 +6067,7 @@
+ 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ 			;;
+ 		(*)
+-			{ echo "$as_me:6068: WARNING: ignored --with-shlib-version" >&5
++			{ echo "$as_me:6070: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ 			;;
+ 		esac
+@@ -6075,7 +6077,7 @@
+ 	if test -n "$cf_try_cflags"
+ 	then
+ cat > conftest.$ac_ext <
+ int main(int argc, char *argv[])
+ {
+@@ -6087,18 +6089,18 @@
+ 		for cf_opt in $cf_try_cflags
+ 		do
+ 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
+-			echo "$as_me:6090: checking if CFLAGS option -$cf_opt works" >&5
++			echo "$as_me:6092: 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:6092: \"$ac_compile\"") >&5
++			if { (eval echo "$as_me:6094: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6095: \$? = $ac_status" >&5
++  echo "$as_me:6097: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-				echo "$as_me:6097: result: yes" >&5
++				echo "$as_me:6099: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 				cf_save_CFLAGS="$CFLAGS"
+ 			else
+-				echo "$as_me:6101: result: no" >&5
++				echo "$as_me:6103: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 			fi
+ 		done
+@@ -6113,17 +6115,17 @@
+ 
+ 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+ 
+-echo "${as_me:-configure}:6116: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++echo "${as_me:-configure}:6118: 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}:6120: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:6122: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ for model in $cf_list_models; do
+ 	case $model in
+ 	(libtool)
+ 
+-echo "$as_me:6126: checking for additional libtool options" >&5
++echo "$as_me:6128: 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.
+@@ -6133,7 +6135,7 @@
+ else
+   with_libtool_opts=no
+ fi;
+-echo "$as_me:6136: result: $with_libtool_opts" >&5
++echo "$as_me:6138: result: $with_libtool_opts" >&5
+ echo "${ECHO_T}$with_libtool_opts" >&6
+ 
+ case .$with_libtool_opts in
+@@ -6144,7 +6146,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:6147: checking if exported-symbols file should be used" >&5
++echo "$as_me:6149: 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.
+@@ -6159,7 +6161,7 @@
+ 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
+ 
+ fi
+-echo "$as_me:6162: result: $with_export_syms" >&5
++echo "$as_me:6164: result: $with_export_syms" >&5
+ echo "${ECHO_T}$with_export_syms" >&6
+ if test "x$with_export_syms" != xno
+ then
+@@ -6170,15 +6172,15 @@
+ 		;;
+ 	(shared)
+ 		if test "$CC_SHARED_OPTS" = "unknown"; then
+-			{ { echo "$as_me:6173: error: Shared libraries are not supported in this version" >&5
++			{ { echo "$as_me:6175: 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:6178: checking if current CFLAGS link properly" >&5
++		echo "$as_me:6180: 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 6181 "configure"
++#line 6183 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6190,16 +6192,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6193: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6195: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6196: \$? = $ac_status" >&5
++  echo "$as_me:6198: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6199: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6201: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6202: \$? = $ac_status" >&5
++  echo "$as_me:6204: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cflags_work=yes
+ else
+@@ -6208,18 +6210,18 @@
+ cf_cflags_work=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-		echo "$as_me:6211: result: $cf_cflags_work" >&5
++		echo "$as_me:6213: 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}:6217: testing try to work around by appending shared-options ..." 1>&5
++echo "${as_me:-configure}:6219: testing try to work around by appending shared-options ..." 1>&5
+ 
+ 			CFLAGS="$CFLAGS $CC_SHARED_OPTS"
+ 		fi
+ 
+-echo "$as_me:6222: checking if versioned-symbols file should be used" >&5
++echo "$as_me:6224: 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.
+@@ -6237,18 +6239,18 @@
+ (xno)
+ 	;;
+ (x/*)
+-	test -f "$with_versioned_syms" || { { echo "$as_me:6240: error: expected a filename: $with_versioned_syms" >&5
++	test -f "$with_versioned_syms" || { { echo "$as_me:6242: error: expected a filename: $with_versioned_syms" >&5
+ echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ (*)
+-	test -f "$with_versioned_syms" || { { echo "$as_me:6245: error: expected a filename: $with_versioned_syms" >&5
++	test -f "$with_versioned_syms" || { { echo "$as_me:6247: error: expected a filename: $with_versioned_syms" >&5
+ echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;}
+    { (exit 1); exit 1; }; }
+ 	with_versioned_syms=`pwd`/"$with_versioned_syms"
+ 	;;
+ esac
+-echo "$as_me:6251: result: $with_versioned_syms" >&5
++echo "$as_me:6253: result: $with_versioned_syms" >&5
+ echo "${ECHO_T}$with_versioned_syms" >&6
+ 
+ RESULTING_SYMS=
+@@ -6264,7 +6266,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}:6267: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:6269: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ 		;;
+ 	(*-dy\ *)
+@@ -6272,11 +6274,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}:6275: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:6277: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ 		;;
+ 	(*)
+-		{ echo "$as_me:6279: WARNING: this system does not support versioned-symbols" >&5
++		{ echo "$as_me:6281: WARNING: this system does not support versioned-symbols" >&5
+ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
+ 		;;
+ 	esac
+@@ -6288,7 +6290,7 @@
+ 	# symbols.
+ 	if test "x$VERSIONED_SYMS" != "x"
+ 	then
+-		echo "$as_me:6291: checking if wildcards can be used to selectively omit symbols" >&5
++		echo "$as_me:6293: 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
+ 
+@@ -6325,7 +6327,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:6359: result: $WILDCARD_SYMS" >&5
++		echo "$as_me:6361: result: $WILDCARD_SYMS" >&5
+ echo "${ECHO_T}$WILDCARD_SYMS" >&6
+ 		rm -f conftest.*
+ 	fi
+@@ -6369,7 +6371,7 @@
+ ### Checks for special libraries, must be done up-front.
+ SHLIB_LIST=""
+ 
+-echo "$as_me:6372: checking if you want to link with the GPM mouse library" >&5
++echo "$as_me:6374: 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.
+@@ -6379,27 +6381,27 @@
+ else
+   with_gpm=maybe
+ fi;
+-echo "$as_me:6382: result: $with_gpm" >&5
++echo "$as_me:6384: result: $with_gpm" >&5
+ echo "${ECHO_T}$with_gpm" >&6
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:6386: checking for gpm.h" >&5
++	echo "$as_me:6388: 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 6392 "configure"
++#line 6394 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:6396: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:6398: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:6402: \$? = $ac_status" >&5
++  echo "$as_me:6404: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -6418,7 +6420,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:6421: result: $ac_cv_header_gpm_h" >&5
++echo "$as_me:6423: 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
+ 
+@@ -6429,7 +6431,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}:6432: testing assuming we really have GPM library ..." 1>&5
++echo "${as_me:-configure}:6434: testing assuming we really have GPM library ..." 1>&5
+ 
+ cat >>confdefs.h <<\EOF
+ #define HAVE_LIBGPM 1
+@@ -6437,7 +6439,7 @@
+ 
+ 			with_gpm=yes
+ 		else
+-			echo "$as_me:6440: checking for Gpm_Open in -lgpm" >&5
++			echo "$as_me:6442: 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
+@@ -6445,7 +6447,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6448 "configure"
++#line 6450 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6464,16 +6466,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6467: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6469: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6470: \$? = $ac_status" >&5
++  echo "$as_me:6472: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6473: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6475: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6476: \$? = $ac_status" >&5
++  echo "$as_me:6478: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -6484,18 +6486,18 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6487: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:6489: 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
+   with_gpm=yes
+ else
+ 
+ 				if test "$with_gpm" = maybe; then
+-					{ echo "$as_me:6494: WARNING: Cannot link with GPM library" >&5
++					{ echo "$as_me:6496: WARNING: Cannot link with GPM library" >&5
+ echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
+ 					with_gpm=no
+ 				else
+-					{ { echo "$as_me:6498: error: Cannot link with GPM library" >&5
++					{ { echo "$as_me:6500: error: Cannot link with GPM library" >&5
+ echo "$as_me: error: Cannot link with GPM library" >&2;}
+    { (exit 1); exit 1; }; }
+ 				fi
+@@ -6506,7 +6508,7 @@
+ 
+ else
+ 
+-		test "$with_gpm" != maybe && { echo "$as_me:6509: WARNING: Cannot find GPM header" >&5
++		test "$with_gpm" != maybe && { echo "$as_me:6511: WARNING: Cannot find GPM header" >&5
+ echo "$as_me: WARNING: Cannot find GPM header" >&2;}
+ 		with_gpm=no
+ 
+@@ -6515,7 +6517,7 @@
+ fi
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:6518: checking if you want to load GPM dynamically" >&5
++	echo "$as_me:6520: 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.
+@@ -6525,18 +6527,18 @@
+ else
+   with_dlsym=yes
+ fi;
+-	echo "$as_me:6528: result: $with_dlsym" >&5
++	echo "$as_me:6530: result: $with_dlsym" >&5
+ echo "${ECHO_T}$with_dlsym" >&6
+ 	if test "x$with_dlsym" = xyes ; then
+ 
+ cf_have_dlsym=no
+-echo "$as_me:6533: checking for dlsym" >&5
++echo "$as_me:6535: 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 6539 "configure"
++#line 6541 "configure"
+ #include "confdefs.h"
+ #define dlsym autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -6567,16 +6569,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6570: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6572: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6573: \$? = $ac_status" >&5
++  echo "$as_me:6575: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6576: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6578: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6579: \$? = $ac_status" >&5
++  echo "$as_me:6581: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_dlsym=yes
+ else
+@@ -6586,14 +6588,14 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:6589: result: $ac_cv_func_dlsym" >&5
++echo "$as_me:6591: 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:6596: checking for dlsym in -ldl" >&5
++echo "$as_me:6598: 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
+@@ -6601,7 +6603,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6604 "configure"
++#line 6606 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6620,16 +6622,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6623: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6625: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6626: \$? = $ac_status" >&5
++  echo "$as_me:6628: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6629: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6631: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6632: \$? = $ac_status" >&5
++  echo "$as_me:6634: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dl_dlsym=yes
+ else
+@@ -6640,7 +6642,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6643: result: $ac_cv_lib_dl_dlsym" >&5
++echo "$as_me:6645: 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
+ 
+@@ -6669,10 +6671,10 @@
+ LIBS="$cf_add_libs"
+  }
+ 
+-	echo "$as_me:6672: checking whether able to link to dl*() functions" >&5
++	echo "$as_me:6674: 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 6675 "configure"
++#line 6677 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6690,16 +6692,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6693: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6695: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6696: \$? = $ac_status" >&5
++  echo "$as_me:6698: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6699: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6701: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6702: \$? = $ac_status" >&5
++  echo "$as_me:6704: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ cat >>confdefs.h <<\EOF
+@@ -6710,15 +6712,15 @@
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ 
+-		{ { echo "$as_me:6713: error: Cannot link test program for libdl" >&5
++		{ { echo "$as_me:6715: 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:6718: result: ok" >&5
++	echo "$as_me:6720: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ else
+-	{ { echo "$as_me:6721: error: Cannot find dlsym function" >&5
++	{ { echo "$as_me:6723: error: Cannot find dlsym function" >&5
+ echo "$as_me: error: Cannot find dlsym function" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -6726,12 +6728,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}:6729: testing assuming soname for gpm is $with_gpm ..." 1>&5
++echo "${as_me:-configure}:6731: testing assuming soname for gpm is $with_gpm ..." 1>&5
+ 
+ 			cf_cv_gpm_soname="$with_gpm"
+ 		else
+ 
+-echo "$as_me:6734: checking for soname of gpm library" >&5
++echo "$as_me:6736: 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
+@@ -6765,15 +6767,15 @@
+ done
+ LIBS="$cf_add_libs"
+ 
+-	if { (eval echo "$as_me:6768: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:6770: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6771: \$? = $ac_status" >&5
++  echo "$as_me:6773: \$? = $ac_status" >&5
+   (exit $ac_status); } ; then
+-		if { (eval echo "$as_me:6773: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:6775: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6776: \$? = $ac_status" >&5
++  echo "$as_me:6778: \$? = $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
+@@ -6784,7 +6786,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:6787: result: $cf_cv_gpm_soname" >&5
++echo "$as_me:6789: result: $cf_cv_gpm_soname" >&5
+ echo "${ECHO_T}$cf_cv_gpm_soname" >&6
+ 
+ 		fi
+@@ -6852,7 +6854,7 @@
+ #define HAVE_LIBGPM 1
+ EOF
+ 
+-echo "$as_me:6855: checking for Gpm_Wgetch in -lgpm" >&5
++echo "$as_me:6857: 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
+@@ -6860,7 +6862,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6863 "configure"
++#line 6865 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6879,16 +6881,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6882: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6884: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6885: \$? = $ac_status" >&5
++  echo "$as_me:6887: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6888: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6890: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6891: \$? = $ac_status" >&5
++  echo "$as_me:6893: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_Gpm_Wgetch=yes
+ else
+@@ -6899,11 +6901,11 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6902: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
++echo "$as_me:6904: 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:6906: checking if GPM is weakly bound to curses library" >&5
++echo "$as_me:6908: 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
+@@ -6927,15 +6929,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:6930: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:6932: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6933: \$? = $ac_status" >&5
++  echo "$as_me:6935: \$? = $ac_status" >&5
+   (exit $ac_status); } ; then
+-		if { (eval echo "$as_me:6935: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:6937: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6938: \$? = $ac_status" >&5
++  echo "$as_me:6940: \$? = $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
+@@ -6947,11 +6949,11 @@
+ fi
+ 
+ fi
+-echo "$as_me:6950: result: $cf_cv_check_gpm_wgetch" >&5
++echo "$as_me:6952: 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:6954: WARNING: GPM library is already linked with curses - read the FAQ" >&5
++	{ echo "$as_me:6956: 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
+ 
+@@ -6959,7 +6961,7 @@
+ 
+ fi
+ 
+-echo "$as_me:6962: checking if you want to use PCRE2 for regular-expressions" >&5
++echo "$as_me:6964: checking if you want to use PCRE2 for regular-expressions" >&5
+ echo $ECHO_N "checking if you want to use PCRE2 for regular-expressions... $ECHO_C" >&6
+ 
+ # Check whether --with-pcre2 or --without-pcre2 was given.
+@@ -6968,7 +6970,7 @@
+ 
+ fi;
+ test -z "$with_pcre2" && with_pcre2=no
+-echo "$as_me:6971: result: $with_pcre2" >&5
++echo "$as_me:6973: result: $with_pcre2" >&5
+ echo "${ECHO_T}$with_pcre2" >&6
+ 
+ if test "x$with_pcre2" != xno ; then
+@@ -6976,17 +6978,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists libpcre2; then
+ 	test -n "$verbose" && echo "	found package libpcre2" 1>&6
+ 
+-echo "${as_me:-configure}:6979: testing found package libpcre2 ..." 1>&5
++echo "${as_me:-configure}:6981: testing found package libpcre2 ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags libpcre2 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   libpcre2 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package libpcre2 CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:6985: testing package libpcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:6987: testing package libpcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package libpcre2 LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:6989: testing package libpcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:6991: testing package libpcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -7110,17 +7112,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists libpcre; then
+ 	test -n "$verbose" && echo "	found package libpcre" 1>&6
+ 
+-echo "${as_me:-configure}:7113: testing found package libpcre ..." 1>&5
++echo "${as_me:-configure}:7115: testing found package libpcre ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags libpcre 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   libpcre 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package libpcre CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:7119: testing package libpcre CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:7121: testing package libpcre CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package libpcre LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:7123: testing package libpcre LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:7125: testing package libpcre LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -7241,7 +7243,7 @@
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+ 
+-			{ { echo "$as_me:7244: error: Cannot find PCRE2 library" >&5
++			{ { echo "$as_me:7246: error: Cannot find PCRE2 library" >&5
+ echo "$as_me: error: Cannot find PCRE2 library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -7257,7 +7259,7 @@
+ 	(*pcre2-posix*|*pcreposix*)
+ 		;;
+ 	(*)
+-		echo "$as_me:7260: checking for regcomp in -lpcre2-posix" >&5
++		echo "$as_me:7262: checking for regcomp in -lpcre2-posix" >&5
+ echo $ECHO_N "checking for regcomp in -lpcre2-posix... $ECHO_C" >&6
+ if test "${ac_cv_lib_pcre2_posix_regcomp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7265,7 +7267,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcre2-posix  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7268 "configure"
++#line 7270 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7284,16 +7286,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7287: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7289: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7290: \$? = $ac_status" >&5
++  echo "$as_me:7292: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7293: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7295: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7296: \$? = $ac_status" >&5
++  echo "$as_me:7298: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_pcre2_posix_regcomp=yes
+ else
+@@ -7304,7 +7306,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7307: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
++echo "$as_me:7309: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
+ echo "${ECHO_T}$ac_cv_lib_pcre2_posix_regcomp" >&6
+ if test $ac_cv_lib_pcre2_posix_regcomp = yes; then
+ 
+@@ -7325,7 +7327,7 @@
+ LIBS="$cf_add_libs"
+ 
+ else
+-  echo "$as_me:7328: checking for regcomp in -lpcreposix" >&5
++  echo "$as_me:7330: checking for regcomp in -lpcreposix" >&5
+ echo $ECHO_N "checking for regcomp in -lpcreposix... $ECHO_C" >&6
+ if test "${ac_cv_lib_pcreposix_regcomp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7333,7 +7335,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcreposix  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7336 "configure"
++#line 7338 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7352,16 +7354,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7355: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7357: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7358: \$? = $ac_status" >&5
++  echo "$as_me:7360: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7361: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7363: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7364: \$? = $ac_status" >&5
++  echo "$as_me:7366: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_pcreposix_regcomp=yes
+ else
+@@ -7372,7 +7374,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7375: result: $ac_cv_lib_pcreposix_regcomp" >&5
++echo "$as_me:7377: result: $ac_cv_lib_pcreposix_regcomp" >&5
+ echo "${ECHO_T}$ac_cv_lib_pcreposix_regcomp" >&6
+ if test $ac_cv_lib_pcreposix_regcomp = yes; then
+ 
+@@ -7393,7 +7395,7 @@
+ LIBS="$cf_add_libs"
+ 
+ else
+-  { { echo "$as_me:7396: error: Cannot find PCRE2 POSIX library" >&5
++  { { echo "$as_me:7398: error: Cannot find PCRE2 POSIX library" >&5
+ echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -7408,23 +7410,23 @@
+ for ac_header in pcre2-posix.h pcreposix.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:7411: checking for $ac_header" >&5
++echo "$as_me:7413: 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 7417 "configure"
++#line 7419 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:7421: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:7423: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:7427: \$? = $ac_status" >&5
++  echo "$as_me:7429: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7443,7 +7445,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:7446: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:7448: 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 </dev/null ; then
+-echo "$as_me:7460: checking if you want to use sysmouse" >&5
++echo "$as_me:7462: 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.
+@@ -7469,7 +7471,7 @@
+ fi;
+ 	if test "$cf_with_sysmouse" != no ; then
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 7472 "configure"
++#line 7474 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -7492,16 +7494,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7495: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7497: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7498: \$? = $ac_status" >&5
++  echo "$as_me:7500: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7501: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7503: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7504: \$? = $ac_status" >&5
++  echo "$as_me:7506: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_with_sysmouse=yes
+ else
+@@ -7511,7 +7513,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 	fi
+-echo "$as_me:7514: result: $cf_with_sysmouse" >&5
++echo "$as_me:7516: result: $cf_with_sysmouse" >&5
+ echo "${ECHO_T}$cf_with_sysmouse" >&6
+ test "$cf_with_sysmouse" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -7521,7 +7523,7 @@
+ fi
+ 
+ # pretend that ncurses==ncursesw==ncursest
+-echo "$as_me:7524: checking if you want to disable library suffixes" >&5
++echo "$as_me:7526: 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.
+@@ -7538,13 +7540,13 @@
+ 	disable_lib_suffixes=no
+ 
+ fi;
+-echo "$as_me:7541: result: $disable_lib_suffixes" >&5
++echo "$as_me:7543: 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" && test "x$cf_cv_enable_rpath" != xno; then
+ 
+-echo "$as_me:7547: checking if rpath-hack should be disabled" >&5
++echo "$as_me:7549: 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.
+@@ -7561,21 +7563,21 @@
+ 	cf_disable_rpath_hack=no
+ 
+ fi;
+-echo "$as_me:7564: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:7566: 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:7568: checking for updated LDFLAGS" >&5
++echo "$as_me:7570: 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:7571: result: maybe" >&5
++	echo "$as_me:7573: 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:7578: checking for $ac_word" >&5
++echo "$as_me:7580: 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
+@@ -7590,7 +7592,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:7593: found $ac_dir/$ac_word" >&5
++echo "$as_me:7595: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -7598,10 +7600,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+-  echo "$as_me:7601: result: $cf_ldd_prog" >&5
++  echo "$as_me:7603: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+-  echo "$as_me:7604: result: no" >&5
++  echo "$as_me:7606: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -7615,7 +7617,7 @@
+ 		cf_rpath_oops=
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7618 "configure"
++#line 7620 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -7627,16 +7629,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7630: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7632: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7633: \$? = $ac_status" >&5
++  echo "$as_me:7635: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7636: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7638: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7639: \$? = $ac_status" >&5
++  echo "$as_me:7641: \$? = $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`
+@@ -7664,7 +7666,7 @@
+ 					then
+ 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+ 
+-echo "${as_me:-configure}:7667: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:7669: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+ 
+ 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ 						break
+@@ -7676,11 +7678,11 @@
+ 
+ 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:7679: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:7681: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:7683: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:7685: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -7717,7 +7719,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:7720: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:7722: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -7730,11 +7732,11 @@
+ 
+ test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:7733: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:7735: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:7737: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:7739: testing ...checking LIBS $LIBS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -7771,7 +7773,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:7774: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:7776: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -7784,14 +7786,14 @@
+ 
+ test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:7787: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:7789: testing ...checked LIBS $LIBS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:7791: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:7793: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ else
+-	echo "$as_me:7794: result: no" >&5
++	echo "$as_me:7796: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -7802,7 +7804,7 @@
+ ###############################################################################
+ 
+ ###	use option --with-extra-suffix to append suffix to headers and libraries
+-echo "$as_me:7805: checking if you wish to append extra suffix to header/library paths" >&5
++echo "$as_me:7807: 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=
+ 
+@@ -7821,11 +7823,11 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:7824: result: $EXTRA_SUFFIX" >&5
++echo "$as_me:7826: result: $EXTRA_SUFFIX" >&5
+ echo "${ECHO_T}$EXTRA_SUFFIX" >&6
+ 
+ ###	use option --disable-overwrite to leave out the link to -lcurses
+-echo "$as_me:7828: checking if you wish to install ncurses overwriting curses" >&5
++echo "$as_me:7830: 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.
+@@ -7835,10 +7837,10 @@
+ else
+   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
+ fi;
+-echo "$as_me:7838: result: $with_overwrite" >&5
++echo "$as_me:7840: result: $with_overwrite" >&5
+ echo "${ECHO_T}$with_overwrite" >&6
+ 
+-echo "$as_me:7841: checking if external terminfo-database is used" >&5
++echo "$as_me:7843: 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.
+@@ -7848,7 +7850,7 @@
+ else
+   use_database=yes
+ fi;
+-echo "$as_me:7851: result: $use_database" >&5
++echo "$as_me:7853: result: $use_database" >&5
+ echo "${ECHO_T}$use_database" >&6
+ 
+ case $host_os in
+@@ -7864,7 +7866,7 @@
+ if test "$use_database" != no ; then
+ 	NCURSES_USE_DATABASE=1
+ 
+-	echo "$as_me:7867: checking which terminfo source-file will be installed" >&5
++	echo "$as_me:7869: 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.
+@@ -7872,10 +7874,10 @@
+   withval="$with_database"
+   TERMINFO_SRC=$withval
+ fi;
+-	echo "$as_me:7875: result: $TERMINFO_SRC" >&5
++	echo "$as_me:7877: result: $TERMINFO_SRC" >&5
+ echo "${ECHO_T}$TERMINFO_SRC" >&6
+ 
+-	echo "$as_me:7878: checking whether to use hashed database instead of directory/tree" >&5
++	echo "$as_me:7880: 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.
+@@ -7885,13 +7887,13 @@
+ else
+   with_hashed_db=no
+ fi;
+-	echo "$as_me:7888: result: $with_hashed_db" >&5
++	echo "$as_me:7890: result: $with_hashed_db" >&5
+ echo "${ECHO_T}$with_hashed_db" >&6
+ else
+ 	with_hashed_db=no
+ fi
+ 
+-echo "$as_me:7894: checking for list of fallback descriptions" >&5
++echo "$as_me:7896: 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.
+@@ -7901,7 +7903,7 @@
+ else
+   with_fallback=
+ fi;
+-echo "$as_me:7904: result: $with_fallback" >&5
++echo "$as_me:7906: result: $with_fallback" >&5
+ echo "${ECHO_T}$with_fallback" >&6
+ 
+ case ".$with_fallback" in
+@@ -7909,7 +7911,7 @@
+ 	FALLBACK_LIST=
+ 	;;
+ (.yes)
+-	{ echo "$as_me:7912: WARNING: expected a list of terminal descriptions" >&5
++	{ echo "$as_me:7914: WARNING: expected a list of terminal descriptions" >&5
+ echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
+ 	;;
+ (*)
+@@ -7920,7 +7922,336 @@
+ USE_FALLBACKS=
+ test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
+ 
+-echo "$as_me:7923: checking if you want modern xterm or antique" >&5
++# The fallback feature in ncurses relies upon tic/infocmp outside the build
++# tree for generating the terminal descriptions that will be compiled into the
++# library.  If your toolchain is old, it may not handle current terminal
++# databases.  Use configure-options to point to the tools which will be used,
++# rather than the first ones found on the $PATH.
++if test -n "$FALLBACK_LIST"
++then
++
++# Check whether --with-tic-path or --without-tic-path was given.
++if test "${with_tic_path+set}" = set; then
++  withval="$with_tic_path"
++  echo "$as_me:7936: checking for tic program for fallbacks" >&5
++echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
++		TIC=$withval
++		echo "$as_me:7939: result: $TIC" >&5
++echo "${ECHO_T}$TIC" >&6
++
++if test "x$prefix" != xNONE; then
++	cf_path_syntax="$prefix"
++else
++	cf_path_syntax="$ac_default_prefix"
++fi
++
++case ".$TIC" in
++(.\$\(*\)*|.\'*\'*)
++	;;
++(..|./*|.\\*)
++	;;
++(.[a-zA-Z]:[\\/]*) # OS/2 EMX
++	;;
++(.\${*prefix}*|.\${*dir}*)
++	eval TIC="$TIC"
++	case ".$TIC" in
++	(.NONE/*)
++		TIC=`echo $TIC | sed -e s%NONE%$cf_path_syntax%`
++		;;
++	esac
++	;;
++(.no|.NONE/*)
++	TIC=`echo $TIC | sed -e s%NONE%$cf_path_syntax%`
++	;;
++(*)
++	{ { echo "$as_me:7967: error: expected a pathname, not \"$TIC\"" >&5
++echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
++   { (exit 1); exit 1; }; }
++	;;
++esac
++
++else
++
++test -z "$TIC" && TIC=tic
++for ac_prog in $TIC tic
++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:7980: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_TIC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $TIC in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_TIC="$TIC" # Let the user override the test with a path.
++  ;;
++  *)
++  ac_save_IFS=$IFS; IFS=$ac_path_separator
++ac_dummy="$PATH:/usr/local/ncurses/bin"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  if $as_executable_p "$ac_dir/$ac_word"; then
++   ac_cv_path_TIC="$ac_dir/$ac_word"
++   echo "$as_me:7997: found $ac_dir/$ac_word" >&5
++   break
++fi
++done
++
++  ;;
++esac
++fi
++TIC=$ac_cv_path_TIC
++
++if test -n "$TIC"; then
++  echo "$as_me:8008: result: $TIC" >&5
++echo "${ECHO_T}$TIC" >&6
++else
++  echo "$as_me:8011: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$TIC" && break
++done
++test -n "$TIC" || TIC="$TIC"
++
++cf_path_prog=""
++cf_path_args=""
++IFS="${IFS:- 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
++for cf_temp in $ac_cv_path_TIC
++do
++	if test -z "$cf_path_prog" ; then
++		if test "$with_full_paths" = yes ; then
++
++if test "x$prefix" != xNONE; then
++	cf_path_syntax="$prefix"
++else
++	cf_path_syntax="$ac_default_prefix"
++fi
++
++case ".$cf_temp" in
++(.\$\(*\)*|.\'*\'*)
++	;;
++(..|./*|.\\*)
++	;;
++(.[a-zA-Z]:[\\/]*) # OS/2 EMX
++	;;
++(.\${*prefix}*|.\${*dir}*)
++	eval cf_temp="$cf_temp"
++	case ".$cf_temp" in
++	(.NONE/*)
++		cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
++		;;
++	esac
++	;;
++(.no|.NONE/*)
++	cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
++	;;
++(*)
++	break
++	;;
++esac
++
++			cf_path_prog="$cf_temp"
++		else
++			cf_path_prog="`basename $cf_temp`"
++		fi
++	elif test -z "$cf_path_args" ; then
++		cf_path_args="$cf_temp"
++	else
++		cf_path_args="$cf_path_args $cf_temp"
++	fi
++done
++IFS="$cf_save_ifs"
++
++if test -n "$cf_path_prog" ; then
++
++echo "${as_me:-configure}:8070: testing defining path for ${cf_path_prog} ..." 1>&5
++
++cat >>confdefs.h <>confdefs.h <&5
++echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
++		fi
++
++fi;
++
++# Check whether --with-infocmp-path or --without-infocmp-path was given.
++if test "${with_infocmp_path+set}" = set; then
++  withval="$with_infocmp_path"
++  echo "$as_me:8094: checking for infocmp program for fallbacks" >&5
++echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
++		INFOCMP=$withval
++		echo "$as_me:8097: result: $INFOCMP" >&5
++echo "${ECHO_T}$INFOCMP" >&6
++
++if test "x$prefix" != xNONE; then
++	cf_path_syntax="$prefix"
++else
++	cf_path_syntax="$ac_default_prefix"
++fi
++
++case ".$INFOCMP" in
++(.\$\(*\)*|.\'*\'*)
++	;;
++(..|./*|.\\*)
++	;;
++(.[a-zA-Z]:[\\/]*) # OS/2 EMX
++	;;
++(.\${*prefix}*|.\${*dir}*)
++	eval INFOCMP="$INFOCMP"
++	case ".$INFOCMP" in
++	(.NONE/*)
++		INFOCMP=`echo $INFOCMP | sed -e s%NONE%$cf_path_syntax%`
++		;;
++	esac
++	;;
++(.no|.NONE/*)
++	INFOCMP=`echo $INFOCMP | sed -e s%NONE%$cf_path_syntax%`
++	;;
++(*)
++	{ { echo "$as_me:8125: error: expected a pathname, not \"$INFOCMP\"" >&5
++echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
++   { (exit 1); exit 1; }; }
++	;;
++esac
++
++else
++
++test -z "$INFOCMP" && INFOCMP=infocmp
++for ac_prog in $INFOCMP infocmp
++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:8138: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_INFOCMP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $INFOCMP in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_INFOCMP="$INFOCMP" # Let the user override the test with a path.
++  ;;
++  *)
++  ac_save_IFS=$IFS; IFS=$ac_path_separator
++ac_dummy="$PATH:/usr/local/ncurses/bin"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  if $as_executable_p "$ac_dir/$ac_word"; then
++   ac_cv_path_INFOCMP="$ac_dir/$ac_word"
++   echo "$as_me:8155: found $ac_dir/$ac_word" >&5
++   break
++fi
++done
++
++  ;;
++esac
++fi
++INFOCMP=$ac_cv_path_INFOCMP
++
++if test -n "$INFOCMP"; then
++  echo "$as_me:8166: result: $INFOCMP" >&5
++echo "${ECHO_T}$INFOCMP" >&6
++else
++  echo "$as_me:8169: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$INFOCMP" && break
++done
++test -n "$INFOCMP" || INFOCMP="$INFOCMP"
++
++cf_path_prog=""
++cf_path_args=""
++IFS="${IFS:- 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
++for cf_temp in $ac_cv_path_INFOCMP
++do
++	if test -z "$cf_path_prog" ; then
++		if test "$with_full_paths" = yes ; then
++
++if test "x$prefix" != xNONE; then
++	cf_path_syntax="$prefix"
++else
++	cf_path_syntax="$ac_default_prefix"
++fi
++
++case ".$cf_temp" in
++(.\$\(*\)*|.\'*\'*)
++	;;
++(..|./*|.\\*)
++	;;
++(.[a-zA-Z]:[\\/]*) # OS/2 EMX
++	;;
++(.\${*prefix}*|.\${*dir}*)
++	eval cf_temp="$cf_temp"
++	case ".$cf_temp" in
++	(.NONE/*)
++		cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
++		;;
++	esac
++	;;
++(.no|.NONE/*)
++	cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
++	;;
++(*)
++	break
++	;;
++esac
++
++			cf_path_prog="$cf_temp"
++		else
++			cf_path_prog="`basename $cf_temp`"
++		fi
++	elif test -z "$cf_path_args" ; then
++		cf_path_args="$cf_temp"
++	else
++		cf_path_args="$cf_path_args $cf_temp"
++	fi
++done
++IFS="$cf_save_ifs"
++
++if test -n "$cf_path_prog" ; then
++
++echo "${as_me:-configure}:8228: testing defining path for ${cf_path_prog} ..." 1>&5
++
++cat >>confdefs.h <>confdefs.h <&5
++echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
++		fi
++
++fi;
++
++else
++	: ${TIC:=tic}
++	: ${INFOCMP:=infocmp}
++fi
++
++echo "$as_me:8254: 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.
+@@ -7934,11 +8265,11 @@
+ (no) with_xterm_new=xterm-old;;
+ (*)	 with_xterm_new=xterm-new;;
+ esac
+-echo "$as_me:7937: result: $with_xterm_new" >&5
++echo "$as_me:8268: result: $with_xterm_new" >&5
+ echo "${ECHO_T}$with_xterm_new" >&6
+ WHICH_XTERM=$with_xterm_new
+ 
+-echo "$as_me:7941: checking if xterm backspace sends BS or DEL" >&5
++echo "$as_me:8272: 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.
+@@ -7959,7 +8290,7 @@
+ 	with_xterm_kbs=$withval
+ 	;;
+ esac
+-echo "$as_me:7962: result: $with_xterm_kbs" >&5
++echo "$as_me:8293: result: $with_xterm_kbs" >&5
+ echo "${ECHO_T}$with_xterm_kbs" >&6
+ XTERM_KBS=$with_xterm_kbs
+ 
+@@ -7969,7 +8300,7 @@
+ 	MAKE_TERMINFO="#"
+ else
+ 
+-echo "$as_me:7972: checking for list of terminfo directories" >&5
++echo "$as_me:8303: 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.
+@@ -8009,7 +8340,7 @@
+ 	cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:8012: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:8343: 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; }; }
+ 	;;
+@@ -8032,7 +8363,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:8035: result: $TERMINFO_DIRS" >&5
++echo "$as_me:8366: result: $TERMINFO_DIRS" >&5
+ echo "${ECHO_T}$TERMINFO_DIRS" >&6
+ test -n "$TERMINFO_DIRS" &&
+ cat >>confdefs.h <&5
++	{ echo "$as_me:8375: WARNING: ignoring non-directory/file TERMINFO value" >&5
+ echo "$as_me: WARNING: ignoring non-directory/file TERMINFO value" >&2;}
+ 	unset TERMINFO
+ 	;;
+ esac
+ 
+-echo "$as_me:8050: checking for default terminfo directory" >&5
++echo "$as_me:8381: 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.
+@@ -8083,7 +8414,7 @@
+ 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:8086: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:8417: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -8092,7 +8423,7 @@
+ fi
+ eval TERMINFO="$withval"
+ 
+-echo "$as_me:8095: result: $TERMINFO" >&5
++echo "$as_me:8426: result: $TERMINFO" >&5
+ echo "${ECHO_T}$TERMINFO" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:8437: 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.
+@@ -8115,7 +8446,7 @@
+   with_big_core=no
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 8118 "configure"
++#line 8449 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8129,15 +8460,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:8132: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8463: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8135: \$? = $ac_status" >&5
++  echo "$as_me:8466: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:8137: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8468: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8140: \$? = $ac_status" >&5
++  echo "$as_me:8471: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   with_big_core=yes
+ else
+@@ -8149,7 +8480,7 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi;
+-echo "$as_me:8152: result: $with_big_core" >&5
++echo "$as_me:8483: result: $with_big_core" >&5
+ echo "${ECHO_T}$with_big_core" >&6
+ test "x$with_big_core" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -8159,7 +8490,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:8162: checking if big-strings option selected" >&5
++echo "$as_me:8493: 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.
+@@ -8183,14 +8514,14 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:8186: result: $with_big_strings" >&5
++echo "$as_me:8517: 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:8193: checking if you want termcap-fallback support" >&5
++echo "$as_me:8524: 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.
+@@ -8200,14 +8531,14 @@
+ else
+   with_termcap=no
+ fi;
+-echo "$as_me:8203: result: $with_termcap" >&5
++echo "$as_me:8534: 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:8210: error: You have disabled the database w/o specifying fallbacks" >&5
++			{ { echo "$as_me:8541: 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
+@@ -8220,13 +8551,13 @@
+ else
+ 
+ 	if test "$with_ticlib" != no ; then
+-		{ { echo "$as_me:8223: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
++		{ { echo "$as_me:8554: 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:8229: checking for list of termcap files" >&5
++	echo "$as_me:8560: 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.
+@@ -8266,7 +8597,7 @@
+ 	cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:8269: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:8600: 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; }; }
+ 	;;
+@@ -8289,7 +8620,7 @@
+ 	;;
+ esac
+ 
+-	echo "$as_me:8292: result: $TERMPATH" >&5
++	echo "$as_me:8623: result: $TERMPATH" >&5
+ echo "${ECHO_T}$TERMPATH" >&6
+ 	test -n "$TERMPATH" &&
+ cat >>confdefs.h <&5
++	echo "$as_me:8631: 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.
+@@ -8307,14 +8638,14 @@
+ else
+   with_getcap=no
+ fi;
+-	echo "$as_me:8310: result: $with_getcap" >&5
++	echo "$as_me:8641: 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:8317: checking if translated termcaps will be cached in ~/.terminfo" >&5
++	echo "$as_me:8648: 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.
+@@ -8324,7 +8655,7 @@
+ else
+   with_getcap_cache=no
+ fi;
+-	echo "$as_me:8327: result: $with_getcap_cache" >&5
++	echo "$as_me:8658: result: $with_getcap_cache" >&5
+ echo "${ECHO_T}$with_getcap_cache" >&6
+ 	test "x$with_getcap_cache" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -8334,7 +8665,7 @@
+ fi
+ 
+ ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
+-echo "$as_me:8337: checking if ~/.terminfo is wanted" >&5
++echo "$as_me:8668: 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.
+@@ -8344,14 +8675,14 @@
+ else
+   with_home_terminfo=yes
+ fi;
+-echo "$as_me:8347: result: $with_home_terminfo" >&5
++echo "$as_me:8678: 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:8354: checking if you want to use restricted environment when running as root" >&5
++echo "$as_me:8685: 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.
+@@ -8361,7 +8692,7 @@
+ else
+   with_root_environ=yes
+ fi;
+-echo "$as_me:8364: result: $with_root_environ" >&5
++echo "$as_me:8695: result: $with_root_environ" >&5
+ echo "${ECHO_T}$with_root_environ" >&6
+ test "x$with_root_environ" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -8376,23 +8707,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:8379: checking for $ac_header" >&5
++echo "$as_me:8710: 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 8385 "configure"
++#line 8716 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8389: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:8720: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:8395: \$? = $ac_status" >&5
++  echo "$as_me:8726: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8411,7 +8742,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:8414: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:8745: 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:8760: 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 8435 "configure"
++#line 8766 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -8463,16 +8794,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8466: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8797: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8469: \$? = $ac_status" >&5
++  echo "$as_me:8800: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:8472: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8803: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8475: \$? = $ac_status" >&5
++  echo "$as_me:8806: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -8482,7 +8813,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:8485: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:8816: 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:8833: 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 8508 "configure"
++#line 8839 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -8536,16 +8867,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8539: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8870: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8542: \$? = $ac_status" >&5
++  echo "$as_me:8873: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:8545: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8876: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8548: \$? = $ac_status" >&5
++  echo "$as_me:8879: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -8555,7 +8886,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:8558: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:8889: 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:8900: 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
+@@ -8579,7 +8910,7 @@
+ 			eval 'ac_cv_func_'$cf_func'=error'
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 8582 "configure"
++#line 8913 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8609,15 +8940,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:8612: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8943: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8615: \$? = $ac_status" >&5
++  echo "$as_me:8946: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:8617: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8948: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8620: \$? = $ac_status" >&5
++  echo "$as_me:8951: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
+@@ -8635,7 +8966,7 @@
+ 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
+ 
+ fi
+-echo "$as_me:8638: result: $cf_cv_link_funcs" >&5
++echo "$as_me:8969: result: $cf_cv_link_funcs" >&5
+ echo "${ECHO_T}$cf_cv_link_funcs" >&6
+ 	test "$ac_cv_func_link"    = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -8655,7 +8986,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:8658: checking if tic should use symbolic links" >&5
++	echo "$as_me:8989: 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.
+@@ -8665,21 +8996,21 @@
+ else
+   with_symlinks=no
+ fi;
+-	echo "$as_me:8668: result: $with_symlinks" >&5
++	echo "$as_me:8999: 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:8675: checking if tic should use hard links" >&5
++	echo "$as_me:9006: 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:8682: result: $with_links" >&5
++	echo "$as_me:9013: result: $with_links" >&5
+ echo "${ECHO_T}$with_links" >&6
+ fi
+ 
+@@ -8694,7 +9025,7 @@
+ EOF
+ 
+ ###   use option --enable-broken-linker to force on use of broken-linker support
+-echo "$as_me:8697: checking if you want broken-linker support code" >&5
++echo "$as_me:9028: 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.
+@@ -8704,7 +9035,7 @@
+ else
+   with_broken_linker=${BROKEN_LINKER:-no}
+ fi;
+-echo "$as_me:8707: result: $with_broken_linker" >&5
++echo "$as_me:9038: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+ 
+ BROKEN_LINKER=0
+@@ -8726,14 +9057,14 @@
+ 		BROKEN_LINKER=1
+ 		test -n "$verbose" && echo "	cygwin linker is broken anyway" 1>&6
+ 
+-echo "${as_me:-configure}:8729: testing cygwin linker is broken anyway ..." 1>&5
++echo "${as_me:-configure}:9060: 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:8736: checking if tputs should process BSD-style prefix padding" >&5
++echo "$as_me:9067: 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.
+@@ -8743,7 +9074,7 @@
+ else
+   with_bsdpad=no
+ fi;
+-echo "$as_me:8746: result: $with_bsdpad" >&5
++echo "$as_me:9077: result: $with_bsdpad" >&5
+ echo "${ECHO_T}$with_bsdpad" >&6
+ test "x$with_bsdpad" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -8762,14 +9093,14 @@
+ # Check to define _XOPEN_SOURCE "automatically"
+ CPPFLAGS_before_XOPEN="$CPPFLAGS"
+ 
+-echo "$as_me:8765: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:9096: checking if the POSIX test-macros are already defined" >&5
+ echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6
+ if test "${cf_cv_posix_visible+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8772 "configure"
++#line 9103 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8788,16 +9119,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8791: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9122: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8794: \$? = $ac_status" >&5
++  echo "$as_me:9125: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8797: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9128: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8800: \$? = $ac_status" >&5
++  echo "$as_me:9131: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_posix_visible=no
+ else
+@@ -8808,7 +9139,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:8811: result: $cf_cv_posix_visible" >&5
++echo "$as_me:9142: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+ 
+ if test "$cf_cv_posix_visible" = no; then
+@@ -8853,14 +9184,14 @@
+ 
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+ 
+-echo "$as_me:8856: checking if this is the GNU C library" >&5
++echo "$as_me:9187: checking if this is the GNU C library" >&5
+ echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6
+ if test "${cf_cv_gnu_library+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8863 "configure"
++#line 9194 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8879,16 +9210,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8882: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9213: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8885: \$? = $ac_status" >&5
++  echo "$as_me:9216: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8888: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9219: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8891: \$? = $ac_status" >&5
++  echo "$as_me:9222: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_library=yes
+ else
+@@ -8899,7 +9230,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:8902: result: $cf_cv_gnu_library" >&5
++echo "$as_me:9233: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+ 
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -8907,7 +9238,7 @@
+ 	# With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE
+ 	# was changed to help a little.  newlib incorporated the change about 4
+ 	# years later.
+-	echo "$as_me:8910: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++	echo "$as_me:9241: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+ echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6
+ if test "${cf_cv_gnu_library_219+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8919,7 +9250,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 8922 "configure"
++#line 9253 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8938,16 +9269,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8941: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9272: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8944: \$? = $ac_status" >&5
++  echo "$as_me:9275: \$? = $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:9278: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8950: \$? = $ac_status" >&5
++  echo "$as_me:9281: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_library_219=yes
+ else
+@@ -8959,12 +9290,12 @@
+ 		CPPFLAGS="$cf_save"
+ 
+ fi
+-echo "$as_me:8962: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:9293: result: $cf_cv_gnu_library_219" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library_219" >&6
+ 
+ 	if test "x$cf_cv_gnu_library_219" = xyes; then
+ 		cf_save="$CPPFLAGS"
+-		echo "$as_me:8967: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++		echo "$as_me:9298: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+ echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_gnu_dftsrc_219+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9069,7 +9400,7 @@
+ fi
+ 
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 9072 "configure"
++#line 9403 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -9089,16 +9420,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9092: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9423: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9095: \$? = $ac_status" >&5
++  echo "$as_me:9426: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9098: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9429: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9101: \$? = $ac_status" >&5
++  echo "$as_me:9432: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -9109,7 +9440,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:9112: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:9443: result: $cf_cv_gnu_dftsrc_219" >&5
+ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
+ 		test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save"
+ 	else
+@@ -9118,14 +9449,14 @@
+ 
+ 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+ 
+-		echo "$as_me:9121: checking if we must define _GNU_SOURCE" >&5
++		echo "$as_me:9452: 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 9128 "configure"
++#line 9459 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9140,16 +9471,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9143: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9474: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9146: \$? = $ac_status" >&5
++  echo "$as_me:9477: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9149: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9480: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9152: \$? = $ac_status" >&5
++  echo "$as_me:9483: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -9256,7 +9587,7 @@
+ fi
+ 
+ 			 cat >conftest.$ac_ext <<_ACEOF
+-#line 9259 "configure"
++#line 9590 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9271,16 +9602,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9274: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9605: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9277: \$? = $ac_status" >&5
++  echo "$as_me:9608: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9280: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9611: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9283: \$? = $ac_status" >&5
++  echo "$as_me:9614: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -9295,12 +9626,12 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:9298: result: $cf_cv_gnu_source" >&5
++echo "$as_me:9629: 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:9303: checking if we should also define _DEFAULT_SOURCE" >&5
++		echo "$as_me:9634: 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
+@@ -9310,7 +9641,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+ 
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 9313 "configure"
++#line 9644 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9325,16 +9656,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9328: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9659: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9331: \$? = $ac_status" >&5
++  echo "$as_me:9662: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9334: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9665: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9337: \$? = $ac_status" >&5
++  echo "$as_me:9668: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -9345,7 +9676,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:9348: result: $cf_cv_default_source" >&5
++echo "$as_me:9679: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ 			if test "$cf_cv_default_source" = yes
+ 			then
+@@ -9382,16 +9713,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:9385: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:9716: 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}:9391: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:9722: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 9394 "configure"
++#line 9725 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9406,16 +9737,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9409: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9740: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9412: \$? = $ac_status" >&5
++  echo "$as_me:9743: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9415: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9746: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9418: \$? = $ac_status" >&5
++  echo "$as_me:9749: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -9436,7 +9767,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 9439 "configure"
++#line 9770 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9451,16 +9782,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9454: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9785: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9457: \$? = $ac_status" >&5
++  echo "$as_me:9788: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9460: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9791: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9463: \$? = $ac_status" >&5
++  echo "$as_me:9794: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -9471,7 +9802,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 	 fi
+ 
+-echo "${as_me:-configure}:9474: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:9805: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -9479,10 +9810,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:9482: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:9813: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 9485 "configure"
++#line 9816 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9497,16 +9828,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9500: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9831: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9503: \$? = $ac_status" >&5
++  echo "$as_me:9834: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9506: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9837: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9509: \$? = $ac_status" >&5
++  echo "$as_me:9840: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -9522,7 +9853,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:9525: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:9856: 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
+@@ -9662,14 +9993,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:9665: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:9996: 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 9672 "configure"
++#line 10003 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -9688,16 +10019,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9691: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10022: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9694: \$? = $ac_status" >&5
++  echo "$as_me:10025: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9697: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10028: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9700: \$? = $ac_status" >&5
++  echo "$as_me:10031: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -9709,7 +10040,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 9712 "configure"
++#line 10043 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -9728,16 +10059,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9731: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10062: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9734: \$? = $ac_status" >&5
++  echo "$as_me:10065: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9737: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10068: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9740: \$? = $ac_status" >&5
++  echo "$as_me:10071: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -9752,7 +10083,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:9755: result: $cf_cv_xopen_source" >&5
++echo "$as_me:10086: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -9882,16 +10213,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:9885: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:10216: 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}:9891: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:10222: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 9894 "configure"
++#line 10225 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9906,16 +10237,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9909: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10240: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9912: \$? = $ac_status" >&5
++  echo "$as_me:10243: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9915: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10246: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9918: \$? = $ac_status" >&5
++  echo "$as_me:10249: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -9936,7 +10267,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 9939 "configure"
++#line 10270 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9951,16 +10282,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9954: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10285: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9957: \$? = $ac_status" >&5
++  echo "$as_me:10288: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9960: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10291: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9963: \$? = $ac_status" >&5
++  echo "$as_me:10294: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -9971,7 +10302,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 	 fi
+ 
+-echo "${as_me:-configure}:9974: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:10305: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -9979,10 +10310,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:9982: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:10313: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 9985 "configure"
++#line 10316 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9997,16 +10328,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10000: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10331: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10003: \$? = $ac_status" >&5
++  echo "$as_me:10334: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10006: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10337: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10009: \$? = $ac_status" >&5
++  echo "$as_me:10340: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -10022,7 +10353,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:10025: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:10356: 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
+@@ -10216,7 +10547,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:10219: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:10550: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -10226,7 +10557,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:10229: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:10560: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -10236,7 +10567,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}:10239: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:10570: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+ 
+ 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+ 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+@@ -10246,10 +10577,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:10249: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:10580: 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 10252 "configure"
++#line 10583 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10264,16 +10595,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10267: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10598: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10270: \$? = $ac_status" >&5
++  echo "$as_me:10601: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10273: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10604: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10276: \$? = $ac_status" >&5
++  echo "$as_me:10607: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -10282,12 +10613,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-	echo "$as_me:10285: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:10616: 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 10290 "configure"
++#line 10621 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10302,16 +10633,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10305: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10636: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10308: \$? = $ac_status" >&5
++  echo "$as_me:10639: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10311: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10642: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10314: \$? = $ac_status" >&5
++  echo "$as_me:10645: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -10322,19 +10653,19 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 		if test $cf_XOPEN_SOURCE_set_ok = no
+ 		then
+-			{ echo "$as_me:10325: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:10656: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:10330: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:10661: 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 10337 "configure"
++#line 10668 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -10353,16 +10684,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10356: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10687: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10359: \$? = $ac_status" >&5
++  echo "$as_me:10690: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10362: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10693: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10365: \$? = $ac_status" >&5
++  echo "$as_me:10696: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -10374,7 +10705,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 10377 "configure"
++#line 10708 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -10393,16 +10724,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10396: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10727: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10399: \$? = $ac_status" >&5
++  echo "$as_me:10730: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10402: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10733: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10405: \$? = $ac_status" >&5
++  echo "$as_me:10736: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -10417,7 +10748,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:10420: result: $cf_cv_xopen_source" >&5
++echo "$as_me:10751: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -10540,14 +10871,14 @@
+ 
+ # Work around breakage on OS X
+ 
+-echo "$as_me:10543: checking if SIGWINCH is defined" >&5
++echo "$as_me:10874: 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 10550 "configure"
++#line 10881 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -10562,23 +10893,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10565: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10896: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10568: \$? = $ac_status" >&5
++  echo "$as_me:10899: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10571: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10902: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10574: \$? = $ac_status" >&5
++  echo "$as_me:10905: \$? = $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 10581 "configure"
++#line 10912 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -10596,16 +10927,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10599: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10930: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10602: \$? = $ac_status" >&5
++  echo "$as_me:10933: \$? = $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:10936: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10608: \$? = $ac_status" >&5
++  echo "$as_me:10939: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_define_sigwinch=maybe
+ else
+@@ -10619,11 +10950,11 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:10622: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:10953: 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:10626: checking for actual SIGWINCH definition" >&5
++echo "$as_me:10957: 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
+@@ -10634,7 +10965,7 @@
+ while test $cf_sigwinch != 1
+ do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 10637 "configure"
++#line 10968 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -10656,16 +10987,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10659: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10990: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10662: \$? = $ac_status" >&5
++  echo "$as_me:10993: \$? = $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:10996: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10668: \$? = $ac_status" >&5
++  echo "$as_me:10999: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_fixup_sigwinch=$cf_sigwinch
+ 	 break
+@@ -10679,7 +11010,7 @@
+ done
+ 
+ fi
+-echo "$as_me:10682: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:11013: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+ 
+ 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -10689,13 +11020,13 @@
+ 
+ # Checks for CODESET support.
+ 
+-echo "$as_me:10692: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:11023: 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 10698 "configure"
++#line 11029 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10707,16 +11038,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10710: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11041: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10713: \$? = $ac_status" >&5
++  echo "$as_me:11044: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10716: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11047: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10719: \$? = $ac_status" >&5
++  echo "$as_me:11050: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   am_cv_langinfo_codeset=yes
+ else
+@@ -10727,7 +11058,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:10730: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:11061: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ 	if test $am_cv_langinfo_codeset = yes; then
+ 
+@@ -10741,7 +11072,7 @@
+ NCURSES_OK_WCHAR_T=
+ NCURSES_OK_WINT_T=
+ 
+-echo "$as_me:10744: checking if you want wide-character code" >&5
++echo "$as_me:11075: 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.
+@@ -10751,7 +11082,7 @@
+ else
+   with_widec=no
+ fi;
+-echo "$as_me:10754: result: $with_widec" >&5
++echo "$as_me:11085: result: $with_widec" >&5
+ echo "${ECHO_T}$with_widec" >&6
+ 
+ NCURSES_WCWIDTH_GRAPHICS=1
+@@ -10775,23 +11106,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:10778: checking for $ac_header" >&5
++echo "$as_me:11109: 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 10784 "configure"
++#line 11115 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:10788: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:11119: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:10794: \$? = $ac_status" >&5
++  echo "$as_me:11125: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -10810,7 +11141,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:10813: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:11144: 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:11154: 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 10830 "configure"
++#line 11161 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -10849,16 +11180,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10852: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11183: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10855: \$? = $ac_status" >&5
++  echo "$as_me:11186: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10858: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11189: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10861: \$? = $ac_status" >&5
++  echo "$as_me:11192: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wchar_h_okay=yes
+ else
+@@ -10868,16 +11199,16 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:10871: result: $cf_cv_wchar_h_okay" >&5
++echo "$as_me:11202: 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:10877: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
++echo "$as_me:11208: 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 10880 "configure"
++#line 11211 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -10893,16 +11224,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10896: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11227: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10899: \$? = $ac_status" >&5
++  echo "$as_me:11230: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10902: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11233: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10905: \$? = $ac_status" >&5
++  echo "$as_me:11236: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=no
+ else
+@@ -10911,16 +11242,16 @@
+ cf_result=yes
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:10914: result: $cf_result" >&5
++echo "$as_me:11245: 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:10920: checking checking for compatible value versus " >&5
++	echo "$as_me:11251: 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 10923 "configure"
++#line 11254 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -10936,16 +11267,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10939: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11270: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10942: \$? = $ac_status" >&5
++  echo "$as_me:11273: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10945: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11276: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10948: \$? = $ac_status" >&5
++  echo "$as_me:11279: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -10954,7 +11285,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-	echo "$as_me:10957: result: $cf_result" >&5
++	echo "$as_me:11288: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" = no ; then
+ 		# perhaps we can override it - try...
+@@ -10964,7 +11295,7 @@
+ 
+ fi
+ 
+-echo "$as_me:10967: checking if wcwidth agrees graphics are single-width" >&5
++echo "$as_me:11298: 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
+@@ -11035,7 +11366,7 @@
+   cf_cv_wcwidth_graphics=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 11038 "configure"
++#line 11369 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -11079,15 +11410,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:11082: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11413: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11085: \$? = $ac_status" >&5
++  echo "$as_me:11416: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:11087: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11418: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11090: \$? = $ac_status" >&5
++  echo "$as_me:11421: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wcwidth_graphics=yes
+ else
+@@ -11100,7 +11431,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:11103: result: $cf_cv_wcwidth_graphics" >&5
++echo "$as_me:11434: result: $cf_cv_wcwidth_graphics" >&5
+ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
+ 
+ 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
+@@ -11111,13 +11442,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:11114: checking for $ac_func" >&5
++echo "$as_me:11445: 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 11120 "configure"
++#line 11451 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -11148,16 +11479,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11151: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11482: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11154: \$? = $ac_status" >&5
++  echo "$as_me:11485: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11157: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11488: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11160: \$? = $ac_status" >&5
++  echo "$as_me:11491: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -11167,7 +11498,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:11170: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:11501: 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:11513: 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
+@@ -11187,7 +11518,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 11190 "configure"
++#line 11521 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -11200,16 +11531,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11203: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11534: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11206: \$? = $ac_status" >&5
++  echo "$as_me:11537: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11209: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11540: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11212: \$? = $ac_status" >&5
++  echo "$as_me:11543: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -11221,12 +11552,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:11224: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:11555: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11229 "configure"
++#line 11560 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -11239,16 +11570,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11242: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11573: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11245: \$? = $ac_status" >&5
++  echo "$as_me:11576: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11248: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11579: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11251: \$? = $ac_status" >&5
++  echo "$as_me:11582: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -11262,7 +11593,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11265 "configure"
++#line 11596 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -11275,16 +11606,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11278: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11609: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11281: \$? = $ac_status" >&5
++  echo "$as_me:11612: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11284: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11615: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11287: \$? = $ac_status" >&5
++  echo "$as_me:11618: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -11301,9 +11632,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:11304: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:11635: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:11306: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:11637: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -11394,7 +11725,7 @@
+ 		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}:11397: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:11728: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+@@ -11402,7 +11733,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+ 
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 11405 "configure"
++#line 11736 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -11415,21 +11746,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11418: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11749: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11421: \$? = $ac_status" >&5
++  echo "$as_me:11752: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11424: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11755: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11427: \$? = $ac_status" >&5
++  echo "$as_me:11758: \$? = $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}:11432: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:11763: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -11447,7 +11778,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:11450: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:11781: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -11522,13 +11853,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}:11525: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:11856: 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 11531 "configure"
++#line 11862 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -11541,21 +11872,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11544: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11875: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11547: \$? = $ac_status" >&5
++  echo "$as_me:11878: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11550: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11881: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11553: \$? = $ac_status" >&5
++  echo "$as_me:11884: \$? = $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}:11558: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:11889: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -11597,7 +11928,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:11600: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:11931: 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
+@@ -11635,7 +11966,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 11638 "configure"
++#line 11969 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11647,16 +11978,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11650: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11981: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11653: \$? = $ac_status" >&5
++  echo "$as_me:11984: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11656: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11987: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11659: \$? = $ac_status" >&5
++  echo "$as_me:11990: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -11673,7 +12004,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}:11676: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:12007: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -11709,7 +12040,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}:11712: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:12043: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -11741,14 +12072,14 @@
+ 	fi
+ 
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:11744: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:12075: 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 11751 "configure"
++#line 12082 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -11766,23 +12097,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11769: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12100: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11772: \$? = $ac_status" >&5
++  echo "$as_me:12103: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11775: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12106: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11778: \$? = $ac_status" >&5
++  echo "$as_me:12109: \$? = $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 11785 "configure"
++#line 12116 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -11801,16 +12132,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11804: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12135: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11807: \$? = $ac_status" >&5
++  echo "$as_me:12138: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11810: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12141: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11813: \$? = $ac_status" >&5
++  echo "$as_me:12144: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_mbstate_t=yes
+ else
+@@ -11822,7 +12153,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:11825: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:12156: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+ 
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -11840,14 +12171,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:11843: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:12174: 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 11850 "configure"
++#line 12181 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -11865,23 +12196,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11868: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12199: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11871: \$? = $ac_status" >&5
++  echo "$as_me:12202: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11874: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12205: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11877: \$? = $ac_status" >&5
++  echo "$as_me:12208: \$? = $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 11884 "configure"
++#line 12215 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -11900,16 +12231,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11903: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12234: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11906: \$? = $ac_status" >&5
++  echo "$as_me:12237: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11909: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12240: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11912: \$? = $ac_status" >&5
++  echo "$as_me:12243: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wchar_t=yes
+ else
+@@ -11921,7 +12252,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:11924: result: $cf_cv_wchar_t" >&5
++echo "$as_me:12255: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+ 
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -11944,14 +12275,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:11947: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:12278: 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 11954 "configure"
++#line 12285 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -11969,23 +12300,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11972: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12303: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11975: \$? = $ac_status" >&5
++  echo "$as_me:12306: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11978: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12309: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11981: \$? = $ac_status" >&5
++  echo "$as_me:12312: \$? = $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 11988 "configure"
++#line 12319 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12004,16 +12335,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12007: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12338: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12010: \$? = $ac_status" >&5
++  echo "$as_me:12341: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12013: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12344: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12016: \$? = $ac_status" >&5
++  echo "$as_me:12347: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wint_t=yes
+ else
+@@ -12025,7 +12356,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:12028: result: $cf_cv_wint_t" >&5
++echo "$as_me:12359: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+ 
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -12057,7 +12388,7 @@
+ fi
+ 
+ ###   use option --disable-lp64 to allow long chtype
+-echo "$as_me:12060: checking whether to enable _LP64 definition in curses.h" >&5
++echo "$as_me:12391: 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.
+@@ -12067,7 +12398,7 @@
+ else
+   with_lp64=$cf_dft_with_lp64
+ fi;
+-echo "$as_me:12070: result: $with_lp64" >&5
++echo "$as_me:12401: result: $with_lp64" >&5
+ echo "${ECHO_T}$with_lp64" >&6
+ 
+ if test "x$with_lp64" = xyes ; then
+@@ -12083,7 +12414,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+ 
+-  echo "$as_me:12086: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:12417: 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
+@@ -12095,7 +12426,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 12098 "configure"
++#line 12429 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -12115,16 +12446,16 @@
+ }
+ _ACEOF
+      	 rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12118: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12449: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12121: \$? = $ac_status" >&5
++  echo "$as_me:12452: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12124: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12455: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12127: \$? = $ac_status" >&5
++  echo "$as_me:12458: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -12134,16 +12465,16 @@
+ rm -f conftest.$ac_objext
+      	 CC="$CC -n32"
+      	 rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12137: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12468: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12140: \$? = $ac_status" >&5
++  echo "$as_me:12471: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12143: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12474: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12146: \$? = $ac_status" >&5
++  echo "$as_me:12477: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -12157,13 +12488,13 @@
+        rm -f conftest.$ac_ext
+     fi
+ fi
+-echo "$as_me:12160: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:12491: 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:12166: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:12497: 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
+@@ -12171,7 +12502,7 @@
+   while :; do
+   ac_cv_sys_file_offset_bits=no
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12174 "configure"
++#line 12505 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -12191,16 +12522,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12194: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12525: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12197: \$? = $ac_status" >&5
++  echo "$as_me:12528: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12200: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12531: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12203: \$? = $ac_status" >&5
++  echo "$as_me:12534: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -12209,7 +12540,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12212 "configure"
++#line 12543 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include 
+@@ -12230,16 +12561,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12233: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12564: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12236: \$? = $ac_status" >&5
++  echo "$as_me:12567: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12239: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12570: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12242: \$? = $ac_status" >&5
++  echo "$as_me:12573: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -12250,7 +12581,7 @@
+   break
+ done
+ fi
+-echo "$as_me:12253: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:12584: 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
+ 
+@@ -12260,7 +12591,7 @@
+ 
+ fi
+ rm -rf conftest*
+-  echo "$as_me:12263: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:12594: 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
+@@ -12268,7 +12599,7 @@
+   while :; do
+   ac_cv_sys_large_files=no
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12271 "configure"
++#line 12602 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -12288,16 +12619,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12291: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12622: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12294: \$? = $ac_status" >&5
++  echo "$as_me:12625: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12297: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12628: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12300: \$? = $ac_status" >&5
++  echo "$as_me:12631: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -12306,7 +12637,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12309 "configure"
++#line 12640 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include 
+@@ -12327,16 +12658,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12330: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12661: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12333: \$? = $ac_status" >&5
++  echo "$as_me:12664: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12336: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12667: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12339: \$? = $ac_status" >&5
++  echo "$as_me:12670: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sys_large_files=1; break
+ else
+@@ -12347,7 +12678,7 @@
+   break
+ done
+ fi
+-echo "$as_me:12350: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:12681: 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
+ 
+@@ -12360,7 +12691,7 @@
+ fi
+ 
+ 	if test "$enable_largefile" != no ; then
+-	echo "$as_me:12363: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++	echo "$as_me:12694: 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
+@@ -12368,7 +12699,7 @@
+   while :; do
+   ac_cv_sys_largefile_source=no
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12371 "configure"
++#line 12702 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12380,16 +12711,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12383: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12714: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12386: \$? = $ac_status" >&5
++  echo "$as_me:12717: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12389: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12720: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12392: \$? = $ac_status" >&5
++  echo "$as_me:12723: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -12398,7 +12729,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12401 "configure"
++#line 12732 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include 
+@@ -12411,16 +12742,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12414: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12745: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12417: \$? = $ac_status" >&5
++  echo "$as_me:12748: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12420: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12751: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12423: \$? = $ac_status" >&5
++  echo "$as_me:12754: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sys_largefile_source=1; break
+ else
+@@ -12431,7 +12762,7 @@
+   break
+ done
+ fi
+-echo "$as_me:12434: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:12765: 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
+ 
+@@ -12445,13 +12776,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:12448: checking for fseeko" >&5
++echo "$as_me:12779: 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 12454 "configure"
++#line 12785 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12463,16 +12794,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12466: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12797: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12469: \$? = $ac_status" >&5
++  echo "$as_me:12800: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12472: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12803: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12475: \$? = $ac_status" >&5
++  echo "$as_me:12806: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_fseeko=yes
+ else
+@@ -12482,7 +12813,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:12485: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:12816: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+ 
+@@ -12521,14 +12852,14 @@
+ 
+ 	fi
+ 
+-	echo "$as_me:12524: checking whether to use struct dirent64" >&5
++	echo "$as_me:12855: 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 12531 "configure"
++#line 12862 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -12550,16 +12881,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12553: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12884: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12556: \$? = $ac_status" >&5
++  echo "$as_me:12887: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12559: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12890: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12562: \$? = $ac_status" >&5
++  echo "$as_me:12893: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_struct_dirent64=yes
+ else
+@@ -12570,7 +12901,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:12573: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:12904: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ 	test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -12580,7 +12911,7 @@
+ 	fi
+ 
+ ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
+-echo "$as_me:12583: checking if you want tparm not to use X/Open fixed-parameter list" >&5
++echo "$as_me:12914: 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.
+@@ -12590,14 +12921,14 @@
+ else
+   with_tparm_varargs=yes
+ fi;
+-echo "$as_me:12593: result: $with_tparm_varargs" >&5
++echo "$as_me:12924: 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:12600: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
++echo "$as_me:12931: 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.
+@@ -12607,14 +12938,14 @@
+ else
+   with_tic_depends=yes
+ fi;
+-echo "$as_me:12610: result: $with_tic_depends" >&5
++echo "$as_me:12941: 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:12617: checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition" >&5
++echo "$as_me:12948: 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.
+@@ -12626,15 +12957,15 @@
+ fi;
+ if [ "x$with_wattr_macros" != xyes ]; then
+ 	NCURSES_WATTR_MACROS=0
+-	echo "$as_me:12629: result: yes" >&5
++	echo "$as_me:12960: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+ 	NCURSES_WATTR_MACROS=1
+-	echo "$as_me:12633: result: no" >&5
++	echo "$as_me:12964: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:12637: checking for X11 rgb file" >&5
++echo "$as_me:12968: checking for X11 rgb file" >&5
+ echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6
+ 
+ # Check whether --with-x11-rgb or --without-x11-rgb was given.
+@@ -12698,7 +13029,7 @@
+ 	cf_path=`echo $cf_path | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:12701: error: expected a pathname, not \"$cf_path\"" >&5
++	{ { echo "$as_me:13032: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -12706,7 +13037,7 @@
+ 
+ fi
+ 
+-echo "$as_me:12709: result: $RGB_PATH" >&5
++echo "$as_me:13040: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:13054: 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.
+@@ -12730,10 +13061,10 @@
+ else
+   NCURSES_BOOL=auto
+ fi;
+-echo "$as_me:12733: result: $NCURSES_BOOL" >&5
++echo "$as_me:13064: result: $NCURSES_BOOL" >&5
+ echo "${ECHO_T}$NCURSES_BOOL" >&6
+ 
+-echo "$as_me:12736: checking for alternate terminal capabilities file" >&5
++echo "$as_me:13067: 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.
+@@ -12744,11 +13075,11 @@
+   TERMINFO_CAPS=Caps
+ fi;
+ test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
+-echo "$as_me:12747: result: $TERMINFO_CAPS" >&5
++echo "$as_me:13078: result: $TERMINFO_CAPS" >&5
+ echo "${ECHO_T}$TERMINFO_CAPS" >&6
+ 
+ ###   use option --with-chtype to override chtype's type
+-echo "$as_me:12751: checking for type of chtype" >&5
++echo "$as_me:13082: 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.
+@@ -12758,11 +13089,11 @@
+ else
+   NCURSES_CHTYPE=$cf_dft_chtype
+ fi;
+-echo "$as_me:12761: result: $NCURSES_CHTYPE" >&5
++echo "$as_me:13092: result: $NCURSES_CHTYPE" >&5
+ echo "${ECHO_T}$NCURSES_CHTYPE" >&6
+ 
+ ###   use option --with-ospeed to override ospeed's type
+-echo "$as_me:12765: checking for type of ospeed" >&5
++echo "$as_me:13096: 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.
+@@ -12772,11 +13103,11 @@
+ else
+   NCURSES_OSPEED=short
+ fi;
+-echo "$as_me:12775: result: $NCURSES_OSPEED" >&5
++echo "$as_me:13106: result: $NCURSES_OSPEED" >&5
+ echo "${ECHO_T}$NCURSES_OSPEED" >&6
+ 
+ ###   use option --with-mmask-t to override mmask_t's type
+-echo "$as_me:12779: checking for type of mmask_t" >&5
++echo "$as_me:13110: 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.
+@@ -12786,11 +13117,11 @@
+ else
+   NCURSES_MMASK_T=$cf_dft_mmask_t
+ fi;
+-echo "$as_me:12789: result: $NCURSES_MMASK_T" >&5
++echo "$as_me:13120: 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:12793: checking for size CCHARW_MAX" >&5
++echo "$as_me:13124: 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.
+@@ -12800,16 +13131,16 @@
+ else
+   NCURSES_CCHARW_MAX=5
+ fi;
+-echo "$as_me:12803: result: $NCURSES_CCHARW_MAX" >&5
++echo "$as_me:13134: result: $NCURSES_CCHARW_MAX" >&5
+ echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
+ 
+-echo "$as_me:12806: checking for ANSI C header files" >&5
++echo "$as_me:13137: 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 12812 "configure"
++#line 13143 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -12817,13 +13148,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:12820: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:13151: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:12826: \$? = $ac_status" >&5
++  echo "$as_me:13157: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12845,7 +13176,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 12848 "configure"
++#line 13179 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -12863,7 +13194,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 12866 "configure"
++#line 13197 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -12884,7 +13215,7 @@
+   :
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12887 "configure"
++#line 13218 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -12910,15 +13241,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:12913: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13244: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12916: \$? = $ac_status" >&5
++  echo "$as_me:13247: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:12918: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13249: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12921: \$? = $ac_status" >&5
++  echo "$as_me:13252: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -12931,7 +13262,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:12934: result: $ac_cv_header_stdc" >&5
++echo "$as_me:13265: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -12947,28 +13278,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:12950: checking for $ac_header" >&5
++echo "$as_me:13281: 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 12956 "configure"
++#line 13287 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12962: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13293: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12965: \$? = $ac_status" >&5
++  echo "$as_me:13296: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12968: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13299: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12971: \$? = $ac_status" >&5
++  echo "$as_me:13302: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -12978,7 +13309,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:12981: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:13312: 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:13322: 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 12997 "configure"
++#line 13328 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -13009,16 +13340,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13012: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13343: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13015: \$? = $ac_status" >&5
++  echo "$as_me:13346: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13018: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13349: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13021: \$? = $ac_status" >&5
++  echo "$as_me:13352: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -13028,10 +13359,10 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:13031: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:13362: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:13034: checking size of signed char" >&5
++echo "$as_me:13365: 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
+@@ -13040,7 +13371,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13043 "configure"
++#line 13374 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -13052,21 +13383,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13055: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13386: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13058: \$? = $ac_status" >&5
++  echo "$as_me:13389: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13061: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13392: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13064: \$? = $ac_status" >&5
++  echo "$as_me:13395: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 13069 "configure"
++#line 13400 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -13078,16 +13409,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13081: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13412: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13084: \$? = $ac_status" >&5
++  echo "$as_me:13415: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13087: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13418: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13090: \$? = $ac_status" >&5
++  echo "$as_me:13421: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -13103,7 +13434,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 13106 "configure"
++#line 13437 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -13115,16 +13446,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13118: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13449: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13121: \$? = $ac_status" >&5
++  echo "$as_me:13452: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13124: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13455: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13127: \$? = $ac_status" >&5
++  echo "$as_me:13458: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -13140,7 +13471,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 13143 "configure"
++#line 13474 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -13152,16 +13483,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13155: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13486: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13158: \$? = $ac_status" >&5
++  echo "$as_me:13489: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13161: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13492: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13164: \$? = $ac_status" >&5
++  echo "$as_me:13495: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -13174,12 +13505,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:13177: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:13508: 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 13182 "configure"
++#line 13513 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -13195,15 +13526,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:13198: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13529: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13201: \$? = $ac_status" >&5
++  echo "$as_me:13532: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:13203: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13534: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13206: \$? = $ac_status" >&5
++  echo "$as_me:13537: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -13219,7 +13550,7 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:13222: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:13553: result: $ac_cv_sizeof_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:13564: 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.
+@@ -13240,12 +13571,12 @@
+ else
+   with_signed_char=no
+ fi;
+-echo "$as_me:13243: result: $with_signed_char" >&5
++echo "$as_me:13574: result: $with_signed_char" >&5
+ echo "${ECHO_T}$with_signed_char" >&6
+ test "x$with_signed_char" != xyes && NCURSES_SBOOL="char"
+ 
+ ###   use option --with-tparm-arg to override tparm's argument type
+-echo "$as_me:13248: checking for type of tparm args" >&5
++echo "$as_me:13579: 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.
+@@ -13255,11 +13586,11 @@
+ else
+   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
+ fi;
+-echo "$as_me:13258: result: $NCURSES_TPARM_ARG" >&5
++echo "$as_me:13589: result: $NCURSES_TPARM_ARG" >&5
+ echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
+ 
+ ### Enable compiling-in rcs id's
+-echo "$as_me:13262: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:13593: 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.
+@@ -13269,7 +13600,7 @@
+ else
+   with_rcs_ids=no
+ fi;
+-echo "$as_me:13272: result: $with_rcs_ids" >&5
++echo "$as_me:13603: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "x$with_rcs_ids" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -13278,7 +13609,7 @@
+ 
+ ###############################################################################
+ 
+-echo "$as_me:13281: checking format of man-pages" >&5
++echo "$as_me:13612: 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.
+@@ -13367,14 +13698,14 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:13370: result: $MANPAGE_FORMAT" >&5
++echo "$as_me:13701: result: $MANPAGE_FORMAT" >&5
+ echo "${ECHO_T}$MANPAGE_FORMAT" >&6
+ if test -n "$cf_unknown" ; then
+-	{ echo "$as_me:13373: WARNING: Unexpected manpage-format $cf_unknown" >&5
++	{ echo "$as_me:13704: WARNING: Unexpected manpage-format $cf_unknown" >&5
+ echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
+ fi
+ 
+-echo "$as_me:13377: checking for manpage renaming" >&5
++echo "$as_me:13708: 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.
+@@ -13402,7 +13733,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:13405: error: not a filename: $MANPAGE_RENAMES" >&5
++		{ { echo "$as_me:13736: error: not a filename: $MANPAGE_RENAMES" >&5
+ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -13416,10 +13747,10 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:13419: result: $MANPAGE_RENAMES" >&5
++echo "$as_me:13750: result: $MANPAGE_RENAMES" >&5
+ echo "${ECHO_T}$MANPAGE_RENAMES" >&6
+ 
+-echo "$as_me:13422: checking if manpage aliases will be installed" >&5
++echo "$as_me:13753: 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.
+@@ -13430,7 +13761,7 @@
+   MANPAGE_ALIASES=yes
+ fi;
+ 
+-echo "$as_me:13433: result: $MANPAGE_ALIASES" >&5
++echo "$as_me:13764: result: $MANPAGE_ALIASES" >&5
+ echo "${ECHO_T}$MANPAGE_ALIASES" >&6
+ 
+ case "x$LN_S" in
+@@ -13444,7 +13775,7 @@
+ 
+ MANPAGE_SYMLINKS=no
+ if test "$MANPAGE_ALIASES" = yes ; then
+-echo "$as_me:13447: checking if manpage symlinks should be used" >&5
++echo "$as_me:13778: 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.
+@@ -13457,17 +13788,17 @@
+ 
+ if test "$$cf_use_symlinks" = no; then
+ if test "$MANPAGE_SYMLINKS" = yes ; then
+-	{ echo "$as_me:13460: WARNING: cannot make symlinks" >&5
++	{ echo "$as_me:13791: WARNING: cannot make symlinks" >&5
+ echo "$as_me: WARNING: cannot make symlinks" >&2;}
+ 	MANPAGE_SYMLINKS=no
+ fi
+ fi
+ 
+-echo "$as_me:13466: result: $MANPAGE_SYMLINKS" >&5
++echo "$as_me:13797: result: $MANPAGE_SYMLINKS" >&5
+ echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
+ fi
+ 
+-echo "$as_me:13470: checking for manpage tbl" >&5
++echo "$as_me:13801: 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.
+@@ -13478,7 +13809,7 @@
+   MANPAGE_TBL=no
+ fi;
+ 
+-echo "$as_me:13481: result: $MANPAGE_TBL" >&5
++echo "$as_me:13812: result: $MANPAGE_TBL" >&5
+ echo "${ECHO_T}$MANPAGE_TBL" >&6
+ 
+ if test "$prefix" = "NONE" ; then
+@@ -13811,7 +14142,7 @@
+ ###############################################################################
+ 
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:13814: checking if you want to build with function extensions" >&5
++echo "$as_me:14145: 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.
+@@ -13821,7 +14152,7 @@
+ else
+   with_ext_funcs=yes
+ fi;
+-echo "$as_me:13824: result: $with_ext_funcs" >&5
++echo "$as_me:14155: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "x$with_ext_funcs" = xyes ; then
+ 	NCURSES_EXT_FUNCS=1
+@@ -13881,7 +14212,7 @@
+ 	GENERATED_EXT_FUNCS=
+ fi
+ 
+-echo "$as_me:13884: checking if you want to build with SCREEN extensions" >&5
++echo "$as_me:14215: 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.
+@@ -13891,7 +14222,7 @@
+ else
+   with_sp_funcs=$cf_dft_ext_spfuncs
+ fi;
+-echo "$as_me:13894: result: $with_sp_funcs" >&5
++echo "$as_me:14225: result: $with_sp_funcs" >&5
+ echo "${ECHO_T}$with_sp_funcs" >&6
+ if test "x$with_sp_funcs" = xyes ; then
+ 	NCURSES_SP_FUNCS=1
+@@ -13910,7 +14241,7 @@
+ 	GENERATED_SP_FUNCS=
+ fi
+ 
+-echo "$as_me:13913: checking if you want to build with terminal-driver" >&5
++echo "$as_me:14244: 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.
+@@ -13920,7 +14251,7 @@
+ else
+   with_term_driver=no
+ fi;
+-echo "$as_me:13923: result: $with_term_driver" >&5
++echo "$as_me:14254: result: $with_term_driver" >&5
+ echo "${ECHO_T}$with_term_driver" >&6
+ if test "x$with_term_driver" = xyes ; then
+ 
+@@ -13929,19 +14260,19 @@
+ EOF
+ 
+ 	if test "x$with_termlib" != xno ; then
+-		{ { echo "$as_me:13932: error: The term-driver option conflicts with the termlib option" >&5
++		{ { echo "$as_me:14263: 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:13937: error: The term-driver option relies upon sp-funcs" >&5
++		{ { echo "$as_me:14268: 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:13944: checking for extended use of const keyword" >&5
++echo "$as_me:14275: 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.
+@@ -13951,7 +14282,7 @@
+ else
+   with_ext_const=$cf_dft_ext_const
+ fi;
+-echo "$as_me:13954: result: $with_ext_const" >&5
++echo "$as_me:14285: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "x$with_ext_const" = xyes ; then
+@@ -13959,7 +14290,7 @@
+ fi
+ 
+ ###   use option --enable-ext-colors to turn on use of colors beyond 16.
+-echo "$as_me:13962: checking if you want to use extended colors" >&5
++echo "$as_me:14293: 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.
+@@ -13969,12 +14300,12 @@
+ else
+   with_ext_colors=$cf_dft_ext_colors
+ fi;
+-echo "$as_me:13972: result: $with_ext_colors" >&5
++echo "$as_me:14303: 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:13977: WARNING: This option applies only to wide-character library" >&5
++		{ echo "$as_me:14308: 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)
+@@ -13984,7 +14315,7 @@
+ 	(5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:13987: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:14318: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -14012,7 +14343,7 @@
+ fi
+ 
+ ###   use option --enable-ext-mouse to modify coding to support 5-button mice
+-echo "$as_me:14015: checking if you want to use extended mouse encoding" >&5
++echo "$as_me:14346: 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.
+@@ -14022,7 +14353,7 @@
+ else
+   with_ext_mouse=$cf_dft_ext_mouse
+ fi;
+-echo "$as_me:14025: result: $with_ext_mouse" >&5
++echo "$as_me:14356: result: $with_ext_mouse" >&5
+ echo "${ECHO_T}$with_ext_mouse" >&6
+ NCURSES_MOUSE_VERSION=1
+ if test "x$with_ext_mouse" = xyes ; then
+@@ -14033,7 +14364,7 @@
+ 	(5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:14036: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:14367: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -14042,7 +14373,7 @@
+ fi
+ 
+ ###   use option --enable-ext-putwin to turn on extended screendumps
+-echo "$as_me:14045: checking if you want to use extended putwin/screendump" >&5
++echo "$as_me:14376: 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.
+@@ -14052,7 +14383,7 @@
+ else
+   with_ext_putwin=$cf_dft_ext_putwin
+ fi;
+-echo "$as_me:14055: result: $with_ext_putwin" >&5
++echo "$as_me:14386: result: $with_ext_putwin" >&5
+ echo "${ECHO_T}$with_ext_putwin" >&6
+ if test "x$with_ext_putwin" = xyes ; then
+ 
+@@ -14062,7 +14393,7 @@
+ 
+ fi
+ 
+-echo "$as_me:14065: checking if you want \$NCURSES_NO_PADDING code" >&5
++echo "$as_me:14396: 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.
+@@ -14072,7 +14403,7 @@
+ else
+   with_no_padding=$with_ext_funcs
+ fi;
+-echo "$as_me:14075: result: $with_no_padding" >&5
++echo "$as_me:14406: result: $with_no_padding" >&5
+ echo "${ECHO_T}$with_no_padding" >&6
+ test "x$with_no_padding" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -14080,7 +14411,7 @@
+ EOF
+ 
+ ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
+-echo "$as_me:14083: checking if you want SIGWINCH handler" >&5
++echo "$as_me:14414: 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.
+@@ -14090,7 +14421,7 @@
+ else
+   with_sigwinch=$with_ext_funcs
+ fi;
+-echo "$as_me:14093: result: $with_sigwinch" >&5
++echo "$as_me:14424: result: $with_sigwinch" >&5
+ echo "${ECHO_T}$with_sigwinch" >&6
+ test "x$with_sigwinch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -14098,7 +14429,7 @@
+ EOF
+ 
+ ###   use option --enable-tcap-names to allow user to define new capabilities
+-echo "$as_me:14101: checking if you want user-definable terminal capabilities like termcap" >&5
++echo "$as_me:14432: 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.
+@@ -14108,14 +14439,14 @@
+ else
+   with_tcap_names=$with_ext_funcs
+ fi;
+-echo "$as_me:14111: result: $with_tcap_names" >&5
++echo "$as_me:14442: result: $with_tcap_names" >&5
+ echo "${ECHO_T}$with_tcap_names" >&6
+ NCURSES_XNAMES=0
+ test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1
+ 
+ ##############################################################################
+ 
+-echo "$as_me:14118: checking if you want to link with the pthread library" >&5
++echo "$as_me:14449: 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.
+@@ -14125,27 +14456,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:14128: result: $with_pthread" >&5
++echo "$as_me:14459: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-	echo "$as_me:14132: checking for pthread.h" >&5
++	echo "$as_me:14463: 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 14138 "configure"
++#line 14469 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:14142: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:14473: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:14148: \$? = $ac_status" >&5
++  echo "$as_me:14479: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -14164,7 +14495,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:14167: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:14498: 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
+ 
+@@ -14174,7 +14505,7 @@
+ 
+ 	for cf_lib_pthread in pthread c_r
+ 	do
+-	    echo "$as_me:14177: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:14508: 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"
+ 
+@@ -14195,7 +14526,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	    cat >conftest.$ac_ext <<_ACEOF
+-#line 14198 "configure"
++#line 14529 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14212,16 +14543,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14215: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14546: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14218: \$? = $ac_status" >&5
++  echo "$as_me:14549: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14221: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14552: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14224: \$? = $ac_status" >&5
++  echo "$as_me:14555: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   with_pthread=yes
+ else
+@@ -14231,7 +14562,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 	    LIBS="$cf_save_LIBS"
+-	    echo "$as_me:14234: result: $with_pthread" >&5
++	    echo "$as_me:14565: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 	    test "$with_pthread" = yes && break
+ 	done
+@@ -14259,7 +14590,7 @@
+ EOF
+ 
+ 	else
+-	    { { echo "$as_me:14262: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:14593: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -14269,13 +14600,13 @@
+ fi
+ 
+ if test "x$with_pthread" != xno; then
+-	echo "$as_me:14272: checking for pthread_kill" >&5
++	echo "$as_me:14603: 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 14278 "configure"
++#line 14609 "configure"
+ #include "confdefs.h"
+ #define pthread_kill autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -14306,16 +14637,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14309: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14640: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14312: \$? = $ac_status" >&5
++  echo "$as_me:14643: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14315: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14646: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14318: \$? = $ac_status" >&5
++  echo "$as_me:14649: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_pthread_kill=yes
+ else
+@@ -14325,11 +14656,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:14328: result: $ac_cv_func_pthread_kill" >&5
++echo "$as_me:14659: 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:14332: checking if you want to allow EINTR in wgetch with pthreads" >&5
++		echo "$as_me:14663: 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.
+@@ -14339,7 +14670,7 @@
+ else
+   use_pthreads_eintr=no
+ fi;
+-		echo "$as_me:14342: result: $use_pthreads_eintr" >&5
++		echo "$as_me:14673: result: $use_pthreads_eintr" >&5
+ echo "${ECHO_T}$use_pthreads_eintr" >&6
+ 		if test "x$use_pthreads_eintr" = xyes ; then
+ 
+@@ -14350,7 +14681,7 @@
+ 		fi
+ fi
+ 
+-	echo "$as_me:14353: checking if you want to use weak-symbols for pthreads" >&5
++	echo "$as_me:14684: 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.
+@@ -14360,18 +14691,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-	echo "$as_me:14363: result: $use_weak_symbols" >&5
++	echo "$as_me:14694: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ 	if test "x$use_weak_symbols" = xyes ; then
+ 
+-echo "$as_me:14367: checking if $CC supports weak symbols" >&5
++echo "$as_me:14698: 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 14374 "configure"
++#line 14705 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14397,16 +14728,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14400: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14731: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14403: \$? = $ac_status" >&5
++  echo "$as_me:14734: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14406: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14737: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14409: \$? = $ac_status" >&5
++  echo "$as_me:14740: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -14417,7 +14748,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:14420: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:14751: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ 	else
+@@ -14467,7 +14798,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:14470: checking if you want reentrant code" >&5
++echo "$as_me:14801: 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.
+@@ -14477,7 +14808,7 @@
+ else
+   with_reentrant=no
+ fi;
+-echo "$as_me:14480: result: $with_reentrant" >&5
++echo "$as_me:14811: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "x$with_reentrant" = xyes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -14565,7 +14896,7 @@
+ 	(5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:14568: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:14899: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -14577,7 +14908,7 @@
+ 	NCURSES_SIZE_T=short
+ fi
+ 
+-echo "$as_me:14580: checking if you want opaque curses-library structures" >&5
++echo "$as_me:14911: checking if you want opaque curses-library structures" >&5
+ echo $ECHO_N "checking if you want opaque curses-library structures... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
+@@ -14599,16 +14930,16 @@
+ 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=no
+ 
+ fi;
+-echo "$as_me:14602: result: $enable_opaque_curses" >&5
++echo "$as_me:14933: result: $enable_opaque_curses" >&5
+ echo "${ECHO_T}$enable_opaque_curses" >&6
+ 
+ test "$cf_cv_enable_reentrant" = 1 && \
+ test "$enable_opaque_curses" = no && \
+-{ { echo "$as_me:14607: error: reentrant configuration requires opaque library" >&5
++{ { echo "$as_me:14938: error: reentrant configuration requires opaque library" >&5
+ echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:14611: checking if you want opaque form-library structures" >&5
++echo "$as_me:14942: checking if you want opaque form-library structures" >&5
+ echo $ECHO_N "checking if you want opaque form-library structures... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-form or --disable-opaque-form was given.
+@@ -14618,10 +14949,10 @@
+ else
+   enable_opaque_form=no
+ fi;
+-echo "$as_me:14621: result: $enable_opaque_form" >&5
++echo "$as_me:14952: result: $enable_opaque_form" >&5
+ echo "${ECHO_T}$enable_opaque_form" >&6
+ 
+-echo "$as_me:14624: checking if you want opaque menu-library structures" >&5
++echo "$as_me:14955: checking if you want opaque menu-library structures" >&5
+ echo $ECHO_N "checking if you want opaque menu-library structures... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
+@@ -14631,10 +14962,10 @@
+ else
+   enable_opaque_menu=no
+ fi;
+-echo "$as_me:14634: result: $enable_opaque_menu" >&5
++echo "$as_me:14965: result: $enable_opaque_menu" >&5
+ echo "${ECHO_T}$enable_opaque_menu" >&6
+ 
+-echo "$as_me:14637: checking if you want opaque panel-library structures" >&5
++echo "$as_me:14968: checking if you want opaque panel-library structures" >&5
+ echo $ECHO_N "checking if you want opaque panel-library structures... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
+@@ -14644,7 +14975,7 @@
+ else
+   enable_opaque_panel=no
+ fi;
+-echo "$as_me:14647: result: $enable_opaque_panel" >&5
++echo "$as_me:14978: result: $enable_opaque_panel" >&5
+ echo "${ECHO_T}$enable_opaque_panel" >&6
+ 
+ NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
+@@ -14654,7 +14985,7 @@
+ 
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+-	echo "$as_me:14657: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:14988: 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.
+@@ -14664,7 +14995,7 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-	echo "$as_me:14667: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:14998: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ 	NCURSES_WRAP_PREFIX=_nc_
+@@ -14677,7 +15008,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:14680: checking if you want all development code" >&5
++echo "$as_me:15011: 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.
+@@ -14687,11 +15018,11 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:14690: result: $with_develop" >&5
++echo "$as_me:15021: 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:14694: checking if you want hard-tabs code" >&5
++echo "$as_me:15025: 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.
+@@ -14701,7 +15032,7 @@
+ else
+   enable_hard_tabs=$with_develop
+ fi;
+-echo "$as_me:14704: result: $enable_hard_tabs" >&5
++echo "$as_me:15035: result: $enable_hard_tabs" >&5
+ echo "${ECHO_T}$enable_hard_tabs" >&6
+ test "x$enable_hard_tabs" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -14709,7 +15040,7 @@
+ EOF
+ 
+ ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
+-echo "$as_me:14712: checking if you want limited support for xmc" >&5
++echo "$as_me:15043: 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.
+@@ -14719,7 +15050,7 @@
+ else
+   enable_xmc_glitch=$with_develop
+ fi;
+-echo "$as_me:14722: result: $enable_xmc_glitch" >&5
++echo "$as_me:15053: result: $enable_xmc_glitch" >&5
+ echo "${ECHO_T}$enable_xmc_glitch" >&6
+ test "x$enable_xmc_glitch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -14729,7 +15060,7 @@
+ ###############################################################################
+ # These are just experimental, probably should not be in a package:
+ 
+-echo "$as_me:14732: checking if you do not want to assume colors are white-on-black" >&5
++echo "$as_me:15063: 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.
+@@ -14739,7 +15070,7 @@
+ else
+   with_assumed_color=yes
+ fi;
+-echo "$as_me:14742: result: $with_assumed_color" >&5
++echo "$as_me:15073: result: $with_assumed_color" >&5
+ echo "${ECHO_T}$with_assumed_color" >&6
+ test "x$with_assumed_color" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -14747,7 +15078,7 @@
+ EOF
+ 
+ ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
+-echo "$as_me:14750: checking if you want hashmap scrolling-optimization code" >&5
++echo "$as_me:15081: 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.
+@@ -14757,7 +15088,7 @@
+ else
+   with_hashmap=yes
+ fi;
+-echo "$as_me:14760: result: $with_hashmap" >&5
++echo "$as_me:15091: result: $with_hashmap" >&5
+ echo "${ECHO_T}$with_hashmap" >&6
+ test "x$with_hashmap" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -14765,7 +15096,7 @@
+ EOF
+ 
+ ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
+-echo "$as_me:14768: checking if you want colorfgbg code" >&5
++echo "$as_me:15099: 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.
+@@ -14775,7 +15106,7 @@
+ else
+   with_colorfgbg=no
+ fi;
+-echo "$as_me:14778: result: $with_colorfgbg" >&5
++echo "$as_me:15109: result: $with_colorfgbg" >&5
+ echo "${ECHO_T}$with_colorfgbg" >&6
+ test "x$with_colorfgbg" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -14783,7 +15114,7 @@
+ EOF
+ 
+ ###   use option --enable-interop to turn on use of bindings used for interop
+-echo "$as_me:14786: checking if you want interop bindings" >&5
++echo "$as_me:15117: 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.
+@@ -14793,13 +15124,13 @@
+ else
+   with_exp_interop=$cf_dft_interop
+ fi;
+-echo "$as_me:14796: result: $with_exp_interop" >&5
++echo "$as_me:15127: result: $with_exp_interop" >&5
+ echo "${ECHO_T}$with_exp_interop" >&6
+ 
+ NCURSES_INTEROP_FUNCS=0
+ test "x$with_exp_interop" = xyes && NCURSES_INTEROP_FUNCS=1
+ 
+-echo "$as_me:14802: checking if you want experimental safe-sprintf code" >&5
++echo "$as_me:15133: 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.
+@@ -14809,13 +15140,13 @@
+ else
+   with_safe_sprintf=no
+ fi;
+-echo "$as_me:14812: result: $with_safe_sprintf" >&5
++echo "$as_me:15143: result: $with_safe_sprintf" >&5
+ echo "${ECHO_T}$with_safe_sprintf" >&6
+ 
+ ###   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:14818: checking if you want to experiment without scrolling-hints code" >&5
++echo "$as_me:15149: 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.
+@@ -14825,7 +15156,7 @@
+ else
+   with_scroll_hints=yes
+ fi;
+-echo "$as_me:14828: result: $with_scroll_hints" >&5
++echo "$as_me:15159: result: $with_scroll_hints" >&5
+ echo "${ECHO_T}$with_scroll_hints" >&6
+ test "x$with_scroll_hints" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -14834,7 +15165,7 @@
+ 
+ fi
+ 
+-echo "$as_me:14837: checking if you want wgetch-events code" >&5
++echo "$as_me:15168: 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.
+@@ -14844,7 +15175,7 @@
+ else
+   with_wgetch_events=no
+ fi;
+-echo "$as_me:14847: result: $with_wgetch_events" >&5
++echo "$as_me:15178: result: $with_wgetch_events" >&5
+ echo "${ECHO_T}$with_wgetch_events" >&6
+ test "x$with_wgetch_events" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -14855,7 +15186,7 @@
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+ 
+-echo "$as_me:14858: checking if you want to see long compiling messages" >&5
++echo "$as_me:15189: 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.
+@@ -14889,7 +15220,7 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:14892: result: $enableval" >&5
++echo "$as_me:15223: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+ if test "x$enable_echo" = xyes; then
+@@ -14902,7 +15233,7 @@
+ 
+ # --disable-stripping is used for debugging
+ 
+-echo "$as_me:14905: checking if you want to install stripped executables" >&5
++echo "$as_me:15236: checking if you want to install stripped executables" >&5
+ echo $ECHO_N "checking if you want to install stripped executables... $ECHO_C" >&6
+ 
+ # Check whether --enable-stripping or --disable-stripping was given.
+@@ -14919,7 +15250,7 @@
+ 	with_stripping=yes
+ 
+ fi;
+-echo "$as_me:14922: result: $with_stripping" >&5
++echo "$as_me:15253: result: $with_stripping" >&5
+ echo "${ECHO_T}$with_stripping" >&6
+ 
+ if test "$with_stripping" = yes
+@@ -14930,7 +15261,7 @@
+ fi
+ 
+ : ${INSTALL:=install}
+-echo "$as_me:14933: checking if install accepts -p option" >&5
++echo "$as_me:15264: checking if install accepts -p option" >&5
+ echo $ECHO_N "checking if install accepts -p option... $ECHO_C" >&6
+ if test "${cf_cv_install_p+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14961,10 +15292,10 @@
+ 	rm -rf conftest*
+ 
+ fi
+-echo "$as_me:14964: result: $cf_cv_install_p" >&5
++echo "$as_me:15295: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+ 
+-echo "$as_me:14967: checking if install needs to be told about ownership" >&5
++echo "$as_me:15298: checking if install needs to be told about ownership" >&5
+ echo $ECHO_N "checking if install needs to be told about ownership... $ECHO_C" >&6
+ case `$ac_config_guess` in
+ (*minix)
+@@ -14975,7 +15306,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:14978: result: $with_install_o" >&5
++echo "$as_me:15309: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -14999,7 +15330,7 @@
+ fi
+ 
+ ###	use option --enable-warnings to turn on all gcc warnings
+-echo "$as_me:15002: checking if you want to see compiler warnings" >&5
++echo "$as_me:15333: 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.
+@@ -15007,7 +15338,7 @@
+   enableval="$enable_warnings"
+   with_warnings=$enableval
+ fi;
+-echo "$as_me:15010: result: $with_warnings" >&5
++echo "$as_me:15341: result: $with_warnings" >&5
+ echo "${ECHO_T}$with_warnings" >&6
+ 
+ if test "x$with_warnings" = "xyes"; then
+@@ -15019,12 +15350,12 @@
+ if test "$GCC" = yes ; then
+ 	case $host_os in
+ 	(linux*|gnu*)
+-		echo "$as_me:15022: checking if this is really Intel C compiler" >&5
++		echo "$as_me:15353: 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 15027 "configure"
++#line 15358 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -15041,16 +15372,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15044: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15375: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15047: \$? = $ac_status" >&5
++  echo "$as_me:15378: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15050: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15381: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15053: \$? = $ac_status" >&5
++  echo "$as_me:15384: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   INTEL_COMPILER=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -15061,7 +15392,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 		CFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:15064: result: $INTEL_COMPILER" >&5
++		echo "$as_me:15395: result: $INTEL_COMPILER" >&5
+ echo "${ECHO_T}$INTEL_COMPILER" >&6
+ 		;;
+ 	esac
+@@ -15070,12 +15401,12 @@
+ CLANG_COMPILER=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:15073: checking if this is really Clang C compiler" >&5
++	echo "$as_me:15404: 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 15078 "configure"
++#line 15409 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -15092,16 +15423,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15095: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15426: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15098: \$? = $ac_status" >&5
++  echo "$as_me:15429: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15101: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15432: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15104: \$? = $ac_status" >&5
++  echo "$as_me:15435: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   CLANG_COMPILER=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
+@@ -15112,13 +15443,13 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 	CFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:15115: result: $CLANG_COMPILER" >&5
++	echo "$as_me:15446: result: $CLANG_COMPILER" >&5
+ echo "${ECHO_T}$CLANG_COMPILER" >&6
+ fi
+ 
+ if test "x$have_x" = xyes; then
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15121 "configure"
++#line 15452 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -15133,26 +15464,26 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15136: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15467: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15139: \$? = $ac_status" >&5
++  echo "$as_me:15470: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15142: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15473: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15145: \$? = $ac_status" >&5
++  echo "$as_me:15476: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+-echo "$as_me:15148: checking for X11/Xt const-feature" >&5
++echo "$as_me:15479: checking for X11/Xt const-feature" >&5
+ echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
+ if test "${cf_cv_const_x_string+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 15155 "configure"
++#line 15486 "configure"
+ #include "confdefs.h"
+ 
+ #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
+@@ -15169,16 +15500,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15172: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15503: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15175: \$? = $ac_status" >&5
++  echo "$as_me:15506: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15178: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15509: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15181: \$? = $ac_status" >&5
++  echo "$as_me:15512: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -15193,7 +15524,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:15196: result: $cf_cv_const_x_string" >&5
++echo "$as_me:15527: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ case $cf_cv_const_x_string in
+@@ -15218,7 +15549,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+  fi
+ cat > conftest.$ac_ext <&5
++	{ echo "$as_me:15568: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="-Wall"
+@@ -15250,12 +15581,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:15253: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:15584: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15256: \$? = $ac_status" >&5
++  echo "$as_me:15587: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:15258: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:15589: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -15263,7 +15594,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes
+ then
+-	{ echo "$as_me:15266: checking for $CC warning options..." >&5
++	{ echo "$as_me:15597: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS=
+@@ -15287,12 +15618,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:15290: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:15621: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15293: \$? = $ac_status" >&5
++  echo "$as_me:15624: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:15295: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:15626: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case $cf_opt in
+ 			(Winline)
+@@ -15300,7 +15631,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:15303: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:15634: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -15310,7 +15641,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:15313: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:15644: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -15330,12 +15661,12 @@
+ if test "$GCC" = yes ; then
+ 	case $host_os in
+ 	(linux*|gnu*)
+-		echo "$as_me:15333: checking if this is really Intel C++ compiler" >&5
++		echo "$as_me:15664: 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 15338 "configure"
++#line 15669 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -15352,16 +15683,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15355: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15686: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15358: \$? = $ac_status" >&5
++  echo "$as_me:15689: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15361: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15692: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15364: \$? = $ac_status" >&5
++  echo "$as_me:15695: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   INTEL_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -15372,7 +15703,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 		CXXFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:15375: result: $INTEL_CPLUSPLUS" >&5
++		echo "$as_me:15706: result: $INTEL_CPLUSPLUS" >&5
+ echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
+ 		;;
+ 	esac
+@@ -15381,12 +15712,12 @@
+ CLANG_CPLUSPLUS=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:15384: checking if this is really Clang C++ compiler" >&5
++	echo "$as_me:15715: 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 15389 "configure"
++#line 15720 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -15403,16 +15734,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15406: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15737: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15409: \$? = $ac_status" >&5
++  echo "$as_me:15740: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15412: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15743: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15415: \$? = $ac_status" >&5
++  echo "$as_me:15746: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   CLANG_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
+@@ -15423,7 +15754,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 	CXXFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:15426: result: $CLANG_CPLUSPLUS" >&5
++	echo "$as_me:15757: result: $CLANG_CPLUSPLUS" >&5
+ echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
+ fi
+ 
+@@ -15435,7 +15766,7 @@
+ ac_main_return=return
+ 
+ cat > conftest.$ac_ext <&5
++	{ echo "$as_me:15787: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-Wall"
+@@ -15470,12 +15801,12 @@
+ 		wd981
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:15473: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:15804: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15476: \$? = $ac_status" >&5
++  echo "$as_me:15807: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:15478: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:15809: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		fi
+@@ -15484,7 +15815,7 @@
+ 
+ elif test "$GXX" = yes
+ then
+-	{ echo "$as_me:15487: checking for $CXX warning options..." >&5
++	{ echo "$as_me:15818: checking for $CXX warning options..." >&5
+ echo "$as_me: checking for $CXX warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-W -Wall"
+@@ -15514,16 +15845,16 @@
+ 		Wundef $cf_gxx_extra_warnings Wno-unused
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
+-		if { (eval echo "$as_me:15517: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:15848: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15520: \$? = $ac_status" >&5
++  echo "$as_me:15851: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:15522: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:15853: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		else
+-			test -n "$verbose" && echo "$as_me:15526: result: ... no -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:15857: result: ... no -$cf_opt" >&5
+ echo "${ECHO_T}... no -$cf_opt" >&6
+ 		fi
+ 	done
+@@ -15559,10 +15890,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:15562: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:15893: 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:15945: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15617: \$? = $ac_status" >&5
++  echo "$as_me:15948: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:15619: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:15950: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case $cf_attribute in
+@@ -15675,7 +16006,7 @@
+ rm -rf conftest*
+ fi
+ 
+-echo "$as_me:15678: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:16009: 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.
+@@ -15685,7 +16016,7 @@
+ else
+   with_string_hacks=no
+ fi;
+-echo "$as_me:15688: result: $with_string_hacks" >&5
++echo "$as_me:16019: result: $with_string_hacks" >&5
+ echo "${ECHO_T}$with_string_hacks" >&6
+ 
+ if test "x$with_string_hacks" = "xyes"; then
+@@ -15694,15 +16025,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+ 
+-	{ echo "$as_me:15697: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++	{ echo "$as_me:16028: 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:15699: checking for strlcat" >&5
++	echo "$as_me:16030: 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 15705 "configure"
++#line 16036 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -15733,16 +16064,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15736: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16067: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15739: \$? = $ac_status" >&5
++  echo "$as_me:16070: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15742: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16073: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15745: \$? = $ac_status" >&5
++  echo "$as_me:16076: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_strlcat=yes
+ else
+@@ -15752,7 +16083,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:15755: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:16086: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test $ac_cv_func_strlcat = yes; then
+ 
+@@ -15762,7 +16093,7 @@
+ 
+ else
+ 
+-		echo "$as_me:15765: checking for strlcat in -lbsd" >&5
++		echo "$as_me:16096: 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
+@@ -15770,7 +16101,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15773 "configure"
++#line 16104 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -15789,16 +16120,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15792: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16123: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15795: \$? = $ac_status" >&5
++  echo "$as_me:16126: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15798: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16129: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15801: \$? = $ac_status" >&5
++  echo "$as_me:16132: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -15809,7 +16140,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:15812: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:16143: 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
+ 
+@@ -15832,23 +16163,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:15835: checking for $ac_header" >&5
++echo "$as_me:16166: 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 15841 "configure"
++#line 16172 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:15845: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:16176: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:15851: \$? = $ac_status" >&5
++  echo "$as_me:16182: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -15867,7 +16198,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:15870: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:16201: 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:16222: 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 15897 "configure"
++#line 16228 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -15925,16 +16256,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15928: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16259: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15931: \$? = $ac_status" >&5
++  echo "$as_me:16262: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15934: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16265: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15937: \$? = $ac_status" >&5
++  echo "$as_me:16268: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -15944,7 +16275,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:15947: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:16278: 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:16291: 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.
+@@ -15967,7 +16298,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:15970: result: $with_assertions" >&5
++echo "$as_me:16301: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -15983,7 +16314,7 @@
+ 
+ ###	use option --disable-leaks to suppress "permanent" leaks, for testing
+ 
+-echo "$as_me:15986: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:16317: 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.
+@@ -16000,7 +16331,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:16003: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:16334: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case .$with_cflags in
+@@ -16114,23 +16445,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:16117: checking for dmalloc.h" >&5
++	echo "$as_me:16448: 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 16123 "configure"
++#line 16454 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:16127: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:16458: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:16133: \$? = $ac_status" >&5
++  echo "$as_me:16464: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16149,11 +16480,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:16152: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:16483: 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:16156: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:16487: 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
+@@ -16161,7 +16492,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16164 "configure"
++#line 16495 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16180,16 +16511,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16183: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16514: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16186: \$? = $ac_status" >&5
++  echo "$as_me:16517: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16189: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16520: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16192: \$? = $ac_status" >&5
++  echo "$as_me:16523: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -16200,7 +16531,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16203: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:16534: 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:16549: 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.
+@@ -16232,7 +16563,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:16235: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:16566: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case .$with_cflags in
+@@ -16346,23 +16677,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:16349: checking for dbmalloc.h" >&5
++	echo "$as_me:16680: 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 16355 "configure"
++#line 16686 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:16359: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:16690: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:16365: \$? = $ac_status" >&5
++  echo "$as_me:16696: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16381,11 +16712,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:16384: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:16715: 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:16388: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:16719: 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
+@@ -16393,7 +16724,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16396 "configure"
++#line 16727 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16412,16 +16743,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16415: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16746: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16418: \$? = $ac_status" >&5
++  echo "$as_me:16749: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16421: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16752: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16424: \$? = $ac_status" >&5
++  echo "$as_me:16755: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -16432,7 +16763,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16435: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:16766: 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:16781: 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.
+@@ -16464,7 +16795,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:16467: result: ${with_valgrind:-no}" >&5
++echo "$as_me:16798: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case .$with_cflags in
+@@ -16577,7 +16908,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:16580: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:16911: 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.
+@@ -16587,7 +16918,7 @@
+ else
+   : ${with_no_leaks:=no}
+ fi;
+-echo "$as_me:16590: result: $with_no_leaks" >&5
++echo "$as_me:16921: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$with_no_leaks" = yes ; then
+@@ -16639,7 +16970,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:16642: checking whether to add trace feature to all models" >&5
++echo "$as_me:16973: 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.
+@@ -16649,7 +16980,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:16652: result: $cf_with_trace" >&5
++echo "$as_me:16983: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "x$cf_with_trace" = xyes ; then
+@@ -16763,7 +17094,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:16766: checking if we want to use GNAT projects" >&5
++echo "$as_me:17097: 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.
+@@ -16780,7 +17111,7 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:16783: result: $enable_gnat_projects" >&5
++echo "$as_me:17114: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+ 
+ ###	Checks for libraries.
+@@ -16790,13 +17121,13 @@
+ 	LIBS=" -lpsapi $LIBS"
+ 	;;
+ (*)
+-echo "$as_me:16793: checking for gettimeofday" >&5
++echo "$as_me:17124: 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 16799 "configure"
++#line 17130 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16827,16 +17158,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16830: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17161: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16833: \$? = $ac_status" >&5
++  echo "$as_me:17164: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16836: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17167: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16839: \$? = $ac_status" >&5
++  echo "$as_me:17170: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -16846,7 +17177,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:16849: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:17180: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test $ac_cv_func_gettimeofday = yes; then
+ 
+@@ -16856,7 +17187,7 @@
+ 
+ else
+ 
+-echo "$as_me:16859: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:17190: 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
+@@ -16864,7 +17195,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16867 "configure"
++#line 17198 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16883,16 +17214,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16886: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17217: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16889: \$? = $ac_status" >&5
++  echo "$as_me:17220: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16892: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17223: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16895: \$? = $ac_status" >&5
++  echo "$as_me:17226: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -16903,7 +17234,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16906: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:17237: 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
+ 
+@@ -16933,14 +17264,14 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:16936: checking if -lm needed for math functions" >&5
++echo "$as_me:17267: 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 16943 "configure"
++#line 17274 "configure"
+ #include "confdefs.h"
+ 
+ 	#include 
+@@ -16956,16 +17287,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16959: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17290: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16962: \$? = $ac_status" >&5
++  echo "$as_me:17293: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16965: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17296: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16968: \$? = $ac_status" >&5
++  echo "$as_me:17299: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_need_libm=no
+ else
+@@ -16975,7 +17306,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:16978: result: $cf_cv_need_libm" >&5
++echo "$as_me:17309: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+ if test "$cf_cv_need_libm" = yes
+ then
+@@ -16983,13 +17314,13 @@
+ fi
+ 
+ ###	Checks for header files.
+-echo "$as_me:16986: checking for ANSI C header files" >&5
++echo "$as_me:17317: 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 16992 "configure"
++#line 17323 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -16997,13 +17328,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:17000: \"$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:17006: \$? = $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
+@@ -17025,7 +17356,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 17028 "configure"
++#line 17359 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -17043,7 +17374,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 17046 "configure"
++#line 17377 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -17064,7 +17395,7 @@
+   :
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 17067 "configure"
++#line 17398 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -17090,15 +17421,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:17093: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17424: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17096: \$? = $ac_status" >&5
++  echo "$as_me:17427: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:17098: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17429: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17101: \$? = $ac_status" >&5
++  echo "$as_me:17432: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -17111,7 +17442,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:17114: result: $ac_cv_header_stdc" >&5
++echo "$as_me:17445: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -17124,13 +17455,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:17127: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:17458: 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 17133 "configure"
++#line 17464 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$ac_hdr>
+@@ -17145,16 +17476,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17148: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17479: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17151: \$? = $ac_status" >&5
++  echo "$as_me:17482: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17154: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17485: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17157: \$? = $ac_status" >&5
++  echo "$as_me:17488: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -17164,7 +17495,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:17167: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:17498: 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:17511: 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
+@@ -17185,7 +17516,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17188 "configure"
++#line 17519 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17204,16 +17535,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17207: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17538: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17210: \$? = $ac_status" >&5
++  echo "$as_me:17541: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17213: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17544: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17216: \$? = $ac_status" >&5
++  echo "$as_me:17547: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -17224,14 +17555,14 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17227: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:17558: 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:17234: checking for opendir in -lx" >&5
++  echo "$as_me:17565: 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
+@@ -17239,7 +17570,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17242 "configure"
++#line 17573 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17258,16 +17589,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17261: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17592: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17264: \$? = $ac_status" >&5
++  echo "$as_me:17595: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17267: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17598: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17270: \$? = $ac_status" >&5
++  echo "$as_me:17601: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -17278,7 +17609,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17281: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:17612: 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"
+@@ -17286,13 +17617,13 @@
+ 
+ fi
+ 
+-echo "$as_me:17289: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:17620: 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 17295 "configure"
++#line 17626 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -17308,16 +17639,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17311: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17642: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17314: \$? = $ac_status" >&5
++  echo "$as_me:17645: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17317: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17648: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17320: \$? = $ac_status" >&5
++  echo "$as_me:17651: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -17327,7 +17658,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:17330: result: $ac_cv_header_time" >&5
++echo "$as_me:17661: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -17346,13 +17677,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17349: checking for regcomp" >&5
++echo "$as_me:17680: 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 17355 "configure"
++#line 17686 "configure"
+ #include "confdefs.h"
+ #define regcomp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17383,16 +17714,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17386: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17717: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17389: \$? = $ac_status" >&5
++  echo "$as_me:17720: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17392: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17723: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17395: \$? = $ac_status" >&5
++  echo "$as_me:17726: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_regcomp=yes
+ else
+@@ -17402,7 +17733,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:17405: result: $ac_cv_func_regcomp" >&5
++echo "$as_me:17736: 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
+@@ -17411,7 +17742,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:17414: checking for regcomp in -l$cf_regex_lib" >&5
++echo "$as_me:17745: 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
+@@ -17419,7 +17750,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_regex_lib  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17422 "configure"
++#line 17753 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17438,16 +17769,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17441: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17772: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17444: \$? = $ac_status" >&5
++  echo "$as_me:17775: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17447: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17778: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17450: \$? = $ac_status" >&5
++  echo "$as_me:17781: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -17458,7 +17789,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17461: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:17792: 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
+ 
+@@ -17487,13 +17818,13 @@
+ fi
+ 
+ if test "$cf_regex_func" = no ; then
+-	echo "$as_me:17490: checking for compile" >&5
++	echo "$as_me:17821: 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 17496 "configure"
++#line 17827 "configure"
+ #include "confdefs.h"
+ #define compile autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17524,16 +17855,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17527: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17858: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17530: \$? = $ac_status" >&5
++  echo "$as_me:17861: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17533: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17864: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17536: \$? = $ac_status" >&5
++  echo "$as_me:17867: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_compile=yes
+ else
+@@ -17543,13 +17874,13 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:17546: result: $ac_cv_func_compile" >&5
++echo "$as_me:17877: 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:17552: checking for compile in -lgen" >&5
++		echo "$as_me:17883: 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
+@@ -17557,7 +17888,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgen  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17560 "configure"
++#line 17891 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17576,16 +17907,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17579: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17910: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17582: \$? = $ac_status" >&5
++  echo "$as_me:17913: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17585: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17916: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17588: \$? = $ac_status" >&5
++  echo "$as_me:17919: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gen_compile=yes
+ else
+@@ -17596,7 +17927,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17599: result: $ac_cv_lib_gen_compile" >&5
++echo "$as_me:17930: 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
+ 
+@@ -17624,11 +17955,11 @@
+ fi
+ 
+ if test "$cf_regex_func" = no ; then
+-	{ echo "$as_me:17627: WARNING: cannot find regular expression library" >&5
++	{ echo "$as_me:17958: WARNING: cannot find regular expression library" >&5
+ echo "$as_me: WARNING: cannot find regular expression library" >&2;}
+ fi
+ 
+-echo "$as_me:17631: checking for regular-expression headers" >&5
++echo "$as_me:17962: 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
+@@ -17640,7 +17971,7 @@
+ 	for cf_regex_hdr in regexp.h regexpr.h
+ 	do
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 17643 "configure"
++#line 17974 "configure"
+ #include "confdefs.h"
+ #include <$cf_regex_hdr>
+ int
+@@ -17655,16 +17986,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17658: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17989: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17661: \$? = $ac_status" >&5
++  echo "$as_me:17992: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17664: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17995: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17667: \$? = $ac_status" >&5
++  echo "$as_me:17998: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -17681,7 +18012,7 @@
+ 	for cf_regex_hdr in regex.h
+ 	do
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 17684 "configure"
++#line 18015 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$cf_regex_hdr>
+@@ -17699,16 +18030,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17702: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18033: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17705: \$? = $ac_status" >&5
++  echo "$as_me:18036: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17708: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18039: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17711: \$? = $ac_status" >&5
++  echo "$as_me:18042: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -17724,11 +18055,11 @@
+ esac
+ 
+ fi
+-echo "$as_me:17727: result: $cf_cv_regex_hdrs" >&5
++echo "$as_me:18058: result: $cf_cv_regex_hdrs" >&5
+ echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
+ 
+ case $cf_cv_regex_hdrs in
+-	(no)		{ echo "$as_me:17731: WARNING: no regular expression header found" >&5
++	(no)		{ echo "$as_me:18062: WARNING: no regular expression header found" >&5
+ echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
+ 	(regex.h)
+ cat >>confdefs.h <<\EOF
+@@ -17767,23 +18098,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:17770: checking for $ac_header" >&5
++echo "$as_me:18101: 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 17776 "configure"
++#line 18107 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:17780: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:18111: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:17786: \$? = $ac_status" >&5
++  echo "$as_me:18117: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17802,7 +18133,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:17805: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:18136: 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:18149: 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 17824 "configure"
++#line 18155 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:17828: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:18159: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:17834: \$? = $ac_status" >&5
++  echo "$as_me:18165: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17850,7 +18181,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:17853: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:18184: 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:18194: 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
+@@ -17870,7 +18201,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17873 "configure"
++#line 18204 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -17883,16 +18214,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17886: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18217: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17889: \$? = $ac_status" >&5
++  echo "$as_me:18220: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17892: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18223: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17895: \$? = $ac_status" >&5
++  echo "$as_me:18226: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -17904,7 +18235,7 @@
+ done
+ 
+ fi
+-echo "$as_me:17907: result: $cf_cv_getopt_header" >&5
++echo "$as_me:18238: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test $cf_cv_getopt_header != none ; then
+ 
+@@ -17921,14 +18252,14 @@
+ 
+ fi
+ 
+-echo "$as_me:17924: checking if external environ is declared" >&5
++echo "$as_me:18255: checking if external environ is declared" >&5
+ echo $ECHO_N "checking if external environ is declared... $ECHO_C" >&6
+ if test "${cf_cv_dcl_environ+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 17931 "configure"
++#line 18262 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_STDLIB_H
+@@ -17944,16 +18275,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17947: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18278: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17950: \$? = $ac_status" >&5
++  echo "$as_me:18281: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17953: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18284: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17956: \$? = $ac_status" >&5
++  echo "$as_me:18287: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_dcl_environ=yes
+ else
+@@ -17964,7 +18295,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:17967: result: $cf_cv_dcl_environ" >&5
++echo "$as_me:18298: result: $cf_cv_dcl_environ" >&5
+ echo "${ECHO_T}$cf_cv_dcl_environ" >&6
+ 
+ if test "$cf_cv_dcl_environ" = no ; then
+@@ -17979,14 +18310,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:17982: checking if external environ exists" >&5
++echo "$as_me:18313: checking if external environ exists" >&5
+ echo $ECHO_N "checking if external environ exists... $ECHO_C" >&6
+ if test "${cf_cv_have_environ+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 17989 "configure"
++#line 18320 "configure"
+ #include "confdefs.h"
+ 
+ #undef environ
+@@ -18001,16 +18332,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18004: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18335: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18007: \$? = $ac_status" >&5
++  echo "$as_me:18338: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18010: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18341: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18013: \$? = $ac_status" >&5
++  echo "$as_me:18344: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_environ=yes
+ else
+@@ -18021,7 +18352,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:18024: result: $cf_cv_have_environ" >&5
++echo "$as_me:18355: result: $cf_cv_have_environ" >&5
+ echo "${ECHO_T}$cf_cv_have_environ" >&6
+ 
+ if test "$cf_cv_have_environ" = yes ; then
+@@ -18034,13 +18365,13 @@
+ 
+ fi
+ 
+-echo "$as_me:18037: checking for getenv" >&5
++echo "$as_me:18368: checking for getenv" >&5
+ echo $ECHO_N "checking for getenv... $ECHO_C" >&6
+ if test "${ac_cv_func_getenv+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 18043 "configure"
++#line 18374 "configure"
+ #include "confdefs.h"
+ #define getenv autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18071,16 +18402,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18074: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18405: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18077: \$? = $ac_status" >&5
++  echo "$as_me:18408: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18080: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18411: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18083: \$? = $ac_status" >&5
++  echo "$as_me:18414: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_getenv=yes
+ else
+@@ -18090,19 +18421,19 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:18093: result: $ac_cv_func_getenv" >&5
++echo "$as_me:18424: result: $ac_cv_func_getenv" >&5
+ echo "${ECHO_T}$ac_cv_func_getenv" >&6
+ 
+ for ac_func in putenv setenv strdup
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:18099: checking for $ac_func" >&5
++echo "$as_me:18430: 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 18105 "configure"
++#line 18436 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18133,16 +18464,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18136: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18467: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18139: \$? = $ac_status" >&5
++  echo "$as_me:18470: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18142: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18473: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18145: \$? = $ac_status" >&5
++  echo "$as_me:18476: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -18152,7 +18483,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:18155: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:18486: 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:18496: checking if getenv returns consistent values" >&5
+ echo $ECHO_N "checking if getenv returns consistent values... $ECHO_C" >&6
+ if test "${cf_cv_consistent_getenv+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18172,7 +18503,7 @@
+   cf_cv_consistent_getenv=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 18175 "configure"
++#line 18506 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -18281,15 +18612,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:18284: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18615: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18287: \$? = $ac_status" >&5
++  echo "$as_me:18618: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:18289: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18620: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18292: \$? = $ac_status" >&5
++  echo "$as_me:18623: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_consistent_getenv=yes
+ else
+@@ -18302,7 +18633,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:18305: result: $cf_cv_consistent_getenv" >&5
++echo "$as_me:18636: result: $cf_cv_consistent_getenv" >&5
+ echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
+ 
+ if test "x$cf_cv_consistent_getenv" = xno
+@@ -18317,7 +18648,7 @@
+ if test "x$cf_cv_consistent_getenv" = xno && \
+ 	test "x$cf_with_trace" = xyes
+ then
+-	{ echo "$as_me:18320: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
++	{ echo "$as_me:18651: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
+ echo "$as_me: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&2;}
+ fi
+ 
+@@ -18325,7 +18656,7 @@
+ # Note: even non-Posix ISC needs  to declare fd_set
+ if test "x$ISC" = xyes ; then
+ 
+-echo "$as_me:18328: checking for main in -lcposix" >&5
++echo "$as_me:18659: 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
+@@ -18333,7 +18664,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lcposix  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18336 "configure"
++#line 18667 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18345,16 +18676,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18348: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18679: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18351: \$? = $ac_status" >&5
++  echo "$as_me:18682: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18354: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18685: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18357: \$? = $ac_status" >&5
++  echo "$as_me:18688: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_cposix_main=yes
+ else
+@@ -18365,7 +18696,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18368: result: $ac_cv_lib_cposix_main" >&5
++echo "$as_me:18699: 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:18710: 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
+@@ -18384,7 +18715,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-linet  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18387 "configure"
++#line 18718 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18403,16 +18734,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18406: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18737: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18409: \$? = $ac_status" >&5
++  echo "$as_me:18740: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18412: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18743: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18415: \$? = $ac_status" >&5
++  echo "$as_me:18746: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_inet_bzero=yes
+ else
+@@ -18423,7 +18754,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18426: result: $ac_cv_lib_inet_bzero" >&5
++echo "$as_me:18757: 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
+ 
+@@ -18446,14 +18777,14 @@
+ fi
+ fi
+ 
+-echo "$as_me:18449: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:18780: 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 18456 "configure"
++#line 18787 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -18473,16 +18804,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18476: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18807: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18479: \$? = $ac_status" >&5
++  echo "$as_me:18810: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18482: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18813: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18485: \$? = $ac_status" >&5
++  echo "$as_me:18816: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -18494,7 +18825,7 @@
+ 
+ fi
+ 
+-echo "$as_me:18497: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:18828: 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
+@@ -18509,13 +18840,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return=return
+ 
+-echo "$as_me:18512: checking for an ANSI C-conforming const" >&5
++echo "$as_me:18843: 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 18518 "configure"
++#line 18849 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18573,16 +18904,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18576: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18907: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18579: \$? = $ac_status" >&5
++  echo "$as_me:18910: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18582: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18913: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18585: \$? = $ac_status" >&5
++  echo "$as_me:18916: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -18592,7 +18923,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:18595: result: $ac_cv_c_const" >&5
++echo "$as_me:18926: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -18602,7 +18933,7 @@
+ 
+ fi
+ 
+-echo "$as_me:18605: checking for inline" >&5
++echo "$as_me:18936: 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
+@@ -18610,7 +18941,7 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 18613 "configure"
++#line 18944 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo () {return 0; }
+@@ -18619,16 +18950,16 @@
+ 
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18622: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18953: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18625: \$? = $ac_status" >&5
++  echo "$as_me:18956: \$? = $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:18959: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18631: \$? = $ac_status" >&5
++  echo "$as_me:18962: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -18639,7 +18970,7 @@
+ done
+ 
+ fi
+-echo "$as_me:18642: result: $ac_cv_c_inline" >&5
++echo "$as_me:18973: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -18665,7 +18996,7 @@
+ 		:
+ 	elif test "$GCC" = yes
+ 	then
+-		echo "$as_me:18668: checking if $CC supports options to tune inlining" >&5
++		echo "$as_me:18999: 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
+@@ -18674,7 +19005,7 @@
+ 		cf_save_CFLAGS=$CFLAGS
+ 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 18677 "configure"
++#line 19008 "configure"
+ #include "confdefs.h"
+ inline int foo(void) { return 1; }
+ int
+@@ -18686,16 +19017,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18689: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19020: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18692: \$? = $ac_status" >&5
++  echo "$as_me:19023: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18695: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19026: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18698: \$? = $ac_status" >&5
++  echo "$as_me:19029: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gcc_inline=yes
+ else
+@@ -18707,7 +19038,7 @@
+ 		CFLAGS=$cf_save_CFLAGS
+ 
+ fi
+-echo "$as_me:18710: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:19041: result: $cf_cv_gcc_inline" >&5
+ echo "${ECHO_T}$cf_cv_gcc_inline" >&6
+ 		if test "$cf_cv_gcc_inline" = yes ; then
+ 
+@@ -18813,7 +19144,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:18816: checking for signal global datatype" >&5
++echo "$as_me:19147: 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
+@@ -18825,7 +19156,7 @@
+ 		"int"
+ 	do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 18828 "configure"
++#line 19159 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -18848,16 +19179,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18851: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19182: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18854: \$? = $ac_status" >&5
++  echo "$as_me:19185: \$? = $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:19188: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18860: \$? = $ac_status" >&5
++  echo "$as_me:19191: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -18871,7 +19202,7 @@
+ 
+ fi
+ 
+-echo "$as_me:18874: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:19205: 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:19214: 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
+@@ -18890,7 +19221,7 @@
+   cf_cv_typeof_chtype=long
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 18893 "configure"
++#line 19224 "configure"
+ #include "confdefs.h"
+ 
+ #define WANT_BITS 31
+@@ -18925,15 +19256,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:18928: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19259: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18931: \$? = $ac_status" >&5
++  echo "$as_me:19262: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:18933: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19264: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18936: \$? = $ac_status" >&5
++  echo "$as_me:19267: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_typeof_chtype=`cat cf_test.out`
+ else
+@@ -18948,7 +19279,7 @@
+ 
+ fi
+ 
+-echo "$as_me:18951: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:19282: result: $cf_cv_typeof_chtype" >&5
+ echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:19294: 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 18970 "configure"
++#line 19301 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18979,16 +19310,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18982: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19313: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18985: \$? = $ac_status" >&5
++  echo "$as_me:19316: \$? = $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:19319: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18991: \$? = $ac_status" >&5
++  echo "$as_me:19322: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_unsigned_literals=yes
+ else
+@@ -19000,7 +19331,7 @@
+ 
+ fi
+ 
+-echo "$as_me:19003: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:19334: result: $cf_cv_unsigned_literals" >&5
+ echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
+ 
+ cf_cv_1UL="1"
+@@ -19016,14 +19347,14 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:19019: checking if external errno is declared" >&5
++echo "$as_me:19350: 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 19026 "configure"
++#line 19357 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_STDLIB_H
+@@ -19041,16 +19372,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19044: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19375: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19047: \$? = $ac_status" >&5
++  echo "$as_me:19378: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19050: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19381: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19053: \$? = $ac_status" >&5
++  echo "$as_me:19384: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_dcl_errno=yes
+ else
+@@ -19061,7 +19392,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:19064: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:19395: result: $cf_cv_dcl_errno" >&5
+ echo "${ECHO_T}$cf_cv_dcl_errno" >&6
+ 
+ if test "$cf_cv_dcl_errno" = no ; then
+@@ -19076,14 +19407,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:19079: checking if external errno exists" >&5
++echo "$as_me:19410: 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 19086 "configure"
++#line 19417 "configure"
+ #include "confdefs.h"
+ 
+ #undef errno
+@@ -19098,16 +19429,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19101: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19432: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19104: \$? = $ac_status" >&5
++  echo "$as_me:19435: \$? = $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:19438: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19110: \$? = $ac_status" >&5
++  echo "$as_me:19441: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_errno=yes
+ else
+@@ -19118,7 +19449,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:19121: result: $cf_cv_have_errno" >&5
++echo "$as_me:19452: result: $cf_cv_have_errno" >&5
+ echo "${ECHO_T}$cf_cv_have_errno" >&6
+ 
+ if test "$cf_cv_have_errno" = yes ; then
+@@ -19131,7 +19462,7 @@
+ 
+ fi
+ 
+-echo "$as_me:19134: checking if data-only library module links" >&5
++echo "$as_me:19465: 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
+@@ -19139,20 +19470,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:19476: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19148: \$? = $ac_status" >&5
++  echo "$as_me:19479: \$? = $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:19499: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19171: \$? = $ac_status" >&5
++  echo "$as_me:19502: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -19181,7 +19512,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 19184 "configure"
++#line 19515 "configure"
+ #include "confdefs.h"
+ 
+ 	int main(void)
+@@ -19192,15 +19523,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:19195: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19526: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19198: \$? = $ac_status" >&5
++  echo "$as_me:19529: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:19200: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19531: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19203: \$? = $ac_status" >&5
++  echo "$as_me:19534: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -19215,7 +19546,7 @@
+ 
+ fi
+ 
+-echo "$as_me:19218: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:19549: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -19257,13 +19588,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:19260: checking for $ac_func" >&5
++echo "$as_me:19591: 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 19266 "configure"
++#line 19597 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19294,16 +19625,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19297: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19628: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19300: \$? = $ac_status" >&5
++  echo "$as_me:19631: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19303: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19634: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19306: \$? = $ac_status" >&5
++  echo "$as_me:19637: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -19313,7 +19644,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:19316: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:19647: 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:19659: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -19334,7 +19665,7 @@
+ then
+ 	if test "x$ac_cv_func_vsnprintf" = xyes
+ 	then
+-		{ echo "$as_me:19337: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
++		{ echo "$as_me:19668: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+ echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
+ 	else
+ 
+@@ -19347,14 +19678,14 @@
+ 
+ if test "x$with_getcap" = "xyes" ; then
+ 
+-echo "$as_me:19350: checking for terminal-capability database functions" >&5
++echo "$as_me:19681: 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 19357 "configure"
++#line 19688 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19374,16 +19705,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19377: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19708: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19380: \$? = $ac_status" >&5
++  echo "$as_me:19711: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19383: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19714: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19386: \$? = $ac_status" >&5
++  echo "$as_me:19717: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cgetent=yes
+ else
+@@ -19394,7 +19725,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:19397: result: $cf_cv_cgetent" >&5
++echo "$as_me:19728: result: $cf_cv_cgetent" >&5
+ echo "${ECHO_T}$cf_cv_cgetent" >&6
+ 
+ if test "$cf_cv_cgetent" = yes
+@@ -19404,14 +19735,14 @@
+ #define HAVE_BSD_CGETENT 1
+ EOF
+ 
+-echo "$as_me:19407: checking if cgetent uses const parameter" >&5
++echo "$as_me:19738: 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 19414 "configure"
++#line 19745 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
+@@ -19434,16 +19765,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19437: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19768: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19440: \$? = $ac_status" >&5
++  echo "$as_me:19771: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19443: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19774: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19446: \$? = $ac_status" >&5
++  echo "$as_me:19777: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cgetent_const=yes
+ else
+@@ -19454,7 +19785,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:19457: result: $cf_cv_cgetent_const" >&5
++echo "$as_me:19788: result: $cf_cv_cgetent_const" >&5
+ echo "${ECHO_T}$cf_cv_cgetent_const" >&6
+ 	if test "$cf_cv_cgetent_const" = yes
+ 	then
+@@ -19468,14 +19799,14 @@
+ 
+ fi
+ 
+-echo "$as_me:19471: checking for isascii" >&5
++echo "$as_me:19802: 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 19478 "configure"
++#line 19809 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -19487,16 +19818,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19490: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19821: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19493: \$? = $ac_status" >&5
++  echo "$as_me:19824: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19496: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19827: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19499: \$? = $ac_status" >&5
++  echo "$as_me:19830: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_isascii=yes
+ else
+@@ -19507,7 +19838,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:19510: result: $cf_cv_have_isascii" >&5
++echo "$as_me:19841: result: $cf_cv_have_isascii" >&5
+ echo "${ECHO_T}$cf_cv_have_isascii" >&6
+ test "$cf_cv_have_isascii" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -19515,10 +19846,10 @@
+ EOF
+ 
+ if test "$ac_cv_func_sigaction" = yes; then
+-echo "$as_me:19518: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:19849: 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 19521 "configure"
++#line 19852 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19532,16 +19863,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19535: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19866: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19538: \$? = $ac_status" >&5
++  echo "$as_me:19869: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19541: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19872: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19544: \$? = $ac_status" >&5
++  echo "$as_me:19875: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   sigact_bad=no
+ else
+@@ -19549,7 +19880,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19552 "configure"
++#line 19883 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -19564,16 +19895,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19567: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19898: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19570: \$? = $ac_status" >&5
++  echo "$as_me:19901: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19573: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19904: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19576: \$? = $ac_status" >&5
++  echo "$as_me:19907: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   sigact_bad=yes
+ 
+@@ -19589,11 +19920,11 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:19592: result: $sigact_bad" >&5
++echo "$as_me:19923: result: $sigact_bad" >&5
+ echo "${ECHO_T}$sigact_bad" >&6
+ fi
+ 
+-echo "$as_me:19596: checking if nanosleep really works" >&5
++echo "$as_me:19927: 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
+@@ -19603,7 +19934,7 @@
+   cf_cv_func_nanosleep=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 19606 "configure"
++#line 19937 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19628,15 +19959,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:19631: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19962: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19634: \$? = $ac_status" >&5
++  echo "$as_me:19965: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:19636: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19967: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19639: \$? = $ac_status" >&5
++  echo "$as_me:19970: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_nanosleep=yes
+ else
+@@ -19648,7 +19979,7 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:19651: result: $cf_cv_func_nanosleep" >&5
++echo "$as_me:19982: result: $cf_cv_func_nanosleep" >&5
+ echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
+ 
+ test "$cf_cv_func_nanosleep" = "yes" &&
+@@ -19665,23 +19996,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:19668: checking for $ac_header" >&5
++echo "$as_me:19999: 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 19674 "configure"
++#line 20005 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:19678: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:20009: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:19684: \$? = $ac_status" >&5
++  echo "$as_me:20015: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -19700,7 +20031,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:19703: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:20034: 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:20051: 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 19723 "configure"
++#line 20054 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -19732,16 +20063,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19735: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20066: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19738: \$? = $ac_status" >&5
++  echo "$as_me:20069: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19741: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20072: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19744: \$? = $ac_status" >&5
++  echo "$as_me:20075: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   termios_bad=no
+ else
+@@ -19749,7 +20080,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 19752 "configure"
++#line 20083 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -19763,16 +20094,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19766: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20097: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19769: \$? = $ac_status" >&5
++  echo "$as_me:20100: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19772: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20103: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19775: \$? = $ac_status" >&5
++  echo "$as_me:20106: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   termios_bad=unknown
+ else
+@@ -19788,19 +20119,19 @@
+ 
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-	echo "$as_me:19791: result: $termios_bad" >&5
++	echo "$as_me:20122: result: $termios_bad" >&5
+ echo "${ECHO_T}$termios_bad" >&6
+ 	fi
+ fi
+ 
+-echo "$as_me:19796: checking for tcgetattr" >&5
++echo "$as_me:20127: 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 19803 "configure"
++#line 20134 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19828,16 +20159,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19831: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20162: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19834: \$? = $ac_status" >&5
++  echo "$as_me:20165: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19837: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20168: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19840: \$? = $ac_status" >&5
++  echo "$as_me:20171: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_tcgetattr=yes
+ else
+@@ -19847,21 +20178,21 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:19850: result: $cf_cv_have_tcgetattr" >&5
++echo "$as_me:20181: 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:19857: checking for vsscanf function or workaround" >&5
++echo "$as_me:20188: 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 19864 "configure"
++#line 20195 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19877,16 +20208,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19880: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20211: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19883: \$? = $ac_status" >&5
++  echo "$as_me:20214: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19886: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20217: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19889: \$? = $ac_status" >&5
++  echo "$as_me:20220: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_vsscanf=vsscanf
+ else
+@@ -19894,7 +20225,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19897 "configure"
++#line 20228 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19916,16 +20247,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19919: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20250: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19922: \$? = $ac_status" >&5
++  echo "$as_me:20253: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19925: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20256: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19928: \$? = $ac_status" >&5
++  echo "$as_me:20259: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_vsscanf=vfscanf
+ else
+@@ -19933,7 +20264,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19936 "configure"
++#line 20267 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19955,16 +20286,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19958: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20289: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19961: \$? = $ac_status" >&5
++  echo "$as_me:20292: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19964: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20295: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19967: \$? = $ac_status" >&5
++  echo "$as_me:20298: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_vsscanf=_doscan
+ else
+@@ -19979,7 +20310,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:19982: result: $cf_cv_func_vsscanf" >&5
++echo "$as_me:20313: result: $cf_cv_func_vsscanf" >&5
+ echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
+ 
+ case $cf_cv_func_vsscanf in
+@@ -20005,23 +20336,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20008: checking for $ac_header" >&5
++echo "$as_me:20339: 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 20014 "configure"
++#line 20345 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20018: \"$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:20024: \$? = $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_c_preproc_warn_flag
+@@ -20040,7 +20371,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:20043: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:20374: 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:20384: 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
+@@ -20061,7 +20392,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 20064 "configure"
++#line 20395 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20102,15 +20433,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:20105: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20436: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20108: \$? = $ac_status" >&5
++  echo "$as_me:20439: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:20110: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20441: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20113: \$? = $ac_status" >&5
++  echo "$as_me:20444: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -20125,16 +20456,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:20128: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:20459: 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:20131: checking for mkstemp" >&5
++	echo "$as_me:20462: 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 20137 "configure"
++#line 20468 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20165,16 +20496,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20168: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20499: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20171: \$? = $ac_status" >&5
++  echo "$as_me:20502: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20174: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20505: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20177: \$? = $ac_status" >&5
++  echo "$as_me:20508: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -20184,7 +20515,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:20187: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:20518: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -20205,21 +20536,21 @@
+ fi
+ 
+ if test "x$cross_compiling" = xyes ; then
+-	{ echo "$as_me:20208: WARNING: cross compiling: assume setvbuf params not reversed" >&5
++	{ echo "$as_me:20539: 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:20211: checking whether setvbuf arguments are reversed" >&5
++	echo "$as_me:20542: 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:20217: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:20548: 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 20222 "configure"
++#line 20553 "configure"
+ #include "confdefs.h"
+ #include 
+ /* If setvbuf has the reversed format, exit 0. */
+@@ -20236,15 +20567,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:20239: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20570: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20242: \$? = $ac_status" >&5
++  echo "$as_me:20573: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:20244: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20575: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20247: \$? = $ac_status" >&5
++  echo "$as_me:20578: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_setvbuf_reversed=yes
+ else
+@@ -20257,7 +20588,7 @@
+ fi
+ rm -f core core.* *.core
+ fi
+-echo "$as_me:20260: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:20591: 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
+ 
+@@ -20268,13 +20599,13 @@
+ fi
+ 
+ fi
+-echo "$as_me:20271: checking for intptr_t" >&5
++echo "$as_me:20602: 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 20277 "configure"
++#line 20608 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -20289,16 +20620,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20292: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20623: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20295: \$? = $ac_status" >&5
++  echo "$as_me:20626: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20298: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20629: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20301: \$? = $ac_status" >&5
++  echo "$as_me:20632: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_intptr_t=yes
+ else
+@@ -20308,7 +20639,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:20311: result: $ac_cv_type_intptr_t" >&5
++echo "$as_me:20642: 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
+   :
+@@ -20320,13 +20651,13 @@
+ 
+ fi
+ 
+-echo "$as_me:20323: checking for ssize_t" >&5
++echo "$as_me:20654: 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 20329 "configure"
++#line 20660 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -20341,16 +20672,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20344: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20675: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20347: \$? = $ac_status" >&5
++  echo "$as_me:20678: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20350: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20681: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20353: \$? = $ac_status" >&5
++  echo "$as_me:20684: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_ssize_t=yes
+ else
+@@ -20360,7 +20691,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:20363: result: $ac_cv_type_ssize_t" >&5
++echo "$as_me:20694: 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
+   :
+@@ -20372,14 +20703,14 @@
+ 
+ fi
+ 
+-echo "$as_me:20375: checking for type sigaction_t" >&5
++echo "$as_me:20706: 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 20382 "configure"
++#line 20713 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20392,16 +20723,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20395: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20726: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20398: \$? = $ac_status" >&5
++  echo "$as_me:20729: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20401: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20732: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20404: \$? = $ac_status" >&5
++  echo "$as_me:20735: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_type_sigaction=yes
+ else
+@@ -20412,14 +20743,14 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+-echo "$as_me:20415: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:20746: 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:20422: checking declaration of size-change" >&5
++echo "$as_me:20753: 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
+@@ -20440,7 +20771,7 @@
+ 
+ 	fi
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 20443 "configure"
++#line 20774 "configure"
+ #include "confdefs.h"
+ #include 
+ #ifdef HAVE_TERMIOS_H
+@@ -20486,16 +20817,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20489: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20820: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20492: \$? = $ac_status" >&5
++  echo "$as_me:20823: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20495: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20826: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20498: \$? = $ac_status" >&5
++  echo "$as_me:20829: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_sizechange=yes
+ else
+@@ -20514,7 +20845,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20517: result: $cf_cv_sizechange" >&5
++echo "$as_me:20848: result: $cf_cv_sizechange" >&5
+ echo "${ECHO_T}$cf_cv_sizechange" >&6
+ if test "$cf_cv_sizechange" != no ; then
+ 
+@@ -20532,13 +20863,13 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:20535: checking for memmove" >&5
++echo "$as_me:20866: 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 20541 "configure"
++#line 20872 "configure"
+ #include "confdefs.h"
+ #define memmove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20569,16 +20900,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20572: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20903: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20575: \$? = $ac_status" >&5
++  echo "$as_me:20906: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20578: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20909: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20581: \$? = $ac_status" >&5
++  echo "$as_me:20912: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_memmove=yes
+ else
+@@ -20588,19 +20919,19 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:20591: result: $ac_cv_func_memmove" >&5
++echo "$as_me:20922: 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:20597: checking for bcopy" >&5
++echo "$as_me:20928: 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 20603 "configure"
++#line 20934 "configure"
+ #include "confdefs.h"
+ #define bcopy autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20631,16 +20962,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20634: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20965: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20637: \$? = $ac_status" >&5
++  echo "$as_me:20968: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20640: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20971: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20643: \$? = $ac_status" >&5
++  echo "$as_me:20974: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_bcopy=yes
+ else
+@@ -20650,11 +20981,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:20653: result: $ac_cv_func_bcopy" >&5
++echo "$as_me:20984: 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:20657: checking if bcopy does overlapping moves" >&5
++	echo "$as_me:20988: 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
+@@ -20664,7 +20995,7 @@
+   cf_cv_good_bcopy=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 20667 "configure"
++#line 20998 "configure"
+ #include "confdefs.h"
+ 
+ int main(void) {
+@@ -20678,15 +21009,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:20681: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21012: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20684: \$? = $ac_status" >&5
++  echo "$as_me:21015: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:20686: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21017: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20689: \$? = $ac_status" >&5
++  echo "$as_me:21020: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_good_bcopy=yes
+ else
+@@ -20699,7 +21030,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:20702: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:21033: result: $cf_cv_good_bcopy" >&5
+ echo "${ECHO_T}$cf_cv_good_bcopy" >&6
+ 
+ else
+@@ -20726,13 +21057,13 @@
+ for ac_func in posix_openpt
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:20729: checking for $ac_func" >&5
++echo "$as_me:21060: 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 20735 "configure"
++#line 21066 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20763,16 +21094,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20766: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21097: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20769: \$? = $ac_status" >&5
++  echo "$as_me:21100: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20772: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21103: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20775: \$? = $ac_status" >&5
++  echo "$as_me:21106: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -20782,7 +21113,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:20785: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:21116: 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:21126: 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
+@@ -20802,7 +21133,7 @@
+   cf_cv_working_poll=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 20805 "configure"
++#line 21136 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20854,15 +21185,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:20857: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21188: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20860: \$? = $ac_status" >&5
++  echo "$as_me:21191: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:20862: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21193: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20865: \$? = $ac_status" >&5
++  echo "$as_me:21196: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_working_poll=yes
+ else
+@@ -20874,21 +21205,21 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:20877: result: $cf_cv_working_poll" >&5
++echo "$as_me:21208: 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:20884: checking for va_copy" >&5
++echo "$as_me:21215: 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 20891 "configure"
++#line 21222 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20905,16 +21236,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20908: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21239: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20911: \$? = $ac_status" >&5
++  echo "$as_me:21242: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20914: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21245: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20917: \$? = $ac_status" >&5
++  echo "$as_me:21248: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_va_copy=yes
+ else
+@@ -20924,7 +21255,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:20927: result: $cf_cv_have_va_copy" >&5
++echo "$as_me:21258: result: $cf_cv_have_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have_va_copy" >&6
+ 
+ if test "$cf_cv_have_va_copy" = yes;
+@@ -20936,14 +21267,14 @@
+ 
+ else # !cf_cv_have_va_copy
+ 
+-echo "$as_me:20939: checking for __va_copy" >&5
++echo "$as_me:21270: 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 20946 "configure"
++#line 21277 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20960,16 +21291,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20963: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21294: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20966: \$? = $ac_status" >&5
++  echo "$as_me:21297: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20969: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21300: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20972: \$? = $ac_status" >&5
++  echo "$as_me:21303: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have___va_copy=yes
+ else
+@@ -20979,7 +21310,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:20982: result: $cf_cv_have___va_copy" >&5
++echo "$as_me:21313: result: $cf_cv_have___va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___va_copy" >&6
+ 
+ if test "$cf_cv_have___va_copy" = yes
+@@ -20991,14 +21322,14 @@
+ 
+ else # !cf_cv_have___va_copy
+ 
+-echo "$as_me:20994: checking for __builtin_va_copy" >&5
++echo "$as_me:21325: checking for __builtin_va_copy" >&5
+ echo $ECHO_N "checking for __builtin_va_copy... $ECHO_C" >&6
+ if test "${cf_cv_have___builtin_va_copy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 21001 "configure"
++#line 21332 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21015,16 +21346,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21018: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21349: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21021: \$? = $ac_status" >&5
++  echo "$as_me:21352: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:21024: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21355: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21027: \$? = $ac_status" >&5
++  echo "$as_me:21358: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have___builtin_va_copy=yes
+ else
+@@ -21034,7 +21365,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:21037: result: $cf_cv_have___builtin_va_copy" >&5
++echo "$as_me:21368: result: $cf_cv_have___builtin_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___builtin_va_copy" >&6
+ 
+ test "$cf_cv_have___builtin_va_copy" = yes &&
+@@ -21052,14 +21383,14 @@
+ 	;;
+ 
+ (*)
+-	echo "$as_me:21055: checking if we can simply copy va_list" >&5
++	echo "$as_me:21386: checking if we can simply copy va_list" >&5
+ echo $ECHO_N "checking if we can simply copy va_list... $ECHO_C" >&6
+ if test "${cf_cv_pointer_va_list+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 21062 "configure"
++#line 21393 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21076,16 +21407,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21079: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21410: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21082: \$? = $ac_status" >&5
++  echo "$as_me:21413: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:21085: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21416: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21088: \$? = $ac_status" >&5
++  echo "$as_me:21419: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_pointer_va_list=yes
+ else
+@@ -21095,19 +21426,19 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:21098: result: $cf_cv_pointer_va_list" >&5
++echo "$as_me:21429: result: $cf_cv_pointer_va_list" >&5
+ echo "${ECHO_T}$cf_cv_pointer_va_list" >&6
+ 
+ 	if test "$cf_cv_pointer_va_list" = no
+ 	then
+-		echo "$as_me:21103: checking if we can copy va_list indirectly" >&5
++		echo "$as_me:21434: checking if we can copy va_list indirectly" >&5
+ echo $ECHO_N "checking if we can copy va_list indirectly... $ECHO_C" >&6
+ if test "${cf_cv_array_va_list+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 21110 "configure"
++#line 21441 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21124,16 +21455,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21127: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21458: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21130: \$? = $ac_status" >&5
++  echo "$as_me:21461: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:21133: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21464: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21136: \$? = $ac_status" >&5
++  echo "$as_me:21467: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_array_va_list=yes
+ else
+@@ -21143,7 +21474,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:21146: result: $cf_cv_array_va_list" >&5
++echo "$as_me:21477: result: $cf_cv_array_va_list" >&5
+ echo "${ECHO_T}$cf_cv_array_va_list" >&6
+ 		test "$cf_cv_array_va_list" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -21154,13 +21485,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:21157: checking for pid_t" >&5
++echo "$as_me:21488: 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 21163 "configure"
++#line 21494 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -21175,16 +21506,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:21178: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21509: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21181: \$? = $ac_status" >&5
++  echo "$as_me:21512: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:21184: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21515: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21187: \$? = $ac_status" >&5
++  echo "$as_me:21518: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_pid_t=yes
+ else
+@@ -21194,7 +21525,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:21197: result: $ac_cv_type_pid_t" >&5
++echo "$as_me:21528: 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
+   :
+@@ -21209,23 +21540,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:21212: checking for $ac_header" >&5
++echo "$as_me:21543: 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 21218 "configure"
++#line 21549 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:21222: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:21553: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:21228: \$? = $ac_status" >&5
++  echo "$as_me:21559: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -21244,7 +21575,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:21247: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:21578: 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:21591: 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 21266 "configure"
++#line 21597 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21294,16 +21625,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21297: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21628: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21300: \$? = $ac_status" >&5
++  echo "$as_me:21631: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:21303: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21634: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21306: \$? = $ac_status" >&5
++  echo "$as_me:21637: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -21313,7 +21644,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:21316: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:21647: 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:21659: 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
+@@ -21348,15 +21679,15 @@
+       }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:21351: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21682: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21354: \$? = $ac_status" >&5
++  echo "$as_me:21685: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:21356: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21687: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21359: \$? = $ac_status" >&5
++  echo "$as_me:21690: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_fork_works=yes
+ else
+@@ -21368,7 +21699,7 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:21371: result: $ac_cv_func_fork_works" >&5
++echo "$as_me:21702: result: $ac_cv_func_fork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+ 
+ fi
+@@ -21382,12 +21713,12 @@
+       ac_cv_func_fork_works=yes
+       ;;
+   esac
+-  { echo "$as_me:21385: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:21716: 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:21390: checking for working vfork" >&5
++  echo "$as_me:21721: 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
+@@ -21396,7 +21727,7 @@
+   ac_cv_func_vfork_works=cross
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 21399 "configure"
++#line 21730 "configure"
+ #include "confdefs.h"
+ /* Thanks to Paul Eggert for this test.  */
+ #include 
+@@ -21493,15 +21824,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:21496: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21827: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21499: \$? = $ac_status" >&5
++  echo "$as_me:21830: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:21501: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21832: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21504: \$? = $ac_status" >&5
++  echo "$as_me:21835: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_vfork_works=yes
+ else
+@@ -21513,13 +21844,13 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:21516: result: $ac_cv_func_vfork_works" >&5
++echo "$as_me:21847: 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:21522: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:21853: 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
+ 
+@@ -21544,7 +21875,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21547: checking if fopen accepts explicit binary mode" >&5
++echo "$as_me:21878: checking if fopen accepts explicit binary mode" >&5
+ echo $ECHO_N "checking if fopen accepts explicit binary mode... $ECHO_C" >&6
+ if test "${cf_cv_fopen_bin_r+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21554,7 +21885,7 @@
+   cf_cv_fopen_bin_r=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 21557 "configure"
++#line 21888 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21587,15 +21918,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:21590: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21921: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21593: \$? = $ac_status" >&5
++  echo "$as_me:21924: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:21595: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21926: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21598: \$? = $ac_status" >&5
++  echo "$as_me:21929: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_fopen_bin_r=yes
+ else
+@@ -21608,7 +21939,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:21611: result: $cf_cv_fopen_bin_r" >&5
++echo "$as_me:21942: result: $cf_cv_fopen_bin_r" >&5
+ echo "${ECHO_T}$cf_cv_fopen_bin_r" >&6
+ test "x$cf_cv_fopen_bin_r" != xno && cat >>confdefs.h <<\EOF
+ #define USE_FOPEN_BIN_R 1
+@@ -21616,7 +21947,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:21619: checking for openpty in -lutil" >&5
++echo "$as_me:21950: 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
+@@ -21624,7 +21955,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 21627 "configure"
++#line 21958 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21643,16 +21974,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21646: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21977: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21649: \$? = $ac_status" >&5
++  echo "$as_me:21980: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:21652: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21983: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21655: \$? = $ac_status" >&5
++  echo "$as_me:21986: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -21663,7 +21994,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21666: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:21997: 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
+@@ -21671,7 +22002,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:21674: checking for openpty header" >&5
++echo "$as_me:22005: 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
+@@ -21698,7 +22029,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 21701 "configure"
++#line 22032 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -21715,16 +22046,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21718: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22049: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21721: \$? = $ac_status" >&5
++  echo "$as_me:22052: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:21724: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22055: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21727: \$? = $ac_status" >&5
++  echo "$as_me:22058: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -21742,7 +22073,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:21745: result: $cf_cv_func_openpty" >&5
++echo "$as_me:22076: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -21815,7 +22146,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 21818 "configure"
++#line 22149 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -21827,16 +22158,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:21830: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22161: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21833: \$? = $ac_status" >&5
++  echo "$as_me:22164: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:21836: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22167: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21839: \$? = $ac_status" >&5
++  echo "$as_me:22170: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -21853,7 +22184,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}:21856: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:22187: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -21889,7 +22220,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}:21892: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:22223: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -21900,7 +22231,7 @@
+ 	else
+ 		case "$with_hashed_db" in
+ 		(./*|../*|/*)
+-			{ echo "$as_me:21903: WARNING: no such directory $with_hashed_db" >&5
++			{ echo "$as_me:22234: WARNING: no such directory $with_hashed_db" >&5
+ echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
+ 			;;
+ 		(*)
+@@ -21972,7 +22303,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 21975 "configure"
++#line 22306 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -21984,16 +22315,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:21987: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22318: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21990: \$? = $ac_status" >&5
++  echo "$as_me:22321: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:21993: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22324: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21996: \$? = $ac_status" >&5
++  echo "$as_me:22327: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -22010,7 +22341,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}:22013: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:22344: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -22090,7 +22421,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}:22093: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:22424: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -22107,23 +22438,23 @@
+ 	fi
+ esac
+ 
+-echo "$as_me:22110: checking for db.h" >&5
++echo "$as_me:22441: 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 22116 "configure"
++#line 22447 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:22120: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:22451: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:22126: \$? = $ac_status" >&5
++  echo "$as_me:22457: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22142,11 +22473,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:22145: result: $ac_cv_header_db_h" >&5
++echo "$as_me:22476: 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:22149: checking for version of db" >&5
++echo "$as_me:22480: 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
+@@ -22157,10 +22488,10 @@
+ for cf_db_version in 1 2 3 4 5 6
+ do
+ 
+-echo "${as_me:-configure}:22160: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me:-configure}:22491: testing checking for db version $cf_db_version ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 22163 "configure"
++#line 22494 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22190,16 +22521,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:22193: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22524: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22196: \$? = $ac_status" >&5
++  echo "$as_me:22527: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:22199: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22530: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22202: \$? = $ac_status" >&5
++  echo "$as_me:22533: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_hashed_db_version=$cf_db_version
+@@ -22213,16 +22544,16 @@
+ done
+ 
+ fi
+-echo "$as_me:22216: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:22547: 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:22220: error: Cannot determine version of db" >&5
++	{ { echo "$as_me:22551: 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:22225: checking for db libraries" >&5
++echo "$as_me:22556: 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
+@@ -22252,10 +22583,10 @@
+ 
+ 	fi
+ 
+-echo "${as_me:-configure}:22255: testing checking for library "$cf_db_libs" ..." 1>&5
++echo "${as_me:-configure}:22586: testing checking for library "$cf_db_libs" ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 22258 "configure"
++#line 22589 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22310,16 +22641,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:22313: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22644: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22316: \$? = $ac_status" >&5
++  echo "$as_me:22647: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:22319: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22650: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22322: \$? = $ac_status" >&5
++  echo "$as_me:22653: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	if test -n "$cf_db_libs" ; then
+@@ -22339,11 +22670,11 @@
+ done
+ 
+ fi
+-echo "$as_me:22342: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:22673: 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:22346: error: Cannot determine library for db" >&5
++		{ { echo "$as_me:22677: 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
+@@ -22369,7 +22700,7 @@
+ 
+ else
+ 
+-	{ { echo "$as_me:22372: error: Cannot find db.h" >&5
++	{ { echo "$as_me:22703: error: Cannot find db.h" >&5
+ echo "$as_me: error: Cannot find db.h" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -22384,7 +22715,7 @@
+ 
+ # Just in case, check if the C compiler has a bool type.
+ 
+-echo "$as_me:22387: checking if we should include stdbool.h" >&5
++echo "$as_me:22718: 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
+@@ -22392,7 +22723,7 @@
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 22395 "configure"
++#line 22726 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -22404,23 +22735,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:22407: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22738: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22410: \$? = $ac_status" >&5
++  echo "$as_me:22741: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:22413: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22744: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22416: \$? = $ac_status" >&5
++  echo "$as_me:22747: \$? = $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 22423 "configure"
++#line 22754 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -22436,16 +22767,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:22439: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22770: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22442: \$? = $ac_status" >&5
++  echo "$as_me:22773: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:22445: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22776: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22448: \$? = $ac_status" >&5
++  echo "$as_me:22779: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -22459,13 +22790,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:22462: result: yes" >&5
++then	echo "$as_me:22793: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:22464: result: no" >&5
++else	echo "$as_me:22795: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:22468: checking for builtin bool type" >&5
++echo "$as_me:22799: 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
+@@ -22473,7 +22804,7 @@
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 22476 "configure"
++#line 22807 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22488,16 +22819,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:22491: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22822: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22494: \$? = $ac_status" >&5
++  echo "$as_me:22825: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:22497: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22828: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22500: \$? = $ac_status" >&5
++  echo "$as_me:22831: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cc_bool_type=1
+ else
+@@ -22510,9 +22841,9 @@
+ fi
+ 
+ if test "$cf_cv_cc_bool_type" = 1
+-then	echo "$as_me:22513: result: yes" >&5
++then	echo "$as_me:22844: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:22515: result: no" >&5
++else	echo "$as_me:22846: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -22529,10 +22860,10 @@
+ 
+ 	cf_save="$LIBS"
+ 	LIBS="$LIBS $CXXLIBS"
+-	echo "$as_me:22532: checking if we already have C++ library" >&5
++	echo "$as_me:22863: 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 22535 "configure"
++#line 22866 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -22546,16 +22877,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:22549: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22880: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22552: \$? = $ac_status" >&5
++  echo "$as_me:22883: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:22555: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22886: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22558: \$? = $ac_status" >&5
++  echo "$as_me:22889: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_have_libstdcpp=yes
+ else
+@@ -22564,7 +22895,7 @@
+ cf_have_libstdcpp=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-	echo "$as_me:22567: result: $cf_have_libstdcpp" >&5
++	echo "$as_me:22898: result: $cf_have_libstdcpp" >&5
+ echo "${ECHO_T}$cf_have_libstdcpp" >&6
+ 	LIBS="$cf_save"
+ 
+@@ -22583,7 +22914,7 @@
+ 			;;
+ 		esac
+ 
+-		echo "$as_me:22586: checking for library $cf_stdcpp_libname" >&5
++		echo "$as_me:22917: 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
+@@ -22609,7 +22940,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 22612 "configure"
++#line 22943 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -22623,16 +22954,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:22626: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22957: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22629: \$? = $ac_status" >&5
++  echo "$as_me:22960: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:22632: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22963: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22635: \$? = $ac_status" >&5
++  echo "$as_me:22966: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_libstdcpp=yes
+ else
+@@ -22644,7 +22975,7 @@
+ 			LIBS="$cf_save"
+ 
+ fi
+-echo "$as_me:22647: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:22978: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ 		test "$cf_cv_libstdcpp" = yes && {
+ cf_add_libs="-l$cf_stdcpp_libname"
+@@ -22666,7 +22997,7 @@
+ 	fi
+ fi
+ 
+-	echo "$as_me:22669: checking whether $CXX understands -c and -o together" >&5
++	echo "$as_me:23000: 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
+@@ -22681,15 +23012,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:22684: \"$ac_try\"") >&5
++if { (eval echo "$as_me:23015: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22687: \$? = $ac_status" >&5
++  echo "$as_me:23018: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:22689: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:23020: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22692: \$? = $ac_status" >&5
++  echo "$as_me:23023: \$? = $ac_status" >&5
+   (exit $ac_status); };
+ then
+   eval cf_cv_prog_CXX_c_o=yes
+@@ -22700,10 +23031,10 @@
+ 
+ fi
+ if test $cf_cv_prog_CXX_c_o = yes; then
+-  echo "$as_me:22703: result: yes" >&5
++  echo "$as_me:23034: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:22706: result: no" >&5
++  echo "$as_me:23037: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -22723,7 +23054,7 @@
+ 	;;
+ esac
+ if test "$GXX" = yes; then
+-	echo "$as_me:22726: checking for lib$cf_gpp_libname" >&5
++	echo "$as_me:23057: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ 	cf_save="$LIBS"
+ 
+@@ -22744,7 +23075,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 22747 "configure"
++#line 23078 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_gpp_libname/builtin.h>
+@@ -22758,16 +23089,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:22761: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23092: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22764: \$? = $ac_status" >&5
++  echo "$as_me:23095: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:22767: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23098: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22770: \$? = $ac_status" >&5
++  echo "$as_me:23101: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -22804,7 +23135,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 22807 "configure"
++#line 23138 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22818,16 +23149,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:22821: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23152: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22824: \$? = $ac_status" >&5
++  echo "$as_me:23155: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:22827: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23158: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22830: \$? = $ac_status" >&5
++  echo "$as_me:23161: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -22860,7 +23191,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 	LIBS="$cf_save"
+-	echo "$as_me:22863: result: $cf_cxx_library" >&5
++	echo "$as_me:23194: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+ 
+@@ -22876,7 +23207,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:22879: checking how to run the C++ preprocessor" >&5
++echo "$as_me:23210: 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
+@@ -22893,18 +23224,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 22896 "configure"
++#line 23227 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:22901: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:23232: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:22907: \$? = $ac_status" >&5
++  echo "$as_me:23238: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -22927,17 +23258,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 22930 "configure"
++#line 23261 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:22934: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:23265: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:22940: \$? = $ac_status" >&5
++  echo "$as_me:23271: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -22974,7 +23305,7 @@
+ else
+   ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:22977: result: $CXXCPP" >&5
++echo "$as_me:23308: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -22984,18 +23315,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 22987 "configure"
++#line 23318 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:22992: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:23323: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:22998: \$? = $ac_status" >&5
++  echo "$as_me:23329: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -23018,17 +23349,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 23021 "configure"
++#line 23352 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:23025: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:23356: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:23031: \$? = $ac_status" >&5
++  echo "$as_me:23362: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -23056,7 +23387,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:23059: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++  { { echo "$as_me:23390: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -23071,23 +23402,23 @@
+ for ac_header in typeinfo
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:23074: checking for $ac_header" >&5
++echo "$as_me:23405: 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 23080 "configure"
++#line 23411 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:23084: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:23415: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:23090: \$? = $ac_status" >&5
++  echo "$as_me:23421: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -23106,7 +23437,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:23109: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:23440: 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:23453: 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 23128 "configure"
++#line 23459 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:23132: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:23463: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:23138: \$? = $ac_status" >&5
++  echo "$as_me:23469: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -23154,7 +23485,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:23157: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:23488: 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:23499: 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 23171 "configure"
++#line 23502 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23185,16 +23516,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:23188: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23519: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23191: \$? = $ac_status" >&5
++  echo "$as_me:23522: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:23194: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23525: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23197: \$? = $ac_status" >&5
++  echo "$as_me:23528: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_iostream_namespace=yes
+ else
+@@ -23203,7 +23534,7 @@
+ cf_iostream_namespace=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-	echo "$as_me:23206: result: $cf_iostream_namespace" >&5
++	echo "$as_me:23537: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+ 	if test "$cf_iostream_namespace" = yes ; then
+ 
+@@ -23214,7 +23545,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:23217: checking if we should include stdbool.h" >&5
++echo "$as_me:23548: 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
+@@ -23222,7 +23553,7 @@
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 23225 "configure"
++#line 23556 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -23234,23 +23565,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:23237: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23568: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23240: \$? = $ac_status" >&5
++  echo "$as_me:23571: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:23243: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23574: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23246: \$? = $ac_status" >&5
++  echo "$as_me:23577: \$? = $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 23253 "configure"
++#line 23584 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -23266,16 +23597,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:23269: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23600: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23272: \$? = $ac_status" >&5
++  echo "$as_me:23603: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:23275: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23606: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23278: \$? = $ac_status" >&5
++  echo "$as_me:23609: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -23289,13 +23620,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:23292: result: yes" >&5
++then	echo "$as_me:23623: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:23294: result: no" >&5
++else	echo "$as_me:23625: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:23298: checking for builtin bool type" >&5
++echo "$as_me:23629: 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
+@@ -23303,7 +23634,7 @@
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 23306 "configure"
++#line 23637 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23318,16 +23649,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:23321: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23652: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23324: \$? = $ac_status" >&5
++  echo "$as_me:23655: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:23327: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23658: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23330: \$? = $ac_status" >&5
++  echo "$as_me:23661: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_builtin_bool=1
+ else
+@@ -23340,13 +23671,13 @@
+ fi
+ 
+ if test "$cf_cv_builtin_bool" = 1
+-then	echo "$as_me:23343: result: yes" >&5
++then	echo "$as_me:23674: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:23345: result: no" >&5
++else	echo "$as_me:23676: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:23349: checking for size of bool" >&5
++echo "$as_me:23680: 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
+@@ -23357,7 +23688,7 @@
+   cf_cv_type_of_bool=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 23360 "configure"
++#line 23691 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23399,15 +23730,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:23402: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23733: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23405: \$? = $ac_status" >&5
++  echo "$as_me:23736: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:23407: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23738: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23410: \$? = $ac_status" >&5
++  echo "$as_me:23741: \$? = $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
+@@ -23425,18 +23756,18 @@
+ fi
+ 
+ 	rm -f cf_test.out
+-echo "$as_me:23428: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:23759: 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:23434: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:23765: 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:23439: checking for special defines needed for etip.h" >&5
++echo "$as_me:23770: 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"
+@@ -23454,7 +23785,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 23457 "configure"
++#line 23788 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23468,16 +23799,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:23471: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23802: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23474: \$? = $ac_status" >&5
++  echo "$as_me:23805: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:23477: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23808: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23480: \$? = $ac_status" >&5
++  echo "$as_me:23811: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	test -n "$cf_math" && cat >>confdefs.h <&5
++echo "$as_me:23832: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ CXXFLAGS="$cf_save_CXXFLAGS"
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:23506: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:23837: 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
+@@ -23520,7 +23851,7 @@
+   cf_cv_cpp_param_init=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 23523 "configure"
++#line 23854 "configure"
+ #include "confdefs.h"
+ 
+ class TEST {
+@@ -23539,15 +23870,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:23542: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23873: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23545: \$? = $ac_status" >&5
++  echo "$as_me:23876: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:23547: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23878: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23550: \$? = $ac_status" >&5
++  echo "$as_me:23881: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cpp_param_init=yes
+ else
+@@ -23566,7 +23897,7 @@
+ ac_main_return=return
+ 
+ fi
+-echo "$as_me:23569: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:23900: result: $cf_cv_cpp_param_init" >&5
+ echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
+ fi
+ test "$cf_cv_cpp_param_init" = yes &&
+@@ -23576,7 +23907,7 @@
+ 
+ if test -n "$CXX"; then
+ 
+-echo "$as_me:23579: checking if $CXX accepts static_cast" >&5
++echo "$as_me:23910: 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
+@@ -23590,7 +23921,7 @@
+ ac_main_return=return
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 23593 "configure"
++#line 23924 "configure"
+ #include "confdefs.h"
+ 
+ class NCursesPanel
+@@ -23634,16 +23965,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:23637: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23968: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23640: \$? = $ac_status" >&5
++  echo "$as_me:23971: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:23643: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23974: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23646: \$? = $ac_status" >&5
++  echo "$as_me:23977: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cpp_static_cast=yes
+ else
+@@ -23661,7 +23992,7 @@
+ ac_main_return=return
+ 
+ fi
+-echo "$as_me:23664: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:23995: result: $cf_cv_cpp_static_cast" >&5
+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
+ 
+ fi
+@@ -23710,7 +24041,7 @@
+ 	else
+ 		if test "$cf_cv_header_stdbool_h" = 1 ; then
+ 
+-echo "$as_me:23713: checking for size of bool" >&5
++echo "$as_me:24044: 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
+@@ -23721,7 +24052,7 @@
+   cf_cv_type_of_bool=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 23724 "configure"
++#line 24055 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23763,15 +24094,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:23766: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24097: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23769: \$? = $ac_status" >&5
++  echo "$as_me:24100: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:23771: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24102: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23774: \$? = $ac_status" >&5
++  echo "$as_me:24105: \$? = $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
+@@ -23789,25 +24120,25 @@
+ fi
+ 
+ 	rm -f cf_test.out
+-echo "$as_me:23792: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:24123: 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:23798: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:24129: 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:23804: checking for fallback type of bool" >&5
++			echo "$as_me:24135: 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:23810: result: $cf_cv_type_of_bool" >&5
++			echo "$as_me:24141: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ 		fi
+ 	fi
+@@ -23836,7 +24167,7 @@
+ 
+ 	if test "$cf_with_ada" != "no" ; then
+ 		if test "$with_libtool" != "no"; then
+-			{ echo "$as_me:23839: WARNING: libtool does not support Ada - disabling feature" >&5
++			{ echo "$as_me:24170: 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
+@@ -23848,7 +24179,7 @@
+ cf_ada_config="#"
+ # 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:23851: checking for $ac_word" >&5
++echo "$as_me:24182: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_gnatmake_exists+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -23863,7 +24194,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_gnatmake_exists="yes"
+-echo "$as_me:23866: found $ac_dir/$ac_word" >&5
++echo "$as_me:24197: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -23872,10 +24203,10 @@
+ fi
+ gnatmake_exists=$ac_cv_prog_gnatmake_exists
+ if test -n "$gnatmake_exists"; then
+-  echo "$as_me:23875: result: $gnatmake_exists" >&5
++  echo "$as_me:24206: result: $gnatmake_exists" >&5
+ echo "${ECHO_T}$gnatmake_exists" >&6
+ else
+-  echo "$as_me:23878: result: no" >&5
++  echo "$as_me:24209: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -23885,7 +24216,7 @@
+ else
+ 	# Extract the first word of "gprconfig", so it can be a program name with args.
+ set dummy gprconfig; ac_word=$2
+-echo "$as_me:23888: checking for $ac_word" >&5
++echo "$as_me:24219: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_gprconfig_exists+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -23900,7 +24231,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_gprconfig_exists="yes"
+-echo "$as_me:23903: found $ac_dir/$ac_word" >&5
++echo "$as_me:24234: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -23909,10 +24240,10 @@
+ fi
+ gprconfig_exists=$ac_cv_prog_gprconfig_exists
+ if test -n "$gprconfig_exists"; then
+-  echo "$as_me:23912: result: $gprconfig_exists" >&5
++  echo "$as_me:24243: result: $gprconfig_exists" >&5
+ echo "${ECHO_T}$gprconfig_exists" >&6
+ else
+-  echo "$as_me:23915: result: no" >&5
++  echo "$as_me:24246: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -23925,7 +24256,7 @@
+ 			cd conftest.src
+ 			for cf_gprconfig in Ada C
+ 			do
+-				echo "$as_me:23928: checking for gprconfig name for $cf_gprconfig" >&5
++				echo "$as_me:24259: checking for gprconfig name for $cf_gprconfig" >&5
+ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
+ 				if test $cf_gprconfig = C
+ 				then
+@@ -23944,10 +24275,10 @@
+ 				if test -n "$cf_gprconfig_value"
+ 				then
+ 					eval cf_ada_config_$cf_gprconfig=$cf_gprconfig_value
+-					echo "$as_me:23947: result: $cf_gprconfig_value" >&5
++					echo "$as_me:24278: result: $cf_gprconfig_value" >&5
+ echo "${ECHO_T}$cf_gprconfig_value" >&6
+ 				else
+-					echo "$as_me:23950: result: missing" >&5
++					echo "$as_me:24281: result: missing" >&5
+ echo "${ECHO_T}missing" >&6
+ 					cf_ada_config="#"
+ 					break
+@@ -23963,12 +24294,12 @@
+ 	if test "x$cf_ada_config" != "x#"
+ 	then
+ 
+-echo "$as_me:23966: checking for gnat version" >&5
++echo "$as_me:24297: 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:23971: result: $cf_gnat_version" >&5
++echo "$as_me:24302: result: $cf_gnat_version" >&5
+ echo "${ECHO_T}$cf_gnat_version" >&6
+ 
+ case $cf_gnat_version in
+@@ -23976,7 +24307,7 @@
+ 	cf_cv_prog_gnat_correct=yes
+ 	;;
+ (*)
+-	{ echo "$as_me:23979: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
++	{ echo "$as_me:24310: 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
+ 	;;
+@@ -23984,7 +24315,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:23987: checking for $ac_word" >&5
++echo "$as_me:24318: 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
+@@ -23999,7 +24330,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_M4_exists="yes"
+-echo "$as_me:24002: found $ac_dir/$ac_word" >&5
++echo "$as_me:24333: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -24008,10 +24339,10 @@
+ fi
+ M4_exists=$ac_cv_prog_M4_exists
+ if test -n "$M4_exists"; then
+-  echo "$as_me:24011: result: $M4_exists" >&5
++  echo "$as_me:24342: result: $M4_exists" >&5
+ echo "${ECHO_T}$M4_exists" >&6
+ else
+-  echo "$as_me:24014: result: no" >&5
++  echo "$as_me:24345: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -24020,7 +24351,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:24023: checking if GNAT works" >&5
++			echo "$as_me:24354: checking if GNAT works" >&5
+ echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+ 
+ rm -rf conftest* *~conftest*
+@@ -24048,7 +24379,7 @@
+ fi
+ rm -rf conftest* *~conftest*
+ 
+-			echo "$as_me:24051: result: $cf_cv_prog_gnat_correct" >&5
++			echo "$as_me:24382: result: $cf_cv_prog_gnat_correct" >&5
+ echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
+ 		fi
+ 	else
+@@ -24060,7 +24391,7 @@
+ 
+  	ADAFLAGS="$ADAFLAGS -gnatpn"
+ 
+-	echo "$as_me:24063: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:24394: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -24077,10 +24408,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:24080: result: $ADAFLAGS" >&5
++	echo "$as_me:24411: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:24083: checking if GNATPREP supports -T option" >&5
++echo "$as_me:24414: 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
+@@ -24090,11 +24421,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:24093: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:24424: 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:24097: checking if GNAT supports generics" >&5
++echo "$as_me:24428: 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].*)
+@@ -24104,7 +24435,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:24107: result: $cf_gnat_generics" >&5
++echo "$as_me:24438: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -24116,7 +24447,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:24119: checking if GNAT supports SIGINT" >&5
++echo "$as_me:24450: 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
+@@ -24164,7 +24495,7 @@
+ rm -rf conftest* *~conftest*
+ 
+ fi
+-echo "$as_me:24167: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:24498: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test $cf_cv_gnat_sigint = yes ; then
+@@ -24177,7 +24508,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:24180: checking if GNAT supports project files" >&5
++echo "$as_me:24511: 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]*)
+@@ -24240,15 +24571,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:24243: result: $cf_gnat_projects" >&5
++echo "$as_me:24574: 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:24249: checking if GNAT supports libraries" >&5
++	echo "$as_me:24580: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:24251: result: $cf_gnat_libraries" >&5
++	echo "$as_me:24582: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -24268,7 +24599,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:24271: checking for ada-compiler" >&5
++echo "$as_me:24602: 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.
+@@ -24279,12 +24610,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:24282: result: $cf_ada_compiler" >&5
++echo "$as_me:24613: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 			cf_ada_package=terminal_interface
+ 
+-echo "$as_me:24287: checking for ada-include" >&5
++echo "$as_me:24618: 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.
+@@ -24320,7 +24651,7 @@
+ 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:24323: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:24654: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -24329,10 +24660,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:24332: result: $ADA_INCLUDE" >&5
++echo "$as_me:24663: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:24335: checking for ada-objects" >&5
++echo "$as_me:24666: 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.
+@@ -24368,7 +24699,7 @@
+ 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:24371: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:24702: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -24377,10 +24708,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:24380: result: $ADA_OBJECTS" >&5
++echo "$as_me:24711: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:24383: checking if an Ada95 shared-library should be built" >&5
++echo "$as_me:24714: 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.
+@@ -24390,14 +24721,14 @@
+ else
+   with_ada_sharedlib=no
+ fi;
+-echo "$as_me:24393: result: $with_ada_sharedlib" >&5
++echo "$as_me:24724: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ 
+ if test "x$with_ada_sharedlib" != xno
+ then
+ 	if test "x$cf_gnat_projects" != xyes
+ 	then
+-		{ echo "$as_me:24400: WARNING: disabling shared-library since GNAT projects are not supported" >&5
++		{ echo "$as_me:24731: WARNING: disabling shared-library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;}
+ 		with_ada_sharedlib=no
+ 	fi
+@@ -24423,13 +24754,13 @@
+ 
+ # do this "late" to avoid conflict with header-checks
+ if test "x$with_widec" = xyes ; then
+-	echo "$as_me:24426: checking for wchar_t" >&5
++	echo "$as_me:24757: 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 24432 "configure"
++#line 24763 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24444,16 +24775,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:24447: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24778: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24450: \$? = $ac_status" >&5
++  echo "$as_me:24781: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:24453: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24784: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24456: \$? = $ac_status" >&5
++  echo "$as_me:24787: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_wchar_t=yes
+ else
+@@ -24463,10 +24794,10 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:24466: result: $ac_cv_type_wchar_t" >&5
++echo "$as_me:24797: result: $ac_cv_type_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
+ 
+-echo "$as_me:24469: checking size of wchar_t" >&5
++echo "$as_me:24800: 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
+@@ -24475,7 +24806,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 24478 "configure"
++#line 24809 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24487,21 +24818,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:24490: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24821: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24493: \$? = $ac_status" >&5
++  echo "$as_me:24824: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:24496: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24827: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24499: \$? = $ac_status" >&5
++  echo "$as_me:24830: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 24504 "configure"
++#line 24835 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24513,16 +24844,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:24516: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24847: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24519: \$? = $ac_status" >&5
++  echo "$as_me:24850: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:24522: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24853: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24525: \$? = $ac_status" >&5
++  echo "$as_me:24856: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -24538,7 +24869,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 24541 "configure"
++#line 24872 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24550,16 +24881,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:24553: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24884: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24556: \$? = $ac_status" >&5
++  echo "$as_me:24887: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:24559: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24890: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24562: \$? = $ac_status" >&5
++  echo "$as_me:24893: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -24575,7 +24906,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 24578 "configure"
++#line 24909 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24587,16 +24918,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:24590: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24921: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24593: \$? = $ac_status" >&5
++  echo "$as_me:24924: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:24596: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24927: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24599: \$? = $ac_status" >&5
++  echo "$as_me:24930: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -24609,12 +24940,12 @@
+ ac_cv_sizeof_wchar_t=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:24612: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:24943: 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 24617 "configure"
++#line 24948 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24630,15 +24961,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:24633: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24964: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24636: \$? = $ac_status" >&5
++  echo "$as_me:24967: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:24638: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24969: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24641: \$? = $ac_status" >&5
++  echo "$as_me:24972: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_wchar_t=`cat conftest.val`
+ else
+@@ -24654,7 +24985,7 @@
+   ac_cv_sizeof_wchar_t=0
+ fi
+ fi
+-echo "$as_me:24657: result: $ac_cv_sizeof_wchar_t" >&5
++echo "$as_me:24988: result: $ac_cv_sizeof_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:25006: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+ 
+@@ -24714,7 +25045,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:24717: result: $LIB_SUBSETS" >&5
++echo "$as_me:25048: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+ 
+ ### Construct the list of include-directories to be generated
+@@ -24745,7 +25076,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:24748: checking default library suffix" >&5
++echo "$as_me:25079: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -24756,10 +25087,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:24759: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:25090: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:24762: checking default library-dependency suffix" >&5
++echo "$as_me:25093: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -24817,10 +25148,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:24820: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:25151: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:24823: checking default object directory" >&5
++echo "$as_me:25154: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -24836,11 +25167,11 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:24839: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:25170: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ if test "x$cf_with_cxx" = xyes ; then
+-echo "$as_me:24843: checking c++ library-dependency suffix" >&5
++echo "$as_me:25174: 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++)
+@@ -24908,7 +25239,7 @@
+ 	fi
+ 
+ fi
+-echo "$as_me:24911: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:25242: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+ 
+ fi
+@@ -25084,19 +25415,19 @@
+ 
+ if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
+ then
+-	echo "$as_me:25087: checking if linker supports switching between static/dynamic" >&5
++	echo "$as_me:25418: 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:25096: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:25427: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25099: \$? = $ac_status" >&5
++  echo "$as_me:25430: \$? = $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
+@@ -25107,10 +25438,10 @@
+ 
+ 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 25110 "configure"
++#line 25441 "configure"
+ #include "confdefs.h"
+ 
+-#line 25113 "configure"
++#line 25444 "configure"
+ #include 
+ int cf_ldflags_static(FILE *fp);
+ 
+@@ -25125,16 +25456,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:25128: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25459: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25131: \$? = $ac_status" >&5
++  echo "$as_me:25462: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:25134: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25465: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25137: \$? = $ac_status" >&5
++  echo "$as_me:25468: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	# some linkers simply ignore the -dynamic
+@@ -25157,7 +25488,7 @@
+ 	rm -f libconftest.*
+ 	LIBS="$cf_save_LIBS"
+ 
+-	echo "$as_me:25160: result: $cf_ldflags_static" >&5
++	echo "$as_me:25491: result: $cf_ldflags_static" >&5
+ echo "${ECHO_T}$cf_ldflags_static" >&6
+ 
+ 	if test $cf_ldflags_static != yes
+@@ -25173,7 +25504,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:25176: checking where we will install curses.h" >&5
++echo "$as_me:25507: checking where we will install curses.h" >&5
+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
+ 
+ includesubdir=
+@@ -25183,7 +25514,7 @@
+ then
+ 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
+ fi
+-echo "$as_me:25186: result: ${includedir}${includesubdir}" >&5
++echo "$as_me:25517: result: ${includedir}${includesubdir}" >&5
+ echo "${ECHO_T}${includedir}${includesubdir}" >&6
+ 
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -25191,7 +25522,7 @@
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+-	{ echo "$as_me:25194: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++	{ echo "$as_me:25525: 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
+@@ -25209,7 +25540,7 @@
+ ### Construct the list of subdirectories for which we'll customize makefiles
+ ### with the appropriate compile-rules.
+ 
+-echo "$as_me:25212: checking for src modules" >&5
++echo "$as_me:25543: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+ 
+ # dependencies and linker-arguments for test-programs
+@@ -25274,7 +25605,7 @@
+ 		fi
+ 	fi
+ done
+-echo "$as_me:25277: result: $cf_cv_src_modules" >&5
++echo "$as_me:25608: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+ 
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+@@ -25509,53 +25840,6 @@
+ SUB_MAKEFILES="$SUB_MAKEFILES misc/gen-pkgconfig:misc/gen-pkgconfig.in"
+ 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:25514: 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
+-else
+-  case $TIC_PATH in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_TIC_PATH="$TIC_PATH" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  ac_save_IFS=$IFS; IFS=$ac_path_separator
+-ac_dummy="$PATH:/usr/local/ncurses/bin"
+-for ac_dir in $ac_dummy; do
+-  IFS=$ac_save_IFS
+-  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:25531: found $ac_dir/$ac_word" >&5
+-   break
+-fi
+-done
+-
+-  test -z "$ac_cv_path_TIC_PATH" && ac_cv_path_TIC_PATH="unknown"
+-  ;;
+-esac
+-fi
+-TIC_PATH=$ac_cv_path_TIC_PATH
+-
+-if test -n "$TIC_PATH"; then
+-  echo "$as_me:25543: result: $TIC_PATH" >&5
+-echo "${ECHO_T}$TIC_PATH" >&6
+-else
+-  echo "$as_me:25546: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-if test -n "$FALLBACK_LIST"
+-then
+-	if test "$TIC_PATH" = unknown
+-	then
+-		{ echo "$as_me:25554: WARNING: no tic program found for fallbacks" >&5
+-echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
+-	fi
+-fi
+-
+ if test "x$cf_with_tests" != xno ; then
+ 	MAKE_TESTS=
+ else
+@@ -25587,7 +25871,7 @@
+ 	(*-D_XOPEN_SOURCE_EXTENDED*)
+ 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
+ 
+-echo "${as_me:-configure}:25590: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
++echo "${as_me:-configure}:25874: 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//'`
+@@ -25598,7 +25882,7 @@
+ 
+ # Help to automatically enable the extended curses features when using either
+ # the *-config or the ".pc" files by adding defines.
+-echo "$as_me:25601: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
++echo "$as_me:25885: 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
+@@ -25614,7 +25898,7 @@
+ 	done
+ 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
+ done
+-echo "$as_me:25617: result: $PKG_CFLAGS" >&5
++echo "$as_me:25901: result: $PKG_CFLAGS" >&5
+ echo "${ECHO_T}$PKG_CFLAGS" >&6
+ 
+ # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
+@@ -25677,7 +25961,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}:25680: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
++echo "${as_me:-configure}:25964: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
+ 
+ fi
+ 
+@@ -25787,7 +26071,7 @@
+ : ${CONFIG_STATUS=./config.status}
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:25790: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:26074: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >$CONFIG_STATUS <<_ACEOF
+ #! $SHELL
+@@ -25963,7 +26247,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:25966: error: ambiguous option: $1
++    { { echo "$as_me:26250: 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;}
+@@ -25982,7 +26266,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:25985: error: unrecognized option: $1
++  -*) { { echo "$as_me:26269: 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;}
+@@ -26102,7 +26386,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:26105: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:26389: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -26313,6 +26597,8 @@
+ s,@NCURSES_USE_DATABASE@,$NCURSES_USE_DATABASE,;t t
+ s,@FALLBACK_LIST@,$FALLBACK_LIST,;t t
+ s,@USE_FALLBACKS@,$USE_FALLBACKS,;t t
++s,@TIC@,$TIC,;t t
++s,@INFOCMP@,$INFOCMP,;t t
+ s,@WHICH_XTERM@,$WHICH_XTERM,;t t
+ s,@XTERM_KBS@,$XTERM_KBS,;t t
+ s,@TERMINFO_DIRS@,$TERMINFO_DIRS,;t t
+@@ -26448,7 +26734,6 @@
+ s,@HAVE_TERMIO_H@,$HAVE_TERMIO_H,;t t
+ s,@HAVE_TERMIOS_H@,$HAVE_TERMIOS_H,;t t
+ s,@cross_compiling@,$cross_compiling,;t t
+-s,@TIC_PATH@,$TIC_PATH,;t t
+ s,@MAKE_TESTS@,$MAKE_TESTS,;t t
+ s,@ADAHTML_DIR@,$ADAHTML_DIR,;t t
+ s,@PANEL_NAME@,$PANEL_NAME,;t t
+@@ -26596,7 +26881,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:26599: creating $ac_file" >&5
++    { echo "$as_me:26884: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -26614,7 +26899,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:26617: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:26902: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -26627,7 +26912,7 @@
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+-           { { echo "$as_me:26630: error: cannot find input file: $f" >&5
++           { { echo "$as_me:26915: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -26643,7 +26928,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' $ac_item`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:26646: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:26931: 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;}
+@@ -26652,7 +26937,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' $ac_item`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:26655: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:26940: 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;}
+@@ -26689,7 +26974,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:26692: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:26977: 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;}
+@@ -26700,7 +26985,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:26703: WARNING: Some variables may not be substituted:
++      { echo "$as_me:26988: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -26749,7 +27034,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:26752: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:27037: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -26760,7 +27045,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:26763: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:27048: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -26773,7 +27058,7 @@
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+-           { { echo "$as_me:26776: error: cannot find input file: $f" >&5
++           { { echo "$as_me:27061: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -26831,7 +27116,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:26834: $ac_file is unchanged" >&5
++      { echo "$as_me:27119: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -27176,7 +27461,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}:27179: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:27464: testing overriding CXX_MODEL to SHARED ..." 1>&5
+ 
+ 					with_shared_cxx=yes
+ 					;;
+Index: configure.in
+Prereq:  1.682 
+--- ncurses-6.1-20190623+/configure.in	2019-06-23 21:26:48.000000000 +0000
++++ ncurses-6.1-20190630/configure.in	2019-06-30 15:21:02.000000000 +0000
+@@ -28,14 +28,14 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: configure.in,v 1.682 2019/06/23 21:26:48 tom Exp $
++dnl $Id: configure.in,v 1.688 2019/06/30 15:21:02 tom Exp $
+ dnl Process this file with autoconf to produce a configure script.
+ dnl
+ dnl See https://invisible-island.net/autoconf/ for additional information.
+ dnl
+ dnl ---------------------------------------------------------------------------
+ AC_PREREQ(2.52.20170501)
+-AC_REVISION($Revision: 1.682 $)
++AC_REVISION($Revision: 1.688 $)
+ AC_INIT(ncurses/base/lib_initscr.c)
+ AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
+ 
+@@ -629,6 +629,22 @@
+ AC_SUBST(FALLBACK_LIST)
+ AC_SUBST(USE_FALLBACKS)
+ 
++# The fallback feature in ncurses relies upon tic/infocmp outside the build
++# tree for generating the terminal descriptions that will be compiled into the
++# library.  If your toolchain is old, it may not handle current terminal
++# databases.  Use configure-options to point to the tools which will be used,
++# rather than the first ones found on the $PATH.
++if test -n "$FALLBACK_LIST"
++then
++	CF_WITH_PATH_PROG(TIC,     tic,     [for fallbacks], $PATH:/usr/local/ncurses/bin)
++	CF_WITH_PATH_PROG(INFOCMP, infocmp, [for fallbacks], $PATH:/usr/local/ncurses/bin)
++else
++	: ${TIC:=tic}
++	: ${INFOCMP:=infocmp}
++fi
++AC_SUBST(TIC)
++AC_SUBST(INFOCMP)
++
+ AC_MSG_CHECKING(if you want modern xterm or antique)
+ AC_ARG_WITH(xterm-new,
+ 	[  --without-xterm-new     specify if xterm terminfo should be old version],
+@@ -2221,16 +2237,6 @@
+ fi
+ AC_SUBST(cross_compiling)
+ 
+-AC_PATH_PROG(TIC_PATH,tic,unknown,$PATH:/usr/local/ncurses/bin)
+-if test -n "$FALLBACK_LIST"
+-then
+-	if test "$TIC_PATH" = unknown
+-	then
+-		AC_MSG_WARN(no tic program found for fallbacks)
+-	fi
+-fi
+-AC_SUBST(TIC_PATH)
+-
+ if test "x$cf_with_tests" != xno ; then
+ 	MAKE_TESTS=
+ else
+Index: dist.mk
+Prereq:  1.1290 
+--- ncurses-6.1-20190623+/dist.mk	2019-06-23 15:31:40.000000000 +0000
++++ ncurses-6.1-20190630/dist.mk	2019-06-30 01:30:19.000000000 +0000
+@@ -25,7 +25,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1290 2019/06/23 15:31:40 tom Exp $
++# $Id: dist.mk,v 1.1292 2019/06/30 01:30:19 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 = 1
+-NCURSES_PATCH = 20190623
++NCURSES_PATCH = 20190630
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: misc/run_tic.in
+Prereq:  1.35 
+--- ncurses-6.1-20190623+/misc/run_tic.in	2017-10-24 00:16:22.000000000 +0000
++++ ncurses-6.1-20190630/misc/run_tic.in	2019-06-30 16:29:23.000000000 +0000
+@@ -1,7 +1,7 @@
+ #!@SHELL@
+-# $Id: run_tic.in,v 1.35 2017/10/24 00:16:22 tom Exp $
++# $Id: run_tic.in,v 1.36 2019/06/30 16:29:23 tom Exp $
+ ##############################################################################
+-# Copyright (c) 1998-2012,2017 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2017,2019 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"), #
+@@ -50,7 +50,7 @@
+ : ${srcdir:=@srcdir@}
+ : ${datarootdir:=@datarootdir@}
+ : ${datadir:=@datadir@}
+-: ${TIC_PATH:=@TIC_PATH@}
++: ${TIC_PATH:=@TIC@}
+ : ${ticdir:=@TERMINFO@}
+ : ${source:=@TERMINFO_SRC@}
+ : ${LN_S:="@LN_S@"}
+Index: misc/terminfo.src
+--- ncurses-6.1-20190623+/misc/terminfo.src	2019-06-09 20:01:43.000000000 +0000
++++ ncurses-6.1-20190630/misc/terminfo.src	2019-06-30 20:05:21.000000000 +0000
+@@ -6,8 +6,8 @@
+ # Report bugs and new terminal descriptions to
+ #	bug-ncurses@gnu.org
+ #
+-#	$Revision: 1.742 $
+-#	$Date: 2019/06/09 20:01:43 $
++#	$Revision: 1.749 $
++#	$Date: 2019/06/30 20:05:21 $
+ #
+ # 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
+@@ -495,9 +495,8 @@
+ 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[1A,
+ 	dch=\E[%p1%dP, dispc=\E=%p1%dg, ech=\E[%p1%dX,
+ 	hpa=\E[%i%p1%dG, hts=\EH, ich=\E[%p1%d@, ich1=\E[@,
+-	il=\E[%p1%dL, indn=\E[%p1%dS, rc=\E7, rin=\E[%p1%dT,
+-	rmam=\E[?7l, sc=\E7, smam=\E[?7h, tbc=\E[g,
+-	vpa=\E[%i%p1%dd,
++	il=\E[%p1%dL, rc=\E7, rmam=\E[?7l, sc=\E7, smam=\E[?7h,
++	tbc=\E[g, vpa=\E[%i%p1%dd, use=ecma+index,
+ 
+ #### ANSI/ECMA-48 terminals and terminal emulators
+ #
+@@ -612,12 +611,11 @@
+ 	cub=\E[%p1%dD, cud=\E[%p1%dB, cuf=\E[%p1%dC,
+ 	cuu=\E[%p1%dA, dch=\E[%p1%dP, dl=\E[%p1%dM,
+ 	ech=\E[%p1%dX, el1=\E[1K, hpa=\E[%i%p1%dG, ht=\E[I,
+-	ich=\E[%p1%d@, il=\E[%p1%dL, indn=\E[%p1%dS, kbs=^H,
+-	kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+-	kich1=\E[L, mc4=\E[4i, mc5=\E[5i, nel=\r\E[S,
+-	rep=%p1%c\E[%p2%{1}%-%db, rin=\E[%p1%dT, s0ds=\E(B,
+-	s1ds=\E)B, s2ds=\E*B, s3ds=\E+B, tbc=\E[3g,
+-	vpa=\E[%i%p1%dd, use=pcansi-m,
++	ich=\E[%p1%d@, il=\E[%p1%dL, kbs=^H, kcbt=\E[Z, kcub1=\E[D,
++	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kich1=\E[L, mc4=\E[4i,
++	mc5=\E[5i, nel=\r\E[S, rep=%p1%c\E[%p2%{1}%-%db,
++	s0ds=\E(B, s1ds=\E)B, s2ds=\E*B, s3ds=\E+B, tbc=\E[3g,
++	vpa=\E[%i%p1%dd, use=ecma+index, use=pcansi-m,
+ 
+ ansi+enq|ncurses extension for ANSI ENQ,
+ 	u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?%[;0123456789]c,
+@@ -1195,10 +1193,10 @@
+ 	     \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,
++	invis=\E[8m, nel=\EE,
+ 	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,
++	use=ecma+index, use=mach,
+ 
+ mach-gnu-color|Mach Console with ANSI color,
+ 	colors#8, pairs#64,
+@@ -1245,24 +1243,23 @@
+ 	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=\Eg,
+ 	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, ich=\E[%p1%d@,
+-	il=\E[%p1%dL, il1=\E[L, ind=\E[S, indn=\E[%p1%dS,
+-	invis=\E[8m, kb2=\E[G, kbs=^?, kcbt=\E[Z, kcub1=\EOD,
+-	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~,
+-	kend=\E[4~, kf1=\EOP, 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=\EOQ, kf20=\E[34~, kf3=\EOR, kf4=\EOS, kf5=\E[15~,
+-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
++	il=\E[%p1%dL, il1=\E[L, ind=\E[S, invis=\E[8m, kb2=\E[G,
++	kbs=^?, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
++	kcuu1=\EOA, kdch1=\E[3~, kend=\E[4~, kf1=\EOP, 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=\EOQ, kf20=\E[34~, kf3=\EOR, kf4=\EOS,
++	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+ 	khome=\E[1~, kich1=\E[2~, kmous=\E[M, knp=\E[6~, kpp=\E[5~,
+ 	kspd=^Z, nel=\r\n, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\E[T,
+-	rin=\E[%p1%dT, rmacs=\E[10m, rmir=\E[4l, rmso=\E[27m,
+-	rmul=\E[24m, rs1=\EM\E[?1000l, sc=\E7, setab=\E[4%p1%dm,
++	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,
+ 	sgr0=\E[0m, smacs=\E[11m, smir=\E[4h, smso=\E[7m,
+ 	smul=\E[4m, vpa=\E[%i%p1%dd, grbom=\E[>1l, gsbom=\E[>1h,
+-	use=ecma+italics,
++	use=ecma+index, use=ecma+italics,
+ 
+ #### QNX
+ #
+@@ -1377,7 +1374,7 @@
+ 	el=\E[K, el1=\E[1K\E[X, flash=\E[?5h$<200>\E[?5l,
+ 	fsl=\E[?6h\E8, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH,
+ 	ich=\E[%p1%d@, ich1=\E[1@, il=\E[%p1%dL, il1=\E[1L,
+-	ind=\E[S, indn=\E[%p1%dS, invis=\E[9m,
++	ind=\E[S, invis=\E[9m,
+ 	is2=\E>\E[?1l\E[?7h\E[0;10;39;49m, is3=\E(B\E)0,
+ 	kBEG=\ENn, kCAN=\E[s, kCMD=\E[t, kCPY=\ENs, kCRT=\ENt,
+ 	kDL=\ENv, kEXT=\ENw, kFND=\ENx, kHLP=\ENy, kHOM=\E[h,
+@@ -1401,9 +1398,9 @@
+ 	kopt=\ENk, kpp=\E[V, kref=\ENl, kres=\ENp, krfr=\ENg,
+ 	kri=\E[b, krpl=\ENr, krst=\ENj, ksav=\ENq, kslt=\E[T,
+ 	ktbc=\ENd, kund=\ENu, ll=\E[99H, nel=\EE, op=\E[39;49m,
+-	rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, ri=\E[T,
+-	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,
++	rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, ri=\E[T, 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,
+@@ -1413,7 +1410,7 @@
+ 	    %|%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,
++	tsl=\E7\E1;24r\E[?6l\E[25;%i%p1%dH, use=ecma+index,
+ #
+ qansi|QNX ansi with console writes,
+ 	daisy, xhpa, use=qansi-g,
+@@ -1475,23 +1472,23 @@
+ 	dch1=\E[P, dispc=\E[=%p1%dg, dl=\E[%p1%dM, dl1=\E[M,
+ 	ed=\E[m\E[J, el=\E[m\E[K, el1=\E[1K, home=\E[H, ht=^I,
+ 	hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L,
+-	ind=\E[S, indn=\E[%p1%dS, invis=\E[8m, kbeg=\E[E, kbs=^H,
+-	kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+-	kdch1=^?, kend=\E[F, kf1=\E[M, kf10=\E[V, kf11=\E[W,
+-	kf12=\E[X, kf13=\E[Y, kf15=\E[a, kf16=\E[b, kf17=\E[c,
+-	kf18=\E[d, kf19=\E[e, kf2=\E[N, kf20=\E[f, kf21=\E[g,
+-	kf22=\E[h, kf23=\E[i, kf24=\E[j, kf25=\E[k, kf26=\E[l,
+-	kf27=\E[m, kf28=\E[n, kf29=\E[o, kf3=\E[O, kf30=\E[p,
+-	kf31=\E[q, kf32=\E[r, kf33=\E[s, kf34=\E[t, kf35=\E[u,
+-	kf36=\E[v, kf37=\E[w, kf38=\E[x, kf39=\E[y, kf4=\E[P,
+-	kf40=\E[z, kf41=\E[@, kf42=\E[[, kf43=\E[\\, kf44=\E[],
+-	kf45=\E[\^, kf46=\E[_, kf47=\E[`, kf48=\E[{, kf5=\E[Q,
+-	kf6=\E[R, kf7=\E[S, kf8=\E[T, kf9=\E[U, khome=\E[H,
+-	kich1=\E[L, knp=\E[G, kpp=\E[I, op=\E[0;37;40m, rc=\E8,
+-	rev=\E[7m, ri=\E[T, rin=\E[%p1%dT, rmacs=\E[10m,
+-	rmam=\E[?7l, rmso=\E[m, rmul=\E[m, sc=\E7,
+-	setab=\E[4%p1%dm, setaf=\E[3%p1%dm, sgr0=\E[0;10m,
+-	smacs=\E[12m, smam=\E[?7h, smso=\E[7m, smul=\E[4m,
++	ind=\E[S, invis=\E[8m, kbeg=\E[E, kbs=^H, kcbt=\E[Z,
++	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=^?,
++	kend=\E[F, kf1=\E[M, kf10=\E[V, kf11=\E[W, kf12=\E[X,
++	kf13=\E[Y, kf15=\E[a, kf16=\E[b, kf17=\E[c, kf18=\E[d,
++	kf19=\E[e, kf2=\E[N, kf20=\E[f, kf21=\E[g, kf22=\E[h,
++	kf23=\E[i, kf24=\E[j, kf25=\E[k, kf26=\E[l, kf27=\E[m,
++	kf28=\E[n, kf29=\E[o, kf3=\E[O, kf30=\E[p, kf31=\E[q,
++	kf32=\E[r, kf33=\E[s, kf34=\E[t, kf35=\E[u, kf36=\E[v,
++	kf37=\E[w, kf38=\E[x, kf39=\E[y, kf4=\E[P, kf40=\E[z,
++	kf41=\E[@, kf42=\E[[, kf43=\E[\\, kf44=\E[], kf45=\E[\^,
++	kf46=\E[_, kf47=\E[`, kf48=\E[{, kf5=\E[Q, kf6=\E[R,
++	kf7=\E[S, kf8=\E[T, kf9=\E[U, khome=\E[H, kich1=\E[L,
++	knp=\E[G, kpp=\E[I, op=\E[0;37;40m, rc=\E8, rev=\E[7m,
++	ri=\E[T, rmacs=\E[10m, rmam=\E[?7l, rmso=\E[m, rmul=\E[m,
++	sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
++	sgr0=\E[0;10m, smacs=\E[12m, smam=\E[?7h, smso=\E[7m,
++	smul=\E[4m, use=ecma+index,
+ scoansi-new|SCO Extended ANSI standard crt (5.0.6),
+ 	km,
+ 	civis=\E[=0c, cnorm=\E[=1c, csr=\E[%i%p1%d;%p2%dr,
+@@ -1674,18 +1671,19 @@
+ 	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, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@,
+-	il=\E[%p1%dL, il1=\E[L, ind=\ED, indn=\E[%p1%dS,
++	il=\E[%p1%dL, il1=\E[L, ind=\ED,
+ 	is1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, kbs=^?,
+ 	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+ 	kdch1=\E[3~, kf1=\E[17~, kf2=\E[18~, kf3=\E[19~,
+ 	kf4=\E[20~, kf5=\E[21~, kf6=\E[23~, kf7=\E[24~, kf8=\E[25~,
+ 	khome=\E[1~, kich1=\E[2~, kll=\E[4~, knp=\E[6~, kpp=\E[5~,
+ 	nel=\EE, rc=\E8, rev=\E[7m, rf=/usr/share/tabset/vt100,
+-	ri=\EM, rin=\E[%p1%dT, rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l,
++	ri=\EM, rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l,
+ 	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
+ 	rs1=\Ec\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, 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,
++	use=ecma+index,
+ 
+ #	NetBSD/FreeBSD vt220 terminal emulator console (pc keyboard & monitor)
+ #	termcap entries for pure VT220-Emulation and 25, 28, 35, 40, 43 and
+@@ -1890,15 +1888,15 @@
+ 	dch=\E[%p1%dP, dch1=\E[P, dim=\E[30;1m, dl=\E[%p1%dM,
+ 	dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
+ 	home=\E[H, hpa=\E[%i%p1%d`, ht=^I, ich=\E[%p1%d@,
+-	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\E[S,
+-	indn=\E[%p1%dS, kb2=\E[E, kbs=^H, kcbt=\E[Z, kcub1=\E[D,
+-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=^?, kend=\E[F,
+-	kf1=\E[M, kf10=\E[V, kf11=\E[W, kf12=\E[X, kf2=\E[N,
+-	kf3=\E[O, kf4=\E[P, kf5=\E[Q, kf6=\E[R, kf7=\E[S, kf8=\E[T,
+-	kf9=\E[U, khome=\E[H, kich1=\E[L, 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, setb=\E[4%p1%dm,
+-	setf=\E[3%p1%dm, sgr0=\E[m, smso=\E[7m, vpa=\E[%i%p1%dd,
++	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\E[S, kb2=\E[E,
++	kbs=^H, kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
++	kcuu1=\E[A, kdch1=^?, kend=\E[F, kf1=\E[M, kf10=\E[V,
++	kf11=\E[W, kf12=\E[X, kf2=\E[N, kf3=\E[O, kf4=\E[P, kf5=\E[Q,
++	kf6=\E[R, kf7=\E[S, kf8=\E[T, kf9=\E[U, khome=\E[H,
++	kich1=\E[L, knp=\E[G, kpp=\E[I, nel=\E[E, op=\E[x, rc=\E8,
++	rev=\E[7m, ri=\E[T, rmso=\E[m, rs2=\E[x\E[m\Ec, sc=\E7,
++	setb=\E[4%p1%dm, setf=\E[3%p1%dm, sgr0=\E[m, smso=\E[7m,
++	vpa=\E[%i%p1%dd, use=ecma+index,
+ 
+ #### FreeBSD console entries
+ #
+@@ -1939,25 +1937,25 @@
+ 	cvvis=\E[=1C, dch=\E[%p1%dP, dch1=\E[P, dim=\E[30;1m,
+ 	dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
+ 	home=\E[H, hpa=\E[%i%p1%d`, ht=^I, ich=\E[%p1%d@,
+-	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\E[S,
+-	indn=\E[%p1%dS, kb2=\E[E, kbs=^H, kcbt=\E[Z, kcub1=\E[D,
+-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=^?, kend=\E[F,
+-	kf1=\E[M, kf10=\E[V, kf11=\E[W, kf12=\E[X, kf13=\E[Y,
+-	kf14=\E[Z, kf15=\E[a, kf16=\E[b, kf17=\E[c, kf18=\E[d,
+-	kf19=\E[e, kf2=\E[N, kf20=\E[f, kf21=\E[g, kf22=\E[h,
+-	kf23=\E[i, kf24=\E[j, kf25=\E[k, kf26=\E[l, kf27=\E[m,
+-	kf28=\E[n, kf29=\E[o, kf3=\E[O, kf30=\E[p, kf31=\E[q,
+-	kf32=\E[r, kf33=\E[s, kf34=\E[t, kf35=\E[u, kf36=\E[v,
+-	kf37=\E[w, kf38=\E[x, kf39=\E[y, kf4=\E[P, kf40=\E[z,
+-	kf41=\E[@, kf42=\E[[, kf43=\E[\\, kf44=\E[], kf45=\E[\^,
+-	kf46=\E[_, kf47=\E[`, kf48=\E[{, kf5=\E[Q, kf6=\E[R,
+-	kf7=\E[S, kf8=\E[T, kf9=\E[U, khome=\E[H, kich1=\E[L,
+-	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,
++	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\E[S, kb2=\E[E,
++	kbs=^H, kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
++	kcuu1=\E[A, kdch1=^?, kend=\E[F, kf1=\E[M, kf10=\E[V,
++	kf11=\E[W, kf12=\E[X, kf13=\E[Y, kf14=\E[Z, kf15=\E[a,
++	kf16=\E[b, kf17=\E[c, kf18=\E[d, kf19=\E[e, kf2=\E[N,
++	kf20=\E[f, kf21=\E[g, kf22=\E[h, kf23=\E[i, kf24=\E[j,
++	kf25=\E[k, kf26=\E[l, kf27=\E[m, kf28=\E[n, kf29=\E[o,
++	kf3=\E[O, kf30=\E[p, kf31=\E[q, kf32=\E[r, kf33=\E[s,
++	kf34=\E[t, kf35=\E[u, kf36=\E[v, kf37=\E[w, kf38=\E[x,
++	kf39=\E[y, kf4=\E[P, kf40=\E[z, kf41=\E[@, kf42=\E[[,
++	kf43=\E[\\, kf44=\E[], kf45=\E[\^, kf46=\E[_, kf47=\E[`,
++	kf48=\E[{, kf5=\E[Q, kf6=\E[R, kf7=\E[S, kf8=\E[T, kf9=\E[U,
++	khome=\E[H, kich1=\E[L, knp=\E[G, kpp=\E[I, nel=\E[E,
++	op=\E[x, rc=\E8, rev=\E[7m, ri=\E[T, 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,
+-	sgr0=\E[m, smso=\E[7m, vpa=\E[%i%p1%dd,
++	sgr0=\E[m, smso=\E[7m, vpa=\E[%i%p1%dd, use=ecma+index,
+ 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~
+@@ -3537,14 +3535,14 @@
+ # 2018/01/21: found xterm+sm+1006 did not work with version 3.1.5
+ # 2018/05/19: xterm+sm+1006 seems to work with 3.1.6beta -TD
+ iTerm2.app|iterm2|terminal emulator for Mac OS X,
+-	blink=\E[5m, cbt=\E[Z, dim=\E[2m, indn=\E[%p1%dS,
+-	kEND=\E[1;2F, kHOM=\E[1;2H, ka1@, ka3@, kb2@, kc1@, kc3@, kent@,
+-	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~, kind=\E[1;2B, kri=\E[1;2A,
+-	nel=\EE, op=\E[39;49m, rin=\E[%p1%dT, rmso=\E[27m,
+-	rmul=\E[24m, rs2=\E[!p\E[?3;4l\E[4l\E>\E[?1000l,
++	blink=\E[5m, cbt=\E[Z, dim=\E[2m, kEND=\E[1;2F,
++	kHOM=\E[1;2H, ka1@, ka3@, kb2@, kc1@, kc3@, kent@, 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~, kind=\E[1;2B, kri=\E[1;2A, nel=\EE,
++	op=\E[39;49m, rmso=\E[27m, rmul=\E[24m,
++	rs2=\E[!p\E[?3;4l\E[4l\E>\E[?1000l,
+ 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
+ 	    %p5%t;2%;m%?%p9%t\016%e\017%;,
+ 	kDN3=\E\E[B, kDN4=\E[1;10B, kDN5=\E[1;5B, kDN6=\E[1;6B,
+@@ -3555,8 +3553,8 @@
+ 	kLFT5=\E[1;5D, kLFT6=\E[1;6D, kNXT3=\E\E[6~,
+ 	kPRV3=\E\E[5~, kRIT3=\E\E[C, kRIT4=\E[1;10C,
+ 	kRIT5=\E[1;5C, kRIT6=\E[1;6C, kUP3=\E\E[A, kUP4=\E[1;10A,
+-	kUP5=\E[1;5A, kUP6=\E[1;6A, use=xterm+alt+title,
+-	use=ecma+italics, use=iterm,
++	kUP5=\E[1;5A, kUP6=\E[1;6A, use=ecma+index,
++	use=xterm+alt+title, use=ecma+italics, use=iterm,
+ 
+ # xnuppc - Darwin PowerPC Console (a.k.a. "darwin")
+ #
+@@ -3882,7 +3880,7 @@
+ 	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$<100/>\E[?5l,
+ 	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, il=\E[%p1%dL,
+-	il1=\E[L, ind=\n, indn=\E[%p1%dS,
++	il1=\E[L, ind=\n,
+ 	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,
+@@ -3890,10 +3888,9 @@
+ 	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+ 	kdch1=\E[3~, kend=\E[4~, khome=\E[1~, kich1=\E[2~,
+ 	kind=\E[B, knp=\E[6~, kpp=\E[5~, kri=\E[A, kspd=^Z, nel=\r\n,
+-	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, rmkx=\E[?1l\E>, rmpch=\E[10m, rmso=\E[27m,
+-	rmul=\E[24m,
++	oc=\E]R, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
++	rmam=\E[?7l, 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,
+@@ -3902,8 +3899,8 @@
+ 	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,
+-	use=xterm+sm+1006, use=putty+fnkeys, use=vt102+enq,
+-	use=xterm+sl,
++	use=ecma+index, use=xterm+sm+1006, 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,
+@@ -4160,6 +4157,8 @@
+ teraterm|Tera Term,
+ 	use=teraterm4.97,
+ 
++#### Command prompt
++
+ # Tested with WinNT 4.0, the telnet application assumes the screensize is
+ # 25x80.  This entry uses the 'Terminal' font, to get line-drawing characters.
+ #
+@@ -4224,6 +4223,79 @@
+ ms-vt-utf8|vt-utf8|UTF-8 flavor of vt100+,
+ 	use=ms-vt100+,
+ 
++# Windows 10 1903
++# Version 0.2.1715.0
++# The task manager shows this as "OpenConsole.exe", which differs
++# from the "Windows Command Processor" used for the command-prompt.
++#
++# The settings dialog does not work (unless the end user expects to open
++# profiles.json in Visual Studio).  There is no documentation, of course.
++#
++# Testing via an ssh connection, using openssh:
++# - the program sets TERM to cygwin if the tab is set to PowerShell,
++#   and to xterm-256color if "Legacy".  However, in the latter, more tests
++#   fail in vttest, which does not pay attention to TERM.
++# vttest:
++# - menu 1 (tests for cursor movement) misbehaves like command-prompt
++# - does not flush response to primary DA, leaving a ^M on the end when
++#   The PowerShell tab is used.  Both the "Legacy" tab and the command-prompt
++#   work properly in this test.
++# - in the generic VT100 tests, there are problems with character sets.
++# - outside of the generic VT100 tests, the program does poorly because most
++#   of the features are missing.
++# - ECH does not work properly
++# - a few generic xterm features are supported (set window title), but
++#   others are missing (such as the mouse).
++# - the cursor visible/invisible works in the PowerShell tab, not in "Legacy"
++# tack: 
++# - blink, dim, bold, invis, protect do not work
++# - bce works (but per vttest, with ED, EL, not BCE)
++# - does not support keypad application mode
++# - implements most of the xterm modified keys; sometimes modifiers are ignored
++#   or simply incorrect
++# - sends escape+key rather than implementing meta mode
++# other:
++# - color palette cannot be altered
++ms-terminal|Windows10 terminal,
++	npc,
++	rmkx=\E[?1l, rmm@, smkx=\E[?1h, smm@, use=xterm+256setaf,
++	use=xterm+pcfkeys, use=xterm-basic,
++
++#### Visual Studio
++# Visual Studio Code 1.35.1
++#
++# This sets TERM to xterm-256color, which is a little more successful than
++# Windows Terminal.
++#
++# vttest:
++# - menu 1 (cursor movement) has problems with wrapping
++# - claims to be a VT100 with AVO, but copies xterm #276's secondary response
++# - menu 8 (insert/delete char/line) has problem with delete-character
++# - like Windows Terminal, fails the ECH test: neither supports DECALN
++#   However, the bce test with ECH works.
++# - does not support keypad application mode
++# - supports most xterm mode controls (except DEC Locator Events)
++# - REP, SL/SL do not work, but SD/SU work.
++# - the alternate-screen tests fail because it does not support DECALN
++# - window modify/report is not supported
++# - supports some VT320 presentation reports
++# tack:
++# - does not support blinking text
++# - implements most of the xterm modified keys, with some exceptions:
++#   - pageup/pagedown do not send escapes
++#   - alt cursor left/right send escape-b and escape-f
++# - sends UTF-8 like xterm for meta mode
++# other:
++# - mouse mode is not reset by reset-sequence
++# - supports italics and dim, but not cross-out or double-underline
++# - color-palette cannot be changed
++vscode|Visual Studio Code terminal,
++	npc,
++	kcbt=\E[Z, rmkx=\E[?1l, smkx=\E[?1h, use=xterm+256setaf,
++	use=ecma+index, use=xterm+sm+1006, use=xterm+pcfkeys,
++	use=xterm-basic, use=xterm-basic,
++vscode-direct|Visual Studio Code with direct-colors,
++	use=xterm+indirect, use=vscode,
+ 
+ ######## X TERMINAL EMULATORS
+ #### XTERM
+@@ -4392,10 +4464,10 @@
+ 	kf38=\EO6Q, kf39=\EO6R, kf40=\EO6S, 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~, khome=\EOH, rmcup=\E[?1049l,
++	kf48=\E[24;6~, khome=\EOH,
+ 	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,
++	use=xterm+alt1049, use=xterm-xf86-v333,
+ 
+ # This version was released in XFree86 4.3.
+ xterm-xf86-v43|xterm terminal emulator (XFree86 4.3 Window System),
+@@ -4408,8 +4480,8 @@
+ 
+ # This version was released in XFree86 4.4.
+ xterm-xf86-v44|xterm terminal emulator (XFree86 4.4 Window System),
+-	cnorm=\E[?12l\E[?25h, cvvis=\E[?12;25h, indn=\E[%p1%dS,
+-	rin=\E[%p1%dT, use=xterm-xf86-v43,
++	cnorm=\E[?12l\E[?25h, cvvis=\E[?12;25h, use=ecma+index,
++	use=xterm-xf86-v43,
+ 
+ xterm-xfree86|xterm terminal emulator (XFree86),
+ 	use=xterm-xf86-v44,
+@@ -4417,10 +4489,10 @@
+ # This version reflects the current xterm features.
+ xterm-new|modern xterm terminal emulator,
+ 	npc,
+-	indn=\E[%p1%dS, kcbt=\E[Z, kent=\EOM, rin=\E[%p1%dT,
+-	use=ansi+rep, use=ecma+strikeout, use=xterm+keypad,
+-	use=vt420+lrmm, use=xterm+sm+1006, use=xterm+pcfkeys,
+-	use=xterm+tmux, use=xterm-basic,
++	kcbt=\E[Z, kent=\EOM, use=ecma+index, use=ansi+rep,
++	use=ecma+strikeout, use=xterm+keypad, use=vt420+lrmm,
++	use=xterm+sm+1006, use=xterm+pcfkeys, use=xterm+tmux,
++	use=xterm-basic,
+ 
+ # This fragment is for people who cannot agree on what the backspace key
+ # should send.
+@@ -5472,7 +5544,7 @@
+ vte-2014|VTE 0.35.1,
+ 	ncv@,
+ 	cbt=\E[Z, el1=\E[1K, flash=\E[?5h$<100/>\E[?5l,
+-	ich=\E[%p1%d@, indn=\E[%p1%dS, kent=\EOM, rin=\E[%p1%dT,
++	ich=\E[%p1%d@, kent=\EOM, use=ecma+index,
+ 	use=xterm+sm+1006, use=xterm+pcfkeys, use=vte-2012,
+ 
+ # As of January 2018, this was the  most recent release,
+@@ -5536,19 +5608,19 @@
+ 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
+ 	dch=\E[%p1%dP, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
+ 	flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
+-	ht=^I, hts=\EH, ind=\n, indn=\E[%p1%dS, invis=\E[8m,
++	ht=^I, hts=\EH, ind=\n, invis=\E[8m,
+ 	is2=\E[!p\E[?3;4l\E[4l\E>, kb2=\EOE, kbs=^?, kcbt=\E[Z,
+-	kent=\EOM, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM,
+-	rin=\E[%p1%dT, rmacs=\E(B, rmam=\E[?7l, rmcup=\E[?1049l,
+-	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
+-	rs2=\E[!p\E[?3;4l\E[4l\E>, sc=\E7,
++	kent=\EOM, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM, rmacs=\E(B,
++	rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
++	rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>, sc=\E7,
+ 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
+ 	    %t;7%;%?%p7%t;8%;m,
+-	sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smcup=\E[?1049h,
+-	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+-	vpa=\E[%i%p1%dd, use=ansi+idc, use=ansi+idl,
+-	use=ansi+enq, use=ecma+italics, use=xterm+256color,
+-	use=ecma+color, use=xterm+pcfkeys, use=xterm+sl-twm,
++	sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smkx=\E[?1h\E=,
++	smso=\E[7m, smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd,
++	use=xterm+alt1049, use=ecma+index, use=ansi+idc,
++	use=ansi+idl, use=ansi+enq, use=ecma+italics,
++	use=xterm+256color, use=ecma+color, use=xterm+pcfkeys,
++	use=xterm+sl-twm,
+ 
+ #### Other GNOME
+ # Multi-Gnome-Terminal 1.6.2
+@@ -5556,7 +5628,7 @@
+ # This does not use VTE, and does have different behavior (compare xfce and
+ # gnome).
+ mgt|Multi GNOME Terminal,
+-	indn=\E[%p1%dS, rin=\E[%p1%dT, use=xterm-xf86-v333,
++	use=ecma+index, use=xterm-xf86-v333,
+ 
+ #### KDE
+ # This is kvt 0-18.7, shipped with Redhat 6.0 (though whether it supports bce
+@@ -5620,16 +5692,16 @@
+ 	ncv@,
+ 	bel@, blink=\E[5m, civis=\E[?25l, cnorm=\E[?25h, dim=\E[2m,
+ 	ech=\E[%p1%dX, flash=\E[?5h$<100/>\E[?5l,
+-	hpa=\E[%i%p1%dG, indn=\E[%p1%dS, invis=\E[8m, kbs=^?,
+-	kdch1=\E[3~, kend=\E[4~, kf1@, kf10@, kf11@, kf12@, kf13@, kf14@,
+-	kf15@, kf16@, kf17@, kf18@, kf19@, kf2@, kf20@, kf3@, kf4@, kf5@, kf6@,
+-	kf7@, kf8@, kf9@, kfnd@, khome=\E[1~, kslt@, rin=\E[%p1%dT,
+-	rmam=\E[?7l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
++	hpa=\E[%i%p1%dG, invis=\E[8m, kbs=^?, kdch1=\E[3~,
++	kend=\E[4~, kf1@, kf10@, kf11@, kf12@, kf13@, kf14@, kf15@, kf16@,
++	kf17@, kf18@, kf19@, kf2@, kf20@, kf3@, kf4@, kf5@, kf6@, kf7@, kf8@,
++	kf9@, kfnd@, khome=\E[1~, kslt@, rmam=\E[?7l, rmso=\E[27m,
++	rmul=\E[24m, rs1=\Ec,
+ 	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%;%?
+ 	    %p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[0m\017, smam=\E[?7h, vpa=\E[%i%p1%dd,
+-	use=xterm+sm+1006, use=ecma+strikeout,
++	use=ecma+index, use=xterm+sm+1006, use=ecma+strikeout,
+ 	use=ecma+italics, use=ecma+color, use=xterm-r6,
+ 
+ # The keytab feature was introduced in 0.9.12 (February 2000) with "linux" and
+@@ -5785,23 +5857,24 @@
+ 	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=,
+ 	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=\n, indn=\E[%p1%dS,
++	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\n,
+ 	is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>, kbs=^?,
+ 	kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+ 	kdch1=\E[3~, kend=\EOF, kent=\EOM, kfnd=\E[1~, khome=\EOH,
+ 	kich1=\E[2~, kind=\EO1;2B, kmous=\E[M, knp=\E[6~,
+ 	kpp=\E[5~, kri=\EO1;2A, kslt=\E[4~, mc0=\E[i, nel=\EE,
+-	op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM, rin=\E[%p1%dT,
+-	rmacs=\E(B, rmam=\E[?7l, rmcup=\E[?1049l, rmir=\E[4l,
+-	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
++	op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM, rmacs=\E(B,
++	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m,
++	rmul=\E[24m, rs1=\Ec,
+ 	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%;,
+-	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,
+-	vpa=\E[%i%p1%dd, use=mlterm+pcfkeys, use=xterm+r6f2,
++	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,
++	u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?1;2c, u9=\E[c,
++	vpa=\E[%i%p1%dd, use=xterm+alt1049, use=ecma+index,
++	use=mlterm+pcfkeys, use=xterm+r6f2,
+ 
+ # The insert/delete/home/end keys do not respond to modifiers because mlterm
+ # looks in its termcap to decide which string to send.  If it used terminfo
+@@ -6298,14 +6371,13 @@
+ 	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, home=\E[H, hpa=\E[%i%p1%d`, ht=^I, ich1=,
+-	il=\E[%p1%dL, il1=\E[L, ind=\E[S, indn=\E[%p1%dS,
+-	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,
++	il=\E[%p1%dL, il1=\E[L, ind=\E[S, invis=\E[8m,
++	is2=\E)0\017, kbs=^H, nel=\EE, rev=\E[7m, ri=\E[T, 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%;,
+ 	sgr0=\E[m\017, smacs=^N, smir=\E[4h, smso=\E[7m,
+-	smul=\E[4m, vpa=\E[%i%p1%dd,
++	smul=\E[4m, vpa=\E[%i%p1%dd, use=ecma+index,
+ # mterm normally sets $TERM to "mterm"
+ mterm|mouse-sun|Der Mouse term,
+ 	am, bw, mir,
+@@ -6329,23 +6401,22 @@
+ 	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, enacs=\E(B\E)0,
+ 	home=\E[H, hpa=\E[%i%p1%d`, ht=^I, ich1=, il=\E[%p1%dL,
+-	il1=\E[L, ind=\E[S, indn=\E[%p1%dS, invis=\E[8m,
+-	is2=\E)0\E[r\017, kbs=^H, kcub1=\EOD, kcud1=\EOB,
+-	kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kf1=\E[11~,
+-	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[12~, kf20=\E[34~,
+-	kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~,
+-	kf8=\E[19~, kf9=\E[20~, kfnd=\E[1~, kich1=\E[2~, knp=\E[6~,
+-	kpp=\E[5~, kslt=\E[4~, nel=\EE, op=\E[0m, rc=\E8, rev=\E[7m,
+-	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,
++	il1=\E[L, ind=\E[S, invis=\E[8m, is2=\E)0\E[r\017, kbs=^H,
++	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
++	kdch1=\E[3~, kf1=\E[11~, 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[12~, kf20=\E[34~, kf3=\E[13~, kf4=\E[14~,
++	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
++	kfnd=\E[1~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~, kslt=\E[4~,
++	nel=\EE, op=\E[0m, rc=\E8, rev=\E[7m, ri=\E[T, 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%;,
+ 	sgr0=\E[m\017, 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,
++	u7=\E[6n, vpa=\E[%i%p1%dd, use=ecma+index,
+ 
+ #### VWM
+ # http://vwm.sourceforge.net/
+@@ -6368,12 +6439,12 @@
+ 	kf12=\E[23~, kf2=\E[[B, kf3=\E[[C, kf4=\E[[D, kf5=\E[[E,
+ 	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+ 	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,
++	rmam=\E[?7l, rs1=\E[H\E[J\E[m\Ec, setab=\E[4%p1%dm,
++	setaf=\E[3%p1%dm,
+ 	sgr=\E[0;10%?%p1%t;3%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5
+ 	    %t;2%;%?%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,
++	sgr0=\E[0;10m, smacs=\E[11m, smam=\E[?7h, smso=\E[3m,
++	smul=\E[4m, use=xterm+alt1049,
+ 
+ #### MGR
+ #
+@@ -6480,16 +6551,16 @@
+ 	dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
+ 	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=\n, indn=\E[%p1%dS,
+-	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=^?, 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~,
++	il=\E[%p1%dL, il1=\E[L, ind=\n, 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=^?, 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,
+@@ -6508,20 +6579,20 @@
+ 	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~, mc0=\E[i, mc4=\E[4i,
+ 	mc5=\E[5i, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM,
+-	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,
++	rmacs=\E(B, 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%;%?%p7%t;8%;m,
+-	sgr0=\E[0m, smacs=\E(0, 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,
+-	vpa=\E[%i%p1%dd, Se=\E[2 q, Ss=\E[%p1%d q, use=xterm+sl,
+-	use=ecma+italics,
++	sgr0=\E[0m, smacs=\E(0, 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, vpa=\E[%i%p1%dd, Se=\E[2 q,
++	Ss=\E[%p1%d q, use=ecma+index, use=xterm+alt1049,
++	use=xterm+sl, use=ecma+italics,
+ #
+ # st-0.1.1
+ #
+@@ -6551,17 +6622,18 @@
+ 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
+ 	dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K,
+ 	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, ich=\E[%p1%d@,
+-	il=\E[%p1%dL, il1=\E[L, ind=\n, indn=\E[%p1%dS, kbs=^?,
+-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+-	kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~,
+-	kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
+-	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
++	il=\E[%p1%dL, il1=\E[L, ind=\n, kbs=^?, kcub1=\E[D,
++	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~,
++	kend=\E[4~, kf1=\EOP, kf10=\E[21~, kf11=\E[23~,
++	kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[15~,
++	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+ 	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,
+ 	sgr0=\E[0m, smacs=\E(0, smso=\E[7m, smul=\E[4m,
++	use=ecma+index,
+ st-16color|stterm-16color|simpleterm with 16-colors,
+ 	use=ibm+16color, use=st,
+ # 256 colors "works", but when running xterm's test-scripts, some garbage is
+@@ -6645,9 +6717,10 @@
+ #	CBT, CHT, HPR, CNL,CPL, VPR do not work
+ #
+ # removed the cancel for "hs", removed cbt, invis, corrected sgr -TD
++# use xterm+256setaf, etc -TD
+ terminator|Terminator no line wrap,
+ 	bce, eo, mir, msgr, xenl, xon,
+-	colors#0x100, cols#80, it#8, lines#24, lm#0, pairs#0x10000,
++	cols#80, it#8, lines#24, lm#0,
+ 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ 	bold=\E[1m, civis=\E[?25l, clear=\E[H\E[2J,
+ 	cnorm=\E[?25h, cr=\r, csr=\E[%i%p1%d;%p2%dr,
+@@ -6657,24 +6730,23 @@
+ 	dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K,
+ 	el1=\E[1K, enacs=\E(B\E)0, flash=^G, home=\E[H,
+ 	hpa=\E[%i%p1%dG, ht=^I, hts=\EH, il=\E[%p1%dL, il1=\E[L,
+-	ind=\n, indn=\E[%p1%dS, is1=\E[?47l\E=\E[?1l,
++	ind=\n, 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=^?,
+ 	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+ 	kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~,
+ 	kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~,
+ 	kf15=\E[28~, kf16=\E[29~, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
+ 	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+-	khome=\E[1~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
+-	op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM, rin=\E[%p1%dT,
+-	ritm=\E[23m, rmacs=\E(B, rmcup=\E[?1049l, rmir=\E[4l,
+-	rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
+-	rs2=\E[!p\E[?3;4l\E[4l\E>, s0ds=\E(B, s1ds=\E(0, sc=\E7,
+-	setab=\E[48;5;%p1%dm, setaf=\E[38;5;%p1%dm,
++	khome=\E[1~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~, rc=\E8,
++	rev=\E[7m, ri=\EM, rmacs=\E(B, rmir=\E[4l, rmso=\E[27m,
++	rmul=\E[24m, rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>,
++	s0ds=\E(B, s1ds=\E(0, sc=\E7,
+ 	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p5%t;2%;%?%p1%p3%|%t;7
+ 	    %;m%?%p9%t\E(0%e\E(B%;,
+-	sgr0=\E[m\E(B, sitm=\E[3m, smacs=\E(0, smcup=\E[?1049h,
+-	smir=\E[4h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+-	tsl=\E]2;%p1, vpa=\E[%i%p1%dd, use=xterm+sl-twm,
++	sgr0=\E[m\E(B, smacs=\E(0, smir=\E[4h, smso=\E[7m,
++	smul=\E[4m, tbc=\E[3g, tsl=\E]2;%p1, vpa=\E[%i%p1%dd,
++	use=ecma+italics, use=ecma+index, use=xterm+256setaf,
++	use=xterm+sl-twm, use=xterm+alt1049,
+ 
+ #### TERMINOLOGY
+ # https://www.enlightenment.org/about-terminology
+@@ -6819,8 +6891,8 @@
+ # removed ecma+strikeout, not implemented -TD
+ alacritty+common|base fragment for alacritty,
+ 	npc,
+-	ech@, indn=\E[%p1%dS, kb2=\EOE, kbs=^H, kcbt=\E[Z, kent=\EOM,
+-	rin=\E[%p1%dT, Se=\E[0 q, use=xterm-basic, use=xterm+app,
++	ech@, kb2=\EOE, kbs=^H, kcbt=\E[Z, kent=\EOM, Se=\E[0 q,
++	use=ecma+index, use=xterm-basic, use=xterm+app,
+ 	use=ansi+rep, use=xterm+sm+1006, use=xterm+tmux,
+ 	use=ecma+italics, use=xterm+pce2, use=xterm+pcc2,
+ 	use=xterm+pcf2,
+@@ -6917,28 +6989,28 @@
+ 	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
+ 	flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
+ 	ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L,
+-	ind=\n, indn=\E[%p1%dS, kbs=^?, kcbt=\E[Z, kcub1=\EOD,
+-	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kend=\EOF,
+-	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~, kf4=\EOS, kf5=\E[15~, kf6=\E[17~,
+-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\EOH,
+-	kich1=\E[2~, kind=\E[1;2B, kmous=\E[M, knp=\E[6~,
+-	kpp=\E[5~, kri=\E[1;2A, op=\E[39;49m, rc=\E8, rev=\E[7m,
+-	ri=\EM, rin=\E[%p1%dT, rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l,
++	ind=\n, kbs=^?, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB,
++	kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kend=\EOF, 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~, kf4=\EOS,
++	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
++	khome=\EOH, kich1=\E[2~, kind=\E[1;2B, kmous=\E[M,
++	knp=\E[6~, kpp=\E[5~, kri=\E[1;2A, op=\E[39;49m, rc=\E8,
++	rev=\E[7m, ri=\EM, rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l,
+ 	rmkx=\E[?1l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec, sc=\E7,
+ 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
+ 	    %t;7%;;m,
+ 	sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smir=\E[4h,
+ 	smkx=\E[?1h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+-	vpa=\E[%i%p1%dd, use=xterm+sl-twm, use=xterm+pce2,
+-	use=xterm+pcc2, use=ecma+italics, use=xterm+alt1049,
++	vpa=\E[%i%p1%dd, use=ecma+index, use=xterm+sl-twm,
++	use=xterm+pce2, use=xterm+pcc2, use=ecma+italics,
++	use=xterm+alt1049,
+ 
+ ######## UNIX VIRTUAL TERMINALS, VIRTUAL CONSOLES, AND TELNET CLIENTS
+ #
+@@ -7104,20 +7176,20 @@
+ 	dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K,
+ 	enacs=\E(B\E)0, flash=\Eg, home=\E[H, hpa=\E[%i%p1%dG,
+ 	ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L,
+-	ind=\n, indn=\E[%p1%dS, is2=\E)0, kbs=^H, kcbt=\E[Z,
+-	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+-	kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~,
+-	kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
+-	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+-	khome=\E[1~, kich1=\E[2~, kmous=\E[M, knp=\E[6~, kpp=\E[5~,
+-	nel=\EE, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
+-	rmcup=\E[?1049l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[23m,
++	ind=\n, is2=\E)0, kbs=^H, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB,
++	kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kend=\E[4~, kf1=\EOP,
++	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR,
++	kf4=\EOS, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
++	kf9=\E[20~, khome=\E[1~, kich1=\E[2~, kmous=\E[M,
++	knp=\E[6~, kpp=\E[5~, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM,
++	rmacs=^O, 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%;,
+-	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,
+-	vpa=\E[%i%p1%dd, E0=\E(B, S0=\E(%p1%c, use=ecma+color,
++	sgr0=\E[m\017, smacs=^N, smir=\E[4h, smkx=\E[?1h\E=,
++	smso=\E[3m, smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd,
++	E0=\E(B, S0=\E(%p1%c, use=ecma+index, use=xterm+alt1049,
++	use=ecma+color,
+ # The bce and status-line entries are from screen 3.9.13 (and require some
+ # changes to .screenrc).
+ screen-bce|VT 100/ANSI X3.64 virtual terminal with bce,
+@@ -8307,18 +8379,18 @@
+ 	cvvis=\E[2v, 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,
+ 	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, ich=\E[%p1%d@,
+-	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\E[S,
+-	indn=\E[%p1%dS, invis=\E[8m, kbs=^H, kcub1=\E[D,
+-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~,
+-	kend=\E[4~, kf1=\E[[A, kf10=\E[21~, kf11=\E[23~,
+-	kf12=\E[24~, kf2=\E[[B, kf3=\E[[C, kf4=\E[[D, kf5=\E[[E,
+-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
++	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\E[S, invis=\E[8m,
++	kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
++	kdch1=\E[3~, kend=\E[4~, kf1=\E[[A, kf10=\E[21~,
++	kf11=\E[23~, kf12=\E[24~, kf2=\E[[B, 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~, knp=\E[6~, kpp=\E[5~, nel=\r\n,
+-	op=\E[37;40m, rev=\E[7m, ri=\E[T, rin=\E[%p1%dT, rmso=\E[m,
++	op=\E[37;40m, rev=\E[7m, ri=\E[T, 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,
+ 	sgr0=\E[m, smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd,
++	use=ecma+index,
+ 
+ djgpp203|Entry for DJGPP 2.03,
+ 	OTbs, am,
+@@ -8336,14 +8408,14 @@
+ 	cuu1=\E[A, cvvis=\E[2v, dch=\E[%p1%dP, dch1=\E[P,
+ 	dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
+ 	home=\E[H, ht=^I, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL,
+-	il1=\E[L, ind=\E[S, indn=\E[%p1%dS, invis=\E[8m, kbs=^H,
+-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+-	kdch1=\E[3~, kf0=\E[21~, kf1=\E[[A, kf10=\E[21~, kf2=\E[[B,
+-	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~,
+-	kll=\E[4~, knp=\E[6~, kpp=\E[5~, nel=\r\n, rev=\E[7m,
+-	ri=\E[T, rin=\E[%p1%dT, rmso=\E[m, setab=\E[4%p1%dm,
+-	setaf=\E[3%p1%dm, sgr0=\E[m, smso=\E[7m, smul=\E[4m,
++	il1=\E[L, ind=\E[S, invis=\E[8m, kbs=^H, kcub1=\E[D,
++	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~,
++	kf0=\E[21~, kf1=\E[[A, kf10=\E[21~, kf2=\E[[B, 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~, kll=\E[4~, knp=\E[6~,
++	kpp=\E[5~, nel=\r\n, rev=\E[7m, ri=\E[T, rmso=\E[m,
++	setab=\E[4%p1%dm, setaf=\E[3%p1%dm, sgr0=\E[m,
++	smso=\E[7m, smul=\E[4m, use=ecma+index,
+ 
+ #### U/Win
+ 
+@@ -8466,26 +8538,25 @@
+ 	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,
+ 	home=\E[H, ht=^I, il=\E[%p1%dL, il1=\E[L, ind=\E[S,
+-	indn=\E[%p1%dS, kLFT=\EF\^, kRIT=\EF$, kbs=^H, kcbt=\E[Z,
+-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=^?,
+-	kend=\E[U, kf0=\EFA, kf1=\EF1, kf10=\EFA, kf11=\EFB,
+-	kf12=\EFC, kf13=\EFD, kf14=\EFE, kf15=\EFF, kf16=\EFG,
+-	kf17=\EFH, kf18=\EFI, kf19=\EFJ, kf2=\EF2, kf20=\EFK,
+-	kf21=\EFL, kf22=\EFM, kf23=\EFN, kf24=\EFO, kf25=\EFP,
+-	kf26=\EFQ, kf27=\EFR, kf28=\EFS, kf29=\EFT, kf3=\EF3,
+-	kf30=\EFU, kf31=\EFV, kf32=\EFW, kf33=\EFX, kf34=\EFY,
+-	kf35=\EFZ, kf36=\EFa, kf37=\EFb, kf38=\EFc, kf39=\EFd,
+-	kf4=\EF4, kf40=\EFe, kf41=\EFf, kf42=\EFg, kf43=\EFh,
+-	kf44=\EFi, kf45=\EFj, kf46=\EFk, kf47=\EFm, kf48=\EFn,
+-	kf49=\EFo, kf5=\EF5, kf50=\EFp, kf51=\EFq, kf52=\EFr,
+-	kf53=\EFs, kf54=\EFt, kf55=\EFu, kf56=\EFv, kf57=\EFw,
+-	kf58=\EFx, kf59=\EFy, kf6=\EF6, kf60=\EFz, kf7=\EF7,
+-	kf8=\EF8, kf9=\EF9, khome=\E[H, kich1=\E[L, kind=\EF+,
+-	kll=\E[U, knp=\E[T, kpp=\E[S, kri=\EF-, ll=\E[U, nel=\r\n,
+-	op=\E[m, rc=\E[u, rev=\E[7m, ri=\E[T, rin=\E[%p1%dT,
+-	rmcup=\E[2b\E[u\r\E[K, rmso=\E[m, rmul=\E[m, rs1=\Ec,
+-	sc=\E[s, sgr0=\E[0m, smcup=\E[s\E[1b, smso=\E[7m,
+-	smul=\E[4m, use=klone+color,
++	kLFT=\EF\^, kRIT=\EF$, kbs=^H, kcbt=\E[Z, kcub1=\E[D,
++	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=^?, kend=\E[U,
++	kf0=\EFA, kf1=\EF1, kf10=\EFA, kf11=\EFB, kf12=\EFC,
++	kf13=\EFD, kf14=\EFE, kf15=\EFF, kf16=\EFG, kf17=\EFH,
++	kf18=\EFI, kf19=\EFJ, kf2=\EF2, kf20=\EFK, kf21=\EFL,
++	kf22=\EFM, kf23=\EFN, kf24=\EFO, kf25=\EFP, kf26=\EFQ,
++	kf27=\EFR, kf28=\EFS, kf29=\EFT, kf3=\EF3, kf30=\EFU,
++	kf31=\EFV, kf32=\EFW, kf33=\EFX, kf34=\EFY, kf35=\EFZ,
++	kf36=\EFa, kf37=\EFb, kf38=\EFc, kf39=\EFd, kf4=\EF4,
++	kf40=\EFe, kf41=\EFf, kf42=\EFg, kf43=\EFh, kf44=\EFi,
++	kf45=\EFj, kf46=\EFk, kf47=\EFm, kf48=\EFn, kf49=\EFo,
++	kf5=\EF5, kf50=\EFp, kf51=\EFq, kf52=\EFr, kf53=\EFs,
++	kf54=\EFt, kf55=\EFu, kf56=\EFv, kf57=\EFw, kf58=\EFx,
++	kf59=\EFy, kf6=\EF6, kf60=\EFz, kf7=\EF7, kf8=\EF8, kf9=\EF9,
++	khome=\E[H, kich1=\E[L, kind=\EF+, kll=\E[U, knp=\E[T,
++	kpp=\E[S, kri=\EF-, ll=\E[U, nel=\r\n, op=\E[m, rc=\E[u,
++	rev=\E[7m, ri=\E[T, rmcup=\E[2b\E[u\r\E[K, rmso=\E[m,
++	rmul=\E[m, rs1=\Ec, sc=\E[s, sgr0=\E[0m, smcup=\E[s\E[1b,
++	smso=\E[7m, smul=\E[4m, use=ecma+index, use=klone+color,
+ 
+ opennt-35|ntconsole-35|OpenNT-term35 compatible with color,
+ 	lines#35, use=opennt,
+@@ -10852,8 +10923,7 @@
+ 	dl=\E[%p1%dM, dl1=\ER, dsl=\E_30\r, ech=\E[%p1%d@, ed=\EY,
+ 	el=\ET, flash=\Eb$<15>\Ed, fsl=\r, home=^^, ht=^I, hts=\E1,
+ 	ich=\E[%p1%d@, if=/usr/share/tabset/stdcrt,
+-	il=\E[%p1%dL, il1=\EE, ind=\n, indn=\E[%p1%dS, invis=\EG1,
+-	ip=$<3>,
++	il=\E[%p1%dL, il1=\EE, ind=\n, invis=\EG1, ip=$<3>,
+ 	is1=\E"\E%\E'\E(\EG@\EO\EX\E[=5l\E[=6l\E[=7h\Ed\Er,
+ 	is2=\EF2\EG0\E\\L, is3=\E<\E[=4l\E[=8h, kHOM=\E\s\s\s,
+ 	kbs=^H, kcbt=\EI, kcub1=^H, kcud1=^V, kcuf1=^L, kcuu1=^K,
+@@ -10866,10 +10936,10 @@
+ 	pfx=\E|%p1%{48}%+%c1%p2%s\031,
+ 	pln=\E_%p1%{63}%+%c%p2%s\r, prot=\E&,
+ 	rep=\E[%p2%db%p1%c, rev=\EG4,
+-	rf=/usr/share/tabset/stdcrt, ri=\Ej, rin=\E[%p1%dT,
+-	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,
++	rf=/usr/share/tabset/stdcrt, ri=\Ej, 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[=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
+@@ -10881,7 +10951,7 @@
+ 	    %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,
++	tbc=\E3, tsl=\E[4;1v\E_30, uc=\EG8\EG0, use=ecma+index,
+ 
+ #### Visual (vi)
+ #
+@@ -13071,16 +13141,15 @@
+ 	cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\EP,
+ 	dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[0K, home=\E[H,
+ 	hpa=\E[%p1%dG, ht=^I, hts=\E1, ich=\E[%p1%d@, ich1=\E\^,
+-	il=\E[%p1%dL, il1=\EL, ind=\n, indn=\E[%p1%dS,
+-	is1=\Ec\E[?7h, is2=\E[m\E[1;24r, kbs=^H, kcbt=\EO,
+-	kclr=\E[2J, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA,
+-	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=\r\n, rc=\E8, rev=\E[7m, ri=\ET, rin=\E[%p1%dT,
+-	rmacs=\E(B, rmam=\E[?7l, rmso=\E[m, rmul=\E[m,
+-	rs2=\Ec\E[?3l\E[2;0y, sc=\E7, sgr0=\E[m\E(B, smacs=\E(0,
+-	smam=\E[?7h, smso=\E[5m, smul=\E[4m, tbc=\E[3g,
+-	vpa=\E[%p1%dd,
++	il=\E[%p1%dL, il1=\EL, ind=\n, is1=\Ec\E[?7h,
++	is2=\E[m\E[1;24r, kbs=^H, kcbt=\EO, kclr=\E[2J, kcub1=\ED,
++	kcud1=\EB, kcuf1=\EC, kcuu1=\EA, 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=\r\n, rc=\E8,
++	rev=\E[7m, ri=\ET, rmacs=\E(B, rmam=\E[?7l, rmso=\E[m,
++	rmul=\E[m, rs2=\Ec\E[?3l\E[2;0y, sc=\E7, sgr0=\E[m\E(B,
++	smacs=\E(0, smam=\E[?7h, smso=\E[5m, smul=\E[4m, tbc=\E[3g,
++	vpa=\E[%p1%dd, use=ecma+index,
+ 
+ # Terminfo entry for the AT&T 510 A Personal Terminal
+ # Function keys 9 - 16 are available only after the
+@@ -13136,24 +13205,24 @@
+ 	dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M, ed=\E[0J, el=\E[0K,
+ 	el1=\E[1K, enacs=\E(B\E)1, ff=^L, home=\E[H,
+ 	hpa=\E[%p1%{1}%+%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
+-	il=\E[%p1%dL, il1=\E[L, ind=\n, indn=\E[%p1%dS,
+-	invis=\E[8m, is1=\E(B\E)1\E[5;0|, is3=\E[21;1|\212,
+-	kLFT=\E[u, kRIT=\E[v, kbs=^H, kcbt=\E[Z, kcub1=\E[D,
+-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOm, kf10=\EOd,
+-	kf11=\EOe, kf12=\EOf, kf13=\EOg, kf14=\EOh, kf15=\EOi,
+-	kf16=\EOj, kf2=\EOV, kf3=\EOu, kf4=\ENj, kf5=\ENe, kf6=\ENf,
+-	kf7=\ENh, kf8=\E[H, kf9=\EOc, kind=\E[S, kri=\E[T, ll=\E#2,
+-	mc0=\E[0i, mc4=\E[?8i, mc5=\E[?4i, mgc=\E\:, nel=\EE,
++	il=\E[%p1%dL, il1=\E[L, ind=\n, invis=\E[8m,
++	is1=\E(B\E)1\E[5;0|, is3=\E[21;1|\212, kLFT=\E[u,
++	kRIT=\E[v, kbs=^H, kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B,
++	kcuf1=\E[C, kcuu1=\E[A, kf1=\EOm, kf10=\EOd, kf11=\EOe,
++	kf12=\EOf, kf13=\EOg, kf14=\EOh, kf15=\EOi, kf16=\EOj,
++	kf2=\EOV, kf3=\EOu, kf4=\ENj, kf5=\ENe, kf6=\ENf, kf7=\ENh,
++	kf8=\E[H, kf9=\EOc, kind=\E[S, kri=\E[T, ll=\E#2, mc0=\E[0i,
++	mc4=\E[?8i, mc5=\E[?4i, mgc=\E\:, nel=\EE,
+ 	pln=\E[%p1%dp%p2%:-16s, rc=\E8,
+-	rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, ri=\EM,
+-	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,
++	rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, ri=\EM, 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%;,
+ 	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,
++	use=ecma+index,
+ 
+ # (att500: I merged this with the att513 entry, att500 just used att513 -- esr)
+ att500|att513|AT&T 513 using page mode,
+@@ -13260,10 +13329,9 @@
+ 	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch=\E[%p1%dP,
+ 	dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K,
+ 	home=\E[H, ht=^I, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL,
+-	il1=\E[L, ind=\n, indn=\E[%p1%dS, kbs=^H, kclr=\E[2J,
+-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, khome=\E[H,
+-	kll=\E[70;1H, nel=\r\n, rc=\E8, ri=\E[T, rin=\E[%p1%dT,
+-	rs1=\Ec, sc=\E7,
++	il1=\E[L, ind=\n, kbs=^H, kclr=\E[2J, kcub1=\E[D, kcud1=\E[B,
++	kcuf1=\E[C, kcuu1=\E[A, khome=\E[H, kll=\E[70;1H, nel=\r\n,
++	rc=\E8, ri=\E[T, rs1=\Ec, sc=\E7, use=ecma+index,
+ 
+ # 5620 terminfo  (2.0 or later ROMS with char attributes)
+ # The following SET-UP modes are assumed for normal operation:
+@@ -13284,12 +13352,12 @@
+ 	cud1=\E[B, 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, ed=\E[J, el=\E[K, home=\E[H, ht=^I, ich=\E[%p1%d@,
+-	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\E[S,
+-	indn=\E[%p1%dS, kbs=^H, kclr=\E[2J, kcub1=\E[D, kcud1=\E[B,
+-	kcuf1=\E[C, kcuu1=\E[A, khome=\E[H, kll=\E[70;1H, nel=\n,
++	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\E[S, kbs=^H,
++	kclr=\E[2J, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
++	khome=\E[H, kll=\E[70;1H, nel=\n,
+ 	pfx=\E[%p1%d;%p2%l%dq%p2%s, rc=\E8, rev=\E[7m, ri=\E[T,
+-	rin=\E[%p1%dT, rmso=\E[0m, rmul=\E[0m, rs1=\Ec, sc=\E7,
+-	sgr0=\E[0m, smso=\E[7m, smul=\E[4m,
++	rmso=\E[0m, rmul=\E[0m, rs1=\Ec, sc=\E7, sgr0=\E[0m,
++	smso=\E[7m, smul=\E[4m, use=ecma+index,
+ att5620-24|tty5620-24|dmd-24|teletype dmd 5620 in a 24x80 layer,
+ 	lines#24, use=att5620,
+ att5620-34|tty5620-34|dmd-34|teletype dmd 5620 in a 34x80 layer,
+@@ -13370,7 +13438,7 @@
+ 	dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K,
+ 	flash=\E[?5h$<200>\E[?5l, fsl=\E8, home=\E[H, ht=^I,
+ 	ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\ED,
+-	indn=\E[%p1%dS, invis=\E[8m,
++	invis=\E[8m,
+ 	is1=\E[8;0|\E[?3;4;5;13;15l\E[13;20l\E[?7h\E[12h\E(B\E)0,
+ 	is2=\E[m\017, is3=\E(B\E)0, kLFT=\E[ @, kRIT=\E[ A, kbs=^H,
+ 	kcbt=\E[Z, kclr=\E[2J, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
+@@ -13381,12 +13449,13 @@
+ 	nel=\EE,
+ 	pfx=\E[%p1%d;%p2%l%02dq   F%p1%1d           %p2%s,
+ 	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,
++	ri=\EM, 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%;,
+ 	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,
++	use=ecma+index,
+ att610-w|AT&T 610; 132 column; 98key keyboard,
+ 	cols#132, wsl#132,
+ 	is1=\E[8;0|\E[?4;5;13;15l\E[13;20l\E[?3;7h\E[12h,
+@@ -13445,7 +13514,7 @@
+ 	dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K,
+ 	flash=\E[?5h$<200>\E[?5l, fsl=\E8, home=\E[H, ht=^I,
+ 	ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\ED,
+-	indn=\E[%p1%dS, invis=\E[8m,
++	invis=\E[8m,
+ 	is1=\E[8;0|\E[?3;4;5;13;15l\E[13;20l\E[?7h\E[12h,
+ 	is2=\E[m\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,
+@@ -13462,14 +13531,13 @@
+ 	mc4=\E[?4i, mc5=\E[?5i, nel=\EE,
+ 	pfx=\E[%p1%d;%p2%l%02dq   F%p1%1d           %p2%s,
+ 	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, rc=\E8, rev=\E[7m,
+-	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,
++	ri=\EM, 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%;,
+ 	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,
++	tsl=\E7\E[25;%i%p1%dx, use=ecma+index,
+ att620-w|AT&T 620; 132 column; 98key keyboard,
+ 	cols#132, wsl#132,
+ 	is1=\E[8;0|\E[?4;5;13;15l\E[13;20l\E[?3;7h\E[12h,
+@@ -13516,19 +13584,19 @@
+ 	cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P,
+ 	dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K,
+ 	el1=\E[1K, home=\E[H, ht=^I, ich=\E[%p1%d@, ich1=\E[@,
+-	il=\E[%p1%dL, il1=\E[L, ind=\ED, indn=\E[%p1%dS, is2=\E[m,
+-	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, kent=\r,
+-	kf10=\ENp, kf11=\ENq, kf12=\ENr, kf13=\ENs, kf14=\ENt,
+-	kf15=\ENu, kf16=\ENv, kf17=\ENw, kf18=\ENx, kf19=\ENy,
+-	kf20=\ENz, kf21=\EN{, kf22=\EN|, kf23=\EN}, kf24=\EN~,
+-	kf9=\ENo, khome=\E[H, kich1=\E[@, kil1=\E[L, mc4=\E[?4i,
+-	mc5=\E[?5i, nel=\r\n, 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,
++	il=\E[%p1%dL, il1=\E[L, ind=\ED, is2=\E[m, 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, kent=\r, kf10=\ENp, kf11=\ENq,
++	kf12=\ENr, kf13=\ENs, kf14=\ENt, kf15=\ENu, kf16=\ENv,
++	kf17=\ENw, kf18=\ENx, kf19=\ENy, kf20=\ENz, kf21=\EN{,
++	kf22=\EN|, kf23=\EN}, kf24=\EN~, kf9=\ENo, khome=\E[H,
++	kich1=\E[@, kil1=\E[L, mc4=\E[?4i, mc5=\E[?5i, nel=\r\n,
++	pfx=\E[%p1%d;%p2%l%dq%p2%s, rc=\E8, rev=\E[7m, ri=\EM,
++	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,
+ 	sgr0=\E[m, smir=\E[4h, smso=\E[7m, smul=\E[4m,
++	use=ecma+index,
+ att630-24|5630-24|5630DMD-24|630MTG-24|AT&T 630 windowing terminal 24 lines,
+ 	lines#24, use=att630,
+ 
+@@ -14632,16 +14700,16 @@
+ 	cvvis=\E[3;5v, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM,
+ 	dl1=\E[M, ed=\E[J, el=\E[K, flash=\E[?5l$<200/>\E[?5h,
+ 	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=\n, indn=\E[%p1%dS,
++	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\n,
+ 	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=^?, 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,
+-	rmso=\E[m, rmul=\E[m, rs1=\Ec\E[?7h\E[>5g, sc=\E7,
+-	sgr0=\E[m, smcup=\E[>5g\E[?7h\E[?5h, smir=\E[4h,
+-	smso=\E[7m, smul=\E[4m, tbc=\E[3g, u6=\E[%i%p1%d;%p2%dR,
+-	u7=\E[6n, u8=\E[?6c, u9=\E[c,
++	rev=\E[7m, ri=\EM, rmcup=, rmir=\E[4l, rmso=\E[m, rmul=\E[m,
++	rs1=\Ec\E[?7h\E[>5g, sc=\E7, sgr0=\E[m,
++	smcup=\E[>5g\E[?7h\E[?5h, smir=\E[4h, smso=\E[7m,
++	smul=\E[4m, tbc=\E[3g, u6=\E[%i%p1%d;%p2%dR, u7=\E[6n,
++	u8=\E[?6c, u9=\E[c, use=ecma+index,
+ cit101e-n|CIT-101e w/o am,
+ 	am@,
+ 	cvvis=\E[?1l\E[?4l\E[?7l, kbs=^H, kcub1=^H, kcud1=\n,
+@@ -16945,25 +17013,25 @@
+ 	cuu=\E[%p1%dA, cuu1=\E[A, dch1=\E[P, dl=\E[%p1%dM,
+ 	dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, home=\E[H,
+ 	hpa=\E[%i%p1%dG, il=\E[%p1%dL, il1=\E[L, ind=\E[S,
+-	indn=\E[%p1%dS, invis=\E[8m, is2=\Ec, kbs=^H, kcbt=\E[Z,
+-	kclr=\E[144q, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
+-	kcuu1=\E[A, kdch1=\E[P, ked=\E[148q, kel=\E[142q,
+-	kend=\E[146q, kf1=\E[001q, kf10=\E[010q, kf11=\E[011q,
+-	kf12=\E[012q, kf13=\E[013q, kf14=\E[014q, kf15=\E[015q,
+-	kf16=\E[016q, kf17=\E[017q, kf18=\E[018q, kf19=\E[019q,
+-	kf2=\E[002q, kf20=\E[020q, kf21=\E[021q, kf22=\E[022q,
+-	kf23=\E[023q, kf24=\E[024q, kf25=\E[025q, kf26=\E[026q,
+-	kf27=\E[027q, kf28=\E[028q, kf29=\E[029q, kf3=\E[003q,
+-	kf30=\E[030q, kf31=\E[031q, kf32=\E[032q, kf33=\E[033q,
+-	kf34=\E[034q, kf35=\E[035q, kf36=\E[036q, kf4=\E[004q,
+-	kf5=\E[005q, kf6=\E[006q, kf7=\E[007q, kf8=\E[008q,
+-	kf9=\E[009q, khome=\E[H, kich1=\E[139q, kil1=\E[140q,
+-	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,
++	invis=\E[8m, is2=\Ec, kbs=^H, kcbt=\E[Z, kclr=\E[144q,
++	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P,
++	ked=\E[148q, kel=\E[142q, kend=\E[146q, kf1=\E[001q,
++	kf10=\E[010q, kf11=\E[011q, kf12=\E[012q, kf13=\E[013q,
++	kf14=\E[014q, kf15=\E[015q, kf16=\E[016q, kf17=\E[017q,
++	kf18=\E[018q, kf19=\E[019q, kf2=\E[002q, kf20=\E[020q,
++	kf21=\E[021q, kf22=\E[022q, kf23=\E[023q, kf24=\E[024q,
++	kf25=\E[025q, kf26=\E[026q, kf27=\E[027q, kf28=\E[028q,
++	kf29=\E[029q, kf3=\E[003q, kf30=\E[030q, kf31=\E[031q,
++	kf32=\E[032q, kf33=\E[033q, kf34=\E[034q, kf35=\E[035q,
++	kf36=\E[036q, kf4=\E[004q, kf5=\E[005q, kf6=\E[006q,
++	kf7=\E[007q, kf8=\E[008q, kf9=\E[009q, khome=\E[H,
++	kich1=\E[139q, kil1=\E[140q, kind=\E[151q, knp=\E[154q,
++	kpp=\E[150q, kri=\E[155q, krmir=\E[4l, rev=\E[7m, ri=\E[T,
++	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,
+ 	sgr0=\E[0m, smir=\E[4h, smso=\E[7m, smul=\E[4m,
++	use=ecma+index,
+ 
+ ibmaed|IBM Experimental display,
+ 	OTbs, am, eo, msgr,
+@@ -17110,26 +17178,26 @@
+ 	cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P,
+ 	dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[2J, el=\E[0K,
+ 	home=\E[H, hpa=\E[%i%p1%dG, ich=\E[%p1%d@, il=\E[%p1%dL,
+-	il1=\E[L, ind=\ED, indn=\E[%p1%dS, invis=\E[8m, is2=\Ec,
+-	kbs=^H, kcbt=\E[Z, kclr=\E[144q, kcub1=\E[D, kcud1=\E[B,
+-	kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P, ked=\E[148q,
+-	kel=\E[142q, kend=\E[146q, kf1=\E[001q, kf10=\E[010q,
+-	kf11=\E[011q, kf12=\E[012q, kf13=\E[013q, kf14=\E[014q,
+-	kf15=\E[015q, kf16=\E[016q, kf17=\E[017q, kf18=\E[018q,
+-	kf19=\E[019q, kf2=\E[002q, kf20=\E[020q, kf21=\E[021q,
+-	kf22=\E[022q, kf23=\E[023q, kf24=\E[024q, kf25=\E[025q,
+-	kf26=\E[026q, kf27=\E[027q, kf28=\E[028q, kf29=\E[029q,
+-	kf3=\E[003q, kf30=\E[030q, kf31=\E[031q, kf32=\E[032q,
+-	kf33=\E[033q, kf34=\E[034q, kf35=\E[035q, kf36=\E[036q,
+-	kf4=\E[004q, kf5=\E[005q, kf6=\E[006q, kf7=\E[007q,
+-	kf8=\E[008q, kf9=\E[009q, khome=\E[H, kich1=\E[139q,
+-	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,
++	il1=\E[L, ind=\ED, invis=\E[8m, is2=\Ec, kbs=^H, kcbt=\E[Z,
++	kclr=\E[144q, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
++	kcuu1=\E[A, kdch1=\E[P, ked=\E[148q, kel=\E[142q,
++	kend=\E[146q, kf1=\E[001q, kf10=\E[010q, kf11=\E[011q,
++	kf12=\E[012q, kf13=\E[013q, kf14=\E[014q, kf15=\E[015q,
++	kf16=\E[016q, kf17=\E[017q, kf18=\E[018q, kf19=\E[019q,
++	kf2=\E[002q, kf20=\E[020q, kf21=\E[021q, kf22=\E[022q,
++	kf23=\E[023q, kf24=\E[024q, kf25=\E[025q, kf26=\E[026q,
++	kf27=\E[027q, kf28=\E[028q, kf29=\E[029q, kf3=\E[003q,
++	kf30=\E[030q, kf31=\E[031q, kf32=\E[032q, kf33=\E[033q,
++	kf34=\E[034q, kf35=\E[035q, kf36=\E[036q, kf4=\E[004q,
++	kf5=\E[005q, kf6=\E[006q, kf7=\E[007q, kf8=\E[008q,
++	kf9=\E[009q, khome=\E[H, kich1=\E[139q, kil1=\E[140q,
++	kind=\E[151q, knp=\E[154q, kpp=\E[150q, kri=\E[155q,
++	krmir=\E[4l, rev=\E[7m, ri=\EL, 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%;,
+ 	sgr0=\E[0m, smacs=\E(0, smir=\E[4h, smso=\E[7m, smul=\E[4m,
+-	tbc=\E[3g,
++	tbc=\E[3g, use=ecma+index,
+ # "Megapel" refers to the display adapter, which was used with the IBM RT
+ # aka IBM 6150.
+ ibm5081|hft|IBM Megapel Color display,
+@@ -19201,18 +19269,19 @@
+ 	cuu=\E[%p1%dA, cuu1=\EM, cvvis=\E%!0\ETD70\E%!1,
+ 	dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
+ 	ech=\E[%p1%dX, ed=\E[J, el=\E[K, home=\E[H, ht=^I, hts=\EH,
+-	il=\E[%p1%dL, il1=\E[L, ind=\n, indn=\E[%p1%dS, is2=\E%!1,
+-	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+-	kf0=\EOA, kf1=\EOB, kf2=\EOC, kf3=\EOD, kf4=\EOP, kf5=\EOQ,
+-	kf6=\EOR, kf7=\EOS, lf0=F1, lf1=F2, lf2=F3, lf3=F4, lf4=F5,
+-	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,
++	il=\E[%p1%dL, il1=\E[L, ind=\n, is2=\E%!1, kbs=^H,
++	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf0=\EOA,
++	kf1=\EOB, kf2=\EOC, kf3=\EOD, kf4=\EOP, kf5=\EOQ, kf6=\EOR,
++	kf7=\EOS, lf0=F1, lf1=F2, lf2=F3, lf3=F4, lf4=F5, lf5=F6, lf6=F8,
++	ll=\E[30;H, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM, 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>,
+ 	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,
++	use=ecma+index,
+ 
+ #
+ # Tektronix 4106/4107/4109 from BRL
+@@ -19247,18 +19316,19 @@
+ 	cuu=\E[%p1%dA, cuu1=\EM, cvvis=\E%!0\ETD70\E%!1,
+ 	dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
+ 	ech=\E[%p1%dX, ed=\E[J, el=\E[K, home=\E[H, ht=^I, hts=\EH,
+-	il=\E[%p1%dL, il1=\E[L, ind=\n, indn=\E[%p1%dS, is2=\E%!1,
+-	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+-	kf0=\EOA, kf1=\EOB, kf2=\EOC, kf3=\EOD, kf4=\EOP, kf5=\EOQ,
+-	kf6=\EOR, kf7=\EOS, lf0=F1, lf1=F2, lf2=F3, lf3=F4, lf4=F5,
+-	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,
++	il=\E[%p1%dL, il1=\E[L, ind=\n, is2=\E%!1, kbs=^H,
++	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf0=\EOA,
++	kf1=\EOB, kf2=\EOC, kf3=\EOD, kf4=\EOP, kf5=\EOQ, kf6=\EOR,
++	kf7=\EOS, lf0=F1, lf1=F2, lf2=F3, lf3=F4, lf4=F5, lf5=F6, lf6=F8,
++	ll=\E[32;H, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM, 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>,
+ 	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,
++	use=ecma+index,
+ 
+ # Tektronix 4107/4109 interpret 4 modes using "\E%!" followed by a code:
+ # 0 selects Tek mode, i.e., \E%!0
+@@ -19972,12 +20042,12 @@
+ 	cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
+ 	dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H,
+ 	ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\E[S,
+-	indn=\E[%p1%dS, invis=\E[8m, is2=\E[20l, kbs=^H,
+-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf0=\E[9~,
+-	kf1=\E[0~, kf2=\E[1~, kf3=\E[2~, kf4=\E[3~, kf5=\E[4~,
+-	kf6=\E[5~, kf7=\E[6~, kf8=\E[7~, kf9=\E[8~, rev=\E[7m,
+-	ri=\E[T, rin=\E[%p1%dT, rmacs=^O, rmso=\E[m, rmul=\E[m,
+-	rs1=\Ec, sgr0=\E[m, smacs=^N, smso=\E[7m, smul=\E[4m,
++	invis=\E[8m, is2=\E[20l, kbs=^H, kcub1=\E[D, kcud1=\E[B,
++	kcuf1=\E[C, kcuu1=\E[A, kf0=\E[9~, kf1=\E[0~, kf2=\E[1~,
++	kf3=\E[2~, kf4=\E[3~, kf5=\E[4~, kf6=\E[5~, kf7=\E[6~,
++	kf8=\E[7~, kf9=\E[8~, rev=\E[7m, ri=\E[T, rmacs=^O,
++	rmso=\E[m, rmul=\E[m, rs1=\Ec, sgr0=\E[m, smacs=^N,
++	smso=\E[7m, smul=\E[4m, use=ecma+index,
+ 
+ # From: Hans Verkuil , 4 Dec 1995
+ # (amiga: added empty  to suppress a warning.
+@@ -20027,20 +20097,20 @@
+ 	cvvis=\E[>?6h, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
+ 	dl=\E[%p1%dM, dl1=\E[1M, ed=\E[J, el=\E[K, flash=^G,
+ 	ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[1L, ind=\ED,
+-	indn=\E[%p1%dS, invis=\E8m,
++	invis=\E8m,
+ 	is2=\E[>?2;18l\E[>?26;?6;20;>?15;?7;>?22;>?8h,
+ 	kbs=^H, kcbt=\233Z, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
+ 	kcuu1=\E[A, kdch1=^?, kf0=\E[9~, kf1=\E[0~, kf2=\E[1~,
+ 	kf3=\E[2~, kf4=\E[3~, kf5=\E[4~, kf6=\E[5~, kf7=\E[6~,
+ 	kf8=\E[7~, kf9=\E[8~, khlp=\E[?~, khome=\E[44~, kll=\E[45~,
+ 	kmous=\E[M, knp=\E[42~, kpp=\E[41~, nel=\EE, oc=\E[0m,
+-	rev=\E[7m, ri=\EM, rin=\E[%p1%dT, rmcup=\E[?7h\E[r\E[J,
+-	rmkx=\E[?1l, rmso=\E[21m, rmul=\E[24m, rs1=\Ec,
++	rev=\E[7m, ri=\EM, rmcup=\E[?7h\E[r\E[J, rmkx=\E[?1l,
++	rmso=\E[21m, rmul=\E[24m, rs1=\Ec,
+ 	rs2=\E[>?2;18l\E[>?26;?6;20;>?15;?7;>?22;>?8h,
+ 	setab=\E[%?%p1%{8}%>%t%'F'%p1%+%d%e4%p1%d%;m,
+ 	setaf=\E[%?%p1%{8}%>%t%'2'%p1%+%d%e3%p1%d%;m,
+ 	sgr0=\E[0m\017\E[30;85;>15m, smcup=\E[?7h, smkx=\E[?1h,
+-	smso=\E[1m, smul=\E[4m,
++	smso=\E[1m, smul=\E[4m, use=ecma+index,
+ 
+ # MorphOS on Genesi Pegasos
+ # By Pavel Fedin 
+@@ -20684,29 +20754,29 @@
+ 
+ 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,
++	dim@, dsl=\E]2;\007, fsl=^G, kf1=\E[11~, kf2=\E[12~,
++	kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
++	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=ecma+index, 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,
++	dim@, dsl=\E]2;\007, fsl=^G, kf1=\E[11~, kf2=\E[12~,
++	kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
++	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=ecma+index, 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,
++	dim@, dsl=\E]2;\007, fsl=^G, kf1=\E[11~, kf2=\E[12~,
++	kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
++	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=ecma+index, use=linux-m2,
+ 
+ 
+ screen.putty-m1|Putty m1 specific for screen,
+@@ -22702,19 +22772,19 @@
+ 	cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
+ 	dl=\E[%p1%dM, dl1=\E[1M, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
+ 	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
+-	ich1=\E[1@, il=\E[%p1%dL, il1=\E[1L, ind=\E[S,
+-	indn=\E[%p1%dS, invis=\E[9m, is2=\E[0;10;39m, kbs=^H,
+-	kcbt=^], kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+-	kdch1=\E[P, kend=\E[Y, kf1=\EOP, kf10=\EOY, kf11=\EOZ,
+-	kf12=\EOA, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU,
+-	kf7=\EOV, kf8=\EOW, kf9=\EOX, khome=\E[H, kich1=\E[@,
+-	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,
++	ich1=\E[1@, il=\E[%p1%dL, il1=\E[1L, ind=\E[S, invis=\E[9m,
++	is2=\E[0;10;39m, kbs=^H, kcbt=^], kcub1=\E[D, kcud1=\E[B,
++	kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P, kend=\E[Y, kf1=\EOP,
++	kf10=\EOY, kf11=\EOZ, kf12=\EOA, kf2=\EOQ, kf3=\EOR,
++	kf4=\EOS, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW, kf9=\EOX,
++	khome=\E[H, kich1=\E[@, knp=\E[U, kpp=\E[V, krmir=\E0,
++	nel=\r\E[S, rc=\E8, rev=\E[7m, ri=\E[T, 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,
+ 	sgr0=\E[0;10m, smacs=\E[12m, smso=\E[7m, smul=\E[4m,
+-	tbc=\E[3g, vpa=\E[%i%p1%dd, use=klone+color,
++	tbc=\E[3g, vpa=\E[%i%p1%dd, use=ecma+index,
++	use=klone+color,
+ # (pc6300plus: removed ":KM=/usr/lib/ua/kmap.s5:"; renamed BO/EE/CI/CV -- esr)
+ pc6300plus|AT&T 6300 plus,
+ 	OTbs, am, xon,
+@@ -26207,4 +26277,9 @@
+ #	+ comment-out some user-defined capabilities in mintty+common to allow
+ #	  builds with existing releases 5.9-6.1 -TD
+ #
++# 2019-06-30
++#	+ add ms-terminal -TD
++#	+ add vscode, vscode-direct -TD
++#	+ use ecma+index in screen, st -TD
++#
+ ######## SHANTIH!  SHANTIH!  SHANTIH!
+Index: ncurses/Makefile.in
+Prereq:  1.161 
+--- ncurses-6.1-20190623+/ncurses/Makefile.in	2019-05-11 14:15:21.000000000 +0000
++++ ncurses-6.1-20190630/ncurses/Makefile.in	2019-06-30 14:57:27.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: Makefile.in,v 1.161 2019/05/11 14:15:21 tom Exp $
++# $Id: Makefile.in,v 1.163 2019/06/30 14:57:27 tom Exp $
+ ##############################################################################
+ # Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.                #
+ #                                                                            #
+@@ -159,7 +159,8 @@
+ 
+ TERMINFO	= @TERMINFO@
+ TERMINFO_SRC	= @TERMINFO_SRC@
+-TIC_PATH	= @TIC_PATH@
++TIC_PATH	= @TIC@
++INFOCMP_PATH	= @INFOCMP@
+ 
+ AUTO_SRC = \
+ 	./codes.c \
+@@ -221,7 +222,7 @@
+ ../lib : ; mkdir $@
+ 
+ ./fallback.c : $(tinfo)/MKfallback.sh
+-	$(SHELL) -e $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) $(TIC_PATH) $(FALLBACK_LIST) >$@
++	$(SHELL) -e $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) $(TIC_PATH) $(INFOCMP_PATH) $(FALLBACK_LIST) >$@
+ 
+ ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h
+ 	$(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@
+Index: ncurses/tinfo/MKfallback.sh
+Prereq:  1.21 
+--- ncurses-6.1-20190623+/ncurses/tinfo/MKfallback.sh	2017-04-12 00:50:50.000000000 +0000
++++ ncurses-6.1-20190630/ncurses/tinfo/MKfallback.sh	2019-06-30 10:44:15.000000000 +0000
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ ##############################################################################
+-# Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2017,2019 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.21 2017/04/12 00:50:50 tom Exp $
++# $Id: MKfallback.sh,v 1.22 2019/06/30 10:44:15 tom Exp $
+ #
+ # MKfallback.sh -- create fallback table for entry reads
+ #
+@@ -45,6 +45,9 @@
+ tic_path=$1
+ shift
+ 
++infocmp_path=$1
++shift
++
+ case $tic_path in #(vi
+ /*)
+ 	tic_head=`echo "$tic_path" | sed -e 's,/[^/]*$,,'`
+@@ -89,7 +92,7 @@
+ 	for x in $*
+ 	do
+ 		echo "/* $x */"
+-		infocmp -E $x | sed -e 's/\/NCURSES_INT2/g'
++		$infocmp_path -E $x | sed -e 's/\/NCURSES_INT2/g'
+ 	done
+ 
+ 	cat <  Sun, 23 Jun 2019 11:31:40 -0400
++ -- Thomas E. Dickey   Sat, 29 Jun 2019 21:29:49 -0400
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw/rules
+--- ncurses-6.1-20190623+/package/debian-mingw/rules	2018-02-10 18:25:00.000000000 +0000
++++ ncurses-6.1-20190630/package/debian-mingw/rules	2019-06-30 16:00:26.000000000 +0000
+@@ -50,6 +50,8 @@
+ 	--with-cxx-shared \
+ 	--with-develop \
+ 	--with-fallbacks=unknown,rxvt \
++	--with-tic-path=/usr/bin/tic$(MY_ABI) \
++	--with-infocmp-path=/usr/bin/infocmp$(MY_ABI) \
+ 	--with-shared \
+ 	--with-trace \
+ 	--with-xterm-kbs=DEL \
+Index: package/debian-mingw64/changelog
+--- ncurses-6.1-20190623+/package/debian-mingw64/changelog	2019-06-23 15:31:40.000000000 +0000
++++ ncurses-6.1-20190630/package/debian-mingw64/changelog	2019-06-30 01:30:19.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.1+20190623) unstable; urgency=low
++ncurses6 (6.1+20190630) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 23 Jun 2019 11:31:40 -0400
++ -- Thomas E. Dickey   Sat, 29 Jun 2019 21:29:49 -0400
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/rules
+--- ncurses-6.1-20190623+/package/debian-mingw64/rules	2018-02-10 18:25:00.000000000 +0000
++++ ncurses-6.1-20190630/package/debian-mingw64/rules	2019-06-30 16:00:48.000000000 +0000
+@@ -50,6 +50,8 @@
+ 	--with-cxx-shared \
+ 	--with-develop \
+ 	--with-fallbacks=unknown,rxvt \
++	--with-tic-path=/usr/bin/tic$(MY_ABI) \
++	--with-infocmp-path=/usr/bin/infocmp$(MY_ABI) \
+ 	--with-shared \
+ 	--with-trace \
+ 	--with-xterm-kbs=DEL \
+Index: package/debian/changelog
+--- ncurses-6.1-20190623+/package/debian/changelog	2019-06-23 15:31:40.000000000 +0000
++++ ncurses-6.1-20190630/package/debian/changelog	2019-06-30 01:30:19.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.1+20190623) unstable; urgency=low
++ncurses6 (6.1+20190630) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 23 Jun 2019 11:31:40 -0400
++ -- Thomas E. Dickey   Sat, 29 Jun 2019 21:29:49 -0400
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.336 
+--- ncurses-6.1-20190623+/package/mingw-ncurses.nsi	2019-06-23 15:31:40.000000000 +0000
++++ ncurses-6.1-20190630/package/mingw-ncurses.nsi	2019-06-30 01:30:19.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.336 2019/06/23 15:31:40 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.338 2019/06/30 01:30:19 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "1"
+ !define VERSION_YYYY  "2019"
+-!define VERSION_MMDD  "0623"
++!define VERSION_MMDD  "0630"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.1-20190623+/package/mingw-ncurses.spec	2019-06-23 15:31:40.000000000 +0000
++++ ncurses-6.1-20190630/package/mingw-ncurses.spec	2019-06-30 18:34:07.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.1
+-Release: 20190623
++Release: 20190630
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+@@ -68,6 +68,8 @@
+ 	--with-cxx-shared \\\
+ 	--with-develop \\\
+ 	--with-fallbacks=unknown,xterm \\\
++	--with-tic-path=/usr/bin/tic${MY_ABI} \\\
++	--with-infocmp-path=/usr/bin/infocmp${MY_ABI} \\\
+ 	--with-install-prefix=$RPM_BUILD_ROOT \\\
+ 	--with-pc-suffix=%{MY_ABI} \\\
+ 	--with-pcre2 \\\
+@@ -145,6 +147,9 @@
+ 
+ %changelog
+ 
++* Sun Jun 30 2019 Thomas E. Dickey
++- use tic-path and infocmp-path options for fallbacks
++
+ * Sat Feb 10 2018 Thomas E. Dickey
+ - add several development features
+ 
+Index: package/ncurses.spec
+--- ncurses-6.1-20190623+/package/ncurses.spec	2019-06-23 15:31:40.000000000 +0000
++++ ncurses-6.1-20190630/package/ncurses.spec	2019-06-30 01:30:19.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.1
+-Release: 20190623
++Release: 20190630
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncursest.spec
+--- ncurses-6.1-20190623+/package/ncursest.spec	2019-06-23 15:31:40.000000000 +0000
++++ ncurses-6.1-20190630/package/ncursest.spec	2019-06-30 01:30:19.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.1
+-Release: 20190623
++Release: 20190630
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: progs/tic.c
+Prereq:  1.276 
+--- ncurses-6.1-20190623+/progs/tic.c	2019-05-10 21:00:25.000000000 +0000
++++ ncurses-6.1-20190630/progs/tic.c	2019-06-29 23:23:22.000000000 +0000
+@@ -48,7 +48,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: tic.c,v 1.276 2019/05/10 21:00:25 tom Exp $")
++MODULE_ID("$Id: tic.c,v 1.277 2019/06/29 23:23:22 tom Exp $")
+ 
+ #define STDIN_NAME ""
+ 
+@@ -2931,6 +2931,11 @@
+     check_screen(tp);
+ 
+     /*
++     * These are probably both or none.
++     */
++    PAIRED(parm_index, parm_rindex);
++
++    /*
+      * These may be mismatched because the terminal description relies on
+      * restoring the cursor visibility by resetting it.
+      */
diff --git a/ncurses-6.1-20190706.patch b/ncurses-6.1-20190706.patch
new file mode 100644
index 0000000..a83ef15
--- /dev/null
+++ b/ncurses-6.1-20190706.patch
@@ -0,0 +1,309 @@
+# ncurses 6.1 - patch 20190706 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.1 is at
+# 	ftp.gnu.org:/pub/gnu
+#
+# Patches for ncurses 6.1 can be found at
+# 	ftp://ftp.invisible-island.net/ncurses/6.1
+#	http://invisible-mirror.net/archives/ncurses/6.1 
+#
+# ------------------------------------------------------------------------------
+# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20190706.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Jul  7 00:14:47 UTC 2019
+# ------------------------------------------------------------------------------
+# NEWS                             |    6 ++
+# VERSION                          |    2 
+# dist.mk                          |    4 -
+# misc/terminfo.src                |   77 +++++++++++++++++++++++++++++++++----
+# 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 
+# package/ncursest.spec            |    2 
+# 11 files changed, 89 insertions(+), 22 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.3342 
+--- ncurses-6.1-20190630+/NEWS	2019-06-30 10:45:10.000000000 +0000
++++ ncurses-6.1-20190706/NEWS	2019-07-06 20:51:46.000000000 +0000
+@@ -25,7 +25,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.3342 2019/06/30 10:45:10 tom Exp $
++-- $Id: NEWS,v 1.3344 2019/07/06 20:51:46 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.
+ 
++20190706
++	+ add domterm -TD
++	+ improve comments for recent changes, add alias xterm.js -TD
++
+ 20190630
+ 	+ add --with-tic-path and --with-infocmp-path to work around problems
+ 	  building fallback source using pre-6.0 tic/infocmp.
+Index: VERSION
+--- ncurses-6.1-20190630+/VERSION	2019-06-30 01:30:19.000000000 +0000
++++ ncurses-6.1-20190706/VERSION	2019-07-06 09:10:26.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.1	20190630
++5:0:10	6.1	20190706
+Index: dist.mk
+Prereq:  1.1292 
+--- ncurses-6.1-20190630+/dist.mk	2019-06-30 01:30:19.000000000 +0000
++++ ncurses-6.1-20190706/dist.mk	2019-07-06 09:10:26.000000000 +0000
+@@ -25,7 +25,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1292 2019/06/30 01:30:19 tom Exp $
++# $Id: dist.mk,v 1.1293 2019/07/06 09:10:26 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 = 1
+-NCURSES_PATCH = 20190630
++NCURSES_PATCH = 20190706
+ 
+ # 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.1-20190630+/misc/terminfo.src	2019-06-30 20:05:21.000000000 +0000
++++ ncurses-6.1-20190706/misc/terminfo.src	2019-07-06 20:35:26.000000000 +0000
+@@ -6,8 +6,8 @@
+ # Report bugs and new terminal descriptions to
+ #	bug-ncurses@gnu.org
+ #
+-#	$Revision: 1.749 $
+-#	$Date: 2019/06/30 20:05:21 $
++#	$Revision: 1.757 $
++#	$Date: 2019/07/06 20:35: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
+@@ -4225,6 +4225,8 @@
+ 
+ # Windows 10 1903
+ # Version 0.2.1715.0
++# https://github.com/microsoft/terminal
++#
+ # The task manager shows this as "OpenConsole.exe", which differs
+ # from the "Windows Command Processor" used for the command-prompt.
+ #
+@@ -4247,9 +4249,9 @@
+ # - a few generic xterm features are supported (set window title), but
+ #   others are missing (such as the mouse).
+ # - the cursor visible/invisible works in the PowerShell tab, not in "Legacy"
+-# tack: 
++# tack:
+ # - blink, dim, bold, invis, protect do not work
+-# - bce works (but per vttest, with ED, EL, not BCE)
++# - bce works (but per vttest, with ED, EL, not ECH)
+ # - does not support keypad application mode
+ # - implements most of the xterm modified keys; sometimes modifiers are ignored
+ #   or simply incorrect
+@@ -4262,7 +4264,8 @@
+ 	use=xterm+pcfkeys, use=xterm-basic,
+ 
+ #### Visual Studio
+-# Visual Studio Code 1.35.1
++# Visual Studio Code 1.35.1 uses xterm.js (see https://xtermjs.org/).
++# https://code.visualstudio.com/docs/editor/integrated-terminal
+ #
+ # This sets TERM to xterm-256color, which is a little more successful than
+ # Windows Terminal.
+@@ -4289,11 +4292,11 @@
+ # - mouse mode is not reset by reset-sequence
+ # - supports italics and dim, but not cross-out or double-underline
+ # - color-palette cannot be changed
+-vscode|Visual Studio Code terminal,
++vscode|xterm.js|Visual Studio Code terminal using xterm.js,
+ 	npc,
+ 	kcbt=\E[Z, rmkx=\E[?1l, smkx=\E[?1h, use=xterm+256setaf,
+ 	use=ecma+index, use=xterm+sm+1006, use=xterm+pcfkeys,
+-	use=xterm-basic, use=xterm-basic,
++	use=xterm-basic,
+ vscode-direct|Visual Studio Code with direct-colors,
+ 	use=xterm+indirect, use=vscode,
+ 
+@@ -7012,6 +7015,62 @@
+ 	use=xterm+pce2, use=xterm+pcc2, use=ecma+italics,
+ 	use=xterm+alt1049,
+ 
++######## WEB CLIENTS
++
++#### DomTerm
++# https://domterm.org
++#
++# Quoting its webpage:
++#	The domterm command runs a server that manages sessions (usually shell
++#	processes).  The user interface and terminal emulation is handled by a
++#	JavaScript library that can run in a regular web browser or an embedded
++#	browser such as Electron, using Web Sockets to talk to the server.
++#
++# it can connect to, and display in, a web browser, or as a standalone Qt
++# application.  Either way, it displays in the current desktop session.
++#
++# Testing current code (2019/07/06) with Fedora 30:
++# tack
++#	no flash
++#	no beep
++#	no dim
++#	no blink
++#	no invis
++#	no italics
++#	ok smxx/rmxx
++#	bce screen shows diagonal lines...
++#	kf6 sends nothing
++#	kf11 toggles maximize
++#	cursor-key application mode works
++#	numeric keypad application does not work; keys always send face-codes
++#	sends utf-8 for meta, like xterm
++# vttest
++#	has problems with menu #1 (wrapping)
++#	DA = vt200 with 132 columns, color
++#	DA2 = 990, 100300 ("\E[>990;100300;0c")
++#	no VT52, no double-size characters
++#	vt220 ECH test works, SRM, DECSCA do not
++#	S7C1T/S8C1t does not work
++#	DECUDK does not work
++#	CNL does not work; the other ECMA-48 cursor-movement tests work
++#	REP sort-of works (does not match xterm)
++#	SD/SU work, but not SL/SR
++#	window reporting: works for size in chars/pixels, but not other tests
++#	X10 mouse clicks work -- but return 4 rather than 1 for codes
++#	any-event mouse mode acts like any-button mode
++#	implements SGR mouse-mode
++# other:
++#	does not implement initc
++#	does accept either colons or semicolon in 38/48 SGR.
++domterm|DomTerm web client,
++	npc,
++	bel@, blink@, dim@, invis@, kcbt=\E[Z, ritm@, rmkx=\E[?1l,
++	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
++	    %t;7%;m,
++	sitm@, smkx=\E[?1h, use=xterm+256setaf, use=ecma+index,
++	use=xterm+sm+1006, use=xterm+pcfkeys, use=xterm-basic,
++	use=xterm-basic,
++
+ ######## UNIX VIRTUAL TERMINALS, VIRTUAL CONSOLES, AND TELNET CLIENTS
+ #
+ 
+@@ -26282,4 +26341,8 @@
+ #	+ add vscode, vscode-direct -TD
+ #	+ use ecma+index in screen, st -TD
+ #
++# 2019-07-06
++#	+ add domterm -TD
++#	+ improve comments for recent changes, add alias xterm.js -TD
++#
+ ######## SHANTIH!  SHANTIH!  SHANTIH!
+Index: package/debian-mingw/changelog
+--- ncurses-6.1-20190630+/package/debian-mingw/changelog	2019-06-30 01:30:19.000000000 +0000
++++ ncurses-6.1-20190706/package/debian-mingw/changelog	2019-07-06 09:10:26.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.1+20190630) unstable; urgency=low
++ncurses6 (6.1+20190706) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 29 Jun 2019 21:29:49 -0400
++ -- Thomas E. Dickey   Sat, 06 Jul 2019 05:10:26 -0400
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.1-20190630+/package/debian-mingw64/changelog	2019-06-30 01:30:19.000000000 +0000
++++ ncurses-6.1-20190706/package/debian-mingw64/changelog	2019-07-06 09:10:26.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.1+20190630) unstable; urgency=low
++ncurses6 (6.1+20190706) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 29 Jun 2019 21:29:49 -0400
++ -- Thomas E. Dickey   Sat, 06 Jul 2019 05:10:26 -0400
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.1-20190630+/package/debian/changelog	2019-06-30 01:30:19.000000000 +0000
++++ ncurses-6.1-20190706/package/debian/changelog	2019-07-06 09:10:26.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.1+20190630) unstable; urgency=low
++ncurses6 (6.1+20190706) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 29 Jun 2019 21:29:49 -0400
++ -- Thomas E. Dickey   Sat, 06 Jul 2019 05:10:26 -0400
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.338 
+--- ncurses-6.1-20190630+/package/mingw-ncurses.nsi	2019-06-30 01:30:19.000000000 +0000
++++ ncurses-6.1-20190706/package/mingw-ncurses.nsi	2019-07-06 09:10:26.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.338 2019/06/30 01:30:19 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.339 2019/07/06 09:10:26 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "1"
+ !define VERSION_YYYY  "2019"
+-!define VERSION_MMDD  "0630"
++!define VERSION_MMDD  "0706"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.1-20190630+/package/mingw-ncurses.spec	2019-06-30 18:34:07.000000000 +0000
++++ ncurses-6.1-20190706/package/mingw-ncurses.spec	2019-07-06 09:10:26.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.1
+-Release: 20190630
++Release: 20190706
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.1-20190630+/package/ncurses.spec	2019-06-30 01:30:19.000000000 +0000
++++ ncurses-6.1-20190706/package/ncurses.spec	2019-07-06 09:10:26.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.1
+-Release: 20190630
++Release: 20190706
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncursest.spec
+--- ncurses-6.1-20190630+/package/ncursest.spec	2019-06-30 01:30:19.000000000 +0000
++++ ncurses-6.1-20190706/package/ncursest.spec	2019-07-06 09:10:26.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.1
+-Release: 20190630
++Release: 20190706
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/ncurses-6.1-20190713.patch b/ncurses-6.1-20190713.patch
new file mode 100644
index 0000000..08bcffe
--- /dev/null
+++ b/ncurses-6.1-20190713.patch
@@ -0,0 +1,904 @@
+# ncurses 6.1 - patch 20190713 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.1 is at
+# 	ftp.gnu.org:/pub/gnu
+#
+# Patches for ncurses 6.1 can be found at
+# 	ftp://ftp.invisible-island.net/ncurses/6.1
+#	http://invisible-mirror.net/archives/ncurses/6.1 
+#
+# ------------------------------------------------------------------------------
+# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20190713.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Jul 14 00:50:41 UTC 2019
+# ------------------------------------------------------------------------------
+# NEWS                                                     |    8 ++
+# VERSION                                                  |    2 
+# dist.mk                                                  |    4 -
+# doc/html/ada/funcs/T.htm                                 |    2 
+# doc/html/ada/terminal_interface-curses-terminfo__adb.htm |    2 
+# 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_bkgd.3x.html                           |   10 ++-
+# doc/html/man/curs_mouse.3x.html                          |   13 ++--
+# 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/term.7.html                                 |    6 +-
+# doc/html/man/terminfo.5.html                             |   39 +++++++------
+# 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_bkgd.3x                                         |   10 ++-
+# man/curs_mouse.3x                                        |   18 +++---
+# man/term.7                                               |    6 +-
+# man/terminfo.head                                        |    6 +-
+# man/terminfo.tail                                        |   30 +++++-----
+# 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 
+# package/ncursest.spec                                    |    2 
+# progs/reset_cmd.c                                        |    9 +--
+# test/padview.c                                           |   14 +++-
+# 38 files changed, 132 insertions(+), 99 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.3344 
+--- ncurses-6.1-20190706+/NEWS	2019-07-06 20:51:46.000000000 +0000
++++ ncurses-6.1-20190713/NEWS	2019-07-13 23:10:57.000000000 +0000
+@@ -25,7 +25,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.3344 2019/07/06 20:51:46 tom Exp $
++-- $Id: NEWS,v 1.3347 2019/07/13 23:10:57 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.
+ 
++20190713
++	+ change reset's behavior for margins to simply clear soft-margins if
++	  possible, rather than clearing and then setting them according to the
++	  terminal's width (suggested by Thomas Wolff).
++	+ correct order of one wbkgd versus start_color call in test/padview.c
++
+ 20190706
+ 	+ add domterm -TD
+ 	+ improve comments for recent changes, add alias xterm.js -TD
+Index: VERSION
+--- ncurses-6.1-20190706+/VERSION	2019-07-06 09:10:26.000000000 +0000
++++ ncurses-6.1-20190713/VERSION	2019-07-13 20:42:44.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.1	20190706
++5:0:10	6.1	20190713
+Index: dist.mk
+Prereq:  1.1293 
+--- ncurses-6.1-20190706+/dist.mk	2019-07-06 09:10:26.000000000 +0000
++++ ncurses-6.1-20190713/dist.mk	2019-07-13 20:42:44.000000000 +0000
+@@ -25,7 +25,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1293 2019/07/06 09:10:26 tom Exp $
++# $Id: dist.mk,v 1.1294 2019/07/13 20:42:44 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 = 1
+-NCURSES_PATCH = 20190706
++NCURSES_PATCH = 20190713
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/ada/funcs/T.htm
+--- ncurses-6.1-20190706+/doc/html/ada/funcs/T.htm	2019-06-15 23:31:13.000000000 +0000
++++ ncurses-6.1-20190713/doc/html/ada/funcs/T.htm	2019-07-13 23:50:38.000000000 +0000
+@@ -20,8 +20,8 @@
+ 
  • tgetnum
+ 
  • tgetstr -  terminal_interface-curses-termcap.adb:108
+ 
  • tgetstr -  terminal_interface-curses-termcap.adb:129
+-
  • TGoto
+ 
  • tgoto
++
  • TGoto
+ 
  • tigetflag
+ 
  • tigetstr -  terminal_interface-curses-terminfo.adb:87
+ 
  • tigetstr -  terminal_interface-curses-terminfo.adb:108
+Index: doc/html/ada/terminal_interface-curses-terminfo__adb.htm
+--- ncurses-6.1-20190706+/doc/html/ada/terminal_interface-curses-terminfo__adb.htm	2019-03-16 19:34:48.000000000 +0000
++++ ncurses-6.1-20190713/doc/html/ada/terminal_interface-curses-terminfo__adb.htm	2019-07-13 23:50:39.000000000 +0000
+@@ -151,7 +151,7 @@
+    end Get_Number;
+ 
+ ------------------------------------------------------------------------------
+-   procedure Put_String (Str    : Terminfo_String;
++   procedure Put_String (Str    : Terminfo_String;
+                          affcnt : Natural := 1;
+                          putc   : putctype := null) is
+       function tputs (str    : char_array;
+Index: doc/html/man/adacurses6-config.1.html
+--- ncurses-6.1-20190706+/doc/html/man/adacurses6-config.1.html	2019-06-23 21:16:02.000000000 +0000
++++ ncurses-6.1-20190713/doc/html/man/adacurses6-config.1.html	2019-07-13 23:50:33.000000000 +0000
+@@ -125,7 +125,7 @@
+

    • SEE ALSO

    +        curses(3x)
+ 
+-       This describes ncurses version 6.1 (patch 20190623).
++       This describes ncurses version 6.1 (patch 20190713).
+ 
+ 
+ 
+Index: doc/html/man/captoinfo.1m.html
+--- ncurses-6.1-20190706+/doc/html/man/captoinfo.1m.html	2019-06-23 21:16:02.000000000 +0000
++++ ncurses-6.1-20190713/doc/html/man/captoinfo.1m.html	2019-07-13 23:50:33.000000000 +0000
+@@ -190,7 +190,7 @@
+

    SEE ALSO

    +        infocmp(1m), curses(3x), terminfo(5)
+ 
+-       This describes ncurses version 6.1 (patch 20190623).
++       This describes ncurses version 6.1 (patch 20190713).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/clear.1.html
+--- ncurses-6.1-20190706+/doc/html/man/clear.1.html	2019-06-23 21:16:02.000000000 +0000
++++ ncurses-6.1-20190713/doc/html/man/clear.1.html	2019-07-13 23:50:33.000000000 +0000
+@@ -148,7 +148,7 @@
+

    SEE ALSO

    +        tput(1), terminfo(5)
+ 
+-       This describes ncurses version 6.1 (patch 20190623).
++       This describes ncurses version 6.1 (patch 20190713).
+ 
+ 
+ 
+Index: doc/html/man/curs_bkgd.3x.html
+--- ncurses-6.1-20190706+/doc/html/man/curs_bkgd.3x.html	2019-03-16 19:34:43.000000000 +0000
++++ ncurses-6.1-20190713/doc/html/man/curs_bkgd.3x.html	2019-07-13 23:50:33.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -121,6 +121,12 @@
+            rent  background,  and  then  adding  attributes from the new back-
+            ground.
+ 
++       If the background's character value is zero, a space is assumed.
++
++       If the terminal does not support  color,  or  if  color  has  not  been
++       started   with   start_color,  the  new  background  character's  color
++       attribute will be ignored.
++
+ 
+

    getbkgd

    +        The getbkgd function returns  the  given  window's  current  background
+Index: doc/html/man/curs_mouse.3x.html
+--- ncurses-6.1-20190706+/doc/html/man/curs_mouse.3x.html	2019-03-16 19:34:44.000000000 +0000
++++ ncurses-6.1-20190713/doc/html/man/curs_mouse.3x.html	2019-07-13 23:50:34.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -347,10 +347,11 @@
+ 
+        Because  there  are  no standard terminal responses that would serve to
+        identify terminals which support the xterm mouse protocol, ncurses  as-
+-       sumes  that  if  your  $TERM  environment variable contains "xterm", or
+-       kmous is defined in the terminal description,  then  the  terminal  may
+-       send mouse events.  The kmous capability is checked first, allowing the
+-       use of newer xterm mouse protocols.
++       sumes  that  if kmous is defined in the terminal description, or if the
++       terminal description's primary  name  or  aliases  contain  the  string
++       "xterm", then the terminal may send mouse events.  The kmous capability
++       is checked first, allowing the use of newer xterm mouse protocols  such
++       as xterm's private mode 1006.
+ 
+ 
+

    SEE ALSO

    +Index: doc/html/man/form.3x.html
+--- ncurses-6.1-20190706+/doc/html/man/form.3x.html	2019-06-23 21:16:04.000000000 +0000
++++ ncurses-6.1-20190713/doc/html/man/form.3x.html	2019-07-13 23:50:35.000000000 +0000
+@@ -246,7 +246,7 @@
+        curses(3x)  and  related  pages  whose names begin "form_" for detailed
+        descriptions of the entry points.
+ 
+-       This describes ncurses version 6.1 (patch 20190623).
++       This describes ncurses version 6.1 (patch 20190713).
+ 
+ 
+ 
+Index: doc/html/man/infocmp.1m.html
+--- ncurses-6.1-20190706+/doc/html/man/infocmp.1m.html	2019-06-23 21:16:04.000000000 +0000
++++ ncurses-6.1-20190713/doc/html/man/infocmp.1m.html	2019-07-13 23:50:36.000000000 +0000
+@@ -481,7 +481,7 @@
+ 
+        https://invisible-island.net/ncurses/tctest.html
+ 
+-       This describes ncurses version 6.1 (patch 20190623).
++       This describes ncurses version 6.1 (patch 20190713).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/infotocap.1m.html
+--- ncurses-6.1-20190706+/doc/html/man/infotocap.1m.html	2019-06-23 21:16:04.000000000 +0000
++++ ncurses-6.1-20190713/doc/html/man/infotocap.1m.html	2019-07-13 23:50:36.000000000 +0000
+@@ -85,7 +85,7 @@
+

    SEE ALSO

    +        curses(3x), tic(1m), infocmp(1m), terminfo(5)
+ 
+-       This describes ncurses version 6.1 (patch 20190623).
++       This describes ncurses version 6.1 (patch 20190713).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/menu.3x.html
+--- ncurses-6.1-20190706+/doc/html/man/menu.3x.html	2019-06-23 21:16:05.000000000 +0000
++++ ncurses-6.1-20190713/doc/html/man/menu.3x.html	2019-07-13 23:50:36.000000000 +0000
+@@ -221,7 +221,7 @@
+        curses(3x)  and  related  pages  whose names begin "menu_" for detailed
+        descriptions of the entry points.
+ 
+-       This describes ncurses version 6.1 (patch 20190623).
++       This describes ncurses version 6.1 (patch 20190713).
+ 
+ 
+ 
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.1-20190706+/doc/html/man/ncurses.3x.html	2019-06-23 21:16:05.000000000 +0000
++++ ncurses-6.1-20190713/doc/html/man/ncurses.3x.html	2019-07-13 23:50:37.000000000 +0000
+@@ -59,7 +59,7 @@
+        method of updating  character  screens  with  reasonable  optimization.
+        This  implementation  is  "new  curses"  (ncurses)  and is the approved
+        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
+-       This describes ncurses version 6.1 (patch 20190623).
++       This describes ncurses version 6.1 (patch 20190713).
+ 
+        The  ncurses  library emulates the curses library of System V Release 4
+        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
+Index: doc/html/man/ncurses6-config.1.html
+--- ncurses-6.1-20190706+/doc/html/man/ncurses6-config.1.html	2019-06-23 21:16:05.000000000 +0000
++++ ncurses-6.1-20190713/doc/html/man/ncurses6-config.1.html	2019-07-13 23:50:37.000000000 +0000
+@@ -112,7 +112,7 @@
+

    SEE ALSO

    +        curses(3x)
+ 
+-       This describes ncurses version 6.1 (patch 20190623).
++       This describes ncurses version 6.1 (patch 20190713).
+ 
+ 
+ 
+Index: doc/html/man/panel.3x.html
+--- ncurses-6.1-20190706+/doc/html/man/panel.3x.html	2019-06-23 21:16:05.000000000 +0000
++++ ncurses-6.1-20190713/doc/html/man/panel.3x.html	2019-07-13 23:50:37.000000000 +0000
+@@ -204,7 +204,7 @@
+

    SEE ALSO

    +        curses(3x), curs_variables(3x),
+ 
+-       This describes ncurses version 6.1 (patch 20190623).
++       This describes ncurses version 6.1 (patch 20190713).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/tabs.1.html
+--- ncurses-6.1-20190706+/doc/html/man/tabs.1.html	2019-06-23 21:16:06.000000000 +0000
++++ ncurses-6.1-20190713/doc/html/man/tabs.1.html	2019-07-13 23:50:37.000000000 +0000
+@@ -205,7 +205,7 @@
+

    SEE ALSO

    +        tset(1), infocmp(1m), curses(3x), terminfo(5).
+ 
+-       This describes ncurses version 6.1 (patch 20190623).
++       This describes ncurses version 6.1 (patch 20190713).
+ 
+ 
+ 
+Index: doc/html/man/term.7.html
+--- ncurses-6.1-20190706+/doc/html/man/term.7.html	2019-03-16 19:34:46.000000000 +0000
++++ ncurses-6.1-20190713/doc/html/man/term.7.html	2019-07-13 23:50:37.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -177,7 +177,7 @@
+ 
+        -vb  Use visible bell (flash) rather than beep.
+ 
+-       -w   Wide; terminal is in 132 column mode.
++       -w   Wide; terminal is in 132-column mode.
+ 
+        Conventionally, if your terminal type is a variant intended to  specify
+        a  line  height,  that  suffix should go first.  So, for a hypothetical
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.1-20190706+/doc/html/man/terminfo.5.html	2019-06-23 21:16:06.000000000 +0000
++++ ncurses-6.1-20190713/doc/html/man/terminfo.5.html	2019-07-13 23:50:37.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-2017,2018 Free Software Foundation, Inc.              *
++  * Copyright (c) 1998-2018,2019 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.35 2018/07/28 22:29:09 tom Exp @
++  * @Id: terminfo.head,v 1.36 2019/07/13 23:17:33 tom Exp @
+   * Head of terminfo man page ends here
+-  * @Id: terminfo.tail,v 1.93 2019/06/01 22:32:15 tom Exp @
++  * @Id: terminfo.tail,v 1.95 2019/07/13 23:29:04 tom Exp @
+   * Beginning of terminfo.tail file
+   * This file is part of ncurses.
+   * See "terminfo.head" for copyright.
+@@ -74,7 +74,7 @@
+        Terminfo describes terminals by giving a set of capabilities which they
+        have, by specifying how to perform screen operations, and by specifying
+        padding  requirements  and  initialization  sequences.   This describes
+-       ncurses version 6.1 (patch 20190623).
++       ncurses version 6.1 (patch 20190713).
+ 
+ 
+

    Terminfo Entry Syntax

    +@@ -124,7 +124,7 @@
+        ing  up the terminal should have a root name, thus "hp2621".  This name
+        should not contain hyphens.  Modes that the hardware can be in, or user
+        preferences,  should be indicated by appending a hyphen and a mode suf-
+-       fix.  Thus, a vt100 in 132 column mode would be vt100-w.  The following
++       fix.  Thus, a vt100 in 132-column mode would be vt100-w.  The following
+        suffixes should be used where possible:
+ 
+             Suffix                  Meaning                   Example
+@@ -1902,10 +1902,14 @@
+               run the program
+                      iprog
+ 
+-              output is1 is2
++              output
++                     is1 and
++                     is2
+ 
+               set the margins using
+-                     mgc, smgl and smgr
++                     mgc or
++                     smglp and smgrp or
++                     smgl and smgr
+ 
+               set tabs using
+                      tbc and hts
+@@ -1913,8 +1917,8 @@
+               print the file
+                      if
+ 
+-              and finally
+-                     output is3.
++              and finally output
++                     is3.
+ 
+        Most initialization is done with is2.  Special terminal  modes  can  be
+        set  up  without duplicating strings by putting the common sequences in
+@@ -1922,14 +1926,14 @@
+ 
+        A set of sequences that does a harder  reset  from  a  totally  unknown
+        state can be given as rs1, rs2, rf and rs3, analogous to is1 , is2 , if
+-       and is3 respectively.  These strings are output by  the  reset  program
+-       (an  alias of tset), which is used when the terminal gets into a wedged
+-       state.  Commands are normally placed in rs1, rs2 rs3  and  rf  only  if
+-       they  produce 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.
++       and is3 respectively.  These strings are  output  by  reset  option  of
++       tput,  or  by  the reset program (an alias of tset), which is used when
++       the terminal gets into a wedged state.  Commands are normally placed in
++       rs1, rs2 rs3 and rf only if they produce 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., instead of  is1,  etc.   If
+@@ -2146,7 +2150,6 @@
+                     green     COLOR_GREEN       2     0,max,0
+                     yellow    COLOR_YELLOW      3     max,max,0
+                     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
+Index: doc/html/man/tic.1m.html
+--- ncurses-6.1-20190706+/doc/html/man/tic.1m.html	2019-06-23 21:16:06.000000000 +0000
++++ ncurses-6.1-20190713/doc/html/man/tic.1m.html	2019-07-13 23:50:37.000000000 +0000
+@@ -365,7 +365,7 @@
+        infocmp(1m),   captoinfo(1m),   infotocap(1m),   toe(1m),   curses(3x),
+        term(5).  terminfo(5).  user_caps(5).
+ 
+-       This describes ncurses version 6.1 (patch 20190623).
++       This describes ncurses version 6.1 (patch 20190713).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/toe.1m.html
+--- ncurses-6.1-20190706+/doc/html/man/toe.1m.html	2019-06-23 21:16:06.000000000 +0000
++++ ncurses-6.1-20190713/doc/html/man/toe.1m.html	2019-07-13 23:50:37.000000000 +0000
+@@ -113,7 +113,7 @@
+        tic(1m), infocmp(1m), captoinfo(1m),  infotocap(1m),  curses(3x),  ter-
+        minfo(5).
+ 
+-       This describes ncurses version 6.1 (patch 20190623).
++       This describes ncurses version 6.1 (patch 20190713).
+ 
+ 
+ 
+Index: doc/html/man/tput.1.html
+--- ncurses-6.1-20190706+/doc/html/man/tput.1.html	2019-06-23 21:16:06.000000000 +0000
++++ ncurses-6.1-20190713/doc/html/man/tput.1.html	2019-07-13 23:50:37.000000000 +0000
+@@ -522,7 +522,7 @@
+

    SEE ALSO

    +        clear(1), stty(1), tabs(1), tset(1), terminfo(5), curs_termcap(3x).
+ 
+-       This describes ncurses version 6.1 (patch 20190623).
++       This describes ncurses version 6.1 (patch 20190713).
+ 
+ 
+ 
+Index: doc/html/man/tset.1.html
+--- ncurses-6.1-20190706+/doc/html/man/tset.1.html	2019-06-23 21:16:06.000000000 +0000
++++ ncurses-6.1-20190713/doc/html/man/tset.1.html	2019-07-13 23:50:37.000000000 +0000
+@@ -389,7 +389,7 @@
+        csh(1),  sh(1),  stty(1),   curs_terminfo(3x),   tty(4),   terminfo(5),
+        ttys(5), environ(7)
+ 
+-       This describes ncurses version 6.1 (patch 20190623).
++       This describes ncurses version 6.1 (patch 20190713).
+ 
+ 
+ 
+Index: man/curs_bkgd.3x
+Prereq:  1.28 
+--- ncurses-6.1-20190706+/man/curs_bkgd.3x	2018-12-09 00:45:05.000000000 +0000
++++ ncurses-6.1-20190713/man/curs_bkgd.3x	2019-07-13 21:01:06.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2018,2019 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_bkgd.3x,v 1.28 2018/12/09 00:45:05 tom Exp $
++.\" $Id: curs_bkgd.3x,v 1.29 2019/07/13 21:01:06 tom Exp $
+ .de bP
+ .ie n  .IP \(bu 4
+ .el    .IP \(bu 2
+@@ -112,6 +112,12 @@
+ the library updates only the non-color attributes,
+ first removing those which may have come from the current background,
+ and then adding attributes from the new background.
++.PP
++If the background's character value is zero, a space is assumed.
++.PP
++If the terminal does not support color,
++or if color has not been started with \fBstart_color\fP,
++the new background character's color attribute will be ignored.
+ .SS getbkgd
+ .PP
+ The \fBgetbkgd\fR function returns the given window's current background
+Index: man/curs_mouse.3x
+Prereq:  1.50 
+--- ncurses-6.1-20190706+/man/curs_mouse.3x	2018-12-29 23:40:47.000000000 +0000
++++ ncurses-6.1-20190713/man/curs_mouse.3x	2019-07-13 23:45:12.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2018,2019 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.50 2018/12/29 23:40:47 tom Exp $
++.\" $Id: curs_mouse.3x,v 1.51 2019/07/13 23:45:12 tom Exp $
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+ .ie \n(.g .ds '' \(rq
+@@ -394,7 +394,7 @@
+ .PP
+ Mouse events under xterm will not be detected correctly in a window with
+ its keypad bit off, since they are interpreted as a variety of function key.
+-Your terminfo description should have \fBkmous\fR set to "\\E[M"
++Your terminfo description should have \fBkmous\fR set to \*(``\\E[M\*(''
+ (the beginning of the response from xterm for mouse clicks).
+ Other values for \fBkmous\fR are permitted,
+ but under the same assumption,
+@@ -402,11 +402,13 @@
+ .PP
+ Because there are no standard terminal responses that would serve to identify
+ terminals which support the xterm mouse protocol, \fBncurses\fR assumes that
+-if your $TERM environment variable contains \*(``xterm\*('',
+-or \fBkmous\fR is defined in
+-the terminal description, then the terminal may send mouse events.
+-The \fBkmous\fP capability is checked first, allowing the
+-use of newer xterm mouse protocols.
++if \fBkmous\fR is defined in the terminal description,
++or if the terminal description's primary name or aliases
++contain the string \*(``xterm\*('',
++then the terminal may send mouse events.
++The \fBkmous\fP capability is checked first,
++allowing the use of newer xterm mouse protocols
++such as xterm's private mode 1006.
+ .SH SEE ALSO
+ \fBcurses\fR(3X),
+ \fBcurs_kernel\fR(3X),
+Index: man/term.7
+Prereq:  1.26 
+--- ncurses-6.1-20190706+/man/term.7	2018-07-28 22:19:56.000000000 +0000
++++ ncurses-6.1-20190713/man/term.7	2019-07-13 23:17:23.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2018,2019 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.7,v 1.26 2018/07/28 22:19:56 tom Exp $
++.\" $Id: term.7,v 1.27 2019/07/13 23:17:23 tom Exp $
+ .TH term 7
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -190,7 +190,7 @@
+ Use visible bell (flash) rather than beep.
+ .TP 5
+ \-w
+-Wide; terminal is in 132 column mode.
++Wide; terminal is in 132-column mode.
+ .PP
+ Conventionally, if your terminal type is a variant intended to specify a
+ line height, that suffix should go first.
+Index: man/terminfo.head
+Prereq:  1.35 
+--- ncurses-6.1-20190706+/man/terminfo.head	2018-07-28 22:29:09.000000000 +0000
++++ ncurses-6.1-20190713/man/terminfo.head	2019-07-13 23:17:33.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2018,2019 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.35 2018/07/28 22:29:09 tom Exp $
++.\" $Id: terminfo.head,v 1.36 2019/07/13 23:17:33 tom Exp $
+ .TH terminfo 5 "" "" "File Formats"
+ .ds n 5
+ .ds d @TERMINFO@
+@@ -124,7 +124,7 @@
+ This name should not contain hyphens.
+ Modes that the hardware can be in, or user preferences, should
+ be indicated by appending a hyphen and a mode suffix.
+-Thus, a vt100 in 132 column mode would be vt100\-w.
++Thus, a vt100 in 132-column mode would be vt100\-w.
+ The following suffixes should be used where possible:
+ .PP
+ .TS
+Index: man/terminfo.tail
+Prereq:  1.93 
+--- ncurses-6.1-20190706+/man/terminfo.tail	2019-06-01 22:32:15.000000000 +0000
++++ ncurses-6.1-20190713/man/terminfo.tail	2019-07-13 23:29:04.000000000 +0000
+@@ -1,4 +1,4 @@
+-.\" $Id: terminfo.tail,v 1.93 2019/06/01 22:32:15 tom Exp $
++.\" $Id: terminfo.tail,v 1.95 2019/07/13 23:29:04 tom Exp $
+ .\" Beginning of terminfo.tail file
+ .\" This file is part of ncurses.
+ .\" See "terminfo.head" for copyright.
+@@ -1141,14 +1141,17 @@
+ .B iprog
+ .TP
+ output
+-.B is1
+-.B is2
++.br
++\fBis1\fP and
++.br
++\fBis2\fP
+ .TP
+ set the margins using
+-.BR mgc ,
+-.B smgl
+-and
+-.B smgr
++\fBmgc\fP or
++.br
++\fBsmglp\fP and \fBsmgrp\fP or
++.br
++\fBsmgl\fP and \fBsmgr\fP
+ .TP
+ set tabs using
+ .B tbc
+@@ -1156,11 +1159,10 @@
+ .B hts
+ .TP
+ print the file
+-.B if
++\fBif\fP
+ .TP
+-and finally
+-output
+-.BR is3 .
++and finally output
++\fBis3\fP.
+ .RE
+ .PP
+ Most initialization is done with
+@@ -1187,7 +1189,9 @@
+ and
+ .B is3
+ respectively.
+-These strings are output by the \fB@RESET@\fP program
++These strings are output
++by \fIreset\fP option of \fB@TPUT@\fP,
++or by the \fB@RESET@\fP program
+ (an alias of \fB@TSET@\fP),
+ which is used when the terminal gets into a wedged state.
+ Commands are normally placed in
+@@ -1202,7 +1206,7 @@
+ normally be part of
+ .BR 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.
++needed since the terminal is usually already in 80-column mode.
+ .PP
+ The \fB@RESET@\fP program writes strings including
+ .BR iprog ,
+Index: package/debian-mingw/changelog
+--- ncurses-6.1-20190706+/package/debian-mingw/changelog	2019-07-06 09:10:26.000000000 +0000
++++ ncurses-6.1-20190713/package/debian-mingw/changelog	2019-07-13 20:42:44.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.1+20190706) unstable; urgency=low
++ncurses6 (6.1+20190713) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 06 Jul 2019 05:10:26 -0400
++ -- Thomas E. Dickey   Sat, 13 Jul 2019 16:42:44 -0400
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.1-20190706+/package/debian-mingw64/changelog	2019-07-06 09:10:26.000000000 +0000
++++ ncurses-6.1-20190713/package/debian-mingw64/changelog	2019-07-13 20:42:44.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.1+20190706) unstable; urgency=low
++ncurses6 (6.1+20190713) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 06 Jul 2019 05:10:26 -0400
++ -- Thomas E. Dickey   Sat, 13 Jul 2019 16:42:44 -0400
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.1-20190706+/package/debian/changelog	2019-07-06 09:10:26.000000000 +0000
++++ ncurses-6.1-20190713/package/debian/changelog	2019-07-13 20:42:44.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.1+20190706) unstable; urgency=low
++ncurses6 (6.1+20190713) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 06 Jul 2019 05:10:26 -0400
++ -- Thomas E. Dickey   Sat, 13 Jul 2019 16:42:44 -0400
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.339 
+--- ncurses-6.1-20190706+/package/mingw-ncurses.nsi	2019-07-06 09:10:26.000000000 +0000
++++ ncurses-6.1-20190713/package/mingw-ncurses.nsi	2019-07-13 20:42:44.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.339 2019/07/06 09:10:26 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.340 2019/07/13 20:42:44 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "1"
+ !define VERSION_YYYY  "2019"
+-!define VERSION_MMDD  "0706"
++!define VERSION_MMDD  "0713"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.1-20190706+/package/mingw-ncurses.spec	2019-07-06 09:10:26.000000000 +0000
++++ ncurses-6.1-20190713/package/mingw-ncurses.spec	2019-07-13 20:42:44.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.1
+-Release: 20190706
++Release: 20190713
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.1-20190706+/package/ncurses.spec	2019-07-06 09:10:26.000000000 +0000
++++ ncurses-6.1-20190713/package/ncurses.spec	2019-07-13 20:42:44.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.1
+-Release: 20190706
++Release: 20190713
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncursest.spec
+--- ncurses-6.1-20190706+/package/ncursest.spec	2019-07-06 09:10:26.000000000 +0000
++++ ncurses-6.1-20190713/package/ncursest.spec	2019-07-13 20:42:44.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.1
+-Release: 20190706
++Release: 20190713
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: progs/reset_cmd.c
+Prereq:  1.17 
+--- ncurses-6.1-20190706+/progs/reset_cmd.c	2019-05-25 22:36:53.000000000 +0000
++++ ncurses-6.1-20190713/progs/reset_cmd.c	2019-07-13 21:35:13.000000000 +0000
+@@ -52,7 +52,7 @@
+ #include 
+ #endif
+ 
+-MODULE_ID("$Id: reset_cmd.c,v 1.17 2019/05/25 22:36:53 tom Exp $")
++MODULE_ID("$Id: reset_cmd.c,v 1.18 2019/07/13 21:35:13 tom Exp $")
+ 
+ /*
+  * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,
+@@ -495,6 +495,9 @@
+ 				  ? reset_2string
+ 				  : init_2string);
+ 
++	if (VALID_STRING(clear_margins)) {
++	    need_flush |= sent_string(clear_margins);
++	} else
+ #if defined(set_lr_margin)
+ 	if (VALID_STRING(set_lr_margin)) {
+ 	    need_flush |= sent_string(TPARM_2(set_lr_margin, 0,
+@@ -509,10 +512,8 @@
+ 					      columns - 1));
+ 	} else
+ #endif
+-	    if (VALID_STRING(clear_margins)
+-		&& VALID_STRING(set_left_margin)
++	    if (VALID_STRING(set_left_margin)
+ 		&& VALID_STRING(set_right_margin)) {
+-	    need_flush |= sent_string(clear_margins);
+ 	    need_flush |= to_left_margin();
+ 	    need_flush |= sent_string(set_left_margin);
+ 	    if (VALID_STRING(parm_right_cursor)) {
+Index: test/padview.c
+Prereq:  1.13 
+--- ncurses-6.1-20190706+/test/padview.c	2019-01-21 19:47:07.000000000 +0000
++++ ncurses-6.1-20190713/test/padview.c	2019-07-13 20:41:47.000000000 +0000
+@@ -28,7 +28,7 @@
+ /*
+  * clone of view.c, using pads
+  *
+- * $Id: padview.c,v 1.13 2019/01/21 19:47:07 tom Exp $
++ * $Id: padview.c,v 1.14 2019/07/13 20:41:47 tom Exp $
+  */
+ 
+ #include 
+@@ -191,7 +191,7 @@
+ 	failed("cannot allocate pad workspace");
+     if (try_color) {
+ 	wattrset(my_pad, COLOR_PAIR(my_pair));
+-	wbkgd(my_pad, (chtype) COLOR_PAIR(my_pair));
++	wbkgd(my_pad, (chtype) (' ' | COLOR_PAIR(my_pair)));
+     }
+ 
+     /*
+@@ -347,18 +347,22 @@
+ 	nodelay(stdscr, TRUE);
+     idlok(stdscr, TRUE);	/* allow use of insert/delete line */
+ 
+-    my_pad = read_file(fname = argv[optind]);
+-
+     if (try_color) {
+ 	if (has_colors()) {
+ 	    start_color();
+ 	    init_pair(my_pair, COLOR_WHITE, COLOR_BLUE);
+-	    bkgd((chtype) COLOR_PAIR(my_pair));
++	    bkgd((chtype) (' ' | COLOR_PAIR(my_pair)));
+ 	} else {
+ 	    try_color = FALSE;
+ 	}
+     }
+ 
++    /*
++     * Do this after starting color, otherwise the pad's background will be
++     * uncolored after the ncurses 6.1.20181208 fixes.
++     */
++    my_pad = read_file(fname = argv[optind]);
++
+     my_row = 0;
+     while (!done) {
+ 	int n, c;
diff --git a/ncurses-6.1-20190720.patch b/ncurses-6.1-20190720.patch
new file mode 100644
index 0000000..0505f4d
--- /dev/null
+++ b/ncurses-6.1-20190720.patch
@@ -0,0 +1,1437 @@
+# ncurses 6.1 - patch 20190720 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.1 is at
+# 	ftp.gnu.org:/pub/gnu
+#
+# Patches for ncurses 6.1 can be found at
+# 	ftp://ftp.invisible-island.net/ncurses/6.1
+#	http://invisible-mirror.net/archives/ncurses/6.1 
+#
+# ------------------------------------------------------------------------------
+# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20190720.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Jul 21 01:22:45 UTC 2019
+# ------------------------------------------------------------------------------
+# NEWS                                  |    9 ++
+# 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_get_wstr.3x.html    |   23 +++---
+# doc/html/man/curs_getstr.3x.html      |    8 +-
+# doc/html/man/form.3x.html             |    2 
+# doc/html/man/infocmp.1m.html          |   47 ++++++++++--
+# 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          |   36 ++++++++-
+# doc/html/man/tic.1m.html              |  118 ++++++++++++++++++++++++++------
+# doc/html/man/toe.1m.html              |   65 ++++++++++++++++-
+# doc/html/man/tput.1.html              |    2 
+# doc/html/man/tset.1.html              |    2 
+# include/tic.h                         |    4 -
+# man/curs_get_wstr.3x                  |    8 +-
+# man/curs_getstr.3x                    |    8 +-
+# man/infocmp.1m                        |   30 +++++++-
+# man/man_db.renames                    |    3 
+# man/terminfo.tail                     |   35 ++++++++-
+# man/tic.1m                            |   92 +++++++++++++++++++++++-
+# man/toe.1m                            |   78 ++++++++++++++++++++-
+# ncurses/base/lib_mouse.c              |    8 +-
+# ncurses/base/lib_screen.c             |    8 +-
+# ncurses/tinfo/make_hash.c             |   12 +--
+# ncurses/tinfo/read_entry.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 
+# package/ncursest.spec                 |    2 
+# 40 files changed, 531 insertions(+), 119 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.3347 
+--- ncurses-6.1-20190713+/NEWS	2019-07-13 23:10:57.000000000 +0000
++++ ncurses-6.1-20190720/NEWS	2019-07-21 00:33:00.000000000 +0000
+@@ -25,7 +25,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.3347 2019/07/13 23:10:57 tom Exp $
++-- $Id: NEWS,v 1.3351 2019/07/21 00:33:00 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.
+ 
++20190720
++	+ fix a few warnings for gcc 4.x
++	+ add some portability/historical details to the tic, toe and infocmp
++	  manual pages.
++	+ correct fix for broken link from terminfo(5) to tabs(1) manpage
++	  (report by Sven Joachim).
++
+ 20190713
+ 	+ change reset's behavior for margins to simply clear soft-margins if
+ 	  possible, rather than clearing and then setting them according to the
+Index: VERSION
+--- ncurses-6.1-20190713+/VERSION	2019-07-13 20:42:44.000000000 +0000
++++ ncurses-6.1-20190720/VERSION	2019-07-20 10:26:30.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.1	20190713
++5:0:10	6.1	20190720
+Index: dist.mk
+Prereq:  1.1294 
+--- ncurses-6.1-20190713+/dist.mk	2019-07-13 20:42:44.000000000 +0000
++++ ncurses-6.1-20190720/dist.mk	2019-07-20 10:26:30.000000000 +0000
+@@ -25,7 +25,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1294 2019/07/13 20:42:44 tom Exp $
++# $Id: dist.mk,v 1.1296 2019/07/20 10: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 = 1
+-NCURSES_PATCH = 20190713
++NCURSES_PATCH = 20190720
+ 
+ # 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.1-20190713+/doc/html/man/adacurses6-config.1.html	2019-07-13 23:50:33.000000000 +0000
++++ ncurses-6.1-20190720/doc/html/man/adacurses6-config.1.html	2019-07-20 18:53:10.000000000 +0000
+@@ -125,7 +125,7 @@
+

    SEE ALSO

    +        curses(3x)
+ 
+-       This describes ncurses version 6.1 (patch 20190713).
++       This describes ncurses version 6.1 (patch 20190720).
+ 
+ 
+ 
+Index: doc/html/man/captoinfo.1m.html
+--- ncurses-6.1-20190713+/doc/html/man/captoinfo.1m.html	2019-07-13 23:50:33.000000000 +0000
++++ ncurses-6.1-20190720/doc/html/man/captoinfo.1m.html	2019-07-20 18:53:10.000000000 +0000
+@@ -190,7 +190,7 @@
+

    SEE ALSO

    +        infocmp(1m), curses(3x), terminfo(5)
+ 
+-       This describes ncurses version 6.1 (patch 20190713).
++       This describes ncurses version 6.1 (patch 20190720).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/clear.1.html
+--- ncurses-6.1-20190713+/doc/html/man/clear.1.html	2019-07-13 23:50:33.000000000 +0000
++++ ncurses-6.1-20190720/doc/html/man/clear.1.html	2019-07-20 18:53:10.000000000 +0000
+@@ -148,7 +148,7 @@
+

    SEE ALSO

    +        tput(1), terminfo(5)
+ 
+-       This describes ncurses version 6.1 (patch 20190713).
++       This describes ncurses version 6.1 (patch 20190720).
+ 
+ 
+ 
+Index: doc/html/man/curs_get_wstr.3x.html
+--- ncurses-6.1-20190713+/doc/html/man/curs_get_wstr.3x.html	2019-03-16 19:34:43.000000000 +0000
++++ ncurses-6.1-20190720/doc/html/man/curs_get_wstr.3x.html	2019-07-20 19:16:42.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -141,22 +141,23 @@
+        wchar_t  is  a  unsigned type.  All of the vendors implement this using
+        wint_t, following the standard.
+ 
+-       X/Open Curses issue 7 is unclear regarding whether the terminating null
+-       wchar_t  value is counted in the length parameter n.  X/Open Curses is-
+-       sue 7 revised the corresponding description of wgetnstr to address this
+-       issue.   The unrevised description of wget_nwstr can be interpreted ei-
+-       ther way.  This implementation counts the terminator in the length.
++       X/Open Curses, Issue 7 (2009) is unclear regarding whether  the  termi-
++       nating null wchar_t value is counted in the length parameter n.  X/Open
++       Curses, Issue 7 revised the corresponding description  of  wgetnstr  to
++       address this issue.  The unrevised description of wget_nwstr can be in-
++       terpreted either way.  This implementation counts the terminator in the
++       length.
+ 
+-       X/Open Curses does not specify what happens if the length  n  is  nega-
++       X/Open  Curses  does  not specify what happens if the length n is nega-
+        tive.
+ 
+-       o   For  analogy  with  wgetnstr,  ncurses  6.2  uses a limit (based on
++       o   For analogy with wgetnstr, ncurses  6.2  uses  a  limit  (based  on
+            LINE_MAX).
+ 
+-       o   Some other implementations (such as Solaris xcurses) do  the  same,
++       o   Some  other  implementations (such as Solaris xcurses) do the same,
+            while others (PDCurses) do not allow this.
+ 
+-       o   NetBSD  7 curses imitates ncurses 6.1 in this regard, treating a -1
++       o   NetBSD 7 curses imitates ncurses 6.1 in this regard, treating a  -1
+            as an indefinite number of characters.
+ 
+ 
+Index: doc/html/man/curs_getstr.3x.html
+--- ncurses-6.1-20190713+/doc/html/man/curs_getstr.3x.html	2019-03-16 19:34:43.000000000 +0000
++++ ncurses-6.1-20190720/doc/html/man/curs_getstr.3x.html	2019-07-20 19:16:43.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -457,17 +457,48 @@
+        /usr/share/terminfo Compiled terminal description database.
+ 
+ 
++

    HISTORY

    ++       Although System V Release 2 provided a terminfo library, it had no doc-
++       umented tool for decompiling the terminal  descriptions.   Tony  Hansen
++       (AT&T) wrote the first infocmp in early 1984, for System V Release 3.
++
++       Eric  Raymond used the AT&T documentation in 1995 to provide an equiva-
++       lent infocmp for ncurses.  In addition, he added  a  few  new  features
++       such as:
++
++       o   the  -e option, to support fallback (compiled-in) terminal descrip-
++           tions
++
++       o   the -i option, to help with analysis
++
++       Later, Thomas Dickey added the -x (user-defined  capabilities)  option,
++       and  the  -E option to support fallback entries with user-defined capa-
++       bilities.
++
++       For a complete list, see the EXTENSIONS section.
++
++       In 2010, Roy Marples provided an infocmp program  for  NetBSD.   It  is
++       less  capable  than  the  SVr4  or ncurses versions (e.g., it lacks the
++       sorting options documented in X/Open), but does include the  -x  option
++       adapted from ncurses.
++
++
++

    PORTABILITY

    ++       X/Open  Curses,  Issue  7 (2009) provides a description of infocmp.  It
++       does not mention the options used for converting to termcap format.
++
++
+

    EXTENSIONS

    +-       The  -0, -1, -E, -F, -G, -Q, -R, -T, -V, -a, -e, -f, -g, -i, -l, -p, -q
++       The -0, -1, -E, -F, -G, -Q, -R, -T, -V, -a, -e, -f, -g, -i, -l, -p,  -q
+        and -t options are not supported in SVr4 curses.
+ 
+        SVr4 infocmp does not distinguish between absent and cancelled capabil-
+        ities.  Also, it shows missing integer capabilities as -1 (the internal
+-       value used to represent missing integers).  This  implementation  shows
++       value  used  to represent missing integers).  This implementation shows
+        those as "NULL", for consistency with missing strings.
+ 
+-       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
++       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 -RBSD.
+ 
+ 
+@@ -476,12 +507,12 @@
+ 
+ 
+

    SEE ALSO

    +-       captoinfo(1m),   infotocap(1m),   tic(1m),  toe(1m),  curses(3x),  ter-
++       captoinfo(1m),  infotocap(1m),  tic(1m),  toe(1m),   curses(3x),   ter-
+        minfo(5).  user_caps(5).
+ 
+        https://invisible-island.net/ncurses/tctest.html
+ 
+-       This describes ncurses version 6.1 (patch 20190713).
++       This describes ncurses version 6.1 (patch 20190720).
+ 
+ 
+

    AUTHOR

    +@@ -506,6 +537,8 @@
+ 
+ 
+ 
  • FILES
    • 
++
  • HISTORY
    • 
++
  • PORTABILITY
    • 
+ 
  • EXTENSIONS
    • 
+ 
  • BUGS
    • 
+ 
  • SEE ALSO
    • 
+Index: doc/html/man/infotocap.1m.html
+--- ncurses-6.1-20190713+/doc/html/man/infotocap.1m.html	2019-07-13 23:50:36.000000000 +0000
++++ ncurses-6.1-20190720/doc/html/man/infotocap.1m.html	2019-07-20 18:53:13.000000000 +0000
+@@ -85,7 +85,7 @@
+

    SEE ALSO

    +        curses(3x), tic(1m), infocmp(1m), terminfo(5)
+ 
+-       This describes ncurses version 6.1 (patch 20190713).
++       This describes ncurses version 6.1 (patch 20190720).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/menu.3x.html
+--- ncurses-6.1-20190713+/doc/html/man/menu.3x.html	2019-07-13 23:50:36.000000000 +0000
++++ ncurses-6.1-20190720/doc/html/man/menu.3x.html	2019-07-20 18:53:13.000000000 +0000
+@@ -221,7 +221,7 @@
+        curses(3x)  and  related  pages  whose names begin "menu_" for detailed
+        descriptions of the entry points.
+ 
+-       This describes ncurses version 6.1 (patch 20190713).
++       This describes ncurses version 6.1 (patch 20190720).
+ 
+ 
+ 
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.1-20190713+/doc/html/man/ncurses.3x.html	2019-07-13 23:50:37.000000000 +0000
++++ ncurses-6.1-20190720/doc/html/man/ncurses.3x.html	2019-07-20 18:53:14.000000000 +0000
+@@ -59,7 +59,7 @@
+        method of updating  character  screens  with  reasonable  optimization.
+        This  implementation  is  "new  curses"  (ncurses)  and is the approved
+        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
+-       This describes ncurses version 6.1 (patch 20190713).
++       This describes ncurses version 6.1 (patch 20190720).
+ 
+        The  ncurses  library emulates the curses library of System V Release 4
+        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
+Index: doc/html/man/ncurses6-config.1.html
+--- ncurses-6.1-20190713+/doc/html/man/ncurses6-config.1.html	2019-07-13 23:50:37.000000000 +0000
++++ ncurses-6.1-20190720/doc/html/man/ncurses6-config.1.html	2019-07-20 18:53:14.000000000 +0000
+@@ -112,7 +112,7 @@
+

    SEE ALSO

    +        curses(3x)
+ 
+-       This describes ncurses version 6.1 (patch 20190713).
++       This describes ncurses version 6.1 (patch 20190720).
+ 
+ 
+ 
+Index: doc/html/man/panel.3x.html
+--- ncurses-6.1-20190713+/doc/html/man/panel.3x.html	2019-07-13 23:50:37.000000000 +0000
++++ ncurses-6.1-20190720/doc/html/man/panel.3x.html	2019-07-20 18:53:14.000000000 +0000
+@@ -204,7 +204,7 @@
+

    SEE ALSO

    +        curses(3x), curs_variables(3x),
+ 
+-       This describes ncurses version 6.1 (patch 20190713).
++       This describes ncurses version 6.1 (patch 20190720).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/tabs.1.html
+--- ncurses-6.1-20190713+/doc/html/man/tabs.1.html	2019-07-13 23:50:37.000000000 +0000
++++ ncurses-6.1-20190720/doc/html/man/tabs.1.html	2019-07-20 18:53:15.000000000 +0000
+@@ -205,7 +205,7 @@
+

    SEE ALSO

    +        tset(1), infocmp(1m), curses(3x), terminfo(5).
+ 
+-       This describes ncurses version 6.1 (patch 20190713).
++       This describes ncurses version 6.1 (patch 20190720).
+ 
+ 
+ 
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.1-20190713+/doc/html/man/terminfo.5.html	2019-07-13 23:50:37.000000000 +0000
++++ ncurses-6.1-20190720/doc/html/man/terminfo.5.html	2019-07-20 18:53:15.000000000 +0000
+@@ -33,10 +33,34 @@
+   ****************************************************************************
+   * @Id: terminfo.head,v 1.36 2019/07/13 23:17:33 tom Exp @
+   * Head of terminfo man page ends here
+-  * @Id: terminfo.tail,v 1.95 2019/07/13 23:29:04 tom Exp @
+-  * Beginning of terminfo.tail file
+-  * This file is part of ncurses.
+-  * See "terminfo.head" for copyright.
++  ****************************************************************************
++  * Copyright (c) 1998-2018,2019 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: terminfo.tail,v 1.97 2019/07/20 10:20:57 tom Exp @
+   *.in -2
+   *.in +2
+   *.in -2
+@@ -74,7 +98,7 @@
+        Terminfo describes terminals by giving a set of capabilities which they
+        have, by specifying how to perform screen operations, and by specifying
+        padding  requirements  and  initialization  sequences.   This describes
+-       ncurses version 6.1 (patch 20190713).
++       ncurses version 6.1 (patch 20190720).
+ 
+ 
+

    Terminfo Entry Syntax

    +@@ -2457,7 +2481,7 @@
+ 
+ 
+

    SEE ALSO

    +-       tabs(1m),  tic(1m), infocmp(1m), curses(3x), curs_color(3x), curs_vari-
++       tabs(1),  tic(1m),  infocmp(1m), curses(3x), curs_color(3x), curs_vari-
+        ables(3x), printf(3), term(5).  term_variables(3x).  user_caps(5).
+ 
+ 
+Index: doc/html/man/tic.1m.html
+--- ncurses-6.1-20190713+/doc/html/man/tic.1m.html	2019-07-13 23:50:37.000000000 +0000
++++ ncurses-6.1-20190720/doc/html/man/tic.1m.html	2019-07-20 18:53:15.000000000 +0000
+@@ -26,7 +26,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: tic.1m,v 1.69 2019/05/18 22:48:40 tom Exp @
++  * @Id: tic.1m,v 1.74 2019/07/20 17:57:09 tom Exp @
+ -->
+ 
+ 
+@@ -324,35 +324,108 @@
+        will be printed.
+ 
+ 
+-

    COMPATIBILITY

    +-       There is  some  evidence  that  historic  tic  implementations  treated
+-       description  fields with no whitespace in them as additional aliases or
++

    HISTORY

    ++       System V Release 2 provided  a  tic  utility.   It  accepted  a  single
++       option:  -v  (optionally  followed  by  a  number).   According to Ross
++       Ridge's comment in mytinfo, this version of tic was unable to represent
++       cancelled capabilities.
++
++       System  V  Release 3 provided a different tic utility, written by Pavel
++       Curtis, (originally named "compile" in pcurses).  This added an  option
++       -c  to check the file for errors, with the caveat that errors in "use="
++       links would not be reported.  System V Release 3 documented a few warn-
++       ing messages which did not appear in pcurses.  While the program itself
++       was changed little as development continued with System  V  Release  4,
++       the table of capabilities grew from 180 (pcurses) to 464 (Solaris).
++
++       In  early  development of ncurses (1993), Zeyd Ben-Halim used the table
++       from mytinfo to extend the  pcurses  table  to  469  capabilities  (456
++       matched  SVr4, 8 were only in SVr4, 13 were not in SVr4).  Of those 13,
++       11 were ultimately discarded (perhaps to  match  the  draft  of  X/Open
++       Curses).   The exceptions were memory_lock_above and memory_unlock (see
++       user_caps(5)).
++
++       Eric Raymond incorporated parts of mytinfo into  ncurses  to  implement
++       the  termcap-to-terminfo  source conversion, and extended that to begin
++       development of the corresponding terminfo-to-termcap source conversion,
++       Thomas  Dickey  completed  that  development over the course of several
++       years.
++
++       In 1999, Thomas Dickey added the  -x  option  to  support  user-defined
++       capabilities.
++
++       In  2010,  Roy  Marples provided a tic program and terminfo library for
++       NetBSD.  This implementation  adapts  several  features  from  ncurses,
++       including tic's -x option.
++
++       The  -c  option  tells tic to check for problems in the terminfo source
++       file.  Continued development provides additional checks:
++
++       o   pcurses had 8 warnings
++
++       o   ncurses in 1996 had 16 warnings
++
++       o   Solaris (SVr4) curses has 28 warnings
++
++       o   NetBSD tic in 2019 has 19 warnings.
++
++       o   ncurses in 2019 has 96 warnings
++
++       The checking done in ncurses' tic helps with the conversion to termcap,
++       as well as pointing out errors and inconsistencies.  It is also used to
++       ensure consistency with the user-defined capabilities.  There  are  527
++       distinct  capabilities  in ncurses' terminal database; 128 of those are
++       user-defined.
++
++
++

    PORTABILITY

    ++       X/Open Curses, Issue 7 (2009) provides a brief description of tic.   It
++       lists  one  option:  -c.  The omission of -v is unexpected.  The change
++       history states that  the  description  is  derived  from  True64  UNIX.
++       According  to  its  manual  pages,  that  system  also supported the -v
++       option.
++
++       Shortly after Issue 7 was released,  Tru64  was  discontinued.   As  of
++       2019,  the  surviving  implementations  of tic are SVr4 (AIX, HP-UX and
++       Solaris), ncurses and NetBSD curses.
++
++       The X/Open rationale states that some implementations of tic read  ter-
++       minal  descriptions  from  the  standard input if the file parameter is
++       omitted.  None of these implementations do that.  Further, it  comments
++       that some may choose to read from "./terminfo.src" but that is obsoles-
++       cent behavior from SVr2, and is not (for example) a documented  feature
++       of SVr3.
++
++
++

    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 descrip-
+-       tion  fields may be treated that way and check them for dangerous char-
++       tion fields may be treated that way and check them for dangerous  char-
+        acters.
+ 
+ 
+-

    EXTENSIONS

    +-       Unlike the SVr4 tic command, this implementation can  actually  compile
+-       termcap  sources.   In fact, entries in terminfo and termcap syntax can
+-       be mixed in a single source file.  See  terminfo(5)  for  the  list  of
++

    EXTENSIONS

    ++       Unlike  the  SVr4 tic command, this implementation can actually compile
++       termcap sources.  In fact, entries in terminfo 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 will find  use  targets  any-
+-       where  in  the source file, or anywhere in the file tree rooted at TER-
+-       MINFO (if TERMINFO is defined), or in the user's $HOME/.terminfo  data-
++       The SVr4 manual pages are not clear on the  resolution  rules  for  use
++       capabilities.   This  implementation  of tic will find use targets any-
++       where in the source file, or anywhere in the file tree rooted  at  TER-
++       MINFO  (if TERMINFO is defined), or in the user's $HOME/.terminfo data-
+        base (if it 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
++       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
++       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.
++       report bad "use=" links.
+ 
+-       System  V  does  not  compile  entries  to  or  read  entries from your
++       System V does  not  compile  entries  to  or  read  entries  from  your
+        $HOME/.terminfo database unless TERMINFO is explicitly set to it.
+ 
+ 
+@@ -365,7 +438,7 @@
+        infocmp(1m),   captoinfo(1m),   infotocap(1m),   toe(1m),   curses(3x),
+        term(5).  terminfo(5).  user_caps(5).
+ 
+-       This describes ncurses version 6.1 (patch 20190713).
++       This describes ncurses version 6.1 (patch 20190720).
+ 
+ 
+

    AUTHOR

    +@@ -387,8 +460,13 @@
+ 
  • PROCESSING
    • 
+ 
+ 
+-
  • COMPATIBILITY
    • 
+-
  • EXTENSIONS
    • 
++
  • HISTORY
    • 
++
  • PORTABILITY
++
++
    • 
+ 
  • FILES
    • 
+ 
  • SEE ALSO
    • 
+ 
  • AUTHOR
    • 
+Index: doc/html/man/toe.1m.html
+--- ncurses-6.1-20190713+/doc/html/man/toe.1m.html	2019-07-13 23:50:37.000000000 +0000
++++ ncurses-6.1-20190720/doc/html/man/toe.1m.html	2019-07-20 19:10:50.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -104,16 +104,73 @@
+               and exits.
+ 
+ 
++

    EXAMPLES

    ++       Without sorting, the -a option reports all of the names found in all of
++       the terminal databases found by the TERMINFO and TERMINFO_DIRS environ-
++       ment variables:
++
++           MtxOrb162      16x2 Matrix Orbital LCD display
++           MtxOrb204      20x4 Matrix Orbital LCD display
++           MtxOrb         Generic Matrix Orbital LCD display
++           qvt101+        qume qvt 101 PLUS product
++           qvt119+-25     QVT 119 PLUS with 25 data lines
++           qansi-g        QNX ANSI
++           qvt103         qume qvt 103
++           qnxw           QNX4 windows
++           qansi-w        QNX ansi for windows
++           qnxm           QNX4 with mouse events
++           qvt203-25-w    QVT 203 PLUS with 25 by 132 columns
++           qansi-t        QNX ansi without console writes
++           . . .
++
++       Use the -a and -s options together to show where each terminal descrip-
++       tion was found:
++
++           --> /usr/local/ncurses/share/terminfo
++           ----> /usr/share/terminfo
++           *-+-:     9term          Plan9 terminal emulator for X
++           *---:     Eterm          Eterm with xterm-style color support (X Window System)
++           *-*-:     Eterm-256color Eterm with xterm 256-colors
++           *-*-:     Eterm-88color  Eterm with 88 colors
++           *-+-:     MtxOrb         Generic Matrix Orbital LCD display
++           *-+-:     MtxOrb162      16x2 Matrix Orbital LCD display
++           *-+-:     MtxOrb204      20x4 Matrix Orbital LCD display
++           *-*-:     NCR260VT300WPP NCR 2900_260 vt300 wide mode pc+  kybd
++           *-+-:     aaa            ann arbor ambassador/30 lines
++           *-+-:     aaa+dec        ann arbor ambassador in dec vt100 mode
++           *-+-:     aaa+rv         ann arbor ambassador in reverse video
++           . . .
++
++
+

    FILES

    +        /usr/share/terminfo/?/*
+             Compiled terminal description database.
+ 
+ 
++

    HISTORY

    ++       This  utility  is  not  provided by other implementations.  There is no
++       relevant X/Open or POSIX standard for toe.
++
++       The program name refers to a developer's pun:
++
++       o   tic,
++
++       o   tac (now tack),
++
++       o   toe.
++
++       It replaced a -T option which was  briefly  supported  by  the  ncurses
++       infocmp utility in 1995.
++
++       The  -a  and -s options were added to toe several years later (2006 and
++       2011, respectively).
++
++
+

    SEE ALSO

    +        tic(1m), infocmp(1m), captoinfo(1m),  infotocap(1m),  curses(3x),  ter-
+        minfo(5).
+ 
+-       This describes ncurses version 6.1 (patch 20190713).
++       This describes ncurses version 6.1 (patch 20190720).
+ 
+ 
+ 
+@@ -124,7 +181,9 @@
+ 
  • NAME
    • 
+ 
  • SYNOPSIS
    • 
+ 
  • DESCRIPTION
    • 
++
  • EXAMPLES
    • 
+ 
  • FILES
    • 
++
  • HISTORY
    • 
+ 
  • SEE ALSO
    • 
+ 
+ 
+Index: doc/html/man/tput.1.html
+--- ncurses-6.1-20190713+/doc/html/man/tput.1.html	2019-07-13 23:50:37.000000000 +0000
++++ ncurses-6.1-20190720/doc/html/man/tput.1.html	2019-07-20 18:53:15.000000000 +0000
+@@ -522,7 +522,7 @@
+

    SEE ALSO

    +        clear(1), stty(1), tabs(1), tset(1), terminfo(5), curs_termcap(3x).
+ 
+-       This describes ncurses version 6.1 (patch 20190713).
++       This describes ncurses version 6.1 (patch 20190720).
+ 
+ 
+ 
+Index: doc/html/man/tset.1.html
+--- ncurses-6.1-20190713+/doc/html/man/tset.1.html	2019-07-13 23:50:37.000000000 +0000
++++ ncurses-6.1-20190720/doc/html/man/tset.1.html	2019-07-20 18:53:15.000000000 +0000
+@@ -389,7 +389,7 @@
+        csh(1),  sh(1),  stty(1),   curs_terminfo(3x),   tty(4),   terminfo(5),
+        ttys(5), environ(7)
+ 
+-       This describes ncurses version 6.1 (patch 20190713).
++       This describes ncurses version 6.1 (patch 20190720).
+ 
+ 
+ 
+Index: include/tic.h
+Prereq:  1.78 
+--- ncurses-6.1-20190713+/include/tic.h	2019-03-10 00:06:02.000000000 +0000
++++ ncurses-6.1-20190720/include/tic.h	2019-07-20 20:19:54.000000000 +0000
+@@ -33,7 +33,7 @@
+  ****************************************************************************/
+ 
+ /*
+- * $Id: tic.h,v 1.78 2019/03/10 00:06:02 tom Exp $
++ * $Id: tic.h,v 1.79 2019/07/20 20:19:54 tom Exp $
+  *	tic.h - Global variables and structures for the terminfo compiler.
+  */
+ 
+@@ -93,7 +93,7 @@
+ 
+ #define IS_TIC_MAGIC(p)	(LOW_MSB(p) == MAGIC || LOW_MSB(p) == MAGIC2)
+ 
+-#define quick_prefix(s) (!strncmp((s), "b64:", 4) || !strncmp((s), "hex:", 4))
++#define quick_prefix(s) (!strncmp((s), "b64:", (size_t)4) || !strncmp((s), "hex:", (size_t)4))
+ 
+ /*
+  * The "maximum" here is misleading; XSI guarantees minimum values, which a
+Index: man/curs_get_wstr.3x
+Prereq:  1.16 
+--- ncurses-6.1-20190713+/man/curs_get_wstr.3x	2018-09-01 20:58:10.000000000 +0000
++++ ncurses-6.1-20190720/man/curs_get_wstr.3x	2019-07-20 19:14:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 2002-2017,2018 Free Software Foundation, Inc.              *
++.\" Copyright (c) 2002-2018,2019 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.16 2018/09/01 20:58:10 tom Exp $
++.\" $Id: curs_get_wstr.3x,v 1.18 2019/07/20 19:14:56 tom Exp $
+ .TH curs_get_wstr 3X ""
+ .de bP
+ .ie n  .IP \(bu 4
+@@ -189,10 +189,10 @@
+ while \fBwchar_t\fP is a unsigned type.
+ All of the vendors implement this using \fBwint_t\fR, following the standard.
+ .PP
+-X/Open Curses issue 7 is unclear regarding whether
++X/Open Curses, Issue 7 (2009) is unclear regarding whether
+ the terminating \fInull \fP\fBwchar_t\fP
+ value is counted in the length parameter \fIn\fP.
+-X/Open Curses issue 7 revised the corresponding description
++X/Open Curses, Issue 7 revised the corresponding description
+ of \fBwgetnstr\fP to address this issue.
+ The unrevised description of \fBwget_nwstr\fP can be interpreted either way.
+ This implementation counts the terminator in the length.
+Index: man/curs_getstr.3x
+Prereq:  1.26 
+--- ncurses-6.1-20190713+/man/curs_getstr.3x	2018-09-01 20:34:52.000000000 +0000
++++ ncurses-6.1-20190720/man/curs_getstr.3x	2019-07-20 19:14:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2018,2019 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.26 2018/09/01 20:34:52 tom Exp $
++.\" $Id: curs_getstr.3x,v 1.28 2019/07/20 19:14:56 tom Exp $
+ .TH curs_getstr 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -140,10 +140,10 @@
+ The functions \fBgetnstr\fR, \fBmvgetnstr\fR, and \fBmvwgetnstr\fR were
+ present but not documented in SVr4.
+ .PP
+-X/Open Curses issue 5 (2007) stated that these functions
++X/Open Curses, Issue 5 (2007) stated that these functions
+ \*(``read at most \fIn\fP bytes\*(''
+ but did not state whether the terminating NUL is counted in that limit.
+-X/Open Curses issue 7 (2009) changed that to say they
++X/Open Curses, Issue 7 (2009) changed that to say they
+ \*(``read at most \fIn\fP\-1 bytes\*(''
+ to allow for the terminating NUL.
+ As of 2018, some implementations do, some do not count it:
+Index: man/infocmp.1m
+Prereq:  1.74 
+--- ncurses-6.1-20190713+/man/infocmp.1m	2019-05-18 22:00:55.000000000 +0000
++++ ncurses-6.1-20190720/man/infocmp.1m	2019-07-20 18:42:11.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: infocmp.1m,v 1.74 2019/05/18 22:00:55 tom Exp $
++.\" $Id: infocmp.1m,v 1.75 2019/07/20 18:42:11 tom Exp $
+ .TH @INFOCMP@ 1M ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -560,6 +560,34 @@
+ .TP 20
+ \*d
+ Compiled terminal description database.
++.SH HISTORY
++Although System V Release 2 provided a terminfo library,
++it had no documented tool for decompiling the terminal descriptions.
++Tony Hansen (AT&T) wrote the first \fBinfocmp\fP in early 1984,
++for System V Release 3.
++.PP
++Eric Raymond used the AT&T documentation in 1995 to provide an equivalent
++\fB@INFOCMP@\fP for ncurses.
++In addition, he added a few new features such as:
++.bP
++the \fB\-e\fP option, to support \fIfallback\fP
++(compiled-in) terminal descriptions
++.bP
++the \fB\-i\fP option, to help with analysis 
++.PP
++Later, Thomas Dickey added the \fB\-x\fP (user-defined capabilities)
++option, and the \fB\-E\fP option to support fallback entries with
++user-defined capabilities.
++.PP
++For a complete list, see the \fIEXTENSIONS\fP section.
++.PP
++In 2010, Roy Marples provided an \fBinfocmp\fP program for NetBSD.
++It is less capable than the SVr4 or ncurses versions
++(e.g., it lacks the sorting options documented in X/Open),
++but does include the \fB\-x\fP option adapted from ncurses.
++.SH PORTABILITY
++X/Open Curses, Issue 7 (2009) provides a description of \fBinfocmp\fP.
++It does not mention the options used for converting to termcap format.
+ .SH EXTENSIONS
+ The
+ \fB\-0\fR,
+Index: man/man_db.renames
+Prereq:  1.54 
+--- ncurses-6.1-20190713+/man/man_db.renames	2019-06-23 19:12:27.000000000 +0000
++++ ncurses-6.1-20190720/man/man_db.renames	2019-07-20 10:18:12.000000000 +0000
+@@ -25,7 +25,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: man_db.renames,v 1.54 2019/06/23 19:12:27 tom Exp $
++# $Id: man_db.renames,v 1.55 2019/07/20 10:18:12 Sven.Joachim Exp $
+ # Manual-page renamings for the man_db program
+ #
+ # Files:
+@@ -171,7 +171,6 @@
+ wresize.3x			wresize.3ncurses
+ #
+ # Other:
+-tabs.1m				tabs.1
+ tack.1m				tack.1
+ #
+ getty.1				getty.8
+Index: man/terminfo.tail
+Prereq:  1.95 
+--- ncurses-6.1-20190713+/man/terminfo.tail	2019-07-13 23:29:04.000000000 +0000
++++ ncurses-6.1-20190720/man/terminfo.tail	2019-07-20 10:20:57.000000000 +0000
+@@ -1,7 +1,32 @@
+-.\" $Id: terminfo.tail,v 1.95 2019/07/13 23:29:04 tom Exp $
+-.\" Beginning of terminfo.tail file
+-.\" This file is part of ncurses.
+-.\" See "terminfo.head" for copyright.
++.\"***************************************************************************
++.\" Copyright (c) 1998-2018,2019 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: terminfo.tail,v 1.97 2019/07/20 10:20:57 tom Exp $
+ .ps +1
+ .SS User-Defined Capabilities
+ .
+@@ -1879,7 +1904,7 @@
+ \*d/?/*
+ files containing terminal descriptions
+ .SH SEE ALSO
+-\fB@TABS@\fR(1M),
++\fB@TABS@\fR(1),
+ \fB@TIC@\fR(1M),
+ \fB@INFOCMP@\fR(1M),
+ \fBcurses\fR(3X),
+Index: man/tic.1m
+Prereq:  1.69 
+--- ncurses-6.1-20190713+/man/tic.1m	2019-05-18 22:48:40.000000000 +0000
++++ ncurses-6.1-20190720/man/tic.1m	2019-07-20 17:57:09.000000000 +0000
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tic.1m,v 1.69 2019/05/18 22:48:40 tom Exp $
++.\" $Id: tic.1m,v 1.74 2019/07/20 17:57:09 tom Exp $
+ .TH @TIC@ 1M ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -402,14 +402,98 @@
+ (32 characters on systems with long filenames, 14 characters otherwise)
+ will be truncated to the maximum alias length
+ and a warning message will be printed.
+-.SH COMPATIBILITY
++.SH HISTORY
++.PP
++System V Release 2 provided a \fBtic\fP utility.
++It accepted a single option: \fB\-v\fP (optionally followed by a number).
++According to Ross Ridge's comment in \fImytinfo\fP,
++this version of \fBtic\fP was
++unable to represent cancelled capabilities.
++.PP
++System V Release 3 provided a different \fBtic\fP utility,
++written by Pavel Curtis,
++(originally named \*(``compile\*('' in \fIpcurses\fP).
++This added an option \fB\-c\fP to check the file for
++errors, with the caveat that errors in \*(``use=\*('' links
++would not be reported.
++System V Release 3 documented a few warning messages which
++did not appear in \fIpcurses\fP.
++While the program itself was changed little as development
++continued with System V Release 4,
++the table of capabilities grew from 180 (\fIpcurses\fP) to 464 (Solaris).
++.PP
++In early development of ncurses (1993),
++Zeyd Ben-Halim used the table from \fImytinfo\fP to
++extend the \fIpcurses\fP table to 469 capabilities
++(456 matched SVr4, 8 were only in SVr4, 13 were not in SVr4).
++Of those 13, 11 were ultimately discarded
++(perhaps to match the draft of X/Open Curses).
++The exceptions were
++\fBmemory_lock_above\fP and
++\fBmemory_unlock\fP (see \fBuser_caps\fP(5)).
++.PP
++Eric Raymond incorporated parts of \fImytinfo\fP into ncurses
++to implement the termcap-to-terminfo source conversion,
++and extended that to begin development of 
++the corresponding terminfo-to-termcap source conversion,
++Thomas Dickey completed that development over the course of several years.
++.PP
++In 1999, Thomas Dickey added the \fB\-x\fP option
++to support user-defined capabilities.
++.PP
++In 2010, Roy Marples provided a \fBtic\fP program
++and terminfo library for NetBSD.
++This implementation adapts several features from ncurses,
++including \fB@TIC@\fP's \fB\-x\fP option.
++.PP
++The \fB\-c\fP option tells \fB@TIC@\fP to check for problems in the
++terminfo source file.
++Continued development provides additional checks:
++.bP
++\fIpcurses\fP had 8 warnings
++.bP
++ncurses in 1996 had 16 warnings
++.bP
++Solaris (SVr4) curses has 28 warnings
++.bP
++NetBSD tic in 2019 has 19 warnings.
++.bP
++ncurses in 2019 has 96 warnings
++.PP
++The checking done in ncurses' \fB@TIC@\fP helps with the conversion to
++termcap, as well as pointing out errors and inconsistencies.
++It is also used to ensure consistency with the user-defined capabilities.
++There are 527 distinct capabilities in ncurses' terminal database;
++128 of those are user-defined.
++.SH PORTABILITY
++.PP
++X/Open Curses, Issue 7 (2009) provides a brief description of \fBtic\fP.
++It lists one option: \fB\-c\fP.
++The omission of \fB\-v\fP is unexpected.
++The change history states that the description is derived from True64 UNIX.
++According to its manual pages, that system also supported the \fB\-v\fP option.
++.PP
++Shortly after Issue 7 was released, Tru64 was discontinued.
++As of 2019, the surviving implementations of \fBtic\fP
++are SVr4 (AIX, HP-UX and Solaris),
++ncurses
++and NetBSD curses.
++.PP
++The X/Open rationale states that some implementations of \fBtic\fP
++read terminal descriptions from the standard input if the \fIfile\fP
++parameter is omitted.
++None of these implementations do that.
++Further, it comments that some may choose to read from \*(''./terminfo.src\*(''
++but that is obsolescent behavior from SVr2,
++and is not (for example) a documented feature of SVr3.
++.SS COMPATIBILITY
+ There is some evidence that historic \fB@TIC@\fR implementations treated
+ description fields with no whitespace in them as additional aliases or
+ short names.
+ This \fB@TIC@\fR does not do that, but it does warn when
+ description fields may be treated that way and check them for dangerous
+ characters.
+-.SH EXTENSIONS
++.SS EXTENSIONS
+ Unlike the SVr4 \fB@TIC@\fR command, this implementation can actually
+ compile termcap sources.
+ In fact, entries in terminfo and termcap syntax can
+@@ -451,7 +535,7 @@
+ \fB\-x\fR
+ options
+ are not supported under SVr4.
+-The SVr4 \fB\-c\fR mode does not report bad use links.
++The SVr4 \fB\-c\fR mode does not report bad \*(``use=\*('' links.
+ .PP
+ System V does not compile entries to or read entries from your
+ \fI$HOME/.terminfo\fR database unless TERMINFO is explicitly set to it.
+Index: man/toe.1m
+Prereq:  1.29 
+--- ncurses-6.1-20190713+/man/toe.1m	2017-02-18 17:10:26.000000000 +0000
++++ ncurses-6.1-20190720/man/toe.1m	2019-07-20 19:06:44.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2015,2017 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2017,2019 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,30 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: toe.1m,v 1.29 2017/02/18 17:10:26 tom Exp $
++.\" $Id: toe.1m,v 1.31 2019/07/20 19:06:44 tom Exp $
+ .TH @TOE@ 1M ""
++.de bP
++.ie n  .IP \(bu 4
++.el    .IP \(bu 2
++..
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+ .ie \n(.g .ds '' \(rq
+ .el       .ds '' ''
++.de NS
++.ie n  .sp
++.el    .sp .5
++.ie n  .in +4
++.el    .in +2
++.nf
++.ft C			\" Courier
++..
++.de NE
++.fi
++.ft R
++.ie n  .in -4
++.el    .in -2
++..
+ .ds n 5
+ .ds d @TERMINFO@
+ .SH NAME
+@@ -103,10 +121,66 @@
+ \fB\-V\fR
+ reports the version of ncurses which was used in this program,
+ and exits.
++.SH EXAMPLES
++.PP
++Without sorting, the \fB\-a\fP option reports all of the names found
++in all of the terminal databases found by the \fBTERMINFO\fP and
++\fBTERMINFO_DIRS\fP environment variables:
++.NS
++MtxOrb162 	16x2 Matrix Orbital LCD display
++MtxOrb204 	20x4 Matrix Orbital LCD display
++MtxOrb    	Generic Matrix Orbital LCD display
++qvt101+   	qume qvt 101 PLUS product
++qvt119+-25	QVT 119 PLUS with 25 data lines
++qansi-g   	QNX ANSI
++qvt103    	qume qvt 103
++qnxw      	QNX4 windows
++qansi-w   	QNX ansi for windows
++qnxm      	QNX4 with mouse events
++qvt203-25-w	QVT 203 PLUS with 25 by 132 columns
++qansi-t   	QNX ansi without console writes
++\&.\ .\ .
++.NE
++.PP
++Use the \fB\-a\fP and \fB\-s\fP options together to show where each terminal
++description was found:
++.NS
++--> /usr/local/ncurses/share/terminfo
++----> /usr/share/terminfo
++*-+-:	9term     	Plan9 terminal emulator for X
++*---:	Eterm     	Eterm with xterm-style color support (X Window System)
++*-*-:	Eterm-256color	Eterm with xterm 256-colors
++*-*-:	Eterm-88color	Eterm with 88 colors
++*-+-:	MtxOrb    	Generic Matrix Orbital LCD display
++*-+-:	MtxOrb162 	16x2 Matrix Orbital LCD display
++*-+-:	MtxOrb204 	20x4 Matrix Orbital LCD display
++*-*-:	NCR260VT300WPP	NCR 2900_260 vt300 wide mode pc+  kybd
++*-+-:	aaa       	ann arbor ambassador/30 lines
++*-+-:	aaa+dec   	ann arbor ambassador in dec vt100 mode
++*-+-:	aaa+rv    	ann arbor ambassador in reverse video
++\&.\ .\ .
++.NE
+ .SH FILES
+ .TP 5
+ \fB\*d/?/*\fR
+ Compiled terminal description database.
++.SH HISTORY
++This utility is not provided by other implementations.
++There is no relevant X/Open or POSIX standard for \fB@TOE@\fP.
++.PP 
++The program name refers to a developer's pun:
++.bP
++\fBtic\fP,
++.bP
++\fBtac\fP (now \fBtack\fP),
++.bP
++\fBtoe\fP.
++.PP
++It replaced a \fB\-T\fP option which was briefly supported by
++the ncurses \fBinfocmp\fP utility in 1995.
++.PP
++The \fB\-a\fP and \fB\-s\fP options were added to 
++\fB@TOE@\fR several years later (2006 and 2011, respectively).
+ .SH SEE ALSO
+ \fB@TIC@\fR(1M),
+ \fB@INFOCMP@\fR(1M),
+Index: ncurses/base/lib_mouse.c
+Prereq:  1.181 
+--- ncurses-6.1-20190713+/ncurses/base/lib_mouse.c	2018-11-24 17:28:37.000000000 +0000
++++ ncurses-6.1-20190720/ncurses/base/lib_mouse.c	2019-07-20 20:42:43.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2018,2019 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            *
+@@ -84,7 +84,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_mouse.c,v 1.181 2018/11/24 17:28:37 tom Exp $")
++MODULE_ID("$Id: lib_mouse.c,v 1.182 2019/07/20 20:42:43 tom Exp $")
+ 
+ #include 
+ 
+@@ -1103,7 +1103,7 @@
+ #else
+ 			    sp->_ifd,
+ #endif
+-			    kbuf + grabbed, 1);
++			    (kbuf + grabbed), (size_t) 1);
+ 	if (res == -1)
+ 	    break;
+ 	grabbed += (size_t) res;
+@@ -1188,7 +1188,7 @@
+ #else
+ 			    sp->_ifd,
+ #endif
+-			    kbuf + grabbed, 1);
++			    (kbuf + grabbed), (size_t) 1);
+ 	if (res == -1)
+ 	    break;
+ 	if ((grabbed + MAX_KBUF) >= (int) sizeof(kbuf)) {
+Index: ncurses/base/lib_screen.c
+Prereq:  1.95 
+--- ncurses-6.1-20190713+/ncurses/base/lib_screen.c	2019-05-04 20:31:31.000000000 +0000
++++ ncurses-6.1-20190720/ncurses/base/lib_screen.c	2019-07-20 20:23:21.000000000 +0000
+@@ -41,7 +41,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_screen.c,v 1.95 2019/05/04 20:31:31 tom Exp $")
++MODULE_ID("$Id: lib_screen.c,v 1.96 2019/07/20 20:23:21 tom Exp $")
+ 
+ #define MAX_SIZE 0x3fff		/* 16k is big enough for a window or pad */
+ 
+@@ -514,13 +514,13 @@
+      * Read the first 4 bytes to determine first if this is an old-format
+      * screen-dump, or new-format.
+      */
+-    if (read_block(&tmp, 4, filep) < 0) {
++    if (read_block(&tmp, (size_t) 4, filep) < 0) {
+ 	returnWin(0);
+     }
+     /*
+      * If this is a new-format file, and we do not support it, give up.
+      */
+-    if (!memcmp(&tmp, my_magic, 4)) {
++    if (!memcmp(&tmp, my_magic, (size_t) 4)) {
+ #if NCURSES_EXT_PUTWIN
+ 	if (read_win(&tmp, filep) < 0)
+ #endif
+@@ -823,7 +823,7 @@
+ 	    attr_t attr;
+ 
+ 	    *buffer = '\0';
+-	    if (!strncmp(name, "_pad.", 5) && !(win->_flags & _ISPAD)) {
++	    if (!strncmp(name, "_pad.", (size_t) 5) && !(win->_flags & _ISPAD)) {
+ 		continue;
+ 	    }
+ 	    switch (scr_params[y].type) {
+Index: ncurses/tinfo/make_hash.c
+Prereq:  1.26 
+--- ncurses-6.1-20190713+/ncurses/tinfo/make_hash.c	2019-03-10 01:10:15.000000000 +0000
++++ ncurses-6.1-20190720/ncurses/tinfo/make_hash.c	2019-07-20 20:14:46.000000000 +0000
+@@ -43,7 +43,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: make_hash.c,v 1.26 2019/03/10 01:10:15 tom Exp $")
++MODULE_ID("$Id: make_hash.c,v 1.27 2019/07/20 20:14:46 tom Exp $")
+ 
+ /*
+  *	_nc_make_hash_table()
+@@ -222,16 +222,16 @@
+ {
+     static char result[40];
+     unsigned n;
+-    strcpy(result, L_PAREN);
++    _nc_STRCPY(result, L_PAREN, sizeof(result));
+     for (n = 0; n < 3; ++n) {
+ 	if ((1 << n) & type_mask) {
+ 	    if (result[1])
+-		strcat(result, "|");
+-	    strcat(result, "1<<");
+-	    strcat(result, typenames[n]);
++		_nc_STRCAT(result, "|", sizeof(result));
++	    _nc_STRCAT(result, "1<<", sizeof(result));
++	    _nc_STRCAT(result, typenames[n], sizeof(result));
+ 	}
+     }
+-    strcat(result, R_PAREN);
++    _nc_STRCAT(result, R_PAREN, sizeof(result));
+     return result;
+ }
+ 
+Index: ncurses/tinfo/read_entry.c
+Prereq:  1.154 
+--- ncurses-6.1-20190713+/ncurses/tinfo/read_entry.c	2019-03-23 23:47:16.000000000 +0000
++++ ncurses-6.1-20190720/ncurses/tinfo/read_entry.c	2019-07-20 20:23:11.000000000 +0000
+@@ -41,7 +41,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: read_entry.c,v 1.154 2019/03/23 23:47:16 tom Exp $")
++MODULE_ID("$Id: read_entry.c,v 1.155 2019/07/20 20:23:11 tom Exp $")
+ 
+ #define TYPE_CALLOC(type,elts) typeCalloc(type, (unsigned)(elts))
+ 
+@@ -694,7 +694,7 @@
+     char *base = target;
+     int result = 0;
+ 
+-    if (!strncmp(source, "b64:", 4)) {
++    if (!strncmp(source, "b64:", (size_t) 4)) {
+ 	source += 4;
+ 	while (*source != '\0') {
+ 	    int bits[4];
+@@ -712,7 +712,7 @@
+ 		}
+ 	    }
+ 	}
+-    } else if (!strncmp(source, "hex:", 4)) {
++    } else if (!strncmp(source, "hex:", (size_t) 4)) {
+ 	source += 4;
+ 	while (*source != '\0') {
+ 	    int ch = decode_hex(&source);
+Index: package/debian-mingw/changelog
+--- ncurses-6.1-20190713+/package/debian-mingw/changelog	2019-07-13 20:42:44.000000000 +0000
++++ ncurses-6.1-20190720/package/debian-mingw/changelog	2019-07-20 10:26:30.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.1+20190713) unstable; urgency=low
++ncurses6 (6.1+20190720) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 13 Jul 2019 16:42:44 -0400
++ -- Thomas E. Dickey   Sat, 20 Jul 2019 06:26:30 -0400
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.1-20190713+/package/debian-mingw64/changelog	2019-07-13 20:42:44.000000000 +0000
++++ ncurses-6.1-20190720/package/debian-mingw64/changelog	2019-07-20 10:26:30.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.1+20190713) unstable; urgency=low
++ncurses6 (6.1+20190720) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 13 Jul 2019 16:42:44 -0400
++ -- Thomas E. Dickey   Sat, 20 Jul 2019 06:26:30 -0400
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.1-20190713+/package/debian/changelog	2019-07-13 20:42:44.000000000 +0000
++++ ncurses-6.1-20190720/package/debian/changelog	2019-07-20 10:26:30.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.1+20190713) unstable; urgency=low
++ncurses6 (6.1+20190720) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 13 Jul 2019 16:42:44 -0400
++ -- Thomas E. Dickey   Sat, 20 Jul 2019 06:26:30 -0400
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.340 
+--- ncurses-6.1-20190713+/package/mingw-ncurses.nsi	2019-07-13 20:42:44.000000000 +0000
++++ ncurses-6.1-20190720/package/mingw-ncurses.nsi	2019-07-20 10:26:30.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.340 2019/07/13 20:42:44 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.342 2019/07/20 10:26:30 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "1"
+ !define VERSION_YYYY  "2019"
+-!define VERSION_MMDD  "0713"
++!define VERSION_MMDD  "0720"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.1-20190713+/package/mingw-ncurses.spec	2019-07-13 20:42:44.000000000 +0000
++++ ncurses-6.1-20190720/package/mingw-ncurses.spec	2019-07-20 10:26:30.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.1
+-Release: 20190713
++Release: 20190720
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.1-20190713+/package/ncurses.spec	2019-07-13 20:42:44.000000000 +0000
++++ ncurses-6.1-20190720/package/ncurses.spec	2019-07-20 10:26:30.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.1
+-Release: 20190713
++Release: 20190720
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncursest.spec
+--- ncurses-6.1-20190713+/package/ncursest.spec	2019-07-13 20:42:44.000000000 +0000
++++ ncurses-6.1-20190720/package/ncursest.spec	2019-07-20 10:26:30.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.1
+-Release: 20190713
++Release: 20190720
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/ncurses-6.1-20190727.patch b/ncurses-6.1-20190727.patch
new file mode 100644
index 0000000..d5410df
--- /dev/null
+++ b/ncurses-6.1-20190727.patch
@@ -0,0 +1,4133 @@
+# ncurses 6.1 - patch 20190727 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.1 is at
+# 	ftp.gnu.org:/pub/gnu
+#
+# Patches for ncurses 6.1 can be found at
+# 	ftp://ftp.invisible-island.net/ncurses/6.1
+#	http://invisible-mirror.net/archives/ncurses/6.1 
+#
+# ------------------------------------------------------------------------------
+# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20190727.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Jul 28 00:01:44 UTC 2019
+# ------------------------------------------------------------------------------
+# NEWS                                  |    6 
+# VERSION                               |    2 
+# dist.mk                               |    4 
+# doc/html/ada/funcs/T.htm              |    2 
+# 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          | 1192 ++++++++++++++++----------------
+# 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/ncurses-intro.html           |  379 ++++++----
+# doc/ncurses-intro.doc                 |   36 
+# include/Caps                          |   10 
+# include/Caps.aix4                     |   10 
+# include/Caps.hpux11                   |   10 
+# include/Caps.keys                     |   10 
+# include/Caps.osf1r5                   |   10 
+# include/Caps.uwin                     |   10 
+# man/manhtml.externs                   |    5 
+# man/terminfo.head                     |   19 
+# ncurses-6.1-20190727/progs/ktrace.out |binary
+# ncurses/tinfo/add_tries.c             |    5 
+# ncurses/tinfo/make_hash.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 
+# package/ncursest.spec                 |    2 
+# progs/tic.c                           |   14 
+# 41 files changed, 968 insertions(+), 818 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.3351 
+--- ncurses-6.1-20190720+/NEWS	2019-07-21 00:33:00.000000000 +0000
++++ ncurses-6.1-20190727/NEWS	2019-07-27 22:45:29.000000000 +0000
+@@ -25,7 +25,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.3351 2019/07/21 00:33:00 tom Exp $
++-- $Id: NEWS,v 1.3354 2019/07/27 22:45:29 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.
+ 
++20190727
++	+ fix a few coverity warnings.
++	+ documentation updates based on tctest.
++
+ 20190720
+ 	+ fix a few warnings for gcc 4.x
+ 	+ add some portability/historical details to the tic, toe and infocmp
+Index: VERSION
+--- ncurses-6.1-20190720+/VERSION	2019-07-20 10:26:30.000000000 +0000
++++ ncurses-6.1-20190727/VERSION	2019-07-26 23:10:14.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.1	20190720
++5:0:10	6.1	20190727
+Index: dist.mk
+Prereq:  1.1296 
+--- ncurses-6.1-20190720+/dist.mk	2019-07-20 10:26:30.000000000 +0000
++++ ncurses-6.1-20190727/dist.mk	2019-07-26 23:10:14.000000000 +0000
+@@ -25,7 +25,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1296 2019/07/20 10:26:30 tom Exp $
++# $Id: dist.mk,v 1.1297 2019/07/26 23:10: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 = 1
+-NCURSES_PATCH = 20190720
++NCURSES_PATCH = 20190727
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/ada/funcs/T.htm
+--- ncurses-6.1-20190720+/doc/html/ada/funcs/T.htm	2019-07-13 23:50:38.000000000 +0000
++++ ncurses-6.1-20190727/doc/html/ada/funcs/T.htm	2019-07-26 23:48:31.000000000 +0000
+@@ -20,8 +20,8 @@
+ 
  • tgetnum
+ 
  • tgetstr -  terminal_interface-curses-termcap.adb:108
+ 
  • tgetstr -  terminal_interface-curses-termcap.adb:129
+-
  • tgoto
+ 
  • TGoto
++
  • tgoto
+ 
  • tigetflag
+ 
  • tigetstr -  terminal_interface-curses-terminfo.adb:87
+ 
  • tigetstr -  terminal_interface-curses-terminfo.adb:108
+Index: doc/html/man/adacurses6-config.1.html
+--- ncurses-6.1-20190720+/doc/html/man/adacurses6-config.1.html	2019-07-20 18:53:10.000000000 +0000
++++ ncurses-6.1-20190727/doc/html/man/adacurses6-config.1.html	2019-07-26 23:48:24.000000000 +0000
+@@ -125,7 +125,7 @@
+

    • SEE ALSO

    +        curses(3x)
+ 
+-       This describes ncurses version 6.1 (patch 20190720).
++       This describes ncurses version 6.1 (patch 20190727).
+ 
+ 
+ 
+Index: doc/html/man/captoinfo.1m.html
+--- ncurses-6.1-20190720+/doc/html/man/captoinfo.1m.html	2019-07-20 18:53:10.000000000 +0000
++++ ncurses-6.1-20190727/doc/html/man/captoinfo.1m.html	2019-07-26 23:48:24.000000000 +0000
+@@ -190,7 +190,7 @@
+

    SEE ALSO

    +        infocmp(1m), curses(3x), terminfo(5)
+ 
+-       This describes ncurses version 6.1 (patch 20190720).
++       This describes ncurses version 6.1 (patch 20190727).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/clear.1.html
+--- ncurses-6.1-20190720+/doc/html/man/clear.1.html	2019-07-20 18:53:10.000000000 +0000
++++ ncurses-6.1-20190727/doc/html/man/clear.1.html	2019-07-26 23:48:24.000000000 +0000
+@@ -148,7 +148,7 @@
+

    SEE ALSO

    +        tput(1), terminfo(5)
+ 
+-       This describes ncurses version 6.1 (patch 20190720).
++       This describes ncurses version 6.1 (patch 20190727).
+ 
+ 
+ 
+Index: doc/html/man/form.3x.html
+--- ncurses-6.1-20190720+/doc/html/man/form.3x.html	2019-07-20 18:53:12.000000000 +0000
++++ ncurses-6.1-20190727/doc/html/man/form.3x.html	2019-07-26 23:48:27.000000000 +0000
+@@ -246,7 +246,7 @@
+        curses(3x)  and  related  pages  whose names begin "form_" for detailed
+        descriptions of the entry points.
+ 
+-       This describes ncurses version 6.1 (patch 20190720).
++       This describes ncurses version 6.1 (patch 20190727).
+ 
+ 
+ 
+Index: doc/html/man/infocmp.1m.html
+--- ncurses-6.1-20190720+/doc/html/man/infocmp.1m.html	2019-07-20 18:53:13.000000000 +0000
++++ ncurses-6.1-20190727/doc/html/man/infocmp.1m.html	2019-07-26 23:48:28.000000000 +0000
+@@ -512,7 +512,7 @@
+ 
+        https://invisible-island.net/ncurses/tctest.html
+ 
+-       This describes ncurses version 6.1 (patch 20190720).
++       This describes ncurses version 6.1 (patch 20190727).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/infotocap.1m.html
+--- ncurses-6.1-20190720+/doc/html/man/infotocap.1m.html	2019-07-20 18:53:13.000000000 +0000
++++ ncurses-6.1-20190727/doc/html/man/infotocap.1m.html	2019-07-26 23:48:28.000000000 +0000
+@@ -85,7 +85,7 @@
+

    SEE ALSO

    +        curses(3x), tic(1m), infocmp(1m), terminfo(5)
+ 
+-       This describes ncurses version 6.1 (patch 20190720).
++       This describes ncurses version 6.1 (patch 20190727).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/menu.3x.html
+--- ncurses-6.1-20190720+/doc/html/man/menu.3x.html	2019-07-20 18:53:13.000000000 +0000
++++ ncurses-6.1-20190727/doc/html/man/menu.3x.html	2019-07-26 23:48:28.000000000 +0000
+@@ -221,7 +221,7 @@
+        curses(3x)  and  related  pages  whose names begin "menu_" for detailed
+        descriptions of the entry points.
+ 
+-       This describes ncurses version 6.1 (patch 20190720).
++       This describes ncurses version 6.1 (patch 20190727).
+ 
+ 
+ 
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.1-20190720+/doc/html/man/ncurses.3x.html	2019-07-20 18:53:14.000000000 +0000
++++ ncurses-6.1-20190727/doc/html/man/ncurses.3x.html	2019-07-26 23:48:29.000000000 +0000
+@@ -59,7 +59,7 @@
+        method of updating  character  screens  with  reasonable  optimization.
+        This  implementation  is  "new  curses"  (ncurses)  and is the approved
+        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
+-       This describes ncurses version 6.1 (patch 20190720).
++       This describes ncurses version 6.1 (patch 20190727).
+ 
+        The  ncurses  library emulates the curses library of System V Release 4
+        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
+Index: doc/html/man/ncurses6-config.1.html
+--- ncurses-6.1-20190720+/doc/html/man/ncurses6-config.1.html	2019-07-20 18:53:14.000000000 +0000
++++ ncurses-6.1-20190727/doc/html/man/ncurses6-config.1.html	2019-07-26 23:48:29.000000000 +0000
+@@ -112,7 +112,7 @@
+

    SEE ALSO

    +        curses(3x)
+ 
+-       This describes ncurses version 6.1 (patch 20190720).
++       This describes ncurses version 6.1 (patch 20190727).
+ 
+ 
+ 
+Index: doc/html/man/panel.3x.html
+--- ncurses-6.1-20190720+/doc/html/man/panel.3x.html	2019-07-20 18:53:14.000000000 +0000
++++ ncurses-6.1-20190727/doc/html/man/panel.3x.html	2019-07-26 23:48:29.000000000 +0000
+@@ -204,7 +204,7 @@
+

    SEE ALSO

    +        curses(3x), curs_variables(3x),
+ 
+-       This describes ncurses version 6.1 (patch 20190720).
++       This describes ncurses version 6.1 (patch 20190727).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/tabs.1.html
+--- ncurses-6.1-20190720+/doc/html/man/tabs.1.html	2019-07-20 18:53:15.000000000 +0000
++++ ncurses-6.1-20190727/doc/html/man/tabs.1.html	2019-07-26 23:48:29.000000000 +0000
+@@ -205,7 +205,7 @@
+

    SEE ALSO

    +        tset(1), infocmp(1m), curses(3x), terminfo(5).
+ 
+-       This describes ncurses version 6.1 (patch 20190720).
++       This describes ncurses version 6.1 (patch 20190727).
+ 
+ 
+ 
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.1-20190720+/doc/html/man/terminfo.5.html	2019-07-20 18:53:15.000000000 +0000
++++ ncurses-6.1-20190727/doc/html/man/terminfo.5.html	2019-07-27 20:27:54.000000000 +0000
+@@ -31,7 +31,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: terminfo.head,v 1.36 2019/07/13 23:17:33 tom Exp @
++  * @Id: terminfo.head,v 1.38 2019/07/27 11:51:04 tom Exp @
+   * Head of terminfo man page ends here
+   ****************************************************************************
+   * Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.              *
+@@ -94,60 +94,65 @@
+ 
+

    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).
++       programs such as nvi(1), lynx(1), mutt(1), and  other  curses  applica-
++       tions,  using  high-level calls to libraries such as curses(3x).  It is
++       also used via low-level calls by non-curses applications which  may  be
++       screen-oriented (such as clear(1)) or non-screen (such as tabs(1)).
++
+        Terminfo describes terminals by giving a set of capabilities which they
+        have, by specifying how to perform screen operations, and by specifying
+-       padding  requirements  and  initialization  sequences.   This describes
+-       ncurses version 6.1 (patch 20190720).
++       padding requirements and initialization sequences.
++
++       This manual describes ncurses version 6.1 (patch 20190727).
+ 
+ 
+

    Terminfo Entry Syntax

    +        Entries in terminfo consist of a sequence of fields:
+ 
+-       o   Each field ends with a comma "," (embedded commas  may  be  escaped
++       o   Each  field  ends  with a comma "," (embedded commas may be escaped
+            with a backslash or written as "\054").
+ 
+        o   White space between fields is ignored.
+ 
+        o   The first field in a terminfo entry begins in the first column.
+ 
+-       o   Newlines  and  leading  whitespace (spaces or tabs) may be used for
+-           formatting entries for readability.  These are removed from  parsed
++       o   Newlines and leading whitespace (spaces or tabs) may  be  used  for
++           formatting  entries for readability.  These are removed from parsed
+            entries.
+ 
+-           The  infocmp  -f and -W options rely on this to format if-then-else
+-           expressions, or to enforce maximum line-width.  The resulting  for-
++           The infocmp -f and -W options rely on this to  format  if-then-else
++           expressions,  or to enforce maximum line-width.  The resulting for-
+            matted terminal description can be read by tic.
+ 
+-       o   The  first  field for each terminal gives the names which are known
++       o   The first field for each terminal gives the names which  are  known
+            for the terminal, separated by "|" characters.
+ 
+            The first name given is the most common abbreviation for the termi-
+-           nal  (its  primary name), the last name given should be a long name
+-           fully identifying the terminal (see longname(3x)), and  all  others
++           nal (its primary name), the last name given should be a  long  name
++           fully  identifying  the terminal (see longname(3x)), and all others
+            are treated as synonyms (aliases) for the primary terminal name.
+ 
+-           X/Open  Curses  advises  that  all  names but the last should be in
+-           lower case and contain no blanks; the last name  may  well  contain
++           X/Open Curses advises that all names but  the  last  should  be  in
++           lower  case  and  contain no blanks; the last name may well contain
+            upper case and blanks for readability.
+ 
+-           This  implementation  is not so strict; it allows mixed case in the
++           This implementation is not so strict; it allows mixed case  in  the
+            primary name and aliases.  If the last name has no embedded blanks,
+-           it  allows  that  to  be both an alias and a verbose name (but will
++           it allows that to be both an alias and a  verbose  name  (but  will
+            warn about this ambiguity).
+ 
+-       o   Lines beginning with a "#" in the first column are treated as  com-
++       o   Lines  beginning with a "#" in the first column are treated as com-
+            ments.
+ 
+            While comment lines are legal at any point, the output of captoinfo
+-           and infotocap (aliases for tic) will move comments  so  they  occur
++           and  infotocap  (aliases  for tic) will move comments so they occur
+            only between entries.
+ 
+-       Terminal  names  (except  for the last, verbose entry) should be chosen
++       Terminal names (except for the last, verbose entry)  should  be  chosen
+        using the following conventions.  The particular piece of hardware mak-
+-       ing  up the terminal should have a root name, thus "hp2621".  This name
++       ing up the terminal should have a root name, thus "hp2621".  This  name
+        should not contain hyphens.  Modes that the hardware can be in, or user
+-       preferences,  should be indicated by appending a hyphen and a mode suf-
++       preferences, should be indicated by appending a hyphen and a mode  suf-
+        fix.  Thus, a vt100 in 132-column mode would be vt100-w.  The following
+        suffixes should be used where possible:
+ 
+@@ -170,96 +175,96 @@
+ 
+ 
+

    Terminfo Capabilities Syntax

    +-       The  terminfo  entry  consists  of several capabilities, i.e., features
+-       that the terminal has, or methods for exercising  the  terminal's  fea-
++       The terminfo entry consists of  several  capabilities,  i.e.,  features
++       that  the  terminal  has, or methods for exercising the terminal's fea-
+        tures.
+ 
+        After the first field (giving the name(s) of the terminal entry), there
+        should be one or more capability fields.  These are boolean, numeric or
+        string names with corresponding values:
+ 
+-       o   Boolean  capabilities  are  true  when  present, false when absent.
++       o   Boolean capabilities are true  when  present,  false  when  absent.
+            There is no explicit value for boolean capabilities.
+ 
+-       o   Numeric capabilities  have  a  "#"  following  the  name,  then  an
++       o   Numeric  capabilities  have  a  "#"  following  the  name,  then an
+            unsigned decimal integer value.
+ 
+-       o   String  capabilities  have a "=" following the name, then an string
++       o   String capabilities have a "=" following the name, then  an  string
+            of characters making up the capability value.
+ 
+-           String capabilities can be split into multiple lines, just  as  the
+-           fields  comprising  a  terminal  entry  can  be split into multiple
+-           lines.  While blanks between fields are  ignored,  blanks  embedded
+-           within  a string value are retained, except for leading blanks on a
++           String  capabilities  can be split into multiple lines, just as the
++           fields comprising a terminal  entry  can  be  split  into  multiple
++           lines.   While  blanks  between fields are ignored, blanks embedded
++           within a string value are retained, except for leading blanks on  a
+            line.
+ 
+-       Any capability can be canceled,  i.e.,  suppressed  from  the  terminal
++       Any  capability  can  be  canceled,  i.e., suppressed from the terminal
+        entry, by following its name with "@" rather than a capability value.
+ 
+ 
+

    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  excep-
++       If there are two very similar  terminals,  one  (the  variant)  can  be
++       defined  as  being  just  like the other (the base) with certain excep-
+        tions.  In the definition of the variant, the string capability use can
+        be given with the name of the base terminal:
+ 
+-       o   The capabilities given before use override those in the  base  type
++       o   The  capabilities  given before use override those in the base type
+            named by use.
+ 
+-       o   If  there are multiple use capabilities, they are merged in reverse
+-           order.  That is, the rightmost use reference  is  processed  first,
++       o   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.
+ 
+-       o   Capabilities  given  explicitly in the entry override those brought
++       o   Capabilities 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 ref-
+-       erence  that  imports it, where xx is the capability.  For example, the
++       erence that imports it, where xx is the capability.  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 modes for a  terminal,  or  for  different
++       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.
+ 
+        An entry included via use can contain canceled capabilities, which have
+-       the same effect as if those cancels were inline in the  using  terminal
++       the  same  effect as if those cancels were inline in the using terminal
+        entry.
+ 
+ 
+

    Predefined Capabilities

    +-       The  following  is  a  complete table of the capabilities included in a
+-       terminfo description block and available to  terminfo-using  code.   In
++       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,
+ 
+-       The  variable  is  the  name  by  which the programmer (at the terminfo
++       The variable is the name by  which  the  programmer  (at  the  terminfo
+        level) accesses the capability.
+ 
+-       The capname is the short name used in the text of the database, and  is
+-       used  by  a  person updating the database.  Whenever possible, capnames
++       The  capname is the short name used in the text of the database, and is
++       used by a person updating the database.   Whenever  possible,  capnames
+        are chosen to be the same as or similar to the ANSI X3.64-1979 standard
+-       (now  superseded  by  ECMA-48,  which  uses  identical  or very similar
+-       names).  Semantics are also intended to match those of  the  specifica-
++       (now superseded by  ECMA-48,  which  uses  identical  or  very  similar
++       names).   Semantics  are also intended to match those of the specifica-
+        tion.
+ 
+-       The  termcap code is the old termcap capability name (some capabilities
++       The termcap code is the old termcap capability name (some  capabilities
+        are new, and have names which termcap did not originate).
+ 
+-       Capability names have no hard length limit, but an informal limit of  5
++       Capability  names have no hard length limit, but an informal limit of 5
+        characters has been adopted to keep them short and to allow the tabs in
+        the source file Caps to line up nicely.
+ 
+-       Finally, the description field attempts to convey the semantics of  the
++       Finally,  the description field attempts to convey the semantics of the
+        capability.  You may find some codes in the description field:
+ 
+        (P)    indicates that padding may be specified
+ 
+-       #[1-9] in  the  description  field  indicates that the string is passed
++       #[1-9] in the description field indicates that  the  string  is  passed
+               through tparm with parms as given (#i).
+ 
+-       (P*)   indicates that padding may vary in proportion to the  number  of
++       (P*)   indicates  that  padding may vary in proportion to the number of
+               lines affected
+ 
+        (#i)   indicates the ith parameter.
+@@ -276,6 +281,9 @@
+                                                        matic margins
+           back_color_erase            bce       ut     screen erased with
+                                                        background color
++
++
++
+           can_change                  ccc       cc     terminal can re-
+                                                        define existing col-
+                                                        ors
+@@ -283,7 +291,6 @@
+                                                        by overwriting (hp)
+           col_addr_glitch             xhpa      YA     only positive motion
+                                                        for hpa/mhpa caps
+-
+           cpi_changes_res             cpix      YF     changing character
+                                                        pitch changes reso-
+                                                        lution
+@@ -342,14 +349,13 @@
+                                                        echo on screen
+           row_addr_glitch             xvpa      YD     only positive motion
+                                                        for vpa/mvpa caps
++
+           semi_auto_right_margin      sam       YE     printing in last
+                                                        column causes cr
+           status_line_esc_ok          eslok     es     escape can be used
+                                                        on the status line
+           tilde_glitch                hz        hz     cannot print ~'s
+                                                        (Hazeltine)
+-
+-
+           transparent_underline       ul        ul     underline character
+                                                        overstrikes
+           xon_xoff                    xon       xo     terminal uses
+@@ -396,8 +402,8 @@
+           width_status_line           wsl       ws     number of columns in
+                                                        status line
+ 
+-       The following numeric capabilities  are  present  in  the  SVr4.0  term
+-       structure,  but  are  not yet documented in the man page.  They came in
++       The  following  numeric  capabilities  are  present  in the SVr4.0 term
++       structure, but are not yet documented in the man page.   They  came  in
+        with SVr4's printer support.
+ 
+ 
+@@ -407,6 +413,9 @@
+                                                        each bit-image row
+           bit_image_type              bitype    Yp     type of bit-image
+                                                        device
++
++
++
+           buffer_capacity             bufsz     Ya     numbers of bytes
+                                                        buffered before
+                                                        printing
+@@ -415,7 +424,6 @@
+           dot_horz_spacing            spinh     Yc     spacing of dots hor-
+                                                        izontally in dots
+                                                        per inch
+-
+           dot_vert_spacing            spinv     Yb     spacing of pins ver-
+                                                        tically in pins per
+                                                        inch
+@@ -472,6 +480,8 @@
+                                                        (P)
+           char_padding                rmp       rP     like ip but when in
+                                                        insert mode
++
++
+           clear_all_tabs              tbc       ct     clear all tab stops
+                                                        (P)
+           clear_margins               mgc       MC     clear right and left
+@@ -480,8 +490,6 @@
+                                                        home cursor (P*)
+           clr_bol                     el1       cb     Clear to beginning
+                                                        of line
+-
+-
+           clr_eol                     el        ce     clear to end of line
+                                                        (P)
+           clr_eos                     ed        cd     clear to end of
+@@ -539,6 +547,7 @@
+           enter_delete_mode           smdc      dm     enter delete mode
+           enter_dim_mode              dim       mh     turn on half-bright
+                                                        mode
++
+           enter_doublewide_mode       swidm     ZF     Enter double-wide
+                                                        mode
+           enter_draft_quality         sdrfq     ZG     Enter draft-quality
+@@ -547,7 +556,6 @@
+           enter_italics_mode          sitm      ZH     Enter italic mode
+           enter_leftward_mode         slm       ZI     Start leftward car-
+                                                        riage motion
+-
+           enter_micro_mode            smicm     ZJ     Start micro-motion
+                                                        mode
+           enter_near_letter_quality   snlq      ZK     Enter NLQ mode
+@@ -605,6 +613,7 @@
+                                                        not move cursor)
+           form_feed                   ff        ff     hardcopy terminal
+                                                        page eject (P*)
++
+           from_status_line            fsl       fs     return from status
+                                                        line
+           goto_window                 wingo     WG     go to window #1
+@@ -613,7 +622,6 @@
+                                                        string
+           init_2string                is2       is     initialization
+                                                        string
+-
+           init_3string                is3       i3     initialization
+                                                        string
+           init_file                   if        if     name of initializa-
+@@ -671,6 +679,7 @@
+           key_f15                     kf15      F5     F15 function key
+           key_f16                     kf16      F6     F16 function key
+           key_f17                     kf17      F7     F17 function key
++
+           key_f18                     kf18      F8     F18 function key
+           key_f19                     kf19      F9     F19 function key
+           key_f2                      kf2       k2     F2 function key
+@@ -679,7 +688,6 @@
+           key_f22                     kf22      FC     F22 function key
+           key_f23                     kf23      FD     F23 function key
+           key_f24                     kf24      FE     F24 function key
+-
+           key_f25                     kf25      FF     F25 function key
+           key_f26                     kf26      FG     F26 function key
+           key_f27                     kf27      FH     F27 function key
+@@ -737,6 +745,7 @@
+           key_mark                    kmrk      %2     mark key
+           key_message                 kmsg      %3     message key
+           key_move                    kmov      %4     move key
++
+           key_next                    knxt      %5     next key
+           key_npage                   knp       kN     next-page key
+           key_open                    kopn      %6     open key
+@@ -745,7 +754,6 @@
+           key_previous                kprv      %8     previous key
+           key_print                   kprt      %9     print key
+           key_redo                    krdo      %0     redo key
+-
+           key_reference               kref      &1     reference key
+           key_refresh                 krfr      &2     refresh key
+           key_replace                 krpl      &3     replace key
+@@ -802,6 +810,8 @@
+                                                        key f0 if not f0
+           lab_f1                      lf1       l1     label on function
+                                                        key f1 if not f1
++
++
+           lab_f10                     lf10      la     label on function
+                                                        key f10 if not f10
+           lab_f2                      lf2       l2     label on function
+@@ -810,8 +820,6 @@
+                                                        key f3 if not f3
+           lab_f4                      lf4       l4     label on function
+                                                        key f4 if not f4
+-
+-
+           lab_f5                      lf5       l5     label on function
+                                                        key f5 if not f5
+           lab_f6                      lf6       l6     label on function
+@@ -869,6 +877,7 @@
+                                                        to the right (P*)
+           parm_right_micro            mcuf      Zh     Like parm_right_cur-
+                                                        sor in micro mode
++
+           parm_rindex                 rin       SR     scroll back #1 lines
+                                                        (P)
+           parm_up_cursor              cuu       UP     up #1 lines (P*)
+@@ -876,8 +885,6 @@
+                                                        in micro mode
+           pkey_key                    pfkey     pk     program function key
+                                                        #1 to type string #2
+-
+-
+           pkey_local                  pfloc     pl     program function key
+                                                        #1 to execute string
+                                                        #2
+@@ -932,6 +939,11 @@
+                                                        pair to #1
+           set_foreground              setf      Sf     Set foreground color
+                                                        #1
++
++
++
++
++
+           set_left_margin             smgl      ML     set left soft margin
+                                                        at current col-
+                                                        umn.     See smgl.
+@@ -942,8 +954,6 @@
+           set_right_margin            smgr      MR     set right soft mar-
+                                                        gin at current col-
+                                                        umn
+-
+-
+           set_right_margin_parm       smgrp     Zn     Set right margin at
+                                                        column #1
+           set_tab                     hts       st     set a tab in every
+@@ -1008,8 +1018,6 @@
+                                                         lation
+           bit_image_carriage_return   bicr       Yv     Move to beginning
+                                                         of same row
+-
+-
+           bit_image_newline           binel      Zz     Move to next row
+                                                         of the bit image
+           bit_image_repeat            birep      Xy     Repeat bit image
+@@ -1067,6 +1075,7 @@
+           set_a_foreground            setaf      AF     Set foreground
+                                                         color to #1, using
+                                                         ANSI escape
++
+           set_color_band              setcolor   Yz     Change to ribbon
+                                                         color #1
+           set_lr_margin               smglr      ML     Set both left and
+@@ -1074,19 +1083,17 @@
+                                                         #1, #2.  (ML is
+                                                         not in BSD term-
+                                                         cap).
+-
+-
+           set_page_length             slines     YZ     Set page length to
+                                                         #1 lines
+           set_tb_margin               smgtb      MT     Sets both top and
+                                                         bottom margins to
+                                                         #1, #2
+ 
+-        The XSI Curses standard added these hardcopy capabilities.  They  were
+-        used  in  some post-4.1 versions of System V curses, e.g., Solaris 2.5
+-        and IRIX 6.x.  Except for YI, the ncurses termcap names for  them  are
+-        invented.   According to the XSI Curses standard, they have no termcap
+-        names.  If your compiled terminfo entries use these, they may  not  be
++        The  XSI Curses standard added these hardcopy capabilities.  They were
++        used in some post-4.1 versions of System V curses, e.g.,  Solaris  2.5
++        and  IRIX  6.x.  Except for YI, the ncurses termcap names for them are
++        invented.  According to the XSI Curses standard, they have no  termcap
++        names.   If  your compiled terminfo entries use these, they may not be
+         binary-compatible with System V terminfo entries after SVr4.1; beware!
+ 
+ 
+@@ -1115,26 +1122,26 @@
+ 
+ 
+

    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 are special features of newer terminals
+-       which are awkward or impossible to represent by reusing the  predefined
++       The preceding section listed the predefined  capabilities.   They  deal
++       with  some special features for terminals no longer (or possibly never)
++       produced.  Occasionally there are special features of  newer  terminals
++       which  are awkward or impossible to represent by reusing the predefined
+        capabilities.
+ 
+-       ncurses  addresses  this  limitation by allowing user-defined capabili-
++       ncurses addresses this limitation by  allowing  user-defined  capabili-
+        ties.  The tic and infocmp programs provide the -x option for this pur-
+        pose.  When -x is set, tic treats unknown capabilities as user-defined.
+-       That is, if tic encounters a capability name which it does  not  recog-
+-       nize,  it  infers  its type (boolean, number or string) from the syntax
+-       and  makes  an  extended  table  entry  for   that   capability.    The
+-       use_extended_names(3x)  function  makes  this information conditionally
++       That  is,  if tic encounters a capability name which it does not recog-
++       nize, it infers its type (boolean, number or string)  from  the  syntax
++       and   makes   an   extended  table  entry  for  that  capability.   The
++       use_extended_names(3x) function makes  this  information  conditionally
+        available to applications.  The ncurses library provides the data leav-
+        ing most of the behavior to applications:
+ 
+-       o   User-defined  capability  strings  whose  name  begins with "k" are
++       o   User-defined capability strings whose  name  begins  with  "k"  are
+            treated as function keys.
+ 
+-       o   The types (boolean,  number,  string)  determined  by  tic  can  be
++       o   The  types  (boolean,  number,  string)  determined  by  tic can be
+            inferred by successful calls on tigetflag, etc.
+ 
+        o   If the capability name happens to be two characters, the capability
+@@ -1142,18 +1149,18 @@
+ 
+        While termcap is said to be extensible because it does not use a prede-
+        fined set of capabilities, in practice it has been limited to the capa-
+-       bilities defined by terminfo implementations.  As a rule,  user-defined
++       bilities  defined by terminfo implementations.  As a rule, user-defined
+        capabilities intended for use by termcap applications should be limited
+-       to booleans and numbers to avoid  running  past  the  1023  byte  limit
++       to  booleans  and  numbers  to  avoid  running past the 1023 byte limit
+        assumed by termcap implementations and their applications.  In particu-
+-       lar, providing extended sets of function keys  (past  the  60  numbered
+-       keys  and  the  handful  of  special named keys) is best done using the
++       lar,  providing  extended  sets  of function keys (past the 60 numbered
++       keys and the handful of special named keys)  is  best  done  using  the
+        longer names available using terminfo.
+ 
+ 
+

    A Sample Entry

    +        The following entry, describing an ANSI-standard terminal, is represen-
+-       tative  of  what a terminfo entry for a modern terminal typically looks
++       tative of what a terminfo entry for a modern terminal  typically  looks
+        like.
+ 
+        ansi|ansi/pc-term compatible with color,
+@@ -1187,8 +1194,8 @@
+                smul=\E[4m, tbc=\E[3g, u6=\E[%i%d;%dR, u7=\E[6n,
+                u8=\E[?%[;0123456789]c, u9=\E[c, vpa=\E[%i%p1%dd,
+ 
+-       Entries may continue onto multiple lines by placing white space at  the
+-       beginning  of  each line except the first.  Comments may be included on
++       Entries  may continue onto multiple lines by placing white space at the
++       beginning of each line except the first.  Comments may be  included  on
+        lines beginning with "#".  Capabilities in terminfo are of three types:
+ 
+        o   Boolean capabilities which indicate that the terminal has some par-
+@@ -1197,23 +1204,23 @@
+        o   numeric capabilities giving the size of the terminal or the size of
+            particular delays, and
+ 
+-       o   string capabilities, which give a sequence which  can  be  used  to
++       o   string  capabilities,  which  give  a sequence which can be used to
+            perform particular terminal operations.
+ 
+ 
+

    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 reached) is indicated by the capability
+-       am.  Hence the description of ansi includes am.   Numeric  capabilities
+-       are  followed  by  the  character  "#" and then a positive value.  Thus
++       terminals  have  automatic margins (i.e., an automatic return and line-
++       feed when the end of a line is reached) is indicated by the  capability
++       am.   Hence  the description of ansi includes am.  Numeric capabilities
++       are followed by the character "#" and  then  a  positive  value.   Thus
+        cols, which indicates the number of columns the terminal has, gives the
+-       value  "80" for ansi.  Values for numeric capabilities may be specified
++       value "80" for ansi.  Values for numeric capabilities may be  specified
+        in decimal, octal or hexadecimal, using the C programming language con-
+        ventions (e.g., 255, 0377 and 0xff or 0xFF).
+ 
+-       Finally,  string  valued capabilities, such as el (clear to end of line
+-       sequence) are given by the two-character  code,  an  "=",  and  then  a
++       Finally, string valued capabilities, such as el (clear to end  of  line
++       sequence)  are  given  by  the  two-character  code, an "=", and then a
+        string ending at the next following ",".
+ 
+        A number of escape sequences are provided in the string valued capabil-
+@@ -1234,9 +1241,9 @@
+            respectively.
+ 
+        X/Open Curses does not say what "appropriate x" might be.  In practice,
+-       that  is a printable ASCII graphic character.  The special case "^?" is
+-       interpreted as DEL (127).  In all other cases, the character  value  is
+-       AND'd  with 0x1f, mapping to ASCII control codes in the range 0 through
++       that is a printable ASCII graphic character.  The special case "^?"  is
++       interpreted  as  DEL (127).  In all other cases, the character value is
++       AND'd with 0x1f, mapping to ASCII control codes in the range 0  through
+        31.
+ 
+        Other escapes include
+@@ -1252,142 +1259,142 @@
+        o   and \0 for null.
+ 
+            \0 will produce \200, which does not terminate a string but behaves
+-           as  a null character on most terminals, providing CS7 is specified.
++           as a null character on most terminals, providing CS7 is  specified.
+            See stty(1).
+ 
+-           The reason for this quirk is to maintain  binary  compatibility  of
+-           the  compiled  terminfo files with other implementations, e.g., the
+-           SVr4 systems, which document this.   Compiled  terminfo  files  use
+-           null-terminated  strings,  with  no  lengths.  Modifying this would
++           The  reason  for  this quirk is to maintain binary compatibility of
++           the compiled terminfo files with other implementations,  e.g.,  the
++           SVr4  systems,  which  document  this.  Compiled terminfo files use
++           null-terminated strings, with no  lengths.   Modifying  this  would
+            require a new binary format, which would not work with other imple-
+            mentations.
+ 
+        Finally, characters may be given as three octal digits after a \.
+ 
+-       A  delay  in  milliseconds  may appear anywhere in a string capability,
+-       enclosed in $<..> brackets, as in el=\EK$<5>,  and  padding  characters
++       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(3x) to provide this delay.
+ 
+        o   The delay must be a number with at most one decimal place of preci-
+            sion; it may be followed by suffixes "*" or "/" or both.
+ 
+-       o   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
++       o   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.
+ 
+-       o   A "/" suffix indicates that the padding is mandatory and  forces  a
++       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
++       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  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  envi-
+-       ronment  variables.   Before  starting  to  search,  ncurses eliminates
++       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 envi-
++       ronment variables.   Before  starting  to  search,  ncurses  eliminates
+        duplicates in its search list.
+ 
+-       o   If the environment variable TERMINFO is set, it is  interpreted  as
++       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
++       o   If  TERMINFO is not set, ncurses will instead look in the directory
+            $HOME/.terminfo for a compiled description.
+ 
+-       o   Next,  if  the  environment  variable TERMINFO_DIRS is set, ncurses
+-           will interpret the contents of that variable as a  list  of  colon-
++       o   Next, if the environment variable  TERMINFO_DIRS  is  set,  ncurses
++           will  interpret  the  contents of that variable 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
++           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/terminfo.
+ 
+        o   Finally, ncurses searches these compiled-in locations:
+ 
+-           o   a    list    of    directories   (/usr/local/ncurses/share/ter-
++           o   a   list    of    directories    (/usr/local/ncurses/share/ter-
+                minfo:/usr/share/terminfo), and
+ 
+-           o   the system terminfo directory,  /usr/share/terminfo  (the  com-
++           o   the  system  terminfo  directory, /usr/share/terminfo (the com-
+                piled-in default).
+ 
+ 
+

    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
++       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 very unusual terminal may expose deficiencies in the ability  of  the
++       screen-oriented program to check that they are correct.  Be aware  that
++       a  very  unusual terminal may expose deficiencies in the ability 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  manufacturer
+-       did  not  document  it)  a  severe test is to edit a large file at 9600
++       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 usually needed.  A similar test can be used for insert character.
+ 
+ 
+

    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 lines capability.  If the  terminal
+-       wraps  around  to  the  beginning  of the next line when it reaches the
+-       right margin, then it should have the am capability.  If  the  terminal
+-       can  clear  its  screen,  leaving the cursor in the home position, then
+-       this is given by the clear string capability.  If  the  terminal  over-
+-       strikes  (rather  than  clearing  a position when a character is struck
+-       over) then it should have the os capability.   If  the  terminal  is  a
++       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  margin,  then it should have the am capability.  If the terminal
++       can clear its screen, leaving the cursor in  the  home  position,  then
++       this  is  given  by the clear string capability.  If the terminal over-
++       strikes (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
++       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 carriage return, control/M.)  If there is a code to pro-
++       this will be carriage return, control/M.)  If there is a code  to  pro-
+        duce 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 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  the
++       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 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.
++       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 left corner of the
++       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 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
++       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 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
++       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 the screen.
+ 
+-       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 drawing a box  around  the
++       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 drawing 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 col-
+-       umn 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
++       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  col-
++       umn  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" termi-
+@@ -1404,20 +1411,20 @@
+ 
+ 
+

    Parameterized Strings

    +-       Cursor addressing and other strings requiring parameters in the  termi-
+-       nal  are  described  by a parameterized string capability, with printf-
++       Cursor  addressing and other strings requiring parameters in the termi-
++       nal 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
++       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 addressing, that can  be  indicated
++       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 spe-
++       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  spe-
+        cial case.  Other operations, including "%t" pop their operand from the
+-       stack.   It  is noted that more complex operations are often necessary,
++       stack.  It is noted that more complex operations are  often  necessary,
+        e.g., in the sgr string.
+ 
+        The % encodings have the following meanings:
+@@ -1425,7 +1432,7 @@
+        %%   outputs "%"
+ 
+        %[[:]flags][width[.precision]][doxXs]
+-            as in printf(3), flags are [-+#] and space.  Use a  ":"  to  allow
++            as  in  printf(3),  flags are [-+#] and space.  Use a ":" to allow
+             the next character to be a "-" flag, avoiding interpreting "%-" as
+             an operator.
+ 
+@@ -1448,9 +1455,9 @@
+        %g[A-Z]
+             get static variable [a-z] and push it
+ 
+-            The terms "static" and "dynamic"  are  misleading.   Historically,
++            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(3x).  However, that fact  is  not
++            not  reset  between calls to tparm(3x).  However, that fact is not
+             documented in other implementations.  Relying on it will adversely
+             impact portability to other implementations.
+ 
+@@ -1480,8 +1487,8 @@
+ 
+        %? 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, testing if it is nonzero (true).  If  it  is  zero
++            the %? expr part pushes a value onto the stack,  and  %t  pops  it
++            from  the  stack,  testing 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:
+@@ -1489,245 +1496,245 @@
+ 
+             where ci are conditions, bi are bodies.
+ 
+-            Use  the  -f  option of tic or infocmp to see the structure of if-
++            Use the -f option of tic or infocmp to see the  structure  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
++            written on one line.  The -f option splits the string  into  lines
+             with the parts indented.
+ 
+-       Binary operations are in postfix form with the operands  in  the  usual
++       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 vari-
+        ables 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    digits.     Thus    its   cup   capability   is
++       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   digits.     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 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 that  tabs  are
+-       never  expanded, so \t is safe to send.  This turns out to be essential
++       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 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 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 column offset  by
++       A  final example is the LSI ADM-3a, which uses row and column 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
++       "\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 character.  Then the  same
+-       is  done for the second parameter.  More complex arithmetic is possible
++       previous  values) and outputs that value as a character.  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
++       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 addressing to (0,0): to the top left  cor-
++       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 cor-
+        ner of the screen, not of memory.  (Thus, the \EH sequence on HP termi-
+        nals cannot be used for home.)
+ 
+        If the terminal has row or column absolute cursor addressing, these can
+-       be  given  as  single  parameter  capabilities hpa (horizontal position
+-       absolute) and vpa (vertical position absolute).   Sometimes  these  are
+-       shorter  than  the  more  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) 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
++       be given as single  parameter  capabilities  hpa  (horizontal  position
++       absolute)  and  vpa  (vertical position absolute).  Sometimes these are
++       shorter than the more 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)  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 as the TEKTRONIX 4025.
+ 
+-       If the terminal needs to be in a special mode when  running  a  program
++       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
++       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 cur-
+        sor addressing, a one screen-sized window must be fixed into the termi-
+-       nal 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  rmcup  sequence  is output (to the state prior to outputting
++       nal  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 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 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
++       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 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 avail-
+        able.)
+ 
+ 
+

    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 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
++       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 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
++       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 using csr  on
+-       a  properly chosen region; the sc and rc (save and restore cursor) com-
+-       mands 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
++       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)  com-
++       mands  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 combi-
+-       nation of index with the memory-lock feature found  on  some  terminals
++       nation  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,
++       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 terminals with those features.
+ 
+        The boolean non_dest_scroll_region should be set if each scrolling win-
+-       dow is effectively a view port on a screen-sized canvas.  To  test  for
++       dow  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 something to the bottom line, move the cursor to the top  of  the
++       write  something  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 simulate destructive scrolling; their  documentation  cautions
+-       you  not to define csr unless this is true.  This curses implementation
++       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  simulate 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  as  the  parameterized
+-       string  wind.  The four parameters are the starting and ending lines in
++       If the terminal has the ability to define a window as part  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 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
++       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  charac-
+-       ters  on  the current line and shift characters off the end of the line
++       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 charac-
++       ters 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
++       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 clearing 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 position 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 sec-
+-       ond type of terminal, and should give the capability in,  which  stands
++       You can determine the kind of terminal you have by clearing 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 position 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  sec-
++       ond  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 mode cannot be described with the
++       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  mode,  and
+-       terminals  which send a simple sequence to open a blank position on the
++       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
+-       sequence needed to be sent just before  sending  the  character  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
++       as rmir the sequence to leave  insert  mode.   Now  give  as  ich1  any
++       sequence  needed  to  be  sent  just before sending the character 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 preferable 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 appropriate (but not both).  If you have to write an entry
+-       to be used under new curses for a terminal old  enough  to  need  both,
++       If your terminal has both, insert mode is usually preferable  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 appropriate (but not both).  If you have to write an  entry
++       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
++       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  capability,  with  one
++       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 capability, with one
+        parameter, n, will repeat the effects of ich1 n times.
+ 
+-       If  padding  is  necessary between characters typed while not in insert
++       If padding is necessary between characters typed while  not  in  insert
+        mode, give this as a number of milliseconds padding 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  (notably
+-       Datamedia's)  must  not  have  mir because of the way their insert mode
++       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  character,  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
++       Finally,  you  can  specify dch1 to delete a single character, 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
++       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 different ways.  You should choose one
+-       display form as standout 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 spaces on the screen, as the TVI 912 and Teleray  1061  do,  then
++       be represented in a number of different ways.  You  should  choose  one
++       display  form  as  standout  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  spaces  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  cursor  one  space to the right, such as the
++       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
++       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),  taking  9  parameters.   Each
+-       parameter  is either 0 or nonzero, as the corresponding attribute is on
+-       or off.  The 9 parameters are, in order: standout, underline,  reverse,
+-       blink,  dim,  bold,  blank,  protect, alternate character set.  Not all
++       If there is a sequence to set arbitrary  combinations  of  modes,  this
++       should  be  given  as  sgr (set attributes), taking 9 parameters.  Each
++       parameter is either 0 or nonzero, as the corresponding attribute is  on
++       or  off.  The 9 parameters 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 sep-
+        arate attribute commands exist.
+ 
+@@ -1746,17 +1753,17 @@
+                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 they are  active.   Standout
+-       is  set up to be the combination of reverse and bold.  The vt220 termi-
+-       nal has a protect mode, though it is not commonly used in  sgr  because
+-       it  protects  characters  on  the screen from the host's erasures.  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
++       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  termi-
++       nal  has  a protect mode, though it is not commonly used in sgr because
++       it protects characters on the screen from  the  host's  erasures.   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 example, ;7 is  out-
+-       put  when  either  p1  or  p3  is  true, that is, if either standout or
++       Some  sequences are common to different modes.  For example, ;7 is out-
++       put 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 dependencies yields
+@@ -1777,54 +1784,54 @@
+            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 ter-
+-       minfo entries necessarily have an sgr string, however.   Many  terminfo
++       Remember  that  if  you specify sgr, you must also specify sgr0.  Also,
++       some implementations rely on sgr being given if sgr0 is, Not  all  ter-
++       minfo  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 special "cook-
++       Terminals with the "magic cookie" glitch (xmc) deposit  special  "cook-
+        ies" when they receive mode-setting sequences, which affect the display
+-       algorithm  rather than having extra bits for each character.  Some ter-
+-       minals, 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
++       algorithm rather than having extra bits for each character.  Some  ter-
++       minals,  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 indicate  an  error
+-       quietly  (a  bell replacement) then this can be given as flash; it must
++       If  the  terminal has a way of flashing the screen to indicate 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 when it is  not
++       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 blinking underline) give  this  sequence  as
++       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
+-       that as civis.  The capability cnorm should be given which  undoes  the
++       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 the screen, specify the  capability  os.   If
++       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 the screen, specify the capability os.  If
+        overstrikes are 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 that it is not possible
++       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 keypad only works in local (this applies,
+-       for  example, to the unshifted HP 2621 keys).  If the keypad can be set
++       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 rmkx.  Other-
+        wise 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
++       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 function 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
++       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 given:
+@@ -1863,64 +1870,64 @@
+ 
+        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 given as ka1, ka3, kb2,
+-       kc1, and kc3.  These keys are useful when the  effects  of  a  3  by  3
++       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  useful 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
++       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 numbers
+-       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
++       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 computer.
+ 
+-       The  capabilities  nlab,  lw  and  lh define the number of programmable
+-       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 nor-
+-       mally output after one or more pln sequences  to  make  sure  that  the
++       The capabilities nlab, lw and lh  define  the  number  of  programmable
++       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  nor-
++       mally  output  after  one  or  more pln sequences to make sure that the
+        change becomes visible.
+ 
+ 
+

    Tabs and Initialization

    +        A few capabilities are used only for tabs:
+ 
+-       o   If  the  terminal  has hardware tabs, the command to advance to the
++       o   If the terminal has hardware tabs, the command to  advance  to  the
+            next tab stop can be given as ht (usually control/I).
+ 
+        o   A "back-tab" command which moves leftward to the preceding 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
++           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 properly set.
+ 
+-       o   If the terminal has hardware tabs which are initially set  every  n
++       o   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.
+ 
+            The it capability is normally used by the tset command to determine
+-           whether  to set the mode for hardware tab expansion, and whether to
++           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
++           in non-volatile memory, the terminfo description  can  assume  that
+            they are properly set.
+ 
+        Other capabilities include
+ 
+        o   is1, is2, and is3, initialization strings for the terminal,
+ 
+-       o   iprog, the path name of a program to be run to initialize the  ter-
++       o   iprog,  the path name of a program to be run to initialize the ter-
+            minal,
+ 
+        o   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
++       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 will be printed in the following order:
+ 
+               run the program
+@@ -1944,34 +1951,34 @@
+               and finally output
+                      is3.
+ 
+-       Most initialization is done with is2.  Special terminal  modes  can  be
+-       set  up  without duplicating strings by putting the common sequences in
++       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 is3.
+ 
+-       A set of sequences that does a harder  reset  from  a  totally  unknown
++       A  set  of  sequences  that  does a harder reset from a totally unknown
+        state can be given as rs1, rs2, rf and rs3, analogous to is1 , is2 , if
+-       and is3 respectively.  These strings are  output  by  reset  option  of
+-       tput,  or  by  the reset program (an alias of tset), which is used when
++       and  is3  respectively.   These  strings  are output by reset option of
++       tput, or by the reset program (an alias of tset), which  is  used  when
+        the terminal gets into a wedged state.  Commands are normally placed in
+        rs1, rs2 rs3 and rf only if they produce 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
++       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., instead of  is1,  etc.   If
+-       any  of  rs1, rs2, rs3, or rf reset capability strings are missing, the
++       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 back upon the corresponding initialization capabil-
+        ity string.
+ 
+-       If  there are commands to set and clear tab stops, they can be given as
++       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 complex sequence is needed to set the tabs
++       of every row).  If a more complex sequence is needed to  set  the  tabs
+        than can be described by this, the sequence can be placed in is2 or if.
+ 
+-       The tput reset command uses the same capability strings  as  the  reset
+-       command,  although  the two programs (tput and reset) provide different
++       The  tput  reset  command uses the same capability strings as the reset
++       command, although the two programs (tput and reset)  provide  different
+        command-line options.
+ 
+        In practice, these terminfo capabilities are not often used in initial-
+@@ -1980,78 +1987,78 @@
+        o   Almost all hardware terminals (at least those which supported tabs)
+            initialized those to every eight columns:
+ 
+-           The only exception was the AT&T 2300  series,  which  set  tabs  to
++           The  only  exception  was  the  AT&T 2300 series, which set tabs to
+            every five columns.
+ 
+-       o   In  particular, developers of the hardware terminals which are com-
+-           monly used as models for modern terminal emulators  provided  docu-
++       o   In particular, developers of the hardware terminals which are  com-
++           monly  used  as models for modern terminal emulators provided docu-
+            mentation demonstrating that eight columns were the standard.
+ 
+        o   Because of this, the terminal initialization programs tput and tset
+-           use  the  tbc  (clear_all_tabs)  and  hts  (set_tab)   capabilities
+-           directly  only when the it (init_tabs) capability is set to a value
++           use   the  tbc  (clear_all_tabs)  and  hts  (set_tab)  capabilities
++           directly only when the it (init_tabs) capability is set to a  value
+            other than eight.
+ 
+ 
+

    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 VT100s).  These may require padding  char-
++       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 char-
+        acters after certain 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  its  input  buffers  are
+-       close  to  full),  set xon.  This capability suppresses the emission of
+-       padding.  You can also set it for memory-mapped console devices  effec-
+-       tively  that  do  not  have  a speed limit.  Padding information should
++       automatically  emits  ^S  back  to  the host when its input buffers are
++       close to full), set xon.  This capability suppresses  the  emission  of
++       padding.   You can also set it for memory-mapped console devices effec-
++       tively that do not have a  speed  limit.   Padding  information  should
+        still be included so that routines can make better decisions about rel-
+        ative 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
++       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) character as a pad,
+-       then this can be given as pad.  Only the first  character  of  the  pad
++       If the terminal requires other than a null (zero) character 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
++       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
++       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
++       status  line  of  this  kind,  as  would a 24-line VT100 with a 23-line
+        scrolling region set up on initialization.  This situation is indicated
+        by the hs capability.
+ 
+-       Some terminals with status lines need special sequences to  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  capability fsl must return to the main-screen cursor posi-
+-       tions 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
++       Some  terminals  with status lines need special sequences to 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 capability fsl must return to the main-screen  cursor  posi-
++       tions  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 specify it with the
++       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 specified as dsl.
+ 
+-       The boolean capability eslok specifies  that  escape  sequences,  tabs,
++       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.
++       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.
++       Many  terminals have alternate character sets useful for forms-drawing.
+        Terminfo and curses have built-in support for most of the drawing char-
+-       acters supported by the VT100,  with  some  characters  from  the  AT&T
+-       4410v1  added.   This  alternate  character set may be specified by the
++       acters  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     acsc     acsc
+@@ -2092,34 +2099,34 @@
+ 
+        A few notes apply to the table itself:
+ 
+-       o   X/Open Curses incorrectly states that the mapping  for  lantern  is
+-           uppercase  "I"  although Unix implementations use the lowercase "i"
++       o   X/Open  Curses  incorrectly  states that the mapping for lantern is
++           uppercase "I" although Unix implementations use the  lowercase  "i"
+            mapping.
+ 
+-       o   The DEC VT100 implemented graphics using  the  alternate  character
+-           set  feature, temporarily switching modes and sending characters in
++       o   The  DEC  VT100  implemented graphics using the alternate character
++           set feature, temporarily switching modes and sending characters  in
+            the range 0x60 (96) to 0x7e (126) (the acsc Value column in the ta-
+            ble).
+ 
+        o   The AT&T terminal added graphics characters outside that range.
+ 
+-           Some  of  the  characters  within the range do not match the VT100;
+-           presumably they were used in the AT&T terminal:  board  of  squares
+-           replaces  the  VT100  newline symbol, while lantern symbol replaces
++           Some of the characters within the range do  not  match  the  VT100;
++           presumably  they  were  used in the AT&T terminal: board of squares
++           replaces the VT100 newline symbol, while  lantern  symbol  replaces
+            the VT100 vertical tab symbol.  The other VT100 symbols for control
+-           characters  (horizontal tab, carriage return and line-feed) are not
++           characters (horizontal tab, carriage return and line-feed) are  not
+            (re)used in curses.
+ 
+-       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
++       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
+        corresponding graphic.  Then read off the VT100/your terminal character
+        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
++       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":
+@@ -2128,43 +2135,43 @@
+            is usually 8), and can set character-cell foreground and background
+            characters independently, mixing them into N * N color-pairs.
+ 
+-       o   On HP-like terminals, the user must set each color  pair  up  sepa-
+-           rately  (foreground and background are not independently settable).
++       o   On  HP-like  terminals,  the user must set each color pair up sepa-
++           rately (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
++       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
++       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 cur-
+-       rent background color rather  than  the  power-up  default  background;
++       rent  background  color  rather  than  the power-up default background;
+        these should have the boolean capability bce.
+ 
+        While the curses library works with color pairs (reflecting the inabil-
+-       ity of some devices to set foreground and  background  colors  indepen-
++       ity  of  some  devices to set foreground and background colors indepen-
+        dently), there are separate capabilities for setting these features:
+ 
+-       o   To  change  the  current  foreground  or background color on a Tek-
+-           tronix-type terminal, use setaf (set  ANSI  foreground)  and  setab
+-           (set  ANSI background) or setf (set foreground) and setb (set back-
+-           ground).  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  foreground,  they  should be coded as setaf and setab, respec-
++       o   To change the current foreground or  background  color  on  a  Tek-
++           tronix-type  terminal,  use  setaf  (set ANSI foreground) and setab
++           (set ANSI background) or setf (set foreground) and setb (set  back-
++           ground).   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 foreground, they should be coded as setaf  and  setab,  respec-
+            tively.
+ 
+-       o   If the terminal supports other escape sequences to  set  background
+-           and  foreground,  they  should  be  coded as setf and setb, respec-
+-           tively.  The vidputs and the refresh(3x) functions  use  the  setaf
++       o   If  the  terminal supports other escape sequences to set background
++           and foreground, they should be coded  as  setf  and  setb,  respec-
++           tively.   The  vidputs  and the refresh(3x) functions use the setaf
+            and setab capabilities if they are defined.
+ 
+-       The  setaf/setab and setf/setb capabilities take a single numeric argu-
+-       ment each.  Argument values 0-7 of setaf/setab 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
++       The setaf/setab and setf/setb capabilities take a single numeric  argu-
++       ment  each.  Argument values 0-7 of setaf/setab 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 loca-
+        tions in color space.
+ 
+@@ -2194,28 +2201,28 @@
+        It is important to not confuse the two sets of color capabilities; oth-
+        erwise red/blue will be interchanged on the display.
+ 
+-       On an HP-like terminal, use scp with a color-pair number  parameter  to
++       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
++       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
++           which  describe the color.  These three parameters default to being
+            interpreted as RGB (Red, Green, Blue) values.  If the boolean capa-
+-           bility hls is present, they are instead  as  HLS  (Hue,  Lightness,
++           bility  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
++       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 num-
+-           ber  (0  to  max_pairs - 1), and two triples describing first back-
+-           ground and then foreground colors.  These parameters must be  (Red,
++           ber (0 to max_pairs - 1), and two triples  describing  first  back-
++           ground  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 reg-
+-       ister these collisions with the ncv capability.  This is a bit-mask  of
+-       attributes  not to be used when colors are enabled.  The correspondence
++       On some color terminals, colors collide with highlights.  You can  reg-
++       ister  these collisions with the ncv capability.  This is a bit-mask of
++       attributes not to be used when colors are enabled.  The  correspondence
+        with the attributes understood by curses is as follows:
+ 
+                   Attribute              Bit   Decimal      Set by
+@@ -2227,6 +2234,7 @@
+                   A_BOLD                 5     32           sgr
+                   A_INVIS                6     64           sgr
+                   A_PROTECT              7     128          sgr
++
+                   A_ALTCHARSET           8     256          sgr
+                   A_HORIZONTAL           9     512          sgr1
+                   A_LEFT                 10    1024         sgr1
+@@ -2236,134 +2244,134 @@
+                   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.
++       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 and  optimizes
++       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) character as a pad,
+-       then this can be given as pad.  Only the first  character  of  the  pad
++       If the terminal requires other than a null (zero) character as  a  pad,
++       then  this  can  be  given as pad.  Only the first character of the pad
+        string is used.  If the terminal 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 napms if the terminal has  no
++       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 napms if the terminal has no
+        pad character.
+ 
+-       If  the terminal can move up or down half a line, this can be indicated
++       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 use-
+        ful for superscripts and subscripts on hard-copy terminals.  If a hard-
+-       copy terminal can eject to the next page (form feed), give this  as  ff
++       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  charac-
+-       ters)  this  can  be  indicated with the parameterized string rep.  The
+-       first parameter is the character to be repeated and the second  is  the
++       If there is a command to repeat a given character  a  given  number  of
++       times  (to  save  time transmitting a large number of identical charac-
++       ters) 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 prototype command character
+-       is chosen which is used in all capabilities.  This character  is  given
+-       in  the  cmdch  capability to identify it.  The following convention is
++       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 capability to identify it.  The  following  convention  is
+        supported on some UNIX systems: The environment is to be searched for a
+-       CC  variable,  and if found, all occurrences of the prototype character
++       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  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  sequences  are
++       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 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 will assume that the 8th bit is parity and it
+-       will usually be cleared.  If strings exist to turn this "meta mode"  on
++       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
+        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
++       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 virtual  terminal
++       If  the terminal is one of those supported by the UNIX virtual terminal
+        protocol, the terminal number can be given as vt.
+ 
+-       Media  copy strings which control an auxiliary printer connected to the
+-       terminal can be given as mc0: print the contents 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 terminal screen
+-       when the printer is on.  A variation  mc5p  takes  one  parameter,  and
++       Media copy strings which control an auxiliary printer connected to  the
++       terminal  can  be  given as mc0: print the contents 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 terminal  screen
++       when  the  printer  is  on.   A variation mc5p takes one parameter, and
+        leaves the printer on for as many characters as the value of the param-
+        eter, then turns the printer off.  The parameter should not exceed 255.
+-       All  text,  including mc4, is transparently passed to the printer while
++       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 be  displayed
++       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
++       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
++       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-
++       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 stand-
+-       out mode it is instead necessary to use delete and  insert  line.   The
++       out  mode  it  is instead necessary to use delete and insert line.  The
+        ncurses implementation ignores this glitch.
+ 
+-       The  Beehive Superbee, which is unable to correctly transmit the escape
+-       or control/C characters, has xsb, indicating 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,
++       The Beehive Superbee, which is unable to correctly transmit the  escape
++       or  control/C  characters,  has xsb, indicating 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 adding more capa-
++       Other specific terminal problems may be corrected by adding more  capa-
+        bilities of the form xx.
+ 
+ 
+

    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.  Unfor-
+-       tunately, the termcap translations are much more strictly  limited  (to
+-       1023  bytes),  thus  termcap  translations of long terminfo entries can
++       Long  terminfo  entries are unlikely to be a problem; to date, no entry
++       has even approached terminfo's 4096-byte string-table maximum.   Unfor-
++       tunately,  the  termcap translations are much more strictly limited (to
++       1023 bytes), thus 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 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 is searching for is,
++       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 is  searching  for  is,
+        several bad things can happen.
+ 
+-       Some termcap libraries print a warning message or exit if they find  an
++       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
++       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
++       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 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 particular terminal.  This is  the
+-       length  of the entry as it exists in /etc/termcap, minus the backslash-
++       The "before tc expansion" length is the most important one, because  it
++       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 tgetent strips out while reading it.  Some termcap
+        libraries strip off the final newline, too (GNU termcap does not).  Now
+        suppose:
+@@ -2372,87 +2380,87 @@
+ 
+        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
++       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
++       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  vulnera-
+-       ble;  modern telnets pass along values like the terminal type automati-
+-       cally.  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
++       Then tgetent will overwrite memory, perhaps  its  stack,  and  probably
++       core  dump the program.  Programs like telnet are particularly vulnera-
++       ble; modern telnets pass along values like the terminal type  automati-
++       cally.   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.
+ 
+-       The "after tc expansion" length will  have  a  similar  effect  to  the
++       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" expansion once it is  found  the  terminal
++       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, it will have this effect even for users of  some  other
+-       terminal  types  and  users whose TERM variable does not have a termcap
++       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,  it will have this effect even for users of some other
++       terminal types and users whose TERM variable does not  have  a  termcap
+        entry.
+ 
+-       When in -C (translate to termcap) mode, the ncurses  implementation  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
++       When  in  -C (translate to termcap) mode, the ncurses implementation 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) 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 HP-UX and AIX) which diverged
+-       from System V terminfo after SVr1, and have added  extension  capabili-
+-       ties  to the string table that (in the binary format) collide with Sys-
++       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 capabili-
++       ties to the string table that (in the binary format) collide with  Sys-
+        tem V and XSI Curses extensions.
+ 
+ 
+

    EXTENSIONS

    +-       Searching  for  terminal  descriptions  in  $HOME/.terminfo  and   TER-
++       Searching   for  terminal  descriptions  in  $HOME/.terminfo  and  TER-
+        MINFO_DIRS is not supported by older implementations.
+ 
+-       Some  SVr4  curses  implementations,  and  all previous to SVr4, do not
++       Some SVr4 curses implementations, and all  previous  to  SVr4,  do  not
+        interpret the %A and %O operators in parameter 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 possibility that an XPG4 implementation making the opposite  inter-
+-       pretation  may  need  terminfo  entries  made  for ncurses to have msgr
++       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  possibility that an XPG4 implementation making the opposite inter-
++       pretation may need terminfo entries  made  for  ncurses  to  have  msgr
+        turned off.
+ 
+        The ncurses library handles insert-character and insert-character modes
+-       in  a  slightly  non-standard way to get better update efficiency.  See
++       in a slightly non-standard way to get better  update  efficiency.   See
+        the Insert/Delete Character subsection above.
+ 
+-       The parameter substitutions for set_clock  and  display_clock  are  not
+-       documented  in  SVr4 or the XSI Curses standard.  They are deduced from
++       The  parameter  substitutions  for  set_clock and display_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  library  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
++       Be  careful  assigning the kmous capability.  The ncurses library 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 applications 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
++       X/Open Curses does not mention  italics.   Portable  applications  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
++       Different  commercial  ports  of  terminfo and curses support different
+        subsets of the XSI Curses standard and (in some cases) different exten-
+        sion sets.  Here is a summary, accurate as of October 1995:
+ 
+@@ -2462,15 +2470,15 @@
+            capability (set_pglen).
+ 
+        o   SVr1, Ultrix -- These support a restricted subset of terminfo capa-
+-           bilities.  The  booleans  end  with  xon_xoff;  the  numerics  with
++           bilities.   The  booleans  end  with  xon_xoff;  the  numerics with
+            width_status_line; and the strings with prtr_non.
+ 
+-       o   HP/UX  --  Supports  the  SVr1  subset,  plus the SVr[234] numerics
+-           num_labels,  label_height,  label_width,  plus  function  keys   11
+-           through  63,  plus  plab_norm,  label_on,  and label_off, plus some
++       o   HP/UX -- Supports the  SVr1  subset,  plus  the  SVr[234]  numerics
++           num_labels,   label_height,  label_width,  plus  function  keys  11
++           through 63, plus plab_norm,  label_on,  and  label_off,  plus  some
+            incompatible extensions in the string table.
+ 
+-       o   AIX -- Supports the SVr1 subset, plus function keys 11 through  63,
++       o   AIX  -- Supports the SVr1 subset, plus function keys 11 through 63,
+            plus a number of incompatible string table extensions.
+ 
+        o   OSF -- Supports both the SVr4 set and the AIX extensions.
+@@ -2481,7 +2489,7 @@
+ 
+ 
+

    SEE ALSO

    +-       tabs(1),  tic(1m),  infocmp(1m), curses(3x), curs_color(3x), curs_vari-
++       tabs(1), tic(1m), infocmp(1m), curses(3x),  curs_color(3x),  curs_vari-
+        ables(3x), printf(3), term(5).  term_variables(3x).  user_caps(5).
+ 
+ 
+Index: doc/html/man/tic.1m.html
+--- ncurses-6.1-20190720+/doc/html/man/tic.1m.html	2019-07-20 18:53:15.000000000 +0000
++++ ncurses-6.1-20190727/doc/html/man/tic.1m.html	2019-07-26 23:48:29.000000000 +0000
+@@ -438,7 +438,7 @@
+        infocmp(1m),   captoinfo(1m),   infotocap(1m),   toe(1m),   curses(3x),
+        term(5).  terminfo(5).  user_caps(5).
+ 
+-       This describes ncurses version 6.1 (patch 20190720).
++       This describes ncurses version 6.1 (patch 20190727).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/toe.1m.html
+--- ncurses-6.1-20190720+/doc/html/man/toe.1m.html	2019-07-20 19:10:50.000000000 +0000
++++ ncurses-6.1-20190727/doc/html/man/toe.1m.html	2019-07-26 23:48:30.000000000 +0000
+@@ -170,7 +170,7 @@
+        tic(1m), infocmp(1m), captoinfo(1m),  infotocap(1m),  curses(3x),  ter-
+        minfo(5).
+ 
+-       This describes ncurses version 6.1 (patch 20190720).
++       This describes ncurses version 6.1 (patch 20190727).
+ 
+ 
+ 
+Index: doc/html/man/tput.1.html
+--- ncurses-6.1-20190720+/doc/html/man/tput.1.html	2019-07-20 18:53:15.000000000 +0000
++++ ncurses-6.1-20190727/doc/html/man/tput.1.html	2019-07-26 23:48:30.000000000 +0000
+@@ -522,7 +522,7 @@
+

    SEE ALSO

    +        clear(1), stty(1), tabs(1), tset(1), terminfo(5), curs_termcap(3x).
+ 
+-       This describes ncurses version 6.1 (patch 20190720).
++       This describes ncurses version 6.1 (patch 20190727).
+ 
+ 
+ 
+Index: doc/html/man/tset.1.html
+--- ncurses-6.1-20190720+/doc/html/man/tset.1.html	2019-07-20 18:53:15.000000000 +0000
++++ ncurses-6.1-20190727/doc/html/man/tset.1.html	2019-07-26 23:48:30.000000000 +0000
+@@ -389,7 +389,7 @@
+        csh(1),  sh(1),  stty(1),   curs_terminfo(3x),   tty(4),   terminfo(5),
+        ttys(5), environ(7)
+ 
+-       This describes ncurses version 6.1 (patch 20190720).
++       This describes ncurses version 6.1 (patch 20190727).
+ 
+ 
+ 
+Index: doc/html/ncurses-intro.html
+Prereq:  1.48 
+--- ncurses-6.1-20190720+/doc/html/ncurses-intro.html	2019-03-16 19:39:05.000000000 +0000
++++ ncurses-6.1-20190727/doc/html/ncurses-intro.html	2019-07-27 11:47:10.000000000 +0000
+@@ -1,5 +1,5 @@
+